bug修复,pom文件处理还原

master
shijie 4 years ago
parent c303fef94d
commit 8588ff7ab1
  1. 24
      dq-financial-api/pom.xml
  2. 46
      dq-financial-crms/pom.xml
  3. 2
      dq-financial-crms/src/main/java/com/daqing/financial/crms/config/IPageConfig.java
  4. 2
      dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java
  5. 3
      dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java
  6. 11
      dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java
  7. 19
      dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml
  8. 54
      dq-financial-guarantee/pom.xml
  9. 14
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/config/IPageConfig.java
  10. 18
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java
  11. 4
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountListMapper.java
  12. 3
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgAssetsInvestigationMapper.java
  13. 3
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java
  14. 3
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeAssignUserMapper.java
  15. 3
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeLetterAssignUserMapper.java
  16. 3
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java
  17. 3
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanNoticeMapper.java
  18. 3
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgMessageInvestigationMapper.java
  19. 3
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgPaymentConfirmationConsiderMapper.java
  20. 3
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgWorkConferenceConsiderMapper.java
  21. 34
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgNoticeListResponse.java
  22. 3
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgEfficiencyService.java
  23. 122
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java
  24. 16
      dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountListMapper.xml
  25. 16
      dq-financial-guarantee/src/main/resources/mapper/guarantee/DgAssetsInvestigationMapper.xml
  26. 3
      dq-financial-guarantee/src/main/resources/mapper/guarantee/DgAuditProcessMapper.xml
  27. 16
      dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceInvestigationMapper.xml
  28. 16
      dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeAssignUserMapper.xml
  29. 16
      dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml
  30. 15
      dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml
  31. 16
      dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanNoticeMapper.xml
  32. 16
      dq-financial-guarantee/src/main/resources/mapper/guarantee/DgMessageInvestigationMapper.xml
  33. 16
      dq-financial-guarantee/src/main/resources/mapper/guarantee/DgPaymentConfirmationConsiderMapper.xml
  34. 16
      dq-financial-guarantee/src/main/resources/mapper/guarantee/DgWorkConferenceConsiderMapper.xml
  35. 45
      dq-financial-hrms-auth/pom.xml
  36. 9
      dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/feign/HrmsFeignService.java
  37. 2
      dq-financial-hrms-auth/src/main/resources/bootstrap.properties
  38. 25
      dq-financial-hrms/pom.xml
  39. 1
      dq-financial-hrms/src/main/java/com/daqing/financial/hrms/DqFinancialHrmsApplication.java
  40. 2
      dq-financial-hrms/src/main/java/com/daqing/financial/hrms/config/IPageConfig.java
  41. 12
      dq-financial-hrms/src/main/resources/application.yml
  42. 1
      dq-financial-hrms/src/main/resources/bootstrap.properties
  43. 2
      dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml
  44. 48
      dq-framework-common/pom.xml
  45. 23
      dq-framework-model/pom.xml
  46. 3
      dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerTO.java
  47. 38
      dq-framework-utils/pom.xml
  48. 33
      dq-govern-gateway/pom.xml
  49. 2
      dq-govern-gateway/src/main/resources/bootstrap.properties
  50. 48
      pom.xml

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

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

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

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

