修复业务流程状态

dq-financial-api/pom.xml

@@ -18,7 +18,7 @@
         <dependency>
             <groupId>com.daqing.framework</groupId>
             <artifactId>dq-framework-model</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>

dq-financial-crms/src/main/java/com/daqing/financial/crms/config/IPageConfig.java

@@ -1,3 +1,4 @@
+/*
 package com.daqing.financial.crms.config;
 
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
@@ -11,3 +12,4 @@ public class IPageConfig {
         return new PaginationInterceptor();
     }
 }
+*/

dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java

@@ -36,4 +36,6 @@ public interface CustomerDao extends BaseMapper<CustomerEntity> {
     List<Long> listCustomerId();
 
     List<CustomerEntity> queryCompanyCodeAndName(int type);
+
+    String getCodeByType(Integer type);
 }

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

@@ -219,7 +219,12 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, CustomerEntity
         BeanUtils.copyProperties(customerPersonalTOI, customerEntity);
         BeanUtils.copyProperties(customerPersonalTOI, personalCustomerEntity);
         //TODO 设置客户编号
-        customerEntity.setCode(((int) (Math.random() * 1000000 + 1)) + "");
+        String code = customerDao.getCodeByType(CrmsConstant.CustomerType.PERSONAL_CUSTOMER.getType());
+        if (code == null || code.length() == 0) {
+            code = PromptSuccess.PERSONAL_START_CODE;
+        }
+        int codeNumber = Integer.parseInt(code.substring(code.length() - 4));
+        customerEntity.setCode(PromptSuccess.PERSONAL_CODE + String.format("%04d", (codeNumber + 1)));
         customerEntity.setCreateTime(new Date());
         customerEntity.setMotifyTime(new Date());
         customerEntity.setType(CrmsConstant.CustomerType.PERSONAL_CUSTOMER.getType());
@@ -241,7 +246,12 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, CustomerEntity
         BeanUtils.copyProperties(customerCompanyTOI, customerEntity);
         BeanUtils.copyProperties(customerCompanyTOI, companyCustomerEntity);
         //TODO 设置客户编号
-        customerEntity.setCode(((int) (Math.random() * 1000000 + 1)) + "");
+        String code = customerDao.getCodeByType(CrmsConstant.CustomerType.COMPANY_CUSTOMER.getType());
+        if (code == null || code.length() == 0) {
+            code = PromptSuccess.COMPANY_START_CODE;
+        }
+        int codeNumber = Integer.parseInt(code.substring(code.length() - 4));
+        customerEntity.setCode(PromptSuccess.COMPANY_CODE + String.format("%04d", (codeNumber + 1)));
         customerEntity.setCreateTime(new Date());
         customerEntity.setMotifyTime(new Date());
         customerEntity.setType(CrmsConstant.CustomerType.COMPANY_CUSTOMER.getType());
@@ -560,7 +570,12 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, CustomerEntity
         BeanUtils.copyProperties(companyCustomerReq, customerEntity);
         BeanUtils.copyProperties(companyCustomerReq, companyCustomerEntity);
         //TODO 设置客户编号
-        customerEntity.setCode(((int) (Math.random() * 1000000 + 1)) + "");
+        String code = customerDao.getCodeByType(CrmsConstant.CustomerType.COMPANY_CUSTOMER.getType());
+        if (code == null || code.length() == 0) {
+            code = PromptSuccess.COMPANY_START_CODE;
+        }
+        int codeNumber = Integer.parseInt(code.substring(code.length() - 4));
+        customerEntity.setCode(PromptSuccess.COMPANY_CODE + String.format("%04d", (codeNumber + 1)));
         customerEntity.setMotifyTime(new Date());
         customerEntity.setCreateTime(new Date());
         customerEntity.setManager(companyCustomerReq.getManager());
@@ -568,7 +583,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, CustomerEntity
         boolean customer = customerDao.saveCustomer(customerEntity);
         companyCustomerEntity.setCustomerId(customerEntity.getId());
         int company = companyCustomerDao.insert(companyCustomerEntity);
