修改报表跳转代入时间问题

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/TjReq/TjOrgCountReq.java

@@ -4,6 +4,7 @@ import com.junmp.v2.common.bean.request.BaseRequest;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
+import java.util.Date;
 import java.util.List;
 
 
@@ -14,7 +15,6 @@ public class TjOrgCountReq extends BaseRequest {
     private Long orgId;
     private List<String> typeIdsList;
     private List<String> sizeNameList;
-    @NotNull(message = "年份不能为空",groups = detail.class)
     private Integer year;
     private List<Integer> monthList;
 
@@ -26,4 +26,7 @@ public class TjOrgCountReq extends BaseRequest {
     private String column;
 
     private Integer level;
+
+    private String startTime;
+    private String endTime;
 }
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/TjServiceImpl.java

@@ -629,6 +629,15 @@ public class TjServiceImpl implements TjService {
         List<String> orgList= inventorySummaryMapper.getTotalData(String.valueOf(req.getOrgId()));
         List<TjOrgCountDto> tjOrgCountList=new ArrayList<>();
 
+        String[] splitStart = req.getStartTime().split("-");
+        String[] splitEnd =req.getEndTime().split("-");
+        Integer year=Integer.parseInt(splitStart[0] );
+        req.setYear(year);
+        List<Integer> monthList=new ArrayList<>();
+        for (int i = Integer.parseInt(splitStart[1]) ; i <= Integer.parseInt(splitEnd[1]); i++) {
+            monthList.add(i);
+        }
+        req.setMonthList(monthList);
         List<CompletableFuture<TjOrgCountDto>> futures = orgList.stream()
                 .map(orgId -> CompletableFuture.supplyAsync(() ->
                         equipmentCountSummaryMapper.TjOrgCount(orgId,
@@ -711,6 +720,14 @@ public class TjServiceImpl implements TjService {
         List<String> orgList= inventorySummaryMapper.getTotalData(String.valueOf(req.getOrgId()));
         List<TjOrgCountDto> tjOrgCountList=new ArrayList<>();
 
+        String[] splitStart = req.getStartTime().split("-");
+        String[] splitEnd =req.getEndTime().split("-");
+        Integer year=Integer.parseInt(splitStart[0] );
+        req.setYear(year);
+        List<Integer> monthList=new ArrayList<>();
+        for (int i = Integer.parseInt(splitStart[1]) ; i <= Integer.parseInt(splitEnd[1]); i++) {
+            monthList.add(i);
+        }
         List<CompletableFuture<TjOrgCountDto>> futures = orgList.stream()
                 .map(orgId -> CompletableFuture.supplyAsync(() ->
                         equipmentCountSummaryMapper.TjOrgCount(orgId,