diff --git a/dq-financial-crms/src/main/resources/bootstrap.properties b/dq-financial-crms/src/main/resources/bootstrap.properties index ac484fb6..5c07b6fc 100644 --- a/dq-financial-crms/src/main/resources/bootstrap.properties +++ b/dq-financial-crms/src/main/resources/bootstrap.properties @@ -1,7 +1,7 @@ #服务名称 spring.application.name=dq-financial-crms #配置中心地址 -spring.cloud.nacos.config.server-addr=127.0.0.1:8848 +spring.cloud.nacos.config.server-addr=192.168.31.140:8848 spring.cloud.nacos.config.file-extension=yml #redis配置 spring.redis.host=127.0.0.1 @@ -14,13 +14,13 @@ spring.redis.jedis.pool.max-wait=-1 spring.redis.jedis.pool.max-idle=8 spring.redis.jedis.pool.min-idle=0 #本地测试环境 -#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 +spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 #线上测试环境 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 #线上生产环境 -spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406 +#spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406 #请求处理的超时时间 ribbon.ReadTimeout: 120000 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 34bf9764..3a6e7b2a 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 @@ -44,6 +44,7 @@ public class DgEfficiencyController { @Autowired private HrmsFeignService hrmsFeignService; + /** * 团队效率 */ @@ -58,7 +59,7 @@ public class DgEfficiencyController { */ @GetMapping("/businessCount") @ApiOperation(value = "统计不同业务状态下业务数量", notes = "统计不同业务状态下业务数量") - public ResponseResult getBusinessCount(){ + public ResponseResult getBusinessCount() { return ResponseResult.SUCCESS(dgEfficiencyService.getBusinessCount()); } @@ -67,19 +68,39 @@ public class DgEfficiencyController { * 首页-近十天的审批数目 */ @GetMapping("/approvalNum") - public ResponseResult approvalNum(){ + public ResponseResult approvalNum() { //查询审批数目的值的数组 Map result = dgEfficiencyService.approvalNum(); return ResponseResult.SUCCESS(result); } + /** + * 首页-当前月份每天新建审批数量 + */ + @GetMapping("/getNewBusinessCount") + @ApiOperation(value = "当前月份每天新建审批数量") + public ResponseResult getNewBusinessCount() { + + return ResponseResult.SUCCESS(dgEfficiencyService.getNewBusinessCount()); + } + + /** + * 首页-今天新建审批数量并按员工和客户分类 + */ + @GetMapping("/getTodayBusinessCount") + @ApiOperation(value = "今天新建审批数量并按员工和客户分类") + public ResponseResult getTodayBusinessCount() { + + return ResponseResult.SUCCESS(dgEfficiencyService.getTodayBusinessCount()); + } + @ApiOperation(value = "个人效率记录列表") /** * 首页-通知 * @Param title 标题 */ @GetMapping("/notice") - public ResponseResult notice(){ + public ResponseResult notice() { //查询审批数目的值的数组 List result = dgEfficiencyService.notice(); return ResponseResult.SUCCESS(result); @@ -89,10 +110,10 @@ public class DgEfficiencyController { @PostMapping("/personalEfficiencyList") public R personalEfficiencyList( @ApiParam(name = "personalEfficiencyListRequest", value = "个人效率列表查询对象") - @RequestBody PersonalEfficiencyListRequest personalEfficiencyListRequest){ + @RequestBody PersonalEfficiencyListRequest personalEfficiencyListRequest) { List responseList = dgEfficiencyService.queryPersonalEfficiencyList(); - if(responseList.size()>0){ + if (responseList.size() > 0) { List arr = new ArrayList<>(); for (PersonalEfficiencyListResponse res : responseList) { arr.add(res.getApplicantId()); @@ -100,14 +121,14 @@ public class DgEfficiencyController { //根据提单人id查询其部门名称 ResponseResult responseResult = hrmsFeignService.getAccountAndDeptNameById(arr); List employeeMessage = null; - if(responseResult.getData() != null){ + if (responseResult.getData() != null) { employeeMessage = (List) responseResult.getData(); } - for (PersonalEfficiencyListResponse response:responseList) { - for(LinkedHashMap res : employeeMessage){ - if(response.getApplicantId().equals(res.get("id"))){//如果提单人id相同情况下,就往对象里面赋值 - response.setApplicant(JSONObject.toJSONString(res.get("account")).replace("\"","")); + for (PersonalEfficiencyListResponse response : responseList) { + for (LinkedHashMap res : employeeMessage) { + if (response.getApplicantId().equals(res.get("id"))) {//如果提单人id相同情况下,就往对象里面赋值 + response.setApplicant(JSONObject.toJSONString(res.get("account")).replace("\"", "")); } } } @@ -117,20 +138,20 @@ public class DgEfficiencyController { //转换任务节点,并统计操作状态个数 responseList.forEach(personalEfficiencyListResponse -> { String taskNode = personalEfficiencyListResponse.getTaskNode(); - if (taskNode!=null){ + if (taskNode != null) { String converter = TaskNodeUtil.converter(taskNode); personalEfficiencyListResponse.setTaskNode(converter); } - if (personalEfficiencyListResponse.getOperatingStatus()!=null){ - switch (personalEfficiencyListResponse.getOperatingStatus()){ + if (personalEfficiencyListResponse.getOperatingStatus() != null) { + switch (personalEfficiencyListResponse.getOperatingStatus()) { case 0: - numResponse.setInitiateNum(numResponse.getInitiateNum()+1); + numResponse.setInitiateNum(numResponse.getInitiateNum() + 1); break; case 1: - numResponse.setPendingNum(numResponse.getPendingNum()+1); + numResponse.setPendingNum(numResponse.getPendingNum() + 1); break; case 2: - numResponse.setProcessedNum(numResponse.getProcessedNum()+1); + numResponse.setProcessedNum(numResponse.getProcessedNum() + 1); break; default: numResponse.setInitiateNum(0); @@ -142,17 +163,17 @@ public class DgEfficiencyController { }); //根据条件筛选数据 //迭代器进行筛选 - if (personalEfficiencyListRequest.getOperatingStatus()!=null){ + if (personalEfficiencyListRequest.getOperatingStatus() != null) { // 已发起 - if (personalEfficiencyListRequest.getOperatingStatus().equals(StatusCode.CZ_LAUNCH)){ + 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()); // 待处理 - }else if (personalEfficiencyListRequest.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)){ + } 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()); // 已处理 - }else if (personalEfficiencyListRequest.getOperatingStatus().equals(StatusCode.CZ_PROCESSED)){ + } 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()); } @@ -190,20 +211,20 @@ public class DgEfficiencyController { long longEnd = getLongDate(personalEfficiencyListRequest.getEndTime()); //迭代器进行筛选 Iterator iterator = responseList.iterator(); - while (iterator.hasNext()){ + while (iterator.hasNext()) { PersonalEfficiencyListResponse next = iterator.next(); String applicationDate = next.getApplicationDate(); long longDate = getLongDate(applicationDate); //当前日期小于开始日期或当前日期大于结束日期,删除该元素 - if (longDatelongEnd){ + if (longDate < longStart || longDate > longEnd) { iterator.remove(); } } } - return R.ok().data("responseList",responseList).data("statistics",numResponse); + return R.ok().data("responseList", responseList).data("statistics", numResponse); } - public static long getLongDate(String stringDate){ + public static long getLongDate(String stringDate) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); try { Date date = sdf.parse(stringDate); @@ -216,9 +237,9 @@ public class DgEfficiencyController { @ApiOperation(value = "个人效率记录列表导出") @GetMapping("/personalEfficiencyListExport") - public void personalEfficiencyListExport(HttpServletResponse httpServletResponse){ + public void personalEfficiencyListExport(HttpServletResponse httpServletResponse) { List responseList = dgEfficiencyService.queryPersonalEfficiencyList(); - if(responseList.size()>0){ + if (responseList.size() > 0) { List arr = new ArrayList<>(); for (PersonalEfficiencyListResponse res : responseList) { arr.add(res.getApplicantId()); @@ -226,20 +247,20 @@ public class DgEfficiencyController { //根据提单人id查询其部门名称 ResponseResult responseResult = hrmsFeignService.getAccountAndDeptNameById(arr); List employeeMessage = null; - if(responseResult.getData() != null){ + if (responseResult.getData() != null) { employeeMessage = (List) responseResult.getData(); } - for (PersonalEfficiencyListResponse response:responseList) { - for(LinkedHashMap res : employeeMessage){ - if(response.getApplicantId().equals(res.get("id"))){//如果提单人id相同情况下,就往对象里面赋值 - response.setApplicant(JSONObject.toJSONString(res.get("account")).replace("\"","")); + for (PersonalEfficiencyListResponse response : responseList) { + for (LinkedHashMap res : employeeMessage) { + if (response.getApplicantId().equals(res.get("id"))) {//如果提单人id相同情况下,就往对象里面赋值 + response.setApplicant(JSONObject.toJSONString(res.get("account")).replace("\"", "")); } } } } try { - EasyExcelUtil.download(httpServletResponse,PersonalEfficiencyListResponse.class,responseList,"个人效率记录列表","第一页"); + EasyExcelUtil.download(httpServletResponse, PersonalEfficiencyListResponse.class, responseList, "个人效率记录列表", "第一页"); } catch (IOException e) { e.printStackTrace(); } 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 88d93acd..89e26148 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 @@ -11,6 +11,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** *