-        if(companyCustomerReq.getIsExistRelated()==1){//有关联人的情况下才绑定关联关系
+        if (companyCustomerReq.getIsExistRelated() == 1) {//有关联人的情况下才绑定关联关系
             //绑定关联关系
             List<CrmsCustomerRelated> relatedList = new ArrayList<>();
             List<Integer> intList = companyCustomerReq.getRelatedId();

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

@@ -1,61 +1,26 @@
 # 开发和测试环境（dev）
 #服务名称
-#spring.application.name=dq-financial-crms
-##配置中心地址
-#spring.cloud.nacos.config.server-addr=192.168.31.140:8848
-#spring.cloud.nacos.config.namespace=1f69d47e-0aeb-4a1e-8ab4-0e84dfb86354
-##spring.cloud.nacos.config.group=prod
-#
-#spring.cloud.nacos.config.ext-config[0].data-id=datasource.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=mybatis.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=other.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
-
-# 正式环境（prod）
-#服务名称
 spring.application.name=dq-financial-crms
-##配置中心地址
+#配置中心地址
-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=25ce05e2-a0eb-4842-92e4-d8b550a489dd
+spring.cloud.nacos.config.namespace=1f69d47e-0aeb-4a1e-8ab4-0e84dfb86354
 #spring.cloud.nacos.config.group=prod
 
 spring.cloud.nacos.config.ext-config[0].data-id=datasource.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=mybatis.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=other.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
@@ -63,6 +28,41 @@ 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
+
+# 正式环境（prod）
+#服务名称
+#spring.application.name=dq-financial-crms
+###配置中心地址
+#spring.cloud.nacos.config.server-addr=120.78.127.12:8848
+#spring.cloud.nacos.config.namespace=25ce05e2-a0eb-4842-92e4-d8b550a489dd
+##spring.cloud.nacos.config.group=prod
+#
+#spring.cloud.nacos.config.ext-config[0].data-id=datasource.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=mybatis.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=other.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-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml

@@ -95,5 +95,8 @@
         SELECT code,`name` from crms_customer where `type` =#{type} and del_or_not = 0 and status = 0
     </select>
 
-
+    <!-- 获取最新添加的数据的客户编码 -->
+    <select id="getCodeByType" parameterType="integer" resultType="string">
+        SELECT code FROM crms_customer WHERE type = #{type} AND del_or_not = 0 ORDER BY create_time DESC LIMIT 0,1
+    </select>
 </mapper>

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/DqFinancialGuaranteeApplication.java

@@ -1,12 +1,11 @@
 package com.daqing.financial.guarantee;
 
-import com.daqing.financial.hrauth.config.SecurityConfig;
+
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Import;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
@@ -16,7 +15,6 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @EnableScheduling
 @EnableSwagger2
 @ComponentScan(basePackages = "com.daqing")
-@Import({SecurityConfig.class})
 public class DqFinancialGuaranteeApplication {
 
     public static void main(String[] args) {

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/config/IPageConfig.java

@@ -1,21 +1,18 @@
-/*
 package com.daqing.financial.guarantee.config;
 
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-*/
 /**
  * @auther River
  * @date 2020/11/5 14:38
- *//*
+ */
 
-@Configuration
+//@Configuration
-public class IPageConfig {
+//public class IPageConfig {
-    @Bean
+//    @Bean
-    public PaginationInterceptor paginationInterceptor() {
+//    public PaginationInterceptor paginationInterceptor() {
-        return new PaginationInterceptor();
+//        return new PaginationInterceptor();
-    }
+//    }
-}
+//}
-*/

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java

@@ -76,7 +76,7 @@ public interface DgComplianceInvestigationMapper extends BaseMapper<DgCompliance
     Boolean updateWorkConferenceConsider(@Param("businessId") Integer businessId, @Param("roleId") Integer roleId,
                                          @Param("auditStatus") Integer auditStatus, @Param("operationStatus") Integer operationStatus);
 
-    String getAuditProcessLatestNameByBusinessId(@Param("businessId") Integer businessId);
+    Integer getAuditProcessLatestProcessIdByBusinessId(@Param("businessId") Integer businessId);
 
     Boolean updateDgComplianceInvestigationUserIdById(@Param("id") Integer id, @Param("userId") Integer userId);
 

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgStatisticsMapper.java

@@ -1,9 +1,11 @@
 package com.daqing.financial.guarantee.mapper;
 
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.daqing.financial.guarantee.model.request.DgStatisticsRequest;
+
 import com.daqing.framework.domain.guarantee.DgApplyAmountInfo;
 import com.daqing.framework.domain.guarantee.po.DgStatisticsPO;
 import com.daqing.framework.domain.guarantee.po.DgStatisticsRefusePO;

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsListResponse.java

@@ -45,23 +45,23 @@ public class DgStatisticsListResponse extends BaseRowModel implements Serializab
     @ExcelProperty(value = "期数",index = 5)
     private String applyTime;
 
-    @ApiModelProperty("创建时间")
+    @ApiModelProperty("申请日期")
     @ExcelProperty(value = "申请日期",index = 6)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date createTime;
 
-    @ApiModelProperty("审批人")
+    @ApiModelProperty("当前审批人")
     @ExcelProperty(value = "当前审批人",index = 7)
-    private String empName;
+    private String empNames;
 
-    @ApiModelProperty("节点状态")
+    @ApiModelProperty("任务节点")
     @ExcelProperty(value = "任务节点",index = 8)
-    private String status;
+    private String taskNode;
 
-    @ApiModelProperty("达到时间")
+    @ApiModelProperty("最新操作时间")
     @ExcelProperty(value = "任务分配时间",index = 9)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date dateTime;
+    private Date operationTime;
 
     @ApiModelProperty("提单人姓名")
     @ExcelProperty(value = "提单人",index = 10)

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

@@ -209,7 +209,7 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         //如果不为保存就往审核流程进程表新增一条记录
         if(businessApplication.getIsSaveOrCommit()==1){
             String account = dgApplyAmountInfoController.getAccount();
-            AuditProcessUtil.save(dgApplyAmountInfo.getId(),account,"担保业务员","",1,"","","");
+            AuditProcessUtil.save(dgApplyAmountInfo.getId(),account,"担保业务员","",1,PromptSuccess.DB_YWY_ID,"","","");
         }
         return 1;
     }
@@ -412,7 +412,7 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
 
         //同时往审核流程进程表新增一条记录
         String account = dgApplyAmountInfoController.getAccount();
-        AuditProcessUtil.save(businessApplication.getBusinessId(),account,"担保业务员","",1,"","","");
+        AuditProcessUtil.save(businessApplication.getBusinessId(),account,"担保业务员","",1,PromptSuccess.DB_YWY_ID,"","","");
 
         //附件新增
         return dgEnclosureInfoMapper.insert(dgEnclosureInfo);
@@ -440,7 +440,7 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
                 .eq("type",applyAmountList.getType()));
         //同时往审核流程进程表新增一条记录
         String account = dgApplyAmountInfoController.getAccount();
-        AuditProcessUtil.save(dgApplyAmountList1.getBusinessId(),account,"担保业务员","",1,"","","");
+        AuditProcessUtil.save(dgApplyAmountList1.getBusinessId(),account,"担保业务员","",1,PromptSuccess.DB_YWY_ID,"","","");
 
         //将业务流程状态设置为已撤销
 
@@ -593,14 +593,17 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         }
         Integer type = dgApplyAmountList1.getType();
         String deptName;
+        Integer roleId;
         if(type==1){
             deptName="担保部业务员";
+            roleId = PromptSuccess.DB_YWY_ID;
         }else{
             deptName="担保部经理";
+            roleId = PromptSuccess.DB_JL_ID;
         }
         //同时往审核流程进程表新增一条记录
         String account = dgApplyAmountInfoController.getAccount();
-        AuditProcessUtil.save(dgApplyAmountList1.getBusinessId(),account,deptName,remark,1,"","","");
+        AuditProcessUtil.save(dgApplyAmountList1.getBusinessId(),account,deptName,remark,1,roleId,"","","");
         return 1;
     }
 

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

