优化厂站消防数据更新接口，修改综合报告查看接口

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/java/com/yeejoin/amos/boot/module/tdc/api/enums/ReportStateEnum.java

+package com.yeejoin.amos.boot.module.tdc.api.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum ReportStateEnum {
+    WAIT_FILL_IN("0", "待填报", "waitFillIn"),
+    WAIT_HANDLE("1", "待处理", "waitHandle"),
+    HANDLED("2", "已处理", "handled"),
+    MY_CREATE("3", "我发起", "myCreate"),
+    IN_PROGRESS("4", "进行中", "inProgress");
+
+    private String status;
+    private String state;
+    private String IState;
+
+    ReportStateEnum(String status, String state, String IState) {
+        this.status = status;
+        this.state = state;
+        this.IState = IState;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getIState() {
+        return IState;
+    }
+
+    public void setIState(String IState) {
+        this.IState = IState;
+    }
+
+    public static final Map<String, String> map = new HashMap<>();
+
+
+    public static String getStateValue(String status){
+        return map.get(status);
+    }
+
+    static {
+        for(ReportStateEnum reportStateEnum: ReportStateEnum.values()){
+            map.put(reportStateEnum.getStatus(),reportStateEnum.getState());
+        }
+    }
+}

amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/java/com/yeejoin/amos/boot/module/tdc/biz/service/impl/CheckReportImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import com.yeejoin.amos.boot.module.tdc.api.entity.CheckReport;
+import com.yeejoin.amos.boot.module.tdc.api.enums.ReportStateEnum;
 import com.yeejoin.amos.boot.module.tdc.api.feign.IdxFeignService;
 import com.yeejoin.amos.boot.module.tdc.api.mapper.CheckReportMapper;
 import com.yeejoin.amos.boot.module.tdc.api.service.CheckReportService;
@@ -32,10 +33,13 @@ public class CheckReportImpl extends ServiceImpl<CheckReportMapper, CheckReport>
     public IPage<CheckReport> selectAll(int current,int size,String amosOrgCode) {
         Page<CheckReport> page = new Page<>(current,size);
 
+        LambdaQueryWrapper<CheckReport> wrapper = new LambdaQueryWrapper<>();
+        wrapper.orderByDesc(CheckReport::getCreateDate);
+
         if(ValidationUtil.isEmpty(amosOrgCode)){
-            return this.page(page);
+
+            return this.page(page,wrapper);
         }else{
-            LambdaQueryWrapper<CheckReport> wrapper = new LambdaQueryWrapper<>();
             wrapper.likeRight(CheckReport::getAmosOrgCode, amosOrgCode);
             return this.page(page,wrapper);
         }
@@ -49,22 +53,8 @@ public class CheckReportImpl extends ServiceImpl<CheckReportMapper, CheckReport>
         for(int i = 0 ; i<jsonArray.size(); i++){
             JSONObject jsonObject = jsonArray.getJSONObject(i);
             String status = jsonObject.getString("status");
-            if("0".equals(status)){
-                jsonObject.put("state","待填报");
-            }
-            if("1".equals(status)){
-                jsonObject.put("state","待处理");
-            }
-            if("2".equals(status)){
-                jsonObject.put("state","已处理");
-            }
-            if("3".equals(status)){
-                jsonObject.put("state","我发起");
-            }
-            if("4".equals(status)){
-                jsonObject.put("state","进行中");
-            }
-        }
+            jsonObject.put("state",ReportStateEnum.map.get(status));
+
         map.put("current",object.getString("pageNumber"));
         map.put("records",jsonArray);
         map.put("total",object.getString("total"));