@ -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<CustomerEntity> {
IPage<CustomerEntity> queryList(Page page, @Param("cr") CustomerRequest customerRequest);
IPage<CustomerEntityResponse> queryList(Page page, @Param("cr") CustomerRequest customerRequest);
CustomerEntity queryCustomerById(Long id);

@ -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<CustomerDao, CustomerEntity
// 分页参数校验
Page<Object> pages = this.pageCheckout(page, size);
// 查询所有客户的基本信息
IPage<CustomerEntity> customerEntityIPage = customerDao.queryList(pages, customerRequest);
IPage<CustomerEntityResponse> customerEntityIPage = customerDao.queryList(pages, customerRequest);
// 获取所有的客户基本信息
List<CustomerEntity> customers = customerEntityIPage.getRecords();
List<CustomerEntityResponse> 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<CustomerDao, CustomerEntity
// 将客户信息和客户经理及部门信息拼装起来
listResponse = this.jointCustomerEmployee(customers, employeeTO);
} else {
for (CustomerEntity customer : customers) {
for (CustomerEntityResponse customer : customers) {
CustomerTO customerTO = new CustomerTO();
BeanUtils.copyProperties(customer, customerTO);
listResponse.add(customerTO);
@ -477,11 +478,11 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, CustomerEntity
* @param employeeTO 员工及部门信息集合
* @return
*/
private List<CustomerTO> jointCustomerEmployee(List<CustomerEntity> customers, List<EmployeeTO> employeeTO) {
private List<CustomerTO> jointCustomerEmployee(List<CustomerEntityResponse> customers, List<EmployeeTO> employeeTO) {
List<CustomerTO> customerTOS = new ArrayList<>();// 用于拼装客户信息和员工及部门信息的集合
CustomerTO customerTO;
// 将客户信息和客户经理及部门信息拼装起来
for (CustomerEntity customer : customers) {
for (CustomerEntityResponse customer : customers) {
// 每一个客户对应一个不同的对象
customerTO = new CustomerTO();
for (EmployeeTO employee : employeeTO) {

@ -21,23 +21,24 @@
</resultMap>
<!-- 查询客户列表(所有)、根据创建时间筛选、根据客户类型筛选、根据客户编号或者名称搜索 -->
<select id="queryList" parameterType="com.daqing.framework.domain.crms.request.CustomerRequest" resultType="com.daqing.framework.domain.crms.CustomerEntity">
SELECT id,code,type,name,phone,manager
FROM crms_customer
WHERE del_or_not = 0
<select id="queryList" parameterType="com.daqing.framework.domain.crms.request.CustomerRequest" resultType="com.daqing.framework.domain.crms.response.CustomerEntityResponse">
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
<if test="cr.codeOrName != null and cr.codeOrName != '' ">
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},'%'))
</if>
<if test="cr.customerType != null">
AND type = #{cr.customerType}
AND cc.type = #{cr.customerType}
</if>
<if test="cr.startTime != null and cr.startTime != '' ">
AND create_time &gt;= #{cr.startTime}
AND cc.create_time &gt;= #{cr.startTime}
</if>
<if test="cr.endTime != null and cr.endTime != '' ">
AND create_time &lt;= #{cr.endTime}
AND cc.create_time &lt;= #{cr.endTime}
</if>
ORDER BY create_time DESC
ORDER BY cc.create_time DESC
</select>
<!-- 根据id查询客户的基本信息 -->

@ -3,15 +3,16 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>financial</artifactId>
<groupId>com.daqing.financial</groupId>
<version>0.0.1-SNAPSHOT</version>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.8.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.daqing.financial.guarantee</groupId>
<artifactId>dq-financial-guarantee</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>担保业务管理系统guarantee</name>
<name>dq-financial-guarantee</name>
<description>大庆智慧金融平台-担保业务管理系统</description>
<properties>
<java.version>1.8</java.version>
@ -19,18 +20,12 @@
</properties>
<dependencies>
<dependency>
<groupId>com.daqing.financial</groupId>
<artifactId>dq-financial-hrms-auth</artifactId>
<version>0.0.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.3.8</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.daqing.financial</groupId>-->
<!-- <artifactId>dq-financial-hrms-auth</artifactId>-->
<!-- <version>0.0.1-SNAPSHOT</version>-->
<!-- <scope>compile</scope>-->
<!-- </dependency>-->
<!--redis-->
<dependency>
<groupId>org.springframework.boot</groupId>
@ -40,13 +35,14 @@
<dependency>
<groupId>com.daqing.framework</groupId>
<artifactId>dq-framework-common</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.daqing.financial</groupId>
<artifactId>dq-financial-api</artifactId>
<version>0.0.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@ -68,6 +64,13 @@
<version>1.8.2</version>
</dependency>
<!-- lombok需要的jar包 -->
<!-- <dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.12</version>
</dependency>-->
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
@ -80,12 +83,6 @@
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.0.7.1</version>
</dependency>
<dependency>
<groupId>com.daqing.framework</groupId>
<artifactId>dq-framework-model</artifactId>
<version>0.0.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
@ -99,4 +96,13 @@
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>

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

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

@ -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<DgApplyAmountList> {
IPage<BusinessApplicationListResponse> pageByCondition(Page page, String customerNumberOrName, List<String> roleIdlist, String userId);
List<DgNoticeListResponse> selectApplyList(@Param("userId") String userId, @Param("roleIdlist") List<String> roleIdlist);
}

@ -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<DgAssetsInvestig
DgAssetsInvestigationResponse selectInfoById(Integer id);
List<AssetsInvestigationListResponse> selectListByIds(List<String> ids);
List<DgNoticeListResponse> selectAssetsList(String userId, List<String> roleIdlist);
}

@ -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<DgCompliance
Boolean updateDgComplianceInvestigationUserIdById(@Param("id") Integer id, @Param("userId") Integer userId);
AttacheAndABUserIdPO getAttacheAndABByBusinessId(Integer businessId);
List<DgNoticeListResponse> selectComplianceList(String userId, List<String> roleIdlist);
}

@ -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<DgGuaranteeAssig
Boolean updateAuditStatusByBusinessId(@Param("businessId") Integer businessId, @Param("auditStatus") Integer auditStatus);
Boolean updateOperationStatusById(@Param("businessId") Integer businessId, @Param("operationStatus") Integer operationStatus);
List<DgNoticeListResponse> selectGuaranteeList(String userId, List<String> roleIdlist);
}

@ -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<DgGuarante
List<GuaranteeLetterListResponse> selectBatchData(List<String> idList);
GuaranteeLetterListResponse selectGuaranteeLetter(String businessId,String roleId);
List<DgNoticeListResponse> selectGuaranteeLetterList(String userId, List<String> roleIdlist);
}

@ -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<DgLoanCommitte
Boolean updateLoanCommitteeConsiderUserIdById(@Param("id") Integer id, @Param("userId") Integer userId);
Integer countGuaranteeLetterAssignUser(@Param("businessId") Integer businessId, @Param("roleId") Integer roleId);
List<DgNoticeListResponse> selectLoanCommitteeList(String userId, List<String> roleIdlist);
}