@@ -299,7 +299,7 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
         }
         //同时往审核流程进程表新增一条记录
         String account = dgApplyAmountInfoController.getAccount();
-        AuditProcessUtil.save(dgAssetsInvestigation.getBusinessId(),account,"资产部专员",investigateAssetsRequest.getApplyContent(),3,"","","");
+        AuditProcessUtil.save(dgAssetsInvestigation.getBusinessId(),account,"资产部专员",investigateAssetsRequest.getApplyContent(),3,PromptSuccess.ZC_ZY_ID,"","","");
 
         return 1;
     }
@@ -424,10 +424,13 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
         }
         Integer type = assetsInvestigation.getType();
         String deptName;
+        Integer roleId;
         if(type == 2){
             deptName = "资产部经理";
+            roleId=PromptSuccess.ZC_JL_ID;
         }else{
             deptName = "资产部分管领导";
+            roleId=PromptSuccess.ZC_LD_ID;
         }
         String remark1 = Arrays.toString(approvalAssetsRequest.getRemark());//补充调查原因
         String remark = remark1.replace("[","").replace("]","");
@@ -443,7 +446,7 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
         String loanTerm = approvalAssetsRequest.getTerm();//期限
         //同时往审核流程进程表新增一条记录
         String account = dgApplyAmountInfoController.getAccount();
-        AuditProcessUtil.save(assetsInvestigation.getBusinessId(),account,deptName,approvalAssetsRequest.getApplyContent(),3,reason,loanMoney,loanTerm);
+        AuditProcessUtil.save(assetsInvestigation.getBusinessId(),account,deptName,approvalAssetsRequest.getApplyContent(),3,roleId,reason,loanMoney,loanTerm);
 
         return 1;
     }

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

@@ -137,7 +137,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
                 if (result2) {
                     // 在审核进程表中插入一条指派成功的数据
                     return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
-                            PromptSuccess.FG_JL_NAME, null, PromptSuccess.HG_PROCESS_ID,"","","");
+                            PromptSuccess.FG_JL_NAME, null, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_JL_ID,"","","");
                 }
             }
         }
@@ -176,7 +176,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
                     // 在业务流程表中插入一条调查成功的数据
                     if (result2) {
                         return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
-                                PromptSuccess.FG_C_NAME, opinion, PromptSuccess.HG_PROCESS_ID,"","","");
+                                PromptSuccess.FG_C_NAME, opinion, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_C_ID,"","","");
                     }
                 }
             }
