作业方案在审批过程中丢失bug解决

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/model/domain/THazardWorkPlan.java

@@ -3,6 +3,7 @@ package com.testor.module.hazard.model.domain;
 import java.time.LocalDateTime;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.testor.common.annotation.Translation;
 import com.testor.common.constant.TransConstant;
@@ -16,9 +17,6 @@ import lombok.experimental.Accessors;
 import lombok.experimental.SuperBuilder;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.tongtech.tfw.backend.common.models.supers.SuperModel;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -245,7 +243,7 @@ public class THazardWorkPlan extends SuperModel
  */
   @ApiModelProperty(value = "作业方案（含应急方案）")
 
-  @TableField("work_plan_file")
+  @TableField(value ="work_plan_file", updateStrategy = FieldStrategy.NOT_NULL)
   private String workPlanFile;
 /**
  * 计划关闭后作业现场负责人签字

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/service/impl/THazardWorkPlanServiceImpl.java

@@ -2492,7 +2492,12 @@ public class THazardWorkPlanServiceImpl extends SuperServiceImpl<THazardWorkPlan
         tHazardWorkPlan.setId(completeTask.getBizId());
         tHazardWorkPlan.setWorkStatus(WorkPlanStatusEnum.DRAFT.getValue());
         tHazardWorkPlan.setRevokeOpinion(opinion);
+        log.info("[WORK_PLAN_FILE_TRACE] revokeProcess - Before update, planId={}, workPlanFile={}",
+            tHazardWorkPlan.getId(), tHazardWorkPlan.getWorkPlanFile());
+        // 防止意外更新 work_plan_file
+        tHazardWorkPlan.setWorkPlanFile(null);
         this.updateById(tHazardWorkPlan);
+        log.info("[WORK_PLAN_FILE_TRACE] revokeProcess - After update, planId={}", tHazardWorkPlan.getId());
     }
 
     @Override

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/task/LicenseCheckUsersListener.java

@@ -38,7 +38,9 @@ public class LicenseCheckUsersListener implements TaskListener {
                 } else {
                     tHazardWorkPlan.setLicenseCheckUser(submitter);
                 }
+                System.out.println("[WORK_PLAN_FILE_TRACE] LicenseCheckUsersListener - Before update, planId=" + bizId + ", workPlanFile=" + tHazardWorkPlan.getWorkPlanFile());
                 tHazardWorkPlanService.updateById(tHazardWorkPlan);
+                System.out.println("[WORK_PLAN_FILE_TRACE] LicenseCheckUsersListener - After update, planId=" + bizId);
             }
         }