diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 89d5c3e1..7b320794 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -7,16 +7,16 @@ + + - - - - - - + + + + diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 8703e7ad..8c3bc4a0 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -1,6 +1,8 @@ + + @@ -13,8 +15,11 @@ + + + diff --git a/dq-financial-api/src/main/java/com/daqing/financial/hrms/DeptControllerApi.java b/dq-financial-api/src/main/java/com/daqing/financial/hrms/DeptControllerApi.java index a07fff28..443503fe 100644 --- a/dq-financial-api/src/main/java/com/daqing/financial/hrms/DeptControllerApi.java +++ b/dq-financial-api/src/main/java/com/daqing/financial/hrms/DeptControllerApi.java @@ -70,6 +70,12 @@ public interface DeptControllerApi { @ApiOperation(value = "查询该部门下所有子部门及部门下的的员工", notes = "查询该部门下所有子部门及部门下的的员工") ResponseResult children(Long id); + /** + * 获取所有部门id和名称(用户团队效率的部门筛选) + */ + @ApiOperation(value = "获取所有部门id和名称(用户团队效率的部门筛选)", notes = "获取所有部门id和名称(用户团队效率的部门筛选)") + ResponseResult listDepartment(); + /** * 根据部门id查询该部门下所有员工 */ diff --git a/dq-financial-api/target/classes/com/daqing/financial/DqFinancialApiApplication.class b/dq-financial-api/target/classes/com/daqing/financial/DqFinancialApiApplication.class deleted file mode 100644 index 38b18cb5..00000000 Binary files a/dq-financial-api/target/classes/com/daqing/financial/DqFinancialApiApplication.class and /dev/null differ diff --git a/dq-financial-api/target/classes/com/daqing/financial/config/SwaggerConfig.class b/dq-financial-api/target/classes/com/daqing/financial/config/SwaggerConfig.class index dd3c1ee4..3a33f86e 100644 Binary files a/dq-financial-api/target/classes/com/daqing/financial/config/SwaggerConfig.class and b/dq-financial-api/target/classes/com/daqing/financial/config/SwaggerConfig.class differ diff --git a/dq-financial-api/target/classes/com/daqing/financial/crms/CustomerControllerApi.class b/dq-financial-api/target/classes/com/daqing/financial/crms/CustomerControllerApi.class index 4edb2409..73a0e029 100644 Binary files a/dq-financial-api/target/classes/com/daqing/financial/crms/CustomerControllerApi.class and b/dq-financial-api/target/classes/com/daqing/financial/crms/CustomerControllerApi.class differ diff --git a/dq-financial-api/target/classes/com/daqing/financial/hrauth/UserLoginControllerApi.class b/dq-financial-api/target/classes/com/daqing/financial/hrauth/UserLoginControllerApi.class index ce4e2fc4..89a9bd55 100644 Binary files a/dq-financial-api/target/classes/com/daqing/financial/hrauth/UserLoginControllerApi.class and b/dq-financial-api/target/classes/com/daqing/financial/hrauth/UserLoginControllerApi.class differ diff --git a/dq-financial-api/target/classes/com/daqing/financial/hrms/DeptControllerApi.class b/dq-financial-api/target/classes/com/daqing/financial/hrms/DeptControllerApi.class index 5ab93650..9119628c 100644 Binary files a/dq-financial-api/target/classes/com/daqing/financial/hrms/DeptControllerApi.class and b/dq-financial-api/target/classes/com/daqing/financial/hrms/DeptControllerApi.class differ diff --git a/dq-financial-api/target/classes/com/daqing/financial/hrms/EmployeeControllerApi.class b/dq-financial-api/target/classes/com/daqing/financial/hrms/EmployeeControllerApi.class index e6b3b9e4..f910927a 100644 Binary files a/dq-financial-api/target/classes/com/daqing/financial/hrms/EmployeeControllerApi.class and b/dq-financial-api/target/classes/com/daqing/financial/hrms/EmployeeControllerApi.class differ diff --git a/dq-financial-api/target/classes/com/daqing/financial/hrms/PermissionControllerApi.class b/dq-financial-api/target/classes/com/daqing/financial/hrms/PermissionControllerApi.class index feb1f657..9c20bb1d 100644 Binary files a/dq-financial-api/target/classes/com/daqing/financial/hrms/PermissionControllerApi.class and b/dq-financial-api/target/classes/com/daqing/financial/hrms/PermissionControllerApi.class differ diff --git a/dq-financial-api/target/classes/com/daqing/financial/hrms/PositionControllerApi.class b/dq-financial-api/target/classes/com/daqing/financial/hrms/PositionControllerApi.class index 11730f47..6db5f2a2 100644 Binary files a/dq-financial-api/target/classes/com/daqing/financial/hrms/PositionControllerApi.class and b/dq-financial-api/target/classes/com/daqing/financial/hrms/PositionControllerApi.class differ diff --git a/dq-financial-crms/pom.xml b/dq-financial-crms/pom.xml index 54f97d16..4ced7f50 100644 --- a/dq-financial-crms/pom.xml +++ b/dq-financial-crms/pom.xml @@ -24,6 +24,7 @@ 0.0.1-SNAPSHOT compile + com.daqing.financial dq-financial-api @@ -65,6 +66,12 @@ maven-compiler-plugin 3.8.1 + + org.springframework.security + spring-security-core + 5.3.4.RELEASE + compile + diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/request/CompanyCustomerRequest.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/request/CompanyCustomerRequest.java index 2b911495..a321465e 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/request/CompanyCustomerRequest.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/model/request/CompanyCustomerRequest.java @@ -68,7 +68,7 @@ public class CompanyCustomerRequest implements Serializable { @ApiModelProperty(value = "联系人") private String linkman; - @ApiModelProperty(value = "联系人的联系电话") + @ApiModelProperty(value = "联系人电话") private String linkPhone; @ApiModelProperty(value = "经营地址") 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..73751c3d 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 @@ -239,7 +239,7 @@ public class CustomerServiceImpl extends ServiceImpl().FAIL("导入数据失败,员工" + manager.getManager() + "不存在"); } } - this.saveCustomerCompany(customerCompanyTOI); + this.insertCompany(companyCustomerRequest); + // this.saveCustomerCompany(customerCompanyTOI); } return ResponseResult.SUCCESS(); } catch (Exception e) { diff --git a/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml b/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml index deee2166..7acd5e86 100644 --- a/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml +++ b/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml @@ -33,7 +33,7 @@ diff --git a/dq-financial-crms/target/classes/META-INF/dq-financial-crms.kotlin_module b/dq-financial-crms/target/classes/META-INF/dq-financial-crms.kotlin_module deleted file mode 100644 index 8fb60192..00000000 Binary files a/dq-financial-crms/target/classes/META-INF/dq-financial-crms.kotlin_module and /dev/null differ diff --git a/dq-financial-crms/target/classes/bootstrap.properties b/dq-financial-crms/target/classes/bootstrap.properties index 95bb071b..fe1ce1cd 100644 --- a/dq-financial-crms/target/classes/bootstrap.properties +++ b/dq-financial-crms/target/classes/bootstrap.properties @@ -1,7 +1,8 @@ +# 开发和测试环境（dev） #服务名称 spring.application.name=dq-financial-crms #配置中心地址 -spring.cloud.nacos.config.server-addr=192.168.31.142:8848 +spring.cloud.nacos.config.server-addr=192.168.31.140:8848 spring.cloud.nacos.config.namespace=1f69d47e-0aeb-4a1e-8ab4-0e84dfb86354 #spring.cloud.nacos.config.group=prod @@ -15,4 +16,80 @@ spring.cloud.nacos.config.ext-config[1].refresh=true spring.cloud.nacos.config.ext-config[2].data-id=other.yml spring.cloud.nacos.config.ext-config[2].group=dev -spring.cloud.nacos.config.ext-config[2].refresh=true \ No newline at end of file +spring.cloud.nacos.config.ext-config[2].refresh=true + +spring.redis.host=127.0.0.1 +spring.redis.port=6379 +spring.redis.password=123456 +spring.redis.database=0 +spring.redis.timeout=30000 +spring.redis.jedis.pool.max-active=8 +spring.redis.jedis.pool.max-wait=-1 +spring.redis.jedis.pool.max-idle=8 +spring.redis.jedis.pool.min-idle=0 + +#请求处理的超时时间 +ribbon.ReadTimeout: 120000 +#请求连接的超时时间 +ribbon.ConnectTimeout: 120000 + +# 正式环境（prod） +#服务名称 +#spring.application.name=dq-financial-crms +###配置中心地址 +#spring.cloud.nacos.config.server-addr=120.78.127.12:8848 +#spring.cloud.nacos.config.namespace=25ce05e2-a0eb-4842-92e4-d8b550a489dd +##spring.cloud.nacos.config.group=prod +# +#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml +#spring.cloud.nacos.config.ext-config[0].group=prod +#spring.cloud.nacos.config.ext-config[0].refresh=true +# +#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml +#spring.cloud.nacos.config.ext-config[1].group=prod +#spring.cloud.nacos.config.ext-config[1].refresh=true +# +#spring.cloud.nacos.config.ext-config[2].data-id=other.yml +#spring.cloud.nacos.config.ext-config[2].group=prod +#spring.cloud.nacos.config.ext-config[2].refresh=true +# +#spring.redis.host=127.0.0.1 +#spring.redis.port=6379 +#spring.redis.password=dq123456 +#spring.redis.database=0 +#spring.redis.timeout=30000 +#spring.redis.jedis.pool.max-active=8 +#spring.redis.jedis.pool.max-wait=-1 +#spring.redis.jedis.pool.max-idle=8 +#spring.redis.jedis.pool.min-idle=0 + + +# 测试环境（prod） +#服务名称 +#spring.application.name=dq-financial-crms +##配置中心地址 +#spring.cloud.nacos.config.server-addr=127.0.0.1:8848 +#spring.cloud.nacos.config.namespace=1912aa66-6e18-4680-8943-5b8fae71414c +##spring.cloud.nacos.config.group=prod +# +#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml +#spring.cloud.nacos.config.ext-config[0].group=prod +#spring.cloud.nacos.config.ext-config[0].refresh=true +# +#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml +#spring.cloud.nacos.config.ext-config[1].group=prod +#spring.cloud.nacos.config.ext-config[1].refresh=true +# +#spring.cloud.nacos.config.ext-config[2].data-id=other.yml +#spring.cloud.nacos.config.ext-config[2].group=prod +#spring.cloud.nacos.config.ext-config[2].refresh=true +# +#spring.redis.host=127.0.0.1 +#spring.redis.port=6379 +#spring.redis.password= +#spring.redis.database=0 +#spring.redis.timeout=30000 +#spring.redis.jedis.pool.max-active=8 +#spring.redis.jedis.pool.max-wait=-1 +#spring.redis.jedis.pool.max-idle=8 +#spring.redis.jedis.pool.min-idle=0 \ No newline at end of file diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/DqFinancialCrmsApplication.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/DqFinancialCrmsApplication.class index 518270b3..a37e7e3b 100644 Binary files a/dq-financial-crms/target/classes/com/daqing/financial/crms/DqFinancialCrmsApplication.class and b/dq-financial-crms/target/classes/com/daqing/financial/crms/DqFinancialCrmsApplication.class differ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/config/CorsConfig.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/config/CorsConfig.class deleted file mode 100644 index 6f152156..00000000 Binary files a/dq-financial-crms/target/classes/com/daqing/financial/crms/config/CorsConfig.class and /dev/null differ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/config/IPageConfig.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/config/IPageConfig.class deleted file mode 100644 index 176a6cff..00000000 Binary files a/dq-financial-crms/target/classes/com/daqing/financial/crms/config/IPageConfig.class and /dev/null differ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/controller/CustomerController.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/controller/CustomerController.class index 8dfdaae2..b5038199 100644 Binary files a/dq-financial-crms/target/classes/com/daqing/financial/crms/controller/CustomerController.class and b/dq-financial-crms/target/classes/com/daqing/financial/crms/controller/CustomerController.class differ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CompanyCustomerDao.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CompanyCustomerDao.class index 364a01cf..843b829f 100644 Binary files a/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CompanyCustomerDao.class and b/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CompanyCustomerDao.class differ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CustomerDao.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CustomerDao.class index 060ed43c..a4266a6b 100644 Binary files a/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CustomerDao.class and b/dq-financial-crms/target/classes/com/daqing/financial/crms/dao/CustomerDao.class differ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/feign/HrmsFeignService.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/feign/HrmsFeignService.class index 19fe26e9..51fac9d9 100644 Binary files a/dq-financial-crms/target/classes/com/daqing/financial/crms/feign/HrmsFeignService.class and b/dq-financial-crms/target/classes/com/daqing/financial/crms/feign/HrmsFeignService.class differ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/service/CustomerService.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/service/CustomerService.class index c7838668..2acef682 100644 Binary files a/dq-financial-crms/target/classes/com/daqing/financial/crms/service/CustomerService.class and b/dq-financial-crms/target/classes/com/daqing/financial/crms/service/CustomerService.class differ diff --git a/dq-financial-crms/target/classes/com/daqing/financial/crms/service/impl/CustomerServiceImpl.class b/dq-financial-crms/target/classes/com/daqing/financial/crms/service/impl/CustomerServiceImpl.class index cb384b7c..d6bb34fa 100644 Binary files a/dq-financial-crms/target/classes/com/daqing/financial/crms/service/impl/CustomerServiceImpl.class and b/dq-financial-crms/target/classes/com/daqing/financial/crms/service/impl/CustomerServiceImpl.class differ diff --git a/dq-financial-crms/target/classes/mapper/crms/CompanyCustomerDao.xml b/dq-financial-crms/target/classes/mapper/crms/CompanyCustomerDao.xml index 7ca13ac9..deee2166 100644 --- a/dq-financial-crms/target/classes/mapper/crms/CompanyCustomerDao.xml +++ b/dq-financial-crms/target/classes/mapper/crms/CompanyCustomerDao.xml @@ -5,18 +5,31 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + SELECT cu.*,cc.* + FROM crms_company_customer cu + left join crms_customer cc on cu.customer_id = cc.id + + cc.del_or_not=0 and cc.status=0 + + AND cc.code LIKE CONCAT('%',#{applyAmountInfo.code},'%') + + + AND cc.name LIKE CONCAT('%',#{applyAmountInfo.name},'%') + + + AND cu.id = #{applyAmountInfo.companyId} + + + + + + \ No newline at end of file diff --git a/dq-financial-crms/target/classes/mapper/crms/CustomerDao.xml b/dq-financial-crms/target/classes/mapper/crms/CustomerDao.xml index 36ac5037..b871d350 100644 --- a/dq-financial-crms/target/classes/mapper/crms/CustomerDao.xml +++ b/dq-financial-crms/target/classes/mapper/crms/CustomerDao.xml @@ -90,4 +90,13 @@ WHERE del_or_not = 0; + + + + + \ No newline at end of file diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java index 5c09e546..97a9e1d3 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java @@ -18,6 +18,7 @@ import com.daqing.financial.guarantee.model.response.GuaranteeLetterListResponse import com.daqing.financial.guarantee.service.IDgApplyAmountInfoService; import com.daqing.financial.guarantee.service.IDgApplyAmountListService; import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest; +import com.daqing.framework.domain.guarantee.DgApplyField; import com.daqing.framework.domain.guarantee.response.EmployeeMessageResponse; import com.daqing.framework.domain.hrms.UserEntity; import com.daqing.framework.domain.hrms.ext.EmployeeTO; @@ -327,6 +328,25 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA } + /** + * 获取业务申请所有字段 + */ + @GetMapping("/queryFieldField") + @ApiOperation(value = "获取业务申请所有字段") + public ResponseResult queryApplyField(){ + return ResponseResult.SUCCESS(applyAmountInfoService.queryApplyField()); + } + /** + * 修改业务申请字段 + */ + @ApiOperation(value = "修改业务申请字段") + @PostMapping("/updateApplyField") + public ResponseResult updateApplyField(@RequestBody DgApplyField dgApplyField){ + + Boolean result = applyAmountInfoService.updateApplyField(dgApplyField); + + return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL(); + } } 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 1683d026..7ed07640 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 @@ -4,11 +4,9 @@ import com.alibaba.fastjson.JSONObject; import com.daqing.financial.guarantee.feign.HrmsFeignService; import com.daqing.financial.guarantee.model.request.DgEfficiencyTeamRequest; import com.daqing.financial.guarantee.model.request.PersonalEfficiencyListRequest; -import com.daqing.financial.guarantee.model.response.NumResponse; import com.daqing.financial.guarantee.model.response.PersonalEfficiencyListResponse; import com.daqing.financial.guarantee.service.IDgEfficiencyService; import com.daqing.financial.guarantee.util.DateUtils; -import com.daqing.financial.guarantee.util.R; import com.daqing.financial.guarantee.util.TaskNodeUtil; import com.daqing.framework.model.StatusCode; import com.daqing.framework.model.response.ResponseResult; @@ -64,7 +62,7 @@ public class DgEfficiencyController { @ApiOperation(value = "个人效率记录列表 ") @PostMapping("/personalEfficiencyList") - public R personalEfficiencyList( + public ResponseResult personalEfficiencyList( @ApiParam(name = "personalEfficiencyListRequest", value = "个人效率列表查询对象") @RequestBody PersonalEfficiencyListRequest personalEfficiencyListRequest){ List responseList = dgEfficiencyService.queryPersonalEfficiencyList(); @@ -89,54 +87,23 @@ public class DgEfficiencyController { } } } - - NumResponse numResponse = new NumResponse(); - //转换任务节点，并统计操作状态个数 - responseList.forEach(personalEfficiencyListResponse -> { - String taskNode = personalEfficiencyListResponse.getTaskNode(); - if (taskNode!=null){ - String converter = TaskNodeUtil.converter(taskNode); - personalEfficiencyListResponse.setTaskNode(converter); - } - if (personalEfficiencyListResponse.getOperatingStatus()!=null){ - switch (personalEfficiencyListResponse.getOperatingStatus()){ - case 0: - numResponse.setInitiateNum(numResponse.getInitiateNum()+1); - break; - case 1: - numResponse.setPendingNum(numResponse.getPendingNum()+1); - break; - case 2: - numResponse.setProcessedNum(numResponse.getProcessedNum()+1); - break; - default: - numResponse.setInitiateNum(0); - numResponse.setPendingNum(0); - numResponse.setProcessedNum(0); - break; - } - } - }); //根据条件筛选数据 - //迭代器进行筛选 if (personalEfficiencyListRequest.getOperatingStatus()!=null){ // 已发起 if (personalEfficiencyListRequest.getOperatingStatus().equals(StatusCode.CZ_LAUNCH)){ - responseList.removeIf(next -> !next.getOperatingStatus().equals(StatusCode.CZ_LAUNCH)); - // responseList = responseList.stream().filter(p -> !p.getOperatingStatus().equals(StatusCode.CZ_LAUNCH)).collect(Collectors.toList()); + responseList = responseList.stream().filter(p -> p.getOperatingStatus().equals(StatusCode.CZ_LAUNCH)).collect(Collectors.toList()); // 待处理 }else if (personalEfficiencyListRequest.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)){ - responseList.removeIf(next -> !next.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)); - // responseList = responseList.stream().filter(p -> !p.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)).collect(Collectors.toList()); + responseList = responseList.stream().filter(p -> p.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)).collect(Collectors.toList()); // 已处理 }else if (personalEfficiencyListRequest.getOperatingStatus().equals(StatusCode.CZ_PROCESSED)){ - responseList.removeIf(next -> !next.getOperatingStatus().equals(StatusCode.CZ_PROCESSED)); - // responseList = responseList.stream().filter(p -> !p.getOperatingStatus().equals(StatusCode.CZ_PROCESSED)).collect(Collectors.toList()); + responseList = responseList.stream().filter(p -> p.getOperatingStatus().equals(StatusCode.CZ_PROCESSED)).collect(Collectors.toList()); } } + // 时间筛选(固定时间) if (personalEfficiencyListRequest.getCreateFixedTime() != null && personalEfficiencyListRequest.getStartTime() == null && personalEfficiencyListRequest.getEndTime() == null) { - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); switch (personalEfficiencyListRequest.getCreateFixedTime()) { case 0: personalEfficiencyListRequest.setStartTime(dateFormat.format(DateUtils.getDayBegin())); @@ -177,7 +144,26 @@ public class DgEfficiencyController { } } } - return R.ok().data("responseList",responseList).data("statistics",numResponse); + //转换任务节点，并统计操作状态个数 + responseList.forEach(personalEfficiencyListResponse -> { + String taskNode = personalEfficiencyListResponse.getTaskNode(); + if (taskNode!=null){ + String converter = TaskNodeUtil.converter(taskNode); + personalEfficiencyListResponse.setTaskNode(converter); + } + if (personalEfficiencyListResponse.getOperatingStatus()!=null){ + switch (personalEfficiencyListResponse.getOperatingStatus()){ + case 0: + personalEfficiencyListResponse.setInitiateNum(personalEfficiencyListResponse.getInitiateNum()+1); + case 1: + personalEfficiencyListResponse.setPendingNum(personalEfficiencyListResponse.getPendingNum()+1); + case 2: + personalEfficiencyListResponse.setProcessedNum(personalEfficiencyListResponse.getProcessedNum()+1); + } + } + }); + + return ResponseResult.SUCCESS(responseList); } public static long getLongDate(String stringDate){ diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgStatisticsController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgStatisticsController.java index 1218375e..8db0079d 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgStatisticsController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgStatisticsController.java @@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletResponse; */ @RestController @RequestMapping("/guarantee/statistics") -@Api(value = "担保业务统计",tags = "提供业务统计增删改查的方法") +@Api(value = "担保业务统计", tags = "提供业务统计增删改查的方法") public class DgStatisticsController { @Autowired @@ -33,18 +33,18 @@ public class DgStatisticsController { * 列表 */ @GetMapping("/list") - @ApiOperation(value = "业务统计列表",notes = "业务统计列表",response = DgStatisticsListResponse.class) + @ApiOperation(value = "业务统计列表", notes = "业务统计列表", response = DgStatisticsListResponse.class) public ResponseResult list(@RequestParam("page") Integer page, @RequestParam("size") Integer size, DgStatisticsRequest dgStatisticsRequest) { - return ResponseResult.SUCCESS(iDgStatisticsService.list(page,size,dgStatisticsRequest)); + return ResponseResult.SUCCESS(iDgStatisticsService.list(page, size, dgStatisticsRequest)); } /** * 列表导出 */ - @ApiOperation(value = "统计列表导出",notes = "统计列表导出") + @ApiOperation(value = "统计列表导出", notes = "统计列表导出") @GetMapping("/excelExport") - public ResponseResult excelExport(HttpServletResponse response){ + public ResponseResult excelExport(HttpServletResponse response) { Boolean result = iDgStatisticsService.excelExport(response); @@ -55,18 +55,18 @@ public class DgStatisticsController { * 拒绝列表 */ @GetMapping("/listRefuse") - @ApiOperation(value = "业务统计拒绝列表",notes = "业务统计拒绝列表",response = DgStatisticsListRefuseResponse.class) + @ApiOperation(value = "业务统计拒绝列表", notes = "业务统计拒绝列表", response = DgStatisticsListRefuseResponse.class) public ResponseResult listRefuse(@RequestParam("page") Integer page, - @RequestParam("size") Integer size, DgStatisticsRequest dgStatisticsRequest) { - return ResponseResult.SUCCESS(iDgStatisticsService.listRefuse(page,size,dgStatisticsRequest)); + @RequestParam("size") Integer size, DgStatisticsRequest dgStatisticsRequest) { + return ResponseResult.SUCCESS(iDgStatisticsService.listRefuse(page, size, dgStatisticsRequest)); } /** * 拒绝列表导出 */ - @ApiOperation(value = "统计拒绝列表导出",notes = "统计拒绝列表导出") + @ApiOperation(value = "统计拒绝列表导出", notes = "统计拒绝列表导出") @GetMapping("/excelExportRefuse") - public ResponseResult excelExportRefuse(HttpServletResponse response){ + public ResponseResult excelExportRefuse(HttpServletResponse response) { Boolean result = iDgStatisticsService.excelExportRefuse(response); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountInfoMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountInfoMapper.java index 4eadf931..3980a1c3 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountInfoMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountInfoMapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.daqing.financial.guarantee.model.response.BusinessApplicationListResponse; import com.daqing.financial.guarantee.model.response.DgApplyAmountInfoResponse; import com.daqing.framework.domain.guarantee.DgApplyAmountInfo; +import com.daqing.framework.domain.guarantee.DgApplyField; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -30,7 +31,7 @@ public interface DgApplyAmountInfoMapper extends BaseMapper { List selectListByIds(List ids); - int selectBusinessTaday(@Param("dateTime") String dateTime); + DgApplyField queryApplyField(); - String selectMaxBusinessTaday(String dateTime); + Boolean updateApplyField(@Param("af") DgApplyField dgApplyField); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgEfficiencyMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgEfficiencyMapper.java index 7c7cd8c3..4b57155b 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgEfficiencyMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgEfficiencyMapper.java @@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * @auther River @@ -19,4 +20,6 @@ public interface DgEfficiencyMapper extends BaseMapper { List queryList(@Param("et") DgEfficiencyTeamRequest dgEfficiencyTeamRequest); List queryBusinessId(@Param("et") DgEfficiencyTeamRequest dgEfficiencyTeamRequest); + + Map getBusinessCount(); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgStatisticsRequest.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgStatisticsRequest.java index 85e1c8d6..9c6ff595 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgStatisticsRequest.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgStatisticsRequest.java @@ -18,8 +18,8 @@ import java.util.Date; @ToString public class DgStatisticsRequest implements Serializable { - @ApiModelProperty("部门id") - private Integer deptId; + @ApiModelProperty("部门名称") + private String deptId; @ApiModelProperty("业务类型") private String type; @@ -30,17 +30,13 @@ public class DgStatisticsRequest implements Serializable { @ApiModelProperty("申请时间,固定类型,0:今天,1:昨天,2:本周,3:本月,4:本年") private Integer createFixedTime; - @ApiModelProperty("申请时间,自定义时间") - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private Date createCustomTime; - @ApiModelProperty("客户名称或者编号") private String codeOrName; - @ApiModelProperty("辅助字段,不用管,起始时间") + @ApiModelProperty("起始时间") private String startTime; - @ApiModelProperty("辅助字段,不用管,结束时间") + @ApiModelProperty("结束时间") private String endTime; } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsExcelRefuseResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsExcelRefuseResponse.java new file mode 100644 index 00000000..b393322c --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsExcelRefuseResponse.java @@ -0,0 +1,76 @@ +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; + +/** + * 业务统计拒绝列表导出到excel实体类 + * + * @auther River + * @date 2021/1/4 15:11 + */ +@Data +@ToString +public class DgStatisticsExcelRefuseResponse extends BaseRowModel implements Serializable { + + @ApiModelProperty("业务编号") + @ExcelProperty(value = "业务编号",index = 0) + private String businessCode; + + @ApiModelProperty("客户姓名") + @ExcelProperty(value = "客户姓名",index = 1) + private String name; + + @ApiModelProperty("客户联系方式") + @ExcelProperty(value = "联系电话",index = 2) + private String phone; + + @ApiModelProperty("业务类型") + @ExcelProperty(value = "产品类型",index = 3) + private String businessType; + + @ApiModelProperty("申请额度") + @ExcelProperty(value = "金额",index = 4) + private Double applyAmount; + + @ApiModelProperty("申请期限") + @ExcelProperty(value = "期数",index = 5) + private String applyTime; + + @ApiModelProperty("申请日期") + @ExcelProperty(value = "申请日期",index = 6) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; + + @ApiModelProperty("拒绝人") + @ExcelProperty(value = "当前审批人",index = 7) + private String refuseName; + + @ApiModelProperty("拒绝节点id") + @ExcelProperty(value = "任务节点",index = 8) + private Integer processId; + + @ApiModelProperty("拒绝时间") + @ExcelProperty(value = "拒绝时间",index = 9) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date refuseTime; + + @ApiModelProperty("拒绝原因") + @ExcelProperty(value = "拒绝原因",index = 10) + private String refuseOpinion; + + @ApiModelProperty("提单人姓名") + @ExcelProperty(value = "提单人",index = 11) + private String employeeName; + + @ApiModelProperty("部门") + @ExcelProperty(value = "所属部门",index = 12) + private String department; +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsExcelResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsExcelResponse.java new file mode 100644 index 00000000..e3852870 --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsExcelResponse.java @@ -0,0 +1,69 @@ +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; + +/** + * 业务统计列表导出到excel实体类 + * + * @auther River + * @date 2021/1/4 14:48 + */ +@Data +@ToString +public class DgStatisticsExcelResponse extends BaseRowModel implements Serializable { + + @ApiModelProperty("业务编号") + @ExcelProperty(value = "业务编号",index = 0) + private String businessCode; + + @ApiModelProperty("客户姓名") + @ExcelProperty(value = "客户姓名",index = 1) + private String name; + + @ApiModelProperty("客户联系方式") + @ExcelProperty(value = "联系电话",index = 2) + private String phone; + + @ApiModelProperty("业务类型") + @ExcelProperty(value = "产品类型",index = 3) + private String businessType; + + @ApiModelProperty("申请额度") + @ExcelProperty(value = "金额",index = 4) + private Double applyAmount; + + @ApiModelProperty("申请期限") + @ExcelProperty(value = "期数",index = 5) + private String applyTime; + + @ApiModelProperty("申请日期") + @ExcelProperty(value = "申请日期",index = 6) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; + + @ApiModelProperty("完成任务节点id") + @ExcelProperty(value = "完成任务节点id",index = 7) + private Integer processId; + + @ApiModelProperty("最新操作时间") + @ExcelProperty(value = "任务分配时间",index = 8) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date operationTime; + + @ApiModelProperty("提单人姓名") + @ExcelProperty(value = "提单人",index = 9) + private String employeeName; + + @ApiModelProperty("部门") + @ExcelProperty(value = "所属部门",index = 10) + private String department; + +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsListRefuseResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsListRefuseResponse.java index c265b9a9..8d9c5d3d 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsListRefuseResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgStatisticsListRefuseResponse.java @@ -45,27 +45,27 @@ public class DgStatisticsListRefuseResponse extends BaseRowModel implements Seri @ExcelProperty(value = "期数",index = 5) private String applyTime; - @ApiModelProperty("创建时间") + @ApiModelProperty("申请日期") @ExcelProperty(value = "申请日期",index = 6) - @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date createTime; @ApiModelProperty("拒绝人") @ExcelProperty(value = "当前审批人",index = 7) - private String empName; + private String refuseName; - @ApiModelProperty("节点状态") + @ApiModelProperty("拒绝节点id") @ExcelProperty(value = "任务节点",index = 8) - private String status; + private Integer processId; @ApiModelProperty("拒绝时间") - @ExcelProperty(value = "任务分配时间",index = 9) - @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") - private Date dateTime; + @ExcelProperty(value = "拒绝时间",index = 9) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date refuseTime; @ApiModelProperty("拒绝原因") @ExcelProperty(value = "拒绝原因",index = 10) - private String remark; + private String refuseOpinion; @ApiModelProperty("提单人姓名") @ExcelProperty(value = "提单人",index = 11) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java index 41f0ec5e..3e807e7c 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PersonalEfficiencyListResponse.java @@ -6,9 +6,12 @@ import com.daqing.framework.utils.excel.ApprovalStatusConverter; import com.daqing.framework.utils.excel.BusinessStatusConverter; import com.daqing.framework.utils.excel.OperatingStatusConverter; import com.daqing.framework.utils.excel.TaskNodeConverter; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * @Author chen * @DATE 2020/12/28 16:31 @@ -35,7 +38,8 @@ public class PersonalEfficiencyListResponse { @ApiModelProperty("申请日期") @ExcelProperty(value = "申请日期",index = 3) - private String applicationDate; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date applicationDate; @ApiModelProperty("累计耗时") @ExcelProperty(value = "累计耗时",index = 4) @@ -46,8 +50,8 @@ public class PersonalEfficiencyListResponse { private String completeTime; @ApiModelProperty("任务节点") - @ExcelProperty(value = "任务节点",index = 6,converter = TaskNodeConverter.class) - private String taskNode; + @ExcelProperty(value = "任务节点",index = 6) + private Double taskNode; @ApiModelProperty("审批状态") @ExcelProperty(value = "审批状态",index = 7,converter = ApprovalStatusConverter.class) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgApplyAmountInfoService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgApplyAmountInfoService.java index c1b5b286..8f321a6e 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgApplyAmountInfoService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgApplyAmountInfoService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.daqing.financial.guarantee.model.request.BusinessApplicationRequest; import com.daqing.financial.guarantee.model.response.BusinessApplicationDetailResponse; import com.daqing.framework.domain.guarantee.DgApplyAmountInfo; +import com.daqing.framework.domain.guarantee.DgApplyField; import com.daqing.framework.utils.PageUtils; import javax.servlet.http.HttpServletResponse; @@ -34,4 +35,8 @@ public interface IDgApplyAmountInfoService extends IService { int approvalBusinessApplication(Integer id, Integer status, String remark, Integer companyId); String getRoles(); + + DgApplyField queryApplyField(); + + Boolean updateApplyField(DgApplyField dgApplyField); } 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 a7a4c729..55b398c2 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 @@ -2,12 +2,10 @@ package com.daqing.financial.guarantee.service; import com.baomidou.mybatisplus.extension.service.IService; import com.daqing.financial.guarantee.model.request.DgEfficiencyTeamRequest; -import com.daqing.financial.guarantee.model.response.PersonalEfficiencyListResponse; import com.daqing.framework.domain.guarantee.DgApplyAmountInfo; import org.springframework.stereotype.Service; import java.util.HashMap; -import java.util.List; import java.util.Map; /** @@ -17,7 +15,8 @@ import java.util.Map; public interface IDgEfficiencyService extends IService { Map approvalNum(); + HashMap> queryList(DgEfficiencyTeamRequest dgEfficiencyTeamRequest); - List queryPersonalEfficiencyList(); + Map getBusinessCount(); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java index 1a00b383..ca15ff73 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java @@ -10,7 +10,10 @@ import com.daqing.financial.guarantee.feign.CrmsFeignService; import com.daqing.financial.guarantee.feign.HrmsFeignService; import com.daqing.financial.guarantee.mapper.*; import com.daqing.financial.guarantee.model.request.BusinessApplicationRequest; -import com.daqing.financial.guarantee.model.response.*; +import com.daqing.financial.guarantee.model.response.BusinessApplicationDetailResponse; +import com.daqing.financial.guarantee.model.response.BusinessApplicationListResponse; +import com.daqing.financial.guarantee.model.response.DgApplyAmountInfoResponse; +import com.daqing.financial.guarantee.model.response.DgEnclosureInfoResponse; import com.daqing.financial.guarantee.service.IDgApplyAmountInfoService; import com.daqing.financial.guarantee.util.ArraysUtil; import com.daqing.financial.guarantee.util.AuditProcessUtil; @@ -37,7 +40,6 @@ import org.springframework.web.context.request.ServletRequestAttributes; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.text.SimpleDateFormat; import java.util.*; /** @@ -50,7 +52,8 @@ import java.util.*; */ @Slf4j @Service -public class DgApplyAmountInfoServiceImpl extends ServiceImpl implements IDgApplyAmountInfoService { +public class DgApplyAmountInfoServiceImpl extends ServiceImpl + implements IDgApplyAmountInfoService { @Resource private DgApplyAmountInfoMapper dgApplyAmountInfoMapper; @@ -92,6 +95,27 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl> queryList(DgEfficiencyTeamRequest dgEfficiencyTeamRequest) { // 时间筛选(固定时间) - if (dgEfficiencyTeamRequest.getCreateFixedTime() != null && dgEfficiencyTeamRequest.getStartTime() == null && - dgEfficiencyTeamRequest.getEndTime() == null) { + if (dgEfficiencyTeamRequest.getCreateFixedTime() != null && (dgEfficiencyTeamRequest.getStartTime() == null || + dgEfficiencyTeamRequest.getStartTime().length() == 0) && (dgEfficiencyTeamRequest.getEndTime() == null || + dgEfficiencyTeamRequest.getEndTime().length() == 0)) { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); switch (dgEfficiencyTeamRequest.getCreateFixedTime()) { case 0: @@ -143,7 +103,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl existMap = hashMap.get(Integer.parseInt(departmentId)); if (existMap.get(processId) == null) { - existMap.put(processId, time + "(1)"); + existMap.put(processId, time + ",1"); } else { // 计算当前部门在当前节点的操作次数 - int count = Integer.parseInt(existMap.get(processId).substring(existMap.get(processId).indexOf("(") + 1, - existMap.get(processId).indexOf(")"))) + 1; + int count = Integer.parseInt(existMap.get(processId).substring(existMap.get(processId).indexOf(",") + 1)) + 1; // 计算当前部门在当前节点的累计时间 - String existTime = existMap.get(processId).substring(0, existMap.get(processId).indexOf("(")); + String existTime = existMap.get(processId).substring(0, existMap.get(processId).indexOf(",")); // 累计时间加上本次时间 - existMap.put(processId, (Integer.parseInt(existTime) + Integer.parseInt(time)) + "(" + count + ")"); + existMap.put(processId, (Integer.parseInt(existTime) + Integer.parseInt(time)) + "," + count); } hashMap.put(Integer.parseInt(departmentId), existMap); } @@ -178,6 +137,15 @@ public class DgEfficiencyServiceImpl extends ServiceImpl getBusinessCount() { + + return this.getBaseMapper().getBusinessCount(); + } + /** * 查询审批数目的值的数组 * @@ -197,365 +165,4 @@ public class DgEfficiencyServiceImpl extends ServiceImpl queryPersonalEfficiencyList() { - int size = 100; - List efficiencyList = new ArrayList<>(); - //获取当前登录用户id - int currentUser = Integer.parseInt(this.getUserId()); - //获取当前用户拥有的角色ids - String roleIds = RedisUtil.get("dq:userRole:" + currentUser); - //字符串格式 - List roleIdList = new ArrayList<>(); - if (roleIds != null) { - String[] ids = roleIds.split(","); - roleIdList = Arrays.asList(ids); - } - //数字格式 - List roleList = new ArrayList<>(); - if (roleIds != null) { - String[] roleId = roleIds.split(","); - for (String id : roleId) { - roleList.add(Integer.parseInt(id)); - } - } - //查询用户处理过的业务 - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("user_id", currentUser).groupBy("business_id").select("business_id"); - List auditProcessList = dgAuditProcessMapper.selectList(wrapper); - if (auditProcessList != null && auditProcessList.size() != 0) { - List businessIdList = new ArrayList<>(); - auditProcessList.forEach(dgAuditProcess -> { - businessIdList.add(dgAuditProcess.getBusinessId()); - }); - - //根据业务id查询业务流程，统计耗时，完成时间 - businessIdList.forEach(businessId -> { - //new返回对象 - PersonalEfficiencyListResponse efficiencyListResponse = new PersonalEfficiencyListResponse(); - efficiencyListResponse.setBusinessId(businessId); - //根据业务id查询业务 - DgApplyAmountInfo dgApplyAmountInfo = applyAmountInfoMapper.selectById(businessId); - //业务申请日期 - Date createTime = dgApplyAmountInfo.getCreateTime(); - //客户公司id - Integer companyId = dgApplyAmountInfo.getCompanyId(); - //提单人id - Integer presenterId = dgApplyAmountInfo.getPresenterId(); - efficiencyListResponse.setApplicantId(presenterId); - efficiencyListResponse.setApplicationDate(new SimpleDateFormat("yyyy-MM-dd").format(createTime)); - efficiencyListResponse.setClientName(String.valueOf(companyId)); - //获取累计耗时，完成时间，任务节点 - HashMap hashMap = getTime(businessId, currentUser); - Object countTime = hashMap.get("countTime"); - Object endTime = hashMap.get("endTime"); - efficiencyListResponse.setTimeConsuming(String.valueOf(countTime)); - efficiencyListResponse.setCompleteTime(String.valueOf(endTime)); - efficiencyList.add(efficiencyListResponse); - }); - //获取每个业务id的三种状态 - HashMap hashMap = Maps.newHashMap(); - //角色不为空 - //担保业务员角色、担保经理角色 - if (roleIdList.contains(String.valueOf(PromptSuccess.DB_YWY_ID)) | roleIdList.contains(String.valueOf(PromptSuccess.DB_JL_ID))) { - //业务申请列表查询 - IPage positionVO = applyAmountListMapper.pageByCondition(new Page(1, size), "", roleIdList, this.getUserId()); - List records = positionVO.getRecords(); - if (records!=null && records.size()!=0){ - records.forEach(businessApplicationListResponse -> { - StatusPO statusPO = new StatusPO(); - Integer businessId = businessApplicationListResponse.getBusinessId(); - String name = businessApplicationListResponse.getName(); - Integer status = businessApplicationListResponse.getStatus(); - Integer operatingStatus = businessApplicationListResponse.getOperatingStatus(); - Integer businessStatus = businessApplicationListResponse.getBusinessStatus(); - statusPO.setBusinessStatus(businessStatus); - statusPO.setName(name); - statusPO.setOperatingStatus(operatingStatus); - statusPO.setProcessId(1); - statusPO.setStatus(status); - hashMap.put(businessId, statusPO); - }); - } - } - //担保经理角色、担保A角角色、担保B角角色、担保领导角色 - if (roleIdList.contains(String.valueOf(PromptSuccess.DB_JL_ID)) | roleIdList.contains(String.valueOf(PromptSuccess.DB_A_ID)) | roleIdList.contains(String.valueOf(PromptSuccess.DB_B_ID)) | roleIdList.contains(String.valueOf(PromptSuccess.DB_LD_ID))) { - // 担保部调查列表 - IPage positionVO = guaranteeAssignUserMapper.pageByCondition(new Page(1, size), "", roleIdList, this.getUserId(), null); - List records = positionVO.getRecords(); - if (records!=null && records.size()!=0) { - records.forEach(guaranteeListResponse -> { - StatusPO statusPO = new StatusPO(); - Integer businessId = guaranteeListResponse.getBusinessId(); - Integer status = guaranteeListResponse.getStatus(); - String name = guaranteeListResponse.getName(); - Integer operatingStatus = guaranteeListResponse.getOperatingStatus(); - Integer businessStatus = guaranteeListResponse.getBusinessStatus(); - statusPO.setBusinessStatus(businessStatus); - statusPO.setOperatingStatus(operatingStatus); - statusPO.setProcessId(2); - statusPO.setName(name); - statusPO.setStatus(status); - hashMap.put(businessId, statusPO); - }); - } - } - //资产经理角色、资产专员角色、资产领导角色 - if (roleIdList.contains(String.valueOf(PromptSuccess.ZC_JL_ID)) | roleIdList.contains(String.valueOf(PromptSuccess.ZC_ZY_ID)) | roleIdList.contains(String.valueOf(PromptSuccess.ZC_LD_ID))) { - // 资产部调查列表 - IPage positionVO = assetsInvestigationMapper.pageByCondition(new Page(1, size), "", roleIdList, this.getUserId(), null); - List records = positionVO.getRecords(); - if (records!=null && records.size()!=0) { - records.forEach(assetsInvestigationListResponse -> { - StatusPO statusPO = new StatusPO(); - Integer businessId = assetsInvestigationListResponse.getBusinessId(); - Integer status = assetsInvestigationListResponse.getStatus(); - String name = assetsInvestigationListResponse.getName(); - Integer operatingStatus = assetsInvestigationListResponse.getOperatingStatus(); - Integer businessStatus = assetsInvestigationListResponse.getBusinessStatus(); - statusPO.setBusinessStatus(businessStatus); - statusPO.setOperatingStatus(operatingStatus); - statusPO.setProcessId(3); - statusPO.setName(name); - statusPO.setStatus(status); - hashMap.put(businessId, statusPO); - }); - } - } - //信息经理角色、信息专员角色、信息领导角色 - if (roleIdList.contains(String.valueOf(PromptSuccess.XX_JL_ID)) | roleIdList.contains(String.valueOf(PromptSuccess.XX_ZY_ID)) | roleIdList.contains(String.valueOf(PromptSuccess.XX_LD_ID))) { - // 信息部调查列表 - IPage positionVO = messageInvestigationMapper.pageByCondition(new Page(1, size), "", roleIdList, this.getUserId(), null); - List records = positionVO.getRecords(); - if (records!=null && records.size()!=0) { - records.forEach(messageInvestigationListResponse -> { - StatusPO statusPO = new StatusPO(); - Integer businessId = messageInvestigationListResponse.getBusinessId(); - Integer status = messageInvestigationListResponse.getStatus(); - String name = messageInvestigationListResponse.getName(); - Integer operatingStatus = messageInvestigationListResponse.getOperatingStatus(); - Integer businessStatus = messageInvestigationListResponse.getBusinessStatus(); - statusPO.setBusinessStatus(businessStatus); - statusPO.setOperatingStatus(operatingStatus); - statusPO.setProcessId(4); - statusPO.setName(name); - statusPO.setStatus(status); - hashMap.put(businessId, statusPO); - }); - } - } - //担保部A/B角、法规经理角色、法规部C角、法规部分管领导 - if (roleIdList.contains(String.valueOf(PromptSuccess.DB_A_ID))|roleIdList.contains(String.valueOf(PromptSuccess.DB_B_ID))|roleIdList.contains(String.valueOf(PromptSuccess.FG_JL_ID))|roleIdList.contains(String.valueOf(PromptSuccess.FG_C_ID))|roleIdList.contains(String.valueOf(PromptSuccess.FG_LD_ID))) { - // 合规调查列表 - DgComplianceInvestigationRequest dgComplianceInvestigationRequest = new DgComplianceInvestigationRequest(); - IPage list = complianceInvestigationMapper.list(new Page(1, size), dgComplianceInvestigationRequest, roleList, currentUser); - List records = list.getRecords(); - if (records!=null && records.size()!=0) { - records.forEach(dgComplianceInvestigationResponse -> { - StatusPO statusPO = new StatusPO(); - Integer businessId = dgComplianceInvestigationResponse.getBusinessId(); - String name = dgComplianceInvestigationResponse.getName(); - Integer status = dgComplianceInvestigationResponse.getAuditStatus(); - Integer operatingStatus = dgComplianceInvestigationResponse.getOperationStatus(); - Integer businessStatus = dgComplianceInvestigationResponse.getBusinessStatus(); - statusPO.setBusinessStatus(businessStatus); - statusPO.setOperatingStatus(operatingStatus); - statusPO.setProcessId(5); - statusPO.setName(name); - statusPO.setStatus(status); - hashMap.put(businessId, statusPO); - }); - } - } - //工作会 - if (roleIdList.contains(String.valueOf(PromptSuccess.GZU_ID))) { - IPage list = workConferenceConsiderMapper.list(new Page(1, size), "", roleList, currentUser); - List records = list.getRecords(); - if (records!=null && records.size()!=0) { - records.forEach(dgWorkConferencePO -> { - StatusPO statusPO = new StatusPO(); - Integer businessId = dgWorkConferencePO.getBusinessId(); - String name = dgWorkConferencePO.getName(); - Integer status = dgWorkConferencePO.getAuditStatus(); - Integer operatingStatus = dgWorkConferencePO.getOperationStatus(); - Integer businessStatus = dgWorkConferencePO.getBusinessStatus(); - statusPO.setBusinessStatus(businessStatus); - statusPO.setOperatingStatus(operatingStatus); - statusPO.setProcessId(6); - statusPO.setName(name); - statusPO.setStatus(status); - hashMap.put(businessId, statusPO); - }); - } - } - //担保部A/B角、贷审会 - if (roleIdList.contains(String.valueOf(PromptSuccess.DB_A_ID))|roleIdList.contains(String.valueOf(PromptSuccess.DB_B_ID))|roleIdList.contains(String.valueOf(PromptSuccess.DSH_ID))) { - IPage list = loanCommitteeConsiderMapper.list(new Page(1, size), "", roleList, currentUser); - List records = list.getRecords(); - if (records!=null && records.size()!=0) { - records.forEach(dgLoanCommitteeConsiderResponse -> { - StatusPO statusPO = new StatusPO(); - Integer businessId = dgLoanCommitteeConsiderResponse.getBusinessId(); - Integer status = dgLoanCommitteeConsiderResponse.getStatus(); - String name = dgLoanCommitteeConsiderResponse.getName(); - Integer operatingStatus = dgLoanCommitteeConsiderResponse.getOperatingStatus(); - Integer businessStatus = dgLoanCommitteeConsiderResponse.getBusinessStatus(); - statusPO.setBusinessStatus(businessStatus); - statusPO.setOperatingStatus(operatingStatus); - statusPO.setProcessId(7); - statusPO.setName(name); - statusPO.setStatus(status); - hashMap.put(businessId, statusPO); - }); - } - } - //法规经理、担保部A/B角、资产部经理 - if (roleIdList.contains(String.valueOf(PromptSuccess.FG_JL_ID))|roleIdList.contains(String.valueOf(PromptSuccess.DB_A_ID))|roleIdList.contains(String.valueOf(PromptSuccess.DB_B_ID))|roleIdList.contains(String.valueOf(PromptSuccess.ZC_JL_ID)) ) { - //担保函 - IPage iPage = guaranteeLetterAssignUserMapper.pageByCondition(new Page(1, size), currentUser, roleIdList, null, null); - List records = iPage.getRecords(); - if (records!=null && records.size()!=0) { - records.forEach(guaranteeLetterListResponse -> { - StatusPO statusPO = new StatusPO(); - String name = guaranteeLetterListResponse.getName(); - Integer businessId = guaranteeLetterListResponse.getBusinessId(); - Integer status = guaranteeLetterListResponse.getStatus(); - Integer operatingStatus = guaranteeLetterListResponse.getOperatingStatus(); - Integer businessStatus = guaranteeLetterListResponse.getBusinessStatus(); - statusPO.setBusinessStatus(businessStatus); - statusPO.setOperatingStatus(operatingStatus); - statusPO.setProcessId(8); - statusPO.setName(name); - statusPO.setStatus(status); - hashMap.put(businessId, statusPO); - }); - } - } - //财务部、法规经理 - if (roleIdList.contains(String.valueOf(PromptSuccess.CWB_ID))|roleIdList.contains(String.valueOf(PromptSuccess.FG_JL_ID))) { - //回款确认 - IPage iPage = paymentConfirmationConsiderMapper.pageByCondition(new Page(1, size), roleIdList, currentUser, null, null); - List records = iPage.getRecords(); - if (records!=null && records.size()!=0) { - records.forEach(paymentConfirmationListResponse -> { - StatusPO statusPO = new StatusPO(); - String name = paymentConfirmationListResponse.getName(); - Integer businessId = paymentConfirmationListResponse.getBusinessId(); - Integer status = paymentConfirmationListResponse.getStatus(); - Integer operatingStatus = paymentConfirmationListResponse.getOperatingStatus(); - Integer businessStatus = paymentConfirmationListResponse.getBusinessStatus(); - statusPO.setBusinessStatus(businessStatus); - statusPO.setOperatingStatus(operatingStatus); - statusPO.setProcessId(9); - statusPO.setName(name); - statusPO.setStatus(status); - hashMap.put(businessId, statusPO); - }); - } - } - //法规经理 - if (roleIdList.contains(String.valueOf(PromptSuccess.FG_JL_ID))) { - //放款通知 - IPage iPage = loanNoticeMapper.pageByCondition(new Page(1, size), roleIdList, currentUser, null, null); - List records = iPage.getRecords(); - if (records!=null && records.size()!=0) { - records.forEach(loanNoticeListResponse -> { - StatusPO statusPO = new StatusPO(); - String name = loanNoticeListResponse.getName(); - Integer businessId = loanNoticeListResponse.getBusinessId(); - Integer status = loanNoticeListResponse.getStatus(); - Integer operatingStatus = loanNoticeListResponse.getOperatingStatus(); - Integer businessStatus = loanNoticeListResponse.getBusinessStatus(); - statusPO.setBusinessStatus(businessStatus); - statusPO.setOperatingStatus(operatingStatus); - statusPO.setProcessId(10); - statusPO.setName(name); - statusPO.setStatus(status); - hashMap.put(businessId, statusPO); - }); - } - } - //再次循环，拼接数据 - efficiencyList.forEach(personalEfficiencyListResponse -> { - Integer businessId = personalEfficiencyListResponse.getBusinessId(); - Object o = hashMap.get(businessId); - //有数据 - if (ObjectUtil.isNotNull(o)){ - //强制转换 - if (o instanceof StatusPO){ - StatusPO statusPO = (StatusPO)o; - String name = statusPO.getName(); - Integer operatingStatus = statusPO.getOperatingStatus(); - Integer processId = statusPO.getProcessId(); - Integer status = statusPO.getStatus(); - Integer businessStatus = statusPO.getBusinessStatus(); - personalEfficiencyListResponse.setTaskNode(String.valueOf(processId)); - personalEfficiencyListResponse.setBusinessStatus(businessStatus); - personalEfficiencyListResponse.setOperatingStatus(operatingStatus); - personalEfficiencyListResponse.setApproveStatus(status); - personalEfficiencyListResponse.setClientName(name); - } - } - String timeConsuming = personalEfficiencyListResponse.getTimeConsuming(); - String totalTimeConsuming = countTime(timeConsuming); - personalEfficiencyListResponse.setTimeConsuming(totalTimeConsuming); - }); - } - return efficiencyList; - } - - //根据业务id和用户id统计耗时 - private HashMap getTime(Integer businessId, Integer userId) { - HashMap hashMap = Maps.newHashMap(); - //根据业务id查询业务流程表 - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("business_id", businessId).orderByAsc("create_time"); - List auditProcessList = dgAuditProcessMapper.selectList(wrapper); - long countTime = 0L; - if (auditProcessList.size()>1){ - //遍历业务流程数据，统计该用户的耗时 - for (int i = 1; i <= auditProcessList.size() - 1; i++) { - //从第二条数据开始，获取该数据 - DgAuditProcess auditProcess = auditProcessList.get(i); - //该数据是当前用户处理的 - if (auditProcess.getUserId().equals(userId)) { - //获取上一流程的时间节点 - DgAuditProcess previousProcess = auditProcessList.get(i - 1); - Date previousTime = previousProcess.getCreateTime(); - Date currentTime = auditProcess.getCreateTime(); - long currentTimeTime = currentTime.getTime(); - long previousTimeTime = previousTime.getTime(); - //累计耗时,毫秒 - countTime = currentTimeTime - previousTimeTime; - } - } - } - //查询结束时间 - QueryWrapper wrapperTime = new QueryWrapper<>(); - wrapperTime.eq("business_id", businessId).eq("user_id", userId).orderByDesc("create_time").last("limit 1"); - DgAuditProcess auditProcess = dgAuditProcessMapper.selectOne(wrapperTime); - Date endTime = auditProcess.getCreateTime(); - hashMap.put("countTime", countTime); - hashMap.put("endTime", new SimpleDateFormat("yyyy-MM-dd").format(endTime)); - return hashMap; - } - - public static String countTime(String totalTime) { - long time = Long.parseLong(totalTime); - long days = time/ (1000 * 60 * 60 * 24); - long hours = (time% (1000 * 60 * 60 * 24)) / (1000 * 60 * 60); - long minutes = (time% (1000 * 60 * 60)) / (1000 * 60); - long seconds = (time% (1000 * 60)) / 1000; - return days + "天" + hours + "小时"+ minutes +"分钟"; - } - - /** - * 获取当前登录用户信息 - */ - private String getUserId() { - HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); - String token = request.getHeader("token"); - return RedisUtil.get("dq:token:" + token); - } } \ No newline at end of file diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgStatisticsServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgStatisticsServiceImpl.java index a9e52f76..0a7b1e04 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgStatisticsServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgStatisticsServiceImpl.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.daqing.financial.guarantee.feign.HrmsFeignService; import com.daqing.financial.guarantee.mapper.DgStatisticsMapper; import com.daqing.financial.guarantee.model.request.DgStatisticsRequest; +import com.daqing.financial.guarantee.model.response.DgStatisticsExcelRefuseResponse; +import com.daqing.financial.guarantee.model.response.DgStatisticsExcelResponse; import com.daqing.financial.guarantee.model.response.DgStatisticsListRefuseResponse; import com.daqing.financial.guarantee.model.response.DgStatisticsListResponse; import com.daqing.financial.guarantee.service.IDgStatisticsService; @@ -51,7 +53,8 @@ public class DgStatisticsServiceImpl extends ServiceImpl iPage = this.getBaseMapper().list(new Page(page, size), dgStatisticsRequest); List dgStatisticsPOList = iPage.getRecords(); if (dgStatisticsPOList == null) { return null; } - // 部门筛选 - if (dgStatisticsRequest.getDeptId() != null && dgStatisticsRequest.getEmpId() == null) { - ResponseResult> result = hrmsFeignService.listEmployeeByDeptId(dgStatisticsRequest.getDeptId().longValue()); - if (result.getData() == null || result.getData().size() == 0) { - return null; - } - for (int i = 0; i < dgStatisticsPOList.size(); i++) { - boolean flag = false; - for (EmployeeVO employeeVO : result.getData()) { - if (Objects.equals(dgStatisticsPOList.get(i).getPresenterId().longValue(), employeeVO.getId())) { - flag = true; - } - } - if (!flag) { - dgStatisticsPOList.remove(i); - i--; // 索引要减一,不然会触发"快速失败"异常 - } - } - iPage.setTotal(dgStatisticsPOList.size()); - iPage.setSize(iPage.getTotal() % size == 0 ? iPage.getTotal() / size : iPage.getTotal() / size + 1); - } - // 提单人筛选 - if (dgStatisticsRequest.getEmpId() != null) { - for (int i = 0; i < dgStatisticsPOList.size(); i++) { - if (!Objects.equals(dgStatisticsPOList.get(i).getPresenterId(), dgStatisticsRequest.getEmpId())) { - dgStatisticsPOList.remove(i); - i--;// 索引要减一,不然会触发"快速失败"异常 - } - } - iPage.setTotal(dgStatisticsPOList.size()); - iPage.setSize(iPage.getTotal() % size == 0 ? iPage.getTotal() / size : iPage.getTotal() / size + 1); - } // 获取所有的提单人id Integer[] presenterIds = dgStatisticsPOList.stream().map(DgStatisticsPO::getPresenterId).toArray(Integer[]::new); if (presenterIds.length != 0) { @@ -167,8 +132,25 @@ public class DgStatisticsServiceImpl extends ServiceImpl> empAndDeptList = hrmsFeignService.getEmployeeAndDeptById(ids); if (empAndDeptList.getData() != null) { List listResponse = this.jointStatistics(dgStatisticsPOList, empAndDeptList.getData()); + List excelResponse = new ArrayList<>(); + for (DgStatisticsListResponse dgStatisticsListResponse : listResponse) { + DgStatisticsExcelResponse dgStatisticsExcelResponse = new DgStatisticsExcelResponse(); + StringBuilder stringBuilder = new StringBuilder(); + if (dgStatisticsListResponse.getDepartment() != null && dgStatisticsListResponse.getDepartment().size() != 0) { + for (int i = 0; i < dgStatisticsListResponse.getDepartment().size(); i++) { + if (i == dgStatisticsListResponse.getDepartment().size() - 1) { + stringBuilder.append(dgStatisticsListResponse.getDepartment().get(i)); + } else { + stringBuilder.append(dgStatisticsListResponse.getDepartment().get(i)).append(","); + } + } + } + dgStatisticsExcelResponse.setDepartment(stringBuilder.toString()); + BeanUtils.copyProperties(dgStatisticsListResponse, dgStatisticsExcelResponse); + excelResponse.add(dgStatisticsExcelResponse); + } try { - ExcelUtil.writeExcelWithSheets(response, listResponse, "业务统计信息一览表", "statistics", new DgStatisticsListResponse()) + ExcelUtil.writeExcelWithSheets(response, excelResponse, "业务统计信息一览表", "statistics", new DgStatisticsExcelResponse()) .finish(); } catch (Exception e) { ExceptionCast.cast(CrmsCode.CUSTOMER_EXPORT_EXSIT); @@ -191,7 +173,8 @@ public class DgStatisticsServiceImpl extends ServiceImpl iPage = this.getBaseMapper().listRefuse(new Page(page, size), dgStatisticsRequest); List dgStatisticsRefusePOList = iPage.getRecords(); @@ -232,7 +209,7 @@ public class DgStatisticsServiceImpl extends ServiceImpl> result = hrmsFeignService.listEmployeeByDeptId(dgStatisticsRequest.getDeptId().longValue()); if (result.getData() == null || result.getData().size() == 0) { return null; @@ -251,18 +228,7 @@ public class DgStatisticsServiceImpl extends ServiceImpl listResponse = this.jointRefuseStatistics(statisticsRefusePOList, empAndDeptList.getData()); + List excelResponse = new ArrayList<>(); + for (DgStatisticsListRefuseResponse listRefuseResponse : listResponse) { + DgStatisticsExcelRefuseResponse excelRefuseResponse = new DgStatisticsExcelRefuseResponse(); + StringBuilder stringBuilder = new StringBuilder(); + if (listRefuseResponse.getDepartment() != null && listRefuseResponse.getDepartment().size() != 0) { + for (int i = 0; i < listRefuseResponse.getDepartment().size(); i++) { + if (i == listRefuseResponse.getDepartment().size() - 1) { + stringBuilder.append(listRefuseResponse.getDepartment().get(i)); + } else { + stringBuilder.append(listRefuseResponse.getDepartment().get(i)).append(","); + } + } + } + excelRefuseResponse.setDepartment(stringBuilder.toString()); + BeanUtils.copyProperties(listRefuseResponse, excelRefuseResponse); + excelResponse.add(excelRefuseResponse); + } try { - ExcelUtil.writeExcelWithSheets(response, listResponse, "业务统计拒绝信息一览表", "statisticsRefuse", new DgStatisticsListRefuseResponse()) + ExcelUtil.writeExcelWithSheets(response, excelResponse, "业务统计拒绝信息一览表", "statisticsRefuse", new DgStatisticsExcelRefuseResponse()) .finish(); } catch (Exception e) { ExceptionCast.cast(CrmsCode.CUSTOMER_EXPORT_EXSIT); } - return true; - } else { - return false; } + return false; + } else { + return false; } - return false; } private List jointStatistics(List dgStatisticsPOList, List empAndDeptList) { diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountInfoMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountInfoMapper.xml index 68c53837..9b38217f 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountInfoMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountInfoMapper.xml @@ -60,15 +60,21 @@ - + SELECT * FROM dg_apply_field - + + UPDATE dg_apply_field SET + customer_type = #{af.customerType},customer_code = #{af.customerCode},customer_name = #{af.customerName},customer_unicode = #{af.customerUnicode},customer_phone = #{af.customerPhone},register_time = #{af.registerTime}, + register_fund =#{af.registerFund},register_addr = #{af.registerAddr},employee_number = #{af.employeeNumber},business_addr = #{af.businessAddr},business_type = #{af.businessType},business_scope = #{af.businessScope}, + legal_person_name = #{af.legalPersonName},legal_person_sex = #{af.legalPersonSex},legal_person_card = #{af.legalPersonCard},legal_person_phone = #{af.legalPersonPhone},legal_person_account = #{af.legalPersonAccount}, + legal_person_addr = #{af.legalPersonAddr},legal_person_affiliated_person = #{af.legalPersonAffiliatedPerson},loans_amount = #{af.loansAmount},loans_time_limit = #{af.loansTimeLimit},loans_bank = #{af.loansBank} , + loans_use = #{af.loansUse},loans_else_use = #{af.loansElseUse},loans_measure = #{af.loansMeasure},accessory_business_license = #{af.accessoryBusinessLicense}, + accessory_id_card = #{af.accessoryIdCard},accessory_marriage_certificate = #{af.accessoryMarriageCertificate},accessory_person_card = #{af.accessoryPersonCard},accessory_constitution = #{af.accessoryConstitution}, + accessory_audit = #{af.accessoryAudit},accessory_credit = #{af.accessoryCredit},accessory_couple_credit = #{af.accessoryCoupleCredit},accessory_commitment = #{af.accessoryCommitment},accessory_prove = #{af.accessoryProve}, + accessory_conference = #{af.accessoryConference},accessory_assess = #{af.accessoryAssess},update_time = #{af.updateTime} + WHERE id = #{af.id} + diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgEfficiencyMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgEfficiencyMapper.xml index 1f26c8ed..27fab062 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgEfficiencyMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgEfficiencyMapper.xml @@ -43,4 +43,14 @@ ORDER BY p.create_time ASC + + + \ No newline at end of file diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgStatisticsMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgStatisticsMapper.xml index 7830e8f1..8de2fb6d 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgStatisticsMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgStatisticsMapper.xml @@ -36,6 +36,9 @@ AND a.business_type = #{sr.type} + + AND a.presenter_id = #{sr.empId} + AND a.create_time >= #{sr.startTime} @@ -68,6 +71,9 @@ AND a.business_type = #{sr.type} + + AND a.presenter_id = #{sr.empId} + AND a.create_time >= #{sr.startTime} diff --git a/dq-financial-hrms-auth/target/classes/bootstrap.properties b/dq-financial-hrms-auth/target/classes/bootstrap.properties index 3187c1a2..89e224ba 100644 --- a/dq-financial-hrms-auth/target/classes/bootstrap.properties +++ b/dq-financial-hrms-auth/target/classes/bootstrap.properties @@ -1,8 +1,7 @@ - -#�������� +# 开发和测试环境（dev） spring.application.name=dq-financial-hrms-auth -#�������ĵ�ַ -spring.cloud.nacos.config.server-addr=192.168.31.142:8848 + +spring.cloud.nacos.config.server-addr=192.168.31.140:8848 spring.cloud.nacos.config.namespace=7632bdaa-3381-4669-b3f9-2fc73be451e8 #spring.cloud.nacos.config.group=prod @@ -18,12 +17,71 @@ spring.cloud.nacos.config.ext-config[2].data-id=other.yml spring.cloud.nacos.config.ext-config[2].group=dev spring.cloud.nacos.config.ext-config[2].refresh=true -spring.redis.host=192.168.232.128 +spring.redis.host=127.0.0.1 spring.redis.port=6379 -spring.redis.password= +spring.redis.password=123456 spring.redis.database=0 spring.redis.timeout=30000 spring.redis.jedis.pool.max-active=8 spring.redis.jedis.pool.max-wait=-1 spring.redis.jedis.pool.max-idle=8 spring.redis.jedis.pool.min-idle=0 + + +#正式环境（prod） +#spring.application.name=dq-financial-hrms-auth +# +#spring.cloud.nacos.config.server-addr=120.78.127.12:8848 +#spring.cloud.nacos.config.namespace=b590c830-7ada-44b7-968f-e8d0c81990c4 +##spring.cloud.nacos.config.group=prod +# +#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml +#spring.cloud.nacos.config.ext-config[0].group=prod +#spring.cloud.nacos.config.ext-config[0].refresh=true +# +#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml +#spring.cloud.nacos.config.ext-config[1].group=prod +#spring.cloud.nacos.config.ext-config[1].refresh=true +# +#spring.cloud.nacos.config.ext-config[2].data-id=other.yml +#spring.cloud.nacos.config.ext-config[2].group=prod +#spring.cloud.nacos.config.ext-config[2].refresh=true +# +#spring.redis.host=127.0.0.1 +#spring.redis.port=6379 +#spring.redis.password=dq123456 +#spring.redis.database=0 +#spring.redis.timeout=30000 +#spring.redis.jedis.pool.max-active=8 +#spring.redis.jedis.pool.max-wait=-1 +#spring.redis.jedis.pool.max-idle=8 +#spring.redis.jedis.pool.min-idle=0 + +#测试环境（prod） +#spring.application.name=dq-financial-hrms-auth +# +#spring.cloud.nacos.config.server-addr=127.0.0.1:8848 +#spring.cloud.nacos.config.namespace=d4e087eb-2a9b-4ef1-9f22-76269a30d081 +##spring.cloud.nacos.config.group=prod +# +#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml +#spring.cloud.nacos.config.ext-config[0].group=prod +#spring.cloud.nacos.config.ext-config[0].refresh=true +# +#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml +#spring.cloud.nacos.config.ext-config[1].group=prod +#spring.cloud.nacos.config.ext-config[1].refresh=true +# +#spring.cloud.nacos.config.ext-config[2].data-id=other.yml +#spring.cloud.nacos.config.ext-config[2].group=prod +#spring.cloud.nacos.config.ext-config[2].refresh=true +# +#spring.redis.host=127.0.0.1 +#spring.redis.port=6379 +#spring.redis.password= +#spring.redis.database=0 +#spring.redis.timeout=30000 +#spring.redis.jedis.pool.max-active=8 +#spring.redis.jedis.pool.max-wait=-1 +#spring.redis.jedis.pool.max-idle=8 +#spring.redis.jedis.pool.min-idle=0 \ No newline at end of file diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/aspect/Operation.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/aspect/Operation.class index 3ebaf4a1..ea04fc2a 100644 Binary files a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/aspect/Operation.class and b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/aspect/Operation.class differ diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/aspect/SysLogAspect.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/aspect/SysLogAspect.class index be705675..d5f7743a 100644 Binary files a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/aspect/SysLogAspect.class and b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/aspect/SysLogAspect.class differ diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/controller/UserLoginController.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/controller/UserLoginController.class index 801167bd..4b008810 100644 Binary files a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/controller/UserLoginController.class and b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/controller/UserLoginController.class differ diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/LoginLogMapper.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/LoginLogMapper.class index 82809c1e..79a3df4d 100644 Binary files a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/LoginLogMapper.class and b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/LoginLogMapper.class differ diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/SystemLogMapper.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/SystemLogMapper.class index dee69d4e..c4b8e108 100644 Binary files a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/SystemLogMapper.class and b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/SystemLogMapper.class differ diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/UserLoginDao.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/UserLoginDao.class index 59edb131..73ae249e 100644 Binary files a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/UserLoginDao.class and b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/dao/UserLoginDao.class differ diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/LoginLogService.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/LoginLogService.class index 1cc34945..64604e55 100644 Binary files a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/LoginLogService.class and b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/LoginLogService.class differ diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/UserLoginService.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/UserLoginService.class index 47578bf1..69c7d872 100644 Binary files a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/UserLoginService.class and b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/UserLoginService.class differ diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/impl/LoginLogServiceImpl.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/impl/LoginLogServiceImpl.class index d71db32d..ea0e13d6 100644 Binary files a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/impl/LoginLogServiceImpl.class and b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/impl/LoginLogServiceImpl.class differ diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.class index cb47481a..e6933ee4 100644 Binary files a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.class and b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.class differ diff --git a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/util/IpUtils.class b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/util/IpUtils.class index 07f13442..bbdd262f 100644 Binary files a/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/util/IpUtils.class and b/dq-financial-hrms-auth/target/classes/com/daqing/financial/hrauth/util/IpUtils.class differ diff --git a/dq-financial-hrms-auth/target/classes/mapper/hrmsauth/UserLoginMapper.xml b/dq-financial-hrms-auth/target/classes/mapper/hrmsauth/UserLoginMapper.xml deleted file mode 100644 index 9a66957d..00000000 --- a/dq-financial-hrms-auth/target/classes/mapper/hrmsauth/UserLoginMapper.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - update hrms_user set password = #{password} where phone_account = #{phoneAccount} - - - - - - - - - \ No newline at end of file diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/DeptController.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/DeptController.java index c80c4399..e2e96909 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/DeptController.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/DeptController.java @@ -134,6 +134,14 @@ public class DeptController implements DeptControllerApi { return ResponseResult.SUCCESS(deptService.listEmployeeByDeptId(deptId)); } + /** + * 获取所有的部门id和名称(用户团队效率的部门筛选) + */ + @GetMapping("/listDepartment") + public ResponseResult listDepartment(){ + return ResponseResult.SUCCESS(deptService.listDepartment()); + } + /** * 根据员工id获取对应部门下所有的客户经理 */ diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/DeptDao.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/DeptDao.java index 54473c64..8d9205ce 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/DeptDao.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/DeptDao.java @@ -9,6 +9,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * 记录部门信息 @@ -34,4 +35,6 @@ public interface DeptDao extends BaseMapper { List listEmployeeById(Long id); List listEmployeeByDeptId(Long deptId); + + List> listDepartments(); } diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/DeptService.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/DeptService.java index 3ccf9063..695c4ed3 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/DeptService.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/DeptService.java @@ -8,6 +8,7 @@ import com.daqing.framework.domain.hrms.ext.EmployeeVO; import com.daqing.framework.domain.hrms.request.DeptAddRequest; import java.util.List; +import java.util.Map; /** * 记录部门信息 @@ -37,5 +38,7 @@ public interface DeptService extends IService { List listEmployeeByDeptId(Long deptId); List listEmployeeTrees(String account); + + List> listDepartment(); } diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/DeptServiceImpl.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/DeptServiceImpl.java index b838eb55..09121a7d 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/DeptServiceImpl.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/DeptServiceImpl.java @@ -20,10 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.Arrays; -import java.util.Comparator; -import java.util.Date; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; @@ -255,6 +252,14 @@ public class DeptServiceImpl extends ServiceImpl implements return this.getListEmployeeTrees(deptDao.listDepartment(), 0L, account); } + /** + * 获取所有的部门id和名称(用于团队效率部门筛选) + */ + @Override + public List> listDepartment() { + return this.getBaseMapper().listDepartments(); + } + private List getListEmployeeTrees(List list, Long parentId, String account) { return list.stream() diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java index 28b5354b..1dbe44db 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java @@ -13,6 +13,7 @@ import com.daqing.framework.domain.guarantee.response.EmployeeMessageResponse; import com.daqing.framework.domain.hrms.*; import com.daqing.framework.domain.hrms.ext.*; import com.daqing.framework.domain.hrms.request.EmployeeRequest; +import com.daqing.framework.domain.hrms.response.EmployeeExcelResponse; import com.daqing.framework.domain.hrms.response.HrmsCode; import com.daqing.framework.domain.hrms.response.RolePermissionResponse; import com.daqing.framework.exception.ExceptionCast; @@ -402,7 +403,46 @@ public class EmployeeServiceImpl extends ServiceImpl list = this.getBaseMapper().excelList(); - ExcelUtil.writeExcelWithSheets(response, list, "员工信息一览表", "employee", new EmployeeListVO()) + List excelResponse = new ArrayList<>(); + for (EmployeeListVO employee : list) { + EmployeeExcelResponse employeeExcelResponse = new EmployeeExcelResponse(); + if (employee.getDepartmentNameList() != null && employee.getDepartmentNameList().size() != 0) { + StringBuilder stringBuilder = new StringBuilder(); + for (int i = 0; i < employee.getDepartmentNameList().size(); i++) { + if (i == employee.getDepartmentNameList().size() - 1) { + stringBuilder.append(employee.getDepartmentNameList().get(i)); + } else { + stringBuilder.append(employee.getDepartmentNameList().get(i)).append(","); + } + } + employeeExcelResponse.setDepartmentNameList(stringBuilder.toString()); + } + if (employee.getPositionNameList() != null && employee.getPositionNameList().size() != 0) { + StringBuilder stringBuilder = new StringBuilder(); + for (int i = 0; i < employee.getPositionNameList().size(); i++) { + if (i == employee.getPositionNameList().size() - 1) { + stringBuilder.append(employee.getPositionNameList().get(i)); + } else { + stringBuilder.append(employee.getPositionNameList().get(i)).append(","); + } + } + employeeExcelResponse.setPositionNameList(stringBuilder.toString()); + } + if (employee.getRoleNameList() != null && employee.getRoleNameList().size() != 0) { + StringBuilder stringBuilder = new StringBuilder(); + for (int i = 0; i < employee.getRoleNameList().size(); i++) { + if (i == employee.getRoleNameList().size() - 1) { + stringBuilder.append(employee.getRoleNameList().get(i)); + } else { + stringBuilder.append(employee.getRoleNameList().get(i)).append(","); + } + } + employeeExcelResponse.setRoleNameList(stringBuilder.toString()); + } + BeanUtils.copyProperties(employee, employeeExcelResponse); + excelResponse.add(employeeExcelResponse); + } + ExcelUtil.writeExcelWithSheets(response, excelResponse, "员工信息一览表", "employee", new EmployeeExcelResponse()) .finish(); return true; } catch (Exception e) { diff --git a/dq-financial-hrms/src/main/resources/mapper/hrms/DeptDao.xml b/dq-financial-hrms/src/main/resources/mapper/hrms/DeptDao.xml index effabbb7..83814fa8 100644 --- a/dq-financial-hrms/src/main/resources/mapper/hrms/DeptDao.xml +++ b/dq-financial-hrms/src/main/resources/mapper/hrms/DeptDao.xml @@ -85,4 +85,8 @@ AND d.id = #{deptId} + + \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/bootstrap.properties b/dq-financial-hrms/target/classes/bootstrap.properties index b5a7eb56..69b5c7fa 100644 --- a/dq-financial-hrms/target/classes/bootstrap.properties +++ b/dq-financial-hrms/target/classes/bootstrap.properties @@ -1,7 +1,7 @@ #服务名称 spring.application.name=dq-financial-hrms #配置中心地址 -spring.cloud.nacos.config.server-addr=192.168.31.142:8848 +spring.cloud.nacos.config.server-addr=192.168.31.140:8848 spring.cloud.nacos.config.namespace=4c56c2f9-b6a3-4e7b-88b8-b1001e86dfd6 #spring.cloud.nacos.config.group=prod @@ -17,9 +17,81 @@ spring.cloud.nacos.config.ext-config[2].data-id=other.yml spring.cloud.nacos.config.ext-config[2].group=dev spring.cloud.nacos.config.ext-config[2].refresh=true +spring.redis.host=127.0.0.1 +spring.redis.port=6379 +spring.redis.password=123456 +spring.redis.database=0 +spring.redis.timeout=30000 +spring.redis.jedis.pool.max-active=8 +spring.redis.jedis.pool.max-wait=-1 +spring.redis.jedis.pool.max-idle=8 +spring.redis.jedis.pool.min-idle=0 + +#请求处理的超时时间 +ribbon.ReadTimeout: 120000 +#请求连接的超时时间 +ribbon.ConnectTimeout: 30000 + + +spring.servlet.multipart.max-file-size=10MB +spring.servlet.multipart.max-request-size=10MB + +# 正式环境（prod） +#服务名称 +#spring.application.name=dq-financial-hrms +##配置中心地址 +#spring.cloud.nacos.config.server-addr=120.78.127.12:8848 +#spring.cloud.nacos.config.namespace=69614b55-1521-421c-ac58-dbe4a5b01b43 +##spring.cloud.nacos.config.group=prod +# +#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml +#spring.cloud.nacos.config.ext-config[0].group=prod +#spring.cloud.nacos.config.ext-config[0].refresh=true +# +#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml +#spring.cloud.nacos.config.ext-config[1].group=prod +#spring.cloud.nacos.config.ext-config[1].refresh=true +# +#spring.cloud.nacos.config.ext-config[2].data-id=other.yml +#spring.cloud.nacos.config.ext-config[2].group=prod +#spring.cloud.nacos.config.ext-config[2].refresh=true +# +#spring.redis.host=127.0.0.1 +#spring.redis.port=6379 +#spring.redis.password=dq123456 +#spring.redis.database=0 +#spring.redis.timeout=30000 +#spring.redis.jedis.pool.max-active=8 +#spring.redis.jedis.pool.max-wait=-1 +#spring.redis.jedis.pool.max-idle=8 +#spring.redis.jedis.pool.min-idle=0 +# +#spring.servlet.multipart.max-file-size=10MB +#spring.servlet.multipart.max-request-size=10MB + +# 测试环境（prod） +#服务名称 +#spring.application.name=dq-financial-hrms +##配置中心地址 +#spring.cloud.nacos.config.server-addr=127.0.0.1:8848 +#spring.cloud.nacos.config.namespace=ed20f51f-6038-44e6-8e28-7ac72625e7b0 +##spring.cloud.nacos.config.group=prod +# +#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml +#spring.cloud.nacos.config.ext-config[0].group=prod +#spring.cloud.nacos.config.ext-config[0].refresh=true +# +#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml +#spring.cloud.nacos.config.ext-config[1].group=prod +#spring.cloud.nacos.config.ext-config[1].refresh=true +# +#spring.cloud.nacos.config.ext-config[2].data-id=other.yml +#spring.cloud.nacos.config.ext-config[2].group=prod +#spring.cloud.nacos.config.ext-config[2].refresh=true +# #spring.redis.host=127.0.0.1 #spring.redis.port=6379 -#spring.redis.password=123456 +#spring.redis.password= #spring.redis.database=0 #spring.redis.timeout=30000 #spring.redis.jedis.pool.max-active=8 diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/DqFinancialHrmsApplication.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/DqFinancialHrmsApplication.class index 0bbc7ab2..4b97bd40 100644 Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/DqFinancialHrmsApplication.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/DqFinancialHrmsApplication.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/config/CorsConfig.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/config/CorsConfig.class deleted file mode 100644 index 5999cda2..00000000 Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/config/CorsConfig.class and /dev/null differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/config/IPageConfig.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/config/IPageConfig.class deleted file mode 100644 index 536b9a73..00000000 Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/config/IPageConfig.class and /dev/null differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/DeptController.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/DeptController.class index 0567b3c4..ed083208 100644 Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/DeptController.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/DeptController.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/EmployeeController.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/EmployeeController.class index f33da307..cfa32c11 100644 Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/EmployeeController.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/EmployeeController.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/PermissionController.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/PermissionController.class index 7c82a023..4c8f26dc 100644 Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/PermissionController.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/PermissionController.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/PositionController.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/PositionController.class index ba3901d6..ec4dc998 100644 Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/PositionController.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/PositionController.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/UserController.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/UserController.class index 949f0700..c06c4170 100644 Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/UserController.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/controller/UserController.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/DeptDao.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/DeptDao.class index c21f0674..78b6e8fb 100644 Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/DeptDao.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/DeptDao.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/EmployeeDao.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/EmployeeDao.class index 454674a6..6ab5f7b6 100644 Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/EmployeeDao.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/EmployeeDao.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/PermissionDao.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/PermissionDao.class index d9ff33f1..5c0faf4b 100644 Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/PermissionDao.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/PermissionDao.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/PositionDao.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/PositionDao.class index 288728e2..585ff26d 100644 Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/PositionDao.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/PositionDao.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/RoleDao.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/RoleDao.class index 7df8fd00..b8eea437 100644 Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/RoleDao.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/RoleDao.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/RolePermissionDao.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/RolePermissionDao.class index 11c28e39..86bfe179 100644 Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/RolePermissionDao.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/RolePermissionDao.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/UserDao.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/UserDao.class index f0b5e89b..a16e5546 100644 Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/UserDao.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/dao/UserDao.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/DeptService.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/DeptService.class index dd60d559..2ea370ca 100644 Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/DeptService.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/DeptService.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/EmployeeService.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/EmployeeService.class index 3e73b628..597dfe87 100644 Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/EmployeeService.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/EmployeeService.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/PermissionService.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/PermissionService.class index df6c20b1..a09c2c3d 100644 Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/PermissionService.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/PermissionService.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/PositionService.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/PositionService.class index 937a9381..77eda4b0 100644 Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/PositionService.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/PositionService.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/UserService.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/UserService.class index 392ea20a..f8c3f8df 100644 Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/UserService.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/UserService.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/DeptServiceImpl.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/DeptServiceImpl.class index f08fbac9..bb4009af 100644 Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/DeptServiceImpl.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/DeptServiceImpl.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.class index 79cfc9c9..2c9e233f 100644 Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/PermissionServiceImpl.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/PermissionServiceImpl.class index d90071da..d0e06fbb 100644 Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/PermissionServiceImpl.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/PermissionServiceImpl.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/PositionServiceImpl.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/PositionServiceImpl.class index 6abba0f5..cae2e43a 100644 Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/PositionServiceImpl.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/PositionServiceImpl.class differ diff --git a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/UserServiceImpl.class b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/UserServiceImpl.class index 9a5c202b..b38300cc 100644 Binary files a/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/UserServiceImpl.class and b/dq-financial-hrms/target/classes/com/daqing/financial/hrms/service/impl/UserServiceImpl.class differ diff --git a/dq-financial-hrms/target/classes/mapper/hrms/DeptDao.xml b/dq-financial-hrms/target/classes/mapper/hrms/DeptDao.xml index 8ffcc49b..83814fa8 100644 --- a/dq-financial-hrms/target/classes/mapper/hrms/DeptDao.xml +++ b/dq-financial-hrms/target/classes/mapper/hrms/DeptDao.xml @@ -19,7 +19,13 @@ + + + + + + + + \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/mapper/hrms/EmployeeDao.xml b/dq-financial-hrms/target/classes/mapper/hrms/EmployeeDao.xml index 0988e6e1..fa2321dc 100644 --- a/dq-financial-hrms/target/classes/mapper/hrms/EmployeeDao.xml +++ b/dq-financial-hrms/target/classes/mapper/hrms/EmployeeDao.xml @@ -3,7 +3,7 @@ - + @@ -18,8 +18,123 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -69,6 +184,50 @@ AND d.id = #{id} + + + + + + + + + + + + + + + + + + + + + + + + + + UPDATE hrms_user SET del_or_not = 1 WHERE id IN + + #{id} + + + + + + + + UPDATE hrms_user SET status = #{status},disable_start_time = #{disableStartTime}, + disable_end_time = #{disableEndTime},disable_cause = #{disableCause} + WHERE id = #{id} + + + + + + + + + + + + + + UPDATE hrms_user SET password = #{password} WHERE id = #{id} + + + + + + UPDATE hrms_employee SET name = #{name},job_number = #{jobNumber},gender = #{gender},birthday = #{birthday}, + phone = #{phone},company_mail = #{companyMail} + WHERE id = #{id} + + + + UPDATE hrms_user SET account = #{account},motify_time = #{modifyTime} WHERE id = #{id} + + + + DELETE FROM hrms_employee_dept WHERE employee_id = #{id} + + + + DELETE FROM hrms_employee_position WHERE emp_id = #{id} + + + + DELETE FROM hrms_employee_role WHERE user_id = #{id} + + + + INSERT INTO hrms_employee_dept + (employee_id,dept_id) + VALUES + + (#{id},#{deptId}) + + + + + INSERT INTO hrms_employee_position + (emp_id,position_id) + VALUES + + (#{id},#{positionId}) + + + + + INSERT INTO hrms_employee_role + (user_id,role_id) + VALUES + + (#{id},#{roleId}) + + + + + INSERT INTO hrms_employee_role + (user_id,role_id) + VALUES + + (#{item.userId},#{item.roleId}) + + + + + INSERT INTO hrms_employee_role + (user_id,role_id) + VALUES (#{userId},#{roleId}) + + + + INSERT INTO hrms_employee_role + (user_id,role_id) + VALUES (#{userId},#{roleId}) + + + + INSERT INTO hrms_employee (name,job_number,gender,birthday,phone,company_mail,user_id) + VALUES (#{name},#{jobNumber},#{gender},#{birthday},#{phone},#{companyMail},#{userId}) + + + + INSERT INTO hrms_user (account,create_time,motify_time) VALUES (#{account},#{createTime},#{motifyTime}) + + + + + + UPDATE hrms_employee SET gender = #{gender},office_phone = #{officePhone},phone = #{phone}, + company_mail = #{companyMail},spare_mail = #{spareMail} + + ,head_portarit_url = #{headPortaritUrl} + + WHERE id = #{id} + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/mapper/hrms/PermissionDao.xml b/dq-financial-hrms/target/classes/mapper/hrms/PermissionDao.xml index 9daf7734..33e21a54 100644 --- a/dq-financial-hrms/target/classes/mapper/hrms/PermissionDao.xml +++ b/dq-financial-hrms/target/classes/mapper/hrms/PermissionDao.xml @@ -9,6 +9,7 @@ + @@ -19,5 +20,22 @@ + + \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/mapper/hrms/PositionDao.xml b/dq-financial-hrms/target/classes/mapper/hrms/PositionDao.xml index 88fb9584..9cf3737d 100644 --- a/dq-financial-hrms/target/classes/mapper/hrms/PositionDao.xml +++ b/dq-financial-hrms/target/classes/mapper/hrms/PositionDao.xml @@ -81,5 +81,20 @@ p.id != #{id} + + \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/mapper/hrms/RoleDao.xml b/dq-financial-hrms/target/classes/mapper/hrms/RoleDao.xml index 14d82ba9..5df619cf 100644 --- a/dq-financial-hrms/target/classes/mapper/hrms/RoleDao.xml +++ b/dq-financial-hrms/target/classes/mapper/hrms/RoleDao.xml @@ -12,5 +12,8 @@ + \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/mapper/hrms/RolePermissionDao.xml b/dq-financial-hrms/target/classes/mapper/hrms/RolePermissionDao.xml index 0073b5e7..021a5b51 100644 --- a/dq-financial-hrms/target/classes/mapper/hrms/RolePermissionDao.xml +++ b/dq-financial-hrms/target/classes/mapper/hrms/RolePermissionDao.xml @@ -9,6 +9,13 @@ + \ No newline at end of file diff --git a/dq-financial-hrms/target/classes/mapper/hrms/UserDao.xml b/dq-financial-hrms/target/classes/mapper/hrms/UserDao.xml index 8885d686..ce325376 100644 --- a/dq-financial-hrms/target/classes/mapper/hrms/UserDao.xml +++ b/dq-financial-hrms/target/classes/mapper/hrms/UserDao.xml @@ -21,5 +21,37 @@ + + + + + + UPDATE hrms_user SET password = #{password} WHERE id = #{id} + + + + + + UPDATE hrms_user SET phone_account = #{phoneAccount} WHERE id = #{id} + + + + UPDATE hrms_user SET wechat_id = #{weChatId} WHERE id = #{id} + + + \ No newline at end of file diff --git a/dq-framework-common/dq-framework-common.iml b/dq-framework-common/dq-framework-common.iml index f683c485..5dc05fe8 100644 --- a/dq-framework-common/dq-framework-common.iml +++ b/dq-framework-common/dq-framework-common.iml @@ -1,6 +1,5 @@ - @@ -11,154 +10,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java b/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java index 9ab0ce68..824725c6 100644 --- a/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java +++ b/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java @@ -98,9 +98,9 @@ public class PromptSuccess { public static final String DB_B_NAME = "担保部B角"; // 担保部B角 - public static final String PERSONAL_START_CODE = "DQCZ-0001"; + public static final String PERSONAL_START_CODE = "DQCZ-0000"; - public static final String COMPANY_START_CODE = "DQCQ-0001"; + public static final String COMPANY_START_CODE = "DQCQ-0000"; public static final String PERSONAL_CODE = "DQCZ-"; diff --git a/dq-framework-common/target/classes/com/daqing/framework/SpringContextHolder.class b/dq-framework-common/target/classes/com/daqing/framework/SpringContextHolder.class index 50fa758b..f9bb0cf9 100644 Binary files a/dq-framework-common/target/classes/com/daqing/framework/SpringContextHolder.class and b/dq-framework-common/target/classes/com/daqing/framework/SpringContextHolder.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/client/DqFinancialList.class b/dq-framework-common/target/classes/com/daqing/framework/client/DqFinancialList.class index 1f3f5a05..6d962885 100644 Binary files a/dq-framework-common/target/classes/com/daqing/framework/client/DqFinancialList.class and b/dq-framework-common/target/classes/com/daqing/framework/client/DqFinancialList.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/exception/CustomException.class b/dq-framework-common/target/classes/com/daqing/framework/exception/CustomException.class index 5821baa4..2710cd15 100644 Binary files a/dq-framework-common/target/classes/com/daqing/framework/exception/CustomException.class and b/dq-framework-common/target/classes/com/daqing/framework/exception/CustomException.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/exception/ExceptionCast.class b/dq-framework-common/target/classes/com/daqing/framework/exception/ExceptionCast.class index f1116d34..fc6a852f 100644 Binary files a/dq-framework-common/target/classes/com/daqing/framework/exception/ExceptionCast.class and b/dq-framework-common/target/classes/com/daqing/framework/exception/ExceptionCast.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/exception/ExceptionCatch.class b/dq-framework-common/target/classes/com/daqing/framework/exception/ExceptionCatch.class index 5433d84a..e1b29a5f 100644 Binary files a/dq-framework-common/target/classes/com/daqing/framework/exception/ExceptionCatch.class and b/dq-framework-common/target/classes/com/daqing/framework/exception/ExceptionCatch.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/Constant$CloudService.class b/dq-framework-common/target/classes/com/daqing/framework/model/Constant$CloudService.class index 0c3ad7c6..ce6888e6 100644 Binary files a/dq-framework-common/target/classes/com/daqing/framework/model/Constant$CloudService.class and b/dq-framework-common/target/classes/com/daqing/framework/model/Constant$CloudService.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/Constant$MenuType.class b/dq-framework-common/target/classes/com/daqing/framework/model/Constant$MenuType.class index a639a2bc..af899a7d 100644 Binary files a/dq-framework-common/target/classes/com/daqing/framework/model/Constant$MenuType.class and b/dq-framework-common/target/classes/com/daqing/framework/model/Constant$MenuType.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/Constant$ScheduleStatus.class b/dq-framework-common/target/classes/com/daqing/framework/model/Constant$ScheduleStatus.class index 67e8483f..bae26b28 100644 Binary files a/dq-framework-common/target/classes/com/daqing/framework/model/Constant$ScheduleStatus.class and b/dq-framework-common/target/classes/com/daqing/framework/model/Constant$ScheduleStatus.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/Constant.class b/dq-framework-common/target/classes/com/daqing/framework/model/Constant.class index 79548676..f47d5824 100644 Binary files a/dq-framework-common/target/classes/com/daqing/framework/model/Constant.class and b/dq-framework-common/target/classes/com/daqing/framework/model/Constant.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/request/RequestData.class b/dq-framework-common/target/classes/com/daqing/framework/model/request/RequestData.class index 9df69b0a..9eb8eb6d 100644 Binary files a/dq-framework-common/target/classes/com/daqing/framework/model/request/RequestData.class and b/dq-framework-common/target/classes/com/daqing/framework/model/request/RequestData.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/response/CommonCode.class b/dq-framework-common/target/classes/com/daqing/framework/model/response/CommonCode.class index d939627d..1bf65b68 100644 Binary files a/dq-framework-common/target/classes/com/daqing/framework/model/response/CommonCode.class and b/dq-framework-common/target/classes/com/daqing/framework/model/response/CommonCode.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/response/PromptSuccess.class b/dq-framework-common/target/classes/com/daqing/framework/model/response/PromptSuccess.class index 41b580d3..db378b19 100644 Binary files a/dq-framework-common/target/classes/com/daqing/framework/model/response/PromptSuccess.class and b/dq-framework-common/target/classes/com/daqing/framework/model/response/PromptSuccess.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/response/ResponseResult.class b/dq-framework-common/target/classes/com/daqing/framework/model/response/ResponseResult.class index 271cc3e5..33f83cf7 100644 Binary files a/dq-framework-common/target/classes/com/daqing/framework/model/response/ResponseResult.class and b/dq-framework-common/target/classes/com/daqing/framework/model/response/ResponseResult.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/model/response/ResultCode.class b/dq-framework-common/target/classes/com/daqing/framework/model/response/ResultCode.class index a9527cda..efe51b1a 100644 Binary files a/dq-framework-common/target/classes/com/daqing/framework/model/response/ResultCode.class and b/dq-framework-common/target/classes/com/daqing/framework/model/response/ResultCode.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/util/BasePage.class b/dq-framework-common/target/classes/com/daqing/framework/util/BasePage.class index 99fe907f..55da2716 100644 Binary files a/dq-framework-common/target/classes/com/daqing/framework/util/BasePage.class and b/dq-framework-common/target/classes/com/daqing/framework/util/BasePage.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/util/JwtUtils.class b/dq-framework-common/target/classes/com/daqing/framework/util/JwtUtils.class index a23983f9..6c428dd2 100644 Binary files a/dq-framework-common/target/classes/com/daqing/framework/util/JwtUtils.class and b/dq-framework-common/target/classes/com/daqing/framework/util/JwtUtils.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/util/Md5Util.class b/dq-framework-common/target/classes/com/daqing/framework/util/Md5Util.class index e1ec5d74..26f6de86 100644 Binary files a/dq-framework-common/target/classes/com/daqing/framework/util/Md5Util.class and b/dq-framework-common/target/classes/com/daqing/framework/util/Md5Util.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/util/RandomUtil.class b/dq-framework-common/target/classes/com/daqing/framework/util/RandomUtil.class index 4bcf751f..e0495083 100644 Binary files a/dq-framework-common/target/classes/com/daqing/framework/util/RandomUtil.class and b/dq-framework-common/target/classes/com/daqing/framework/util/RandomUtil.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/util/RedisUtil.class b/dq-framework-common/target/classes/com/daqing/framework/util/RedisUtil.class index 2987d6f7..01c9d7c5 100644 Binary files a/dq-framework-common/target/classes/com/daqing/framework/util/RedisUtil.class and b/dq-framework-common/target/classes/com/daqing/framework/util/RedisUtil.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/util/SendSMS.class b/dq-framework-common/target/classes/com/daqing/framework/util/SendSMS.class index 31d46661..47719b05 100644 Binary files a/dq-framework-common/target/classes/com/daqing/framework/util/SendSMS.class and b/dq-framework-common/target/classes/com/daqing/framework/util/SendSMS.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/web/BaseController.class b/dq-framework-common/target/classes/com/daqing/framework/web/BaseController.class index eee676c8..91d934a1 100644 Binary files a/dq-framework-common/target/classes/com/daqing/framework/web/BaseController.class and b/dq-framework-common/target/classes/com/daqing/framework/web/BaseController.class differ diff --git a/dq-framework-common/target/classes/com/daqing/framework/xss/SQLFilter.class b/dq-framework-common/target/classes/com/daqing/framework/xss/SQLFilter.class index 92132ee5..d555be42 100644 Binary files a/dq-framework-common/target/classes/com/daqing/framework/xss/SQLFilter.class and b/dq-framework-common/target/classes/com/daqing/framework/xss/SQLFilter.class differ diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CompanyTemplate.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CompanyTemplate.java index f8f732b5..5d31bfbc 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CompanyTemplate.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CompanyTemplate.java @@ -2,13 +2,18 @@ package com.daqing.framework.domain.crms.ext; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.metadata.BaseRowModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; import java.io.Serializable; +import java.util.Date; /** * 导出excel模板(企业类型) + * * @auther River * @date 2020/10/9 11:38 */ @@ -18,66 +23,64 @@ public class CompanyTemplate extends BaseRowModel implements Serializable { /** * 客户经理 */ - @ExcelProperty(value = "客户经理(请填写本公司存在的员工姓名)",index = 0) + @ExcelProperty(value = "客户经理(请填写本公司存在的员工姓名)", index = 0) private String manager; /** * 客户名称 */ - @ExcelProperty(value = "姓名",index = 1) + @ExcelProperty(value = "客户名称", index = 1) private String name; - /** - * 联系地址 - */ - @ExcelProperty(value = "地址",index = 2) - private String addr; - /** - * 联系电话 - */ - @ExcelProperty(value = "电话",index = 3) + + @ExcelProperty(value = "社会统一代码", index = 2) + private String socialUnifiedCode; + + @ExcelProperty(value = "联系电话", index = 3) private String phone; - /** - * 注册资金 - */ - @ExcelProperty(value = "注册资金",index = 4) + + @ExcelProperty(value = "注册时间(eg:2020-02-20)", index = 4) + private Date registerTime; + + @ExcelProperty(value = "注册资金", index = 5) private String registeredCapital; - /** - * 所属行业 - */ - @ExcelProperty(value = "所属行业",index = 5) - private String industry; - /** - * 成立年限 - */ - @ExcelProperty(value = "成立年限",index = 6) - private Integer years; - /** - * 所在区域 - */ - @ExcelProperty(value = "所在区域",index = 7) - private String region; - /** - * 股东名称 - */ - @ExcelProperty(value = "股东名称",index = 8) - private String shareholder; - /** - * 关联企业 - */ - @ExcelProperty(value = "关联企业",index = 9) - private String affiliatedCompany; - /** - * 员工个数 - */ - @ExcelProperty(value = "员工个数",index = 10) + + @ExcelProperty(value = "员工人数", index = 6) private String empNum; - /** - * 联系人 - */ - @ExcelProperty(value = "联系人",index = 11) + + @ExcelProperty(value = "注册地址", index = 7) + private String registerAddr; + + @ExcelProperty(value = "联系人", index = 8) private String linkman; + + @ExcelProperty(value = "联系人的联系电话", index = 9) + private String linkPhone; + + @ExcelProperty(value = "经营地址", index = 10) + private String businessAddr; + + @ExcelProperty(value = "业务来源", index = 11) + private String businessSource; + + @ExcelProperty(value = "经营范围", index = 12) + private String businessScope; /** - * 业务来源 + * 法人-姓名 */ - @ExcelProperty(value = "业务来源",index = 12) - private String businessSource; + @ExcelProperty(value = "法人-姓名", index = 13) + private String legalName; + + @ExcelProperty(value = "法人-性别 1、男，0、女", index = 14) + private Integer legalGender; + + @ExcelProperty(value = "法人-身份证号", index = 15) + private String legalIdNumber; + + @ExcelProperty(value = "法人-户口所在地", index = 16) + private String legalHukouAddr; + + @ExcelProperty(value = "法人-联系电话", index = 17) + private String legalPhone; + + @ExcelProperty(value = "法人-家庭住址", index = 18) + private String legalHomeAddr; } diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.java index 0980fcc9..6db6ae44 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.java @@ -8,6 +8,7 @@ import lombok.ToString; import javax.validation.constraints.Email; import java.io.Serializable; +import java.util.Date; /** * 企业类型客户返回信息包装类(excel) @@ -34,59 +35,55 @@ public class CustomerCompanyVO extends BaseRowModel implements Serializable { */ @ExcelProperty(value = "姓名",index = 2) private String name; - /** - * 联系地址 - */ - @ExcelProperty(value = "地址",index = 3) - private String addr; - /** - * 联系电话 - */ - @ExcelProperty(value = "电话",index = 4) + + @ExcelProperty(value = "社会统一代码", index = 3) + private String socialUnifiedCode; + + @ExcelProperty(value = "联系电话", index = 4) private String phone; - /** - * 注册资金 - */ - @ExcelProperty(value = "注册资金",index = 5) + + @ExcelProperty(value = "注册时间", index = 5) + private Date registerTime; + + @ExcelProperty(value = "注册资金", index = 6) private String registeredCapital; - /** - * 所属行业 - */ - @ExcelProperty(value = "所属行业",index = 6) - private String industry; - /** - * 成立年限 - */ - @ExcelProperty(value = "成立年限",index = 7) - private Integer years; - /** - * 所在区域 - */ - @ExcelProperty(value = "所在区域",index = 8) - private String region; - /** - * 股东名称 - */ - @ExcelProperty(value = "股东名称",index = 9) - private String shareholder; - /** - * 关联企业 - */ - @ExcelProperty(value = "关联企业",index = 10) - private String affiliatedCompany; - /** - * 员工个数 - */ - @ExcelProperty(value = "员工个数",index = 11) + + @ExcelProperty(value = "员工人数", index = 7) private String empNum; - /** - * 联系人 - */ - @ExcelProperty(value = "联系人",index = 12) + + @ExcelProperty(value = "注册地址", index = 8) + private String registerAddr; + + @ExcelProperty(value = "联系人", index = 9) private String linkman; - /** - * 业务来源 - */ - @ExcelProperty(value = "业务来源",index = 13) + + @ExcelProperty(value = "联系人的联系电话", index = 10) + private String linkPhone; + + @ExcelProperty(value = "经营地址", index = 11) + private String businessAddr; + + @ExcelProperty(value = "业务来源", index = 12) private String businessSource; + + @ExcelProperty(value = "经营范围", index = 13) + private String businessScope; + + @ExcelProperty(value = "法人-身份证号",index = 14) + private String legalIdNumber; + + @ExcelProperty(value = "法人-户口所在地",index = 15) + private String legalHukouAddr; + + @ExcelProperty(value = "法人-联系电话",index = 16) + private String legalPhone; + + @ExcelProperty(value = "法人-家庭住址",index = 17) + private String legalHomeAddr; + + @ExcelProperty(value = "法人-性别 1、男，0、女",index = 18) + private Integer legalGender; + + @ExcelProperty(value = "法人-姓名",index = 19) + private String legalName; } diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgApplyField.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgApplyField.java new file mode 100644 index 00000000..de391a84 --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgApplyField.java @@ -0,0 +1,142 @@ +package com.daqing.framework.domain.guarantee; + +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; + +/** + * 业务申请字段修改 + * + * @auther River + * @date 2020/12/30 14:48 + */ +@Data +@ToString +public class DgApplyField implements Serializable { + + @ApiModelProperty("id") + private Integer id; + + @ApiModelProperty("客户类别") + private String customerType; + + @ApiModelProperty("客户编号") + private String customerCode; + + @ApiModelProperty("客户名称") + private String customerName; + + @ApiModelProperty("社会统一代码") + private String customerUnicode; + + @ApiModelProperty("联系电话") + private String customerPhone; + + @ApiModelProperty("注册时间") + private String registerTime; + + @ApiModelProperty("注册资金") + private String registerFund; + + @ApiModelProperty("注册地址") + private String registerAddr; + + @ApiModelProperty("员工个数") + private String employeeNumber; + + @ApiModelProperty("经营地址") + private String businessAddr; + + @ApiModelProperty("业务类别") + private String businessType; + + @ApiModelProperty("经营范围") + private String businessScope; + + @ApiModelProperty("法人姓名") + private String legalPersonName; + + @ApiModelProperty("法人性别") + private String legalPersonSex; + + @ApiModelProperty("身份证号码") + private String legalPersonCard; + + @ApiModelProperty("联系电话") + private String legalPersonPhone; + + @ApiModelProperty("户口") + private String legalPersonAccount; + + @ApiModelProperty("家庭地址") + private String legalPersonAddr; + + @ApiModelProperty("关联人") + private String legalPersonAffiliatedPerson; + + @ApiModelProperty("贷款申请额度") + private String loansAmount; + + @ApiModelProperty("贷款申请期限") + private String loansTimeLimit; + + @ApiModelProperty("贷款银行") + private String loansBank; + + @ApiModelProperty("贷款用途") + private String loansUse; + + @ApiModelProperty("贷款其他用途") + private String loansElseUse; + + @ApiModelProperty("贷款反担保措施") + private String loansMeasure; + + @ApiModelProperty("附件营业执照") + private String accessoryBusinessLicense; + + @ApiModelProperty("附件夫妻身份证") + private String accessoryIdCard; + + @ApiModelProperty("附件结婚证、离婚证") + private String accessoryMarriageCertificate; + + @ApiModelProperty("附加法人身份证") + private String accessoryPersonCard; + + @ApiModelProperty("附件公司章程") + private String accessoryConstitution; + + @ApiModelProperty("附件审计报告") + private String accessoryAudit; + + @ApiModelProperty("附件公司信用报告") + private String accessoryCredit; + + @ApiModelProperty("附件夫妻信用报告") + private String accessoryCoupleCredit; + + @ApiModelProperty("附件承诺书") + private String accessoryCommitment; + + @ApiModelProperty("附件完税证明") + private String accessoryProve; + + @ApiModelProperty("附件会议纪要") + private String accessoryConference; + + @ApiModelProperty("附件评估报告") + private String accessoryAssess; + + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("创建时间") + private Date createTime; + + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("更新时间") + private Date updateTime; +} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/StatusPO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/StatusPO.java deleted file mode 100644 index dce15077..00000000 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/StatusPO.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.daqing.framework.domain.guarantee.po; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.ToString; - -/** - * @Author chen - * @DATE 2020/12/30 9:45 - * @Version 1.0 - */ -@Data -@ToString -public class StatusPO { - - @ApiModelProperty("客户名称") - private String name; - - @ApiModelProperty("进程id") - private Integer processId; - - @ApiModelProperty("审核状态") - private Integer status; - - @ApiModelProperty("业务状态") - private Integer businessStatus; - - @ApiModelProperty("操作状态") - private Integer operatingStatus; - -} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/ext/EmployeeListVO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/ext/EmployeeListVO.java index 74ddf4d6..013df42b 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/ext/EmployeeListVO.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/ext/EmployeeListVO.java @@ -1,5 +1,6 @@ package com.daqing.framework.domain.hrms.ext; +import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.metadata.BaseRowModel; import com.fasterxml.jackson.annotation.JsonFormat; @@ -25,6 +26,7 @@ import java.util.List; @AllArgsConstructor public class EmployeeListVO extends BaseRowModel implements Serializable { + @ExcelIgnore @ApiModelProperty("id") private Long id; @@ -58,6 +60,7 @@ public class EmployeeListVO extends BaseRowModel implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date createTime; + @ExcelIgnore @ApiModelProperty("状态(0:启用,1:禁用,2:即将禁用(展示的时候属于启用))") private Integer status; } diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/ext/EmployeeTemplate.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/ext/EmployeeTemplate.java index 102aea71..de13263a 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/ext/EmployeeTemplate.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/ext/EmployeeTemplate.java @@ -26,13 +26,13 @@ public class EmployeeTemplate extends BaseRowModel implements Serializable { @ExcelProperty(value = "工号",index = 2) private String jobNumber; - @ExcelProperty(value = "部门(eg:安全部门&技术部门 请按照格式填写正常且已存在的部门名称)",index = 3) + @ExcelProperty(value = "部门(eg:安全部门&技术部门,请按照格式填写正常且已存在的部门名称)",index = 3) private List departmentNameList; - @ExcelProperty(value = "职位(eg:总经理&董事长 请按照格式填写正常且已存在的职位名称)",index = 4) + @ExcelProperty(value = "职位(eg:合规部专员&合规部经理,请按照格式填写正常且已存在的职位名称)",index = 4) private List positionNameList; - @ExcelProperty(value = "角色(eg:超级管理员&普通管理员 请按照格式填写正常且已存在的角色名称)",index = 5) + @ExcelProperty(value = "角色(eg:超级管理员&员工,请按照格式填写正常且已存在的角色名称)",index = 5) private List roleNameList; } diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/response/EmployeeExcelResponse.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/response/EmployeeExcelResponse.java new file mode 100644 index 00000000..5d560827 --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/response/EmployeeExcelResponse.java @@ -0,0 +1,53 @@ +package com.daqing.framework.domain.hrms.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 org.springframework.data.annotation.Transient; + +import java.io.Serializable; +import java.util.Date; + +/** + * 员工列表导出到excel实体类 + * + * @auther River + * @date 2021/1/4 15:27 + */ +@Data +@ToString +public class EmployeeExcelResponse extends BaseRowModel implements Serializable { + + @ApiModelProperty("姓名") + @ExcelProperty(value = "姓名",index = 0) + private String name; + + @ExcelProperty(value = "账号",index = 1) + @ApiModelProperty("账号") + private String account; + + @ExcelProperty(value = "工号",index = 2) + @ApiModelProperty("工号") + private String jobNumber; + + @ExcelProperty(value = "部门",index = 3) + @ApiModelProperty("部门") + @Transient + private String departmentNameList; + + @ExcelProperty(value = "职位",index = 4) + @ApiModelProperty("职位") + private String positionNameList; + + @ExcelProperty(value = "角色",index = 5) + @ApiModelProperty("角色") + private String roleNameList; + + @ExcelProperty(value = "创建时间",index = 6) + @ApiModelProperty("创建时间") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; +} diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CompanyCustomerEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CompanyCustomerEntity.class index 2a0b2e08..391b1000 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CompanyCustomerEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CompanyCustomerEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CustomerEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CustomerEntity.class index 3174291e..6c43d899 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CustomerEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/CustomerEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/PersonalCustomerEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/PersonalCustomerEntity.class index 1ef94e7f..9deac466 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/PersonalCustomerEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/PersonalCustomerEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CompanyTemplate.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CompanyTemplate.class index e5f520da..6039346a 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CompanyTemplate.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CompanyTemplate.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CrmsConstant$CustomerType.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CrmsConstant$CustomerType.class index 9ae841ed..d20f68e4 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CrmsConstant$CustomerType.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CrmsConstant$CustomerType.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CrmsConstant.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CrmsConstant.class index 3f09bfd0..5733c727 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CrmsConstant.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CrmsConstant.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.class index bb996577..5a982911 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyDTO.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTOI.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTOI.class index 25db8717..346c0310 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTOI.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTOI.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTOU.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTOU.class index ea46e049..e13d10df 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTOU.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyTOU.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.class index 05a31562..4d872680 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerCompanyVO.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalDTO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalDTO.class index a931c967..ed6ee901 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalDTO.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalDTO.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTOI.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTOI.class index 80516b0c..0ab14265 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTOI.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTOI.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTOU.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTOU.class index 144e2e34..ca7ccf65 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTOU.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalTOU.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.class index c94c638f..b66dc2ce 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerPersonalVO.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerTO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerTO.class index c4e917ca..6fa62e83 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerTO.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/CustomerTO.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/ManagerName.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/ManagerName.class index 4c36b24a..c088b570 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/ManagerName.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/ManagerName.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/PersonalTemplate.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/PersonalTemplate.class index c790d53f..4bda43cc 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/PersonalTemplate.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/ext/PersonalTemplate.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/request/CustomerRequest.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/request/CustomerRequest.class index ee3f5621..3e4d51f0 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/request/CustomerRequest.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/request/CustomerRequest.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/response/CrmsCode.class b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/response/CrmsCode.class index a7c673ce..d3d7e9fe 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/crms/response/CrmsCode.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/crms/response/CrmsCode.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DepartmentVO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DepartmentVO.class index 1fd6cc33..caea8d09 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DepartmentVO.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DepartmentVO.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptEntity.class index 9d87ab00..d430582d 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptPositionEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptPositionEntity.class index 89cb0b38..784933ac 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptPositionEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/DeptPositionEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeDeptEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeDeptEntity.class index 23303c6e..ee2ad0f0 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeDeptEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeDeptEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeEntity.class index d207a43c..e999bacb 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeePositionEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeePositionEntity.class index ce466ac3..15529923 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeePositionEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeePositionEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeRoleEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeRoleEntity.class index d33dd995..10d181d9 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeRoleEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/EmployeeRoleEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/LoginLog.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/LoginLog.class index 38fc931f..f4df8b49 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/LoginLog.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/LoginLog.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/PermissionEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/PermissionEntity.class index 51975224..2ffa57fe 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/PermissionEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/PermissionEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/PositionEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/PositionEntity.class index 25418f74..cdf8dc16 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/PositionEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/PositionEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/RoleEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/RoleEntity.class index 75d1523f..87846df8 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/RoleEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/RoleEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/RolePermissionEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/RolePermissionEntity.class index cab19553..a5368d26 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/RolePermissionEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/RolePermissionEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/SystemLog$SystemLogBuilder.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/SystemLog$SystemLogBuilder.class index 87c86c97..9bb67967 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/SystemLog$SystemLogBuilder.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/SystemLog$SystemLogBuilder.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/SystemLog.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/SystemLog.class index 2cb77e8e..8feeb790 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/SystemLog.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/SystemLog.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/Token.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/Token.class index 379db14b..2ee35c18 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/Token.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/Token.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/UserEntity.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/UserEntity.class index 3dab225b..dc174870 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/UserEntity.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/UserEntity.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeTO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeTO.class index 176613cb..059a77e7 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeTO.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeTO.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeVO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeVO.class index 7c23d39d..1b7d2804 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeVO.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/EmployeeVO.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/PositionVO.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/PositionVO.class index 3d34da44..2a1a4f5c 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/PositionVO.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/ext/PositionVO.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/DeptAddRequest.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/DeptAddRequest.class index 00e170be..ee920e0d 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/DeptAddRequest.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/DeptAddRequest.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/DeptUpdateSortRequest.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/DeptUpdateSortRequest.class index bfc68efc..2707e266 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/DeptUpdateSortRequest.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/DeptUpdateSortRequest.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/LoginRequest.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/LoginRequest.class index 9a71d19f..9b0585f5 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/LoginRequest.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/LoginRequest.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/PermissionAddRequest.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/PermissionAddRequest.class index b76c833e..05c612aa 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/PermissionAddRequest.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/PermissionAddRequest.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/PositionRequest.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/PositionRequest.class index 4ea59cdd..533d3d8e 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/PositionRequest.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/PositionRequest.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/UserLoginRequest.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/UserLoginRequest.class index 03da341a..b2055516 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/UserLoginRequest.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/request/UserLoginRequest.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/HrmsCode.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/HrmsCode.class index 20075757..53ea877e 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/HrmsCode.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/HrmsCode.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/LoginResponse.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/LoginResponse.class index 1fbbece8..c52574bf 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/LoginResponse.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/LoginResponse.class differ diff --git a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/PositionResponse.class b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/PositionResponse.class index 826e19d8..8473d2b5 100644 Binary files a/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/PositionResponse.class and b/dq-framework-model/target/classes/com/daqing/framework/domain/hrms/response/PositionResponse.class differ diff --git a/dq-framework-utils/target/classes/com/daqing/framework/utils/PageUtils.class b/dq-framework-utils/target/classes/com/daqing/framework/utils/PageUtils.class index c6ed9be0..d1cb9dcf 100644 Binary files a/dq-framework-utils/target/classes/com/daqing/framework/utils/PageUtils.class and b/dq-framework-utils/target/classes/com/daqing/framework/utils/PageUtils.class differ diff --git a/dq-framework-utils/target/classes/com/daqing/framework/utils/Query.class b/dq-framework-utils/target/classes/com/daqing/framework/utils/Query.class index 883edeaa..43dd51cd 100644 Binary files a/dq-framework-utils/target/classes/com/daqing/framework/utils/Query.class and b/dq-framework-utils/target/classes/com/daqing/framework/utils/Query.class differ diff --git a/dq-framework-utils/target/classes/com/daqing/framework/utils/SnowflakeIdUtils.class b/dq-framework-utils/target/classes/com/daqing/framework/utils/SnowflakeIdUtils.class index 5a362860..9b813b7a 100644 Binary files a/dq-framework-utils/target/classes/com/daqing/framework/utils/SnowflakeIdUtils.class and b/dq-framework-utils/target/classes/com/daqing/framework/utils/SnowflakeIdUtils.class differ diff --git a/dq-framework-utils/target/classes/com/daqing/framework/utils/excel/ExcelException.class b/dq-framework-utils/target/classes/com/daqing/framework/utils/excel/ExcelException.class index a730230f..bd326dba 100644 Binary files a/dq-framework-utils/target/classes/com/daqing/framework/utils/excel/ExcelException.class and b/dq-framework-utils/target/classes/com/daqing/framework/utils/excel/ExcelException.class differ diff --git a/dq-framework-utils/target/classes/com/daqing/framework/utils/excel/ExcelListener.class b/dq-framework-utils/target/classes/com/daqing/framework/utils/excel/ExcelListener.class index 0c0724ec..c789ee8d 100644 Binary files a/dq-framework-utils/target/classes/com/daqing/framework/utils/excel/ExcelListener.class and b/dq-framework-utils/target/classes/com/daqing/framework/utils/excel/ExcelListener.class differ diff --git a/dq-framework-utils/target/classes/com/daqing/framework/utils/excel/ExcelUtil.class b/dq-framework-utils/target/classes/com/daqing/framework/utils/excel/ExcelUtil.class index daa321c3..85cf2538 100644 Binary files a/dq-framework-utils/target/classes/com/daqing/framework/utils/excel/ExcelUtil.class and b/dq-framework-utils/target/classes/com/daqing/framework/utils/excel/ExcelUtil.class differ diff --git a/dq-framework-utils/target/classes/com/daqing/framework/utils/excel/ExcelWriterFactroy.class b/dq-framework-utils/target/classes/com/daqing/framework/utils/excel/ExcelWriterFactroy.class index ea702d78..9a4d365c 100644 Binary files a/dq-framework-utils/target/classes/com/daqing/framework/utils/excel/ExcelWriterFactroy.class and b/dq-framework-utils/target/classes/com/daqing/framework/utils/excel/ExcelWriterFactroy.class differ diff --git a/dq-framework-utils/target/classes/com/daqing/framework/utils/oss/OssFileUtils.class b/dq-framework-utils/target/classes/com/daqing/framework/utils/oss/OssFileUtils.class index 772548cd..ee7a00fc 100644 Binary files a/dq-framework-utils/target/classes/com/daqing/framework/utils/oss/OssFileUtils.class and b/dq-framework-utils/target/classes/com/daqing/framework/utils/oss/OssFileUtils.class differ