From c36d585fa0b8c5c23f93c7a0c827ce9286132f39 Mon Sep 17 00:00:00 2001
From: chen <1251790704@qq.com>
Date: Fri, 4 Dec 2020 09:40:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../guarantee/controller/DgLoanNoticeController.java        | 1 +
 .../impl/DgGuaranteeLetterAssignUserServiceImpl.java        | 6 ++++--
 .../impl/DgPaymentConfirmationConsiderServiceImpl.java      | 6 ++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java
index f156cf7b..e19ac6b6 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java
@@ -89,6 +89,7 @@ public class DgLoanNoticeController {
                     put("bankName", bank);
                     put("clientName", name);
                     put("loanMoney", money);
+                    put("money", loanMoney);
                 }});
         try {
             httpServletResponse.setContentType("application/msword");
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java
index 88ed8d0e..45364e2f 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java
@@ -360,6 +360,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                         //审批状态为已驳回，操作状态为待处理
                         dgGuaranteeLetterAssignUserA.setStatus(StatusCode.SP_REJECT);
                         dgGuaranteeLetterAssignUserA.setOperatingStatus(StatusCode.CZ_ON_HAND);
+                        dgGuaranteeLetterAssignUserA.setAuditOpinion("");
                         //更新a角操作业务数据
                         baseMapper.updateById(dgGuaranteeLetterAssignUserA);
 
@@ -370,6 +371,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                         //审批状态为已驳回，操作状态为待处理
                         dgGuaranteeLetterAssignUserB.setStatus(StatusCode.SP_REJECT);
                         dgGuaranteeLetterAssignUserB.setOperatingStatus(StatusCode.CZ_ON_HAND);
+                        dgGuaranteeLetterAssignUserB.setAuditOpinion("");
                         //更新b用户操作业务数据
                         int update = baseMapper.updateById(dgGuaranteeLetterAssignUserB);
                         //更新成功，返回操作结果
@@ -458,7 +460,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                             //清空审批意见
                             letterAssignUserZCJL.setAuditOpinion("");
                             letterAssignUserZCJL.setStatus(StatusCode.SP_IN_REVIEW);
-                            letterAssignUserZCJL.setStatus(StatusCode.CZ_ON_HAND);
+                            letterAssignUserZCJL.setOperatingStatus(StatusCode.CZ_ON_HAND);
                             int update = baseMapper.updateById(letterAssignUserZCJL);
                             //更新成功，返回操作结果
                             log.info(update > 0 ? "资产部经理更新成功" : "资产部经理更新失败");
@@ -590,7 +592,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                             //清空审批意见
                             letterAssignUserZCJL.setAuditOpinion("");
                             letterAssignUserZCJL.setStatus(StatusCode.SP_IN_REVIEW);
-                            letterAssignUserZCJL.setStatus(StatusCode.CZ_ON_HAND);
+                            letterAssignUserZCJL.setOperatingStatus(StatusCode.CZ_ON_HAND);
                             int update = baseMapper.updateById(letterAssignUserZCJL);
                             //更新成功，返回操作结果
                             log.info(update > 0 ? "资产部经理更新成功" : "资产部经理更新失败");
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java
index 7dd8321c..8c3c5a16 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java
@@ -9,9 +9,6 @@ import com.daqing.financial.guarantee.mapper.DgLoanNoticeMapper;
 import com.daqing.financial.guarantee.mapper.DgPaymentConfirmationConsiderMapper;
 import com.daqing.financial.guarantee.model.request.PaymentConfirmationQueryRequest;
 import com.daqing.financial.guarantee.model.request.PaymentConfirmationUpdateRequest;
-import com.daqing.financial.guarantee.model.response.BusinessApplicationListResponse;
-import com.daqing.financial.guarantee.model.response.GuaranteeLetterListResponse;
-import com.daqing.financial.guarantee.model.response.LoanNoticeListResponse;
 import com.daqing.financial.guarantee.model.response.PaymentConfirmationListResponse;
 import com.daqing.financial.guarantee.service.IDgPaymentConfirmationConsiderService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -24,7 +21,6 @@ import com.daqing.framework.model.response.PromptSuccess;
 import com.daqing.framework.util.RedisUtil;
 import com.daqing.framework.utils.PageUtils;
 import com.daqing.framework.utils.excel.EasyExcelUtil;
-import com.daqing.framework.utils.excel.ExcelUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -213,6 +209,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
                         DgGuaranteeLetterAssignUser dgGuaranteeLetterAssignUser = guaranteeLetterAssignUserMapper.selectOne(guaranteeLetterAssignUserQueryWrapper);
                         dgGuaranteeLetterAssignUser.setStatus(StatusCode.SP_REJECT);
                         dgGuaranteeLetterAssignUser.setOperatingStatus(StatusCode.CZ_ON_HAND);
+                        dgGuaranteeLetterAssignUser.setAuditOpinion("");
                         int updateById = guaranteeLetterAssignUserMapper.updateById(dgGuaranteeLetterAssignUser);
                         //更新成功，返回操作结果
                         log.info(updateById > 0 ? "驳回更新资产部经理成功" : "驳回更新资产部经理失败");
@@ -307,6 +304,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
                         DgPaymentConfirmationConsider paymentConfirmationConsiderT = baseMapper.selectOne(queryWrapperT);
                         paymentConfirmationConsiderT.setOperatingStatus(StatusCode.CZ_ON_HAND);
                         paymentConfirmationConsiderT.setStatus(StatusCode.SP_REJECT);
+                        paymentConfirmationConsiderT.setAuditOpinion("");
                         int updateById = baseMapper.updateById(paymentConfirmationConsiderT);
                         //更新成功，返回操作结果
                         log.info(updateById > 0 ? "驳回更新资产部经理成功" : "驳回更新资产部经理失败");