@@ -203,7 +203,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
                         if (result3) {
                             // 在业务流程表中插入一条驳回成功的数据(记得带上驳回的意见)
                             return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
-                                    PromptSuccess.FG_C_NAME, opinion, PromptSuccess.HG_PROCESS_ID,"","","");
+                                    PromptSuccess.FG_C_NAME, opinion, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_C_ID,"","","");
                         }
                     }
                 }
@@ -228,8 +228,8 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
         // 1.待处理,表示业务进行到法规经理审核
         if (Objects.equals(operationStatus, StatusCode.CZ_ON_HAND)) {
             // 查询业务流程表,找出该业务id的最新操作记录的角色名称
-            String roleName = this.getBaseMapper().getAuditProcessLatestNameByBusinessId(this.getComplianceInvestigation(iid).getBusinessId());
+            Integer processId = this.getBaseMapper().getAuditProcessLatestProcessIdByBusinessId(this.getComplianceInvestigation(iid).getBusinessId());
-            if (PromptSuccess.DB_A_NAME.equals(roleName) || PromptSuccess.DB_B_NAME.equals(roleName)) {
+            if (PromptSuccess.DB_PROCESS_ID.equals(processId)) {
                 // 1.1.若最新操作人为A/B角,表示为驳回给AB角之后直接返回的数据
                 // 同意
                 if (status == 1) {
@@ -242,7 +242,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
                         if (result1) {
                             // 在业务流程表中插入一条法规经理同意的数据
                             return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
-                                    PromptSuccess.FG_JL_NAME, opinion, PromptSuccess.HG_PROCESS_ID,"","","");
+                                    PromptSuccess.FG_JL_NAME, opinion, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_JL_ID,"","","");
                         }
                     }
                 }
@@ -264,7 +264,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
                             if (result2) {
                                 // 在业务流程表中插入一条法规经理驳回的数据
                                 return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
-                                        PromptSuccess.FG_JL_NAME, opinion, PromptSuccess.HG_PROCESS_ID,"","","");
+                                        PromptSuccess.FG_JL_NAME, opinion, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_JL_ID,"","","");
                             }
                         }
                     }
@@ -287,7 +287,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
                             if (result2) {
                                 // 在业务流程表中插入一条拒绝数据(记得带上拒绝意见)
                                 return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
-                                        PromptSuccess.FG_JL_NAME, opinion, PromptSuccess.HG_PROCESS_ID,"","","");
+                                        PromptSuccess.FG_JL_NAME, opinion, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_JL_ID,"","","");
                             }
                         }
                     }
@@ -328,7 +328,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
                         if (result1) {
                             // 在业务流程表中插入一条法规经理审核成功的数据
                             return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
-                                    PromptSuccess.FG_JL_NAME, opinion, PromptSuccess.HG_PROCESS_ID,"","","");
+                                    PromptSuccess.FG_JL_NAME, opinion, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_JL_ID,"","","");
                         }
                     }
                 }
@@ -350,7 +350,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
                             if (result2) {
                                 // 在业务流程表中插入一条法规经理驳回的数据
                                 return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
-                                        PromptSuccess.FG_JL_NAME, opinion, PromptSuccess.HG_PROCESS_ID,"","","");
+                                        PromptSuccess.FG_JL_NAME, opinion, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_JL_ID,"","","");
                             }
                         }
                     }
@@ -373,7 +373,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
                             if (result2) {
                                 // 在业务流程表中插入一条拒绝数据(记得带上拒绝意见)
                                 return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
-                                        PromptSuccess.FG_JL_NAME, opinion, PromptSuccess.HG_PROCESS_ID,"","","");
+                                        PromptSuccess.FG_JL_NAME, opinion, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_JL_ID,"","","");
                             }
                         }
                     }
@@ -414,7 +414,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
                         if (result1) {
                             // 在业务流程表中插入一条法规领导审核成功的数据
                             return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
-                                    PromptSuccess.FG_LD_NAME, opinion, PromptSuccess.HG_PROCESS_ID,"","","");
+                                    PromptSuccess.FG_LD_NAME, opinion, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_LD_ID,"","","");
                         }
                     }
                 }
@@ -440,7 +440,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
                             if (result2) {
                                 // 在业务流程表中插入一条法规领导驳回的数据
                                 return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
-                                        PromptSuccess.FG_LD_NAME, opinion, PromptSuccess.HG_PROCESS_ID,"","","");
+                                        PromptSuccess.FG_LD_NAME, opinion, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_LD_ID,"","","");
                             }
                         }
                     }
@@ -467,7 +467,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
                             if (result2) {
                                 // 在业务流程表中插入一条拒绝数据(记得带上拒绝意见)
                                 return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
-                                        PromptSuccess.FG_LD_NAME, opinion, PromptSuccess.HG_PROCESS_ID,"","","");
+                                        PromptSuccess.FG_LD_NAME, opinion, PromptSuccess.HG_PROCESS_ID,PromptSuccess.FG_LD_ID,"","","");
                             }
                         }
                     }

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

@@ -446,15 +446,18 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
 
         Integer type = guaranteeAssignUser.getType();
         String deptName;