@@ -38,4 +39,10 @@ public interface DgApplyAmountInfoMapper extends BaseMapper { int selectBusinessTaday(String dateTime); String selectMaxBusinessTaday(String dateTime); + + List> getNewBusinessCount(@Param("beginTime") String beginTime, @Param("endTime") String endTime); + + /*List getNewBusinessDate(@Param("beginTime") String beginTime, @Param("endTime") String endTime);*/ + + Map getTodayBusinessCount(@Param("today") String today); } 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 69d4073d..54ace2f7 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 @@ -25,4 +25,8 @@ public interface IDgEfficiencyService extends IService { Map getBusinessCount(); List queryPersonalEfficiencyList(); + + List> getNewBusinessCount(); + + Map getTodayBusinessCount(); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java index badbf56a..855cbc9c 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java @@ -244,6 +244,32 @@ public class DgEfficiencyServiceImpl extends ServiceImpl> getNewBusinessCount() { + + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); + // 本月开始时间 + String beginTime = dateFormat.format(DateUtils.getBeginDayOfMonth()); + // 本月结束时间 + String endTime = dateFormat.format(DateUtils.getEndDayOfMonth()); + + return applyAmountInfoMapper.getNewBusinessCount(beginTime, endTime); + } + + /** + * 获取今天新建审批数量并按申请类型分类 + */ + @Override + public Map getTodayBusinessCount() { + + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); + + return applyAmountInfoMapper.getTodayBusinessCount(dateFormat.format(new Date())); + } + @Override public List queryPersonalEfficiencyList() { int size = 100; @@ -274,7 +300,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl positionVO = applyAmountListMapper.pageByCondition(new Page(1, size), "", roleIdList, this.getUserId()); List records = positionVO.getRecords(); - if (records!=null && records.size()!=0){ + if (records != null && records.size() != 0) { records.forEach(businessApplicationListResponse -> { StatusPO statusPO = new StatusPO(); Integer businessId = businessApplicationListResponse.getBusinessId(); @@ -296,7 +322,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl positionVO = guaranteeAssignUserMapper.pageByCondition(new Page(1, size), "", roleIdList, this.getUserId(), null); List records = positionVO.getRecords(); - if (records!=null && records.size()!=0) { + if (records != null && records.size() != 0) { records.forEach(guaranteeListResponse -> { StatusPO statusPO = new StatusPO(); Integer businessId = guaranteeListResponse.getBusinessId(); @@ -310,8 +336,8 @@ public class DgEfficiencyServiceImpl extends ServiceImpl positionVO = assetsInvestigationMapper.pageByCondition(new Page(1, size), "", roleIdList, this.getUserId(), null); List records = positionVO.getRecords(); - if (records!=null && records.size()!=0) { + if (records != null && records.size() != 0) { records.forEach(assetsInvestigationListResponse -> { StatusPO statusPO = new StatusPO(); Integer businessId = assetsInvestigationListResponse.getBusinessId(); @@ -336,8 +362,8 @@ public class DgEfficiencyServiceImpl extends ServiceImpl positionVO = messageInvestigationMapper.pageByCondition(new Page(1, size), "", roleIdList, this.getUserId(), null); List records = positionVO.getRecords(); - if (records!=null && records.size()!=0) { + if (records != null && records.size() != 0) { records.forEach(messageInvestigationListResponse -> { StatusPO statusPO = new StatusPO(); Integer businessId = messageInvestigationListResponse.getBusinessId(); @@ -362,20 +388,20 @@ public class DgEfficiencyServiceImpl extends ServiceImpl list = complianceInvestigationMapper.list(new Page(1, size), dgComplianceInvestigationRequest, roleList, currentUser); List records = list.getRecords(); - if (records!=null && records.size()!=0) { + if (records != null && records.size() != 0) { records.forEach(dgComplianceInvestigationResponse -> { StatusPO statusPO = new StatusPO(); Integer businessId = dgComplianceInvestigationResponse.getBusinessId(); @@ -389,8 +415,8 @@ public class DgEfficiencyServiceImpl extends ServiceImpl list = workConferenceConsiderMapper.list(new Page(1, size), "", roleList, currentUser); List records = list.getRecords(); - if (records!=null && records.size()!=0) { + if (records != null && records.size() != 0) { records.forEach(dgWorkConferencePO -> { StatusPO statusPO = new StatusPO(); Integer businessId = dgWorkConferencePO.getBusinessId(); @@ -414,18 +440,18 @@ public class DgEfficiencyServiceImpl extends ServiceImpl list = loanCommitteeConsiderMapper.list(new Page(1, size), "", roleList, currentUser); List records = list.getRecords(); - if (records!=null && records.size()!=0) { + if (records != null && records.size() != 0) { records.forEach(dgLoanCommitteeConsiderResponse -> { StatusPO statusPO = new StatusPO(); Integer businessId = dgLoanCommitteeConsiderResponse.getBusinessId(); @@ -439,19 +465,19 @@ public class DgEfficiencyServiceImpl extends ServiceImpl iPage = guaranteeLetterAssignUserMapper.pageByCondition(new Page(1, size), currentUser, roleIdList, null, null); List records = iPage.getRecords(); - if (records!=null && records.size()!=0) { + if (records != null && records.size() != 0) { records.forEach(guaranteeLetterListResponse -> { StatusPO statusPO = new StatusPO(); String name = guaranteeLetterListResponse.getName(); @@ -465,19 +491,19 @@ public class DgEfficiencyServiceImpl extends ServiceImpl iPage = paymentConfirmationConsiderMapper.pageByCondition(new Page(1, size), roleIdList, currentUser, null, null); List records = iPage.getRecords(); - if (records!=null && records.size()!=0) { + if (records != null && records.size() != 0) { records.forEach(paymentConfirmationListResponse -> { StatusPO statusPO = new StatusPO(); String name = paymentConfirmationListResponse.getName(); @@ -491,8 +517,8 @@ public class DgEfficiencyServiceImpl extends ServiceImpl iPage = loanNoticeMapper.pageByCondition(new Page(1, size), roleIdList, currentUser, null, null); List records = iPage.getRecords(); - if (records!=null && records.size()!=0) { + if (records != null && records.size() != 0) { records.forEach(loanNoticeListResponse -> { StatusPO statusPO = new StatusPO(); String name = loanNoticeListResponse.getName(); @@ -517,8 +543,8 @@ public class DgEfficiencyServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); - wrapper.eq("user_id", currentUser).eq("business_id",key); + wrapper.eq("user_id", currentUser).eq("business_id", key); List auditProcessList = dgAuditProcessMapper.selectList(wrapper); if (auditProcessList != null && auditProcessList.size() != 0) { //获取累计耗时,完成时间 @@ -572,7 +598,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl auditProcessList = dgAuditProcessMapper.selectList(wrapper); long countTime = 0L; - if (auditProcessList.size()>1){ + if (auditProcessList.size() > 1) { //遍历业务流程数据,统计该用户的耗时 for (int i = 1; i <= auditProcessList.size() - 1; i++) { //从第二条数据开始,获取该数据 @@ -602,11 +628,11 @@ public class DgEfficiencyServiceImpl extends ServiceImpl roleIdlist = new ArrayList<>(); - if(roleIds != null) { + if (roleIds != null) { String[] ids = roleIds.split(","); roleIdlist = Arrays.asList(ids); } //查询业务管理模块该用户待处理的记录 //业务申请模块,查询该用户待处理的记录 - List list1 = applyAmountListMapper.selectApplyList(userId,roleIdlist); + List list1 = applyAmountListMapper.selectApplyList(userId, roleIdlist); List list = new ArrayList(); - for (DgNoticeListResponse res:list1) { - res.setBusinessCode("您有一个待办任务需办理,评审内容:业务申请:"+res.getBusinessCode()); + for (DgNoticeListResponse res : list1) { + res.setBusinessCode("您有一个待办任务需办理,评审内容:业务申请:" + res.getBusinessCode()); list.add(res); } //担保部调查模块,查询该用户待处理的记录 - List list2 = guaranteeAssignUserMapper.selectGuaranteeList(userId,roleIdlist); - for (DgNoticeListResponse res:list2) { - res.setBusinessCode("您有一个待办任务需办理,评审内容:担保部调查:"+res.getBusinessCode()); + List list2 = guaranteeAssignUserMapper.selectGuaranteeList(userId, roleIdlist); + for (DgNoticeListResponse res : list2) { + res.setBusinessCode("您有一个待办任务需办理,评审内容:担保部调查:" + res.getBusinessCode()); list.add(res); } //资产部调查模块,查询该用户待处理的记录 - List list3 = assetsInvestigationMapper.selectAssetsList(userId,roleIdlist); - for (DgNoticeListResponse res:list3) { - res.setBusinessCode("您有一个待办任务需办理,评审内容:资产部调查:"+res.getBusinessCode()); + List list3 = assetsInvestigationMapper.selectAssetsList(userId, roleIdlist); + for (DgNoticeListResponse res : list3) { + res.setBusinessCode("您有一个待办任务需办理,评审内容:资产部调查:" + res.getBusinessCode()); list.add(res); } //信息部调查模块,查询该用户待处理的记录 - List list4 = messageInvestigationMapper.selectMessageList(userId,roleIdlist); - for (DgNoticeListResponse res:list4) { - res.setBusinessCode("您有一个待办任务需办理,评审内容:信息部调查:"+res.getBusinessCode()); + List list4 = messageInvestigationMapper.selectMessageList(userId, roleIdlist); + for (DgNoticeListResponse res : list4) { + res.setBusinessCode("您有一个待办任务需办理,评审内容:信息部调查:" + res.getBusinessCode()); list.add(res); } //合规调查模块,查询该用户待处理的记录 - List list5 = complianceInvestigationMapper.selectComplianceList(userId,roleIdlist); - for (DgNoticeListResponse res:list5) { - res.setBusinessCode("您有一个待办任务需办理,评审内容:合规调查:"+res.getBusinessCode()); + List list5 = complianceInvestigationMapper.selectComplianceList(userId, roleIdlist); + for (DgNoticeListResponse res : list5) { + res.setBusinessCode("您有一个待办任务需办理,评审内容:合规调查:" + res.getBusinessCode()); list.add(res); } //工作会模块,查询该用户待处理的记录 - List list6 = workConferenceConsiderMapper.selectWorkConferenceList(userId,roleIdlist); - for (DgNoticeListResponse res:list6) { - res.setBusinessCode("您有一个待办任务需办理,评审内容:工作会:"+res.getBusinessCode()); + List list6 = workConferenceConsiderMapper.selectWorkConferenceList(userId, roleIdlist); + for (DgNoticeListResponse res : list6) { + res.setBusinessCode("您有一个待办任务需办理,评审内容:工作会:" + res.getBusinessCode()); list.add(res); } //贷审会模块,查询该用户待处理的记录 - List list7 = loanCommitteeConsiderMapper.selectLoanCommitteeList(userId,roleIdlist); - for (DgNoticeListResponse res:list7) { - res.setBusinessCode("您有一个待办任务需办理,评审内容:贷审会:"+res.getBusinessCode()); + List list7 = loanCommitteeConsiderMapper.selectLoanCommitteeList(userId, roleIdlist); + for (DgNoticeListResponse res : list7) { + res.setBusinessCode("您有一个待办任务需办理,评审内容:贷审会:" + res.getBusinessCode()); list.add(res); } //担保函模块,查询该用户待处理的记录 - List list8 = guaranteeLetterAssignUserMapper.selectGuaranteeLetterList(userId,roleIdlist); - for (DgNoticeListResponse res:list8) { - res.setBusinessCode("您有一个待办任务需办理,评审内容:担保函:"+res.getBusinessCode()); + List list8 = guaranteeLetterAssignUserMapper.selectGuaranteeLetterList(userId, roleIdlist); + for (DgNoticeListResponse res : list8) { + res.setBusinessCode("您有一个待办任务需办理,评审内容:担保函:" + res.getBusinessCode()); list.add(res); } //回款确认模块,查询该用户待处理的记录 - List list9 = paymentConfirmationConsiderMapper.selectPaymentConfirmationList(userId,roleIdlist); - for (DgNoticeListResponse res:list9) { - res.setBusinessCode("您有一个待办任务需办理,评审内容:回款确认:"+res.getBusinessCode()); + List list9 = paymentConfirmationConsiderMapper.selectPaymentConfirmationList(userId, roleIdlist); + for (DgNoticeListResponse res : list9) { + res.setBusinessCode("您有一个待办任务需办理,评审内容:回款确认:" + res.getBusinessCode()); list.add(res); } //放款通知模块,查询该用户待处理的记录 - List list10 = loanNoticeMapper.selectLoanNoticeList(userId,roleIdlist); - for (DgNoticeListResponse res:list10) { - res.setBusinessCode("您有一个待办任务需办理,评审内容:放款通知:"+res.getBusinessCode()); + List list10 = loanNoticeMapper.selectLoanNoticeList(userId, roleIdlist); + for (DgNoticeListResponse res : list10) { + res.setBusinessCode("您有一个待办任务需办理,评审内容:放款通知:" + res.getBusinessCode()); list.add(res); } return list; diff --git a/dq-financial-guarantee/src/main/resources/bootstrap.properties b/dq-financial-guarantee/src/main/resources/bootstrap.properties index 9a445e56..1ea5bbcd 100644 --- a/dq-financial-guarantee/src/main/resources/bootstrap.properties +++ b/dq-financial-guarantee/src/main/resources/bootstrap.properties @@ -1,7 +1,7 @@ #服务名称 spring.application.name=dq-financial-guarantee #配置中心地址 -spring.cloud.nacos.config.server-addr=127.0.0.1:8848 +spring.cloud.nacos.config.server-addr=192.168.31.140:8848 spring.cloud.nacos.config.file-extension=yml #redis配置 spring.redis.host=127.0.0.1 @@ -15,13 +15,13 @@ spring.redis.jedis.pool.max-idle=8 spring.redis.jedis.pool.min-idle=0 #本地测试环境 -#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 +spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 #线上测试环境 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 #线上生产环境 -spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406 +#spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406 #请求处理的超时时间 ribbon.ReadTimeout: 120000 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 1d754f18..b267d68c 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountInfoMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountInfoMapper.xml @@ -88,4 +88,27 @@ order by id desc limit 1 + + + + + + + + + diff --git a/dq-financial-hrms-auth/src/main/resources/bootstrap.properties b/dq-financial-hrms-auth/src/main/resources/bootstrap.properties index 838e5c90..e78457bd 100644 --- a/dq-financial-hrms-auth/src/main/resources/bootstrap.properties +++ b/dq-financial-hrms-auth/src/main/resources/bootstrap.properties @@ -1,7 +1,7 @@ #服务名称 spring.application.name=dq-financial-hrms-auth #配置中心地址 -spring.cloud.nacos.config.server-addr=127.0.0.1:8848 +spring.cloud.nacos.config.server-addr=192.168.31.140:8848 spring.cloud.nacos.config.file-extension=yml #redis配置 spring.redis.host=127.0.0.1 @@ -15,13 +15,13 @@ spring.redis.jedis.pool.max-idle=8 spring.redis.jedis.pool.min-idle=0 #本地测试环境 -#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 +spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 #线上测试环境 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 #线上生产环境 -spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406 +#spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406 #请求处理的超时时间 ribbon.ReadTimeout: 120000 diff --git a/dq-financial-hrms/src/main/resources/bootstrap.properties b/dq-financial-hrms/src/main/resources/bootstrap.properties index 8458c2fc..98937ed0 100644 --- a/dq-financial-hrms/src/main/resources/bootstrap.properties +++ b/dq-financial-hrms/src/main/resources/bootstrap.properties @@ -1,7 +1,7 @@ ##服务名称 spring.application.name=dq-financial-hrms #配置中心地址 -spring.cloud.nacos.config.server-addr=127.0.0.1:8848 +spring.cloud.nacos.config.server-addr=192.168.31.140:8848 spring.cloud.nacos.config.file-extension=yml #redis配置 spring.redis.host=127.0.0.1 @@ -15,13 +15,13 @@ spring.redis.jedis.pool.max-idle=8 spring.redis.jedis.pool.min-idle=0 #本地测试环境 -#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 +spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 #线上测试环境 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 #线上生产环境 -spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406 +#spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406 #请求处理的超时时间 ribbon.ReadTimeout: 120000 diff --git a/dq-framework-common/src/main/java/com/daqing/framework/util/Md5Util.java b/dq-framework-common/src/main/java/com/daqing/framework/util/Md5Util.java index 7a6e421f..77c0a69c 100644 --- a/dq-framework-common/src/main/java/com/daqing/framework/util/Md5Util.java +++ b/dq-framework-common/src/main/java/com/daqing/framework/util/Md5Util.java @@ -33,18 +33,21 @@ public class Md5Util { //String s = URLEncoder.encode("www.occupationlab.com", "utf-8"); //System.out.println(s); //System.out.println(md5("1234564")); - System.out.println(md5("Aa123420")); - - // SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); - // SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - // Date date = new Date(); - // try { - // date = simpleDateFormat.parse("2021-01-06"); - // } catch (ParseException e) { - // e.printStackTrace(); - // } - // Timestamp time = DateUtils.getDayEndTime(date); - // System.out.println(time); - // System.out.println(simpleDateFormat.format(time)); + System.out.println(md5("Aa12342")); + + /* SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Date date = new Date(); + try { + date = simpleDateFormat.parse("2021-01-06"); + } catch (ParseException e) { + e.printStackTrace(); + }*/ +/* Timestamp time = DateUtils.getDayEndTime(date); + System.out.println(time); + System.out.println(simpleDateFormat.format(time));*/ + + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); + System.out.println(dateFormat.format(new Date())); } } diff --git a/dq-govern-gateway/src/main/resources/bootstrap.properties b/dq-govern-gateway/src/main/resources/bootstrap.properties index ee5f1b55..9872b12e 100644 --- a/dq-govern-gateway/src/main/resources/bootstrap.properties +++ b/dq-govern-gateway/src/main/resources/bootstrap.properties @@ -1,7 +1,7 @@ #服务名称 spring.application.name=dq-govern-gateway #配置中心地址 -spring.cloud.nacos.config.server-addr=127.0.0.1:8848 +spring.cloud.nacos.config.server-addr=192.168.31.140:8848 spring.cloud.nacos.config.file-extension=yml #redis配置 spring.redis.host=127.0.0.1 @@ -15,13 +15,13 @@ spring.redis.jedis.pool.max-idle=8 spring.redis.jedis.pool.min-idle=0 #本地测试环境 -#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 +spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 #线上测试环境 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 #线上生产环境 -spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406 +#spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406 spring.servlet.multipart.max-file-size=10MB spring.servlet.multipart.max-request-size=10MB