From 9a06ca337f5bf4facfcae476916efcc0a964b65d Mon Sep 17 00:00:00 2001 From: river <1376754470@qq.com> Date: Fri, 25 Dec 2020 16:57:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=9A=E5=8A=A1=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dq-financial-api/pom.xml | 2 +- .../financial/crms/config/IPageConfig.java | 2 + .../financial/crms/dao/CustomerDao.java | 2 + .../service/impl/CustomerServiceImpl.java | 23 ++++- .../src/main/resources/bootstrap.properties | 84 +++++++++---------- .../resources/mapper/crms/CustomerDao.xml | 5 +- .../DqFinancialGuaranteeApplication.java | 4 +- .../guarantee/config/IPageConfig.java | 19 ++--- .../DgComplianceInvestigationMapper.java | 2 +- .../guarantee/mapper/DgStatisticsMapper.java | 2 + .../response/DgStatisticsListResponse.java | 18 ++-- .../impl/DgApplyAmountInfoServiceImpl.java | 11 ++- .../DgAssetsInvestigationServiceImpl.java | 7 +- .../DgComplianceInvestigationServiceImpl.java | 28 +++---- .../DgGuaranteeAssignUserServiceImpl.java | 12 ++- .../DgLoanCommitteeConsiderServiceImpl.java | 8 +- .../DgMessageInvestigationServiceImpl.java | 7 +- .../service/impl/DgStatisticsServiceImpl.java | 8 +- .../DgWorkConferenceConsiderServiceImpl.java | 8 +- .../guarantee/util/AuditProcessUtil.java | 2 + .../DgComplianceInvestigationMapper.xml | 4 +- .../mapper/guarantee/DgStatisticsMapper.xml | 14 ++-- .../financial/hrauth/config/IPageConfig.java | 14 ++-- .../src/main/resources/bootstrap.properties | 72 ++++++++-------- .../main/resources/mapper/hrms/DeptDao.xml | 8 +- .../model/response/PromptSuccess.java | 10 +++ dq-framework-model/pom.xml | 2 +- .../domain/guarantee/po/DgStatisticsPO.java | 20 ++--- dq-framework-utils/pom.xml | 2 +- dq-govern-gateway/pom.xml | 2 +- .../src/main/resources/bootstrap.properties | 54 ++++++------ 31 files changed, 254 insertions(+), 202 deletions(-) diff --git a/dq-financial-api/pom.xml b/dq-financial-api/pom.xml index 8dd178b0..c8584a3e 100644 --- a/dq-financial-api/pom.xml +++ b/dq-financial-api/pom.xml @@ -18,7 +18,7 @@ com.daqing.framework dq-framework-model - 1.0-SNAPSHOT + 0.0.1-SNAPSHOT diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/config/IPageConfig.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/config/IPageConfig.java index 6001a7e0..243e1e84 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/config/IPageConfig.java +++ b/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(); } } +*/ diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java index 5863ef98..830744c7 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java @@ -36,4 +36,6 @@ public interface CustomerDao extends BaseMapper { List listCustomerId(); List queryCompanyCodeAndName(int type); + + String getCodeByType(Integer type); } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java index 51bf5f6c..c065f1e3 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java @@ -219,7 +219,12 @@ public class CustomerServiceImpl extends ServiceImpl relatedList = new ArrayList<>(); List intList = companyCustomerReq.getRelatedId(); diff --git a/dq-financial-crms/src/main/resources/bootstrap.properties b/dq-financial-crms/src/main/resources/bootstrap.properties index cea72869..fe1ce1cd 100644 --- a/dq-financial-crms/src/main/resources/bootstrap.properties +++ b/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.namespace=25ce05e2-a0eb-4842-92e4-d8b550a489dd +#配置中心地址 +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=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） #服务名称 diff --git a/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml b/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml index e77752a5..b871d350 100644 --- a/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml +++ b/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 - + + \ No newline at end of file diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/DqFinancialGuaranteeApplication.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/DqFinancialGuaranteeApplication.java index 45915ec8..e7409c32 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/DqFinancialGuaranteeApplication.java +++ b/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) { diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/config/IPageConfig.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/config/IPageConfig.java index f3c1c0bf..aaae8a3a 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/config/IPageConfig.java +++ b/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 -public class IPageConfig { - @Bean - public PaginationInterceptor paginationInterceptor() { - return new PaginationInterceptor(); - } -} -*/ +//@Configuration +//public class IPageConfig { +// @Bean +// public PaginationInterceptor paginationInterceptor() { +// return new PaginationInterceptor(); +// } +//} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java index ce6455be..267e4143 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java @@ -76,7 +76,7 @@ public interface DgComplianceInvestigationMapper extends BaseMapper - + 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}) diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgStatisticsMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgStatisticsMapper.xml index 56724aca..177bf97d 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgStatisticsMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgStatisticsMapper.xml @@ -19,14 +19,16 @@