+        Integer roleId;
         if (type == 1) {
             deptName = "担保部A角";
+            roleId = PromptSuccess.DB_A_ID;
         } else {
             deptName = "担保部B角";
+            roleId = PromptSuccess.DB_B_ID;
         }
         //不为保存的情况则往审核流程进程表新增一条记录
         if(!investigateGuaranteeRequest.getStatus().equals(StatusCode.SP_DRAFT)){
             String account = dgApplyAmountInfoController.getAccount();
-            AuditProcessUtil.save(guaranteeAssignUser.getBusinessId(), account, deptName, investigateGuaranteeRequest.getApplyContent(), 2,"","","");
+            AuditProcessUtil.save(guaranteeAssignUser.getBusinessId(), account, deptName, investigateGuaranteeRequest.getApplyContent(), 2,roleId,"","","");
         }
         return 1;
     }
@@ -578,10 +581,13 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
         }
         Integer type = guaranteeUser.getType();
         String deptName;
+        Integer roleId;
         if (type == 3) {
             deptName = "担保部经理";
+            roleId = PromptSuccess.DB_JL_ID;
         } else {
             deptName = "担保部分管领导";
+            roleId = PromptSuccess.DB_LD_ID;
         }
         String remark1 = Arrays.toString(approvalGuaranteeRequest.getRemark());//补充调查原因
         String remark = remark1.replace("[","").replace("]","");
@@ -598,7 +604,7 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
         String loanTerm = approvalGuaranteeRequest.getTerm();//期限
         //同时往审核流程进程表新增一条记录
         String account = dgApplyAmountInfoController.getAccount();
-        AuditProcessUtil.save(guaranteeUser.getBusinessId(), account, deptName, approvalGuaranteeRequest.getApplyContent(), 2,reason,loanMoney,loanTerm);
+        AuditProcessUtil.save(guaranteeUser.getBusinessId(), account, deptName, approvalGuaranteeRequest.getApplyContent(), roleId,2,reason,loanMoney,loanTerm);
 
         return 1;
     }
@@ -707,7 +713,7 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
         }
         //同时往审核流程进程表新增一条记录
         String account = dgApplyAmountInfoController.getAccount();
-        AuditProcessUtil.save(guaranteeRequest.getBusinessId(), account, "担保部经理", "", 2,"","","");
+        AuditProcessUtil.save(guaranteeRequest.getBusinessId(), account, "担保部经理", "", 2,PromptSuccess.DB_JL_ID,"","","");
 
         return ResponseResult.SUCCESS();
     }

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

@@ -146,7 +146,7 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl<DgLoanCommit
                         // 在业务流程表中插入一条审议成功的数据
                         return AuditProcessUtil.save(this.getBaseMapper().getDgLoanCommitteeConsider(
                                 dgLoanCommitteeConsiderRequest.getId()).getBusinessId(), DgApplyAmountInfoController.getAccount(),
-                                PromptSuccess.DSH_NAME, null, PromptSuccess.DSH_PROCESS_ID,"","","");
+                                PromptSuccess.DSH_NAME, null, PromptSuccess.DSH_PROCESS_ID,PromptSuccess.DSH_ID,"","","");
                     }
                 }
             }
@@ -178,7 +178,8 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl<DgLoanCommit
                             // 在业务流程表中插入一条拒绝数据(记得带上拒绝意见)
                             return AuditProcessUtil.save(this.getBaseMapper().getDgLoanCommitteeConsider(
                                     dgLoanCommitteeConsiderRequest.getId()).getBusinessId(), DgApplyAmountInfoController.getAccount(),
-                                    PromptSuccess.DSH_NAME, dgLoanCommitteeConsiderRequest.getRefuseOpinion(), PromptSuccess.DSH_PROCESS_ID,"","","");
+                                    PromptSuccess.DSH_NAME, dgLoanCommitteeConsiderRequest.getRefuseOpinion(), PromptSuccess.DSH_PROCESS_ID,
+                                    PromptSuccess.DSH_ID,"","","");
                         }
                     }
                 }
@@ -216,7 +217,8 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl<DgLoanCommit
                                 // 在业务流程表中插入一条驳回成功的数据(记得带上驳回的意见)
                                 return AuditProcessUtil.save(this.getBaseMapper().getDgLoanCommitteeConsider(
                                         dgLoanCommitteeConsiderRequest.getId()).getBusinessId(), DgApplyAmountInfoController.getAccount(),
-                                        PromptSuccess.DSH_NAME, dgLoanCommitteeConsiderRequest.getRefuseOpinion(), PromptSuccess.DSH_PROCESS_ID,"","","");
+                                        PromptSuccess.DSH_NAME, dgLoanCommitteeConsiderRequest.getRefuseOpinion(), PromptSuccess.DSH_PROCESS_ID,
+                                        PromptSuccess.DSH_ID,"","","");
                             }
                         }
                     }

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

