执法端-计划

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpPlan.java

@@ -45,14 +45,14 @@ public class EfcodeCpPlan extends BaseEntity {
     private Long planTime;
 
     /**
-     * 经过预约后最终的计划执行日期（如 2025-05-08）
+     * 原始日期
      */
-    private Date planActualDate;
+    private Date planSourceDate;
 
     /**
-     * 经过预约后最终的执行时段:1=上午,2=下午,3=其他
+     * 原始执行时段:1=上午,2=下午,3=其他
      */
-    private Long planActualTime;
+    private Long planSourceTime;
 
     /**
      * 执法事项（最多1000字）

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpReserve.java

@@ -64,6 +64,16 @@ public class EfcodeCpReserve extends BaseEntity {
      */
     private String opMessage;
 
+    /**
+     * 警告的消息
+     */
+    private String warringMessage;
+
+    /**
+     * 警告的消息是否被确认:1=已确认,0=未确认
+     */
+    private Integer warringIsPass;
+
     /**
      * 联合时用户选择的操作时间
      */

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpPlanBo.java

@@ -47,16 +47,14 @@ public class EfcodeCpPlanBo extends BaseEntity {
     private Long planTime;
 
     /**
-     * 经过预约后最终的计划执行日期（如 2025-05-08）
+     * 原始日期
      */
-    @NotNull(message = "经过预约后最终的计划执行日期（如 2025-05-08）不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Date planActualDate;
+    private Date planSourceDate;
 
     /**
-     * 经过预约后最终的执行时段:1=上午,2=下午,3=其他
+     * 原始执行时段:1=上午,2=下午,3=其他
      */
-    @NotNull(message = "经过预约后最终的执行时段:1=上午,2=下午,3=其他不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long planActualTime;
+    private Long planSourceTime;
 
     /**
      * 执法事项（最多1000字）

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpReserveBo.java

@@ -70,6 +70,16 @@ public class EfcodeCpReserveBo extends BaseEntity {
     @NotBlank(message = "联合时用户输入的操作消息不能为空", groups = { AddGroup.class, EditGroup.class })
     private String opMessage;
 
+    /**
+     * 警告的消息
+     */
+    private String warringMessage;
+
+    /**
+     * 警告的消息是否被确认:1=已确认,0=未确认
+     */
+    private Integer warringIsPass;
+
     /**
      * 联合时用户选择的操作时间
      */

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpPlanVo.java

@@ -56,17 +56,16 @@ public class EfcodeCpPlanVo implements Serializable {
     private Long planTime;
 
     /**
-     * 经过预约后最终的计划执行日期（如 2025-05-08）
+     * 原始日期
      */
-    @ExcelProperty(value = "经过预约后最终的计划执行日期", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "如=,2=025-05-08")
-    private Date planActualDate;
+    @ExcelProperty(value = "原始日期")
+    private Date planSourceDate;
 
     /**
-     * 经过预约后最终的执行时段:1=上午,2=下午,3=其他
+     * 原始执行时段:1=上午,2=下午,3=其他
      */
-    @ExcelProperty(value = "经过预约后最终的执行时段:1=上午,2=下午,3=其他")
-    private Long planActualTime;
+    @ExcelProperty(value = "原始执行时段:1=上午,2=下午,3=其他")
+    private Long planSourceTime;
 
     /**
      * 执法事项（最多1000字）

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpReserveVo.java

@@ -78,6 +78,16 @@ public class EfcodeCpReserveVo implements Serializable {
     @ExcelProperty(value = "联合时用户输入的操作消息")
     private String opMessage;
 
+    /**
+     * 警告的消息
+     */
+    private String warringMessage;
+
+    /**
+     * 警告的消息是否被确认:1=已确认,0=未确认
+     */
+    private Integer warringIsPass;
+
     /**
      * 联合时用户选择的操作时间
      */

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpTaskVo.java

@@ -67,18 +67,6 @@ public class EfcodeCpTaskVo implements Serializable {
     @com.baomidou.mybatisplus.annotation.TableField(exist = false)
     private Long planTime;
 
-    /**
-     * 经过预约后最终的计划执行日期
-     */
-    @com.baomidou.mybatisplus.annotation.TableField(exist = false)
-    private Date planActualDate;
-
-    /**
-     * 经过预约后最终的执行时段:1=上午,2=下午,3=其他
-     */
-    @com.baomidou.mybatisplus.annotation.TableField(exist = false)
-    private Long planActualTime;
-
     /**
      * 执法事项
      */

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpPlanServiceImpl.java

@@ -284,8 +284,6 @@ public class EfcodeCpPlanServiceImpl implements IEfcodeCpPlanService {
         lqw.eq(bo.getPlanType() != null, EfcodeCpPlan::getPlanType, bo.getPlanType());
         lqw.eq(bo.getPlanDate() != null, EfcodeCpPlan::getPlanDate, bo.getPlanDate());
         lqw.eq(bo.getPlanTime() != null, EfcodeCpPlan::getPlanTime, bo.getPlanTime());
-        lqw.eq(bo.getPlanActualDate() != null, EfcodeCpPlan::getPlanActualDate, bo.getPlanActualDate());
-        lqw.eq(bo.getPlanActualTime() != null, EfcodeCpPlan::getPlanActualTime, bo.getPlanActualTime());
         lqw.like(StringUtils.isNotBlank(bo.getEnforceContent()), EfcodeCpPlan::getEnforceContent, bo.getEnforceContent());
         lqw.like(StringUtils.isNotBlank(bo.getEnterpriseName()), EfcodeCpPlan::getEnterpriseName, bo.getEnterpriseName());
         lqw.eq(StringUtils.isNotBlank(bo.getEnterpriseNumber()), EfcodeCpPlan::getEnterpriseNumber, bo.getEnterpriseNumber());

zdxt-web-server/zdxt-admin-web-server/src/test/java/com/zdxt/rest/test/cp/AppEnfCpPlanControllerTest.java

@@ -279,8 +279,6 @@ public class AppEnfCpPlanControllerTest {
         bo.put("planType", 1L);          // 日常计划
         bo.put("planDate", planDate);
         bo.put("planTime", planTime);
-        bo.put("planActualDate", planDate);
-        bo.put("planActualTime", planTime);
         bo.put("enforceContent", "批量测试执法事项-第" + (index + 1) + "条");
         bo.put("enterpriseName", enterprise.getEnterpriseName());
         bo.put("enterpriseNumber", enterprise.getEnterpriseNumber());