From 19332c82be7b46dc2fb29d259a3b622bfbe4b184 Mon Sep 17 00:00:00 2001
From: shijie <648688341@qq.com>
Date: Mon, 30 Nov 2020 18:02:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E6=83=85=E5=86=B5=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DgAssetsInvestigationServiceImpl.java     | 39 ++++++++++++++++---
 .../DgGuaranteeAssignUserServiceImpl.java     | 22 ++++++++---
 .../DgMessageInvestigationServiceImpl.java    | 22 +++++++++--
 3 files changed, 68 insertions(+), 15 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 6a188c30..62d1c8dd 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
@@ -189,6 +189,19 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
         //根据主键id查询业务id
         DgAssetsInvestigation dgAssetsInvestigation = this.getBaseMapper().selectById(investigateAssetsRequest.getId());
 
+        //如果为驳回情况，通过，则修改资产部调查下该业务审批状态为审核中，设置资产部经理操作状态为待处理
+        if(dgAssetsInvestigation.getStatus().equals(StatusCode.SP_REJECT) && investigateAssetsRequest.getStatus().equals(StatusCode.SP_IN_REVIEW)){
+            DgAssetsInvestigation assets = new DgAssetsInvestigation();
+            assets.setStatus(StatusCode.SP_IN_REVIEW);//审核中
+            this.baseMapper.update(assets,new QueryWrapper<DgAssetsInvestigation>()
+                    .eq("business_id",dgAssetsInvestigation.getBusinessId()));
+
+            DgAssetsInvestigation assetsInvestigation = new DgAssetsInvestigation();
+            assetsInvestigation.setOperatingStatus(StatusCode.CZ_ON_HAND);//待处理
+            this.baseMapper.update(assets,new QueryWrapper<DgAssetsInvestigation>()
+                    .eq("business_id",dgAssetsInvestigation.getBusinessId()).eq("type",2));
+        }
+
         //资产部调查员调查，修改审核意见以及状态，修改其他数据
         DgAssetsInvestigation assetsInvestigation = new DgAssetsInvestigation();
         assetsInvestigation.setId(investigateAssetsRequest.getId());//主键id
@@ -226,7 +239,7 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
         dgAssetsMoneyMapper.insert(money);
 
         //判断资产部调查员是否调查通过，如果通过，修改资产部经理操作状态为待处理
