From e4035189d8cb0d0c9f38f5466702e8e198e1558d Mon Sep 17 00:00:00 2001
From: chen <1251790704@qq.com>
Date: Wed, 13 Jan 2021 10:12:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=B7=A5=E5=85=B7=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DgGuaranteeAssignUserServiceImpl.java       | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

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 8453ea63..109cde3a 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
@@ -541,7 +541,9 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
         if(!investigateGuaranteeRequest.getStatus().equals(StatusCode.SP_DRAFT)){
             String account = dgApplyAmountInfoController.getAccount();
             String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(this.getUserId()));
-            AuditProcessUtil.save(Integer.parseInt(this.getUserId()),guaranteeAssignUser.getBusinessId(), account, departmentId, investigateGuaranteeRequest.getApplyContent(), 2,roleId,"","","");
+            AuditProcessUtil.save(Integer.parseInt(this.getUserId()),guaranteeAssignUser.getBusinessId(),
+                    account, departmentId, investigateGuaranteeRequest.getApplyContent(), 2,roleId,
+                    "","","",investigateGuaranteeRequest.getStatus());
         }
         return 1;
     }
@@ -636,7 +638,7 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
                 assignUser.setOperatingStatus(StatusCode.CZ_ON_HAND);//操作状态设置为待处理
                 this.baseMapper.insert(assignUser);
             }
-        } else if (approvalGuaranteeRequest.getStatus() == StatusCode.SP_REVIEWED && dgGuaranteeAssignUser.getOperatingStatus() == StatusCode.CZ_PROCESSED && guaranteeUser.getType() == 4) {//担保部领导审核通过
+        } else if (approvalGuaranteeRequest.getStatus().equals(StatusCode.SP_REVIEWED) && dgGuaranteeAssignUser.getOperatingStatus() == StatusCode.CZ_PROCESSED && guaranteeUser.getType() == 4) {//担保部领导审核通过
             //如果担保部分管领导审核通过，同时判断资产部分管领导审核以及信息部分管领导审核是否通过，如果通过就往合规调查中插入一条数据
             //如果信息部领导审核通过，则该子业务流程下的所有审批状态都为已审核状态
             DgGuaranteeAssignUser user = new DgGuaranteeAssignUser();
@@ -689,7 +691,8 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
         //同时往审核流程进程表新增一条记录
         String account = dgApplyAmountInfoController.getAccount();
         String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(this.getUserId()));
-        AuditProcessUtil.save(Integer.parseInt(this.getUserId()),guaranteeUser.getBusinessId(), account, departmentId, approvalGuaranteeRequest.getApplyContent(), 2,roleId,reason,loanMoney,loanTerm);
+        AuditProcessUtil.save(Integer.parseInt(this.getUserId()),guaranteeUser.getBusinessId(),
+                account, departmentId, approvalGuaranteeRequest.getApplyContent(), 2,roleId,reason,loanMoney,loanTerm,approvalGuaranteeRequest.getStatus());
 
         return 1;
     }
@@ -799,7 +802,8 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
         //同时往审核流程进程表新增一条记录
         String account = dgApplyAmountInfoController.getAccount();
         String departmentId = OrdinaryUtil.getDepartmentId(Integer.parseInt(this.getUserId()));
-        AuditProcessUtil.save(Integer.parseInt(this.getUserId()),guaranteeRequest.getBusinessId(), account, departmentId, "", 2,PromptSuccess.DB_JL_ID,"","","");
+        AuditProcessUtil.save(Integer.parseInt(this.getUserId()),guaranteeRequest.getBusinessId(),
+                account, departmentId, "", 2,PromptSuccess.DB_JL_ID,"","","",StatusCode.SP_REVIEWED);
 
         return ResponseResult.SUCCESS();
     }