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

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 
 /**
  * <p>
@@ -38,8 +40,14 @@ public class PmTimeConfController {
      */
     @GetMapping("/submitCount")
     public PmSubmitCountResponseVO submitCount(@RequestParam(value = "submitDate", required = false) String submitDate) {
-        if (submitDate == null || submitDate.isEmpty()) {
-            submitDate = LocalDate.now().toString();
+        if (submitDate == null) {
+            LocalDateTime now = LocalDateTime.now();
+            LocalDateTime today1800 = LocalDateTime.of(now.toLocalDate(), LocalTime.of(18, 0));
+            if (now.isBefore(today1800)) {
+                submitDate = now.toLocalDate().minusDays(1).toString();
+            } else {
+                submitDate = now.toLocalDate().toString();
+            }
         }
         return pmTimeConfService.submitCount(submitDate);
     }

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

@@ -6,6 +6,9 @@ import com.usky.common.mybatis.core.CrudService;
 import com.usky.iot.domain.PmWorkReport;
 import com.usky.iot.service.vo.PmSubmitCountResponseVO;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 工作报告提交时间配置表 服务类