报告统计接口代码优化

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/PmTimeConfController.java

@@ -56,7 +56,7 @@ public class PmTimeConfController {
 
     /**
      * 提交记录分页
-     * @param queryType 查询类型
+     * @param queryType 查询类型（0：按时提交，1：迟交，2：未提交）
      * @param submitDate 提交日期
      * @param reportId 报告id
      * @param pageNum 页码

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/PmTimeConfService.java

@@ -27,8 +27,13 @@ public interface PmTimeConfService extends CrudService<PmTimeConf> {
     PmSubmitCountResponseVO submitCount(String submitDate);
 
     /**
-     * 获取提交列表
-     * @return
+     * 提交记录分页
+     * @param queryType 查询类型（0：按时提交，1：迟交，2：未提交）
+     * @param submitDate 提交日期
+     * @param reportId 报告id
+     * @param pageNum 页码
+     * @param pageSize 页大小
+     * @return 分页结果
      */
     CommonPage<Object> submitPage(String submitDate, Integer queryType, Integer reportId, Integer pageNum, Integer pageSize);
 

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/PmTimeConfServiceImpl.java

@@ -55,14 +55,23 @@ public class PmTimeConfServiceImpl extends AbstractCrudService<PmTimeConfMapper,
     public PmSubmitCountResponseVO submitCount(String submitDate) {
         Integer tenantId = SecurityUtils.getTenantId();
         PmSubmitCountResponseVO responseVO = new PmSubmitCountResponseVO();
-        LocalDate countDate = LocalDate.parse(submitDate);
+        LocalDate countDate = null;
+        try {
+            countDate = LocalDate.parse(submitDate);
+        } catch (Exception e) {
+            throw new BusinessException("提交日期有误" + e.getMessage());
+        }
 
         // 查询时间配置
         PmTimeConf timeConf = getTimeConf(tenantId);
         if (timeConf == null) {
             throw new RuntimeException("未找到工作报提交统计告时间配置，请联系管理员");
         } else if (countDate.equals(LocalDate.now()) && timeConf.getStartTime().isAfter(LocalTime.now())) {
-            throw new RuntimeException("不可查看未来数据");
+            responseVO.setSubmitOnTime(0);
+            responseVO.setSubmitLate(0);
+            responseVO.setNotSubmitted(0);
+            responseVO.setStatisticalDate(countDate);
+            return responseVO;
         }
 
         LocalTime startTime = timeConf.getStartTime();
@@ -95,7 +104,12 @@ public class PmTimeConfServiceImpl extends AbstractCrudService<PmTimeConfMapper,
     public CommonPage<Object> submitPage(String submitDate, Integer queryType, Integer reportId, Integer pageNum, Integer pageSize) {
         Integer tenantId = SecurityUtils.getTenantId();
         Long userId2 = SecurityUtils.getUserId();
-        LocalDate countDate = LocalDate.parse(submitDate);
+        LocalDate countDate = null;
+        try {
+            countDate = LocalDate.parse(submitDate);
+        } catch (Exception e) {
+            throw new BusinessException("提交日期有误" + e.getMessage());
+        }
 
         List<SysUser> userList = users(tenantId);
 
@@ -103,6 +117,10 @@ public class PmTimeConfServiceImpl extends AbstractCrudService<PmTimeConfMapper,
         if (timeConf == null) {
             throw new BusinessException("未找到工作报提交统计告时间配置，请联系管理员");
         }
+        if ((LocalDate.now().equals(countDate) && timeConf.getStartTime().isAfter(LocalTime.now())) ||
+                countDate.isAfter(LocalDate.now())) {
+            return new CommonPage<>();
+        }
 
         LocalTime startTime = timeConf.getStartTime();
         LocalTime onTime = timeConf.getOnTime();
@@ -158,7 +176,7 @@ public class PmTimeConfServiceImpl extends AbstractCrudService<PmTimeConfMapper,
                     throw new BusinessException("报告统计分页参数错误！");
             }
             if (countDate.equals(LocalDate.now()) && timeConf.getStartTime().isAfter(LocalTime.now())) {
-                throw new BusinessException("不可查看未来数据");
+                return new CommonPage<>();
             }
             reportQuery.eq(PmWorkReport::getReportDate, countDate);
         }