From e5d49180fb27a3e7439c1b94bae68726449f9c0f Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Sun, 20 Dec 2020 17:12:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=92=E7=BB=9D=E7=8A=B6=E6=80=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DgAssetsInvestigationServiceImpl.java | 5 ++++ .../DgGuaranteeAssignUserServiceImpl.java | 30 +++++++++++++++++-- .../DgMessageInvestigationServiceImpl.java | 5 ++++ .../guarantee/DgGuaranteeAssignUserMapper.xml | 2 +- 4 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java index 06b2a305..af3362e5 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java @@ -350,6 +350,11 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl() .eq("business_id",assetsInvestigation.getBusinessId()).eq("type",3)); }else if(approvalAssetsRequest.getStatus().equals(StatusCode.SP_REFUSE)){//如果为拒绝，业务状态则为已否决 + DgAssetsInvestigation user = new DgAssetsInvestigation(); + user.setStatus(StatusCode.SP_REFUSE);//审批状态为拒绝 + this.baseMapper.update(user, new QueryWrapper() + .eq("business_id", assetsInvestigation.getBusinessId())); + DgBusinessProcessStatus processStatus = new DgBusinessProcessStatus(); processStatus.setBusinessId(assetsInvestigation.getBusinessId()); processStatus.setBusinessStatus(StatusCode.YW_REJECTED);//业务状态设置为已否决 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 de106d41..938c760b 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 @@ -240,10 +240,31 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl() + .eq("business_id",guaranteeAssignUser.getBusinessId())); + dgGuaranteeAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED);//已处理 + this.baseMapper.update(dgGuaranteeAssignUser,new QueryWrapper() + .eq("business_id",guaranteeAssignUser.getBusinessId()).eq("type",1)); + this.baseMapper.update(dgGuaranteeAssignUser,new QueryWrapper() + .eq("business_id",guaranteeAssignUser.getBusinessId()).eq("type",2)); + + //拒绝状态下，修改业务状态为已否决 + DgBusinessProcessStatus processStatus = new DgBusinessProcessStatus(); + processStatus.setBusinessStatus(3);//已否决 + dgBusinessProcessStatusMapper.update(processStatus,new QueryWrapper() + .eq("business_id",guaranteeAssignUser.getBusinessId())); + }else{ + dgGuaranteeAssignUser.setStatus(investigateGuaranteeRequest.getStatus());//审批状态 请求过来是什么状态就是什么 + dgGuaranteeAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED);//操作状态设置为已处理 + this.baseMapper.updateById(dgGuaranteeAssignUser); + } } } @@ -429,7 +450,12 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl() .eq("business_id", guaranteeUser.getBusinessId()).eq("type", 4)); - } else if (approvalGuaranteeRequest.getStatus().equals(StatusCode.SP_REFUSE)) {//如果为拒绝，业务状态则为已否决 + } else if (approvalGuaranteeRequest.getStatus().equals(StatusCode.SP_REFUSE)) {//如果为拒绝，业务状态则为已否决，设置子业务下所有审批状态为拒绝 + DgGuaranteeAssignUser user = new DgGuaranteeAssignUser(); + user.setStatus(StatusCode.SP_REFUSE);//审批状态为拒绝 + this.baseMapper.update(user, new QueryWrapper() + .eq("business_id", guaranteeUser.getBusinessId())); + DgBusinessProcessStatus processStatus = new DgBusinessProcessStatus(); processStatus.setBusinessId(guaranteeUser.getBusinessId()); processStatus.setBusinessStatus(StatusCode.YW_REJECTED);//业务状态设置为已否决 diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java index 53528e15..4c187832 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java @@ -323,6 +323,11 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl() .eq("business_id",messageInvestigation.getBusinessId()).eq("type",3 )); }else if(approvalMessageRequest.getStatus().equals(StatusCode.SP_REFUSE)){//如果为拒绝，业务状态则为已否决 + DgMessageInvestigation user = new DgMessageInvestigation(); + user.setStatus(StatusCode.SP_REFUSE);//审批状态为拒绝 + this.baseMapper.update(user, new QueryWrapper() + .eq("business_id", messageInvestigation.getBusinessId())); + DgBusinessProcessStatus processStatus = new DgBusinessProcessStatus(); processStatus.setBusinessId(messageInvestigation.getBusinessId()); processStatus.setBusinessStatus(StatusCode.YW_REJECTED);//业务状态设置为已否决 diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeAssignUserMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeAssignUserMapper.xml index a1d6ae34..d67df942 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeAssignUserMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeAssignUserMapper.xml @@ -33,7 +33,7 @@ #{id} - AND ai.business_code LIKE CONCAT('%',#{customerNumberOrName},'%') OR cc.name LIKE CONCAT('%',#{customerNumberOrName},'%') + AND (ai.business_code LIKE CONCAT('%',#{customerNumberOrName},'%') OR cc.name LIKE CONCAT('%',#{customerNumberOrName},'%')) AND au.status = #{status}