From 8588ff7ab18749de055bafeb2833bcc3992b5687 Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Tue, 5 Jan 2021 14:35:08 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=EF=BC=8Cpom=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=A4=84=E7=90=86=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dq-financial-api/pom.xml | 24 ++-- dq-financial-crms/pom.xml | 46 ++++--- .../financial/crms/config/IPageConfig.java | 2 - .../crms/controller/CustomerController.java | 2 +- .../financial/crms/dao/CustomerDao.java | 3 +- .../service/impl/CustomerServiceImpl.java | 11 +- .../resources/mapper/crms/CustomerDao.xml | 19 +-- dq-financial-guarantee/pom.xml | 54 ++++---- .../guarantee/config/IPageConfig.java | 14 +- .../controller/DgEfficiencyController.java | 18 ++- .../mapper/DgApplyAmountListMapper.java | 4 + .../mapper/DgAssetsInvestigationMapper.java | 3 + .../DgComplianceInvestigationMapper.java | 3 + .../mapper/DgGuaranteeAssignUserMapper.java | 3 + .../DgGuaranteeLetterAssignUserMapper.java | 3 + .../mapper/DgLoanCommitteeConsiderMapper.java | 3 + .../guarantee/mapper/DgLoanNoticeMapper.java | 3 + .../mapper/DgMessageInvestigationMapper.java | 3 + .../DgPaymentConfirmationConsiderMapper.java | 3 + .../DgWorkConferenceConsiderMapper.java | 3 + .../model/response/DgNoticeListResponse.java | 34 +++++ .../service/IDgEfficiencyService.java | 3 + .../service/impl/DgEfficiencyServiceImpl.java | 122 +++++++++++++++++- .../guarantee/DgApplyAmountListMapper.xml | 16 +++ .../guarantee/DgAssetsInvestigationMapper.xml | 16 +++ .../mapper/guarantee/DgAuditProcessMapper.xml | 3 +- .../DgComplianceInvestigationMapper.xml | 16 +++ .../guarantee/DgGuaranteeAssignUserMapper.xml | 16 +++ .../DgGuaranteeLetterAssignUserMapper.xml | 16 +++ .../DgLoanCommitteeConsiderMapper.xml | 15 +++ .../mapper/guarantee/DgLoanNoticeMapper.xml | 16 +++ .../DgMessageInvestigationMapper.xml | 16 +++ .../DgPaymentConfirmationConsiderMapper.xml | 16 +++ .../DgWorkConferenceConsiderMapper.xml | 16 +++ dq-financial-hrms-auth/pom.xml | 45 ++++--- .../hrauth/feign/HrmsFeignService.java | 9 +- .../src/main/resources/bootstrap.properties | 2 + dq-financial-hrms/pom.xml | 25 ++-- .../hrms/DqFinancialHrmsApplication.java | 1 - .../financial/hrms/config/IPageConfig.java | 2 - .../src/main/resources/application.yml | 12 -- .../src/main/resources/bootstrap.properties | 1 + .../resources/mapper/hrms/EmployeeDao.xml | 2 +- dq-framework-common/pom.xml | 48 ++++--- dq-framework-model/pom.xml | 23 +--- .../framework/domain/crms/ext/CustomerTO.java | 3 + dq-framework-utils/pom.xml | 38 ++++-- dq-govern-gateway/pom.xml | 33 ++++- .../src/main/resources/bootstrap.properties | 2 +- pom.xml | 48 +------ 50 files changed, 595 insertions(+), 244 deletions(-) create mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgNoticeListResponse.java delete mode 100644 dq-financial-hrms/src/main/resources/application.yml diff --git a/dq-financial-api/pom.xml b/dq-financial-api/pom.xml index c8584a3e..90eb2948 100644 --- a/dq-financial-api/pom.xml +++ b/dq-financial-api/pom.xml @@ -9,16 +9,17 @@ 4.0.0 + com.daqing.financial dq-financial-api - 系统API统一定义api + 系统API统一定义 com.daqing.framework dq-framework-model - 0.0.1-SNAPSHOT + 1.0-SNAPSHOT @@ -26,19 +27,12 @@ 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-crms/pom.xml b/dq-financial-crms/pom.xml index 54f97d16..2e677483 100644 --- a/dq-financial-crms/pom.xml +++ b/dq-financial-crms/pom.xml @@ -3,13 +3,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - financial - com.daqing.financial - 0.0.1-SNAPSHOT + org.springframework.boot + spring-boot-starter-parent + 2.1.8.RELEASE + + com.daqing.financial dq-financial-crms 0.0.1-SNAPSHOT - 客户资源管理服务crms + dq-financial-crms + 大庆智慧金融平台-客户资源管理服务 1.8 @@ -18,12 +21,12 @@ - + com.daqing.financial dq-financial-api @@ -79,16 +82,25 @@ - - - - - - - - - - - + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + + 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 243e1e84..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,4 +1,3 @@ -/* package com.daqing.financial.crms.config; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; @@ -12,4 +11,3 @@ public class IPageConfig { return new PaginationInterceptor(); } } -*/ 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 39dbaf70..e11a54a0 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 @@ -18,7 +18,7 @@ import com.daqing.framework.utils.PageUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; +//import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; 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 830744c7..2e41e8cd 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 @@ -6,6 +6,7 @@ import com.daqing.framework.domain.crms.CustomerEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.daqing.framework.domain.crms.PersonalCustomerEntity; import com.daqing.framework.domain.crms.request.CustomerRequest; +import com.daqing.framework.domain.crms.response.CustomerEntityResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -21,7 +22,7 @@ import java.util.List; @Mapper public interface CustomerDao extends BaseMapper { - IPage queryList(Page page, @Param("cr") CustomerRequest customerRequest); + IPage queryList(Page page, @Param("cr") CustomerRequest customerRequest); CustomerEntity queryCustomerById(Long id); 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 c065f1e3..794f185c 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 @@ -21,6 +21,7 @@ import com.daqing.framework.domain.crms.request.CustomerRequest; import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest; import com.daqing.framework.domain.crms.response.CompanyCustomerResponse; import com.daqing.framework.domain.crms.response.CrmsCode; +import com.daqing.framework.domain.crms.response.CustomerEntityResponse; import com.daqing.framework.domain.hrms.EmployeeEntity; import com.daqing.framework.domain.hrms.ext.EmployeeTO; import com.daqing.framework.domain.hrms.ext.EmployeeVO; @@ -78,9 +79,9 @@ public class CustomerServiceImpl extends ServiceImpl pages = this.pageCheckout(page, size); // 查询所有客户的基本信息 - IPage customerEntityIPage = customerDao.queryList(pages, customerRequest); + IPage customerEntityIPage = customerDao.queryList(pages, customerRequest); // 获取所有的客户基本信息 - List customers = customerEntityIPage.getRecords(); + List customers = customerEntityIPage.getRecords(); // 获取所有的客户经理id Long[] managerIds = new Long[customers.size()]; for (int i = 0; i < customers.size(); i++) { @@ -101,7 +102,7 @@ public class CustomerServiceImpl extends ServiceImpl jointCustomerEmployee(List customers, List employeeTO) { + private List jointCustomerEmployee(List customers, List employeeTO) { List customerTOS = new ArrayList<>();// 用于拼装客户信息和员工及部门信息的集合 CustomerTO customerTO; // 将客户信息和客户经理及部门信息拼装起来 - for (CustomerEntity customer : customers) { + for (CustomerEntityResponse customer : customers) { // 每一个客户对应一个不同的对象 customerTO = new CustomerTO(); for (EmployeeTO employee : employeeTO) { 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 b871d350..a0ccbe54 100644 --- a/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml +++ b/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml @@ -21,23 +21,24 @@ - + SELECT cc.id,cc.code,cc.type,cc.name,cc.phone,cc.manager,ccc.id as companyId + FROM crms_customer cc + LEFT JOIN crms_company_customer ccc on ccc.customer_id=cc.id + WHERE cc.del_or_not = 0 - AND (name LIKE CONCAT('%',#{cr.codeOrName},'%') OR code LIKE CONCAT('%',#{cr.codeOrName},'%')) + AND (cc.name LIKE CONCAT('%',#{cr.codeOrName},'%') OR cc.code LIKE CONCAT('%',#{cr.codeOrName},'%')) - AND type = #{cr.customerType} + AND cc.type = #{cr.customerType} - AND create_time >= #{cr.startTime} + AND cc.create_time >= #{cr.startTime} - AND create_time <= #{cr.endTime} + AND cc.create_time <= #{cr.endTime} - ORDER BY create_time DESC + ORDER BY cc.create_time DESC diff --git a/dq-financial-guarantee/pom.xml b/dq-financial-guarantee/pom.xml index 07e37736..88806050 100644 --- a/dq-financial-guarantee/pom.xml +++ b/dq-financial-guarantee/pom.xml @@ -3,15 +3,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - financial - com.daqing.financial - 0.0.1-SNAPSHOT + org.springframework.boot + spring-boot-starter-parent + 2.1.8.RELEASE + - com.daqing.financial.guarantee dq-financial-guarantee 0.0.1-SNAPSHOT - 担保业务管理系统guarantee + dq-financial-guarantee + 大庆智慧金融平台-担保业务管理系统 1.8 @@ -19,18 +20,12 @@ - - com.daqing.financial - dq-financial-hrms-auth - 0.0.1-SNAPSHOT - compile - - - - cn.hutool - hutool-all - 5.3.8 - + + + + + + org.springframework.boot @@ -40,13 +35,14 @@ com.daqing.framework dq-framework-common - 0.0.1-SNAPSHOT + 1.0-SNAPSHOT com.daqing.financial dq-financial-api 0.0.1-SNAPSHOT + compile org.springframework.boot @@ -68,6 +64,13 @@ 1.8.2 + + + org.freemarker freemarker @@ -80,12 +83,6 @@ mybatis-plus-boot-starter 3.0.7.1 - - com.daqing.framework - dq-framework-model - 0.0.1-SNAPSHOT - compile - @@ -99,4 +96,13 @@ + + + + org.springframework.boot + spring-boot-maven-plugin + + + + 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 aaae8a3a..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 @@ -9,10 +9,10 @@ import org.springframework.context.annotation.Configuration; * @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/controller/DgEfficiencyController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java index 905c50cd..8e842a8d 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 @@ -6,17 +6,14 @@ import com.daqing.framework.model.response.ResponseResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; 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.*; import com.daqing.financial.guarantee.service.IDgEfficiencyService; import com.daqing.framework.model.response.ResponseResult; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; +import java.util.List; import java.util.Map; /** @@ -51,4 +48,15 @@ public class DgEfficiencyController { Map result = dgEfficiencyService.approvalNum(); return ResponseResult.SUCCESS(result); } + + /** + * 首页-通知 + * @Param title 标题 + */ + @GetMapping("/notice") + public ResponseResult notice(){ + //查询审批数目的值的数组 + List result = dgEfficiencyService.notice(); + return ResponseResult.SUCCESS(result); + } } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountListMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountListMapper.java index 90d0e85b..79cd2f16 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountListMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountListMapper.java @@ -4,8 +4,10 @@ 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.BusinessApplicationListResponse; +import com.daqing.financial.guarantee.model.response.DgNoticeListResponse; import com.daqing.framework.domain.guarantee.DgApplyAmountList; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -21,4 +23,6 @@ import java.util.List; public interface DgApplyAmountListMapper extends BaseMapper { IPage pageByCondition(Page page, String customerNumberOrName, List roleIdlist, String userId); + + List selectApplyList(@Param("userId") String userId, @Param("roleIdlist") List roleIdlist); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgAssetsInvestigationMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgAssetsInvestigationMapper.java index 1610a61b..ef444725 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgAssetsInvestigationMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgAssetsInvestigationMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.daqing.financial.guarantee.model.response.AssetsInvestigationListResponse; import com.daqing.financial.guarantee.model.response.DgAssetsInvestigationResponse; +import com.daqing.financial.guarantee.model.response.DgNoticeListResponse; import com.daqing.framework.domain.guarantee.DgAssetsInvestigation; import org.apache.ibatis.annotations.Mapper; @@ -26,4 +27,6 @@ public interface DgAssetsInvestigationMapper extends BaseMapper selectListByIds(List ids); + + List selectAssetsList(String userId, List roleIdlist); } 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 267e4143..6f70564d 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 @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.daqing.financial.guarantee.model.request.DgComplianceInvestigationRequest; import com.daqing.financial.guarantee.model.response.DgComplianceInvestigationResponse; +import com.daqing.financial.guarantee.model.response.DgNoticeListResponse; import com.daqing.framework.domain.guarantee.DgComplianceInvestigation; import com.daqing.framework.domain.guarantee.DgWorkConferenceConsider; import com.daqing.framework.domain.guarantee.po.AttacheAndABUserIdPO; @@ -81,4 +82,6 @@ public interface DgComplianceInvestigationMapper extends BaseMapper selectComplianceList(String userId, List roleIdlist); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeAssignUserMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeAssignUserMapper.java index 4e3d5f19..0a031c5d 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeAssignUserMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeAssignUserMapper.java @@ -3,6 +3,7 @@ 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.response.DgNoticeListResponse; import com.daqing.financial.guarantee.model.response.GuaranteeListResponse; import com.daqing.framework.domain.guarantee.DgGuaranteeAssignUser; import org.apache.ibatis.annotations.Mapper; @@ -28,4 +29,6 @@ public interface DgGuaranteeAssignUserMapper extends BaseMapper selectGuaranteeList(String userId, List roleIdlist); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeLetterAssignUserMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeLetterAssignUserMapper.java index 39bd5d35..7ea14344 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeLetterAssignUserMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeLetterAssignUserMapper.java @@ -3,6 +3,7 @@ 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.response.DgNoticeListResponse; import com.daqing.financial.guarantee.model.response.GuaranteeLetterListResponse; import com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser; import org.apache.ibatis.annotations.Mapper; @@ -26,4 +27,6 @@ public interface DgGuaranteeLetterAssignUserMapper extends BaseMapper selectBatchData(List idList); GuaranteeLetterListResponse selectGuaranteeLetter(String businessId,String roleId); + + List selectGuaranteeLetterList(String userId, List roleIdlist); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java index 8a338ef2..c7dfd2a9 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java @@ -7,6 +7,7 @@ import com.daqing.financial.guarantee.model.request.DgLoanCommitteeConsiderConse import com.daqing.financial.guarantee.model.request.DgLoanCommitteeConsiderRequest; import com.daqing.financial.guarantee.model.response.AuditOpinionResponse; import com.daqing.financial.guarantee.model.response.DgLoanCommitteeConsiderResponse; +import com.daqing.financial.guarantee.model.response.DgNoticeListResponse; import com.daqing.framework.domain.guarantee.DgLoanCommitteeConsider; import com.daqing.framework.domain.guarantee.po.AuditOpinionPO; import org.apache.ibatis.annotations.Mapper; @@ -58,4 +59,6 @@ public interface DgLoanCommitteeConsiderMapper extends BaseMapper selectLoanCommitteeList(String userId, List roleIdlist); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanNoticeMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanNoticeMapper.java index 1c5a097b..27c63182 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanNoticeMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanNoticeMapper.java @@ -3,6 +3,7 @@ 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.response.DgNoticeListResponse; import com.daqing.financial.guarantee.model.response.LoanNoticeListResponse; import com.daqing.framework.domain.guarantee.DgLoanNotice; import org.apache.ibatis.annotations.Mapper; @@ -25,4 +26,6 @@ public interface DgLoanNoticeMapper extends BaseMapper { List selectBatchData(List idList); LoanNoticeListResponse selectLoanNotice(String businessId, String roleId); + + List selectLoanNoticeList(String userId, List roleIdlist); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgMessageInvestigationMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgMessageInvestigationMapper.java index d7a5ab19..7138082c 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgMessageInvestigationMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgMessageInvestigationMapper.java @@ -3,6 +3,7 @@ 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.response.DgNoticeListResponse; import com.daqing.financial.guarantee.model.response.MessageInvestigationListResponse; import com.daqing.framework.domain.guarantee.DgMessageInvestigation; import org.apache.ibatis.annotations.Mapper; @@ -23,4 +24,6 @@ public interface DgMessageInvestigationMapper extends BaseMapper pageByCondition(Page page, String customerNumberOrName, List roleIdlist, String userId, Integer status); List selectListByIds(List ids); + + List selectMessageList(String userId, List roleIdlist); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgPaymentConfirmationConsiderMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgPaymentConfirmationConsiderMapper.java index 85246323..2ac03b4f 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgPaymentConfirmationConsiderMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgPaymentConfirmationConsiderMapper.java @@ -3,6 +3,7 @@ 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.response.DgNoticeListResponse; import com.daqing.financial.guarantee.model.response.PaymentConfirmationListResponse; import com.daqing.framework.domain.guarantee.DgPaymentConfirmationConsider; import org.apache.ibatis.annotations.Mapper; @@ -23,4 +24,6 @@ public interface DgPaymentConfirmationConsiderMapper extends BaseMapper pageByCondition(Page page, List roleIdList , Integer userId , Integer status, String customerNumberOrName); List selectBatchData(List idList); + + List selectPaymentConfirmationList(String userId, List roleIdlist); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgWorkConferenceConsiderMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgWorkConferenceConsiderMapper.java index c9b2ce34..25c96039 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgWorkConferenceConsiderMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgWorkConferenceConsiderMapper.java @@ -3,6 +3,7 @@ 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.response.DgNoticeListResponse; import com.daqing.framework.domain.guarantee.DgLoanCommitteeConsider; import com.daqing.framework.domain.guarantee.DgWorkConferenceConsider; import com.daqing.framework.domain.guarantee.po.DgWorkConferencePO; @@ -46,4 +47,6 @@ public interface DgWorkConferenceConsiderMapper extends BaseMapper selectWorkConferenceList(String userId, List roleIdlist); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgNoticeListResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgNoticeListResponse.java new file mode 100644 index 00000000..67c1f047 --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgNoticeListResponse.java @@ -0,0 +1,34 @@ +package com.daqing.financial.guarantee.model.response; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.metadata.BaseRowModel; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; + +import java.io.Serializable; +import java.util.Date; + +@Data +@ToString +public class DgNoticeListResponse extends BaseRowModel implements Serializable { + + /** + * 业务编号 + */ + @ExcelProperty(value = "业务编号",index = 0) + @ApiModelProperty(value = "业务编号") + private String businessCode; + + + /** + * 申请时间 + */ + @ExcelProperty(value = "申请日期",index = 6) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty(value = "申请时间") + private Date createTime; + + +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgEfficiencyService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgEfficiencyService.java index 05c36682..d5387beb 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgEfficiencyService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgEfficiencyService.java @@ -6,6 +6,7 @@ import com.daqing.framework.domain.guarantee.DgApplyAmountInfo; import org.springframework.stereotype.Service; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -16,4 +17,6 @@ public interface IDgEfficiencyService extends IService { Map approvalNum(); HashMap> queryList(DgEfficiencyTeamRequest dgEfficiencyTeamRequest); + + List notice(); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java index d50c3597..4ced09d4 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java @@ -2,13 +2,16 @@ package com.daqing.financial.guarantee.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.daqing.financial.guarantee.controller.DgApplyAmountInfoController; -import com.daqing.financial.guarantee.mapper.DgAuditProcessMapper; -import com.daqing.financial.guarantee.mapper.DgEfficiencyMapper; +import com.daqing.financial.guarantee.mapper.*; import com.daqing.financial.guarantee.model.request.DgEfficiencyTeamRequest; +import com.daqing.financial.guarantee.model.response.BusinessApplicationListResponse; +import com.daqing.financial.guarantee.model.response.DgNoticeListResponse; import com.daqing.financial.guarantee.model.response.EfficiencyApprovalResponse; import com.daqing.financial.guarantee.service.IDgEfficiencyService; import com.daqing.financial.guarantee.util.DateUtils; import com.daqing.framework.domain.guarantee.DgApplyAmountInfo; +import com.daqing.framework.util.RedisUtil; +import com.daqing.framework.utils.PageUtils; import org.springframework.stereotype.Service; @@ -33,6 +36,26 @@ public class DgEfficiencyServiceImpl extends ServiceImpltimeList = dgAuditProcessMapper.selectTenDays(Integer.parseInt(userId)); //近十天审批数目的值的数组 @@ -152,4 +174,96 @@ public class DgEfficiencyServiceImpl extends ServiceImpl roleIdlist = new ArrayList<>(); + if(roleIds != null) { + String[] ids = roleIds.split(","); + roleIdlist = Arrays.asList(ids); + } + //查询业务管理模块该用户待处理的记录 + //业务申请模块，查询该用户待处理的记录 + List list1 = dgApplyAmountListMapper.selectApplyList(userId,roleIdlist); + List list = new ArrayList(); + for (DgNoticeListResponse res:list1) { + res.setBusinessCode("您有一个待办任务需办理，评审内容：业务申请："+res.getBusinessCode()); + list.add(res); + } + + //担保部调查模块，查询该用户待处理的记录 + List list2 = dgGuaranteeAssignUserMapper.selectGuaranteeList(userId,roleIdlist); + for (DgNoticeListResponse res:list2) { + res.setBusinessCode("您有一个待办任务需办理，评审内容：担保部调查："+res.getBusinessCode()); + list.add(res); + } + + //资产部调查模块，查询该用户待处理的记录 + List list3 = dgAssetsInvestigationMapper.selectAssetsList(userId,roleIdlist); + for (DgNoticeListResponse res:list3) { + res.setBusinessCode("您有一个待办任务需办理，评审内容：资产部调查："+res.getBusinessCode()); + list.add(res); + } + + //信息部调查模块，查询该用户待处理的记录 + List list4 = dgMessageInvestigationMapper.selectMessageList(userId,roleIdlist); + for (DgNoticeListResponse res:list4) { + res.setBusinessCode("您有一个待办任务需办理，评审内容：信息部调查："+res.getBusinessCode()); + list.add(res); + } + + //合规调查模块，查询该用户待处理的记录 + List list5 = dgComplianceInvestigationMapper.selectComplianceList(userId,roleIdlist); + for (DgNoticeListResponse res:list5) { + res.setBusinessCode("您有一个待办任务需办理，评审内容：合规调查："+res.getBusinessCode()); + list.add(res); + } + + //工作会模块，查询该用户待处理的记录 + List list6 = dgWorkConferenceConsiderMapper.selectWorkConferenceList(userId,roleIdlist); + for (DgNoticeListResponse res:list6) { + res.setBusinessCode("您有一个待办任务需办理，评审内容：工作会："+res.getBusinessCode()); + list.add(res); + } + + //贷审会模块，查询该用户待处理的记录 + List list7 = dgLoanCommitteeConsiderMapper.selectLoanCommitteeList(userId,roleIdlist); + for (DgNoticeListResponse res:list7) { + res.setBusinessCode("您有一个待办任务需办理，评审内容：贷审会："+res.getBusinessCode()); + list.add(res); + } + + //担保函模块，查询该用户待处理的记录 + List list8 = dgGuaranteeLetterAssignUserMapper.selectGuaranteeLetterList(userId,roleIdlist); + for (DgNoticeListResponse res:list8) { + res.setBusinessCode("您有一个待办任务需办理，评审内容：担保函："+res.getBusinessCode()); + list.add(res); + } + //回款确认模块，查询该用户待处理的记录 + List list9 = dgPaymentConfirmationConsiderMapper.selectPaymentConfirmationList(userId,roleIdlist); + for (DgNoticeListResponse res:list9) { + res.setBusinessCode("您有一个待办任务需办理，评审内容：回款确认："+res.getBusinessCode()); + list.add(res); + } + + //放款通知模块，查询该用户待处理的记录 + List list10 = dgLoanNoticeMapper.selectLoanNoticeList(userId,roleIdlist); + for (DgNoticeListResponse res:list10) { + res.setBusinessCode("您有一个待办任务需办理，评审内容：放款通知："+res.getBusinessCode()); + list.add(res); + } + return list; + } } \ No newline at end of file diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountListMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountListMapper.xml index 26c933f4..adbd1552 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountListMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountListMapper.xml @@ -39,4 +39,20 @@ order by au.create_time desc + + diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgAssetsInvestigationMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgAssetsInvestigationMapper.xml index 48e60031..c3146893 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgAssetsInvestigationMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgAssetsInvestigationMapper.xml @@ -76,4 +76,20 @@ + + diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgAuditProcessMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgAuditProcessMapper.xml index cd557284..13f22582 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgAuditProcessMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgAuditProcessMapper.xml @@ -7,7 +7,6 @@ - @@ -17,7 +16,7 @@ + + diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeAssignUserMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeAssignUserMapper.xml index 2f66874e..f9d999e7 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeAssignUserMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeAssignUserMapper.xml @@ -70,4 +70,20 @@ WHERE business_id = #{businessId} AND (role_id = 59 OR role_id = 60) + + diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml index 8cc0fc10..ac2a82df 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml @@ -86,4 +86,20 @@ where lau.business_id = #{businessId} and lau.role_id = #{roleId} + + diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml index 11e23b8a..a22a9a72 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml @@ -150,5 +150,20 @@ + diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanNoticeMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanNoticeMapper.xml index b1a5f05d..ab8d217c 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanNoticeMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanNoticeMapper.xml @@ -85,4 +85,20 @@ where ln.business_id = #{businessId} and ln.role_id = #{roleId} + + diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgMessageInvestigationMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgMessageInvestigationMapper.xml index 4e2d2ebc..fad8f661 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgMessageInvestigationMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgMessageInvestigationMapper.xml @@ -58,4 +58,20 @@ + + diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgPaymentConfirmationConsiderMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgPaymentConfirmationConsiderMapper.xml index 4c67b36c..670517f0 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgPaymentConfirmationConsiderMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgPaymentConfirmationConsiderMapper.xml @@ -77,4 +77,20 @@ + + diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgWorkConferenceConsiderMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgWorkConferenceConsiderMapper.xml index e84a9e36..7c876efe 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgWorkConferenceConsiderMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgWorkConferenceConsiderMapper.xml @@ -131,4 +131,20 @@ UPDATE dg_work_conference_consider SET user_id = #{userId} WHERE id = #{id} + + diff --git a/dq-financial-hrms-auth/pom.xml b/dq-financial-hrms-auth/pom.xml index 11c52cfd..1e7f00ba 100644 --- a/dq-financial-hrms-auth/pom.xml +++ b/dq-financial-hrms-auth/pom.xml @@ -3,13 +3,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - financial - com.daqing.financial - 0.0.1-SNAPSHOT + org.springframework.boot + spring-boot-starter-parent + 2.1.8.RELEASE + + com.daqing.financial dq-financial-hrms-auth 0.0.1-SNAPSHOT - 人资用户认证服务hrms-auth + dq-financial-hrms-auth + 大庆智慧金融平台-人资用户认证服务 1.8 @@ -70,11 +73,11 @@ compile - + org.springframework.boot spring-boot-starter-web @@ -98,19 +101,19 @@ org.springframework.boot spring-boot-maven-plugin - - - - - + + diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/feign/HrmsFeignService.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/feign/HrmsFeignService.java index b96d5972..df96dd99 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/feign/HrmsFeignService.java +++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/feign/HrmsFeignService.java @@ -2,11 +2,13 @@ package com.daqing.financial.hrauth.feign; import com.daqing.framework.domain.hrms.EmployeeEntity; import com.daqing.framework.domain.hrms.PermissionEntity; -import com.daqing.framework.domain.hrms.RoleEntity; import com.daqing.framework.domain.hrms.RolePermissionEntity; import com.daqing.framework.model.response.ResponseResult; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -15,10 +17,11 @@ import java.util.List; /** * 这是一个声明式的远程调用 */ -@FeignClient(value = "dq-financial-hrms",contextId = "hrms") +@Component +@FeignClient(name="dq-financial-hrms", value = "dq-financial-hrms",contextId = "hrms") public interface HrmsFeignService { - @GetMapping("/hrms/employee/getEmployeeByUserId") + @RequestMapping(method = RequestMethod.GET, value = "/hrms/employee/getEmployeeByUserId") ResponseResult getEmployeeByUserId(@RequestParam("userId") Integer userId); @GetMapping("/hrms/permission/queryPermissionList") diff --git a/dq-financial-hrms-auth/src/main/resources/bootstrap.properties b/dq-financial-hrms-auth/src/main/resources/bootstrap.properties index 89e224ba..91ca0930 100644 --- a/dq-financial-hrms-auth/src/main/resources/bootstrap.properties +++ b/dq-financial-hrms-auth/src/main/resources/bootstrap.properties @@ -57,6 +57,8 @@ spring.redis.jedis.pool.min-idle=0 #spring.redis.jedis.pool.max-idle=8 #spring.redis.jedis.pool.min-idle=0 +#feign.okhttp.enabled=true + #测试环境（prod） #spring.application.name=dq-financial-hrms-auth # diff --git a/dq-financial-hrms/pom.xml b/dq-financial-hrms/pom.xml index 5b50f8e2..7e12b2b5 100644 --- a/dq-financial-hrms/pom.xml +++ b/dq-financial-hrms/pom.xml @@ -11,7 +11,8 @@ com.daqing.financial dq-financial-hrms 0.0.1-SNAPSHOT - 人力资源管理服务hrms + dq-financial-hrms + 大庆智慧金融平台-人力资源管理服务 1.8 @@ -38,17 +39,17 @@ ooxml-schemas 1.0 - - com.daqing.financial - dq-financial-hrms-auth - 0.0.1-SNAPSHOT - compile - - + + diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/DqFinancialHrmsApplication.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/DqFinancialHrmsApplication.java index b9b29137..ba296e98 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/DqFinancialHrmsApplication.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/DqFinancialHrmsApplication.java @@ -13,7 +13,6 @@ import org.springframework.scheduling.annotation.EnableScheduling; @SpringBootApplication @ComponentScan(basePackages = "com.daqing") @EnableScheduling -//@Import({SecurityConfig.class}) public class DqFinancialHrmsApplication { public static void main(String[] args) { diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/config/IPageConfig.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/config/IPageConfig.java index ed530d1c..278266af 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/config/IPageConfig.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/config/IPageConfig.java @@ -1,4 +1,3 @@ -/* package com.daqing.financial.hrms.config; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; @@ -12,4 +11,3 @@ public class IPageConfig { return new PaginationInterceptor(); } } -*/ diff --git a/dq-financial-hrms/src/main/resources/application.yml b/dq-financial-hrms/src/main/resources/application.yml deleted file mode 100644 index 30e77ef2..00000000 --- a/dq-financial-hrms/src/main/resources/application.yml +++ /dev/null @@ -1,12 +0,0 @@ -#security: -# oauth2: -# client: -# client-id: user-client -# client-secret: user-secret-8888 -# user-authorization-uri: http://localhost:7000/oauth/authorize -# access-token-uri: http://localhost:7000/oauth/token -# resource: -# id: user-client -# user-info-uri: user-info -# authorization: -# check-token-access: http://localhost:7000/oauth/check_token \ No newline at end of file diff --git a/dq-financial-hrms/src/main/resources/bootstrap.properties b/dq-financial-hrms/src/main/resources/bootstrap.properties index 69b5c7fa..f933c6cf 100644 --- a/dq-financial-hrms/src/main/resources/bootstrap.properties +++ b/dq-financial-hrms/src/main/resources/bootstrap.properties @@ -65,6 +65,7 @@ spring.servlet.multipart.max-request-size=10MB #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 diff --git a/dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml b/dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml index fa2321dc..ad3b0318 100644 --- a/dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml +++ b/dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml @@ -577,7 +577,7 @@