Merge remote-tracking branch 'origin/master'

# Conflicts:
#	dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/PermissionServiceImpl.java
master
shijie 4 years ago
commit 3d35a02d86
  1. 13
      .idea/artifacts/dq_financial_crms_Web_exploded.xml
  2. 4
      .idea/compiler.xml
  3. 4
      .idea/encodings.xml
  4. 1
      .idea/sqldialects.xml
  5. 24
      dq-financial-api/pom.xml
  6. 13
      dq-financial-api/src/main/java/com/daqing/financial/DqFinancialApiApplication.java
  7. 2
      dq-financial-api/src/main/java/com/daqing/financial/config/SwaggerConfig.java
  8. 1
      dq-financial-api/src/main/java/com/daqing/financial/hrms/PermissionControllerApi.java
  9. 42
      dq-financial-crms/pom.xml
  10. 5
      dq-financial-crms/src/main/java/com/daqing/financial/crms/DqFinancialCrmsApplication.java
  11. 2
      dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java
  12. 23
      dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java
  13. 96
      dq-financial-crms/src/main/resources/bootstrap.properties
  14. 5
      dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml
  15. 35
      dq-financial-guarantee/pom.xml
  16. 4
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/DqFinancialGuaranteeApplication.java
  17. 19
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/config/IPageConfig.java
  18. 2
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java
  19. 2
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgStatisticsMapper.java
  20. 18
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsListResponse.java
  21. 11
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java
  22. 7
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgAssetsInvestigationServiceImpl.java
  23. 28
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java
  24. 12
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeAssignUserServiceImpl.java
  25. 24
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java
  26. 8
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanCommitteeConsiderServiceImpl.java
  27. 4
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java
  28. 7
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java
  29. 12
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java
  30. 8
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgStatisticsServiceImpl.java
  31. 8
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgWorkConferenceConsiderServiceImpl.java
  32. 7
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/util/AuditProcessUtil.java
  33. 106
      dq-financial-guarantee/src/main/resources/bootstrap.properties
  34. 4
      dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceInvestigationMapper.xml
  35. 14
      dq-financial-guarantee/src/main/resources/mapper/guarantee/DgStatisticsMapper.xml
  36. 11
      dq-financial-hrms-auth/pom.xml
  37. 14
      dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/config/IPageConfig.java
  38. 82
      dq-financial-hrms-auth/src/main/resources/bootstrap.properties
  39. 7
      dq-financial-hrms/pom.xml
  40. 1
      dq-financial-hrms/src/main/java/com/daqing/financial/hrms/DqFinancialHrmsApplication.java
  41. 4
      dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/DeptServiceImpl.java
  42. 106
      dq-financial-hrms/src/main/resources/bootstrap.properties
  43. 8
      dq-financial-hrms/src/main/resources/mapper/hrms/DeptDao.xml
  44. 48
      dq-framework-common/pom.xml
  45. 10
      dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java
  46. 23
      dq-framework-model/pom.xml
  47. 5
      dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgAuditProcess.java
  48. 20
      dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/DgStatisticsPO.java
  49. 38
      dq-framework-utils/pom.xml
  50. 33
      dq-govern-gateway/pom.xml
  51. 66
      dq-govern-gateway/src/main/resources/bootstrap.properties
  52. 116
      financial.ipr
  53. 48
      pom.xml

@ -0,0 +1,13 @@
<component name="ArtifactManager">
<artifact type="exploded-war" name="dq-financial-crms:Web exploded">
<output-path>$PROJECT_DIR$/out/artifacts/dq_financial_crms_Web_exploded</output-path>
<root id="root">
<element id="javaee-facet-resources" facet="dq-financial-crms/web/Web" />
<element id="directory" name="WEB-INF">
<element id="directory" name="classes">
<element id="module-output" name="dq-financial-crms" />
</element>
</element>
</root>
</artifact>
</component>

