diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpPlan.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpPlan.java index de23dfd0..0b854f60 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpPlan.java +++ b/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字） diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpReserve.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpReserve.java index 93acbec0..03b2ba7b 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpReserve.java +++ b/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; + /** * 联合时用户选择的操作时间 */ diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpPlanBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpPlanBo.java index 3e5a5abc..c9e59229 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpPlanBo.java +++ b/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字） diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpReserveBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpReserveBo.java index e33fa80a..45261697 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpReserveBo.java +++ b/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; + /** * 联合时用户选择的操作时间 */ diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpPlanVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpPlanVo.java index 3d5f637f..ea47e041 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpPlanVo.java +++ b/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字） diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpReserveVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpReserveVo.java index 285b3989..0806174a 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpReserveVo.java +++ b/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; + /** * 联合时用户选择的操作时间 */ diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpTaskVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpTaskVo.java index 7d5d8007..d2841009 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpTaskVo.java +++ b/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; - /** * 执法事项 */ diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpPlanServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpPlanServiceImpl.java index 4c7f186c..c836146e 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpPlanServiceImpl.java +++ b/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()); diff --git a/zdxt-web-server/zdxt-admin-web-server/src/test/java/com/zdxt/rest/test/cp/AppEnfCpPlanControllerTest.java b/zdxt-web-server/zdxt-admin-web-server/src/test/java/com/zdxt/rest/test/cp/AppEnfCpPlanControllerTest.java index 5645de35..f5978294 100644 --- a/zdxt-web-server/zdxt-admin-web-server/src/test/java/com/zdxt/rest/test/cp/AppEnfCpPlanControllerTest.java +++ b/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());