Merge remote-tracking branch 'origin/master'

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeLetterAssignUserController.java

@@ -91,7 +91,10 @@ public class DgGuaranteeLetterAssignUserController {
         String loanTern = response.getLoanTern();
         Date passingTime = response.getPassingTime();
         String time = DateUtil.dateFormat(passingTime);
-        XWPFTemplate template = XWPFTemplate.compile("D:\\template\\template.docx").render(
+        //本地测试开启
+        // XWPFTemplate template = XWPFTemplate.compile("D:\\template\\template.docx").render(
+        //服务器测试
+        XWPFTemplate template = XWPFTemplate.compile("//usr//local//template//template.docx").render(
                 new HashMap<String, Object>(){{
                     put("bankName", bank);
                     put("clientName", name);

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java

@@ -84,7 +84,10 @@ public class DgLoanNoticeController {
         Double loanMoney = response.getLoanMoney();
         BigDecimal numberOfMoney = new BigDecimal(loanMoney*10000);
         String money = NumberToCN.number2CNMontrayUnit(numberOfMoney);
-        XWPFTemplate template = XWPFTemplate.compile("D:\\template\\templateTwo.docx").render(
+        //本地测试开启
+        // XWPFTemplate template = XWPFTemplate.compile("D:\\template\\templateTwo.docx").render(
+        //服务器测试
+        XWPFTemplate template = XWPFTemplate.compile("//usr//local//template//templateTwo.docx").render(
                 new HashMap<String, Object>(){{
                     put("bankName", bank);
                     put("clientName", name);

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java

@@ -207,6 +207,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     DgGuaranteeLetterAssignUser guaranteeLetterAssignUser = baseMapper.selectOne(queryWrapper);
                     //操作用户为当前用户
                     guaranteeLetterAssignUser.setUserId(currentUser);
+                    guaranteeLetterAssignUser.setStatus(StatusCode.SP_IN_REVIEW);
                     guaranteeLetterAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED);
                     guaranteeLetterAssignUser.setAuditOpinion(auditOpinion);
                     //根据当前用户更新审核状态和操作状态及审核意见
@@ -305,6 +306,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     DgGuaranteeLetterAssignUser guaranteeLetterAssignUser = baseMapper.selectOne(queryWrapper);
                     //操作用户为当前用户
                     guaranteeLetterAssignUser.setUserId(currentUser);
+                    guaranteeLetterAssignUser.setStatus(StatusCode.SP_REVIEWED);
                     guaranteeLetterAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED);
                     guaranteeLetterAssignUser.setAuditOpinion(auditOpinion);
                     //根据当前用户更新审核状态和操作状态及审核意见

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java

@@ -1,6 +1,7 @@
 package com.daqing.financial.guarantee.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.daqing.financial.guarantee.controller.DgApplyAmountInfoController;
@@ -269,7 +270,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
                     if (update > 0){
                         QueryWrapper<DgPaymentConfirmationConsider> queryWrapperCwb = new QueryWrapper<>();
                         queryWrapperCwb.eq("business_id",businessId).eq("role_id", PromptSuccess.CWB_ID);
-                        DgPaymentConfirmationConsider paymentConfirmationConsiderCwb = baseMapper.selectOne(queryWrapper);
+                        DgPaymentConfirmationConsider paymentConfirmationConsiderCwb = baseMapper.selectOne(queryWrapperCwb);
                         paymentConfirmationConsiderCwb.setStatus(StatusCode.SP_REVIEWED);
                         baseMapper.updateById(paymentConfirmationConsiderCwb);
 
@@ -301,7 +302,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
                     if (update > 0){
                         QueryWrapper<DgPaymentConfirmationConsider> queryWrapperCwb = new QueryWrapper<>();
                         queryWrapperCwb.eq("business_id",businessId).eq("role_id", PromptSuccess.CWB_ID);
-                        DgPaymentConfirmationConsider paymentConfirmationConsiderCwb = baseMapper.selectOne(queryWrapper);
+                        DgPaymentConfirmationConsider paymentConfirmationConsiderCwb = baseMapper.selectOne(queryWrapperCwb);
                         paymentConfirmationConsiderCwb.setStatus(StatusCode.SP_REVIEWED);
                         baseMapper.updateById(paymentConfirmationConsiderCwb);