LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新功能点：分标委开发

Browse Source
This commit is contained in:
zhangqinlin
2021-08-30 14:12:06 +08:00
parent 7e3df8cbc8
commit eb4263bd87
14 changed files with 31 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/controller/PayCaseCommitteeController.java → jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/controller/PayCaseCommitteeController.java
+7 -13
View File
@@ -1,11 +1,8 @@
package com.jero.payCaseCommittee.controller;
package com.jero.dataMangement.payCaseCommittee.controller;
import java.text.SimpleDateFormat;
import java.time.LocalTime;
import java.util.*;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -16,16 +13,13 @@ import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.LoginUser;
import com.jero.payCaseCommittee.entity.DTO.PayCaseCommitteeDTO;
import com.jero.payCaseCommittee.entity.DTO.PayCaseCommitteeUpdateDTO;
import com.jero.payCaseCommittee.entity.PayCaseCommittee;
import com.jero.payCaseCommittee.service.IPayCaseCommitteeService;
import com.jero.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem;
import com.jero.payCaseCommitteeSubitem.service.IPayCaseCommitteeSubitemService;
import com.jero.dataMangement.payCaseCommittee.entity.DTO.PayCaseCommitteeDTO;
import com.jero.dataMangement.payCaseCommittee.entity.DTO.PayCaseCommitteeUpdateDTO;
import com.jero.dataMangement.payCaseCommittee.entity.PayCaseCommittee;
import com.jero.dataMangement.payCaseCommittee.service.IPayCaseCommitteeService;
import com.jero.dataMangement.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem;
import com.jero.dataMangement.payCaseCommitteeSubitem.service.IPayCaseCommitteeSubitemService;
import lombok.extern.slf4j.Slf4j;
import net.sf.saxon.functions.DynamicContextAccessor;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/entity/DTO/PayCaseCommitteeUpdateDTO.java → jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/entity/DTO/PayCaseCommitteeUpdateDTO.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.jero.payCaseCommittee.entity.DTO;
package com.jero.dataMangement.payCaseCommittee.entity.DTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/entity/PayCaseCommittee.java → jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/entity/PayCaseCommittee.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.jero.payCaseCommittee.entity;
package com.jero.dataMangement.payCaseCommittee.entity;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/mapper/PayCaseCommitteeMapper.java → jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/mapper/PayCaseCommitteeMapper.java
+2 -2
View File
@@ -1,8 +1,8 @@
package com.jero.payCaseCommittee.mapper;
package com.jero.dataMangement.payCaseCommittee.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jero.payCaseCommittee.entity.PayCaseCommittee;
import com.jero.dataMangement.payCaseCommittee.entity.PayCaseCommittee;
/**
* @Description: pay_case_committee
jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/mapper/xml/PayCaseCommitteeMapper.xml → jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/mapper/xml/PayCaseCommitteeMapper.xml
View File
jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/service/IPayCaseCommitteeService.java → jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/service/IPayCaseCommitteeService.java
+2 -2
View File
@@ -1,6 +1,6 @@
package com.jero.payCaseCommittee.service;
package com.jero.dataMangement.payCaseCommittee.service;
import com.jero.payCaseCommittee.entity.PayCaseCommittee;
import com.jero.dataMangement.payCaseCommittee.entity.PayCaseCommittee;
import com.baomidou.mybatisplus.extension.service.IService;
/**
jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommittee/service/impl/PayCaseCommitteeServiceImpl.java → jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommittee/service/impl/PayCaseCommitteeServiceImpl.java
+4 -4
View File
@@ -1,10 +1,10 @@
package com.jero.payCaseCommittee.service.impl;
package com.jero.dataMangement.payCaseCommittee.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.payCaseCommittee.entity.PayCaseCommittee;
import com.jero.payCaseCommittee.mapper.PayCaseCommitteeMapper;
import com.jero.payCaseCommittee.service.IPayCaseCommitteeService;
import com.jero.dataMangement.payCaseCommittee.entity.PayCaseCommittee;
import com.jero.dataMangement.payCaseCommittee.mapper.PayCaseCommitteeMapper;
import com.jero.dataMangement.payCaseCommittee.service.IPayCaseCommitteeService;
import org.springframework.stereotype.Service;
jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/controller/PayCaseCommitteeSubitemController.java → jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/controller/PayCaseCommitteeSubitemController.java
+4 -7
View File
@@ -1,8 +1,6 @@
package com.jero.payCaseCommitteeSubitem.controller;
package com.jero.dataMangement.payCaseCommitteeSubitem.controller;
import java.util.Arrays;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,14 +8,13 @@ import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.payCaseCommitteeSubitem.entity.DTO.PayCaseCommitteeSubitemDTO;
import com.jero.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem;
import com.jero.payCaseCommitteeSubitem.service.IPayCaseCommitteeSubitemService;
import com.jero.dataMangement.payCaseCommitteeSubitem.entity.DTO.PayCaseCommitteeSubitemDTO;
import com.jero.dataMangement.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem;
import com.jero.dataMangement.payCaseCommitteeSubitem.service.IPayCaseCommitteeSubitemService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/entity/DTO/PayCaseCommitteeSubitemDTO.java → jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/DTO/PayCaseCommitteeSubitemDTO.java
+1 -4
View File
@@ -1,11 +1,8 @@
package com.jero.payCaseCommitteeSubitem.entity.DTO;
package com.jero.dataMangement.payCaseCommitteeSubitem.entity.DTO;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
import javax.validation.constraints.NotBlank;
jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/entity/PayCaseCommitteeSubitem.java → jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/entity/PayCaseCommitteeSubitem.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.jero.payCaseCommitteeSubitem.entity;
package com.jero.dataMangement.payCaseCommitteeSubitem.entity;
import java.io.Serializable;
jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/mapper/PayCaseCommitteeSubitemMapper.java → jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/mapper/PayCaseCommitteeSubitemMapper.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.jero.payCaseCommitteeSubitem.mapper;
package com.jero.dataMangement.payCaseCommitteeSubitem.mapper;
import com.jero.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem;
import com.jero.dataMangement.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/mapper/xml/PayCaseCommitteeSubitemMapper.xml → jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/mapper/xml/PayCaseCommitteeSubitemMapper.xml
View File
jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/service/IPayCaseCommitteeSubitemService.java → jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/service/IPayCaseCommitteeSubitemService.java
+2 -3
View File
@@ -1,9 +1,8 @@
package com.jero.payCaseCommitteeSubitem.service;
package com.jero.dataMangement.payCaseCommitteeSubitem.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.payCaseCommitteeSubitem.entity.DTO.PayCaseCommitteeSubitemDTO;
import com.jero.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem;
import com.jero.dataMangement.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem;
/**
* @Description: pay_case_committee_subitem
jero-boot-incoming-payment/src/main/java/com/jero/payCaseCommitteeSubitem/service/impl/PayCaseCommitteeSubitemServiceImpl.java → jero-boot-incoming-payment/src/main/java/com/jero/dataMangement/payCaseCommitteeSubitem/service/impl/PayCaseCommitteeSubitemServiceImpl.java
+4 -5
View File
@@ -1,11 +1,10 @@
package com.jero.payCaseCommitteeSubitem.service.impl;
package com.jero.dataMangement.payCaseCommitteeSubitem.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.payCaseCommitteeSubitem.entity.DTO.PayCaseCommitteeSubitemDTO;
import com.jero.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem;
import com.jero.payCaseCommitteeSubitem.mapper.PayCaseCommitteeSubitemMapper;
import com.jero.payCaseCommitteeSubitem.service.IPayCaseCommitteeSubitemService;
import com.jero.dataMangement.payCaseCommitteeSubitem.entity.PayCaseCommitteeSubitem;
import com.jero.dataMangement.payCaseCommitteeSubitem.mapper.PayCaseCommitteeSubitemMapper;
import com.jero.dataMangement.payCaseCommitteeSubitem.service.IPayCaseCommitteeSubitemService;
import org.springframework.stereotype.Service;