update

jnpf-tendering-biz/src/main/java/jnpf/service/impl/IndicatorStatisticsServiceImpl.java

@@ -30,10 +30,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.YearMonth;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Service
@@ -273,11 +270,22 @@ public class IndicatorStatisticsServiceImpl implements IndicatorStatisticsServic
         IndicatorStatisticsDto.MyToDoListResponse response = new IndicatorStatisticsDto.MyToDoListResponse();
         //查询用户信息
         UserInfo userInfo = userProvider.get();
-        //待办数量
+        //待填报
-        response.setTodoCount(iBiddingProjectSubscribeChildService.lambdaQuery()
+        response.setToBeFilledCount(iBiddingProjectSubscribeChildService.lambdaQuery()
                 .eq(BiddingProjectSubscribeChild::getUserId, userInfo.getUserId())
-                .in(BiddingProjectSubscribeChild::getChildStatus, Arrays.asList(BiddingProjectEnum.ChildStatusEnum.PENDING_REVIEW.getCode(), BiddingProjectEnum.ChildStatusEnum.TO_BE_ARCHIVED.getCode(), BiddingProjectEnum.ChildStatusEnum.TO_BE_SUBMITTED.getCode(), BiddingProjectEnum.ChildStatusEnum.TO_BE_EDIT.getCode()))
+                .in(BiddingProjectSubscribeChild::getChildStatus, Arrays.asList(BiddingProjectEnum.ChildStatusEnum.TO_BE_SUBMITTED.getCode(), BiddingProjectEnum.ChildStatusEnum.TO_BE_EDIT.getCode()))
                 .count() + "");
+        //待归档
+        response.setToBeArchivedApprovalCount(iBiddingProjectSubscribeChildService.lambdaQuery()
+                .eq(BiddingProjectSubscribeChild::getUserId, userInfo.getUserId())
+                .in(BiddingProjectSubscribeChild::getChildStatus, Collections.singletonList(BiddingProjectEnum.ChildStatusEnum.TO_BE_ARCHIVED.getCode()))
+                .count() + "");
+        //待审核
+        response.setToBeArchivedApprovalCount(iBiddingProjectSubscribeChildService.lambdaQuery()
+                .eq(BiddingProjectSubscribeChild::getUserId, userInfo.getUserId())
+                .in(BiddingProjectSubscribeChild::getChildStatus, Collections.singletonList(BiddingProjectEnum.ChildStatusEnum.PENDING_REVIEW.getCode()))
+                .count() + "");
+
         //已办数量
         response.setAlreadyCount(iBiddingProjectSubscribeChildService.lambdaQuery()
                 .eq(BiddingProjectSubscribeChild::getUserId, userInfo.getUserId())

jnpf-tendering-entity/src/main/java/jnpf/model/dto/IndicatorStatisticsDto.java

@@ -13,7 +13,7 @@ public class IndicatorStatisticsDto {
         /**
          * 查询类型 1-本月(默认本月)：到日。2-当年：按月。3-累计：按年
          */
-        private String type="1";
+        private String type = "1";
         /**
          * 权限控制
          */
@@ -53,11 +53,11 @@ public class IndicatorStatisticsDto {
         /**
          * 审批数量
          */
-        private String spCount="0";
+        private String spCount = "0";
         /**
          * 备案数量
          */
-        private String baCount="0";
+        private String baCount = "0";
     }
 
 
@@ -92,7 +92,7 @@ public class IndicatorStatisticsDto {
          * 1-所有(默认所有) 2-按组织形式分布 3-按事项分类分布 4-按招标方式分布
          */
         private String classificationType;
-        private List<MoneyAndProjectsNumberChild> dataList=new ArrayList<>();
+        private List<MoneyAndProjectsNumberChild> dataList = new ArrayList<>();
     }
 
     @Data
@@ -114,7 +114,21 @@ public class IndicatorStatisticsDto {
 
     @Data
     public static class MyToDoListResponse {
-        private String todoCount;
+        /**
+         * 待填报
+         */
+        private String toBeFilledCount;
+        /**
+         * 待审批
+         */
+        private String pendingApprovalCount;
+        /**
+         * 待归档
+         */
+        private String toBeArchivedApprovalCount;
+        /**
+         * 已办
+         */
         private String alreadyCount;
     }
 }