From 920c19091e92a145d198f706eeb2293f0efa47c6 Mon Sep 17 00:00:00 2001
From: river <1376754470@qq.com>
Date: Thu, 10 Dec 2020 09:40:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DgComplianceInvestigationServiceImpl.java | 32 ++++++-----
 .../DgLoanCommitteeConsiderServiceImpl.java   | 55 +++++++++++--------
 .../DgWorkConferenceConsiderServiceImpl.java  | 40 ++++++++------
 3 files changed, 72 insertions(+), 55 deletions(-)

diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java
index 1cf02614..a6b79835 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java
@@ -410,20 +410,24 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
                 if (opinion == null || opinion.length() == 0) {
                     ExceptionCast.cast(GuaranteeCode.COMPLIANCE_INVESTIGATION_REMARK_NOT_NULL);
                 }
-                // 先改变所有的审核状态为驳回
-                Boolean result = this.getBaseMapper().updateAuditStatusByBusinessId(this.getComplianceInvestigation(iid).getBusinessId(),
-                        StatusCode.SP_REJECT);
-                if (result) {
-                    // 再改变自己当前的操作状态为已处理
-                    Boolean result1 = this.getBaseMapper().updateOperationStatusById(iid, StatusCode.CZ_PROCESSED, opinion);
-                    if (result1) {
-                        // 最后改变法规部经理的这条数据的操作状态为待处理
-                        Boolean result2 = this.getBaseMapper().updateToAudit(this.getComplianceInvestigation(iid).getBusinessId(),
-                                StatusCode.CZ_ON_HAND, PromptSuccess.FG_LD_ID);
-                        if (result2) {
-                            // 在业务流程表中插入一条法规领导驳回的数据
-                            return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
-                                    PromptSuccess.FG_LD_NAME, opinion, PromptSuccess.HG_PROCESS_ID);
+                // 绑定该条数据的userId,表示该用户操作了该条数据
+                Boolean result3 = this.getBaseMapper().updateDgComplianceInvestigationUserIdById(iid, Integer.parseInt(userId));
+                if (result3) {
+                    // 先改变所有的审核状态为驳回
+                    Boolean result = this.getBaseMapper().updateAuditStatusByBusinessId(this.getComplianceInvestigation(iid).getBusinessId(),
+                            StatusCode.SP_REJECT);
+                    if (result) {
+                        // 再改变自己当前的操作状态为已处理
+                        Boolean result1 = this.getBaseMapper().updateOperationStatusById(iid, StatusCode.CZ_PROCESSED, opinion);
+                        if (result1) {
+                            // 最后改变法规部经理的这条数据的操作状态为待处理
+                            Boolean result2 = this.getBaseMapper().updateToAudit(this.getComplianceInvestigation(iid).getBusinessId(),
+                                    StatusCode.CZ_ON_HAND, PromptSuccess.FG_LD_ID);
+                            if (result2) {
+                                // 在业务流程表中插入一条法规领导驳回的数据
+                                return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
+                                        PromptSuccess.FG_LD_NAME, opinion, PromptSuccess.HG_PROCESS_ID);
+                            }
                         }
                     }
                 }
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 c2c20ca7..ca3da3bf 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
@@ -136,7 +136,7 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl<DgLoanCommit
                         DgGuaranteeLetterAssignUser guaranteeLetterAssignUser = new DgGuaranteeLetterAssignUser();
                         guaranteeLetterAssignUser.setBusinessId(this.getBaseMapper().getDgLoanCommitteeConsider(dgLoanCommitteeConsiderRequest.getId())
                                 .getBusinessId());
-                        guaranteeLetterAssignUser.setUserId(this.getBaseMapper().getDgLoanCommitteeConsider(dgLoanCommitteeConsiderRequest.getId())
+                        guaranteeLetterAssignUser.setCompanyId(this.getBaseMapper().getDgLoanCommitteeConsider(dgLoanCommitteeConsiderRequest.getId())
                                 .getCompanyId());
                         System.out.println(guaranteeLetterAssignUser);
                         result1 = guaranteeLetterAssignUserService.saveGuaranteeLetter(guaranteeLetterAssignUser);
@@ -189,29 +189,34 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl<DgLoanCommit
                     || dgLoanCommitteeConsiderRequest.getRefuseOpinion().length() == 0) {
                 ExceptionCast.cast(GuaranteeCode.COMPLIANCE_INVESTIGATION_REMARK_NOT_NULL);
             }
-            // 先改变贷审会的审核状态为驳回
-            Boolean result = this.getBaseMapper().updateAuditStatusByBusinessId(
-                    this.getBaseMapper().getDgLoanCommitteeConsider(dgLoanCommitteeConsiderRequest.getId()).getBusinessId(),
-                    StatusCode.SP_REJECT);
-            if (result) {
-                // 再改变自己的操作状态为已处理
-                Boolean result1 = this.getBaseMapper().updateOperationStatusById(dgLoanCommitteeConsiderRequest.getId(),
-                        StatusCode.CZ_PROCESSED, dgLoanCommitteeConsiderRequest.getRefuseOpinion());
-                if (result1) {
-                    // 改变担保部的审核状态为驳回
-                    Boolean result2 = dgGuaranteeAssignUserMapper.updateAuditStatusByBusinessId(
-                            this.getBaseMapper().getDgLoanCommitteeConsider(dgLoanCommitteeConsiderRequest.getId()).getBusinessId(),
-                            StatusCode.SP_REJECT);
-                    if (result2) {
-                        // 修改AB角的操作状态为待处理
-                        Boolean result3 = dgGuaranteeAssignUserMapper.updateOperationStatusById(
+            // 绑定该条数据的userId,表示该用户操作了该条数据
+            Boolean result4 = this.getBaseMapper().updateLoanCommitteeConsiderUserIdById(dgLoanCommitteeConsiderRequest.getId(),
+                    Integer.parseInt(userId));
+            if (result4) {
+                // 先改变贷审会的审核状态为驳回
+                Boolean result = this.getBaseMapper().updateAuditStatusByBusinessId(
+                        this.getBaseMapper().getDgLoanCommitteeConsider(dgLoanCommitteeConsiderRequest.getId()).getBusinessId(),
+                        StatusCode.SP_REJECT);
+                if (result) {
+                    // 再改变自己的操作状态为已处理
+                    Boolean result1 = this.getBaseMapper().updateOperationStatusById(dgLoanCommitteeConsiderRequest.getId(),
+                            StatusCode.CZ_PROCESSED, dgLoanCommitteeConsiderRequest.getRefuseOpinion());
+                    if (result1) {
+                        // 改变担保部的审核状态为驳回
+                        Boolean result2 = dgGuaranteeAssignUserMapper.updateAuditStatusByBusinessId(
                                 this.getBaseMapper().getDgLoanCommitteeConsider(dgLoanCommitteeConsiderRequest.getId()).getBusinessId(),
-                                StatusCode.CZ_ON_HAND);
-                        if (result3) {
-                            // 在业务流程表中插入一条驳回成功的数据(记得带上驳回的意见)
-                            return AuditProcessUtil.save(this.getBaseMapper().getDgLoanCommitteeConsider(
-                                    dgLoanCommitteeConsiderRequest.getId()).getBusinessId(), DgApplyAmountInfoController.getAccount(),
-                                    PromptSuccess.DSH_NAME, dgLoanCommitteeConsiderRequest.getRefuseOpinion(), PromptSuccess.DSH_PROCESS_ID);
+                                StatusCode.SP_REJECT);
+                        if (result2) {
+                            // 修改AB角的操作状态为待处理
+                            Boolean result3 = dgGuaranteeAssignUserMapper.updateOperationStatusById(
+                                    this.getBaseMapper().getDgLoanCommitteeConsider(dgLoanCommitteeConsiderRequest.getId()).getBusinessId(),
+                                    StatusCode.CZ_ON_HAND);
+                            if (result3) {
+                                // 在业务流程表中插入一条驳回成功的数据(记得带上驳回的意见)
+                                return AuditProcessUtil.save(this.getBaseMapper().getDgLoanCommitteeConsider(
+                                        dgLoanCommitteeConsiderRequest.getId()).getBusinessId(), DgApplyAmountInfoController.getAccount(),
+                                        PromptSuccess.DSH_NAME, dgLoanCommitteeConsiderRequest.getRefuseOpinion(), PromptSuccess.DSH_PROCESS_ID);
+                            }
                         }
                     }
                 }
@@ -260,6 +265,10 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl<DgLoanCommit
             if (dgLoanCommitteeConsider.getDisagreePerson() != null && dgLoanCommitteeConsider.getDisagreePerson().length() != 0) {
                 dgLoanCommitteeConsiderInfoResponse.setDisagreePersons(dgLoanCommitteeConsider.getDisagreePerson().split(","));
             }
+            // 贷审会通过时间
+            if (dgLoanCommitteeConsider.getPassingTime() != null) {
+                dgLoanCommitteeConsiderInfoResponse.setTime(dgLoanCommitteeConsider.getPassingTime());
+            }
             BeanUtils.copyProperties(dgLoanCommitteeConsider, dgLoanCommitteeConsiderInfoResponse);
         }
         return dgLoanCommitteeConsiderInfoResponse;
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 ac4051de..eddaea30 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
@@ -189,24 +189,28 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
             if (opinion == null || opinion.length() == 0) {
                 ExceptionCast.cast(GuaranteeCode.COMPLIANCE_INVESTIGATION_REMARK_NOT_NULL);
             }
-            // 先修改工作会的审核状态为驳回
-            Boolean result = this.getBaseMapper().updateAuditStatusByBusinessId(this.getBaseMapper()
-                    .getWorkConferenceConsider(id).getBusinessId(), StatusCode.SP_REJECT);
-            if (result) {
-                // 再修改自己的状态为已处理
-                Boolean result1 = this.getBaseMapper().updateOperationStatusById(id, StatusCode.CZ_PROCESSED, opinion);
-                if (result1) {
-                    // 修改合规调查的审核状态为驳回
-                    Boolean result2 = dgComplianceInvestigationMapper.updateAuditStatusByBusinessId(this.getBaseMapper()
-                            .getWorkConferenceConsider(id).getBusinessId(), StatusCode.SP_REJECT);
-                    if (result2) {
-                        // 修改法规领导的操作状态为待处理
-                        Boolean result3 = dgComplianceInvestigationMapper.updateToAudit(this.getBaseMapper()
-                                .getWorkConferenceConsider(id).getBusinessId(), StatusCode.CZ_ON_HAND, PromptSuccess.FG_LD_ID);
-                        if (result3) {
-                            // 在业务流程表中插入一条工作会驳回的数据
-                            return AuditProcessUtil.save(this.getBaseMapper().getWorkConferenceConsider(id).getBusinessId(), DgApplyAmountInfoController.getAccount(),
-                                    PromptSuccess.GZU_NAME, opinion, PromptSuccess.GZU_PROCESS_ID);
+            // 绑定该条数据的userId,表示该用户操作了该条数据
+            Boolean result4 = this.getBaseMapper().updateWorkConferenceUserIdById(id, Integer.parseInt(userId));
+            if (result4) {
+                // 先修改工作会的审核状态为驳回
+                Boolean result = this.getBaseMapper().updateAuditStatusByBusinessId(this.getBaseMapper()
+                        .getWorkConferenceConsider(id).getBusinessId(), StatusCode.SP_REJECT);
+                if (result) {
+                    // 再修改自己的状态为已处理
+                    Boolean result1 = this.getBaseMapper().updateOperationStatusById(id, StatusCode.CZ_PROCESSED, opinion);
+                    if (result1) {
+                        // 修改合规调查的审核状态为驳回
+                        Boolean result2 = dgComplianceInvestigationMapper.updateAuditStatusByBusinessId(this.getBaseMapper()
+                                .getWorkConferenceConsider(id).getBusinessId(), StatusCode.SP_REJECT);
+                        if (result2) {
+                            // 修改法规领导的操作状态为待处理
+                            Boolean result3 = dgComplianceInvestigationMapper.updateToAudit(this.getBaseMapper()
+                                    .getWorkConferenceConsider(id).getBusinessId(), StatusCode.CZ_ON_HAND, PromptSuccess.FG_LD_ID);
+                            if (result3) {
+                                // 在业务流程表中插入一条工作会驳回的数据
+                                return AuditProcessUtil.save(this.getBaseMapper().getWorkConferenceConsider(id).getBusinessId(), DgApplyAmountInfoController.getAccount(),
+                                        PromptSuccess.GZU_NAME, opinion, PromptSuccess.GZU_PROCESS_ID);
+                            }
                         }
                     }
                 }