From 57969d86609f247e1d7bf7c60cef1cf0a1c1304d Mon Sep 17 00:00:00 2001
From: shijie <648688341@qq.com>
Date: Fri, 26 Mar 2021 11:41:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=85=E4=BF=9D=E7=B3=BB=E7=BB=9F=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=AD=89=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DgApplyAmountInfoServiceImpl.java        | 4 ++--
 .../service/impl/DgAssetsInvestigationServiceImpl.java    | 8 +++++++-
 .../service/impl/DgGuaranteeAssignUserServiceImpl.java    | 6 ++++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java
index 16dcb7c2..6df68875 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java
@@ -637,11 +637,11 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
                             .eq("business_id",dgApplyAmountList1.getBusinessId()).eq("type",1));
                     dgGuaranteeAssignUserMapper.update(user,new QueryWrapper<DgGuaranteeAssignUser>()
                             .eq("business_id",dgApplyAmountList1.getBusinessId()).eq("type",2));
-                    //担保部经理处，驳回状态改为审核中
+                    //担保部经理处，驳回状态改为审核中（现改为所有该业务下状态均改为审核中）
                     DgGuaranteeAssignUser user2 = new DgGuaranteeAssignUser();
                     user2.setStatus(StatusCode.SP_IN_REVIEW);
                     dgGuaranteeAssignUserMapper.update(user2,new QueryWrapper<DgGuaranteeAssignUser>()
-                            .eq("business_id",dgApplyAmountList1.getBusinessId()).eq("type",3));
+                            .eq("business_id",dgApplyAmountList1.getBusinessId()));//.eq("type",3)
                 }
             }
         }else if(dgApplyAmountList.getStatus().equals(StatusCode.SP_REVIEWED) && dgApplyAmountList.getOperatingStatus().equals(StatusCode.CZ_PROCESSED)){
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 da081e46..a0af3ee4 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
@@ -375,7 +375,7 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
                         .set(DgAssetsInvestigation::getEmpId, Integer.parseInt(dgApplyAmountInfoController.getUserId()))
                         .set(DgAssetsInvestigation::getRemark, ArraysUtil.toString(approvalAssetsRequest.getRemark()))
                         .set(DgAssetsInvestigation::getOtherRemark, approvalAssetsRequest.getOtherRemark())
-                        .set(DgAssetsInvestigation::getStatus, approvalAssetsRequest.getStatus())
+                        .set(DgAssetsInvestigation::getStatus, dgAssetsInvestigation.getStatus())//approvalAssetsRequest.getStatus()
                         .set(DgAssetsInvestigation::getOperatingStatus, StatusCode.CZ_PROCESSED)
                         .set(DgAssetsInvestigation::getAmount, approvalAssetsRequest.getAmount())
                         .set(DgAssetsInvestigation::getTerm, approvalAssetsRequest.getTerm())
@@ -436,6 +436,12 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
             Integer count = this.baseMapper.selectCount(new QueryWrapper<DgAssetsInvestigation>()
                     .eq("business_id", assetsInvestigation2.getBusinessId()).eq("type", 3));
 
+            DgAssetsInvestigation assign = new DgAssetsInvestigation();
+            assign.setStatus(StatusCode.SP_IN_REVIEW);//审批状态为审核中
+            //修改该业务下所有审批状态为审核中
+            this.baseMapper.update(assign,new QueryWrapper<DgAssetsInvestigation>()
+                    .eq("business_id",assetsInvestigation2.getBusinessId()));
+
             if(count>0){//资产领导有数据，则直接修改领导状态
                 DgAssetsInvestigation assignUser = new DgAssetsInvestigation();
                 assignUser.setStatus(StatusCode.SP_IN_REVIEW);//审批状态为审核中
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 011f1ebd..ad0b310e 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
@@ -633,6 +633,12 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
             Integer count = this.baseMapper.selectCount(new QueryWrapper<DgGuaranteeAssignUser>()
                     .eq("business_id", guaranteeAssignUser.getBusinessId()).eq("type", 4));
 
+            DgGuaranteeAssignUser assign = new DgGuaranteeAssignUser();
+            assign.setStatus(StatusCode.SP_IN_REVIEW);//审批状态为审核中
+            //修改该业务下所有审批状态为审核中
+            this.baseMapper.update(assign,new QueryWrapper<DgGuaranteeAssignUser>()
+                    .eq("business_id",guaranteeAssignUser.getBusinessId()));
+
             if(count>0){//担保领导有数据，则直接修改领导状态
                 DgGuaranteeAssignUser assignUser = new DgGuaranteeAssignUser();
                 assignUser.setStatus(StatusCode.SP_IN_REVIEW);//审批状态为审核中