@ -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<DgLoanNotice> {
List<LoanNoticeListResponse> selectBatchData(List<String> idList);
LoanNoticeListResponse selectLoanNotice(String businessId, String roleId);
List<DgNoticeListResponse> selectLoanNoticeList(String userId, List<String> roleIdlist);
}

@ -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<DgMessageInvest
IPage<MessageInvestigationListResponse> pageByCondition(Page page, String customerNumberOrName, List<String> roleIdlist, String userId, Integer status);
List<MessageInvestigationListResponse> selectListByIds(List<String> ids);
List<DgNoticeListResponse> selectMessageList(String userId, List<String> roleIdlist);
}

@ -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<DgPaymen
IPage<PaymentConfirmationListResponse> pageByCondition(Page page, List<String> roleIdList , Integer userId , Integer status, String customerNumberOrName);
List<PaymentConfirmationListResponse> selectBatchData(List<String> idList);
List<DgNoticeListResponse> selectPaymentConfirmationList(String userId, List<String> roleIdlist);
}

@ -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<DgWorkConfere
Boolean updateOperationStatus(@Param("id") Integer id, @Param("operationStatus") Integer operationStatus);
Boolean updateWorkConferenceUserIdById(@Param("id") Integer id, @Param("userId") Integer userId);
List<DgNoticeListResponse> selectWorkConferenceList(String userId, List<String> roleIdlist);
}

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

@ -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<DgApplyAmountInfo> {
Map approvalNum();
HashMap<Integer, HashMap<Integer, String>> queryList(DgEfficiencyTeamRequest dgEfficiencyTeamRequest);
List notice();
}