@ -25,12 +25,16 @@
</component>
<component name="JavacSettings">
<option name="ADDITIONAL_OPTIONS_OVERRIDE">
<module name="dq-financial-api" options="-parameters" />
<module name="dq-financial-crms" options="-parameters" />
<module name="dq-financial-crms-auth" options="-parameters" />
<module name="dq-financial-guarantee" options="-parameters" />
<module name="dq-financial-hrms" options="-parameters" />
<module name="dq-financial-hrms-auth" options="-parameters" />
<module name="dq-financial-workflow" options="-parameters" />
<module name="dq-framework-common" options="-parameters" />
<module name="dq-framework-model" options="-parameters" />
<module name="dq-framework-utils" options="-parameters" />
<module name="dq-govern-gateway" options="-parameters" />
</option>
</component>

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
<file url="file://$PROJECT_DIR$/dq-financial-api/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/dq-financial-crms" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/dq-financial-crms/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/dq-financial-crms/src/main/resources" charset="UTF-8" />
@ -12,6 +13,9 @@
<file url="file://$PROJECT_DIR$/dq-financial-hrms-auth/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/dq-financial-hrms/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/dq-financial-hrms/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/dq-framework-common/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/dq-framework-model/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/dq-framework-utils/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/dq-govern-gateway" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/dq-govern-gateway/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/dq-govern-gateway/src/main/resources" charset="UTF-8" />

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="SqlDialectMappings">
<file url="file://$PROJECT_DIR$/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgAuditProcessMapper.xml" dialect="GenericSQL" />
<file url="file://$PROJECT_DIR$/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml" dialect="GenericSQL" />
<file url="file://$PROJECT_DIR$/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanNoticeMapper.xml" dialect="GenericSQL" />
<file url="file://$PROJECT_DIR$/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgPaymentConfirmationConsiderMapper.xml" dialect="GenericSQL" />

@ -9,17 +9,16 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.daqing.financial</groupId>
<artifactId>dq-financial-api</artifactId>
<description>系统API统一定义</description>
<name>系统API统一定义api</name>
<dependencies>
<dependency>
<groupId>com.daqing.framework</groupId>
<artifactId>dq-framework-model</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
@ -27,12 +26,19 @@
<artifactId>spring-boot-starter-web</artifactId>
<version>2.1.8.RELEASE</version>
</dependency>
<!--<dependency>
<groupId>com.daqing.financial.guarantee</groupId>
<artifactId>dq-financial-guarantee</artifactId>
<version>0.0.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>-->
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>

@ -1,13 +0,0 @@
package com.daqing.financial;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
@SpringBootApplication
@EnableSwagger2
public class DqFinancialApiApplication {
public static void main(String[] args) {
SpringApplication.run(DqFinancialApiApplication.class, args);
}
}