@@ -278,7 +278,7 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
 
         //同时往审核流程进程表新增一条记录
         String account = dgApplyAmountInfoController.getAccount();
-        AuditProcessUtil.save(messageInvestigation.getBusinessId(),account,"信息部专员",investigateMessageRequest.getRemark(),4,"","","");
+        AuditProcessUtil.save(messageInvestigation.getBusinessId(),account,"信息部专员",investigateMessageRequest.getRemark(),4,PromptSuccess.XX_ZY_ID,"","","");
         return 1;
     }
 
@@ -397,14 +397,17 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
         }
         Integer type = messageInvestigation.getType();
         String deptName;
+        Integer roleId;
         if(type == 2){
             deptName = "信息部经理";
+            roleId = PromptSuccess.XX_JL_ID;
         }else{
             deptName = "信息部分管领导";
+            roleId = PromptSuccess.XX_LD_ID;
         }
         //同时往审核流程进程表新增一条记录
         String account = dgApplyAmountInfoController.getAccount();
-        AuditProcessUtil.save(messageInvestigation.getBusinessId(),account,deptName,approvalMessageRequest.getRemark(),4,"","","");
+        AuditProcessUtil.save(messageInvestigation.getBusinessId(),account,deptName,approvalMessageRequest.getRemark(),4,roleId,"","","");
 
         return 1;
     }

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

@@ -334,16 +334,12 @@ public class DgStatisticsServiceImpl extends ServiceImpl<DgStatisticsMapper, DgA
             dgStatisticsListResponse = new DgStatisticsListResponse();
             for (EmployeeTO employeeTO : empAndDeptList) {
                 if (Objects.equals(dgStatisticsPO.getPresenterId().longValue(), employeeTO.getId())) {
-                    BeanUtils.copyProperties(dgStatisticsPO, dgStatisticsListResponse);
                     dgStatisticsListResponse.setEmployeeName(employeeTO.getEmpName());
                     dgStatisticsListResponse.setDepartment(employeeTO.getDeptNames());
-                    listResponse.add(dgStatisticsListResponse);
                 }
             }
-            if (dgStatisticsListResponse.getEmployeeName() == null || dgStatisticsListResponse.getEmployeeName().length() == 0) {
+            BeanUtils.copyProperties(dgStatisticsPO, dgStatisticsListResponse);
-                BeanUtils.copyProperties(dgStatisticsPO, dgStatisticsListResponse);
+            listResponse.add(dgStatisticsListResponse);
-                listResponse.add(dgStatisticsListResponse);
-            }
         }
         return listResponse;
     }

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

@@ -155,7 +155,7 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
             if (result) {
                 // 在业务流程表中插入一条审议通过的数据
                 return AuditProcessUtil.save(this.getBaseMapper().getWorkConferenceConsider(id).getBusinessId(), DgApplyAmountInfoController.getAccount(),
-                        PromptSuccess.GZU_NAME, opinion, PromptSuccess.GZU_PROCESS_ID,"","","");
+                        PromptSuccess.GZU_NAME, opinion, PromptSuccess.GZU_PROCESS_ID,PromptSuccess.GZU_ID,"","","");
             }
         }
         // 拒绝
@@ -179,7 +179,7 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
                         if (result2) {
                             // 在业务流程表中插入一条拒绝数据(记得带上拒绝意见)
                             return AuditProcessUtil.save(this.getBaseMapper().getWorkConferenceConsider(id).getBusinessId(), DgApplyAmountInfoController.getAccount(),
-                                    PromptSuccess.GZU_NAME, opinion, PromptSuccess.GZU_PROCESS_ID,"","","");
+                                    PromptSuccess.GZU_NAME, opinion, PromptSuccess.GZU_PROCESS_ID,PromptSuccess.GZU_ID,"","","");
                         }
                     }
                 }
@@ -210,7 +210,7 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
                             if (result3) {
                                 // 在业务流程表中插入一条工作会驳回的数据
                                 return AuditProcessUtil.save(this.getBaseMapper().getWorkConferenceConsider(id).getBusinessId(), DgApplyAmountInfoController.getAccount(),
-                                        PromptSuccess.GZU_NAME, opinion, PromptSuccess.GZU_PROCESS_ID,"","","");
+                                        PromptSuccess.GZU_NAME, opinion, PromptSuccess.GZU_PROCESS_ID,PromptSuccess.GZU_ID,"","","");
                             }
                         }
                     }
@@ -262,7 +262,7 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
                     if (result2) {
                         // 在业务流程表中插入一条评委抽取成功的数据
                         return AuditProcessUtil.save(this.getBaseMapper().getWorkConferenceConsider(id).getBusinessId(), DgApplyAmountInfoController.getAccount(),
-                                PromptSuccess.GZU_NAME, null, PromptSuccess.GZU_PROCESS_ID,"","","");
+                                PromptSuccess.GZU_NAME, null, PromptSuccess.GZU_PROCESS_ID,PromptSuccess.GZU_ID,"","","");
                     }
                 }
             }

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

