修改 槽液任务。

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java

@@ -286,10 +286,14 @@ public class CycleTestTask extends BaseEntity {
      */
     @Schema(description = "[周期试验]id")
     private Long cycleTestId;
+    /**
+     * 临期标记
+     */
     @Schema(description = "临期标记")
-	@TableField("FLAG_APPROACH")
     private Integer flagApproach;
+    /**
+     * 超期标记
+     */
     @Schema(description = "超期标记")
-	@TableField("FLAG_OUT")
     private Integer flagOut;
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java

@@ -239,6 +239,14 @@ public class LiquidTankTask extends BaseEntity {
      * 复检填报时间
      */
     public static final String COL_REPEAT_FILL_DATE = "REPEAT_FILL_DATE";
+    /**
+     * 临期标记
+     */
+    public static final String COL_FLAG_APPROACH = "FLAG_APPROACH";
+    /**
+     * 超期标记
+     */
+    public static final String COL_FLAG_OUT = "FLAG_OUT";
 
     /**
      * [槽液检测任务]编码
@@ -505,4 +513,14 @@ public class LiquidTankTask extends BaseEntity {
      */
     @Schema(description = "复检填报时间")
     private LocalDateTime repeatFillDate;
+    /**
+     * 临期标记
+     */
+    @Schema(description = "临期标记")
+    private Integer flagApproach;
+    /**
+     * 超期标记
+     */
+    @Schema(description = "超期标记")
+    private Integer flagOut;
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskCopy.java

@@ -228,6 +228,26 @@ public class LiquidTankTaskCopy extends BaseEntity {
 	 * 备注
 	 */
     public static final String COL_REMARK = "REMARK";
+    /**
+     * 撤回原因
+     */
+    public static final String COL_REVOKE_REASON = "REVOKE_REASON";
+    /**
+     * 首次填报时间
+     */
+    public static final String COL_FIRST_FILL_DATE = "FIRST_FILL_DATE";
+    /**
+     * 复检填报时间
+     */
+    public static final String COL_REPEAT_FILL_DATE = "REPEAT_FILL_DATE";
+    /**
+     * 临期标记
+     */
+    public static final String COL_FLAG_APPROACH = "FLAG_APPROACH";
+    /**
+     * 超期标记
+     */
+    public static final String COL_FLAG_OUT = "FLAG_OUT";
 
 	/**
 	 * [槽液检测任务]编码
@@ -479,4 +499,29 @@ public class LiquidTankTaskCopy extends BaseEntity {
 	 */
 	@Schema(description = "备注")
 	private String remark;
+    /**
+     * 撤回原因
+     */
+    @Schema(description = "撤回原因")
+    private String revokeReason;
+    /**
+     * 首次填报时间
+     */
+    @Schema(description = "首次填报时间")
+    private LocalDateTime firstFillDate;
+    /**
+     * 复检填报时间
+     */
+    @Schema(description = "复检填报时间")
+    private LocalDateTime repeatFillDate;
+    /**
+     * 临期标记
+     */
+    @Schema(description = "临期标记")
+    private Integer flagApproach;
+    /**
+     * 超期标记
+     */
+    @Schema(description = "超期标记")
+    private Integer flagOut;
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/CycleTestTaskMapper.xml

@@ -34,6 +34,8 @@
         <result column="FINISH_DATE" property="finishDate"/>
         <result column="REASON_FOR_NO" property="reasonForNo"/>
         <result column="CYCLE_TEST_ID" property="cycleTestId"/>
+        <result column="FLAG_APPROACH" property="flagApproach"/>
+        <result column="FLAG_OUT" property="flagOut"/>
     </resultMap>
 
     <select id="selectCycleTestTaskPage" resultMap="cycleTestTaskResultMap">

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskCopyMapper.xml

@@ -56,6 +56,11 @@
         <result column="REVIEW_OPINION" property="reviewOpinion"/>
         <result column="REVIEW_PASS" property="reviewPass"/>
         <result column="REMARK" property="remark"/>
+        <result column="REVOKE_REASON" property="revokeReason"/>
+        <result column="FIRST_FILL_DATE" property="firstFillDate"/>
+        <result column="REPEAT_FILL_DATE" property="repeatFillDate"/>
+        <result column="FLAG_APPROACH" property="flagApproach"/>
+        <result column="FLAG_OUT" property="flagOut"/>
     </resultMap>
 
     <select id="selectLiquidTankTaskCopyPage" resultMap="liquidTankTaskCopyResultMap">

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.xml

@@ -59,6 +59,8 @@
         <result column="REVOKE_REASON" property="revokeReason"/>
         <result column="FIRST_FILL_DATE" property="firstFillDate"/>
         <result column="REPEAT_FILL_DATE" property="repeatFillDate"/>
+        <result column="FLAG_APPROACH" property="flagApproach"/>
+        <result column="FLAG_OUT" property="flagOut"/>
     </resultMap>
 
     <select id="selectLiquidTankTaskPage" resultMap="liquidTankTaskResultMap">