@ -19,8 +19,6 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
*/
@Configuration
@EnableSwagger2
//@Profile({"dev","test"})
//@ConditionalOnProperty(name = "swagger.enable", havingValue = "true")
public class SwaggerConfig {
@Bean

@ -1,7 +1,6 @@
package com.daqing.financial.hrms;
import com.daqing.framework.domain.hrms.PermissionEntity;
import com.daqing.framework.domain.hrms.request.DeptAddRequest;
import com.daqing.framework.model.response.ResponseResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

@ -3,16 +3,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.8.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
<artifactId>financial</artifactId>
<groupId>com.daqing.financial</groupId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>com.daqing.financial</groupId>
<artifactId>dq-financial-crms</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>dq-financial-crms</name>
<description>大庆智慧金融平台-客户资源管理服务</description>
<name>客户资源管理服务crms</name>
<properties>
<java.version>1.8</java.version>
@ -82,25 +79,16 @@
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<!-- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>-->
</plugins>
</build>
<!-- <build>-->
<!-- <plugins>-->
<!-- <plugin>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-maven-plugin</artifactId>-->
<!-- <configuration>-->
<!-- <skip>true</skip>-->
<!-- </configuration>-->
<!-- </plugin>-->
<!-- </plugins>-->
<!-- </build>-->
</project>

@ -1,18 +1,15 @@
package com.daqing.financial.crms;
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;
@EnableFeignClients(basePackages = "com.daqing.financial.crms.feign")
@EnableDiscoveryClient
@SpringBootApplication
@ComponentScan(basePackages = "com.daqing")
@Import({SecurityConfig.class})
@ComponentScan("com.daqing")
public class DqFinancialCrmsApplication {
public static void main(String[] args) {

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

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

@ -1,26 +1,61 @@
# 开发和测试环境(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=192.168.31.140:8848
#spring.cloud.nacos.config.namespace=1f69d47e-0aeb-4a1e-8ab4-0e84dfb86354
###配置中心地址
#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=dev
#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=dev
#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=dev
#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=123456
#spring.redis.password=dq123456
#spring.redis.database=0
#spring.redis.timeout=30000
#spring.redis.jedis.pool.max-active=8
@ -28,17 +63,13 @@
#spring.redis.jedis.pool.max-idle=8
#spring.redis.jedis.pool.min-idle=0
#请求处理的超时时间
ribbon.ReadTimeout: 120000
#请求连接的超时时间
ribbon.ConnectTimeout: 120000
# 正式环境(prod)
# 测试环境(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.server-addr=127.0.0.1:8848
#spring.cloud.nacos.config.namespace=1912aa66-6e18-4680-8943-5b8fae71414c
##spring.cloud.nacos.config.group=prod
#
#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
@ -55,41 +86,10 @@ ribbon.ConnectTimeout: 120000
#
#spring.redis.host=127.0.0.1
#spring.redis.port=6379
#spring.redis.password=dq123456
#spring.redis.password=
#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-crms
#配置中心地址
spring.cloud.nacos.config.server-addr=127.0.0.1:8848
spring.cloud.nacos.config.namespace=1912aa66-6e18-4680-8943-5b8fae71414c
#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=
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.redis.jedis.pool.min-idle=0

@ -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>

@ -3,16 +3,15 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.8.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
<artifactId>financial</artifactId>
<groupId>com.daqing.financial</groupId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>com.daqing.financial.guarantee</groupId>
<artifactId>dq-financial-guarantee</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>dq-financial-guarantee</name>
<description>大庆智慧金融平台-担保业务管理系统</description>
<name>担保业务管理系统guarantee</name>
<properties>
<java.version>1.8</java.version>
@ -35,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>
@ -64,12 +62,6 @@
<version>1.8.2</version>
</dependency>
<!-- lombok需要的jar包 -->
<!-- <dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.12</version>
</dependency>-->
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
@ -82,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>
@ -95,13 +93,4 @@
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>

@ -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) {

@ -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
public class IPageConfig {
@Bean
public PaginationInterceptor paginationInterceptor() {
return new PaginationInterceptor();
}
}
*/
//@Configuration
//public class IPageConfig {
// @Bean
// public PaginationInterceptor paginationInterceptor() {
// return new PaginationInterceptor();
// }
//}

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

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

@ -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")
private Date dateTime;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date operationTime;
@ApiModelProperty("提单人姓名")
@ExcelProperty(value = "提单人",index = 10)

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

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

@ -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());
if (PromptSuccess.DB_A_NAME.equals(roleName) || PromptSuccess.DB_B_NAME.equals(roleName)) {
Integer processId = this.getBaseMapper().getAuditProcessLatestProcessIdByBusinessId(this.getComplianceInvestigation(iid).getBusinessId());
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,"","","");
}
}
}

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

@ -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用户的审核状态为驳回,操作状态为已处理

@ -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,"","","");
}
}
}

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

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

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

@ -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);
listResponse.add(dgStatisticsListResponse);
}
BeanUtils.copyProperties(dgStatisticsPO, dgStatisticsListResponse);
listResponse.add(dgStatisticsListResponse);
}
return listResponse;
}

@ -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,"","","");
}
}
}

