Merge remote-tracking branch 'origin/master'

dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java

@@ -370,7 +370,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, CustomerEntity
                         }
                     }
                     if (customerPersonalTOI.getManager() == null) {
-                        return new ResponseResult<String>().SUCCESS("导入数据失败,员工" + manager.getManager() + "不存在");
+                        return new ResponseResult<String>().FAIL("导入数据失败,员工" + manager.getManager() + "不存在");
                     }
                 }
                 this.saveCustomerPersonal(customerPersonalTOI);
@@ -390,14 +390,14 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, CustomerEntity
                         }
                     }
                     if (customerCompanyTOI.getManager() == null) {
-                        return new ResponseResult<String>().SUCCESS("导入数据失败,员工" + manager.getManager() + "不存在");
+                        return new ResponseResult<String>().FAIL("导入数据失败,员工" + manager.getManager() + "不存在");
                     }
                 }
                 this.saveCustomerCompany(customerCompanyTOI);
             }
             return ResponseResult.SUCCESS();
         } catch (Exception e) {
-            return new ResponseResult<String>().SUCCESS("导入数据失败,请检查文件和数据格式或稍后再试");
+            return new ResponseResult<String>().FAIL("导入数据失败,请检查文件和数据格式或稍后再试");
         }
     }
 

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);
 

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();

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

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>
 

dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java

@@ -69,8 +69,7 @@ public class EmployeeController implements EmployeeControllerApi {
     @PostMapping("/tree")
     public ResponseResult tree(@RequestBody List<Long> ids) {
         List<RolePermissionResponse> result = employeeService.permissionTreeList(ids);
-        return result == null ? new ResponseResult(CommonCode.PERMISSION_IS_NOT) :
-                new ResponseResult<List<RolePermissionResponse>>().SUCCESS(result);
+        return ResponseResult.SUCCESS(result);
     }
 
     /**

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;
     }

dq-framework-common/src/main/java/com/daqing/framework/model/response/ResponseResult.java

@@ -53,7 +53,11 @@ public class ResponseResult<T> {
     }
 
     public static ResponseResult SUCCESS(Object t) {
-        return new ResponseResult<>(true, 10000, t, "操作成功！");
+        return new ResponseResult<>(true, 10000, t, "操作成功!");
+    }
+
+    public static ResponseResult FAIL(Object t) {
+        return new ResponseResult<>(false, 99999, t, "操作失败!");
     }
 
     public ResponseResult SUCCESS_DATA(T t){

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>