diff --git a/dq-financial-crms/pom.xml b/dq-financial-crms/pom.xml index 732c1c06..76cc234e 100644 --- a/dq-financial-crms/pom.xml +++ b/dq-financial-crms/pom.xml @@ -21,12 +21,6 @@ - - com.daqing.financial - dq-financial-hrms-auth - 0.0.1-SNAPSHOT - compile - com.daqing.financial dq-financial-api 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 1cae2ee9..506f141f 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 @@ -6,7 +6,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.ComponentScan; -@EnableFeignClients(basePackages = "com.daqing.financial.crms.feign") +@EnableFeignClients({"com.daqing.framework.feign","com.daqing.financial.crms.feign"}) @EnableDiscoveryClient @SpringBootApplication @ComponentScan("com.daqing") 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 a48778d6..6001a7e0 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,13 +1,13 @@ -//package com.daqing.financial.crms.config; -// -//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(); -// } -//} +package com.daqing.financial.crms.config; + +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(); + } +} diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCompanyPersonalController.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCompanyPersonalController.java index f3689f1c..507adcad 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCompanyPersonalController.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCompanyPersonalController.java @@ -4,11 +4,11 @@ package com.daqing.financial.crms.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.daqing.financial.crms.service.ICrmsCompanyPersonalService; import com.daqing.financial.crms.service.ICrmsCustomerRelatedService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; +import com.daqing.framework.annotation.Log; import com.daqing.framework.domain.crms.CrmsCompanyPersonal; import com.daqing.framework.domain.crms.CrmsCustomerRelated; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.utils.PageUtils; import io.swagger.annotations.Api; diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCustomerRelatedController.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCustomerRelatedController.java index 2ca07eb6..e036103f 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCustomerRelatedController.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCustomerRelatedController.java @@ -2,11 +2,10 @@ package com.daqing.financial.crms.controller; import com.daqing.financial.crms.service.ICrmsCustomerRelatedService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; -import com.daqing.framework.domain.crms.CrmsCompanyPersonal; +import com.daqing.framework.annotation.Log; import com.daqing.framework.domain.crms.CrmsCustomerRelated; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.ResponseResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java index 1365f2c9..10ead555 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java @@ -3,17 +3,14 @@ package com.daqing.financial.crms.controller; import com.daqing.financial.crms.CustomerControllerApi; import com.daqing.financial.crms.model.request.CompanyCustomerRequest; import com.daqing.financial.crms.service.CustomerService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; -import com.daqing.framework.domain.crms.CompanyCustomerEntity; +import com.daqing.framework.annotation.Log; import com.daqing.framework.domain.crms.CustomerEntity; -import com.daqing.framework.domain.crms.ext.CustomerCompanyTOI; -import com.daqing.framework.domain.crms.ext.CustomerCompanyTOU; import com.daqing.framework.domain.crms.ext.CustomerPersonalTOI; import com.daqing.framework.domain.crms.ext.CustomerPersonalTOU; import com.daqing.framework.domain.crms.request.CustomerRequest; import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.CommonCode; import com.daqing.framework.model.response.PromptSuccess; import com.daqing.framework.model.response.ResponseResult; diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerWorkbenchController.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerWorkbenchController.java index e4a905b9..d4148c97 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerWorkbenchController.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerWorkbenchController.java @@ -3,15 +3,13 @@ package com.daqing.financial.crms.controller; import com.daqing.financial.crms.CustomerWorkbenchControllerApi; import com.daqing.financial.crms.model.request.CompanyCustomerRequest; import com.daqing.financial.crms.service.CustomerWorkbenchService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; -import com.daqing.framework.domain.crms.ext.CustomerCompanyTOI; -import com.daqing.framework.domain.crms.ext.CustomerCompanyTOU; +import com.daqing.framework.annotation.Log; import com.daqing.framework.domain.crms.ext.CustomerPersonalTOI; import com.daqing.framework.domain.crms.ext.CustomerPersonalTOU; import com.daqing.framework.domain.crms.request.CustomerWorkbenchRequest; import com.daqing.framework.domain.hrms.EmployeeEntity; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.CommonCode; import com.daqing.framework.model.response.PromptSuccess; import com.daqing.framework.model.response.ResponseResult; diff --git a/dq-financial-guarantee/pom.xml b/dq-financial-guarantee/pom.xml index 75a00711..786e03bc 100644 --- a/dq-financial-guarantee/pom.xml +++ b/dq-financial-guarantee/pom.xml @@ -20,12 +20,6 @@ - - com.daqing.financial - dq-financial-hrms-auth - 0.0.1-SNAPSHOT - compile - org.springframework.boot 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 4252fa98..1420676d 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,23 +1,21 @@ 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; -@EnableFeignClients(basePackages = "com.daqing.financial.guarantee.feign") +@EnableFeignClients({"com.daqing.framework.feign","com.daqing.financial.guarantee.feign"}) @EnableDiscoveryClient @SpringBootApplication @EnableScheduling @EnableSwagger2 @ComponentScan(basePackages = "com.daqing") -@Import({SecurityConfig.class}) +//@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 b675cbd5..759a152e 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,18 +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(); -// } -//} +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(); + } +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/AlInsuranceListController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/AlInsuranceListController.java index aa94703d..8ff947d1 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/AlInsuranceListController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/AlInsuranceListController.java @@ -3,10 +3,9 @@ package com.daqing.financial.guarantee.controller; import com.daqing.financial.guarantee.model.response.AlInsuranceListRes; import com.daqing.financial.guarantee.service.IAlInsuranceListService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; -import com.daqing.financial.hrauth.model.HrmsAccessRecordsLog; +import com.daqing.framework.annotation.Log; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.utils.PageUtils; import io.swagger.annotations.Api; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/AlRepaymentEntryController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/AlRepaymentEntryController.java index de950bb4..36c1ed9e 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/AlRepaymentEntryController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/AlRepaymentEntryController.java @@ -3,10 +3,10 @@ package com.daqing.financial.guarantee.controller; import com.daqing.financial.guarantee.model.request.AlRepaymentEntryReq; import com.daqing.financial.guarantee.service.IAlRepaymentEntryService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; +import com.daqing.framework.annotation.Log; import com.daqing.framework.domain.guarantee.AlRepaymentEntry; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.utils.PageUtils; import io.swagger.annotations.Api; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java index c03a317d..dc0899fd 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java @@ -12,11 +12,11 @@ import com.daqing.financial.guarantee.model.response.BusinessApplicationExportRe import com.daqing.financial.guarantee.model.response.BusinessApplicationListResponse; import com.daqing.financial.guarantee.service.IDgApplyAmountInfoService; import com.daqing.financial.guarantee.service.IDgApplyAmountListService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; +import com.daqing.framework.annotation.Log; import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest; import com.daqing.framework.domain.guarantee.DgApplyField; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.PromptSuccess; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.util.JwtUtils; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAssetsInvestigationController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAssetsInvestigationController.java index db5ad6a2..c5d9737f 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAssetsInvestigationController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAssetsInvestigationController.java @@ -4,9 +4,9 @@ package com.daqing.financial.guarantee.controller; import com.daqing.financial.guarantee.model.request.*; import com.daqing.financial.guarantee.model.response.AssetsDetailResponse; import com.daqing.financial.guarantee.service.IDgAssetsInvestigationService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; +import com.daqing.framework.annotation.Log; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.util.RedisUtil; import com.daqing.framework.utils.PageUtils; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceInvestigationController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceInvestigationController.java index d91b7ca8..ac5240b3 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceInvestigationController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceInvestigationController.java @@ -6,10 +6,9 @@ import com.daqing.financial.guarantee.model.request.DgComplianceInvestigationReq import com.daqing.financial.guarantee.model.response.DgComplianceInvestigationInfoResponse; import com.daqing.financial.guarantee.model.response.DgComplianceInvestigationResponse; import com.daqing.financial.guarantee.service.IDgComplianceInvestigationService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; -import com.daqing.framework.domain.guarantee.DgComplianceInvestigation; +import com.daqing.framework.annotation.Log; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.ResponseResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyForController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyForController.java index 50bad371..d0c30c91 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyForController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyForController.java @@ -1,18 +1,19 @@ package com.daqing.financial.guarantee.controller; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.daqing.financial.guarantee.model.request.CopySendRequest; import com.daqing.financial.guarantee.service.IDgCopyForService; import com.daqing.financial.guarantee.util.R; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; +import com.daqing.framework.domain.guarantee.DgCopyFor; +import com.daqing.framework.annotation.Log; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.io.IOException; @@ -48,4 +49,26 @@ public class DgCopyForController { } } + @Log(detail = "抄送",level = 4,operationUnit = OperationUnit.COPYFOR,operationType = OperationType.SELECT) + @ApiOperation("查询抄送详情") + @GetMapping("/queryCopySendDetail") + public R queryCopySendDetail(Integer businessId, Integer processId, Integer status){ + //审批状态已审核显示抄送按钮 + if (status==2){ + DgCopyFor one = copyForService.getOne(new QueryWrapper(). + eq("business_id", businessId).eq("process_id", processId)); + //对象不存在，直接返回，不显示 + if (ObjectUtil.isNull(one)) { + return R.ok().success(false); + } + String picUrl = one.getPicUrl(); + //详情不存在，返回true，显示按钮 + boolean exsit = StringUtils.isEmpty(picUrl); + + return exsit ? R.ok() : R.ok().success(false); + } + //其他情况不显示抄送按钮 + return R.ok().success(false); + } + } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyUserController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyUserController.java index 7e4400aa..c8cc196a 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyUserController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgCopyUserController.java @@ -6,9 +6,9 @@ import com.daqing.financial.guarantee.model.response.CopyForMeResponse; import com.daqing.financial.guarantee.service.IDgCopyUserService; import com.daqing.financial.guarantee.util.R; import com.daqing.financial.guarantee.util.TaskNodeUtil; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; +import com.daqing.framework.annotation.Log; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java index 0e1a1902..0d65a1d3 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java @@ -13,9 +13,9 @@ import com.daqing.financial.guarantee.service.IDgEfficiencyService; import com.daqing.financial.guarantee.util.DateUtils; import com.daqing.financial.guarantee.util.R; import com.daqing.financial.guarantee.util.TaskNodeUtil; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; +import com.daqing.framework.annotation.Log; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.StatusCode; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.utils.excel.EasyExcelUtil; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgFormDesignController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgFormDesignController.java index 9498c500..d7f7956f 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgFormDesignController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgFormDesignController.java @@ -3,9 +3,9 @@ package com.daqing.financial.guarantee.controller; import com.daqing.financial.guarantee.model.request.DgFormDesignRequest; import com.daqing.financial.guarantee.model.response.DgFormDesignListResponse; import com.daqing.financial.guarantee.service.IDgFormDesignService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; +import com.daqing.framework.annotation.Log; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.ResponseResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeAssignUserController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeAssignUserController.java index 5fca4639..0d861686 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeAssignUserController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeAssignUserController.java @@ -1,22 +1,14 @@ package com.daqing.financial.guarantee.controller; -import com.daqing.financial.guarantee.feign.HrmsFeignService; -import com.daqing.financial.guarantee.mapper.DgGuaranteeAssignUserMapper; import com.daqing.financial.guarantee.model.request.ApprovalGuaranteeRequest; import com.daqing.financial.guarantee.model.request.GuaranteeRequest; import com.daqing.financial.guarantee.model.request.InvestigateGuaranteeRequest; import com.daqing.financial.guarantee.model.response.GuaranteeDetailResponse; import com.daqing.financial.guarantee.service.IDgGuaranteeAssignUserService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; -import com.daqing.framework.domain.guarantee.DgGuaranteeAssignUser; -import com.daqing.framework.domain.guarantee.po.DgGuaranteePO; -import com.daqing.framework.domain.hrms.response.HrmsCode; -import com.daqing.framework.exception.ExceptionCast; -import com.daqing.framework.model.StatusCode; -import com.daqing.framework.model.response.PromptSuccess; +import com.daqing.framework.annotation.Log; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.util.RedisUtil; import com.daqing.framework.utils.PageUtils; @@ -26,9 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeLetterAssignUserController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeLetterAssignUserController.java index 9c1f219f..e06290de 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeLetterAssignUserController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeLetterAssignUserController.java @@ -5,12 +5,10 @@ import com.daqing.financial.guarantee.model.request.GuaranteeLetterQueryRequest; import com.daqing.financial.guarantee.model.request.GuaranteeLetterUpdateStatusRequest; import com.daqing.financial.guarantee.model.response.GuaranteeLetterListResponse; import com.daqing.financial.guarantee.service.IDgGuaranteeLetterAssignUserService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; +import com.daqing.framework.annotation.Log; import com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser; -import com.daqing.framework.domain.hrms.response.HrmsCode; -import com.daqing.framework.exception.ExceptionCast; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.StatusCode; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.utils.DateUtil; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanCommitteeConsiderController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanCommitteeConsiderController.java index 37786692..e98ebb7c 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanCommitteeConsiderController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanCommitteeConsiderController.java @@ -4,13 +4,11 @@ package com.daqing.financial.guarantee.controller; import com.daqing.financial.guarantee.model.request.DgLoanCommitteeConsiderRequest; import com.daqing.financial.guarantee.model.response.DgLoanCommitteeConsiderResponse; import com.daqing.financial.guarantee.service.IDgLoanCommitteeConsiderService; -import com.daqing.financial.guarantee.service.IDgLoanNoticeService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; +import com.daqing.framework.annotation.Log; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.ResponseResult; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java index 138459e9..f0ac8008 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java @@ -2,20 +2,13 @@ package com.daqing.financial.guarantee.controller; import com.daqing.financial.guarantee.model.request.*; -import com.daqing.financial.guarantee.model.response.GuaranteeLetterListResponse; import com.daqing.financial.guarantee.model.response.LoanNoticeListResponse; -import com.daqing.financial.guarantee.service.IDgGuaranteeLetterAssignUserService; import com.daqing.financial.guarantee.service.IDgLoanNoticeService; -import com.daqing.financial.guarantee.service.impl.DgGuaranteeLetterAssignUserServiceImpl; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; -import com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser; -import com.daqing.framework.domain.hrms.response.HrmsCode; -import com.daqing.framework.exception.ExceptionCast; +import com.daqing.framework.annotation.Log; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.StatusCode; import com.daqing.framework.model.response.ResponseResult; -import com.daqing.framework.utils.DateUtil; import com.daqing.framework.utils.NumberToCN; import com.daqing.framework.utils.PageUtils; import com.deepoove.poi.XWPFTemplate; @@ -28,7 +21,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.math.BigDecimal; -import java.util.Date; import java.util.HashMap; /** diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgMessageInvestigationController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgMessageInvestigationController.java index d285cfef..6fb48b25 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgMessageInvestigationController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgMessageInvestigationController.java @@ -2,12 +2,11 @@ package com.daqing.financial.guarantee.controller; import com.daqing.financial.guarantee.model.request.*; -import com.daqing.financial.guarantee.model.response.AssetsDetailResponse; import com.daqing.financial.guarantee.model.response.MessageDetailResponse; import com.daqing.financial.guarantee.service.IDgMessageInvestigationService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; +import com.daqing.framework.annotation.Log; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.util.RedisUtil; import com.daqing.framework.utils.PageUtils; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgPaymentConfirmationConsiderController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgPaymentConfirmationConsiderController.java index 27b472e1..1dd6d9c6 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgPaymentConfirmationConsiderController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgPaymentConfirmationConsiderController.java @@ -5,11 +5,9 @@ import com.daqing.financial.guarantee.model.request.PaymentConfirmationQueryRequ import com.daqing.financial.guarantee.model.request.PaymentConfirmationUpdateRequest; import com.daqing.financial.guarantee.model.response.PaymentConfirmationListResponse; import com.daqing.financial.guarantee.service.IDgPaymentConfirmationConsiderService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; -import com.daqing.framework.domain.hrms.response.HrmsCode; -import com.daqing.framework.exception.ExceptionCast; +import com.daqing.framework.annotation.Log; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.StatusCode; import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.utils.PageUtils; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgProcessManageController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgProcessManageController.java index 7bfe88b3..315704f5 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgProcessManageController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgProcessManageController.java @@ -1,29 +1,22 @@ package com.daqing.financial.guarantee.controller; -import com.alibaba.fastjson.JSONObject; import com.daqing.financial.guarantee.model.request.ProcessManageRequest; import com.daqing.financial.guarantee.model.request.UpdateUserVisualReq; -import com.daqing.financial.guarantee.model.response.BusinessApplicationListResponse; -import com.daqing.financial.guarantee.model.response.DgProessManageRes; import com.daqing.financial.guarantee.service.IDgProcessManageService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; +import com.daqing.framework.annotation.Log; import com.daqing.framework.domain.guarantee.DgProcessManage; import com.daqing.framework.domain.hrms.ext.EmployeeVO; -import com.daqing.framework.domain.hrms.ext.UserDeptVO; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.ResponseResult; -import com.daqing.framework.util.RedisUtil; import com.daqing.framework.utils.PageUtils; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; -import org.springframework.stereotype.Controller; import java.util.*; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgProcessUserController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgProcessUserController.java index ffc303d5..61e81bb0 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgProcessUserController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgProcessUserController.java @@ -2,17 +2,14 @@ package com.daqing.financial.guarantee.controller; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.daqing.financial.guarantee.feign.HrmsFeignService; import com.daqing.financial.guarantee.model.request.CopySendUserRequest; -import com.daqing.financial.guarantee.service.IDgProcessManageService; import com.daqing.financial.guarantee.service.IDgProcessUserService; import com.daqing.financial.guarantee.util.R; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; -import com.daqing.framework.domain.guarantee.DgProcessManage; +import com.daqing.framework.annotation.Log; import com.daqing.framework.domain.guarantee.DgProcessUser; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.ResponseResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgStatisticsController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgStatisticsController.java index 2ef2a837..78f8d878 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgStatisticsController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgStatisticsController.java @@ -4,9 +4,9 @@ import com.daqing.financial.guarantee.model.request.DgStatisticsRequest; import com.daqing.financial.guarantee.model.response.DgStatisticsListRefuseResponse; import com.daqing.financial.guarantee.model.response.DgStatisticsListResponse; import com.daqing.financial.guarantee.service.IDgStatisticsService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; +import com.daqing.framework.annotation.Log; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.ResponseResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgWorkConferenceConsiderController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgWorkConferenceConsiderController.java index 8d2b3ca8..082a6b32 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgWorkConferenceConsiderController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgWorkConferenceConsiderController.java @@ -3,12 +3,11 @@ package com.daqing.financial.guarantee.controller; import com.daqing.financial.guarantee.model.request.DgWorkConferenceConsiderRequest; import com.daqing.financial.guarantee.service.IDgWorkConferenceConsiderService; -import com.daqing.financial.hrauth.annotation.Log; -import com.daqing.financial.hrauth.enums.OperationType; -import com.daqing.financial.hrauth.enums.OperationUnit; +import com.daqing.framework.annotation.Log; +import com.daqing.framework.enums.OperationType; +import com.daqing.framework.enums.OperationUnit; import com.daqing.framework.model.response.ResponseResult; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlRepaymentEntryMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlRepaymentEntryMapper.java index db0786e9..bc972eac 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlRepaymentEntryMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlRepaymentEntryMapper.java @@ -4,6 +4,7 @@ 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.response.AlRepaymentCountRes; +import com.daqing.financial.guarantee.model.response.AlRepaymentEntryListRes; import com.daqing.financial.guarantee.model.response.AlRepaymentEntryRes; import com.daqing.financial.guarantee.model.response.AlRepaymentRes; import com.daqing.framework.domain.guarantee.AlRepaymentEntry; @@ -22,7 +23,7 @@ import java.util.List; @Mapper public interface AlRepaymentEntryMapper extends BaseMapper { - IPage pageByCondition(Page page, String customerNumberOrName, Integer status,Integer insuranceId); + IPage pageByCondition(Page page, String customerNumberOrName, Integer status, Integer insuranceId); List selectListByIds(List ids); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/BusinessApplicationRequest.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/BusinessApplicationRequest.java index d0e8af30..37f4af09 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/BusinessApplicationRequest.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/BusinessApplicationRequest.java @@ -261,7 +261,7 @@ public class BusinessApplicationRequest implements Serializable { * 注册时间 */ @ApiModelProperty(value = "注册时间") - private String registerTime; + private Date registerTime; /** * 注册地址 diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AlRepaymentEntryListRes.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AlRepaymentEntryListRes.java new file mode 100644 index 00000000..0f5a9dd4 --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AlRepaymentEntryListRes.java @@ -0,0 +1,112 @@ +package com.daqing.financial.guarantee.model.response; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + *

