diff --git a/.gitignore b/.gitignore index 653f7609..9aeacc47 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ node_modules /dist/ /third-party-soft-test/ .plan +.htmlpage diff --git a/script/sql/zfjd-refactoring-v1/013-计划任务表设计.sql b/script/sql/zfjd-refactoring-v1/013-计划任务表设计.sql index 71806b40..95621ee9 100644 --- a/script/sql/zfjd-refactoring-v1/013-计划任务表设计.sql +++ b/script/sql/zfjd-refactoring-v1/013-计划任务表设计.sql @@ -2,8 +2,13 @@ CREATE TABLE `efcode_cp_plan` ( `id` varchar(50) NOT NULL COMMENT '主键ID' primary key, `plan_type` tinyint NOT NULL COMMENT '计划类别:1=日常计划,2=专项计划', + `plan_date` datetime NOT NULL COMMENT '计划执行日期（如 2025-05-08）', `plan_time` tinyint NOT NULL COMMENT '执行时段:1=上午,2=下午,3=其他', + + `plan_actual_date` datetime NOT NULL COMMENT '经过预约后最终的计划执行日期（如 2025-05-08）', + `plan_actual_time` tinyint NOT NULL COMMENT '经过预约后最终的执行时段:1=上午,2=下午,3=其他', + `enforce_content` varchar(1000) NOT NULL COMMENT '执法事项（最多1000字）', `enterprise_name` varchar(200) NOT NULL COMMENT '被检查企业/机构名称', @@ -69,17 +74,23 @@ CREATE TABLE `efcode_cp_plan_users` CREATE TABLE `efcode_cp_reserve` ( - `id` varchar(50) NOT NULL COMMENT '主键ID' primary key, - `plan_id` varchar(50) NOT NULL COMMENT '计划ID', - `reserve_time` datetime NOT NULL COMMENT '预约时间', - `op_status` tinyint NOT NULL COMMENT '操作状态' DEFAULT 3 COMMENT '操作状态:1=同意,2=拒绝,3=待确认', - `from` tinyint NOT NULL COMMENT '来自' COMMENT '来自:系统匹配=1,手动匹配=0', + `id` varchar(50) NOT NULL COMMENT '主键ID' primary key, + `plan_id` varchar(50) NOT NULL COMMENT '计划ID', + `reserve_time` datetime NOT NULL COMMENT '预约时间', + + `op_status` tinyint NOT NULL COMMENT '操作状态' DEFAULT 3 COMMENT '操作状态:1=同意,2=拒绝,3=待确认,4=超期取消', + `op_order` int NOT NULL COMMENT '联合时用户的操作顺序', + `op_time` datetime NOT NULL COMMENT '联合时用户的操作时间', + `op_message` varchar(500) NOT NULL COMMENT '联合时用户输入的操作消息', + `op_set_date` datetime NOT NULL COMMENT '联合时用户选择的操作时间', + `op_set_time` tinyint NOT NULL COMMENT '执行时段:1=上午,2=下午,3=其他', + + `from` tinyint NOT NULL COMMENT '来自' COMMENT '来自:系统匹配=1,手动匹配=0', `create_by` varchar(64) DEFAULT '' COMMENT '创建者', `create_dept` varchar(64) DEFAULT NULL COMMENT '创建人部门', `update_by` varchar(64) DEFAULT '' COMMENT '更新者', `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间' - ) comment '行政执法检查计划-预约表' row_format = DYNAMIC; CREATE TABLE `efcode_cp_notice` @@ -120,9 +131,9 @@ CREATE TABLE `efcode_cp_notice` `remark` varchar(500) DEFAULT NULL COMMENT '备注', PRIMARY KEY (`id`), KEY `idx_dept_id` (`dept_id`), - KEY `idx_company_id` (`company_id`), - KEY `idx_credit_code` (`credit_code`) -) comment '行政执法检查计划-预约表' row_format = DYNAMIC; + KEY `idx_enterprise_id` (`enterprise_id`), + KEY `idx_enterprise_number` (`enterprise_number`) +) comment '行政执法检查计划-预告表' row_format = DYNAMIC; CREATE TABLE `efcode_cp_notice_users` ( @@ -135,7 +146,7 @@ CREATE TABLE `efcode_cp_notice_users` `update_by` varchar(64) DEFAULT '' COMMENT '更新者', `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间' -) comment '行政执法检查计划-预约参与人员表' row_format = DYNAMIC; +) comment '行政执法检查计划-预告参与人员表' row_format = DYNAMIC; CREATE TABLE `efcode_cp_notice_message` ( @@ -145,23 +156,32 @@ CREATE TABLE `efcode_cp_notice_message` `user_name` varchar(100) NOT NULL COMMENT '用户名称', `from` tinyint NOT NULL COMMENT '来自' COMMENT '来自:企业=1,执法单位=0', `message` varchar(1000) NOT NULL COMMENT '消息内容', - `create_by` varchar(64) DEFAULT '' COMMENT '创建者', - `create_dept` varchar(64) DEFAULT NULL COMMENT '创建人部门', - `update_by` varchar(64) DEFAULT '' COMMENT '更新者', - `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间' - `is_delete` tinyint NOT NULL DEFAULT 0 COMMENT '是否删除:0=否,1=是', + `create_by` varchar(64) DEFAULT '' COMMENT '创建者', + `create_dept` varchar(64) DEFAULT NULL COMMENT '创建人部门', + `update_by` varchar(64) DEFAULT '' COMMENT '更新者', + `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `is_delete` tinyint NOT NULL DEFAULT 0 COMMENT '是否删除:0=否,1=是' ) comment '行政执法检查计划-预告交流表' row_format = DYNAMIC; CREATE TABLE `efcode_cp_setting` ( - `id` varchar(50) NOT NULL COMMENT '主键ID' primary key, - `setting_name` varchar(100) NOT NULL COMMENT '设置名称', + `id` varchar(50) NOT NULL COMMENT '主键ID' primary key, + `setting_name` varchar(100) NOT NULL COMMENT '设置名称', `setting_value` varchar(100) NOT NULL COMMENT '设置值', - `remark` varchar(500) NOT NULL COMMENT '备注', - `create_by` varchar(64) DEFAULT '' COMMENT '创建者', - `create_dept` varchar(64) DEFAULT NULL COMMENT '创建人部门', - `update_by` varchar(64) DEFAULT '' COMMENT '更新者', - `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间' + `remark` varchar(500) NOT NULL COMMENT '备注', + `create_by` varchar(64) DEFAULT '' COMMENT '创建者', + `create_dept` varchar(64) DEFAULT NULL COMMENT '创建人部门', + `update_by` varchar(64) DEFAULT '' COMMENT '更新者', + `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间' ) comment '行政执法检查计划-设置表' row_format = DYNAMIC; + + +/*初始化数据*/ +INSERT INTO `efcode_cp_setting` (`id`, `setting_name`, `setting_value`, `remark`, `create_by`, `create_dept`) +VALUES ('CP_SETTING_SUBMIT_DEADLINE', '下阶段计划提交最晚时间', '26', '每月几号前需提交下阶段计划<=', 'admin', NULL), + ('CP_SETTING_AUTO_MATCH_START', '系统自动推荐匹配开始时间', '26', '系统自动推荐匹配的开始时间(号)>=', 'admin', + NULL), + ('CP_SETTING_MANUAL_MATCH_DAYS', '手工匹配距计划开始天数', '3', '手工匹配距离计划开始的天数>=', 'admin', NULL), + ('CP_MAX_UNION_UNIT', '单次联合单位最大数量', '3', '单次联合单位最大数量>=2', 'admin', NULL); diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpNotice.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpNotice.java index 8ff9561a..acdf6c3a 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpNotice.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpNotice.java @@ -10,10 +10,10 @@ import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serial; /** - * 行政执法检查计划-预约对象 efcode_cp_notice + * 行政执法检查计划-预告对象 efcode_cp_notice * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpNoticeMessage.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpNoticeMessage.java index 90878b98..ba2afdf6 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpNoticeMessage.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpNoticeMessage.java @@ -11,7 +11,7 @@ import java.io.Serial; * 行政执法检查计划-预告交流对象 efcode_cp_notice_message * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpNoticeUsers.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpNoticeUsers.java index 7fca8f2a..97631d1b 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpNoticeUsers.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpNoticeUsers.java @@ -8,10 +8,10 @@ import lombok.EqualsAndHashCode; import java.io.Serial; /** - * 行政执法检查计划-预约参与人员对象 efcode_cp_notice_users + * 行政执法检查计划-预告参与人员对象 efcode_cp_notice_users * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ @Data @EqualsAndHashCode(callSuper = true) 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 0cead8b1..b9d5cabb 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 @@ -13,7 +13,7 @@ import java.io.Serial; * 行政执法检查计划-计划对象 efcode_cp_plan * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ @Data @EqualsAndHashCode(callSuper = true) @@ -44,6 +44,16 @@ public class EfcodeCpPlan extends BaseEntity { */ private Long planTime; + /** + * 经过预约后最终的计划执行日期（如 2025-05-08） + */ + private Date planActualDate; + + /** + * 经过预约后最终的执行时段:1=上午,2=下午,3=其他 + */ + private Long planActualTime; + /** * 执法事项（最多1000字） */ diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpPlanUsers.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpPlanUsers.java index 2ace1bf8..78527d34 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpPlanUsers.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpPlanUsers.java @@ -11,7 +11,7 @@ import java.io.Serial; * 行政执法检查计划-计划参与人员对象 efcode_cp_plan_users * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ @Data @EqualsAndHashCode(callSuper = true) 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 b71afef5..df34c9db 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 @@ -13,7 +13,7 @@ import java.io.Serial; * 行政执法检查计划-预约对象 efcode_cp_reserve * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ @Data @EqualsAndHashCode(callSuper = true) @@ -40,10 +40,35 @@ public class EfcodeCpReserve extends BaseEntity { private Date reserveTime; /** - * 操作状态:1=同意,2=拒绝,3=待确认 + * 操作状态:1=同意,2=拒绝,3=待确认,4=超期取消 */ private Long opStatus; + /** + * 联合时用户的操作顺序 + */ + private Long opOrder; + + /** + * 联合时用户的操作时间 + */ + private Date opTime; + + /** + * 联合时用户输入的操作消息 + */ + private String opMessage; + + /** + * 联合时用户选择的操作时间 + */ + private Date opSetDate; + + /** + * 执行时段:1=上午,2=下午,3=其他 + */ + private Long opSetTime; + /** * 来自:系统匹配=1,手动匹配=0 */ diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpSetting.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpSetting.java index b7196cfa..64777ef6 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpSetting.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpSetting.java @@ -11,7 +11,7 @@ import java.io.Serial; * 行政执法检查计划-设置对象 efcode_cp_setting * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpTask.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpTask.java index 326d21cf..430d35da 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpTask.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EfcodeCpTask.java @@ -11,7 +11,7 @@ import java.io.Serial; * 行政执法检查计划-任务对象 efcode_cp_task * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpNoticeBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpNoticeBo.java index 7d9f0290..5442ea1d 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpNoticeBo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpNoticeBo.java @@ -12,10 +12,10 @@ import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; /** - * 行政执法检查计划-预约业务对象 efcode_cp_notice + * 行政执法检查计划-预告业务对象 efcode_cp_notice * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpNoticeMessageBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpNoticeMessageBo.java index e943553f..e35261af 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpNoticeMessageBo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpNoticeMessageBo.java @@ -13,7 +13,7 @@ import jakarta.validation.constraints.*; * 行政执法检查计划-预告交流业务对象 efcode_cp_notice_message * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpNoticeUsersBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpNoticeUsersBo.java index 4ee56880..acacd3b1 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpNoticeUsersBo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpNoticeUsersBo.java @@ -10,10 +10,10 @@ import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; /** - * 行政执法检查计划-预约参与人员业务对象 efcode_cp_notice_users + * 行政执法检查计划-预告参与人员业务对象 efcode_cp_notice_users * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ @Data @EqualsAndHashCode(callSuper = true) 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 32cb209d..096676ee 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 @@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; * 行政执法检查计划-计划业务对象 efcode_cp_plan * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ @Data @EqualsAndHashCode(callSuper = true) @@ -46,6 +46,18 @@ public class EfcodeCpPlanBo extends BaseEntity { @NotNull(message = "执行时段:1=上午,2=下午,3=其他不能为空", groups = { AddGroup.class, EditGroup.class }) private Long planTime; + /** + * 经过预约后最终的计划执行日期（如 2025-05-08） + */ + @NotNull(message = "经过预约后最终的计划执行日期（如 2025-05-08）不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date planActualDate; + + /** + * 经过预约后最终的执行时段:1=上午,2=下午,3=其他 + */ + @NotNull(message = "经过预约后最终的执行时段:1=上午,2=下午,3=其他不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long planActualTime; + /** * 执法事项（最多1000字） */ diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpPlanUsersBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpPlanUsersBo.java index c1ed6007..c18dba1f 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpPlanUsersBo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpPlanUsersBo.java @@ -13,7 +13,7 @@ import jakarta.validation.constraints.*; * 行政执法检查计划-计划参与人员业务对象 efcode_cp_plan_users * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ @Data @EqualsAndHashCode(callSuper = true) 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 42058273..ad0360b3 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 @@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; * 行政执法检查计划-预约业务对象 efcode_cp_reserve * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ @Data @EqualsAndHashCode(callSuper = true) @@ -41,11 +41,41 @@ public class EfcodeCpReserveBo extends BaseEntity { private Date reserveTime; /** - * 操作状态:1=同意,2=拒绝,3=待确认 + * 操作状态:1=同意,2=拒绝,3=待确认,4=超期取消 */ - @NotNull(message = "操作状态:1=同意,2=拒绝,3=待确认不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotNull(message = "操作状态:1=同意,2=拒绝,3=待确认,4=超期取消不能为空", groups = { AddGroup.class, EditGroup.class }) private Long opStatus; + /** + * 联合时用户的操作顺序 + */ + @NotNull(message = "联合时用户的操作顺序不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long opOrder; + + /** + * 联合时用户的操作时间 + */ + @NotNull(message = "联合时用户的操作时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date opTime; + + /** + * 联合时用户输入的操作消息 + */ + @NotBlank(message = "联合时用户输入的操作消息不能为空", groups = { AddGroup.class, EditGroup.class }) + private String opMessage; + + /** + * 联合时用户选择的操作时间 + */ + @NotNull(message = "联合时用户选择的操作时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date opSetDate; + + /** + * 执行时段:1=上午,2=下午,3=其他 + */ + @NotNull(message = "执行时段:1=上午,2=下午,3=其他不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long opSetTime; + /** * 来自:系统匹配=1,手动匹配=0 */ diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpSettingBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpSettingBo.java index 9cce0b9c..12fab21a 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpSettingBo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpSettingBo.java @@ -13,7 +13,7 @@ import jakarta.validation.constraints.*; * 行政执法检查计划-设置业务对象 efcode_cp_setting * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpTaskBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpTaskBo.java index 2d87017f..4bb3fb5d 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpTaskBo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpTaskBo.java @@ -13,7 +13,7 @@ import jakarta.validation.constraints.*; * 行政执法检查计划-任务业务对象 efcode_cp_task * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpNoticeMessageVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpNoticeMessageVo.java index f2a1eca7..e913b8a1 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpNoticeMessageVo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpNoticeMessageVo.java @@ -18,7 +18,7 @@ import java.util.Date; * 行政执法检查计划-预告交流视图对象 efcode_cp_notice_message * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ @Data @ExcelIgnoreUnannotated diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpNoticeUsersVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpNoticeUsersVo.java index b6a35893..10853eba 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpNoticeUsersVo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpNoticeUsersVo.java @@ -15,10 +15,10 @@ import java.util.Date; /** - * 行政执法检查计划-预约参与人员视图对象 efcode_cp_notice_users + * 行政执法检查计划-预告参与人员视图对象 efcode_cp_notice_users * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ @Data @ExcelIgnoreUnannotated diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpNoticeVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpNoticeVo.java index 5b85694c..4e9a9b2c 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpNoticeVo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpNoticeVo.java @@ -17,10 +17,10 @@ import java.util.Date; /** - * 行政执法检查计划-预约视图对象 efcode_cp_notice + * 行政执法检查计划-预告视图对象 efcode_cp_notice * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ @Data @ExcelIgnoreUnannotated diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpPlanUsersVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpPlanUsersVo.java index 7b9c59ac..9fd93a7b 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpPlanUsersVo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpPlanUsersVo.java @@ -18,7 +18,7 @@ import java.util.Date; * 行政执法检查计划-计划参与人员视图对象 efcode_cp_plan_users * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ @Data @ExcelIgnoreUnannotated 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 a844e523..cc083b8a 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 @@ -20,7 +20,7 @@ import java.util.Date; * 行政执法检查计划-计划视图对象 efcode_cp_plan * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ @Data @ExcelIgnoreUnannotated @@ -55,6 +55,19 @@ public class EfcodeCpPlanVo implements Serializable { @ExcelProperty(value = "执行时段:1=上午,2=下午,3=其他") private Long planTime; + /** + * 经过预约后最终的计划执行日期（如 2025-05-08） + */ + @ExcelProperty(value = "经过预约后最终的计划执行日期", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "如=,2=025-05-08") + private Date planActualDate; + + /** + * 经过预约后最终的执行时段:1=上午,2=下午,3=其他 + */ + @ExcelProperty(value = "经过预约后最终的执行时段:1=上午,2=下午,3=其他") + private Long planActualTime; + /** * 执法事项（最多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 63f0b07a..f10f29ca 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 @@ -20,7 +20,7 @@ import java.util.Date; * 行政执法检查计划-预约视图对象 efcode_cp_reserve * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ @Data @ExcelIgnoreUnannotated @@ -49,11 +49,41 @@ public class EfcodeCpReserveVo implements Serializable { private Date reserveTime; /** - * 操作状态:1=同意,2=拒绝,3=待确认 + * 操作状态:1=同意,2=拒绝,3=待确认,4=超期取消 */ - @ExcelProperty(value = "操作状态:1=同意,2=拒绝,3=待确认") + @ExcelProperty(value = "操作状态:1=同意,2=拒绝,3=待确认,4=超期取消") private Long opStatus; + /** + * 联合时用户的操作顺序 + */ + @ExcelProperty(value = "联合时用户的操作顺序") + private Long opOrder; + + /** + * 联合时用户的操作时间 + */ + @ExcelProperty(value = "联合时用户的操作时间") + private Date opTime; + + /** + * 联合时用户输入的操作消息 + */ + @ExcelProperty(value = "联合时用户输入的操作消息") + private String opMessage; + + /** + * 联合时用户选择的操作时间 + */ + @ExcelProperty(value = "联合时用户选择的操作时间") + private Date opSetDate; + + /** + * 执行时段:1=上午,2=下午,3=其他 + */ + @ExcelProperty(value = "执行时段:1=上午,2=下午,3=其他") + private Long opSetTime; + /** * 来自:系统匹配=1,手动匹配=0 */ diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpSettingVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpSettingVo.java index da5f930e..5b29cb9d 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpSettingVo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EfcodeCpSettingVo.java @@ -18,7 +18,7 @@ import java.util.Date; * 行政执法检查计划-设置视图对象 efcode_cp_setting * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ @Data @ExcelIgnoreUnannotated 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 bb421c1e..936a26f2 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 @@ -18,7 +18,7 @@ import java.util.Date; * 行政执法检查计划-任务视图对象 efcode_cp_task * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ @Data @ExcelIgnoreUnannotated diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpNoticeMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpNoticeMapper.java index 18088ad5..2d2f9067 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpNoticeMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpNoticeMapper.java @@ -5,10 +5,10 @@ import com.zdxt.enforcementcode.domain.vo.EfcodeCpNoticeVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** - * 行政执法检查计划-预约Mapper接口 + * 行政执法检查计划-预告Mapper接口 * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ public interface EfcodeCpNoticeMapper extends BaseMapperPlus { diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpNoticeMessageMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpNoticeMessageMapper.java index cde534d2..16a69509 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpNoticeMessageMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpNoticeMessageMapper.java @@ -8,7 +8,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * 行政执法检查计划-预告交流Mapper接口 * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ public interface EfcodeCpNoticeMessageMapper extends BaseMapperPlus { diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpNoticeUsersMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpNoticeUsersMapper.java index 26286388..18ce6d47 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpNoticeUsersMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpNoticeUsersMapper.java @@ -5,10 +5,10 @@ import com.zdxt.enforcementcode.domain.vo.EfcodeCpNoticeUsersVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** - * 行政执法检查计划-预约参与人员Mapper接口 + * 行政执法检查计划-预告参与人员Mapper接口 * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ public interface EfcodeCpNoticeUsersMapper extends BaseMapperPlus { diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpPlanMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpPlanMapper.java index b61d44af..4f837703 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpPlanMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpPlanMapper.java @@ -8,7 +8,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * 行政执法检查计划-计划Mapper接口 * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ public interface EfcodeCpPlanMapper extends BaseMapperPlus { diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpPlanUsersMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpPlanUsersMapper.java index f2bb9dda..0b5a1aeb 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpPlanUsersMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpPlanUsersMapper.java @@ -8,7 +8,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * 行政执法检查计划-计划参与人员Mapper接口 * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ public interface EfcodeCpPlanUsersMapper extends BaseMapperPlus { diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpReserveMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpReserveMapper.java index 244f99e8..fd76f785 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpReserveMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpReserveMapper.java @@ -8,7 +8,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * 行政执法检查计划-预约Mapper接口 * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ public interface EfcodeCpReserveMapper extends BaseMapperPlus { diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpSettingMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpSettingMapper.java index 2b06c960..b9e20536 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpSettingMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpSettingMapper.java @@ -8,7 +8,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * 行政执法检查计划-设置Mapper接口 * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ public interface EfcodeCpSettingMapper extends BaseMapperPlus { diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpTaskMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpTaskMapper.java index 0d2a3d1f..bdea1a75 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpTaskMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpTaskMapper.java @@ -8,7 +8,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * 行政执法检查计划-任务Mapper接口 * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ public interface EfcodeCpTaskMapper extends BaseMapperPlus { diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpNoticeMessageService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpNoticeMessageService.java index 8360c13a..5dd5bfe6 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpNoticeMessageService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpNoticeMessageService.java @@ -12,7 +12,7 @@ import java.util.List; * 行政执法检查计划-预告交流Service接口 * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ public interface IEfcodeCpNoticeMessageService { diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpNoticeService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpNoticeService.java index 2ccef57b..013d7ac9 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpNoticeService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpNoticeService.java @@ -9,56 +9,56 @@ import java.util.Collection; import java.util.List; /** - * 行政执法检查计划-预约Service接口 + * 行政执法检查计划-预告Service接口 * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ public interface IEfcodeCpNoticeService { /** - * 查询行政执法检查计划-预约 + * 查询行政执法检查计划-预告 * * @param id 主键 - * @return 行政执法检查计划-预约 + * @return 行政执法检查计划-预告 */ EfcodeCpNoticeVo queryById(String id); /** - * 分页查询行政执法检查计划-预约列表 + * 分页查询行政执法检查计划-预告列表 * * @param bo 查询条件 * @param pageQuery 分页参数 - * @return 行政执法检查计划-预约分页列表 + * @return 行政执法检查计划-预告分页列表 */ TableDataInfo queryPageList(EfcodeCpNoticeBo bo, PageQuery pageQuery); /** - * 查询符合条件的行政执法检查计划-预约列表 + * 查询符合条件的行政执法检查计划-预告列表 * * @param bo 查询条件 - * @return 行政执法检查计划-预约列表 + * @return 行政执法检查计划-预告列表 */ List queryList(EfcodeCpNoticeBo bo); /** - * 新增行政执法检查计划-预约 + * 新增行政执法检查计划-预告 * - * @param bo 行政执法检查计划-预约 + * @param bo 行政执法检查计划-预告 * @return 是否新增成功 */ Boolean insertByBo(EfcodeCpNoticeBo bo); /** - * 修改行政执法检查计划-预约 + * 修改行政执法检查计划-预告 * - * @param bo 行政执法检查计划-预约 + * @param bo 行政执法检查计划-预告 * @return 是否修改成功 */ Boolean updateByBo(EfcodeCpNoticeBo bo); /** - * 校验并批量删除行政执法检查计划-预约信息 + * 校验并批量删除行政执法检查计划-预告信息 * * @param ids 待删除的主键集合 * @param isValid 是否进行有效性校验 diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpNoticeUsersService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpNoticeUsersService.java index 0f40891a..f14f918d 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpNoticeUsersService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpNoticeUsersService.java @@ -9,56 +9,56 @@ import java.util.Collection; import java.util.List; /** - * 行政执法检查计划-预约参与人员Service接口 + * 行政执法检查计划-预告参与人员Service接口 * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ public interface IEfcodeCpNoticeUsersService { /** - * 查询行政执法检查计划-预约参与人员 + * 查询行政执法检查计划-预告参与人员 * * @param id 主键 - * @return 行政执法检查计划-预约参与人员 + * @return 行政执法检查计划-预告参与人员 */ EfcodeCpNoticeUsersVo queryById(String id); /** - * 分页查询行政执法检查计划-预约参与人员列表 + * 分页查询行政执法检查计划-预告参与人员列表 * * @param bo 查询条件 * @param pageQuery 分页参数 - * @return 行政执法检查计划-预约参与人员分页列表 + * @return 行政执法检查计划-预告参与人员分页列表 */ TableDataInfo queryPageList(EfcodeCpNoticeUsersBo bo, PageQuery pageQuery); /** - * 查询符合条件的行政执法检查计划-预约参与人员列表 + * 查询符合条件的行政执法检查计划-预告参与人员列表 * * @param bo 查询条件 - * @return 行政执法检查计划-预约参与人员列表 + * @return 行政执法检查计划-预告参与人员列表 */ List queryList(EfcodeCpNoticeUsersBo bo); /** - * 新增行政执法检查计划-预约参与人员 + * 新增行政执法检查计划-预告参与人员 * - * @param bo 行政执法检查计划-预约参与人员 + * @param bo 行政执法检查计划-预告参与人员 * @return 是否新增成功 */ Boolean insertByBo(EfcodeCpNoticeUsersBo bo); /** - * 修改行政执法检查计划-预约参与人员 + * 修改行政执法检查计划-预告参与人员 * - * @param bo 行政执法检查计划-预约参与人员 + * @param bo 行政执法检查计划-预告参与人员 * @return 是否修改成功 */ Boolean updateByBo(EfcodeCpNoticeUsersBo bo); /** - * 校验并批量删除行政执法检查计划-预约参与人员信息 + * 校验并批量删除行政执法检查计划-预告参与人员信息 * * @param ids 待删除的主键集合 * @param isValid 是否进行有效性校验 diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpPlanService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpPlanService.java index d5d9a841..7e974da1 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpPlanService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpPlanService.java @@ -12,7 +12,7 @@ import java.util.List; * 行政执法检查计划-计划Service接口 * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ public interface IEfcodeCpPlanService { diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpPlanUsersService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpPlanUsersService.java index 5c207035..8db17c2b 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpPlanUsersService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpPlanUsersService.java @@ -12,7 +12,7 @@ import java.util.List; * 行政执法检查计划-计划参与人员Service接口 * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ public interface IEfcodeCpPlanUsersService { diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpReserveService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpReserveService.java index 9c6d9452..fe57d606 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpReserveService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpReserveService.java @@ -12,7 +12,7 @@ import java.util.List; * 行政执法检查计划-预约Service接口 * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ public interface IEfcodeCpReserveService { diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpSettingService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpSettingService.java index 5eeac65b..dd02c120 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpSettingService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpSettingService.java @@ -12,7 +12,7 @@ import java.util.List; * 行政执法检查计划-设置Service接口 * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ public interface IEfcodeCpSettingService { diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpTaskService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpTaskService.java index afcf9b63..9c432b16 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpTaskService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpTaskService.java @@ -12,7 +12,7 @@ import java.util.List; * 行政执法检查计划-任务Service接口 * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ public interface IEfcodeCpTaskService { diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeMessageServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeMessageServiceImpl.java index 55116c2a..e2d9c290 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeMessageServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeMessageServiceImpl.java @@ -24,7 +24,7 @@ import java.util.Collection; * 行政执法检查计划-预告交流Service业务层处理 * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ @Slf4j @RequiredArgsConstructor diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeServiceImpl.java index f2e44e16..29f31e5a 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeServiceImpl.java @@ -21,10 +21,10 @@ import java.util.Map; import java.util.Collection; /** - * 行政执法检查计划-预约Service业务层处理 + * 行政执法检查计划-预告Service业务层处理 * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ @Slf4j @RequiredArgsConstructor @@ -34,10 +34,10 @@ public class EfcodeCpNoticeServiceImpl implements IEfcodeCpNoticeService { private final EfcodeCpNoticeMapper baseMapper; /** - * 查询行政执法检查计划-预约 + * 查询行政执法检查计划-预告 * * @param id 主键 - * @return 行政执法检查计划-预约 + * @return 行政执法检查计划-预告 */ @Override public EfcodeCpNoticeVo queryById(String id){ @@ -45,11 +45,11 @@ public class EfcodeCpNoticeServiceImpl implements IEfcodeCpNoticeService { } /** - * 分页查询行政执法检查计划-预约列表 + * 分页查询行政执法检查计划-预告列表 * * @param bo 查询条件 * @param pageQuery 分页参数 - * @return 行政执法检查计划-预约分页列表 + * @return 行政执法检查计划-预告分页列表 */ @Override public TableDataInfo queryPageList(EfcodeCpNoticeBo bo, PageQuery pageQuery) { @@ -59,10 +59,10 @@ public class EfcodeCpNoticeServiceImpl implements IEfcodeCpNoticeService { } /** - * 查询符合条件的行政执法检查计划-预约列表 + * 查询符合条件的行政执法检查计划-预告列表 * * @param bo 查询条件 - * @return 行政执法检查计划-预约列表 + * @return 行政执法检查计划-预告列表 */ @Override public List queryList(EfcodeCpNoticeBo bo) { @@ -100,9 +100,9 @@ public class EfcodeCpNoticeServiceImpl implements IEfcodeCpNoticeService { } /** - * 新增行政执法检查计划-预约 + * 新增行政执法检查计划-预告 * - * @param bo 行政执法检查计划-预约 + * @param bo 行政执法检查计划-预告 * @return 是否新增成功 */ @Override @@ -117,9 +117,9 @@ public class EfcodeCpNoticeServiceImpl implements IEfcodeCpNoticeService { } /** - * 修改行政执法检查计划-预约 + * 修改行政执法检查计划-预告 * - * @param bo 行政执法检查计划-预约 + * @param bo 行政执法检查计划-预告 * @return 是否修改成功 */ @Override @@ -137,7 +137,7 @@ public class EfcodeCpNoticeServiceImpl implements IEfcodeCpNoticeService { } /** - * 校验并批量删除行政执法检查计划-预约信息 + * 校验并批量删除行政执法检查计划-预告信息 * * @param ids 待删除的主键集合 * @param isValid 是否进行有效性校验 diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeUsersServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeUsersServiceImpl.java index 3c45d6e2..2c7ff688 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeUsersServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeUsersServiceImpl.java @@ -21,10 +21,10 @@ import java.util.Map; import java.util.Collection; /** - * 行政执法检查计划-预约参与人员Service业务层处理 + * 行政执法检查计划-预告参与人员Service业务层处理 * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ @Slf4j @RequiredArgsConstructor @@ -34,10 +34,10 @@ public class EfcodeCpNoticeUsersServiceImpl implements IEfcodeCpNoticeUsersServi private final EfcodeCpNoticeUsersMapper baseMapper; /** - * 查询行政执法检查计划-预约参与人员 + * 查询行政执法检查计划-预告参与人员 * * @param id 主键 - * @return 行政执法检查计划-预约参与人员 + * @return 行政执法检查计划-预告参与人员 */ @Override public EfcodeCpNoticeUsersVo queryById(String id){ @@ -45,11 +45,11 @@ public class EfcodeCpNoticeUsersServiceImpl implements IEfcodeCpNoticeUsersServi } /** - * 分页查询行政执法检查计划-预约参与人员列表 + * 分页查询行政执法检查计划-预告参与人员列表 * * @param bo 查询条件 * @param pageQuery 分页参数 - * @return 行政执法检查计划-预约参与人员分页列表 + * @return 行政执法检查计划-预告参与人员分页列表 */ @Override public TableDataInfo queryPageList(EfcodeCpNoticeUsersBo bo, PageQuery pageQuery) { @@ -59,10 +59,10 @@ public class EfcodeCpNoticeUsersServiceImpl implements IEfcodeCpNoticeUsersServi } /** - * 查询符合条件的行政执法检查计划-预约参与人员列表 + * 查询符合条件的行政执法检查计划-预告参与人员列表 * * @param bo 查询条件 - * @return 行政执法检查计划-预约参与人员列表 + * @return 行政执法检查计划-预告参与人员列表 */ @Override public List queryList(EfcodeCpNoticeUsersBo bo) { @@ -81,9 +81,9 @@ public class EfcodeCpNoticeUsersServiceImpl implements IEfcodeCpNoticeUsersServi } /** - * 新增行政执法检查计划-预约参与人员 + * 新增行政执法检查计划-预告参与人员 * - * @param bo 行政执法检查计划-预约参与人员 + * @param bo 行政执法检查计划-预告参与人员 * @return 是否新增成功 */ @Override @@ -98,9 +98,9 @@ public class EfcodeCpNoticeUsersServiceImpl implements IEfcodeCpNoticeUsersServi } /** - * 修改行政执法检查计划-预约参与人员 + * 修改行政执法检查计划-预告参与人员 * - * @param bo 行政执法检查计划-预约参与人员 + * @param bo 行政执法检查计划-预告参与人员 * @return 是否修改成功 */ @Override @@ -118,7 +118,7 @@ public class EfcodeCpNoticeUsersServiceImpl implements IEfcodeCpNoticeUsersServi } /** - * 校验并批量删除行政执法检查计划-预约参与人员信息 + * 校验并批量删除行政执法检查计划-预告参与人员信息 * * @param ids 待删除的主键集合 * @param isValid 是否进行有效性校验 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 a41ac9af..c0b36257 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 @@ -24,7 +24,7 @@ import java.util.Collection; * 行政执法检查计划-计划Service业务层处理 * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ @Slf4j @RequiredArgsConstructor @@ -77,6 +77,8 @@ 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.eq(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-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpPlanUsersServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpPlanUsersServiceImpl.java index e5d67fec..71d88632 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpPlanUsersServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpPlanUsersServiceImpl.java @@ -24,7 +24,7 @@ import java.util.Collection; * 行政执法检查计划-计划参与人员Service业务层处理 * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ @Slf4j @RequiredArgsConstructor diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpReserveServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpReserveServiceImpl.java index 222a3f38..d479469a 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpReserveServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpReserveServiceImpl.java @@ -24,7 +24,7 @@ import java.util.Collection; * 行政执法检查计划-预约Service业务层处理 * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ @Slf4j @RequiredArgsConstructor @@ -77,6 +77,11 @@ public class EfcodeCpReserveServiceImpl implements IEfcodeCpReserveService { lqw.eq(StringUtils.isNotBlank(bo.getPlanId()), EfcodeCpReserve::getPlanId, bo.getPlanId()); lqw.eq(bo.getReserveTime() != null, EfcodeCpReserve::getReserveTime, bo.getReserveTime()); lqw.eq(bo.getOpStatus() != null, EfcodeCpReserve::getOpStatus, bo.getOpStatus()); + lqw.eq(bo.getOpOrder() != null, EfcodeCpReserve::getOpOrder, bo.getOpOrder()); + lqw.eq(bo.getOpTime() != null, EfcodeCpReserve::getOpTime, bo.getOpTime()); + lqw.eq(StringUtils.isNotBlank(bo.getOpMessage()), EfcodeCpReserve::getOpMessage, bo.getOpMessage()); + lqw.eq(bo.getOpSetDate() != null, EfcodeCpReserve::getOpSetDate, bo.getOpSetDate()); + lqw.eq(bo.getOpSetTime() != null, EfcodeCpReserve::getOpSetTime, bo.getOpSetTime()); lqw.eq(bo.getFrom() != null, EfcodeCpReserve::getFrom, bo.getFrom()); return lqw; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpSettingServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpSettingServiceImpl.java index be2faa6b..6e0f46eb 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpSettingServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpSettingServiceImpl.java @@ -24,7 +24,7 @@ import java.util.Collection; * 行政执法检查计划-设置Service业务层处理 * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ @Slf4j @RequiredArgsConstructor diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpTaskServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpTaskServiceImpl.java index ec68ddf9..fd620697 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpTaskServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpTaskServiceImpl.java @@ -24,7 +24,7 @@ import java.util.Collection; * 行政执法检查计划-任务Service业务层处理 * * @author Lion Li - * @date 2026-05-16 + * @date 2026-05-17 */ @Slf4j @RequiredArgsConstructor diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/enforcement/plan.js b/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/enforcement/plan.js new file mode 100644 index 00000000..e69de29b