Merge branch 'fu-normal-push' of uskycloud/usky-modules into server-165

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

@@ -2,6 +2,8 @@ package com.usky.iot.controller.web;
 
 
 import com.usky.common.core.bean.CommonPage;
+import com.usky.common.security.utils.SecurityUtils;
+import com.usky.iot.domain.PmTimeConf;
 import com.usky.iot.domain.PmWorkReport;
 import com.usky.iot.service.PmTimeConfService;
 import com.usky.iot.service.vo.PmSubmitCountResponseVO;
@@ -52,6 +54,15 @@ public class PmTimeConfController {
         return pmTimeConfService.submitCount(submitDate);
     }
 
+    /**
+     * 提交记录分页
+     * @param queryType 查询类型（0：按时提交，1：迟交，2：未提交）
+     * @param submitDate 提交日期
+     * @param reportId 报告id
+     * @param pageNum 页码
+     * @param pageSize 页大小
+     * @return 分页结果
+     */
     @GetMapping("/submitPage")
     public CommonPage<Object> submitPage(@RequestParam(value = "queryType", required = false, defaultValue = "0") Integer queryType,
                                          @RequestParam(value = "submitDate", required = false) String submitDate,
@@ -64,5 +75,15 @@ public class PmTimeConfController {
         return pmTimeConfService.submitPage(submitDate, queryType, reportId, pageNum, pageSize);
     }
 
+    /**
+     * 获取配置时间
+     * @return 配置时间
+     */
+    @GetMapping("/timeQuery")
+    public PmTimeConf timeQuery() {
+        Integer tenantId = SecurityUtils.getTenantId();
+        return pmTimeConfService.getTimeConf(tenantId);
+    }
+
 }
 

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

@@ -27,8 +27,19 @@ 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);
+
+    /**
+     * 获取提交时间
+     * @return
+     */
+    public PmTimeConf getTimeConf(Integer tenantId);
 }

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);
         }
@@ -286,10 +304,10 @@ public class PmTimeConfServiceImpl extends AbstractCrudService<PmTimeConfMapper,
     }
 
     // 获取报告时间配置
-    private PmTimeConf getTimeConf(Integer tenantId) {
+    @Override
+    public PmTimeConf getTimeConf(Integer tenantId) {
         LambdaQueryWrapper<PmTimeConf> timeConfQuery = new LambdaQueryWrapper<>();
-        timeConfQuery.select(PmTimeConf::getStartTime, PmTimeConf::getOnTime, PmTimeConf::getEndTime)
-                .eq(PmTimeConf::getTenantId, tenantId)
+        timeConfQuery.eq(PmTimeConf::getTenantId, tenantId)
                 .eq(PmTimeConf::getConfType, "PM");
         return pmTimeConfMapper.selectOne(timeConfQuery);
     }