首页的本月和今日新建审批数量统计

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

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<PersonalEfficiencyListResponse> responseList = dgEfficiencyService.queryPersonalEfficiencyList();
 
-        if(responseList.size()>0){
+        if (responseList.size() > 0) {
             List<Integer> 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<LinkedHashMap> employeeMessage = null;
-            if(responseResult.getData() != null){
+            if (responseResult.getData() != null) {
                 employeeMessage = (List<LinkedHashMap>) 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<PersonalEfficiencyListResponse> iterator = responseList.iterator();
-            while (iterator.hasNext()){
+            while (iterator.hasNext()) {
                 PersonalEfficiencyListResponse next = iterator.next();
                 String applicationDate = next.getApplicationDate();
                 long longDate = getLongDate(applicationDate);
                 //当前日期小于开始日期或当前日期大于结束日期，删除该元素
-                if (longDate<longStart||longDate>longEnd){
+                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<PersonalEfficiencyListResponse> responseList = dgEfficiencyService.queryPersonalEfficiencyList();
-        if(responseList.size()>0){
+        if (responseList.size() > 0) {
             List<Integer> 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<LinkedHashMap> employeeMessage = null;
-            if(responseResult.getData() != null){
+            if (responseResult.getData() != null) {
                 employeeMessage = (List<LinkedHashMap>) 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();
         }

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;
 
 /**
  * <p>
@@ -38,4 +39,10 @@ public interface DgApplyAmountInfoMapper extends BaseMapper<DgApplyAmountInfo> {
     int selectBusinessTaday(String dateTime);
 
     String selectMaxBusinessTaday(String dateTime);
+
+    List<Map<String, Integer>> getNewBusinessCount(@Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+    /*List<Integer> getNewBusinessDate(@Param("beginTime") String beginTime, @Param("endTime") String endTime);*/
+
+    Map<String, Integer> getTodayBusinessCount(@Param("today") String today);
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgEfficiencyService.java

@@ -25,4 +25,8 @@ public interface IDgEfficiencyService extends IService<DgApplyAmountInfo> {
     Map<String, Integer> getBusinessCount();
 
     List<PersonalEfficiencyListResponse> queryPersonalEfficiencyList();
+
+    List<Map<String, Integer>> getNewBusinessCount();
+
+    Map<String, Integer> getTodayBusinessCount();
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java

@@ -244,6 +244,32 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
         return map;
     }
 
+    /**
+     * 获取当前月份的每天的新建审批数量
+     */
+    @Override
+    public List<Map<String, Integer>> 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<String, Integer> getTodayBusinessCount() {
+
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
+
+        return applyAmountInfoMapper.getTodayBusinessCount(dateFormat.format(new Date()));
+    }
+
     @Override
     public List<PersonalEfficiencyListResponse> queryPersonalEfficiencyList() {
         int size = 100;
@@ -274,7 +300,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
             //业务申请列表查询
             IPage<BusinessApplicationListResponse> positionVO = applyAmountListMapper.pageByCondition(new Page(1, size), "", roleIdList, this.getUserId());
             List<BusinessApplicationListResponse> 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<DgEfficiencyMapper, DgA
             // 担保部调查列表
             IPage<GuaranteeListResponse> positionVO = guaranteeAssignUserMapper.pageByCondition(new Page(1, size), "", roleIdList, this.getUserId(), null);
             List<GuaranteeListResponse> 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<DgEfficiencyMapper, DgA
                     statusPO.setName(name);
                     statusPO.setStatus(status);
                     //相同业务中，如果已经是待处理则数据不覆盖
-                    StatusPO po = (StatusPO)hashMap.get(businessId);
-                    if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)){
+                    StatusPO po = (StatusPO) hashMap.get(businessId);
+                    if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)) {
                         hashMap.put(businessId, statusPO);
                     }
                 });
@@ -322,7 +348,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
             // 资产部调查列表
             IPage<AssetsInvestigationListResponse> positionVO = assetsInvestigationMapper.pageByCondition(new Page(1, size), "", roleIdList, this.getUserId(), null);
             List<AssetsInvestigationListResponse> 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<DgEfficiencyMapper, DgA
                     statusPO.setName(name);
                     statusPO.setStatus(status);
                     //相同业务中，如果已经是待处理则数据不覆盖
-                    StatusPO po = (StatusPO)hashMap.get(businessId);
-                    if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)){
+                    StatusPO po = (StatusPO) hashMap.get(businessId);
+                    if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)) {
                         hashMap.put(businessId, statusPO);
                     }
                 });
@@ -348,7 +374,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
             // 信息部调查列表
             IPage<MessageInvestigationListResponse> positionVO = messageInvestigationMapper.pageByCondition(new Page(1, size), "", roleIdList, this.getUserId(), null);
             List<MessageInvestigationListResponse> 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<DgEfficiencyMapper, DgA
                     statusPO.setName(name);
                     statusPO.setStatus(status);
                     //相同业务中，如果已经是待处理则数据不覆盖
-                    StatusPO po = (StatusPO)hashMap.get(businessId);
-                    if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)){
+                    StatusPO po = (StatusPO) hashMap.get(businessId);
+                    if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)) {
                         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))) {
+        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<DgComplianceInvestigationResponse> list = complianceInvestigationMapper.list(new Page(1, size), dgComplianceInvestigationRequest, roleList, currentUser);
             List<DgComplianceInvestigationResponse> 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<DgEfficiencyMapper, DgA
                     statusPO.setName(name);
                     statusPO.setStatus(status);
                     //相同业务中，如果已经是待处理则数据不覆盖
-                    StatusPO po = (StatusPO)hashMap.get(businessId);
-                    if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)){
+                    StatusPO po = (StatusPO) hashMap.get(businessId);
+                    if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)) {
                         hashMap.put(businessId, statusPO);
                     }
                 });
