预警过的放后面

src/main/java/com/biutag/supervision/constants/enums/WarningStateEnum.java

@@ -0,0 +1,32 @@
+package com.biutag.supervision.constants.enums;
+
+import java.util.Set;
+
+/**
+ * @ClassName WarningStateEnum
+ * @Description 预警监督状态
+ * @Author shihao
+ * @Date 2025/12/22 19:05
+ */
+public enum WarningStateEnum {
+    WYJ("0", "未预警"),
+    YWJ("1", "已预警");
+    private final String code;
+    private final String desc;
+
+    WarningStateEnum(String code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+
+
+}

src/main/java/com/biutag/supervision/controller/warning/WarningController.java

@@ -29,10 +29,12 @@ import com.biutag.supervision.service.SupDepartService;
 import com.biutag.supervision.service.Warning.WarningContentService;
 import com.biutag.supervision.service.Warning.WarningRecordService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -80,6 +82,7 @@ public class WarningController {
                 if(CollectionUtil.isNotEmpty(queryParam.getEndDate())){
                     wrapper.between(CollectionUtil.isNotEmpty(queryParam.getEndDate()),"p.archiving",queryParam.getEndDate().get(0),queryParam.getEndDate().get(1));
                 }
+                wrapper.orderByAsc("p.warning_state");
                 wrapper.groupBy("p.id");
         Page<EntryWindowVo> page= reportProjectService.getPageWarning(new Page<>(queryParam.getCurrent(),queryParam.getSize()),wrapper,queryParam.getWarningState());
         List<EntryWindowVo> entryWindowVos = page.getRecords();
@@ -99,6 +102,7 @@ public class WarningController {
                 s.setWarningContent(counts);
             }
         });
+        entryWindowVos.sort(Comparator.comparingInt(e -> Integer.parseInt(e.getStateData())));
         page.setRecords(entryWindowVos);
         return Result.success(page);
 
@@ -155,6 +159,7 @@ public class WarningController {
 
     //保存或者修改 预警督察详情
     @PostMapping("/addOrUpData")
+    @Transactional
     public Result addOrUpData(@RequestBody WaringVo vo){
         vo.getRecord().setReportId(vo.getReportProject().getId());
         UserAuth user = UserContextHolder.getCurrentUser();

src/main/java/com/biutag/supervision/pojo/entity/report/ReportProject.java

@@ -155,6 +155,10 @@ public class ReportProject {
     @TableField("archiving_reduce_money")
     private BigDecimal archivingReduceMoney;
 
+    /**
+     * @see com.biutag.supervision.constants.enums.WarningStateEnum
+     */
+    @Schema(description = "预警状态")
     @TableField("warning_state")
     private String warningState;
     //是否退窗