1

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/vo/TokenVo.java

@@ -11,4 +11,5 @@ public class TokenVo {
     public String token;
     public String startDate;
     public String endDate;
+    public Integer state;
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -8591,6 +8591,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         String token = tokenVo.getToken();
         String startDate =tokenVo.getStartDate();
         String endDate = tokenVo.getEndDate();
+        Integer state = tokenVo.getState();
         DateTimeFormatter df=DateTimeFormatter.ofPattern("yyyy-MM-dd");
         LocalDate openDate = LocalDate.parse(startDate, df);
         LocalDate closeDate = LocalDate.parse(endDate, df);
@@ -8614,7 +8615,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             return msg;
         }
         if(token.equals(thirdPartyInterface.getToken())){
-            List<HashMap<String, Object>> allReportByDate = reportMapper.getAllReportByDate(startDate,thirdPartyInterface.getCompanyId(), null, endDate, null, 1, null,null,null);
+            List<HashMap<String, Object>> allReportByDate = reportMapper.getAllReportByDate(startDate,thirdPartyInterface.getCompanyId(), null, endDate, null, null==state?1:state, null,null,null);
             final CountDownLatch latch=new CountDownLatch(allReportByDate.size());
             for (HashMap<String, Object> map : allReportByDate) {
                 java.sql.Date sqlCreateDate= (java.sql.Date) map.get("createDate");