@ -20,18 +20,21 @@ public class AuditProcessUtil{
private static AuditProcessUtil auditProcessUtil;
@PostConstruct
public void init() {
auditProcessUtil = this;
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);

@ -1,25 +1,66 @@
##服务名称
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=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.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=dev
#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=dev
#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=dev
#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=123456
#spring.redis.password=dq123456
#spring.redis.database=0
#spring.redis.timeout=30000
#spring.redis.jedis.pool.max-active=8
@ -27,24 +68,13 @@
#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)
#测试服务器环境(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.server-addr=127.0.0.1:8848
#spring.cloud.nacos.config.namespace=66fce8ff-5ca8-412d-bc06-b8730fa65869
#
#spring.cloud.nacos.config.ext-config[0].data-id=dq-financial-guarantee.yml
#spring.cloud.nacos.config.ext-config[0].group=prod
@ -60,40 +90,10 @@ spring.servlet.multipart.max-file-size=10MB
#
#spring.redis.host=127.0.0.1
#spring.redis.port=6379
#spring.redis.password=dq123456
#spring.redis.password=
#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-guarantee
#配置中心地址
spring.cloud.nacos.config.server-addr=127.0.0.1:8848
spring.cloud.nacos.config.namespace=66fce8ff-5ca8-412d-bc06-b8730fa65869
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=
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

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

@ -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,
p.status AS status,p.date_time AS date_time
a.business_type AS business_type,a.create_time AS create_time,a.business_code AS business_code,a.id AS business_id,
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
(SELECT apply_amount_info_id,MAX(date_time) FROM dg_audit_process GROUP BY apply_amount_info_id)) AS p
ON a.id = p.apply_amount_info_id
LEFT JOIN (SELECT business_id,role_id,create_time FROM dg_audit_process WHERE (business_id,create_time) IN
(SELECT business_id,MAX(create_time) FROM dg_audit_process GROUP BY business_id)) AS p
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},'%'))

@ -3,16 +3,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.8.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
<artifactId>financial</artifactId>
<groupId>com.daqing.financial</groupId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>com.daqing.financial</groupId>
<artifactId>dq-financial-hrms-auth</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>dq-financial-hrms-auth</name>
<description>大庆智慧金融平台-人资用户认证服务</description>
<name>人资用户认证服务hrms-auth</name>
<properties>
<java.version>1.8</java.version>

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

@ -1,25 +1,55 @@
# 开发和测试环境(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=192.168.31.140:8848
#spring.cloud.nacos.config.namespace=7632bdaa-3381-4669-b3f9-2fc73be451e8
#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=dev
#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=dev
#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=dev
#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=123456
#spring.redis.password=dq123456
#spring.redis.database=0
#spring.redis.timeout=30000
#spring.redis.jedis.pool.max-active=8
@ -27,12 +57,11 @@
#spring.redis.jedis.pool.max-idle=8
#spring.redis.jedis.pool.min-idle=0
#正式环境(prod)
#测试环境(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.server-addr=127.0.0.1:8848
#spring.cloud.nacos.config.namespace=d4e087eb-2a9b-4ef1-9f22-76269a30d081
##spring.cloud.nacos.config.group=prod
#
#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
@ -49,39 +78,10 @@
#
#spring.redis.host=127.0.0.1
#spring.redis.port=6379
#spring.redis.password=dq123456
#spring.redis.password=
#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=127.0.0.1:8848
spring.cloud.nacos.config.namespace=d4e087eb-2a9b-4ef1-9f22-76269a30d081
#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=
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.redis.jedis.pool.min-idle=0

@ -11,8 +11,7 @@
<groupId>com.daqing.financial</groupId>
<artifactId>dq-financial-hrms</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>dq-financial-hrms</name>
<description>大庆智慧金融平台-人力资源管理服务</description>
<name>人力资源管理服务hrms</name>
<properties>
<java.version>1.8</java.version>
@ -39,12 +38,12 @@
<artifactId>ooxml-schemas</artifactId>
<version>1.0</version>
</dependency>
<!-- <dependency>
<dependency>
<groupId>com.daqing.financial</groupId>
<artifactId>dq-financial-hrms-auth</artifactId>
<version>0.0.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>-->
</dependency>
<!-- <dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>

@ -5,6 +5,7 @@ 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.ComponentScans;
import org.springframework.scheduling.annotation.EnableScheduling;
@EnableFeignClients(basePackages = "com.daqing.financial.hrms.feign")

