提交bug

dq-financial-guarantee/pom.xml

@@ -34,14 +34,13 @@
         <dependency>
             <groupId>com.daqing.framework</groupId>
             <artifactId>dq-framework-common</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>com.daqing.financial</groupId>
             <artifactId>dq-financial-api</artifactId>
             <version>0.0.1-SNAPSHOT</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -75,6 +74,12 @@
             <artifactId>mybatis-plus-boot-starter</artifactId>
             <version>3.0.7.1</version>
         </dependency>
+        <dependency>
+            <groupId>com.daqing.framework</groupId>
+            <artifactId>dq-framework-model</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <dependencyManagement>
         <dependencies>

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

@@ -170,7 +170,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
 
                     //同时往审核流程进程表新增一条记录
                     String account = DgApplyAmountInfoController.getAccount();
-                    AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,8,"","","");
+                    AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,8,PromptSuccess.FG_JL_ID,"","","");
                     //更新成功，添加ab角数据
                     if (i > 0){
                         //获取之前指定的a角用户
@@ -243,7 +243,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     int i = baseMapper.updateById(guaranteeLetterAssignUser);
                     //同时往审核流程进程表新增一条记录
                     String account = DgApplyAmountInfoController.getAccount();
-                    AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,8,"","","");
+                    AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,8,PromptSuccess.FG_JL_ID,"","","");
                     //更新成功，更新ab角数据及资产部经理数据
                     if (i > 0){
                         //更新a角
@@ -302,7 +302,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     int i = baseMapper.updateById(guaranteeLetterAssignUser);
                     //同时往审核流程进程表新增一条记录
                     String account = DgApplyAmountInfoController.getAccount();
-                    AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,8,"","","");
+                    AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,8,PromptSuccess.FG_JL_ID,"","","");
                     //更新成功，更新贷审会数据
                     if (i > 0){
                         //根据业务id查询贷审会数据
@@ -342,7 +342,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     int i = baseMapper.updateById(guaranteeLetterAssignUser);
                     //同时往审核流程进程表新增一条记录
                     String account = DgApplyAmountInfoController.getAccount();
-                    AuditProcessUtil.save(businessId,account,"资产部经理",auditOpinion,8,"","","");
+                    AuditProcessUtil.save(businessId,account,"资产部经理",auditOpinion,8,PromptSuccess.ZC_JL_ID,"","","");
                     //获取公司id
                     Integer companyId = guaranteeLetterAssignUser.getCompanyId();
                     //更新成功，添加回款确认数据及更新整个业务的审核状态
@@ -408,7 +408,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     int i = baseMapper.updateById(guaranteeLetterAssignUser);
                     //同时往审核流程进程表新增一条记录
                     String account = DgApplyAmountInfoController.getAccount();
-                    AuditProcessUtil.save(businessId,account,"资产部经理",auditOpinion,8,"","","");
+                    AuditProcessUtil.save(businessId,account,"资产部经理",auditOpinion,8,PromptSuccess.ZC_JL_ID,"","","");
                     //更新成功，更新回款确认数据及更新整个业务的审核状态
                     if (i > 0){
                         //更新法规部经理数据
@@ -466,7 +466,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     int i = baseMapper.updateById(guaranteeLetterAssignUser);
                     //同时往审核流程进程表新增一条记录
                     String account = DgApplyAmountInfoController.getAccount();
-                    AuditProcessUtil.save(businessId,account,"资产部经理",auditOpinion,8,"","","");
+                    AuditProcessUtil.save(businessId,account,"资产部经理",auditOpinion,8,PromptSuccess.ZC_JL_ID,"","","");
                     //更新成功，更新AB角数据
                     if (i > 0){
                         //更新法规部经理数据
@@ -528,7 +528,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     log.info(i > 0 ? "首次a角用户确认担保函更新成功" : "首次a角用户确认担保函更新失败");
                     //同时往审核流程进程表新增一条记录
                     String account = DgApplyAmountInfoController.getAccount();
-                    AuditProcessUtil.save(businessId,account,"指派A角",auditOpinion,8,"","","");
+                    AuditProcessUtil.save(businessId,account,"指派A角",auditOpinion,8,PromptSuccess.DB_A_ID,"","","");
                     //更新成功后，判断b角用户是否确认
                     if (i > 0){
                         QueryWrapper<DgGuaranteeLetterAssignUser> tempB = new QueryWrapper<>();
@@ -577,7 +577,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     log.info(i > 0 ? "驳回后a角用户确认担保函更新成功" : "驳回后a角用户确认担保函更新失败");
                     //同时往审核流程进程表新增一条记录
                     String account = DgApplyAmountInfoController.getAccount();
-                    AuditProcessUtil.save(businessId,account,"指派A角",auditOpinion,8,"","","");
+                    AuditProcessUtil.save(businessId,account,"指派A角",auditOpinion,8,PromptSuccess.DB_A_ID,"","","");
                     //更新成功后，判断b角用户是否确认
                     if (i > 0){
                         QueryWrapper<DgGuaranteeLetterAssignUser> tempB = new QueryWrapper<>();
@@ -618,7 +618,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     log.info(i > 0 ? "a角用户驳回担保函更新成功" : "a角用户驳回担保函更新失败");
                     //同时往审核流程进程表新增一条记录
                     String account = DgApplyAmountInfoController.getAccount();
-                    AuditProcessUtil.save(businessId,account,"指派A角",auditOpinion,8,"","","");
+                    AuditProcessUtil.save(businessId,account,"指派A角",auditOpinion,8,PromptSuccess.DB_A_ID,"","","");
                     //更新成功后，更新b角数据及更新法规部经理数据
                     if (i > 0){
                         //更新b用户的审核状态为驳回，操作状态为已处理
@@ -667,7 +667,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     log.info(i > 0 ? "首次b角用户确认担保函更新成功" : "首次b角用户确认担保函更新失败");
                     //同时往审核流程进程表新增一条记录
                     String account = DgApplyAmountInfoController.getAccount();
-                    AuditProcessUtil.save(businessId,account,"指派B角",auditOpinion,8,"","","");
+                    AuditProcessUtil.save(businessId,account,"指派B角",auditOpinion,8,PromptSuccess.DB_B_ID,"","","");
                     //更新成功后，判断a角用户是否确认
                     if (i > 0){
                         QueryWrapper<DgGuaranteeLetterAssignUser> tempB = new QueryWrapper<>();
@@ -717,7 +717,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     log.info(i > 0 ? "驳回后b角用户确认担保函更新成功" : "驳回后b角用户确认担保函更新失败");
                     //同时往审核流程进程表新增一条记录
                     String account = DgApplyAmountInfoController.getAccount();
-                    AuditProcessUtil.save(businessId,account,"指派B角",auditOpinion,8,"","","");
+                    AuditProcessUtil.save(businessId,account,"指派B角",auditOpinion,8,PromptSuccess.DB_B_ID,"","","");
                     //更新成功后，判断a角用户是否确认
                     if (i > 0){
                         QueryWrapper<DgGuaranteeLetterAssignUser> tempB = new QueryWrapper<>();
@@ -758,7 +758,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     log.info(i > 0 ? "b角用户驳回担保函更新成功" : "b角用户驳回担保函更新失败");
                     //同时往审核流程进程表新增一条记录
                     String account = DgApplyAmountInfoController.getAccount();
-                    AuditProcessUtil.save(businessId,account,"指派B角",auditOpinion,8,"","","");
+                    AuditProcessUtil.save(businessId,account,"指派B角",auditOpinion,8,PromptSuccess.DB_B_ID,"","","");
                     //更新成功后，更新a角数据及更新法规部经理数据
                     if (i > 0){
                         //更新a用户的审核状态为驳回，操作状态为已处理

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

@@ -116,7 +116,7 @@ public class DgLoanNoticeServiceImpl extends ServiceImpl<DgLoanNoticeMapper, DgL
             int update = baseMapper.updateById(loanNotice);
             //同时往审核流程进程表新增一条记录
             String account = DgApplyAmountInfoController.getAccount();
-            AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,10,"","","");
+            AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,10,PromptSuccess.FG_JL_ID,"","","");
             //更新成功更新业务流程已完成
             if (update > 0){
                 QueryWrapper<DgBusinessProcessStatus> businessProcessStatusQueryWrapper = new QueryWrapper<>();
@@ -142,7 +142,7 @@ public class DgLoanNoticeServiceImpl extends ServiceImpl<DgLoanNoticeMapper, DgL
             int update = baseMapper.updateById(loanNotice);
             //同时往审核流程进程表新增一条记录
             String account = DgApplyAmountInfoController.getAccount();
-            AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,10,"","","");
+            AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,10,PromptSuccess.FG_JL_ID,"","","");
             //更新成功，更新回款确认的法规部经理和财务部经理数据
             if (update > 0){
                 QueryWrapper<DgPaymentConfirmationConsider> queryWrapper = new QueryWrapper<>();

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

@@ -143,7 +143,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
                     int update = baseMapper.updateById(paymentConfirmationConsider);
                     //同时往审核流程进程表新增一条记录
                     String account = DgApplyAmountInfoController.getAccount();
-                    AuditProcessUtil.save(businessId,account,"财务部经理",auditOpinion,9,"","","");
+                    AuditProcessUtil.save(businessId,account,"财务部经理",auditOpinion,9,PromptSuccess.CWB_ID,"","","");
                     Integer companyId = paymentConfirmationConsider.getCompanyId();
                     //更新成功，添加法规部经理数据
                     if (update > 0){
@@ -183,7 +183,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
                     int update = baseMapper.updateById(paymentConfirmationConsider);
                     //同时往审核流程进程表新增一条记录
                     String account = DgApplyAmountInfoController.getAccount();
-                    AuditProcessUtil.save(businessId,account,"财务部经理",auditOpinion, 9,"","","");
+                    AuditProcessUtil.save(businessId,account,"财务部经理",auditOpinion, 9,PromptSuccess.CWB_ID,"","","");
                     //更新成功，更新法规部经理数据
                     if (update > 0){
                         QueryWrapper<DgPaymentConfirmationConsider> wrapperTemp = new QueryWrapper<>();
@@ -212,7 +212,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
                     int update = baseMapper.updateById(paymentConfirmationConsider);
                     //同时往审核流程进程表新增一条记录
                     String account = DgApplyAmountInfoController.getAccount();
-                    AuditProcessUtil.save(businessId,account,"财务部经理",auditOpinion,9,"","","");
+                    AuditProcessUtil.save(businessId,account,"财务部经理",auditOpinion,9,PromptSuccess.CWB_ID,"","","");
                     //更新成功，更新资产部经理数据及其他人的数据
                     if (update > 0){
                         //更新法规部经理数据
@@ -275,7 +275,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
 
                     //同时往审核流程进程表新增一条记录
                     String account = DgApplyAmountInfoController.getAccount();
-                    AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,9,"","","");
+                    AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,9,PromptSuccess.FG_JL_ID,"","","");
                     Integer companyId = paymentConfirmationConsider.getCompanyId();
                     //更新成功，添加法规部经理数据和更新财务部数据
                     if (update > 0){
@@ -319,7 +319,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
                     int update = baseMapper.updateById(paymentConfirmationConsider);
                     //同时往审核流程进程表新增一条记录
                     String account = DgApplyAmountInfoController.getAccount();
-                    AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion, 9,"","","");
+                    AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion, 9,PromptSuccess.FG_JL_ID,"","","");
                     //更新成功，更新法规部经理数据和财务部经理数据
                     if (update > 0){
                         QueryWrapper<DgPaymentConfirmationConsider> queryWrapperCwb = new QueryWrapper<>();
@@ -354,7 +354,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
                     int update = baseMapper.updateById(paymentConfirmationConsider);
                     //同时往审核流程进程表新增一条记录
                     String account = DgApplyAmountInfoController.getAccount();
-                    AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,9,"","","");
+                    AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,9,PromptSuccess.FG_JL_ID,"","","");
                     //更新成功，更新财务部经理数据
                     if (update > 0){
                         QueryWrapper<DgPaymentConfirmationConsider> queryWrapperT = new QueryWrapper<>();

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/AuditProcessUtil.java

@@ -26,12 +26,13 @@ public class AuditProcessUtil{
         auditProcessUtil.auditProcessMapper = this.auditProcessMapper;
     }
 
-    public static boolean save(Integer businessId, String approver, String deptName, String auditOpinion,Integer processId,String reason,String loanMoney,String loanTern) {
+    public static boolean save(Integer businessId, String approver, String departmentName, String auditOpinion,Integer processId,Integer roleId,String reason,String loanMoney,String loanTern) {
         DgAuditProcess auditProcess = new DgAuditProcess();
         auditProcess.setApprover(approver);
         auditProcess.setAuditOpinion(auditOpinion);
         auditProcess.setBusinessId(businessId);
-        auditProcess.setDeptName(deptName);
+        auditProcess.setDepartmentName(departmentName);
+        auditProcess.setRoleId(roleId);
         auditProcess.setProcessId(processId);
         auditProcess.setLoanMoney(loanMoney);
         auditProcess.setLoanTern(loanTern);

dq-financial-guarantee/src/main/resources/bootstrap.properties

@@ -1,66 +1,25 @@
 ##服务名称
-#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
-#
-#spring.cloud.nacos.config.ext-config[0].data-id=dq-financial-guarantee.yml
-#spring.cloud.nacos.config.ext-config[0].group=dev
-#spring.cloud.nacos.config.ext-config[0].refresh=true
-#
-#spring.cloud.nacos.config.ext-config[1].data-id=datasource.yml
-#spring.cloud.nacos.config.ext-config[1].group=dev
-#spring.cloud.nacos.config.ext-config[1].refresh=true
-#
-#spring.cloud.nacos.config.ext-config[2].data-id=mybatis.yml
-#spring.cloud.nacos.config.ext-config[2].group=dev
-#spring.cloud.nacos.config.ext-config[2].refresh=true
-#
-#spring.redis.host=127.0.0.1
-#spring.redis.port=6379
-#spring.redis.password=123456
-#spring.redis.database=0
-#spring.redis.timeout=30000
-#spring.redis.jedis.pool.max-active=8
-#spring.redis.jedis.pool.max-wait=-1
-#spring.redis.jedis.pool.max-idle=8
-#spring.redis.jedis.pool.min-idle=0
-
-#请求处理的超时时间
-ribbon.ReadTimeout: 120000
-#请求连接的超时时间
-ribbon.ConnectTimeout: 120000
-
-
-
-# 上传文件总的最大值
-spring.servlet.multipart.max-request-size=10MB
-# 单个文件的最大值
-spring.servlet.multipart.max-file-size=10MB
-
-#正式环境（prod）
-#服务名称
 spring.application.name=dq-financial-guarantee
-#配置中心地址
+##配置中心地址
-spring.cloud.nacos.config.server-addr=120.78.127.12:8848
+spring.cloud.nacos.config.server-addr=192.168.31.140:8848
-spring.cloud.nacos.config.namespace=502bfc93-6e2f-44aa-93ad-f074664c6826
+spring.cloud.nacos.config.namespace=58fa89c6-0e23-4530-ac13-95747e873c60
+#spring.cloud.nacos.config.group=prod
 
 spring.cloud.nacos.config.ext-config[0].data-id=dq-financial-guarantee.yml
-spring.cloud.nacos.config.ext-config[0].group=prod
+spring.cloud.nacos.config.ext-config[0].group=dev
 spring.cloud.nacos.config.ext-config[0].refresh=true
 
 spring.cloud.nacos.config.ext-config[1].data-id=datasource.yml
-spring.cloud.nacos.config.ext-config[1].group=prod
+spring.cloud.nacos.config.ext-config[1].group=dev
 spring.cloud.nacos.config.ext-config[1].refresh=true
 
 spring.cloud.nacos.config.ext-config[2].data-id=mybatis.yml
-spring.cloud.nacos.config.ext-config[2].group=prod
+spring.cloud.nacos.config.ext-config[2].group=dev
 spring.cloud.nacos.config.ext-config[2].refresh=true
 
 spring.redis.host=127.0.0.1
 spring.redis.port=6379
-spring.redis.password=dq123456
+spring.redis.password=123456
 spring.redis.database=0
 spring.redis.timeout=30000
 spring.redis.jedis.pool.max-active=8
@@ -68,6 +27,47 @@ spring.redis.jedis.pool.max-wait=-1
 spring.redis.jedis.pool.max-idle=8
 spring.redis.jedis.pool.min-idle=0
 
+#请求处理的超时时间
+ribbon.ReadTimeout: 120000
+#请求连接的超时时间
+ribbon.ConnectTimeout: 120000
+
+
+
+# 上传文件总的最大值
+#spring.servlet.multipart.max-request-size=10MB
+## 单个文件的最大值
+#spring.servlet.multipart.max-file-size=10MB
+#
+##正式环境（prod）
+##服务名称
+#spring.application.name=dq-financial-guarantee
+##配置中心地址
+#spring.cloud.nacos.config.server-addr=120.78.127.12:8848
+#spring.cloud.nacos.config.namespace=502bfc93-6e2f-44aa-93ad-f074664c6826
+#
+#spring.cloud.nacos.config.ext-config[0].data-id=dq-financial-guarantee.yml
+#spring.cloud.nacos.config.ext-config[0].group=prod
+#spring.cloud.nacos.config.ext-config[0].refresh=true
+#
+#spring.cloud.nacos.config.ext-config[1].data-id=datasource.yml
+#spring.cloud.nacos.config.ext-config[1].group=prod
+#spring.cloud.nacos.config.ext-config[1].refresh=true
+#
+#spring.cloud.nacos.config.ext-config[2].data-id=mybatis.yml
+#spring.cloud.nacos.config.ext-config[2].group=prod
+#spring.cloud.nacos.config.ext-config[2].refresh=true
+#
+#spring.redis.host=127.0.0.1
+#spring.redis.port=6379
+#spring.redis.password=dq123456
+#spring.redis.database=0
+#spring.redis.timeout=30000
+#spring.redis.jedis.pool.max-active=8
+#spring.redis.jedis.pool.max-wait=-1
+#spring.redis.jedis.pool.max-idle=8
+#spring.redis.jedis.pool.min-idle=0
+
 
 #测试服务器环境（prod）
 #服务名称

dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgAuditProcess.java

@@ -32,8 +32,11 @@ public class DgAuditProcess implements Serializable {
     @ApiModelProperty(value = "审批人")
     private String approver;
 
+    @ApiModelProperty(value = "角色id")
+    private Integer roleId;
+
     @ApiModelProperty(value = "部门名称")
-    private String deptName;
+    private String departmentName;
 
     @ApiModelProperty(value = "通过时间")
     @TableField(fill = FieldFill.INSERT)