@@ -400,7 +426,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
         if (roleIdList.contains(String.valueOf(PromptSuccess.GZU_ID))) {
             IPage<DgWorkConferencePO> list = workConferenceConsiderMapper.list(new Page(1, size), "", roleList, currentUser);
             List<DgWorkConferencePO> 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<DgEfficiencyMapper, DgA
                     statusPO.setName(name);
                     statusPO.setStatus(status);
                     //相同业务中，如果已经是待处理则数据不覆盖
-                    StatusPO po = (StatusPO)hashMap.get(businessId);
-                    if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)){
+                    StatusPO po = (StatusPO) hashMap.get(businessId);
+                    if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)) {
                         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))) {
+        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<DgLoanCommitteeConsiderResponse> list = loanCommitteeConsiderMapper.list(new Page(1, size), "", roleList, currentUser);
             List<DgLoanCommitteeConsiderResponse> 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<DgEfficiencyMapper, DgA
                     statusPO.setName(name);
                     statusPO.setStatus(status);
                     //相同业务中，如果已经是待处理则数据不覆盖
-                    StatusPO po = (StatusPO)hashMap.get(businessId);
-                    if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)){
+                    StatusPO po = (StatusPO) hashMap.get(businessId);
+                    if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)) {
                         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)) ) {
+        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<GuaranteeLetterListResponse> iPage = guaranteeLetterAssignUserMapper.pageByCondition(new Page(1, size), currentUser, roleIdList, null, null);
             List<GuaranteeLetterListResponse> 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<DgEfficiencyMapper, DgA
                     statusPO.setName(name);
                     statusPO.setStatus(status);
                     //相同业务中，如果已经是待处理则数据不覆盖
-                    StatusPO po = (StatusPO)hashMap.get(businessId);
-                    if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)){
+                    StatusPO po = (StatusPO) hashMap.get(businessId);
+                    if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)) {
                         hashMap.put(businessId, statusPO);
                     }
                 });
             }
         }
         //财务部、法规经理