@ -30,10 +30,10 @@ import java.util.stream.Collectors;
@Service("deptService")
public class DeptServiceImpl extends ServiceImpl<DeptDao, DeptEntity> implements DeptService {
@Resource
@Autowired
private DeptDao deptDao;
@Resource
@Autowired
private EmployeeDao employeeDao;
/**

@ -1,47 +1,80 @@
#服务名称
spring.application.name=dq-financial-hrms
#配置中心地址
spring.cloud.nacos.config.server-addr=192.168.31.140:8848
spring.cloud.nacos.config.namespace=4c56c2f9-b6a3-4e7b-88b8-b1001e86dfd6
#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: 30000
spring.servlet.multipart.max-file-size=10MB
spring.servlet.multipart.max-request-size=10MB
# 正式环境(prod)
#服务名称
#spring.application.name=dq-financial-hrms
##配置中心地址
#spring.cloud.nacos.config.server-addr=192.168.31.140:8848
#spring.cloud.nacos.config.namespace=4c56c2f9-b6a3-4e7b-88b8-b1001e86dfd6
#spring.cloud.nacos.config.server-addr=120.78.127.12:8848
#spring.cloud.nacos.config.namespace=69614b55-1521-421c-ac58-dbe4a5b01b43
##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].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=dev
#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=dev
#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=123456
#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
#请求处理的超时时间
ribbon.ReadTimeout: 120000
#请求连接的超时时间
ribbon.ConnectTimeout: 30000
spring.servlet.multipart.max-file-size=10MB
spring.servlet.multipart.max-request-size=10MB
# 正式环境(prod)
# 测试环境(prod)
#服务名称
#spring.application.name=dq-financial-hrms
##配置中心地址
#spring.cloud.nacos.config.server-addr=120.78.127.12:8848
#spring.cloud.nacos.config.namespace=69614b55-1521-421c-ac58-dbe4a5b01b43
#spring.cloud.nacos.config.server-addr=127.0.0.1:8848
#spring.cloud.nacos.config.namespace=ed20f51f-6038-44e6-8e28-7ac72625e7b0
##spring.cloud.nacos.config.group=prod
#
#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
@ -58,43 +91,10 @@ spring.servlet.multipart.max-request-size=10MB
#
#spring.redis.host=127.0.0.1
#spring.redis.port=6379
#spring.redis.password=dq123456
#spring.redis.password=
#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)
#服务名称
spring.application.name=dq-financial-hrms
#配置中心地址
spring.cloud.nacos.config.server-addr=127.0.0.1:8848
spring.cloud.nacos.config.namespace=ed20f51f-6038-44e6-8e28-7ac72625e7b0
#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=
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.redis.jedis.pool.min-idle=0

@ -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

@ -5,29 +5,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.daqing.framework</groupId>
<artifactId>dq-framework-common</artifactId>
<version>1.0-SNAPSHOT</version>
<description>每一个微服务公共的依赖</description>
<build>
<plugins>
<!-- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>7</source>
<target>7</target>
</configuration>
</plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>
<name>微服务公共的依赖common</name>
<parent>
<artifactId>financial</artifactId>
<groupId>com.daqing.financial</groupId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<dependencies>
<!--导入mysql驱动-->
@ -118,13 +101,6 @@
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
</dependency>
<!--jwt-->
<!--<dependency>
<groupId>com.auth0</groupId>
<artifactId>java-jwt</artifactId>
<version>3.3.0</version>
</dependency>-->
<!--fastJson-->
<dependency>
<groupId>com.alibaba</groupId>
@ -166,4 +142,16 @@
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>

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

@ -6,15 +6,20 @@
<groupId>com.daqing.framework</groupId>
<artifactId>dq-framework-model</artifactId>
<version>1.0-SNAPSHOT</version>
<description>统一管理项目涉及到的实体类</description>
<parent>
<artifactId>financial</artifactId>
<groupId>com.daqing.financial</groupId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<name>统一管理实体类model</name>
<dependencies>
<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>
@ -22,4 +27,16 @@
<version>0.0.1-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>

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

@ -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;
/**
* 审批人
*/
private String empName;
/**
* 节点状态
* 审批角色id
*/
private String status;
private Integer roleId;
/**
* 达到时间
* 最新操作时间
*/
private Date dateTime;
private Date operationTime;
}

@ -11,36 +11,14 @@
<groupId>com.daqing.framework</groupId>
<artifactId>dq-framework-utils</artifactId>
<name>系统通用的工具类utils</name>
<description>系统通用的工具类</description>
<build>
<plugins>
<!-- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>7</source>
<target>7</target>
</configuration>
</plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<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>
@ -75,4 +53,16 @@
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>

