1.修改inspectorderdot包装类，保证step 字段数据返回

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/biz/InspectOrderBiz.java

@@ -187,7 +187,7 @@ public class InspectOrderBiz {
                 else
                     wrapper = ResponseWrapper.error("评审失败");
             } catch (Exception e) {
-                wrapper = ResponseWrapper.error("评审失败,数据异常",JSON.toJSONString(e.getStackTrace()));
+                wrapper = ResponseWrapper.error("评审失败,数据异常", JSON.toJSONString(e.getStackTrace()));
             } finally {
                 return wrapper;
             }
@@ -198,21 +198,22 @@ public class InspectOrderBiz {
                 wrapper = ResponseWrapper.error("找不到对应的巡检单");
             } else {
                 //计划环节
-                if (dto.getCreatePlanTime() != null) {
+                if (order.getCreatePlanTime() == null && order.getInspectTime() == null) {
                     order.setCreatePlanUser(user)
-                            .setCreatePlanTime(dto.getCreatePlanTime())
+                            .setCreatePlanTime(dto.getCreatePlanTime() == null ? new Date() : dto.getCreatePlanTime())
                             .setPlanStartTime(dto.getPlanStartTime())
                             .setPlanEndTime(dto.getPlanEndTime());
                 }
                 //巡检环节
-                if (dto.getInspectTime() != null) {
+                else if (order.getInspectTime() == null && order.getCreatePlanTime() != null) {
                     order.setInspectUser(user)
-                            .setInspectTime(dto.getInspectTime())
+                            .setInspectTime(dto.getInspectTime() == null ? new Date() : dto.getInspectTime())
                             .setInspectView(dto.getInspectView())
                             .setAccordreport(dto.isAccordreport())
                             .setClosed(dto.isClosed());
+                } else {
+                    return ResponseWrapper.error("系统异常，请联系管理员");
                 }
-
                 boolean b = inspectOrderService.updateById(order);
                 if (b)
                     wrapper = ResponseWrapper.success("更新成功");
@@ -361,7 +362,7 @@ public class InspectOrderBiz {
             wrapper.gt("VERIFYTIME", startTime);
         if (endTime != null)
             wrapper.lt("VERIFYTIME", endTime);
-        wrapper.eq("VERIFYRESULT",true);
+        wrapper.eq("VERIFYRESULT", true);
 
         List<InspectOrder> list = inspectOrderService.list(wrapper);
         List<InspectOrderDto> orderDtoList = packInspectOrderInspectOrderDto(list);

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/controller/InspectOrderController.java

@@ -2,7 +2,6 @@ package com.gyee.wisdom.alarm.sharding.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.wisdom.alarm.sharding.biz.InspectOrderBiz;
-import com.gyee.wisdom.alarm.sharding.entity.Alertrule2;
 import com.gyee.wisdom.alarm.sharding.model.InspectOrderDto;
 import com.gyee.wisdom.alarm.sharding.util.ResponseWrapper;
 import com.gyee.wisdom.alarm.sharding.util.TokenUtil;
@@ -11,7 +10,6 @@ import io.jsonwebtoken.Claims;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/entity/InspectOrder.java

@@ -3,7 +3,10 @@ package com.gyee.wisdom.alarm.sharding.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AccessLevel;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
@@ -74,12 +77,17 @@ public class InspectOrder implements Serializable {
     private EarlyReportWindturbine earlyReportWindturbine;
 
     @TableField(exist = false)
+    @Getter(AccessLevel.NONE)
+    @Setter(AccessLevel.NONE)
     private String step;
 
     @TableField(exist = false)
     private int stepMark;
 
-    private String getStep() {
+    public void setStep(String step) {
+        this.step = step;
+    }
+    public String getStep() {
         //节点 1-待审核，2-已审核，3-未计划，4-已计划，5-未巡检，6-已巡检
         String result = "";
         if (inspectTime != null && createPlanTime != null && verifyTime != null) {

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/model/InspectOrderDto.java

@@ -5,7 +5,11 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.gyee.wisdom.alarm.sharding.entity.EarlyReport;
 import com.gyee.wisdom.alarm.sharding.entity.EarlyReportAlarm;
 import com.gyee.wisdom.alarm.sharding.entity.EarlyReportWindturbine;
+import com.gyee.wisdom.alarm.sharding.entity.InspectOrder;
+import lombok.AccessLevel;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
@@ -59,31 +63,34 @@ public class InspectOrderDto implements Serializable {
 
     private EarlyReportWindturbine earlyReportWindturbine;
 
-    private String step;
 
-    private String getStep() {
-        String result = "";
+    @Getter(AccessLevel.NONE)
+    @Setter(AccessLevel.NONE)
+    private String step;
 
-        if(earlyReport){
-            result="待审核";
-        }else{
+    public InspectOrderDto setStep(String step) {
+        this.step = step;
+        return this;
+    }
+    public String getStep() {
+        if (earlyReport) {
+            step = "待审核";
+        } else {
             if (inspectTime != null && createPlanTime != null && verifyTime != null) {
-                result = "已巡检";
+                step = "已巡检";
             } else if (inspectTime == null && createPlanTime != null && verifyTime != null) {
-                result = "待巡检";
+                step = "待巡检";
 
             } else if (inspectTime == null && createPlanTime == null && verifyTime != null && verifyResult == true) {
-                result = "未计划";
+                step = "未计划";
             } else if (inspectTime == null && createPlanTime == null && verifyTime != null && verifyResult == false) {
-                result="审核不通过";
-            }else{
+                step = "审核不通过";
+            } else {
                 return "";
             }
         }
-
         return step;
     }
 
 
-
 }