From 2dcfb30c7d544b0ced10b14ab586e32c8545c9f4 Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Wed, 21 Apr 2021 11:29:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=B5=84=E6=BA=90=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=A0=B9=E6=8D=AE=E6=97=A5=E6=9C=9F=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=B7=BB=E5=8A=A0=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=AF=AD=E5=8F=A5?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=BA=E7=A9=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crms/service/impl/CustomerServiceImpl.java | 2 ++ .../service/impl/CustomerWorkbenchServiceImpl.java | 4 ++++ .../controller/DgApplyAmountInfoController.java | 4 ++-- .../DgLoanCommitteeConsiderController.java | 4 ++-- .../DgWorkConferenceConsiderController.java | 4 ++-- .../guarantee/mapper/DgApplyAmountListMapper.java | 2 +- .../mapper/DgLoanCommitteeConsiderMapper.java | 2 +- .../mapper/DgWorkConferenceConsiderMapper.java | 2 +- .../service/IDgApplyAmountListService.java | 2 +- .../service/IDgLoanCommitteeConsiderService.java | 2 +- .../service/IDgWorkConferenceConsiderService.java | 2 +- .../service/impl/DgApplyAmountListServiceImpl.java | 4 ++-- .../service/impl/DgEfficiencyServiceImpl.java | 6 +++--- .../impl/DgGuaranteeAssignUserServiceImpl.java | 14 ++++++++++++-- .../impl/DgLoanCommitteeConsiderServiceImpl.java | 4 ++-- .../impl/DgWorkConferenceConsiderServiceImpl.java | 4 ++-- .../mapper/guarantee/DgApplyAmountListMapper.xml | 3 +++ .../guarantee/DgLoanCommitteeConsiderMapper.xml | 3 +++ .../guarantee/DgWorkConferenceConsiderMapper.xml | 3 +++ 19 files changed, 48 insertions(+), 23 deletions(-) diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java index a8cfff31..b732cb70 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java @@ -82,6 +82,8 @@ public class CustomerServiceImpl extends ServiceImpl pages = new Page<>(page, size); + if(customerRequest.getEndTime()!=null && customerRequest.getEndTime()!="") + customerRequest.setEndTime(customerRequest.getEndTime()+" 23:59:59"); // 查询所有客户的基本信息 IPage customerEntityIPage = customerDao.queryList(pages, customerRequest); // 获取所有的客户基本信息 diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerWorkbenchServiceImpl.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerWorkbenchServiceImpl.java index a73354be..65ddaf4b 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerWorkbenchServiceImpl.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerWorkbenchServiceImpl.java @@ -59,6 +59,10 @@ public class CustomerWorkbenchServiceImpl extends ServiceImpl customerEntityIPage = this.getBaseMapper().queryList(new Page(page, size), cwr); //List customers = customerEntityIPage.getRecords(); + + if(cwr.getEndTime()!=null) + cwr.setEndTime(cwr.getEndTime()+" 23:59:59"); + IPage customerEntityIPage = this.getBaseMapper().queryList(new Page(page, size), cwr); List customers = customerEntityIPage.getRecords(); // 获取所有的客户经理id diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java index 3dc9adb7..86b9fa44 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java @@ -215,7 +215,7 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA @GetMapping("/businessApplicationList") @ApiOperation(value = "业务申请列表") public ResponseResult businessApplicationList(@RequestParam(value="page",required=false) Integer page,@RequestParam(value="size",required=false) Integer size, - @RequestParam(value = "CustomerNumberOrName", required = false) String CustomerNumberOrName){ + @RequestParam(value = "CustomerNumberOrName", required = false) String CustomerNumberOrName,@RequestParam(value = "status", required = false) Integer status){ //获取当前登录用户id String userId = getUserId(); @@ -225,7 +225,7 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA if(roleIds != null) { String[] ids = roleIds.split(","); List roleIdlist = Arrays.asList(ids); - data = applyAmountListService.queryPage(page, size, CustomerNumberOrName, roleIdlist, userId); + data = applyAmountListService.queryPage(page, size, CustomerNumberOrName, roleIdlist, userId, status); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanCommitteeConsiderController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanCommitteeConsiderController.java index e98ebb7c..b7d12990 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanCommitteeConsiderController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanCommitteeConsiderController.java @@ -40,8 +40,8 @@ public class DgLoanCommitteeConsiderController { @GetMapping("/list") @ApiOperation(value = "列表", notes = "列表", response = DgLoanCommitteeConsiderResponse.class) public ResponseResult list(@RequestParam("page") Integer page, - @RequestParam("size") Integer size, String codeOrName) { - return ResponseResult.SUCCESS(dgLoanCommitteeConsiderService.list(page, size, codeOrName)); + @RequestParam("size") Integer size, String codeOrName,@RequestParam(value = "status", required = false) Integer status) { + return ResponseResult.SUCCESS(dgLoanCommitteeConsiderService.list(page, size, codeOrName,status)); } /** diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgWorkConferenceConsiderController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgWorkConferenceConsiderController.java index 082a6b32..15148ec9 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgWorkConferenceConsiderController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgWorkConferenceConsiderController.java @@ -38,8 +38,8 @@ public class DgWorkConferenceConsiderController { @GetMapping("/list") @ApiOperation(value = "列表", notes = "列表") public ResponseResult list(@RequestParam("page") Integer page, - @RequestParam("size") Integer size, String codeOrName) { - return ResponseResult.SUCCESS(dgWorkConferenceConsiderService.list(page, size, codeOrName)); + @RequestParam("size") Integer size, String codeOrName,@RequestParam(value = "status", required = false) Integer status) { + return ResponseResult.SUCCESS(dgWorkConferenceConsiderService.list(page, size, codeOrName,status)); } /** diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountListMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountListMapper.java index 79cd2f16..bd0c8fca 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountListMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountListMapper.java @@ -22,7 +22,7 @@ import java.util.List; @Mapper public interface DgApplyAmountListMapper extends BaseMapper { - IPage pageByCondition(Page page, String customerNumberOrName, List roleIdlist, String userId); + IPage pageByCondition(Page page, String customerNumberOrName, List roleIdlist, String userId, Integer status); List selectApplyList(@Param("userId") String userId, @Param("roleIdlist") List roleIdlist); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java index e1102b53..e8e29d91 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java @@ -28,7 +28,7 @@ import java.util.List; public interface DgLoanCommitteeConsiderMapper extends BaseMapper { IPage list(Page page, @Param("codeOrName") String codeOrName, @Param("roleIds") List roleIds, - @Param("userId") Integer userId); + @Param("userId") Integer userId,@Param("status") Integer status); List excelList(@Param("ids") List ids); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgWorkConferenceConsiderMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgWorkConferenceConsiderMapper.java index 25c96039..bd2d4fe4 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgWorkConferenceConsiderMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgWorkConferenceConsiderMapper.java @@ -25,7 +25,7 @@ import java.util.List; public interface DgWorkConferenceConsiderMapper extends BaseMapper { IPage list(Page page, @Param("codeOrName") String codeOrName, @Param("roleIds") List roleIds, - @Param("userId") Integer userId); + @Param("userId") Integer userId, @Param("status") Integer status); List excelList(@Param("ids") List ids); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgApplyAmountListService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgApplyAmountListService.java index eb55e4db..69572d81 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgApplyAmountListService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgApplyAmountListService.java @@ -17,5 +17,5 @@ import java.util.List; */ public interface IDgApplyAmountListService extends IService { - PageUtils queryPage(Integer page, Integer size, String customerNumberOrName, List roleIdlist, String userId); + PageUtils queryPage(Integer page, Integer size, String customerNumberOrName, List roleIdlist, String userId, Integer status); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgLoanCommitteeConsiderService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgLoanCommitteeConsiderService.java index b4a2d12d..275938ae 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgLoanCommitteeConsiderService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgLoanCommitteeConsiderService.java @@ -19,7 +19,7 @@ import java.util.List; */ public interface IDgLoanCommitteeConsiderService extends IService { - PageUtils list(Integer page, Integer size, String codeOrName); + PageUtils list(Integer page, Integer size, String codeOrName, Integer status); Boolean check(DgLoanCommitteeConsiderRequest dgLoanCommitteeConsiderRequest); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgWorkConferenceConsiderService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgWorkConferenceConsiderService.java index b116fcad..a68a210e 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgWorkConferenceConsiderService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgWorkConferenceConsiderService.java @@ -19,7 +19,7 @@ import java.util.List; */ public interface IDgWorkConferenceConsiderService extends IService { - PageUtils list(Integer page, Integer size, String codeOrName); + PageUtils list(Integer page, Integer size, String codeOrName,Integer status); Boolean check(Integer id, String opinion, Integer status, List empNames); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountListServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountListServiceImpl.java index ca639930..c4c16a95 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountListServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountListServiceImpl.java @@ -24,7 +24,7 @@ import java.util.List; public class DgApplyAmountListServiceImpl extends ServiceImpl implements IDgApplyAmountListService { @Override - public PageUtils queryPage(Integer page, Integer size, String customerNumberOrName, List roleIdlist, String userId) { + public PageUtils queryPage(Integer page, Integer size, String customerNumberOrName, List roleIdlist, String userId, Integer status) { //分页参数 if (page <= 0) { page = 1; @@ -32,7 +32,7 @@ public class DgApplyAmountListServiceImpl extends ServiceImpl positionVO = this.getBaseMapper().pageByCondition(new Page(page, size),customerNumberOrName,roleIdlist,userId); + IPage positionVO = this.getBaseMapper().pageByCondition(new Page(page, size),customerNumberOrName,roleIdlist,userId,status); return new PageUtils(positionVO); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java index b8d894bb..72796aad 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java @@ -298,7 +298,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl positionVO = applyAmountListMapper.pageByCondition(new Page(1, size), "", roleIdList, this.getUserId()); + IPage positionVO = applyAmountListMapper.pageByCondition(new Page(1, size), "", roleIdList, this.getUserId(),null); List records = positionVO.getRecords(); if (records != null && records.size() != 0) { records.forEach(businessApplicationListResponse -> { @@ -408,7 +408,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl list = workConferenceConsiderMapper.list(new Page(1, size), "", roleList, currentUser); + IPage list = workConferenceConsiderMapper.list(new Page(1, size), "", roleList, currentUser,null); List records = list.getRecords(); if (records != null && records.size() != 0) { records.forEach(dgWorkConferencePO -> { @@ -429,7 +429,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl list = loanCommitteeConsiderMapper.list(new Page(1, size), "", roleList, currentUser); + IPage list = loanCommitteeConsiderMapper.list(new Page(1, size), "", roleList, currentUser,null); List records = list.getRecords(); if (records != null && records.size() != 0) { records.forEach(dgLoanCommitteeConsiderResponse -> { diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java index c7e510a1..01ea4dfb 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java @@ -297,12 +297,22 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl0 || count1>0){//说明数据是C角或者贷审会驳回回来的 //AB角调查，修改审核意见以及状态 - DgGuaranteeAssignUser dgGuaranteeAssignUser2 = new DgGuaranteeAssignUser(); +/* DgGuaranteeAssignUser dgGuaranteeAssignUser2 = new DgGuaranteeAssignUser(); dgGuaranteeAssignUser2.setId(investigateGuaranteeRequest.getId());//主键id dgGuaranteeAssignUser2.setStatus(investigateGuaranteeRequest.getStatus());//状态为驳回(只有A,B角同时同意，状态才改为审核中) dgGuaranteeAssignUser2.setOperatingStatus(StatusCode.CZ_PROCESSED);//操作状态设置为已处理 dgGuaranteeAssignUser2.setApplyContent(investigateGuaranteeRequest.getApplyContent());//审核意见 - this.baseMapper.updateById(dgGuaranteeAssignUser2); + this.baseMapper.updateById(dgGuaranteeAssignUser2);*/ + + //插入或更新的字段有 空字符串 或者 null + this.baseMapper.update( + null, + Wrappers.lambdaUpdate() + .set(DgGuaranteeAssignUser::getApplyContent, investigateGuaranteeRequest.getApplyContent()) + .set(DgGuaranteeAssignUser::getOperatingStatus, StatusCode.CZ_PROCESSED) + .set(DgGuaranteeAssignUser::getStatus, investigateGuaranteeRequest.getStatus()) + .eq(DgGuaranteeAssignUser::getId, investigateGuaranteeRequest.getId()) + ); int i = this.baseMapper.selectCount(new QueryWrapper().eq("business_id", guaranteeAssignUser.getBusinessId()) .eq("type", 1).eq("status", StatusCode.SP_IN_REVIEW).eq("operating_status", StatusCode.CZ_PROCESSED)); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanCommitteeConsiderServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanCommitteeConsiderServiceImpl.java index 1e4efc7a..f2b1916c 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanCommitteeConsiderServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanCommitteeConsiderServiceImpl.java @@ -73,7 +73,7 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl list = this.getBaseMapper().list(new Page(page, size), - codeOrName, roleList, Integer.parseInt(userId)); + codeOrName, roleList, Integer.parseInt(userId),status); return new PageUtils(list); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgWorkConferenceConsiderServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgWorkConferenceConsiderServiceImpl.java index f1208e94..bbeb9ed1 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgWorkConferenceConsiderServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgWorkConferenceConsiderServiceImpl.java @@ -79,7 +79,7 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl list = this.getBaseMapper().list(new Page(page, size), codeOrName, roleList, Integer.parseInt(userId)); + IPage list = this.getBaseMapper().list(new Page(page, size), codeOrName, roleList, Integer.parseInt(userId),status); List dgWorkConferencePOS = list.getRecords(); List listResponse = new ArrayList<>(); if (dgWorkConferencePOS != null && dgWorkConferencePOS.size() != 0) { diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountListMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountListMapper.xml index f0602c7a..945b29c8 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountListMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountListMapper.xml @@ -36,6 +36,9 @@ AND (au.emp_id =#{userId} or au.emp_id is null or au.emp_id ='') + + AND au.status = #{status} + order by au.create_time desc diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml index c4c52ad5..2c608473 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml @@ -42,6 +42,9 @@ AND (a.business_code LIKE CONCAT('%',#{codeOrName},'%') OR c.name LIKE CONCAT('%',#{codeOrName},'%')) + + AND l.status = #{status} + ORDER BY a.create_time DESC diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgWorkConferenceConsiderMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgWorkConferenceConsiderMapper.xml index b64b300c..f0c2573b 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgWorkConferenceConsiderMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgWorkConferenceConsiderMapper.xml @@ -51,6 +51,9 @@ AND (a.business_code LIKE CONCAT('%',#{codeOrName},'%') OR c.name LIKE CONCAT('%',#{codeOrName},'%')) + + AND w.audit_status = #{status} + ORDER BY a.create_time DESC