diff --git a/.idea/artifacts/dq_financial_crms_Web_exploded.xml b/.idea/artifacts/dq_financial_crms_Web_exploded.xml new file mode 100644 index 00000000..24037e04 --- /dev/null +++ b/.idea/artifacts/dq_financial_crms_Web_exploded.xml @@ -0,0 +1,13 @@ + + + $PROJECT_DIR$/out/artifacts/dq_financial_crms_Web_exploded + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 13d90be3..89d5c3e1 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -25,12 +25,16 @@ diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 7f97a975..8703e7ad 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -1,6 +1,7 @@ + @@ -12,6 +13,9 @@ + + + diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml index 7f3f3332..ebb0ac7a 100644 --- a/.idea/sqldialects.xml +++ b/.idea/sqldialects.xml @@ -1,6 +1,7 @@ + diff --git a/dq-financial-api/pom.xml b/dq-financial-api/pom.xml index 90eb2948..c8584a3e 100644 --- a/dq-financial-api/pom.xml +++ b/dq-financial-api/pom.xml @@ -9,17 +9,16 @@ 4.0.0 - com.daqing.financial dq-financial-api - 系统API统一定义 + 系统API统一定义api com.daqing.framework dq-framework-model - 1.0-SNAPSHOT + 0.0.1-SNAPSHOT @@ -27,12 +26,19 @@ spring-boot-starter-web 2.1.8.RELEASE - + + + + + org.springframework.boot + spring-boot-maven-plugin + + true + + + + + \ No newline at end of file diff --git a/dq-financial-api/src/main/java/com/daqing/financial/DqFinancialApiApplication.java b/dq-financial-api/src/main/java/com/daqing/financial/DqFinancialApiApplication.java deleted file mode 100644 index 96efe364..00000000 --- a/dq-financial-api/src/main/java/com/daqing/financial/DqFinancialApiApplication.java +++ /dev/null @@ -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); - } -} diff --git a/dq-financial-api/src/main/java/com/daqing/financial/config/SwaggerConfig.java b/dq-financial-api/src/main/java/com/daqing/financial/config/SwaggerConfig.java index eb8759e3..1994fbf3 100644 --- a/dq-financial-api/src/main/java/com/daqing/financial/config/SwaggerConfig.java +++ b/dq-financial-api/src/main/java/com/daqing/financial/config/SwaggerConfig.java @@ -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 diff --git a/dq-financial-api/src/main/java/com/daqing/financial/hrms/PermissionControllerApi.java b/dq-financial-api/src/main/java/com/daqing/financial/hrms/PermissionControllerApi.java index b77513a7..19835153 100644 --- a/dq-financial-api/src/main/java/com/daqing/financial/hrms/PermissionControllerApi.java +++ b/dq-financial-api/src/main/java/com/daqing/financial/hrms/PermissionControllerApi.java @@ -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; diff --git a/dq-financial-crms/pom.xml b/dq-financial-crms/pom.xml index f6f86562..54f97d16 100644 --- a/dq-financial-crms/pom.xml +++ b/dq-financial-crms/pom.xml @@ -3,16 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.boot - spring-boot-starter-parent - 2.1.8.RELEASE - + financial + com.daqing.financial + 0.0.1-SNAPSHOT - com.daqing.financial dq-financial-crms 0.0.1-SNAPSHOT - dq-financial-crms - 大庆智慧金融平台-客户资源管理服务 + 客户资源管理服务crms 1.8 @@ -82,25 +79,16 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - - + + + + + + + + + + + diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/DqFinancialCrmsApplication.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/DqFinancialCrmsApplication.java index 73319226..1cae2ee9 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/DqFinancialCrmsApplication.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/DqFinancialCrmsApplication.java @@ -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) { 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 da7762ac..fe1ce1cd 100644 --- a/dq-financial-crms/src/main/resources/bootstrap.properties +++ b/dq-financial-crms/src/main/resources/bootstrap.properties @@ -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 \ No newline at end of file +#spring.redis.jedis.pool.min-idle=0 \ No newline at end of file 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/pom.xml b/dq-financial-guarantee/pom.xml index 7c224442..8b487c7b 100644 --- a/dq-financial-guarantee/pom.xml +++ b/dq-financial-guarantee/pom.xml @@ -3,16 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.boot - spring-boot-starter-parent - 2.1.8.RELEASE - + financial + com.daqing.financial + 0.0.1-SNAPSHOT + com.daqing.financial.guarantee dq-financial-guarantee 0.0.1-SNAPSHOT - dq-financial-guarantee - 大庆智慧金融平台-担保业务管理系统 + 担保业务管理系统guarantee 1.8 @@ -35,14 +34,13 @@ com.daqing.framework dq-framework-common - 1.0-SNAPSHOT + 0.0.1-SNAPSHOT com.daqing.financial dq-financial-api 0.0.1-SNAPSHOT - compile org.springframework.boot @@ -64,12 +62,6 @@ 1.8.2 - - org.freemarker freemarker @@ -82,6 +74,12 @@ mybatis-plus-boot-starter 3.0.7.1 + + com.daqing.framework + dq-framework-model + 0.0.1-SNAPSHOT + compile + @@ -95,13 +93,4 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - - 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 0){ //获取之前指定的a角用户 @@ -243,7 +243,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl 0){ //更新a角 @@ -302,7 +302,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl 0){ //根据业务id查询贷审会数据 @@ -342,7 +342,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl 0){ //更新法规部经理数据 @@ -466,7 +466,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl 0){ //更新法规部经理数据 @@ -528,7 +528,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl 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 tempB = new QueryWrapper<>(); @@ -577,7 +577,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl 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 tempB = new QueryWrapper<>(); @@ -618,7 +618,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl 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 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 tempB = new QueryWrapper<>(); @@ -717,7 +717,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl 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 tempB = new QueryWrapper<>(); @@ -758,7 +758,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl 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用户的审核状态为驳回，操作状态为已处理 diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanCommitteeConsiderServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanCommitteeConsiderServiceImpl.java index d868089f..916898ef 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanCommitteeConsiderServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanCommitteeConsiderServiceImpl.java @@ -146,7 +146,7 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl 0){ QueryWrapper businessProcessStatusQueryWrapper = new QueryWrapper<>(); @@ -142,7 +142,7 @@ public class DgLoanNoticeServiceImpl extends ServiceImpl 0){ QueryWrapper queryWrapper = new QueryWrapper<>(); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java index 4c187832..713866e0 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgMessageInvestigationServiceImpl.java @@ -278,7 +278,7 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl 0){ @@ -183,7 +183,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl 0){ QueryWrapper wrapperTemp = new QueryWrapper<>(); @@ -212,7 +212,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl 0){ //更新法规部经理数据 @@ -275,7 +275,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl 0){ @@ -319,7 +319,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl 0){ QueryWrapper queryWrapperCwb = new QueryWrapper<>(); @@ -354,7 +354,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl 0){ QueryWrapper queryWrapperT = new QueryWrapper<>(); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgStatisticsServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgStatisticsServiceImpl.java index f9f921d8..844ea0a3 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgStatisticsServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgStatisticsServiceImpl.java @@ -334,16 +334,12 @@ public class DgStatisticsServiceImpl extends ServiceImpl - + 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 @@