-        if(investigateAssetsRequest.getStatus()==1){//状态为审核中
+        if(investigateAssetsRequest.getStatus()==StatusCode.SP_IN_REVIEW){//状态为审核中
             DgAssetsInvestigation assetsInvestigation2= new DgAssetsInvestigation();
             assetsInvestigation2.setOperatingStatus(StatusCode.CZ_ON_HAND);
             this.baseMapper.update(assetsInvestigation2,new QueryWrapper<DgAssetsInvestigation>().
@@ -243,6 +256,23 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
     @Override
     public int approvalAssets(ApprovalAssetsRequest approvalAssetsRequest) {
 
+        //根据主键id查询资产部记录
+        DgAssetsInvestigation assetsInvestigation = this.baseMapper.selectById(approvalAssetsRequest.getId());
+
+        //此处为资产部经理审核的操作
+        //如果数据为驳回状态，审核通过，则处理资产部调查下该业务的审批状态为审核中，设置资产部领导的操作状态为待处理
+        if(assetsInvestigation.getStatus().equals(StatusCode.SP_REJECT) && approvalAssetsRequest.getStatus().equals(StatusCode.SP_IN_REVIEW) && assetsInvestigation.getType()==2){
+            DgAssetsInvestigation assets = new DgAssetsInvestigation();
+            assets.setStatus(StatusCode.SP_IN_REVIEW);//审核中
+            this.baseMapper.update(assets,new QueryWrapper<DgAssetsInvestigation>()
+                    .eq("business_id",assetsInvestigation.getBusinessId()));
+
+            DgAssetsInvestigation assets2 = new DgAssetsInvestigation();
+            assets2.setOperatingStatus(StatusCode.CZ_ON_HAND);//待处理
+            this.baseMapper.update(assets2,new QueryWrapper<DgAssetsInvestigation>()
+                    .eq("business_id",assetsInvestigation.getBusinessId()).eq("type",3));
+        }
+
         DgAssetsInvestigation dgAssetsInvestigation = new DgAssetsInvestigation();
         dgAssetsInvestigation.setId(approvalAssetsRequest.getId());
         dgAssetsInvestigation.setEmpId(Integer.parseInt(dgApplyAmountInfoController.getUserId()));
@@ -256,9 +286,6 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
         //根据主键id修改资产部记录
         this.baseMapper.updateById(dgAssetsInvestigation);
 
-        //根据主键id查询资产部记录
-        DgAssetsInvestigation assetsInvestigation = this.baseMapper.selectById(approvalAssetsRequest.getId());
-
         if(approvalAssetsRequest.getStatus().equals(StatusCode.SP_REFUSE)){//如果为拒绝，业务状态则为已否决
             DgBusinessProcessStatus processStatus = new DgBusinessProcessStatus();
             processStatus.setBusinessId(assetsInvestigation.getBusinessId());
@@ -293,7 +320,7 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
         }
 
         //如果资产部经理审核通过，则往担保部分管领导处加一条记录，由分管领导审核
-        if(approvalAssetsRequest.getStatus()==StatusCode.SP_IN_REVIEW && assetsInvestigation.getOperatingStatus()==StatusCode.CZ_PROCESSED && assetsInvestigation.getType()==2){//资产部经理审核通过
+        if(approvalAssetsRequest.getStatus()==StatusCode.SP_IN_REVIEW && dgAssetsInvestigation.getOperatingStatus()==StatusCode.CZ_PROCESSED && assetsInvestigation.getType()==2){//资产部经理审核通过
             //根据主键id查询业务id
             DgAssetsInvestigation assetsInvestigation2 = this.getBaseMapper().selectById(approvalAssetsRequest.getId());
 
@@ -314,7 +341,7 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
 
         //如果担保部分管领导审核通过，同时判断资产部分管领导审核以及信息部分管领导审核是否通过，如果通过就往合规调查中插入一条数据
         //待完善
-        if(approvalAssetsRequest.getStatus()==StatusCode.SP_REVIEWED && assetsInvestigation.getOperatingStatus()==StatusCode.CZ_PROCESSED && assetsInvestigation.getType()==3) {//资产部分管领导审核通过
+        if(approvalAssetsRequest.getStatus()==StatusCode.SP_REVIEWED && dgAssetsInvestigation.getOperatingStatus()==StatusCode.CZ_PROCESSED && assetsInvestigation.getType()==3) {//资产部分管领导审核通过
 
             //查看担保部分管领导是否审核通过
             int a=dgGuaranteeAssignUserMapper.selectCount(new QueryWrapper<DgGuaranteeAssignUser>()
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 d65c18bf..592f46b4 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
@@ -258,6 +258,21 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
     @Override
     public int approvalGuarantee(ApprovalGuaranteeRequest approvalGuaranteeRequest) {
 
+        //根据主键id查询担保部记录
+        DgGuaranteeAssignUser guaranteeUser = this.baseMapper.selectById(approvalGuaranteeRequest.getId());
+
+        //如果是处理驳回数据，如果审核通过，则将担保部调查业务下所有审批状态设置为审核中，担保领导这条记录操作状态设置为待处理
+        if(guaranteeUser.getStatus().equals(StatusCode.SP_REJECT) && approvalGuaranteeRequest.getStatus().equals(StatusCode.SP_IN_REVIEW) && guaranteeUser.getType()==3){
+            DgGuaranteeAssignUser assignUser = new DgGuaranteeAssignUser();
+            assignUser.setStatus(StatusCode.SP_IN_REVIEW);//审核中
+            this.baseMapper.update(assignUser,new QueryWrapper<DgGuaranteeAssignUser>().eq("business_id",guaranteeUser.getBusinessId()));
+
+            DgGuaranteeAssignUser user = new DgGuaranteeAssignUser();
+            user.setOperatingStatus(StatusCode.CZ_ON_HAND);//操作状态为待处理
+            this.baseMapper.update(assignUser,new QueryWrapper<DgGuaranteeAssignUser>()
+                    .eq("business_id",guaranteeUser.getBusinessId()).eq("type",4));
+        }
+
         DgGuaranteeAssignUser dgGuaranteeAssignUser = new DgGuaranteeAssignUser();
         dgGuaranteeAssignUser.setId(approvalGuaranteeRequest.getId());
         dgGuaranteeAssignUser.setEmpId(Integer.parseInt(dgApplyAmountInfoController.getUserId()));
@@ -271,9 +286,6 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
         //根据主键id修改担保部记录
         this.baseMapper.updateById(dgGuaranteeAssignUser);
 
-        //根据主键id查询担保部记录
-        DgGuaranteeAssignUser guaranteeUser = this.baseMapper.selectById(approvalGuaranteeRequest.getId());
-
         if(approvalGuaranteeRequest.getStatus().equals(StatusCode.SP_REFUSE)){//如果为拒绝，业务状态则为已否决
             DgBusinessProcessStatus processStatus = new DgBusinessProcessStatus();
             processStatus.setBusinessId(guaranteeUser.getBusinessId());
@@ -309,7 +321,7 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
                     .eq("business_id",guaranteeUser.getBusinessId()).eq("type",3));
         }
         //如果担保部经理审核通过，则往担保部分管领导处加一条记录，由分管领导审核
-        if(approvalGuaranteeRequest.getStatus()==StatusCode.SP_IN_REVIEW && guaranteeUser.getOperatingStatus()==StatusCode.CZ_PROCESSED && guaranteeUser.getType()==3){//担保部经理审核通过
+        if(approvalGuaranteeRequest.getStatus()==StatusCode.SP_IN_REVIEW && dgGuaranteeAssignUser.getOperatingStatus()==StatusCode.CZ_PROCESSED && guaranteeUser.getType()==3){//担保部经理审核通过
             //根据主键id查询业务id
             DgGuaranteeAssignUser guaranteeAssignUser = this.getBaseMapper().selectById(approvalGuaranteeRequest.getId());
 
@@ -330,7 +342,7 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
 
         //如果担保部分管领导审核通过，同时判断资产部分管领导审核以及信息部分管领导审核是否通过，如果通过就往合规调查中插入一条数据
         //待完善
-        if(approvalGuaranteeRequest.getStatus()==StatusCode.SP_REVIEWED && guaranteeUser.getOperatingStatus()==StatusCode.CZ_PROCESSED && guaranteeUser.getType()==4) {//担保部领导审核通过
+        if(approvalGuaranteeRequest.getStatus()==StatusCode.SP_REVIEWED && dgGuaranteeAssignUser.getOperatingStatus()==StatusCode.CZ_PROCESSED && guaranteeUser.getType()==4) {//担保部领导审核通过
             //查看信息部分管领导是否审核通过
             int a=dgMessageInvestigationMapper.selectCount(new QueryWrapper<DgMessageInvestigation>()
                     .eq("business_id",guaranteeUser.getBusinessId())
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 34086b33..2a27e974 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
@@ -244,6 +244,22 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
     @Override
     public int approvalMessage(ApprovalMessageRequest approvalMessageRequest) {
 
+        //根据主键id查询信息部记录
+        DgMessageInvestigation messageInvestigation = this.baseMapper.selectById(approvalMessageRequest.getId());
+
+        //如果数据为驳回状态，审核通过，则处理信息部调查下该业务的审批状态为审核中，设置信息部领导的操作状态为待处理
+        if(messageInvestigation.getStatus().equals(StatusCode.SP_REJECT) && approvalMessageRequest.getStatus().equals(StatusCode.SP_IN_REVIEW) && messageInvestigation.getType()==2){
+            DgMessageInvestigation message = new DgMessageInvestigation();
+            message.setStatus(StatusCode.SP_IN_REVIEW);//审核中
+            this.baseMapper.update(message,new QueryWrapper<DgMessageInvestigation>()
+                    .eq("business_id",messageInvestigation.getBusinessId()));
+
+            DgMessageInvestigation message2 = new DgMessageInvestigation();
+            message2.setOperatingStatus(StatusCode.CZ_ON_HAND);//待处理
+            this.baseMapper.update(message,new QueryWrapper<DgMessageInvestigation>()
+                    .eq("business_id",messageInvestigation.getBusinessId()).eq("type",3));
+        }
+
         DgMessageInvestigation dgMessageInvestigation = new DgMessageInvestigation();
         dgMessageInvestigation.setId(approvalMessageRequest.getId());
         dgMessageInvestigation.setEmpId(Integer.parseInt(dgApplyAmountInfoController.getUserId()));
@@ -253,8 +269,6 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
         //根据主键id修改信息部记录
         this.baseMapper.updateById(dgMessageInvestigation);
 
-        //根据主键id查询信息部记录
-        DgMessageInvestigation messageInvestigation = this.baseMapper.selectById(approvalMessageRequest.getId());
 
         if(approvalMessageRequest.getStatus().equals(StatusCode.SP_REFUSE)){//如果为拒绝，业务状态则为已否决
             DgBusinessProcessStatus processStatus = new DgBusinessProcessStatus();
@@ -290,7 +304,7 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
         }
 
         //如果信息部经理审核通过，则往信息部分管领导处加一条记录，由分管领导审核
-        if(approvalMessageRequest.getStatus()==StatusCode.SP_IN_REVIEW && messageInvestigation.getOperatingStatus()==StatusCode.CZ_PROCESSED && messageInvestigation.getType()==2){//信息部经理审核通过
+        if(approvalMessageRequest.getStatus()==StatusCode.SP_IN_REVIEW && dgMessageInvestigation.getOperatingStatus()==StatusCode.CZ_PROCESSED && messageInvestigation.getType()==2){//信息部经理审核通过
             //根据主键id查询业务id
             DgMessageInvestigation messageInvestigation2 = this.getBaseMapper().selectById(approvalMessageRequest.getId());
 
@@ -311,7 +325,7 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
 
         //如果担保部分管领导审核通过，同时判断资产部分管领导审核以及信息部分管领导审核是否通过，如果通过就往合规调查中插入一条数据
         //待完善
-        if(approvalMessageRequest.getStatus()==StatusCode.SP_REVIEWED && messageInvestigation.getOperatingStatus()==StatusCode.CZ_PROCESSED && messageInvestigation.getType()==3) {//信息部领导审核通过
+        if(approvalMessageRequest.getStatus()==StatusCode.SP_REVIEWED && dgMessageInvestigation.getOperatingStatus()==StatusCode.CZ_PROCESSED && messageInvestigation.getType()==3) {//信息部领导审核通过
             //查看担保部分管领导是否审核通过
             int a=dgGuaranteeAssignUserMapper.selectCount(new QueryWrapper<DgGuaranteeAssignUser>()
                     .eq("business_id",messageInvestigation.getBusinessId())