@ -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 ServiceImpl<DgEfficiencyMapper, DgA
@Autowired
private DgAuditProcessMapper dgAuditProcessMapper;
@Autowired
private DgApplyAmountListMapper dgApplyAmountListMapper;
@Autowired
private DgGuaranteeAssignUserMapper dgGuaranteeAssignUserMapper;
@Autowired
private DgAssetsInvestigationMapper dgAssetsInvestigationMapper;
@Autowired
private DgMessageInvestigationMapper dgMessageInvestigationMapper;
@Autowired
private DgComplianceInvestigationMapper dgComplianceInvestigationMapper;
@Autowired
private DgWorkConferenceConsiderMapper dgWorkConferenceConsiderMapper;
@Autowired
private DgLoanCommitteeConsiderMapper dgLoanCommitteeConsiderMapper;
@Autowired
private DgGuaranteeLetterAssignUserMapper dgGuaranteeLetterAssignUserMapper;
@Autowired
private DgPaymentConfirmationConsiderMapper dgPaymentConfirmationConsiderMapper;
@Autowired
private DgLoanNoticeMapper dgLoanNoticeMapper;
/**
* 团队效率
*/
@ -141,8 +164,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
@Override
public Map approvalNum() {
//获取当前用户id
//String userId = dgApplyAmountInfoController.getUserId();
String userId = "5";
String userId = dgApplyAmountInfoController.getUserId();
//近十天的日期数组
List<String>timeList = dgAuditProcessMapper.selectTenDays(Integer.parseInt(userId));
//近十天审批数目的值的数组
@ -152,4 +174,96 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
map.put("approvalNumArr",approvalList);
return map;
}
/**
* 查询审批数目的值的数组
* @return
*/
@Override
public List notice() {
//获取当前用户id
//String userId = dgApplyAmountInfoController.getUserId();
String userId = "5";
//根据角色查询资产部调查列表
String roleIds = RedisUtil.get("dq:userRole:" + userId);
PageUtils data = null;
List<String> roleIdlist = new ArrayList<>();
if(roleIds != null) {
String[] ids = roleIds.split(",");
roleIdlist = Arrays.asList(ids);
}
//查询业务管理模块该用户待处理的记录
//业务申请模块,查询该用户待处理的记录
List<DgNoticeListResponse> list1 = dgApplyAmountListMapper.selectApplyList(userId,roleIdlist);
List<DgNoticeListResponse> list = new ArrayList();
for (DgNoticeListResponse res:list1) {
res.setBusinessCode("您有一个待办任务需办理,评审内容:业务申请:"+res.getBusinessCode());
list.add(res);
}
//担保部调查模块,查询该用户待处理的记录
List<DgNoticeListResponse> list2 = dgGuaranteeAssignUserMapper.selectGuaranteeList(userId,roleIdlist);
for (DgNoticeListResponse res:list2) {
res.setBusinessCode("您有一个待办任务需办理,评审内容:担保部调查:"+res.getBusinessCode());
list.add(res);
}
//资产部调查模块,查询该用户待处理的记录
List<DgNoticeListResponse> list3 = dgAssetsInvestigationMapper.selectAssetsList(userId,roleIdlist);
for (DgNoticeListResponse res:list3) {
res.setBusinessCode("您有一个待办任务需办理,评审内容:资产部调查:"+res.getBusinessCode());
list.add(res);
}
//信息部调查模块,查询该用户待处理的记录
List<DgNoticeListResponse> list4 = dgMessageInvestigationMapper.selectMessageList(userId,roleIdlist);
for (DgNoticeListResponse res:list4) {
res.setBusinessCode("您有一个待办任务需办理,评审内容:信息部调查:"+res.getBusinessCode());
list.add(res);
}
//合规调查模块,查询该用户待处理的记录
List<DgNoticeListResponse> list5 = dgComplianceInvestigationMapper.selectComplianceList(userId,roleIdlist);
for (DgNoticeListResponse res:list5) {
res.setBusinessCode("您有一个待办任务需办理,评审内容:合规调查:"+res.getBusinessCode());
list.add(res);
}
//工作会模块,查询该用户待处理的记录
List<DgNoticeListResponse> list6 = dgWorkConferenceConsiderMapper.selectWorkConferenceList(userId,roleIdlist);
for (DgNoticeListResponse res:list6) {
res.setBusinessCode("您有一个待办任务需办理,评审内容:工作会:"+res.getBusinessCode());
list.add(res);
}
//贷审会模块,查询该用户待处理的记录
List<DgNoticeListResponse> list7 = dgLoanCommitteeConsiderMapper.selectLoanCommitteeList(userId,roleIdlist);
for (DgNoticeListResponse res:list7) {
res.setBusinessCode("您有一个待办任务需办理,评审内容:贷审会:"+res.getBusinessCode());
list.add(res);
}
//担保函模块,查询该用户待处理的记录
List<DgNoticeListResponse> list8 = dgGuaranteeLetterAssignUserMapper.selectGuaranteeLetterList(userId,roleIdlist);
for (DgNoticeListResponse res:list8) {
res.setBusinessCode("您有一个待办任务需办理,评审内容:担保函:"+res.getBusinessCode());
list.add(res);
}
//回款确认模块,查询该用户待处理的记录
List<DgNoticeListResponse> list9 = dgPaymentConfirmationConsiderMapper.selectPaymentConfirmationList(userId,roleIdlist);
for (DgNoticeListResponse res:list9) {
res.setBusinessCode("您有一个待办任务需办理,评审内容:回款确认:"+res.getBusinessCode());
list.add(res);
}
//放款通知模块,查询该用户待处理的记录
List<DgNoticeListResponse> list10 = dgLoanNoticeMapper.selectLoanNoticeList(userId,roleIdlist);
for (DgNoticeListResponse res:list10) {
res.setBusinessCode("您有一个待办任务需办理,评审内容:放款通知:"+res.getBusinessCode());
list.add(res);
}
return list;
}
}

