From a4ec4525e4f9fe92c1d3965e84dc16dedf33ec85 Mon Sep 17 00:00:00 2001
From: river <1376754470@qq.com>
Date: Fri, 18 Dec 2020 17:06:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=91=98=E5=B7=A5=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5jar=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=94=E5=9B=9E=E7=BB=99=E6=8B=85=E4=BF=9D?=
 =?UTF-8?q?=E5=87=BD=E6=97=B6=E5=88=A0=E9=99=A4=E9=A9=B3=E5=9B=9E=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../guarantee/mapper/DgLoanCommitteeConsiderMapper.java      | 3 ++-
 .../service/impl/DgLoanCommitteeConsiderServiceImpl.java     | 4 ++--
 .../src/main/resources/bootstrap.properties                  | 4 ++--
 .../mapper/guarantee/DgLoanCommitteeConsiderMapper.xml       | 2 +-
 .../financial/hrms/service/impl/EmployeeServiceImpl.java     | 2 +-
 dq-framework-utils/pom.xml                                   | 5 +++++
 6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java
index 062b4a61..8a338ef2 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java
@@ -50,7 +50,8 @@ public interface DgLoanCommitteeConsiderMapper extends BaseMapper<DgLoanCommitte
                                       @Param("refuseOpinion") String opinion);
 
     Boolean updateGuaranteeLetterAssignUser(@Param("businessId") Integer businessId, @Param("roleId") Integer roleId,
-                                            @Param("auditStatus") Integer auditStatus, @Param("operatingStatus") Integer operatingStatus);
+                                            @Param("auditStatus") Integer auditStatus, @Param("operatingStatus") Integer operatingStatus,
+                                            @Param("auditOpinion") String auditOpinion);
 
     Integer getAuditStatus(Integer 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 fc304d29..3d782994 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
@@ -129,10 +129,10 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl<DgLoanCommit
                 if (result2) {
                     Boolean result1;
                     if (count > 0) {
-                        // 当前贷审会的操作状态为驳回,表示为担保函驳回数据,改变担保函的法规部经理的操作状态为待处理,审核状态为审核中
+                        // 当前贷审会的数据存在,表示为担保函驳回数据,改变担保函的法规部经理的操作状态为待处理,审核状态为审核中
                         result1 = this.getBaseMapper().updateGuaranteeLetterAssignUser(
                                 this.getBaseMapper().getDgLoanCommitteeConsider(dgLoanCommitteeConsiderRequest.getId()).getBusinessId(),
-                                PromptSuccess.FG_JL_ID, StatusCode.SP_IN_REVIEW, StatusCode.CZ_ON_HAND);
+                                PromptSuccess.FG_JL_ID, StatusCode.SP_IN_REVIEW, StatusCode.CZ_ON_HAND,"");
                     } else {
                         // 当前贷审会的操作状态不为驳回,表示不是担保函驳回数据,在担保函表中插入一条数据
                         DgGuaranteeLetterAssignUser guaranteeLetterAssignUser = new DgGuaranteeLetterAssignUser();
diff --git a/dq-financial-guarantee/src/main/resources/bootstrap.properties b/dq-financial-guarantee/src/main/resources/bootstrap.properties
index d0e675df..e979dd87 100644
--- a/dq-financial-guarantee/src/main/resources/bootstrap.properties
+++ b/dq-financial-guarantee/src/main/resources/bootstrap.properties
@@ -1,6 +1,6 @@
 #服务名称
-spring.application.name=dq-financial-guarantee
-#配置中心地址
+#spring.application.name=dq-financial-guarantee
+##配置中心地址
 spring.cloud.nacos.config.server-addr=192.168.31.140:8848
 spring.cloud.nacos.config.namespace=58fa89c6-0e23-4530-ac13-95747e873c60
 #spring.cloud.nacos.config.group=prod
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 328c1ce6..1ecc5aff 100644
--- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml
+++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml
@@ -137,7 +137,7 @@
 
     <!-- 根据业务id和角色id更新担保函数据 -->
     <update id="updateGuaranteeLetterAssignUser">
-        UPDATE dg_guarantee_letter_assign_user SET status = #{auditStatus},operating_status = #{operatingStatus}
+        UPDATE dg_guarantee_letter_assign_user SET status = #{auditStatus},operating_status = #{operatingStatus},audit_opinion = #{auditOpinion}
         WHERE business_id = #{businessId} AND role_id = #{roleId}
     </update>
 
diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java
index 0d29448e..42e830a8 100644
--- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java
+++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java
@@ -539,7 +539,7 @@ public class EmployeeServiceImpl extends ServiceImpl<EmployeeDao, EmployeeEntity
             if (roleIds.size() != roleNames.length) {
                 ExceptionCast.cast(HrmsCode.EMPLOYEE_ROLE_NAME_IS_NOT);
             }
-            this.getBaseMapper().insertRole(employee.getId(), new ArrayList<>(roleIds));
+            this.getBaseMapper().insertRole(user.getId(), new ArrayList<>(roleIds));
         }
         return true;
     }
diff --git a/dq-framework-utils/pom.xml b/dq-framework-utils/pom.xml
index c780b64c..61868c10 100644
--- a/dq-framework-utils/pom.xml
+++ b/dq-framework-utils/pom.xml
@@ -52,6 +52,11 @@
             <artifactId>poi-ooxml-schemas</artifactId>
             <version>3.15</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>ooxml-schemas</artifactId>
+            <version>1.0</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>