@ -11,8 +11,7 @@
<groupId>com.daqing.financial</groupId>
<artifactId>dq-govern-gateway</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>dq-govern-gateway</name>
<description>大庆智慧金融平台-网关服务</description>
<name>网关服务gateway</name>
<properties>
<java.version>1.8</java.version>
@ -24,39 +23,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>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-gateway</artifactId>
</dependency>
<!--<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.8.1</version>
</dependency>-->
<!-- <dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.70</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.12</version>
</dependency>
-->
<!-- <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>-->
</dependencies>

@ -1,16 +1,37 @@
#服务名称
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=192.168.31.140:8848
#spring.cloud.nacos.config.namespace=772e2607-b929-4246-9671-ee5a36d74d25
#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=dev
#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=123456
#spring.redis.password=dq123456
#spring.redis.database=0
#spring.redis.timeout=30000
#spring.redis.jedis.pool.max-active=8
@ -18,12 +39,15 @@
#spring.redis.jedis.pool.max-idle=8
#spring.redis.jedis.pool.min-idle=0
# 正式环境(prod)
#spring.servlet.multipart.max-file-size=10MB
#spring.servlet.multipart.max-request-size=10MB
# 测试环境(prod)
#服务名称
#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.server-addr=127.0.0.1:8848
#spring.cloud.nacos.config.namespace=8a913b60-2335-4657-9048-7392c8d0899f
#
#spring.cloud.nacos.config.ext-config[0].data-id=dq-govern-gateway.yml
#spring.cloud.nacos.config.ext-config[0].group=prod
@ -31,7 +55,7 @@
#
#spring.redis.host=127.0.0.1
#spring.redis.port=6379
#spring.redis.password=dq123456
#spring.redis.password=
#spring.redis.database=0
#spring.redis.timeout=30000
#spring.redis.jedis.pool.max-active=8
@ -40,28 +64,4 @@
#spring.redis.jedis.pool.min-idle=0
#
#spring.servlet.multipart.max-file-size=10MB
#spring.servlet.multipart.max-request-size=10MB
# 测试环境(prod)
#服务名称
spring.application.name=dq-govern-gateway
#配置中心地址
spring.cloud.nacos.config.server-addr=127.0.0.1:8848
spring.cloud.nacos.config.namespace=8a913b60-2335-4657-9048-7392c8d0899f
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=
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
#spring.servlet.multipart.max-request-size=10MB