-        if (roleIdList.contains(String.valueOf(PromptSuccess.CWB_ID))|roleIdList.contains(String.valueOf(PromptSuccess.FG_JL_ID))) {
+        if (roleIdList.contains(String.valueOf(PromptSuccess.CWB_ID)) | roleIdList.contains(String.valueOf(PromptSuccess.FG_JL_ID))) {
             //回款确认
             IPage<PaymentConfirmationListResponse> iPage = paymentConfirmationConsiderMapper.pageByCondition(new Page(1, size), roleIdList, currentUser, null, null);
             List<PaymentConfirmationListResponse> 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<DgEfficiencyMapper, DgA
                     statusPO.setName(name);
                     statusPO.setStatus(status);
                     //相同业务中，如果已经是待处理则数据不覆盖
-                    StatusPO po = (StatusPO)hashMap.get(businessId);
-                    if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)){
+                    StatusPO po = (StatusPO) hashMap.get(businessId);
+                    if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)) {
                         hashMap.put(businessId, statusPO);
                     }
                 });
@@ -503,7 +529,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
             //放款通知
             IPage<LoanNoticeListResponse> iPage = loanNoticeMapper.pageByCondition(new Page(1, size), roleIdList, currentUser, null, null);
             List<LoanNoticeListResponse> 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<DgEfficiencyMapper, DgA
                     statusPO.setName(name);
                     statusPO.setStatus(status);
                     //相同业务中，如果已经是待处理则数据不覆盖
-                    StatusPO po = (StatusPO)hashMap.get(businessId);
-                    if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)){
+                    StatusPO po = (StatusPO) hashMap.get(businessId);
+                    if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)) {
                         hashMap.put(businessId, statusPO);
                     }
                 });
