报表

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/safetyInspect/controller/SafetyInspectReportController.java

@@ -62,9 +62,14 @@ public class SafetyInspectReportController {
     public AjaxResult selfInspectList(SafetyInspectDTO safetyInspectDTO) {
         AjaxResult ajax = AjaxResult.success();
      if (null== safetyInspectDTO.getYear()){
-         safetyInspectDTO.setCycle(1);
-         LocalDate localDate= LocalDate.now();
-         safetyInspectDTO.setYear(localDate.getYear()+"-"+  localDate.getMonthValue());
+         if (safetyInspectDTO==null||safetyInspectDTO.getCycle()==1){
+             safetyInspectDTO.setCycle(1);
+             LocalDate localDate= LocalDate.now();
+             safetyInspectDTO.setYear(localDate.getYear()+"-"+  localDate.getMonthValue());
+         }else {
+             LocalDate localDate= LocalDate.now();
+             safetyInspectDTO.setYear(localDate.getYear()+"");
+         }
      }
         List<SelfInspectVO> report = safetyInspectService.selfInspectReport(safetyInspectDTO);
         ajax.put(AjaxResult.DATA_TAG, report);

soc-modules/soc-modules-gen/src/main/resources/bootstrap.yml

@@ -13,11 +13,11 @@ spring:
   cloud:
     nacos:
       discovery:
-        namespace: 34306a91-1bb7-45ce-b80d-4092dd08ea64
+        namespace: 13d6af5d-c288-40d6-b1ee-4fc370665aba
         # 服务注册地址
         server-addr: 10.87.10.54:8848
       config:
-        namespace: 34306a91-1bb7-45ce-b80d-4092dd08ea64
+        namespace: 13d6af5d-c288-40d6-b1ee-4fc370665aba
         # 配置中心地址
         server-addr: 10.87.10.54:8848
         # 配置文件格式