@ -0,0 +1,116 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<project version="4" relativePaths="false">
<component name="ProjectRootManager" version="2" assert-keyword="true" project-jdk-name="1.8" jdk-15="true"/>
<component name="CodeStyleManager">
<option name="USE_DEFAULT_CODE_STYLE_SCHEME" value="true"/>
<option name="CODE_STYLE_SCHEME" value=""/>
</component>
<component name="libraryTable"/>
<component name="CompilerConfiguration">
<option name="DEFAULT_COMPILER" value="Javac"/>
<option name="CLEAR_OUTPUT_DIRECTORY" value="false"/>
<!--
<wildcardResourcePatterns>
<entry name="${wildcardResourcePattern}"/>
</wildcardResourcePatterns>
-->
<wildcardResourcePatterns>
<entry name="!?*.java"/>
</wildcardResourcePatterns>
</component>
<component name="JavacSettings">
<option name="DEBUGGING_INFO" value="true"/>
<option name="GENERATE_NO_WARNINGS" value="false"/>
<option name="DEPRECATION" value="true"/>
<option name="ADDITIONAL_OPTIONS_STRING" value=""/>
<option name="MAXIMUM_HEAP_SIZE" value="128"/>
<option name="USE_GENERICS_COMPILER" value="false"/>
</component>
<component name="JikesSettings">
<option name="DEBUGGING_INFO" value="true"/>
<option name="DEPRECATION" value="true"/>
<option name="GENERATE_NO_WARNINGS" value="false"/>
<option name="GENERATE_MAKE_FILE_DEPENDENCIES" value="false"/>
<option name="DO_FULL_DEPENDENCE_CHECK" value="false"/>
<option name="IS_INCREMENTAL_MODE" value="false"/>
<option name="IS_EMACS_ERRORS_MODE" value="true"/>
<option name="ADDITIONAL_OPTIONS_STRING" value=""/>
<option name="MAXIMUM_HEAP_SIZE" value="128"/>
</component>
<component name="AntConfiguration">
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false"/>
<option name="FILTER_TARGETS" value="false"/>
</component>
<component name="JavadocGenerationManager">
<option name="OUTPUT_DIRECTORY"/>
<option name="OPTION_SCOPE" value="protected"/>
<option name="OPTION_HIERARCHY" value="false"/>
<option name="OPTION_NAVIGATOR" value="false"/>
<option name="OPTION_INDEX" value="false"/>
<option name="OPTION_SEPARATE_INDEX" value="false"/>
<option name="OPTION_USE_1_1" value="false"/>
<option name="OPTION_DOCUMENT_TAG_USE" value="false"/>
<option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false"/>
<option name="OPTION_DOCUMENT_TAG_VERSION" value="false"/>
<option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="false"/>
<option name="OPTION_DEPRECATED_LIST" value="false"/>
<option name="OTHER_OPTIONS"/>
<option name="HEAP_SIZE"/>
<option name="OPEN_IN_BROWSER" value="false"/>
</component>
<component name="JUnitProjectSettings">
<option name="TEST_RUNNER" value="UI"/>
</component>
<component name="EntryPointsManager">
<entry_points/>
</component>
<component name="DataSourceManager"/>
<component name="ExportToHTMLSettings">
<option name="PRINT_LINE_NUMBERS" value="false"/>
<option name="OPEN_IN_BROWSER" value="false"/>
<option name="OUTPUT_DIRECTORY"/>
</component>
<component name="ImportConfiguration">
<option name="VENDOR"/>
<option name="RELEASE_TAG"/>
<option name="LOG_MESSAGE"/>
<option name="CHECKOUT_AFTER_IMPORT" value="true"/>
</component>
<component name="ProjectModuleManager">
<modules>
<!-- module filepath="$$PROJECT_DIR$$/${pom.artifactId}.iml"/ -->
<module filepath="$PROJECT_DIR$/financial.iml"/>
<module filepath="$PROJECT_DIR$/dq-framework-common/dq-framework-common.iml"/>
<module filepath="$PROJECT_DIR$/dq-framework-model/dq-framework-model.iml"/>
<module filepath="$PROJECT_DIR$/dq-framework-utils/dq-framework-utils.iml"/>
<module filepath="$PROJECT_DIR$/dq-financial-api/dq-financial-api.iml"/>
<module filepath="$PROJECT_DIR$/dq-financial-hrms/dq-financial-hrms.iml"/>
<module filepath="$PROJECT_DIR$/dq-financial-hrms-auth/dq-financial-hrms-auth.iml"/>
<module filepath="$PROJECT_DIR$/dq-financial-crms/dq-financial-crms.iml"/>
<module filepath="$PROJECT_DIR$/dq-govern-gateway/dq-govern-gateway.iml"/>
<module filepath="$PROJECT_DIR$/dq-financial-guarantee/dq-financial-guarantee.iml"/>
</modules>
</component>
<UsedPathMacros>
<!--<macro name="cargo"></macro>-->
</UsedPathMacros>
</project>

@ -1,14 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.8.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.daqing.financial</groupId>
<artifactId>financial</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>financial</name>
<description>聚合服务</description>
<name>大庆智慧金融平台</name>
<packaging>pom</packaging>
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<modules>
<module>dq-framework-common</module>
<module>dq-framework-model</module>
@ -17,8 +30,35 @@
<module>dq-financial-hrms</module>
<module>dq-financial-hrms-auth</module>
<module>dq-financial-crms</module>
<module>dq-govern-gateway</module>
<!--<module>dq-financial-workflow</module>-->
<module>dq-financial-guarantee</module>
</modules>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<!--忽略打包时出现的【Failed to execute goal org.apache.maven.plugins:maven-surefire-plugin】错误 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>

Loading…
Cancel
Save