+ * 还款记录表 + *

+ * + * @author Qyq + * @since 2021-03-17 + */ +@Data +public class AlRepaymentEntryListRes implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 保后外键id + */ + private Integer insuranceId; + + /** + * 应还款日 + */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date repaymentDate; + + /** + * 实际还款日 + */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date actualRepaymentDate; + + /** + * 逾期天数 + */ + private Integer overdueDays; + + /** + * 还款总额（元） + */ + private BigDecimal totalRepayment; + + /** + * 本次还款（元） + */ + private BigDecimal currentRepayment; + + /** + * 利息（元） + */ + private BigDecimal interest; + + /** + * 其他费用（元） + */ + private BigDecimal otherExpenses; + + /** + * 减免金额（元） + */ + private BigDecimal deductionAmount; + + /** + * 还款备注 + */ + private String repaymentNotes; + + /** + * 还款状态：1->待还款；2->已还款；3->已逾期；4->未到期； + */ + private Integer repaymentStatus; + + /** + * 提交人id + */ + private Integer submitterId; + + /** + * 提交人名称 + */ + private String submitterName; + + /** + * 创建时间 + */ + @TableField(fill= FieldFill.INSERT) + private Date createTime; + + /** + * 修改时间 + */ + @TableField(fill= FieldFill.INSERT_UPDATE) + private Date updateTime; + /** + * 担保额度（元） + */ + private Double guaranteeAmount; +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java index 5fb3a869..b87f245c 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java @@ -8,6 +8,7 @@ import com.daqing.financial.guarantee.controller.DgApplyAmountInfoController; import com.daqing.financial.guarantee.mapper.AlInsuranceListMapper; import com.daqing.financial.guarantee.mapper.AlRepaymentEntryMapper; import com.daqing.financial.guarantee.model.request.AlRepaymentEntryReq; +import com.daqing.financial.guarantee.model.response.AlRepaymentEntryListRes; import com.daqing.financial.guarantee.model.response.AlRepaymentEntryRes; import com.daqing.financial.guarantee.model.response.AlRepaymentRes; import com.daqing.financial.guarantee.service.IAlRepaymentEntryService; @@ -72,7 +73,7 @@ public class AlRepaymentEntryServiceImpl extends ServiceImpl positionVO = this.getBaseMapper().pageByCondition(new Page(page, size),customerNumberOrName,status,insuranceId); + IPage positionVO = this.getBaseMapper().pageByCondition(new Page(page, size),customerNumberOrName,status,insuranceId); return new PageUtils(positionVO); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java index ff9d8c9c..691ded26 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java @@ -831,39 +831,61 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl queryWrapperOne = new QueryWrapper<>(); queryWrapperOne.eq("business_id",businessId).eq("role_id",PromptSuccess.FG_JL_ID); DgGuaranteeLetterAssignUser guaranteeLetterAssignUserOne = baseMapper.selectOne(queryWrapperOne); - Integer userId = guaranteeLetterAssignUserOne.getUserId(); - //没有操作过则法规部经理操作 - if (ObjectUtil.isNull(userId)){ + Integer operatingStatus = guaranteeLetterAssignUserOne.getOperatingStatus(); + //待处理则法规部经理操作 + if (operatingStatus.equals(1)){ return this.regulatoryDepartmentManagerOperating(businessId,currentUser,auditOpinion,status); } - //操作过，拥有a角，则a角操作 + //已处理，拥有a角，则a角操作 if (roleIdList.contains(String.valueOf(PromptSuccess.DB_A_ID))){ //a角数据是否被操作过 QueryWrapper queryWrapperTwo = new QueryWrapper<>(); queryWrapperTwo.eq("business_id",businessId).eq("role_id",PromptSuccess.DB_A_ID); DgGuaranteeLetterAssignUser guaranteeLetterAssignUserTwo = baseMapper.selectOne(queryWrapperTwo); - Integer userIdA = guaranteeLetterAssignUserTwo.getUserId(); - //没有操作过则a角操作 - if (ObjectUtil.isNull(userIdA)){ + Integer operatingStatusA = guaranteeLetterAssignUserTwo.getOperatingStatus(); + //待处理则a角操作 + if (operatingStatusA.equals(1)){ return this.aRoleOperating(businessId,currentUser,auditOpinion,status); } - //操作过，拥有b角，则b角操作 + //已处理，拥有b角，则b角操作 if (roleIdList.contains(String.valueOf(PromptSuccess.DB_B_ID))){ //b角数据是否被操作过 QueryWrapper queryWrapperThree = new QueryWrapper<>(); queryWrapperThree.eq("business_id",businessId).eq("role_id",PromptSuccess.DB_B_ID); DgGuaranteeLetterAssignUser guaranteeLetterAssignUserThree = baseMapper.selectOne(queryWrapperThree); - Integer userIdB = guaranteeLetterAssignUserThree.getUserId(); - //没有操作过则b角操作 - if (ObjectUtil.isNull(userIdB)){ + Integer operatingStatusB = guaranteeLetterAssignUserThree.getOperatingStatus(); + //待处理则b角操作 + if (operatingStatusB.equals(1)){ return this.bRoleOperating(businessId,currentUser,auditOpinion,status); } - //操作过，拥有资产部经理，则资产部经理操作 + //已处理，拥有资产部经理，则资产部经理操作 if (roleIdList.contains(String.valueOf(PromptSuccess.ZC_JL_ID))){ return this.assetManagerOperating(businessId,currentUser,auditOpinion,status); } } } + + //已处理，拥有b角，则b角操作 + if (roleIdList.contains(String.valueOf(PromptSuccess.DB_B_ID))){ + //b角数据是否被操作过 + QueryWrapper queryWrapperThree = new QueryWrapper<>(); + queryWrapperThree.eq("business_id",businessId).eq("role_id",PromptSuccess.DB_B_ID); + DgGuaranteeLetterAssignUser guaranteeLetterAssignUserThree = baseMapper.selectOne(queryWrapperThree); + Integer operatingStatusB = guaranteeLetterAssignUserThree.getOperatingStatus(); + //待处理则b角操作 + if (operatingStatusB.equals(1)){ + return this.bRoleOperating(businessId,currentUser,auditOpinion,status); + } + //已处理，拥有资产部经理，则资产部经理操作 + if (roleIdList.contains(String.valueOf(PromptSuccess.ZC_JL_ID))){ + return this.assetManagerOperating(businessId,currentUser,auditOpinion,status); + } + } + + //已处理，拥有资产部经理，则资产部经理操作 + if (roleIdList.contains(String.valueOf(PromptSuccess.ZC_JL_ID))){ + return this.assetManagerOperating(businessId,currentUser,auditOpinion,status); + } } //角色为资产部经理则确认担保函操作和驳回操作 diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java index 5e92ab90..cd2cb566 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java @@ -142,6 +142,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl queryWrapperOne = new QueryWrapper<>(); queryWrapperOne.eq("business_id",businessId).eq("role_id", PromptSuccess.CWB_ID); DgPaymentConfirmationConsider paymentConfirmationConsiderOne = baseMapper.selectOne(queryWrapperOne); - Integer userId = paymentConfirmationConsiderOne.getConsiderId(); - //没有操作过则财务部经理操作 - if (ObjectUtil.isNull(userId)){ + Integer operatingStatus = paymentConfirmationConsiderOne.getOperatingStatus(); + //待处理则财务部经理操作 + if (operatingStatus.equals(1)){ return this.financeDepartmentOperating(businessId,currentUser,auditOpinion,status,imgFile); } - //操作过，拥有法规部经理，则法规部经理操作 + //已处理，拥有法规部经理，则法规部经理操作 if (roleIdList.contains(String.valueOf(PromptSuccess.FG_JL_ID))){ return this.regulationDepartmentOperating(businessId,currentUser,auditOpinion,status,imgFile); } diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlRepaymentEntryMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlRepaymentEntryMapper.xml index 5f2cb655..7ae607f2 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlRepaymentEntryMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlRepaymentEntryMapper.xml @@ -20,20 +20,20 @@ - + select re.*,il.guarantee_amount as guaranteeAmount from al_repayment_entry re left join al_insurance_list il on il.id=re.insurance_id - repayment_status = #{status} + re.repayment_status = #{status} - AND repayment_date = #{customerNumberOrName} + AND re.repayment_date = #{customerNumberOrName} - AND insurance_id = #{insuranceId} + AND re.insurance_id = #{insuranceId} - order by create_time desc + order by re.create_time desc