@@ -20,6 +20,8 @@ public class AuditProcessUtil{
 
     private static AuditProcessUtil auditProcessUtil;
 
+
+
     @PostConstruct
     public void init() {
         auditProcessUtil = this;

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceInvestigationMapper.xml

@@ -179,8 +179,8 @@
     </update>
 
     <!-- 根据业务id获取业务流程表中的最新操作角色名称(dept_name字段) -->
-    <select id="getAuditProcessLatestNameByBusinessId" parameterType="integer" resultType="string">
+    <select id="getAuditProcessLatestProcessIdByBusinessId" parameterType="integer" resultType="integer">
-        SELECT dept_name FROM dg_audit_process WHERE business_id = #{businessId}
+        SELECT process_id FROM dg_audit_process WHERE business_id = #{businessId}
         AND create_time = (SELECT MAX(create_time) FROM dg_audit_process WHERE business_id = #{businessId})
     </select>
 

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgStatisticsMapper.xml

@@ -19,14 +19,16 @@
     <!-- 业务统计列表 -->
     <select id="list" parameterType="com.daqing.financial.guarantee.model.request.DgStatisticsRequest" resultType="com.daqing.framework.domain.guarantee.po.DgStatisticsPO">
       SELECT c.name AS name,c.phone AS phone,a.presenter_id AS presenter_id,a.apply_amount AS apply_amount,a.apply_time AS apply_time,
-             a.business_type AS business_type,a.create_time AS create_time,a.business_code AS business_code,p.emp_name AS emp_name,
+             a.business_type AS business_type,a.create_time AS create_time,a.business_code AS business_code,a.id AS business_id,
-             p.status AS status,p.date_time AS date_time
+             p.role_id AS role_id,p.create_time AS operation_time
       FROM dg_apply_amount_info AS a
-      LEFT JOIN (SELECT apply_amount_info_id,emp_name,status,date_time FROM dg_audit_process WHERE (apply_amount_info_id,date_time) IN
+      LEFT JOIN (SELECT business_id,role_id,create_time FROM dg_audit_process WHERE (business_id,create_time) IN
-                 (SELECT apply_amount_info_id,MAX(date_time) FROM dg_audit_process GROUP BY apply_amount_info_id)) AS p
+                 (SELECT business_id,MAX(create_time) FROM dg_audit_process GROUP BY business_id)) AS p
-      ON a.id = p.apply_amount_info_id
+      ON a.id = p.business_id
+      LEFT JOIN crms_company_customer AS cc
+      ON a.company_id = cc.id
       LEFT JOIN crms_customer AS c
-      ON a.company_id = c.id
+      ON cc.customer_id = c.id
       WHERE c.del_or_not = 0
       <if test="sr.codeOrName != null and sr.codeOrName != ''">
           AND (a.business_code LIKE CONCAT('%',#{sr.codeOrName},'%') OR c.name LIKE CONCAT('%',#{sr.codeOrName},'%'))

dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/config/IPageConfig.java

@@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-// @Configuration
+ @Configuration
-// public class IPageConfig {
+ public class IPageConfig {
-//     @Bean
+     @Bean
-//     public PaginationInterceptor paginationInterceptor() {
+     public PaginationInterceptor paginationInterceptor() {
-//         return new PaginationInterceptor();
+         return new PaginationInterceptor();
-//     }
+     }
-// }
+ }

dq-financial-hrms-auth/src/main/resources/bootstrap.properties

@@ -1,55 +1,25 @@
 # 开发和测试环境（dev）
-#spring.application.name=dq-financial-hrms-auth
-#
-#spring.cloud.nacos.config.server-addr=192.168.31.140:8848
-#spring.cloud.nacos.config.namespace=7632bdaa-3381-4669-b3f9-2fc73be451e8
-##spring.cloud.nacos.config.group=prod
-#
-#spring.cloud.nacos.config.ext-config[0].data-id=datasource.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=mybatis.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=other.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
-
-
-#正式环境（prod）
 spring.application.name=dq-financial-hrms-auth
 
-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=b590c830-7ada-44b7-968f-e8d0c81990c4
+spring.cloud.nacos.config.namespace=7632bdaa-3381-4669-b3f9-2fc73be451e8
 #spring.cloud.nacos.config.group=prod
 
 spring.cloud.nacos.config.ext-config[0].data-id=datasource.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=mybatis.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=other.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
@@ -57,6 +27,36 @@ spring.redis.jedis.pool.max-wait=-1
 spring.redis.jedis.pool.max-idle=8
 spring.redis.jedis.pool.min-idle=0
 
+
+#正式环境（prod）
+#spring.application.name=dq-financial-hrms-auth
+#
+#spring.cloud.nacos.config.server-addr=120.78.127.12:8848
+#spring.cloud.nacos.config.namespace=b590c830-7ada-44b7-968f-e8d0c81990c4
+##spring.cloud.nacos.config.group=prod
+#
+#spring.cloud.nacos.config.ext-config[0].data-id=datasource.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=mybatis.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=other.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）
 #spring.application.name=dq-financial-hrms-auth
 #

dq-financial-hrms/src/main/resources/mapper/hrms/DeptDao.xml

@@ -19,7 +19,13 @@
     </select>
 
     <select id="getEmpDeptCount" parameterType="java.lang.Long" resultType="java.lang.Integer">
-        SELECT count(1) FROM hrms_employee_dept WHERE dept_id = #{deptId}
+        SELECT count(1) FROM hrms_employee_dept AS ed
+        LEFT JOIN hrms_employee AS e
+        ON ed.employee_id = e.id
+        LEFT JOIN hrms_user AS u
+        ON e.user_id = u.id
+        WHERE u.del_or_not = 0
+        AND dept_id = #{deptId}
     </select>
     <select id="getByPositionId" resultType="com.daqing.framework.domain.hrms.DeptEntity">
         SELECT

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

@@ -76,6 +76,8 @@ public class PromptSuccess {
 
     public static final Integer CWB_ID = 73; // 财务部
 
+    public static final Integer DB_PROCESS_ID = 2; // 担保部调查
+
     public static final Integer HG_PROCESS_ID = 5; // 合规调查进程id
 
     public static final Integer GZU_PROCESS_ID = 6; // 工作会进程id
@@ -95,4 +97,12 @@ public class PromptSuccess {
     public static final String DB_A_NAME = "担保部A角"; // 担保部A角
 
     public static final String DB_B_NAME = "担保部B角"; // 担保部B角
+
+    public static final String PERSONAL_START_CODE = "DQCZ-0001";
+
+    public static final String COMPANY_START_CODE = "DQCQ-0001";
+
+    public static final String PERSONAL_CODE = "DQCZ-";
+
+    public static final String COMPANY_CODE = "DQCQ-";
 }

dq-framework-model/pom.xml

@@ -19,7 +19,7 @@
         <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.framework</groupId>

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

@@ -39,6 +39,11 @@ public class DgStatisticsPO {
      */
     private String applyTime;
 
+    /**
+     * 业务id
+     */
+    private Integer businessId;
+
     /**
      * 业务类型
      */
@@ -50,22 +55,17 @@ public class DgStatisticsPO {
     private String businessCode;
 
     /**
-     * 创建时间
+     * 申请时间
      */
     private Date createTime;
 
     /**
-     * 审批人
+     * 审批角色id
-     */
-    private String empName;
-
-    /**
-     * 节点状态
      */
-    private String status;
+    private Integer roleId;
 
     /**
-     * 达到时间
+     * 最新操作时间
      */
-    private Date dateTime;
+    private Date operationTime;
 }

dq-framework-utils/pom.xml

@@ -18,7 +18,7 @@
         <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>org.springframework.boot</groupId>

dq-govern-gateway/pom.xml

@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.daqing.framework</groupId>
             <artifactId>dq-framework-common</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>

dq-govern-gateway/src/main/resources/bootstrap.properties

@@ -1,37 +1,16 @@
 #服务名称
-#spring.application.name=dq-govern-gateway
-##配置中心地址
-#spring.cloud.nacos.config.server-addr=192.168.31.140:8848
-#spring.cloud.nacos.config.namespace=772e2607-b929-4246-9671-ee5a36d74d25
-#
-#spring.cloud.nacos.config.ext-config[0].data-id=dq-govern-gateway.yml
-#spring.cloud.nacos.config.ext-config[0].group=dev
-#spring.cloud.nacos.config.ext-config[0].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
-
-# 正式环境（prod）
-#服务名称
 spring.application.name=dq-govern-gateway
 #配置中心地址
-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=68738215-903f-426c-8658-2dcd99b20009
+spring.cloud.nacos.config.namespace=772e2607-b929-4246-9671-ee5a36d74d25
 
 spring.cloud.nacos.config.ext-config[0].data-id=dq-govern-gateway.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.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
@@ -39,8 +18,29 @@ spring.redis.jedis.pool.max-wait=-1
 spring.redis.jedis.pool.max-idle=8
 spring.redis.jedis.pool.min-idle=0
 
-spring.servlet.multipart.max-file-size=10MB
+# 正式环境（prod）
-spring.servlet.multipart.max-request-size=10MB
+#服务名称
+#spring.application.name=dq-govern-gateway
+##配置中心地址
+#spring.cloud.nacos.config.server-addr=120.78.127.12:8848
+#spring.cloud.nacos.config.namespace=68738215-903f-426c-8658-2dcd99b20009
+#
+#spring.cloud.nacos.config.ext-config[0].data-id=dq-govern-gateway.yml
+#spring.cloud.nacos.config.ext-config[0].group=prod
+#spring.cloud.nacos.config.ext-config[0].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
+
+#spring.servlet.multipart.max-file-size=10MB
+#spring.servlet.multipart.max-request-size=10MB
 
 # 测试环境（prod）
 #服务名称