@@ -528,7 +554,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
         for (Integer key : hashMap.keySet()) {
             PersonalEfficiencyListResponse efficiencyListResponse = new PersonalEfficiencyListResponse();
             efficiencyListResponse.setBusinessId(key);
-            StatusPO po = (StatusPO)hashMap.get(key);
+            StatusPO po = (StatusPO) hashMap.get(key);
             Integer businessStatus = po.getBusinessStatus();
             Integer operatingStatus = po.getOperatingStatus();
             Integer processId = po.getProcessId();
@@ -549,7 +575,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
             efficiencyListResponse.setApplicationDate(new SimpleDateFormat("yyyy-MM-dd").format(createTime));
             //用户处理过业务,统计耗时
             QueryWrapper<DgAuditProcess> wrapper = new QueryWrapper<>();
-            wrapper.eq("user_id", currentUser).eq("business_id",key);
+            wrapper.eq("user_id", currentUser).eq("business_id", key);
             List<DgAuditProcess> auditProcessList = dgAuditProcessMapper.selectList(wrapper);
             if (auditProcessList != null && auditProcessList.size() != 0) {
                 //获取累计耗时，完成时间
@@ -572,7 +598,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
         wrapper.eq("business_id", businessId).orderByAsc("create_time");
         List<DgAuditProcess> 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<DgEfficiencyMapper, DgA
 
     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 +"分钟";
+        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 + "分钟";
     }
 
     /**
@@ -621,6 +647,7 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
 
     /**
      * 查询审批数目的值的数组
+     *
      * @return
      */
     @Override
@@ -632,78 +659,78 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
         String roleIds = RedisUtil.get("dq:userRole:" + userId);
         PageUtils data = null;
         List<String> roleIdlist = new ArrayList<>();
-        if(roleIds != null) {
+        if (roleIds != null) {
             String[] ids = roleIds.split(",");
             roleIdlist = Arrays.asList(ids);
         }
         //查询业务管理模块该用户待处理的记录
         //业务申请模块，查询该用户待处理的记录
-        List<DgNoticeListResponse> list1 = applyAmountListMapper.selectApplyList(userId,roleIdlist);
+        List<DgNoticeListResponse> list1 = applyAmountListMapper.selectApplyList(userId, roleIdlist);
         List<DgNoticeListResponse> list = new ArrayList();
-        for (DgNoticeListResponse res:list1) {
-            res.setBusinessCode("您有一个待办任务需办理，评审内容：业务申请："+res.getBusinessCode());
+        for (DgNoticeListResponse res : list1) {
+            res.setBusinessCode("您有一个待办任务需办理，评审内容：业务申请：" + res.getBusinessCode());
             list.add(res);
         }
 
         //担保部调查模块，查询该用户待处理的记录
-        List<DgNoticeListResponse> list2 = guaranteeAssignUserMapper.selectGuaranteeList(userId,roleIdlist);
-        for (DgNoticeListResponse res:list2) {
-            res.setBusinessCode("您有一个待办任务需办理，评审内容：担保部调查："+res.getBusinessCode());
+        List<DgNoticeListResponse> list2 = guaranteeAssignUserMapper.selectGuaranteeList(userId, roleIdlist);
+        for (DgNoticeListResponse res : list2) {
+            res.setBusinessCode("您有一个待办任务需办理，评审内容：担保部调查：" + res.getBusinessCode());
             list.add(res);
         }
 
         //资产部调查模块，查询该用户待处理的记录
-        List<DgNoticeListResponse> list3 = assetsInvestigationMapper.selectAssetsList(userId,roleIdlist);
-        for (DgNoticeListResponse res:list3) {
-            res.setBusinessCode("您有一个待办任务需办理，评审内容：资产部调查："+res.getBusinessCode());
+        List<DgNoticeListResponse> list3 = assetsInvestigationMapper.selectAssetsList(userId, roleIdlist);
+        for (DgNoticeListResponse res : list3) {
+            res.setBusinessCode("您有一个待办任务需办理，评审内容：资产部调查：" + res.getBusinessCode());
             list.add(res);
         }
 
         //信息部调查模块，查询该用户待处理的记录
-        List<DgNoticeListResponse> list4 = messageInvestigationMapper.selectMessageList(userId,roleIdlist);
-        for (DgNoticeListResponse res:list4) {
-            res.setBusinessCode("您有一个待办任务需办理，评审内容：信息部调查："+res.getBusinessCode());
+        List<DgNoticeListResponse> list4 = messageInvestigationMapper.selectMessageList(userId, roleIdlist);
+        for (DgNoticeListResponse res : list4) {
+            res.setBusinessCode("您有一个待办任务需办理，评审内容：信息部调查：" + res.getBusinessCode());
             list.add(res);
         }
 
         //合规调查模块，查询该用户待处理的记录
-        List<DgNoticeListResponse> list5 = complianceInvestigationMapper.selectComplianceList(userId,roleIdlist);
-        for (DgNoticeListResponse res:list5) {
-            res.setBusinessCode("您有一个待办任务需办理，评审内容：合规调查："+res.getBusinessCode());
+        List<DgNoticeListResponse> list5 = complianceInvestigationMapper.selectComplianceList(userId, roleIdlist);
+        for (DgNoticeListResponse res : list5) {
+            res.setBusinessCode("您有一个待办任务需办理，评审内容：合规调查：" + res.getBusinessCode());
             list.add(res);
         }
 
         //工作会模块，查询该用户待处理的记录
-        List<DgNoticeListResponse> list6 = workConferenceConsiderMapper.selectWorkConferenceList(userId,roleIdlist);
-        for (DgNoticeListResponse res:list6) {
-            res.setBusinessCode("您有一个待办任务需办理，评审内容：工作会："+res.getBusinessCode());
+        List<DgNoticeListResponse> list6 = workConferenceConsiderMapper.selectWorkConferenceList(userId, roleIdlist);
+        for (DgNoticeListResponse res : list6) {
+            res.setBusinessCode("您有一个待办任务需办理，评审内容：工作会：" + res.getBusinessCode());
             list.add(res);
         }
 
         //贷审会模块，查询该用户待处理的记录
-        List<DgNoticeListResponse> list7 = loanCommitteeConsiderMapper.selectLoanCommitteeList(userId,roleIdlist);
-        for (DgNoticeListResponse res:list7) {
-            res.setBusinessCode("您有一个待办任务需办理，评审内容：贷审会："+res.getBusinessCode());
+        List<DgNoticeListResponse> list7 = loanCommitteeConsiderMapper.selectLoanCommitteeList(userId, roleIdlist);
+        for (DgNoticeListResponse res : list7) {
+            res.setBusinessCode("您有一个待办任务需办理，评审内容：贷审会：" + res.getBusinessCode());
             list.add(res);
         }
 
         //担保函模块，查询该用户待处理的记录
-        List<DgNoticeListResponse> list8 = guaranteeLetterAssignUserMapper.selectGuaranteeLetterList(userId,roleIdlist);
-        for (DgNoticeListResponse res:list8) {
-            res.setBusinessCode("您有一个待办任务需办理，评审内容：担保函："+res.getBusinessCode());
+        List<DgNoticeListResponse> list8 = guaranteeLetterAssignUserMapper.selectGuaranteeLetterList(userId, roleIdlist);
+        for (DgNoticeListResponse res : list8) {
+            res.setBusinessCode("您有一个待办任务需办理，评审内容：担保函：" + res.getBusinessCode());
             list.add(res);
         }
         //回款确认模块，查询该用户待处理的记录
-        List<DgNoticeListResponse> list9 = paymentConfirmationConsiderMapper.selectPaymentConfirmationList(userId,roleIdlist);
-        for (DgNoticeListResponse res:list9) {
-            res.setBusinessCode("您有一个待办任务需办理，评审内容：回款确认："+res.getBusinessCode());
+        List<DgNoticeListResponse> list9 = paymentConfirmationConsiderMapper.selectPaymentConfirmationList(userId, roleIdlist);
+        for (DgNoticeListResponse res : list9) {
+            res.setBusinessCode("您有一个待办任务需办理，评审内容：回款确认：" + res.getBusinessCode());
             list.add(res);
         }
 
         //放款通知模块，查询该用户待处理的记录
-        List<DgNoticeListResponse> list10 = loanNoticeMapper.selectLoanNoticeList(userId,roleIdlist);
-        for (DgNoticeListResponse res:list10) {
-            res.setBusinessCode("您有一个待办任务需办理，评审内容：放款通知："+res.getBusinessCode());
+        List<DgNoticeListResponse> list10 = loanNoticeMapper.selectLoanNoticeList(userId, roleIdlist);
+        for (DgNoticeListResponse res : list10) {
+            res.setBusinessCode("您有一个待办任务需办理，评审内容：放款通知：" + res.getBusinessCode());
             list.add(res);
         }
         return list;

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

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountInfoMapper.xml

@@ -88,4 +88,27 @@
         order by id desc limit 1
     </select>
 
+    <!-- 获取本月每天新建审批数量 -->
+    <select id="getNewBusinessCount" parameterType="string" resultType="map">
+        SELECT DATE_FORMAT(create_time,'%d') days,COUNT(id) count
+        FROM dg_apply_amount_info
+        WHERE DATE_FORMAT(create_time,'%Y%m%d') &gt;= #{beginTime} AND DATE_FORMAT(create_time,'%Y%m%d') &lt;= #{endTime}
+        GROUP BY days
+    </select>
+
+    <!-- 获取本月存在新建审批的日期集合(查询两个结果集的时候接收类型只有一个默认只接收第一个) -->
+    <!--<select id="getNewBusinessDate" parameterType="string" resultType="integer">
+        SELECT COUNT(id) count,DATE_FORMAT(create_time,'%Y%m%d') days
+        FROM dg_apply_amount_info GROUP BY days
+        HAVING days &gt;= #{beginTime} AND days &lt;= #{endTime};
+    </select>-->
+
+    <!-- 今天新建审批数量并按照员工和客户分类 -->
+    <select id="getTodayBusinessCount" parameterType="string" resultType="map">
+        SELECT
+        SUM(CASE WHEN (apply_type = 0) THEN 1 ELSE 0 END) AS 'employee',
+        SUM(CASE WHEN (apply_type = 1) THEN 1 ELSE 0 END) AS 'customer'
+        FROM dg_apply_amount_info WHERE DATE_FORMAT(create_time,'%Y%m%d') = #{today}
+    </select>
+
 </mapper>

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

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

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

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