@ -39,4 +39,20 @@
order by au.create_time desc
</select>
<select id="selectApplyList" resultType="com.daqing.financial.guarantee.model.response.DgNoticeListResponse">
select au.id,au.role_id,ai.business_code,au.create_time
from dg_apply_amount_list au
left join dg_apply_amount_info ai on au.business_id = ai.id
<where>
au.role_id in
<foreach collection="roleIdlist" open="(" separator="," close=")" item="id">
#{id}
</foreach>
<if test="userId != null and userId != ''">
AND (au.emp_id =#{userId} or au.emp_id is null or au.emp_id ='')
</if>
AND au.operating_status=1
</where>
</select>
</mapper>

@ -76,4 +76,20 @@
</foreach>
</select>
<select id="selectAssetsList" resultType="com.daqing.financial.guarantee.model.response.DgNoticeListResponse">
select au.id,au.role_id,ai.business_code,au.create_time
from dg_assets_investigation au
left join dg_apply_amount_info ai on au.business_id = ai.id
<where>
au.role_id in
<foreach collection="roleIdlist" open="(" separator="," close=")" item="id">
#{id}
</foreach>
<if test="userId != null and userId != ''">
AND (au.emp_id =#{userId} or au.emp_id is null or au.emp_id ='')
</if>
AND au.operating_status=1
</where>
</select>
</mapper>

@ -7,7 +7,6 @@
<id column="id" property="id" />
<result column="business_id" property="businessId" />
<result column="approver" property="approver" />
<result column="dept_name" property="deptName"/>
<result column="create_time" property="createTime" />
<result column="status" property="status" />
<result column="audit_opinion" property="auditOpinion" />
@ -17,7 +16,7 @@
</resultMap>
<select id="selectAuditProcessList" resultMap="BaseResultMap">
select dap.id,dap.business_id,dap.approver,dap.dept_name,dap.create_time,dap.audit_opinion,
select dap.id,dap.business_id,dap.approver,dap.create_time,dap.audit_opinion,
dbps.business_status as status,dap.reason,dap.loan_money,dap.loan_tern
from dg_audit_process dap
left join dg_business_process_status dbps on dbps.business_id = dap.business_id

@ -202,4 +202,20 @@
AND a.business_id = #{businessId}
</select>
<select id="selectComplianceList" resultType="com.daqing.financial.guarantee.model.response.DgNoticeListResponse">
SELECT au.id,au.role_id,ai.business_code,au.create_time
FROM dg_compliance_investigation au
left join dg_apply_amount_info ai on au.business_id = ai.id
<where>
au.role_id in
<foreach collection="roleIdlist" open="(" separator="," close=")" item="id">
#{id}
</foreach>
<if test="userId != null and userId != ''">
AND (au.user_id =#{userId} or au.user_id is null or au.user_id ='')
</if>
AND au.operation_status=1
</where>
</select>
</mapper>

@ -70,4 +70,20 @@
WHERE business_id = #{businessId} AND (role_id = 59 OR role_id = 60)
</update>
<select id="selectGuaranteeList" resultType="com.daqing.financial.guarantee.model.response.DgNoticeListResponse">
select au.id,au.role_id,ai.business_code,au.create_time
from dg_guarantee_assign_user au
left join dg_apply_amount_info ai on au.business_id = ai.id
<where>
au.role_id in
<foreach collection="roleIdlist" open="(" separator="," close=")" item="id">
#{id}
</foreach>
<if test="userId != null and userId != ''">
AND (au.emp_id =#{userId} or au.emp_id is null or au.emp_id ='')
</if>
AND au.operating_status=1
</where>
</select>
</mapper>

@ -86,4 +86,20 @@
where lau.business_id = #{businessId} and lau.role_id = #{roleId}
</select>
<select id="selectGuaranteeLetterList" resultType="com.daqing.financial.guarantee.model.response.DgNoticeListResponse">
select au.id,au.role_id,ai.business_code,au.create_time
from dg_guarantee_letter_assign_user au
left join dg_apply_amount_info ai on au.business_id = ai.id
<where>
au.role_id in
<foreach collection="roleIdlist" open="(" separator="," close=")" item="id">
#{id}
</foreach>
<if test="userId != null and userId != ''">
AND (au.user_id =#{userId} or au.user_id is null or au.user_id ='')
</if>
AND au.operating_status=1
</where>
</select>
</mapper>

@ -150,5 +150,20 @@
<select id="countGuaranteeLetterAssignUser" resultType="integer">
SELECT COUNT(id) FROM dg_guarantee_letter_assign_user WHERE business_id = #{businessId} AND role_id = #{roleId}
</select>
<select id="selectLoanCommitteeList" resultType="com.daqing.financial.guarantee.model.response.DgNoticeListResponse">
SELECT au.id,au.role_id,ai.business_code,au.create_time
FROM dg_loan_committee_consider au
left join dg_apply_amount_info ai on au.business_id = ai.id
<where>
au.role_id in
<foreach collection="roleIdlist" open="(" separator="," close=")" item="id">
#{id}
</foreach>
<if test="userId != null and userId != ''">
AND (au.consider_id =#{userId} or au.consider_id is null or au.consider_id ='')
</if>
AND au.operating_status=1
</where>
</select>
</mapper>

@ -85,4 +85,20 @@
where ln.business_id = #{businessId} and ln.role_id = #{roleId}
</select>
<select id="selectLoanNoticeList" resultType="com.daqing.financial.guarantee.model.response.DgNoticeListResponse">
select au.id,au.role_id,ai.business_code,au.create_time
from dg_loan_notice au
left join dg_apply_amount_info ai on au.business_id = ai.id
<where>
au.role_id in
<foreach collection="roleIdlist" open="(" separator="," close=")" item="id">
#{id}
</foreach>
<if test="userId != null and userId != ''">
AND (au.consider_id =#{userId} or au.consider_id is null or au.consider_id ='')
</if>
AND au.operating_status=1
</where>
</select>
</mapper>

@ -58,4 +58,20 @@
</foreach>
</select>
<select id="selectMessageList" resultType="com.daqing.financial.guarantee.model.response.DgNoticeListResponse">
select au.id,au.role_id,ai.business_code,au.create_time
from dg_message_investigation au
left join dg_apply_amount_info ai on au.business_id = ai.id
<where>
au.role_id in
<foreach collection="roleIdlist" open="(" separator="," close=")" item="id">
#{id}
</foreach>
<if test="userId != null and userId != ''">
AND (au.emp_id =#{userId} or au.emp_id is null or au.emp_id ='')
</if>
AND au.operating_status=1
</where>
</select>
</mapper>

@ -77,4 +77,20 @@
</foreach>
</select>
<select id="selectPaymentConfirmationList" resultType="com.daqing.financial.guarantee.model.response.DgNoticeListResponse">
select au.id,au.role_id,ai.business_code,au.create_time
from dg_payment_confirmation_consider au
left join dg_apply_amount_info ai on au.business_id = ai.id
<where>
au.role_id in
<foreach collection="roleIdlist" open="(" separator="," close=")" item="id">
#{id}
</foreach>
<if test="userId != null and userId != ''">
AND (au.consider_id =#{userId} or au.consider_id is null or au.consider_id ='')
</if>
AND au.operating_status=1
</where>
</select>
</mapper>

@ -131,4 +131,20 @@
UPDATE dg_work_conference_consider SET user_id = #{userId} WHERE id = #{id}
</update>
<select id="selectWorkConferenceList" resultType="com.daqing.financial.guarantee.model.response.DgNoticeListResponse">
SELECT au.id,au.role_id,ai.business_code,au.create_time
FROM dg_work_conference_consider au
left join dg_apply_amount_info ai on au.business_id = ai.id
<where>
au.role_id in
<foreach collection="roleIdlist" open="(" separator="," close=")" item="id">
#{id}
</foreach>
<if test="userId != null and userId != ''">
AND (au.user_id =#{userId} or au.user_id is null or au.user_id ='')
</if>
AND au.operation_status=1
</where>
</select>
</mapper>

@ -3,13 +3,16 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>financial</artifactId>
<groupId>com.daqing.financial</groupId>
<version>0.0.1-SNAPSHOT</version>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.8.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.daqing.financial</groupId>
<artifactId>dq-financial-hrms-auth</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>人资用户认证服务hrms-auth</name>
<name>dq-financial-hrms-auth</name>
<description>大庆智慧金融平台-人资用户认证服务</description>
<properties>
<java.version>1.8</java.version>
@ -70,11 +73,11 @@
<scope>compile</scope>
</dependency>
<!-- <dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
</dependency>-->
<!-- <dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
</dependency>-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
@ -98,19 +101,19 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<!-- <configuration >-->
<!-- <classifier>exec</classifier>-->
<!-- </configuration>-->
</plugin>
<!-- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<configuration >
<classifier>exec</classifier>
</configuration>
</plugin>-->
</plugin>
<!-- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>-->
</plugins>
</build>

@ -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<EmployeeEntity> getEmployeeByUserId(@RequestParam("userId") Integer userId);
@GetMapping("/hrms/permission/queryPermissionList")

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

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

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

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

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

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

@ -577,7 +577,7 @@
<select id="getAccountAndDeptNameById"
resultType="com.daqing.framework.domain.guarantee.response.EmployeeMessageResponse">
select hu.id, hu.account, GROUP_CONCAT(hd.`name` SEPARATOR '/')deptName
select hu.id, he.name as account, GROUP_CONCAT(hd.`name` SEPARATOR '/')deptName
from hrms_employee_dept ed
LEFT JOIN hrms_dept hd on hd.id=ed.dept_id
LEFT JOIN hrms_employee he on he.id=ed.employee_id

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

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

@ -57,4 +57,7 @@ public class CustomerTO implements Serializable {
*/
@ApiModelProperty(value = "所属部门")
private List<String> departments;
@ApiModelProperty(value = "企业id")
private Long companyId;
}

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

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

@ -38,7 +38,7 @@ spring.redis.jedis.pool.min-idle=0
#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

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

Loading…
Cancel
Save