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

---
 .../DgComplianceInvestigationServiceImpl.java | 28 ++++++++++---------
 .../DgWorkConferenceConsiderServiceImpl.java  |  2 +-
 .../DgLoanCommitteeConsiderMapper.xml         |  2 +-
 3 files changed, 17 insertions(+), 15 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 a6b79835..2cd9fe92 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
@@ -284,10 +284,11 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
                 // 1.2.若最新操作人为C角或法规部领导,表示C角调查通过后发送过来的数据或者法规部领导驳回的数据
                 // 同意
                 if (status == 1) {
+                    Integer auditStatus = this.getBaseMapper().getAuditStatusByBusinessId(this.getComplianceInvestigation(iid).getBusinessId(),
+                            PromptSuccess.FG_JL_ID);
                     Boolean result = this.getBaseMapper().check(iid, opinion, new Date(),
                             StatusCode.SP_IN_REVIEW, StatusCode.CZ_PROCESSED, Integer.parseInt(userId));
                     if (result) {
-                        Integer auditStatus = this.getBaseMapper().getAuditStatusByBusinessId(this.getComplianceInvestigation(iid).getBusinessId(), PromptSuccess.FG_JL_ID);
                         Boolean result1;
                         if (StatusCode.SP_REJECT.equals(auditStatus)) {
                             // 表示为法规部领导驳回的数据,先更新审批状态为审核中
@@ -422,7 +423,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
                         if (result1) {
                             // 最后改变法规部经理的这条数据的操作状态为待处理
                             Boolean result2 = this.getBaseMapper().updateToAudit(this.getComplianceInvestigation(iid).getBusinessId(),
-                                    StatusCode.CZ_ON_HAND, PromptSuccess.FG_LD_ID);
+                                    StatusCode.CZ_ON_HAND, PromptSuccess.FG_JL_ID);
                             if (result2) {
                                 // 在业务流程表中插入一条法规领导驳回的数据
                                 return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
@@ -470,16 +471,21 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
     public DgComplianceInvestigationInfoResponse query(Integer iid) {
         DgComplianceInvestigationInfoResponse dgComplianceInvestigationInfoResponse = new DgComplianceInvestigationInfoResponse();
         // 担保领导的数据id
-        Integer guaranteeId = this.getBaseMapper().getGuaranteeId(this.getComplianceInvestigation(iid).getBusinessId(),
-                PromptSuccess.DB_LD_ID);
+        Integer guaranteeId = this.getBaseMapper().getGuaranteeId(this.getComplianceInvestigation(iid).getBusinessId(), PromptSuccess.DB_LD_ID);
+        if (guaranteeId != null) {
+            // 担保详情
+            GuaranteeDetailResponse guaranteeDetailResponse = guaranteeAssignUserService.guaranteeDetail(guaranteeId);
+            dgComplianceInvestigationInfoResponse.setGuaranteeDetailResponse(guaranteeDetailResponse);
+        }
         // 资产领导的数据id
         Integer dgAssetsInvestigationId = this.getBaseMapper().getDgAssetsInvestigationId(this.getComplianceInvestigation(iid).getBusinessId(),
                 PromptSuccess.ZC_LD_ID);
-        // 担保详情
-        GuaranteeDetailResponse guaranteeDetailResponse = guaranteeAssignUserService.guaranteeDetail(guaranteeId);
-        // 资产详情
-        AssetsDetailResponse assetsDetailResponse = dgAssetsInvestigationService.assetsDetail(dgAssetsInvestigationId);
-        // 合规附件和意见
+        if (dgAssetsInvestigationId != null) {
+            // 资产详情
+            AssetsDetailResponse assetsDetailResponse = dgAssetsInvestigationService.assetsDetail(dgAssetsInvestigationId);
+            dgComplianceInvestigationInfoResponse.setAssetsResponse(assetsDetailResponse.getAssetsResponse());
+        }
+        // 合规调查附件和意见
         DgComplianceInvestigation dgComplianceInvestigation = this.getBaseMapper().queryDgComplianceInvestigation(iid);
         if (dgComplianceInvestigation != null) {
             if (dgComplianceInvestigation.getFileUrl() != null && dgComplianceInvestigation.getFileUrl().length() != 0) {
@@ -490,10 +496,6 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
                 dgComplianceInvestigationInfoResponse.setOpinion(dgComplianceInvestigation.getOpinion());
             }
         }
-        // 统一返回
-        dgComplianceInvestigationInfoResponse.setGuaranteeDetailResponse(guaranteeDetailResponse);
-        dgComplianceInvestigationInfoResponse.setAssetsResponse(assetsDetailResponse.getAssetsResponse());
-
         return dgComplianceInvestigationInfoResponse;
     }
 
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 eddaea30..69193331 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
@@ -270,7 +270,7 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
     }
 
     /**
-     * 查询AB角、资产部调查、信息部调查、法规部调查的审核意见、审核人姓名及时间
+     * 查询业务申请详情、AB角、资产部调查、信息部调查、法规部调查的审核意见、审核人姓名及时间
      */
     @Override
     public AuditOpinionResponse getAuditOpinion(Integer businessId) {
diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml
index 187ad266..b2f3e12d 100644
--- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml
+++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml
@@ -139,7 +139,7 @@
 
     <!-- 根据id绑定用户id -->
     <update id="updateLoanCommitteeConsiderUserIdById">
-        UPDATE dg_loan_committee_consider SET user_id = #{userId} WHERE id = #{id}
+        UPDATE dg_loan_committee_consider SET consider_id = #{userId} WHERE id = #{id}
     </update>
 
 </mapper>