Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc into V0.0.2

project_data/sql/0.0.2/soc/soc.sql

@@ -160,10 +160,10 @@ IF
 	EXISTS `sync_fjnx_org_move`;
 CREATE TABLE `sync_fjnx_org_move` (
 	`id` BIGINT NOT NULL AUTO_INCREMENT,
-	`org_code` VARCHAR ( 64 ) CHARACTER 
+	`org_code` VARCHAR ( 64 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '特殊机构编码',
 	`org_type` INT DEFAULT NULL COMMENT '1: 部门（强行将机构类型指定为部门） 2： 机构  （强行将机构类型指定为机构）',
-	PRIMARY KEY ( `id` ) USING BTREE 
+	PRIMARY KEY ( `id` ) USING BTREE
 ) ENGINE = INNODB AUTO_INCREMENT = 98 DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '配置特殊的机构和部门机构，决定是否要移动到机关机构下';
 DROP TABLE
 IF
@@ -179,7 +179,7 @@ CREATE TABLE `core_question_flow` (
 	`description` VARCHAR ( 255 ) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '执行描述',
 	`reform_date` datetime DEFAULT NULL COMMENT '整改时间',
 	`images` VARCHAR ( 1024 ) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '流程相关图片',
-	PRIMARY KEY ( `id` ) 
+	PRIMARY KEY ( `id` )
 ) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '隐患问题审批流程';
 DROP TABLE
 IF
@@ -187,7 +187,7 @@ IF
 CREATE TABLE `core_question` (
 	`id` BIGINT NOT NULL,
 	`org_id` BIGINT DEFAULT NULL COMMENT '隐患所属机构',
-	`org_name` VARCHAR ( 64 ) CHARACTER 
+	`org_name` VARCHAR ( 64 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '隐患所属机构名称',
 	`org_path` VARCHAR ( 255 ) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '隐患所属机构path',
 	`src_type` INT DEFAULT NULL COMMENT '来源，1：履职，2：安全检查',
@@ -206,11 +206,11 @@ CREATE TABLE `core_question` (
 	`reform_deadline` datetime DEFAULT NULL COMMENT '整改期限',
 	`create_time` datetime DEFAULT NULL,
 	`update_time` datetime DEFAULT NULL,
-	`create_by` VARCHAR ( 255 ) CHARACTER 
+	`create_by` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-	`update_by` VARCHAR ( 32 ) CHARACTER 
+	`update_by` VARCHAR ( 32 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-	PRIMARY KEY ( `id` ) 
+	PRIMARY KEY ( `id` )
 ) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '隐患问题清单';
 DROP TABLE
 IF
@@ -218,33 +218,33 @@ IF
 CREATE TABLE `core_announcement_notification` (
 	`id` BIGINT ( 0 ) NOT NULL,
 	`org_id` BIGINT ( 0 ) NULL DEFAULT NULL COMMENT '机构',
-	`org_name` VARCHAR ( 255 ) CHARACTER 
+	`org_name` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机构',
-	`org_path` VARCHAR ( 500 ) CHARACTER 
+	`org_path` VARCHAR ( 500 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机构',
-	`title` VARCHAR ( 255 ) CHARACTER 
+	`title` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标题',
-	`content` text CHARACTER 
+	`content` text CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '内容',
-	`messag_type` VARCHAR ( 50 ) CHARACTER 
+	`messag_type` VARCHAR ( 50 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '消息类型0公告1通知',
-	`tag_org_type` VARCHAR ( 50 ) CHARACTER 
+	`tag_org_type` VARCHAR ( 50 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机构类型',
-	`create_by` VARCHAR ( 50 ) CHARACTER 
+	`create_by` VARCHAR ( 50 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
 	`create_time` datetime ( 0 ) NULL DEFAULT NULL COMMENT '创建时间',
 	`publish_time` datetime ( 0 ) NULL DEFAULT NULL COMMENT '发布时间',
-	`messag_status` VARCHAR ( 50 ) CHARACTER 
+	`messag_status` VARCHAR ( 50 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态',
-	`update_by` VARCHAR ( 50 ) CHARACTER 
+	`update_by` VARCHAR ( 50 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
 	`update_time` datetime ( 0 ) NULL DEFAULT NULL,
-	`file_list` text CHARACTER 
+	`file_list` text CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '文件',
 	PRIMARY KEY ( `id` ) USING BTREE,
 	INDEX `org_id_indx` ( `org_id` ) USING BTREE,
-	INDEX `org_path_index` ( `org_path` ) USING BTREE 
-) ENGINE = INNODB CHARACTER 
+	INDEX `org_path_index` ( `org_path` ) USING BTREE
+) ENGINE = INNODB CHARACTER
 SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '公告通知' ROW_FORMAT = Dynamic;
 DROP TABLE
 IF
@@ -253,8 +253,8 @@ CREATE TABLE `core_announcement_notification_to_org` (
 	`announcement_notification_id` BIGINT ( 0 ) NOT NULL,
 	`org_id` BIGINT ( 0 ) NULL DEFAULT NULL,
 	INDEX `notification_id_index` ( `announcement_notification_id` ) USING BTREE,
-	INDEX `org_id_index` ( `org_id` ) USING BTREE 
-) ENGINE = INNODB CHARACTER 
+	INDEX `org_id_index` ( `org_id` ) USING BTREE
+) ENGINE = INNODB CHARACTER
 SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '通知公告机构关联表' ROW_FORMAT = Dynamic;
 DROP TABLE
 IF
@@ -263,8 +263,8 @@ CREATE TABLE `core_announcement_notification_to_role` (
 	`announcement_notification_id` BIGINT ( 0 ) NOT NULL,
 	`role_id` BIGINT ( 0 ) NULL DEFAULT NULL,
 	INDEX `notification_id_index` ( `announcement_notification_id` ) USING BTREE,
-	INDEX `role_id_index` ( `role_id` ) USING BTREE 
-) ENGINE = INNODB CHARACTER 
+	INDEX `role_id_index` ( `role_id` ) USING BTREE
+) ENGINE = INNODB CHARACTER
 SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '公告通知角色关联表' ROW_FORMAT = Dynamic;
 DROP TABLE
 IF
@@ -277,85 +277,85 @@ CREATE TABLE `core_announcement_notification_to_user` (
 	`user_id` BIGINT ( 0 ) NULL DEFAULT NULL COMMENT '用户id',
 	PRIMARY KEY ( `id` ) USING BTREE,
 	INDEX `user_id_index` ( `user_id` ) USING BTREE,
-	INDEX `announcement_notification_id_index` ( `announcement_notification_id` ) USING BTREE 
-) ENGINE = INNODB CHARACTER 
+	INDEX `announcement_notification_id_index` ( `announcement_notification_id` ) USING BTREE
+) ENGINE = INNODB CHARACTER
 SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '公告通知查看记录表' ROW_FORMAT = Dynamic;
 DROP TABLE
 IF
 	EXISTS `core_weather_warning`;
 CREATE TABLE `core_weather_warning` (
 	`id` BIGINT ( 0 ) NOT NULL AUTO_INCREMENT,
-	`alarm_title` VARCHAR ( 100 ) CHARACTER 
+	`alarm_title` VARCHAR ( 100 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '预警标题',
-	`alarm_content` VARCHAR ( 500 ) CHARACTER 
+	`alarm_content` VARCHAR ( 500 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '预警内容',
-	`alarm_level` VARCHAR ( 50 ) CHARACTER 
+	`alarm_level` VARCHAR ( 50 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '预警等级',
-	`province` VARCHAR ( 50 ) CHARACTER 
+	`province` VARCHAR ( 50 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '省',
-	`city` VARCHAR ( 50 ) CHARACTER 
+	`city` VARCHAR ( 50 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '市',
-	`area` VARCHAR ( 50 ) CHARACTER 
+	`area` VARCHAR ( 50 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '区、县（没得区县用市）',
-	`code` VARCHAR ( 50 ) CHARACTER 
+	`code` VARCHAR ( 50 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '市区县的编号',
-	`alarm_type` VARCHAR ( 50 ) CHARACTER 
+	`alarm_type` VARCHAR ( 50 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '预警类型',
 	`alarm_time` datetime ( 0 ) NULL DEFAULT NULL COMMENT '预警发布时间',
 	`create_time` datetime ( 0 ) NULL DEFAULT NULL COMMENT '创建时间',
 	PRIMARY KEY ( `id` ) USING BTREE,
-	INDEX `code` ( `code` ) USING BTREE 
-) ENGINE = INNODB AUTO_INCREMENT = 4 CHARACTER 
+	INDEX `code` ( `code` ) USING BTREE
+) ENGINE = INNODB AUTO_INCREMENT = 4 CHARACTER
 SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '天气预警数据' ROW_FORMAT = Dynamic;
 DROP TABLE
 IF
 	EXISTS `core_weather_city`;
 CREATE TABLE `core_weather_city` (
-	`AREACODE` VARCHAR ( 255 ) CHARACTER 
+	`AREACODE` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-	`AREAID` VARCHAR ( 255 ) CHARACTER 
+	`AREAID` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-	`NAMEEN` VARCHAR ( 255 ) CHARACTER 
+	`NAMEEN` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-	`NAMECN` VARCHAR ( 255 ) CHARACTER 
+	`NAMECN` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-	`DISTRICTEN` VARCHAR ( 255 ) CHARACTER 
+	`DISTRICTEN` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-	`DISTRICTCN` VARCHAR ( 255 ) CHARACTER 
+	`DISTRICTCN` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-	`PROVEN` VARCHAR ( 255 ) CHARACTER 
+	`PROVEN` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-	`PROVCN` VARCHAR ( 255 ) CHARACTER 
+	`PROVCN` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-	`NATIONEN` VARCHAR ( 255 ) CHARACTER 
+	`NATIONEN` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-	`NATIONCN` VARCHAR ( 255 ) CHARACTER 
+	`NATIONCN` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-	`GROUPID` VARCHAR ( 255 ) CHARACTER 
-	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL 
-) ENGINE = INNODB AUTO_INCREMENT = 97 CHARACTER 
+	`GROUPID` VARCHAR ( 255 ) CHARACTER
+	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL
+) ENGINE = INNODB AUTO_INCREMENT = 97 CHARACTER
 SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '预警城市列表' ROW_FORMAT = Dynamic;
 DROP TABLE
 IF
 	EXISTS `core_safety_task`;
 CREATE TABLE `core_safety_task` (
-	`id` VARCHAR ( 32 ) CHARACTER 
+	`id` VARCHAR ( 32 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-	`title` VARCHAR ( 255 ) CHARACTER 
+	`title` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '标题',
 	`create_time` datetime ( 6 ) DEFAULT NULL COMMENT '创建时间',
 	`modified_id` BIGINT DEFAULT NULL COMMENT '最后修改人id',
-	`modified_name` VARCHAR ( 32 ) CHARACTER 
+	`modified_name` VARCHAR ( 32 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人名称',
 	`update_time` datetime ( 6 ) DEFAULT NULL COMMENT '更新时间',
 	`exception_count` INT DEFAULT '0' COMMENT '异常数目',
 	`org_id` BIGINT DEFAULT '0' COMMENT '受检机构',
-	`org_name` VARCHAR ( 50 ) CHARACTER 
+	`org_name` VARCHAR ( 50 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '受检机构',
-	`org_path` VARCHAR ( 200 ) CHARACTER 
+	`org_path` VARCHAR ( 200 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '受检机构',
 	`check_org_id` BIGINT DEFAULT NULL COMMENT '执行检查机构',
-	`check_org_name` VARCHAR ( 50 ) CHARACTER 
+	`check_org_name` VARCHAR ( 50 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '执行检查机构',
 	`status` INT DEFAULT NULL COMMENT '0待检查,1检查完成',
 	`check_type` INT DEFAULT NULL COMMENT '0 常规安全检查 1 专项安全检查',
@@ -367,7 +367,7 @@ CREATE TABLE `core_safety_task` (
 	`ymd_week` INT DEFAULT NULL COMMENT '周',
 	`ymd_year` INT DEFAULT NULL COMMENT '年',
 	`ymd_halfyear` INT DEFAULT NULL COMMENT '半年',
-	`submit_by` VARCHAR ( 50 ) CHARACTER 
+	`submit_by` VARCHAR ( 50 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '提交人',
 	`submit_time` datetime DEFAULT NULL COMMENT '提交时间',
 	`plan_id` BIGINT DEFAULT NULL COMMENT '计划id',
@@ -378,15 +378,15 @@ CREATE TABLE `core_safety_task` (
 	`role_id` BIGINT DEFAULT NULL COMMENT '角色id',
 	`deleted` INT DEFAULT '0' COMMENT '是否删除0否1是',
 	`is_question` INT DEFAULT NULL COMMENT '0:未整改 1:已开始整改',
-	`batch_id` VARCHAR ( 64 ) CHARACTER 
+	`batch_id` VARCHAR ( 64 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '批次id,同一执行机构一个批次id',
 	`source_type` INT DEFAULT '0' COMMENT '数据来源 0：检查计划 ，1：登记检查结果',
-	`pdf_url` VARCHAR ( 500 ) CHARACTER 
+	`pdf_url` VARCHAR ( 500 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '登记簿pdf 文件地址',
 	PRIMARY KEY ( `id` ) USING BTREE,
 	KEY `idx_resumption_orgId` ( `org_id` ) USING BTREE,
 	KEY `idx_orgpath` (
-	`org_path` ( 191 )) USING BTREE 
+	`org_path` ( 191 )) USING BTREE
 ) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci;
 DROP TABLE
 IF
@@ -396,7 +396,7 @@ CREATE TABLE `core_safety_task_data` (
 	`plan_id` BIGINT DEFAULT NULL COMMENT '计划id',
 	`item_id` BIGINT DEFAULT NULL COMMENT '检查项id',
 	`point_id` BIGINT DEFAULT NULL COMMENT '要点id',
-	`task_id` VARCHAR ( 100 ) CHARACTER 
+	`task_id` VARCHAR ( 100 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '检查任务id',
 	`area_id` BIGINT DEFAULT NULL COMMENT '区域id',
 	`res_value` INT DEFAULT NULL COMMENT '正常不正常，通过不通过，合格不合格',
@@ -405,45 +405,45 @@ CREATE TABLE `core_safety_task_data` (
 	`submit_time` datetime DEFAULT NULL COMMENT '提交时间',
 	`res_status` INT DEFAULT NULL COMMENT '0未提交 1正常提交 2延迟提交',
 	`submit_by` BIGINT DEFAULT NULL COMMENT '提交人id',
-	`submit_name` VARCHAR ( 50 ) CHARACTER 
+	`submit_name` VARCHAR ( 50 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '提交人名',
 	PRIMARY KEY ( `id` ) USING BTREE,
 	KEY `item_id` ( `point_id` ) USING BTREE,
-	KEY `check_task_id` ( `task_id` ) USING BTREE 
+	KEY `check_task_id` ( `task_id` ) USING BTREE
 ) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '安全检查项表';
 DROP TABLE
 IF
 	EXISTS `core_resumption_configuration`;
 CREATE TABLE `core_resumption_configuration` (
 	`id` BIGINT NOT NULL COMMENT '主键',
-	`resumption_cycle` VARCHAR ( 2 ) CHARACTER 
+	`resumption_cycle` VARCHAR ( 2 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '履职周期',
-	`create_by` VARCHAR ( 255 ) CHARACTER 
+	`create_by` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
 	`create_time` datetime DEFAULT NULL,
-	`update_by` VARCHAR ( 255 ) CHARACTER 
+	`update_by` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
 	`update_time` datetime DEFAULT NULL,
-	`del_flag` VARCHAR ( 2 ) CHARACTER 
+	`del_flag` VARCHAR ( 2 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0',
-	`all_day` VARCHAR ( 255 ) CHARACTER 
+	`all_day` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '全天',
-	`front` VARCHAR ( 255 ) CHARACTER 
+	`front` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '营业前',
-	`centre` VARCHAR ( 255 ) CHARACTER 
+	`centre` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '营业中',
-	`after` VARCHAR ( 255 ) CHARACTER 
+	`after` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '营业后',
-	`time_unit` VARCHAR ( 2 ) CHARACTER 
+	`time_unit` VARCHAR ( 2 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '时间单位',
-	PRIMARY KEY ( `id` ) USING BTREE 
+	PRIMARY KEY ( `id` ) USING BTREE
 ) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '履职任务定时提醒';
 DROP TABLE
 IF
 	EXISTS `core_safety_task_data_nfc`;
 CREATE TABLE `core_safety_task_data_nfc` (
 	`id` BIGINT NOT NULL DEFAULT '0',
-	`task_id` VARCHAR ( 100 ) CHARACTER 
+	`task_id` VARCHAR ( 100 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '检查任务id',
 	`task_data_id` BIGINT DEFAULT NULL COMMENT '安全检查项id',
 	`check_id` BIGINT NOT NULL DEFAULT '0' COMMENT '采集点id',
@@ -451,7 +451,7 @@ CREATE TABLE `core_safety_task_data_nfc` (
 	`status` INT DEFAULT '0' COMMENT '状态0未扫1以扫',
 	`point_id` BIGINT DEFAULT NULL COMMENT '要点id',
 	PRIMARY KEY ( `id` ) USING BTREE,
-	KEY `task_id` ( `task_id` ) USING BTREE 
+	KEY `task_id` ( `task_id` ) USING BTREE
 ) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '安全检查nfc扫描表';
 DROP TABLE
 IF
@@ -465,14 +465,14 @@ CREATE TABLE `core_message_send` (
 	`send_role` BIGINT DEFAULT NULL COMMENT '按角色选择',
 	`send_time_type` VARCHAR ( 2 ) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '发送时间类型1立即2指定时间',
 	`send_time` datetime DEFAULT NULL COMMENT '发送时间',
-	`del_flag` VARCHAR ( 2 ) CHARACTER 
+	`del_flag` VARCHAR ( 2 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '0未2删',
 	`send_status` VARCHAR ( 2 ) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '1已发送2待发送',
 	`create_time` datetime DEFAULT NULL COMMENT '创建时间',
 	`create_by` VARCHAR ( 255 ) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
 	`update_time` datetime DEFAULT NULL COMMENT '修改时间',
 	`update_by` VARCHAR ( 255 ) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人',
-	PRIMARY KEY ( `id` ) 
+	PRIMARY KEY ( `id` )
 ) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '消息发送配置';
 DROP TABLE
 IF
@@ -481,7 +481,7 @@ CREATE TABLE `core_message_center` (
 	`id` BIGINT NOT NULL,
 	`type` VARCHAR ( 2 ) COLLATE utf8mb4_general_ci NOT NULL COMMENT '1公告2业务提醒3消息',
 	`title` VARCHAR ( 255 ) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '标题',
-	`is_read` VARCHAR ( 2 ) CHARACTER 
+	`is_read` VARCHAR ( 2 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '0未读1已读',
 	`content` VARCHAR ( 4000 ) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '内容',
 	`del_flag` VARCHAR ( 2 ) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '0未2删',
@@ -490,7 +490,7 @@ CREATE TABLE `core_message_center` (
 	`create_time` datetime DEFAULT NULL COMMENT '创建时间',
 	`update_by` VARCHAR ( 255 ) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人',
 	`update_time` datetime DEFAULT NULL COMMENT '修改时间',
-	PRIMARY KEY ( `id` ) 
+	PRIMARY KEY ( `id` )
 ) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '消息中心';
 DROP TABLE
 IF
@@ -498,47 +498,47 @@ IF
 CREATE TABLE `core_safety_task_data_remark` (
 	`id` BIGINT NOT NULL DEFAULT '0',
 	`task_data_id` BIGINT DEFAULT NULL COMMENT '检查项id',
-	`task_id` VARCHAR ( 100 ) CHARACTER 
+	`task_id` VARCHAR ( 100 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '检查任务id',
-	`remark` VARCHAR ( 500 ) CHARACTER 
+	`remark` VARCHAR ( 500 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '问题描述',
 	PRIMARY KEY ( `id` ) USING BTREE,
-	KEY `task_item_id` ( `task_data_id` ) USING BTREE 
+	KEY `task_item_id` ( `task_data_id` ) USING BTREE
 ) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '安全检查项表问题描述表';
 DROP TABLE
 IF
 	EXISTS `core_safety_task_data_remarkimg`;
 CREATE TABLE `core_safety_task_data_remarkimg` (
 	`id` BIGINT NOT NULL DEFAULT '0',
-	`task_id` VARCHAR ( 50 ) CHARACTER 
+	`task_id` VARCHAR ( 50 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '安全检查任务id',
 	`task_data_id` BIGINT DEFAULT NULL COMMENT '安全检查项id',
 	`remark_id` BIGINT DEFAULT NULL COMMENT '安全检查项问题描述id',
-	`img_path` VARCHAR ( 200 ) CHARACTER 
+	`img_path` VARCHAR ( 200 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '图片存放路径',
 	PRIMARY KEY ( `id` ) USING BTREE,
-	KEY `data_id` ( `remark_id` ) USING BTREE 
+	KEY `data_id` ( `remark_id` ) USING BTREE
 ) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '安全检查产生图片表';
 DROP TABLE
 IF
 	EXISTS `core_safety_task`;
 CREATE TABLE `core_safety_task` (
 	`id` BIGINT NOT NULL,
-	`title` VARCHAR ( 255 ) CHARACTER 
+	`title` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '标题',
 	`create_time` datetime ( 6 ) DEFAULT NULL COMMENT '创建时间',
 	`modified_id` BIGINT DEFAULT NULL COMMENT '最后修改人id',
-	`modified_name` VARCHAR ( 32 ) CHARACTER 
+	`modified_name` VARCHAR ( 32 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人名称',
 	`update_time` datetime ( 6 ) DEFAULT NULL COMMENT '更新时间',
 	`exception_count` INT DEFAULT '0' COMMENT '异常数目',
 	`org_id` BIGINT DEFAULT '0' COMMENT '受检机构',
-	`org_name` VARCHAR ( 50 ) CHARACTER 
+	`org_name` VARCHAR ( 50 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '受检机构',
-	`org_path` VARCHAR ( 200 ) CHARACTER 
+	`org_path` VARCHAR ( 200 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '受检机构',
 	`check_org_id` BIGINT DEFAULT NULL COMMENT '执行检查机构',
-	`check_org_name` VARCHAR ( 50 ) CHARACTER 
+	`check_org_name` VARCHAR ( 50 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '执行检查机构',
 	`status` INT DEFAULT NULL COMMENT '0待检查,1检查完成',
 	`done_status` INT DEFAULT NULL COMMENT '0:代办,1:逾期,2:按时,3:补登',
@@ -551,7 +551,7 @@ CREATE TABLE `core_safety_task` (
 	`ymd_week` INT DEFAULT NULL COMMENT '周',
 	`ymd_year` INT DEFAULT NULL COMMENT '年',
 	`ymd_halfyear` INT DEFAULT NULL COMMENT '半年',
-	`submit_by` VARCHAR ( 50 ) CHARACTER 
+	`submit_by` VARCHAR ( 50 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '提交人',
 	`submit_time` datetime DEFAULT NULL COMMENT '提交时间',
 	`plan_id` BIGINT DEFAULT NULL COMMENT '计划id',
@@ -564,20 +564,20 @@ CREATE TABLE `core_safety_task` (
 	`is_question` INT DEFAULT NULL COMMENT '0:未整改 1:已开始整改',
 	`batch_id` BIGINT DEFAULT NULL COMMENT '批次id,同一执行机构一个批次id',
 	`source_type` INT DEFAULT '0' COMMENT '数据来源 0：检查计划 ，1：登记检查结果',
-	`pdf_url` VARCHAR ( 500 ) CHARACTER 
+	`pdf_url` VARCHAR ( 500 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '登记簿pdf 文件地址',
 	`des` VARCHAR ( 4000 ) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '备注',
 	PRIMARY KEY ( `id` ) USING BTREE,
 	KEY `idx_resumption_orgId` ( `org_id` ) USING BTREE,
 	KEY `idx_orgpath` (
-	`org_path` ( 191 )) USING BTREE 
+	`org_path` ( 191 )) USING BTREE
 ) ENGINE = INNODB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci;
 DROP TABLE
 IF
 	EXISTS `core_safecheck_plan`;
 CREATE TABLE `core_safecheck_plan` (
 	`id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键',
-	`plan_name` VARCHAR ( 100 ) CHARACTER 
+	`plan_name` VARCHAR ( 100 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '计划名称',
 	`plan_cycle` INT NULL DEFAULT NULL COMMENT '计划周期：每日，每周，每月，每季度，每半年，每年 ,无周期',
 	`exec_org_type` INT NULL DEFAULT NULL COMMENT '检查机构类型',
@@ -585,14 +585,14 @@ CREATE TABLE `core_safecheck_plan` (
 	`plan_status` INT NULL DEFAULT NULL COMMENT '计划状态：0：启用，1禁用',
 	`start_date` datetime NULL DEFAULT NULL COMMENT '开始日期',
 	`end_date` datetime NULL DEFAULT NULL COMMENT '结束日期',
-	`build_task_now` VARCHAR ( 1 ) CHARACTER 
+	`build_task_now` VARCHAR ( 1 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '立即生成任务',
-	`description` VARCHAR ( 255 ) CHARACTER 
+	`description` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
-	`is_deleted` VARCHAR ( 1 ) CHARACTER 
+	`is_deleted` VARCHAR ( 1 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '\0' COMMENT '是否删除',
 	`create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
-	`modified_name` VARCHAR ( 30 ) CHARACTER 
+	`modified_name` VARCHAR ( 30 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '修改人名称',
 	`update_time` datetime NULL DEFAULT NULL COMMENT '修改时间',
 	`modified_by` BIGINT NULL DEFAULT NULL COMMENT '修改人id',
@@ -602,23 +602,23 @@ CREATE TABLE `core_safecheck_plan` (
 	`check_type` INT NULL DEFAULT NULL COMMENT '检查类型',
 	`count` INT NULL DEFAULT NULL COMMENT '检查次数',
 	`modified_time` datetime NULL DEFAULT NULL COMMENT '修改时间',
-	`create_by` VARCHAR ( 255 ) CHARACTER 
+	`create_by` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-	`update_by` VARCHAR ( 32 ) CHARACTER 
+	`update_by` VARCHAR ( 32 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-	`exec_org` VARCHAR ( 255 ) CHARACTER 
+	`exec_org` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '检查机构',
-	`check_org` VARCHAR ( 255 ) CHARACTER 
+	`check_org` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '受检机构',
-	`des` VARCHAR ( 4000 ) CHARACTER 
+	`des` VARCHAR ( 4000 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
-	`distribute_status` VARCHAR ( 255 ) CHARACTER 
+	`distribute_status` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '下发状态',
-	`distribute_plan_status` VARCHAR ( 255 ) CHARACTER 
+	`distribute_plan_status` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '计划下发默认状态',
 	`parent_id` BIGINT NULL DEFAULT - 1 COMMENT '下发父计划id',
-	PRIMARY KEY ( `id` ) USING BTREE 
-) ENGINE = INNODB AUTO_INCREMENT = 1705420577829208067 CHARACTER 
+	PRIMARY KEY ( `id` ) USING BTREE
+) ENGINE = INNODB AUTO_INCREMENT = 1705420577829208067 CHARACTER
 SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '常规安全检查计划表' ROW_FORMAT = Dynamic;
 DROP TABLE
 IF
@@ -628,11 +628,11 @@ CREATE TABLE `core_safecheck_plan_to_check_org` (
 	`org_id` BIGINT NOT NULL COMMENT '机构id',
 	`create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
 	`update_time` datetime NULL DEFAULT NULL COMMENT '修改时间',
-	`create_by` VARCHAR ( 255 ) CHARACTER 
+	`create_by` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-	`update_by` VARCHAR ( 32 ) CHARACTER 
-	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL 
-) ENGINE = INNODB CHARACTER 
+	`update_by` VARCHAR ( 32 ) CHARACTER
+	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL
+) ENGINE = INNODB CHARACTER
 SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '常规安全检查-受检机构关联表' ROW_FORMAT = Dynamic;
 -- ----------------------------
 -- Table structure for core_safecheck_plan_to_exec_org
@@ -645,11 +645,11 @@ CREATE TABLE `core_safecheck_plan_to_exec_org` (
 	`org_id` BIGINT NOT NULL COMMENT '机构id',
 	`create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
 	`update_time` datetime NULL DEFAULT NULL COMMENT '修改时间',
-	`create_by` VARCHAR ( 255 ) CHARACTER 
+	`create_by` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-	`update_by` VARCHAR ( 32 ) CHARACTER 
-	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL 
-) ENGINE = INNODB CHARACTER 
+	`update_by` VARCHAR ( 32 ) CHARACTER
+	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL
+) ENGINE = INNODB CHARACTER
 SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '常规安全检查-检查机构关系表' ROW_FORMAT = Dynamic;
 -- ----------------------------
 -- Table structure for core_safecheck_plan_to_point
@@ -663,12 +663,12 @@ CREATE TABLE `core_safecheck_plan_to_point` (
 	`point_scan` TINYINT ( 1 ) NULL DEFAULT NULL COMMENT '是否扫描NFC 1扫描，0不扫描',
 	`create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
 	`update_time` datetime NULL DEFAULT NULL COMMENT '修改时间',
-	`create_by` VARCHAR ( 255 ) CHARACTER 
+	`create_by` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-	`update_by` VARCHAR ( 32 ) CHARACTER 
+	`update_by` VARCHAR ( 32 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-	`required` TINYINT ( 1 ) NULL DEFAULT NULL 
-) ENGINE = INNODB CHARACTER 
+	`required` TINYINT ( 1 ) NULL DEFAULT NULL
+) ENGINE = INNODB CHARACTER
 SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '常规安全检查计划要点关联表' ROW_FORMAT = Dynamic;
 -- ----------------------------
 -- Table structure for core_safecheck_plan_to_role
@@ -681,11 +681,11 @@ CREATE TABLE `core_safecheck_plan_to_role` (
 	`role_id` BIGINT NOT NULL COMMENT '角色id',
 	`create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
 	`update_time` datetime NULL DEFAULT NULL COMMENT '修改时间',
-	`create_by` VARCHAR ( 255 ) CHARACTER 
+	`create_by` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-	`update_by` VARCHAR ( 32 ) CHARACTER 
-	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL 
-) ENGINE = INNODB CHARACTER 
+	`update_by` VARCHAR ( 32 ) CHARACTER
+	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL
+) ENGINE = INNODB CHARACTER
 SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '常规安全检查计划执行角色关联表' ROW_FORMAT = Dynamic;
 -- ----------------------------
 -- Table structure for core_safety_task
@@ -695,16 +695,16 @@ IF
 	EXISTS `core_safety_task`;
 CREATE TABLE `core_safety_task` (
 	`id` BIGINT NOT NULL,
-	`title` VARCHAR ( 255 ) CHARACTER 
+	`title` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标题',
 	`exception_count` INT NULL DEFAULT 0 COMMENT '异常数目',
 	`org_id` BIGINT NULL DEFAULT 0 COMMENT '受检机构',
-	`org_name` VARCHAR ( 50 ) CHARACTER 
+	`org_name` VARCHAR ( 50 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '受检机构',
-	`org_path` VARCHAR ( 200 ) CHARACTER 
+	`org_path` VARCHAR ( 200 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '受检机构',
 	`check_org_id` BIGINT NULL DEFAULT NULL COMMENT '执行检查机构',
-	`check_org_name` VARCHAR ( 50 ) CHARACTER 
+	`check_org_name` VARCHAR ( 50 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '执行检查机构',
 	`status` INT NULL DEFAULT NULL COMMENT '0待检查,1检查完成',
 	`done_status` INT NULL DEFAULT NULL COMMENT '0:代办,1:逾期,2:按时,3:补登',
@@ -718,7 +718,7 @@ CREATE TABLE `core_safety_task` (
 	`ymd_year` INT NULL DEFAULT NULL COMMENT '年',
 	`ymd_halfyear` INT NULL DEFAULT NULL COMMENT '半年',
 	`submitor_id` BIGINT NULL DEFAULT NULL COMMENT '提交人id',
-	`submit_by` VARCHAR ( 50 ) CHARACTER 
+	`submit_by` VARCHAR ( 50 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '提交人',
 	`submit_time` datetime NULL DEFAULT NULL COMMENT '提交时间',
 	`plan_id` BIGINT NULL DEFAULT NULL COMMENT '计划id',
@@ -731,23 +731,23 @@ CREATE TABLE `core_safety_task` (
 	`is_question` INT NULL DEFAULT NULL COMMENT '0:未整改 1:已开始整改',
 	`batch_id` BIGINT NULL DEFAULT NULL COMMENT '批次id,同一执行机构一个批次id',
 	`source_type` INT NULL DEFAULT 0 COMMENT '数据来源 0：检查计划 ，1：登记检查结果',
-	`pdf_url` VARCHAR ( 500 ) CHARACTER 
+	`pdf_url` VARCHAR ( 500 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '登记簿pdf 文件地址',
-	`des` VARCHAR ( 4000 ) CHARACTER 
+	`des` VARCHAR ( 4000 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
-	`check_team` VARCHAR ( 255 ) CHARACTER 
+	`check_team` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '检查组成员',
 	`grant_user_id` BIGINT NULL DEFAULT NULL COMMENT '被授权的用户id',
 	`create_time` datetime NULL DEFAULT NULL,
 	`update_time` datetime NULL DEFAULT NULL,
-	`create_by` VARCHAR ( 255 ) CHARACTER 
+	`create_by` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-	`update_by` VARCHAR ( 32 ) CHARACTER 
+	`update_by` VARCHAR ( 32 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
 	PRIMARY KEY ( `id` ) USING BTREE,
 	INDEX `idx_resumption_orgId` ( `org_id` ASC ) USING BTREE,
-	INDEX `idx_orgpath` ( `org_path` ( 191 ) ASC ) USING BTREE 
-) ENGINE = INNODB CHARACTER 
+	INDEX `idx_orgpath` ( `org_path` ( 191 ) ASC ) USING BTREE
+) ENGINE = INNODB CHARACTER
 SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 -- ----------------------------
 -- Table structure for core_safety_task_data
@@ -763,20 +763,20 @@ CREATE TABLE `core_safety_task_data` (
 	`task_id` BIGINT NULL DEFAULT NULL COMMENT '检查任务id',
 	`area_id` BIGINT NULL DEFAULT NULL COMMENT '区域id',
 	`value` INT NULL DEFAULT NULL COMMENT '正常不正常，通过不通过，合格不合格',
-	`remark` VARCHAR ( 255 ) CHARACTER 
+	`remark` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '问题描述',
 	`submit_time` datetime NULL DEFAULT NULL COMMENT '提交时间',
 	`submit_by` BIGINT NULL DEFAULT NULL COMMENT '提交人id',
-	`submit_name` VARCHAR ( 50 ) CHARACTER 
+	`submit_name` VARCHAR ( 50 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '提交人名',
-	`is_add` VARCHAR ( 255 ) CHARACTER 
+	`is_add` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '是否为登记界面新增的。0：否，1：是',
-	`rectification_deadline` VARCHAR ( 6 ) CHARACTER 
+	`rectification_deadline` VARCHAR ( 6 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '整改期限字典值',
 	PRIMARY KEY ( `id` ) USING BTREE,
 	INDEX `item_id` ( `point_id` ASC ) USING BTREE,
-	INDEX `check_task_id` ( `task_id` ASC ) USING BTREE 
-) ENGINE = INNODB CHARACTER 
+	INDEX `check_task_id` ( `task_id` ASC ) USING BTREE
+) ENGINE = INNODB CHARACTER
 SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '安全检查项表' ROW_FORMAT = Dynamic;
 -- ----------------------------
 -- Table structure for core_safety_task_data_nfc
@@ -793,11 +793,11 @@ CREATE TABLE `core_safety_task_data_nfc` (
 	`status` INT NULL DEFAULT 0 COMMENT '状态0未扫1以扫',
 	`point_id` BIGINT NULL DEFAULT NULL COMMENT '要点id',
 	`scan_method` INT NULL DEFAULT NULL COMMENT '0:扫描，1：拍照',
-	`img` VARCHAR ( 255 ) CHARACTER 
+	`img` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '拍照路径',
 	PRIMARY KEY ( `id` ) USING BTREE,
-	INDEX `task_id` ( `task_id` ASC ) USING BTREE 
-) ENGINE = INNODB CHARACTER 
+	INDEX `task_id` ( `task_id` ASC ) USING BTREE
+) ENGINE = INNODB CHARACTER
 SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '安全检查nfc扫描表' ROW_FORMAT = Dynamic;
 -- ----------------------------
 -- Table structure for core_safety_task_data_remarkimg
@@ -809,10 +809,10 @@ CREATE TABLE `core_safety_task_data_remarkimg` (
 	`id` BIGINT NOT NULL DEFAULT 0,
 	`task_id` BIGINT NULL DEFAULT NULL COMMENT '安全检查任务id',
 	`task_data_id` BIGINT NULL DEFAULT NULL COMMENT '安全检查项id',
-	`img_path` VARCHAR ( 200 ) CHARACTER 
+	`img_path` VARCHAR ( 200 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '图片存放路径',
-	PRIMARY KEY ( `id` ) USING BTREE 
-) ENGINE = INNODB CHARACTER 
+	PRIMARY KEY ( `id` ) USING BTREE
+) ENGINE = INNODB CHARACTER
 SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '安全检查产生图片表' ROW_FORMAT = Dynamic;
 -- ----------------------------
 -- Table structure for core_safetycheck_rule
@@ -822,26 +822,26 @@ IF
 	EXISTS `core_safetycheck_rule`;
 CREATE TABLE `core_safetycheck_rule` (
 	`id` BIGINT NOT NULL AUTO_INCREMENT,
-	`type` VARCHAR ( 100 ) CHARACTER 
+	`type` VARCHAR ( 100 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '类型',
-	`name` VARCHAR ( 125 ) CHARACTER 
+	`name` VARCHAR ( 125 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '名称',
-	`status` CHAR ( 1 ) CHARACTER 
+	`status` CHAR ( 1 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '0:禁用 1:启用',
 	`org_id` BIGINT NOT NULL COMMENT '发布机构',
-	`org_type` VARCHAR ( 100 ) CHARACTER 
+	`org_type` VARCHAR ( 100 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '机构类型',
-	`remark` VARCHAR ( 255 ) CHARACTER 
+	`remark` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注',
 	`create_time` datetime NULL DEFAULT NULL,
 	`update_time` datetime NULL DEFAULT NULL,
-	`create_by` VARCHAR ( 255 ) CHARACTER 
+	`create_by` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-	`update_by` VARCHAR ( 32 ) CHARACTER 
+	`update_by` VARCHAR ( 32 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
 	`deleted` INT NULL DEFAULT NULL COMMENT '0:未删除 、1：删除',
-	PRIMARY KEY ( `id` ) USING BTREE 
-) ENGINE = INNODB AUTO_INCREMENT = 1701795990306471938 CHARACTER 
+	PRIMARY KEY ( `id` ) USING BTREE
+) ENGINE = INNODB AUTO_INCREMENT = 1701795990306471938 CHARACTER
 SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '安全检查内容库定义\r\n' ROW_FORMAT = Dynamic;
 -- ----------------------------
 -- Table structure for core_safetycheck_rule_item
@@ -852,19 +852,19 @@ IF
 CREATE TABLE `core_safetycheck_rule_item` (
 	`id` BIGINT NOT NULL AUTO_INCREMENT,
 	`rule_id` BIGINT NOT NULL COMMENT '安全检查内容库定义id',
-	`name` VARCHAR ( 100 ) CHARACTER 
+	`name` VARCHAR ( 100 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '检查项名称',
-	`desc` VARCHAR ( 255 ) CHARACTER 
+	`desc` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述',
 	`create_time` datetime NULL DEFAULT NULL,
 	`update_time` datetime NULL DEFAULT NULL,
-	`create_by` VARCHAR ( 255 ) CHARACTER 
+	`create_by` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-	`update_by` VARCHAR ( 32 ) CHARACTER 
+	`update_by` VARCHAR ( 32 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
 	`deleted` INT NULL DEFAULT NULL COMMENT '删除状态，0未删除，1已删除',
-	PRIMARY KEY ( `id` ) USING BTREE 
-) ENGINE = INNODB AUTO_INCREMENT = 1705410983891484674 CHARACTER 
+	PRIMARY KEY ( `id` ) USING BTREE
+) ENGINE = INNODB AUTO_INCREMENT = 1705410983891484674 CHARACTER
 SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '安全检查内容库-检查项' ROW_FORMAT = Dynamic;
 -- ----------------------------
 -- Table structure for core_safetycheck_rule_point
@@ -876,22 +876,22 @@ CREATE TABLE `core_safetycheck_rule_point` (
 	`id` BIGINT NOT NULL AUTO_INCREMENT,
 	`rule_id` BIGINT NOT NULL COMMENT '安全检查内容库定义id',
 	`item_id` BIGINT NOT NULL COMMENT '检查项id',
-	`name` VARCHAR ( 125 ) CHARACTER 
+	`name` VARCHAR ( 125 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '检查内容',
 	`area_id` BIGINT NOT NULL COMMENT '检查区域,区域表id',
-	`business_type` VARCHAR ( 50 ) CHARACTER 
+	`business_type` VARCHAR ( 50 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '要点关联的业务类型来源,要点业务类型,关联字典表code',
-	`remark` VARCHAR ( 255 ) CHARACTER 
+	`remark` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
 	`deleted` INT NULL DEFAULT NULL COMMENT '是否删除, 1是0否',
 	`create_time` datetime NULL DEFAULT NULL,
 	`update_time` datetime NULL DEFAULT NULL,
-	`create_by` VARCHAR ( 255 ) CHARACTER 
+	`create_by` VARCHAR ( 255 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-	`update_by` VARCHAR ( 32 ) CHARACTER 
+	`update_by` VARCHAR ( 32 ) CHARACTER
 	SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-	PRIMARY KEY ( `id` ) USING BTREE 
-) ENGINE = INNODB AUTO_INCREMENT = 1705410983891484676 CHARACTER 
+	PRIMARY KEY ( `id` ) USING BTREE
+) ENGINE = INNODB AUTO_INCREMENT = 1705410983891484676 CHARACTER
 SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '安全检查内容库-检查内容' ROW_FORMAT = Dynamic;
 
 DROP TABLE IF EXISTS `core_safety_dict`;
@@ -958,76 +958,76 @@ IF
 	IF
 		NOT EXISTS ( SELECT * FROM information_schema.COLUMNS WHERE table_schema = DATABASE () AND table_name = 'core_drill_task' AND column_name = 'rec_status' ) THEN
 			ALTER TABLE core_drill_task ADD rec_status INT NULL COMMENT '推荐状态:0:正常案例、1:行社优秀案例、2:已推荐地区优秀案例、3:地区优秀案例、4:已推荐省级优秀案例、5:省级优秀案例' AFTER STATUS;
-		
+
 	END IF;
 	IF
 		NOT EXISTS ( SELECT * FROM information_schema.COLUMNS WHERE table_schema = DATABASE () AND table_name = 'sync_fjnx_org_business_relation' AND column_name = 'tree_show_parent_code' ) THEN
-			ALTER TABLE `sync_fjnx_org_business_relation` ADD COLUMN `tree_show_parent_code` VARCHAR ( 64 ) CHARACTER 
+			ALTER TABLE `sync_fjnx_org_business_relation` ADD COLUMN `tree_show_parent_code` VARCHAR ( 64 ) CHARACTER
 			SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机构树上显示的父级编码' AFTER `business_parent_code`;
-		
+
 	END IF;
 	IF
 		NOT EXISTS ( SELECT * FROM information_schema.COLUMNS WHERE table_schema = DATABASE () AND table_name = 'sync_fjnx_org_business_relation' AND column_name = 'org_type' ) THEN
 			ALTER TABLE `sync_fjnx_org_business_relation` ADD COLUMN `org_type` INT NULL DEFAULT NULL COMMENT '同步配置表自定义机构类型 1：省联社 2：办事处 3: 地区行社' AFTER `tree_show_parent_code`;
-		
+
 	END IF;
 	IF
 		NOT EXISTS ( SELECT * FROM information_schema.COLUMNS WHERE table_schema = DATABASE () AND table_name = 'sync_fjnx_org_business_relation' AND column_name = 'dqhs_org_code' ) THEN
-			ALTER TABLE `sync_fjnx_org_business_relation` ADD COLUMN `dqhs_org_code` VARCHAR ( 255 ) CHARACTER 
+			ALTER TABLE `sync_fjnx_org_business_relation` ADD COLUMN `dqhs_org_code` VARCHAR ( 255 ) CHARACTER
 			SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '办事处对应的地区行社，机构编码是办事处时需要配置' AFTER `org_type`;
-		
+
 	END IF;
 	ALTER TABLE core_protection MODIFY device_id BIGINT;
 	IF
 		NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE  table_schema = DATABASE () and TABLE_NAME = 'core_safety_task' AND COLUMN_NAME = 'des' ) THEN
 			ALTER TABLE core_safety_task ADD COLUMN des VARCHAR ( 4000 ) COMMENT '备注';
-		
+
 	END IF;
 	IF
 		NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE  table_schema = DATABASE () and TABLE_NAME = 'sys_nfc_bind' AND COLUMN_NAME = 'label_name' ) THEN
 			ALTER TABLE sys_nfc_bind ADD COLUMN label_name VARCHAR ( 255 ) COMMENT '标签名称';
-		
+
 	END IF;
 	IF
 		EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and  TABLE_NAME = 'sys_area_check' AND COLUMN_NAME = 'area_id' ) THEN
 			ALTER TABLE sys_area_check DROP COLUMN area_id;
-		
+
 	END IF;
 	IF
 		NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE  table_schema = DATABASE () and TABLE_NAME = 'core_safecheck_plan_to_point' AND COLUMN_NAME = 'required' ) THEN
 			ALTER TABLE core_safecheck_plan_to_point ADD COLUMN required TINYINT ( 1 ) COMMENT '是否必检';
-		
+
 	END IF;
 	IF
 		NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and  TABLE_NAME = 'core_safecheck_plan' AND COLUMN_NAME = 'distribute_status' ) THEN
 			ALTER TABLE core_safecheck_plan ADD COLUMN distribute_status TINYINT ( 1 ) COMMENT '下发状态';
-		
+
 	END IF;
 	IF
 		NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and  TABLE_NAME = 'core_safecheck_plan' AND COLUMN_NAME = 'distribute_plan_status' ) THEN
 			ALTER TABLE core_safecheck_plan ADD COLUMN distribute_plan_status TINYINT ( 1 ) COMMENT '计划下发默认状态';
-		
+
 	END IF;
 	IF
 		NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and  TABLE_NAME = 'core_safecheck_plan' AND COLUMN_NAME = 'parent_id' ) THEN
 			ALTER TABLE core_safecheck_plan ADD COLUMN parent_id TINYINT ( 1 ) COMMENT '计划下发默认状态';
-		
+
 	END IF;
 	IF
 		NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE  table_schema = DATABASE () and TABLE_NAME = 'core_resumption_data' AND COLUMN_NAME = 'data_status' ) THEN
 			ALTER TABLE core_resumption_data ADD COLUMN `data_status` INT NULL DEFAULT NULL COMMENT '数据状态：1保存未处理，2保存已处理';
-		
+
 	END IF;
 	IF
 		NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE  table_schema = DATABASE () and TABLE_NAME = 'sys_user' AND COLUMN_NAME = 'is_manage' ) THEN
 			ALTER TABLE sys_user ADD COLUMN `is_manage` VARCHAR ( 2 ) DEFAULT NULL COMMENT '是否管理人员：Y是，N否';
-		
+
 	END IF;
 	IF
 		NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE  table_schema = DATABASE () and TABLE_NAME = 'core_protection' AND COLUMN_NAME = 'alarm_host_id' ) THEN
 			ALTER TABLE `core_protection` CHANGE COLUMN `alarm_host_code` `alarm_host_id` BIGINT NULL DEFAULT NULL COMMENT '报警主机id' AFTER `org_name`;
 		ALTER TABLE `core_protection_log` CHANGE COLUMN `alarm_host_code` `alarm_host_id` BIGINT NULL DEFAULT NULL COMMENT '报警主机id' AFTER `code`;
-		
+
 	END IF;
 	-- 安全检查是否下发标识
     IF
@@ -1081,12 +1081,24 @@ END IF;
         ALTER TABLE `core_resumption_plan` ADD COLUMN `plan_of_org_type` INT NULL DEFAULT NULL COMMENT '所属机构类型';
 
     END IF;
+
+    -- 安全检查所属机构类型
+    IF
+        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and  TABLE_NAME = 'core_safecheck_plan' AND COLUMN_NAME = 'plan_of_org_type' ) THEN
+        ALTER TABLE `core_safecheck_plan` ADD COLUMN `plan_of_org_type` INT NULL DEFAULT NULL COMMENT '计划所属机构类型';
+
+    END IF;
+
+
 	-- 履职任务NFC表增加submitby
     IF
         NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'core_resumption_data_nfc' AND COLUMN_NAME = 'submit_by' ) THEN
         ALTER TABLE `core_resumption_data_nfc` ADD COLUMN `submit_by` bigint NULL COMMENT '提交人id' AFTER `submit_time`;
 
     END IF;
+
+
+
 	ALTER TABLE `core_protection` MODIFY COLUMN `device_id` BIGINT NULL DEFAULT NULL COMMENT '设备ID' AFTER `id`;
 -- 机构扩展添加是否业务库
 	ALTER TABLE sys_org_extend MODIFY COLUMN business_library INT COMMENT '是否业务库';
@@ -1099,19 +1111,19 @@ END IF;
 	alter table core_edu_training_task  modify status int null comment '任务状态:0:待培训,1:待签名,2:已完成,3:已逾期,4:待提交';
 	alter table sys_menu modify icon mediumtext null comment '菜单图标';
 
-END ?? 
+END ??
 DELIMITER;
 CALL schema_change ();
 
-ALTER TABLE `core_resumption_rule_item` 
+ALTER TABLE `core_resumption_rule_item`
 MODIFY COLUMN `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '履职项名称' AFTER `rule_id`;
 
-ALTER TABLE `core_resumption_rule_point` 
+ALTER TABLE `core_resumption_rule_point`
 MODIFY COLUMN `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '履职要点名称' AFTER `item_id`;
 
-ALTER TABLE `core_safetycheck_rule_item` 
+ALTER TABLE `core_safetycheck_rule_item`
 MODIFY COLUMN `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '检查项名称' AFTER `rule_id`;
-ALTER TABLE `core_safetycheck_rule_point` 
+ALTER TABLE `core_safetycheck_rule_point`
 MODIFY COLUMN `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '检查内容' AFTER `item_id`;
 -- -------------------------------------------------------
 -- ----------修改表脚本 end ----------------------------
@@ -1264,7 +1276,7 @@ INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type
 
 delete from sys_menu where menu_name in('公告通知','公告通知详情','公告通知编辑','新增公告通知','删除公告通知','发布公告通知','取消发布');
 delete from sys_menu where id in(2208,2209,2210,2211,2212,2213,2196);
-INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2196, '公告通知', 2358, 1, 'core/message', 'core/message/index', NULL, 1, 0, 'C', '0', '0', 'core:notification:list', '1', 'dashboard', NULL, '超级管理员', '2023-09-13 17:50:26', '超级管理员', '2023-09-15 16:47:45', '');
+INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2196, '公告通知', 2207, 1, 'core/message', 'core/message/index', NULL, 1, 0, 'C', '0', '0', 'core:notification:list', '1', 'dashboard', NULL, '超级管理员', '2023-09-13 17:50:26', '超级管理员', '2023-09-15 16:47:45', '');
 INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2208, '公告通知详情', 2196, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:notification:query', '1', '#', NULL, '超级管理员', '2023-09-19 15:17:27', '', NULL, '');
 INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2209, '公告通知编辑', 2196, 2, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:notification:edit', '1', '#', NULL, '超级管理员', '2023-09-19 15:17:56', '', NULL, '');
 INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2210, '新增公告通知', 2196, 3, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:notification:add', '1', '#', NULL, '超级管理员', '2023-09-19 15:18:18', '', NULL, '');
@@ -1400,7 +1412,7 @@ INSERT INTO `sys_role` VALUES (128, '4', '运行主管', 'default', 8, 1, 1, 1,
 -- 天气预警end
 
 -- Web演练库按钮及权限
-delete from sys_menu where menu_name in ('预案演练管理','演练');
+delete from sys_menu where menu_name in ('预案演练管理','演练','预案演练');
 INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2319, '预案演练管理', 0, 6, '/drill', null, null, 1, 0, 'M', '0', '0', null, '1', 'dashboard', null, '超级管理员', now(), '', null, '');
 INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (2311, '演练', 0, 12, '/', null, null, 1, 0, 'M', '0', '0', null, '0', '#', null, '超级管理员', now(), '', null, '');
 
@@ -1789,7 +1801,7 @@ DELETE FROM sys_menu WHERE id IN(2359,2360,2361,2362,2363,2364,2365,2207);
 INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
 VALUES (2207, '信息中心', 0, 8, 'infoCore', NULL, NULL, 1, 0, 'M', '0', '0', 'core:send:list', '1', 'documentation', NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
 INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
-VALUES (2359, '信息发送管理', 2207, 3, 'send', 'core/send/index', NULL, 1, 1, 'C', '0', '0', 'core:send:list', '1', 'email', NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
+VALUES (2359, '消息发送管理', 2207, 3, 'send', 'core/send/index', NULL, 1, 1, 'C', '0', '0', 'core:send:list', '1', 'email', NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
 INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
 VALUES (2360, '新增', 2359, 1, NULL, NULL, NULL, 1, 0, 'F', '0', '0', 'core:send:add', '1', NULL, NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
 INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
@@ -2100,4 +2112,4 @@ alter table core_drill_plan
 
 -- -------------------------------------------------------
 -- ----------更新数据 end  ----------------------------
--- -------------------------------------------------------
+-- -------------------------------------------------------

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -833,6 +833,9 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                 throw new ServiceException("计划有已完成或者已逾期的任务，不能被删除。");
             }
             i = tMonitoringRetrievalPlanMapper.updatePlan(monitoringRetrievalPlan);
+            if (i < 1) {
+                return i;
+            }
             iCoreMonitoringRetrievalTaskService.deleteWaitTaskByPlanId(id);
         }
         return i;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/controller/CoreDrillTaskController.java

@@ -138,6 +138,6 @@ public class CoreDrillTaskController extends BaseController {
     @ApiOperation(value = "未完成任务修改成已过期")
     @GetMapping("/updateDrillTaskStatus")
     public AjaxResult updateDrillTaskStatus() {
-        return success(coreDrillTaskService.updateDrillTaskStatus());
+        return toAjax(coreDrillTaskService.updateDrillTaskStatus());
     }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/mapper/CoreDrillPlanMapper.java

@@ -81,4 +81,6 @@ public interface CoreDrillPlanMapper extends BaseMapper<CoreDrillPlan> {
     int updatePlanStatus(@Param("planId") Long planId, @Param("planStatus") int status);
 
     void updatePlanStatusByIdOrParentId(@Param("planId") Long planId, @Param("planStatus") int status);
+
+    void updatePlanStatusByIdList(@Param("list") List<Long> list, @Param("status") int status);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/mapper/CoreDrillTaskMapper.java

@@ -45,6 +45,6 @@ public interface CoreDrillTaskMapper extends BaseMapper<CoreDrillTask> {
 
     List<PanelListVo> selectWaitEvaluateTaskList(@Param("request") PanelListDto panelListDto);
 
-    Integer updateTaskStatus();
+    Integer updateTaskStatus(@Param("status") int status);
 
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillPlanServiceImpl.java

@@ -210,7 +210,7 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
         plan.setPlanStatus(DrillPlanStatus.DRAFT.getCode());
         plan.setStandard(0);
         plan.setIssue(0);
-        //省联社或者办事处创建的计划才存在下发
+        //省联社或者办事处行社创建的计划才存在下发
         if (checkOrgType(org.getType())) {
             plan.setStandard(1);
             plan.setIssue(0);
@@ -218,7 +218,7 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
         plan.setBeIssue(0);
         int insert = coreDrillPlanMapper.insert(plan);
 
-        //如果不是省联社或者办事处，状态启用，并且是无周期或者立即生效
+        //如果不是省联社或者办事处行社，状态启用，并且是无周期或者立即生效
         if ((!checkOrgType(org.getType())) && ObjectUtil.equal(DrillPlanStatus.USING.getCode(), plan.getPlanStatus()) && (ObjectUtil.equal(DrillPlanCycleEnum.NONE.getCode(), plan.getPlanCycle()) || ObjectUtil.equal(1, plan.getBuildTaskNow()))) {
             final CoreDrillPlanDataVo detailPlanData = this.getCoreDrillPlanDataVo(plan.getId());
             coreDrillTaskService.createTaskForNow(detailPlanData, plan.getPlanStartDate(), plan.getPlanEndDate());
@@ -232,7 +232,7 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
             throw new RuntimeException("当前用户所在机构类型无法确认!");
         }
         //如果是省联社或者办事处则返回1，其他机构类型返回0
-        return ObjectUtil.equal(orgType, OrgTypeEnum.SHEGN_LIAN_SHE.getCode()) || ObjectUtil.equal(orgType, OrgTypeEnum.BAN_SHI_CHU.getCode());
+        return ObjectUtil.equal(orgType, OrgTypeEnum.SHEGN_LIAN_SHE.getCode()) || ObjectUtil.equal(orgType, OrgTypeEnum.BAN_SHI_CHU.getCode()) || ObjectUtil.equal(orgType, OrgTypeEnum.HANG_SHE.getCode());
     }
 
     /**
@@ -269,8 +269,8 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
         plan.setFileList(ObjectUtil.isNotEmpty(request.getFileList()) ? JSON.toJSONString(request.getFileList()) : null);
         plan.setUpdateBy(SecurityUtils.getLoginUser().getSysUser().getId().toString());
         coreDrillPlanToRoleMapper.deleteByMap(MapUtil.of("plan_id", plan.getId()));
-        //List<CoreEduTrainingPlanToRole> trainingPlanToRoleList = batchSavePlanToRole(request.getPlanRoleId(), plan.getId());
         coreDrillPlanToExecOrgMapper.deleteByMap(MapUtil.of("plan_id", plan.getId()));
+        batchSavePlanToRole(request.getPlanRoleId(), plan.getId());
         batchSavePlanToExecOrg(request.getPlanExecOrgIdList(), plan.getId());
         coreDrillPlanMapper.updateById(plan);
     }
@@ -282,7 +282,7 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
         Long planId = plan.getId();
         // 判断标准计划能否修改:存在下发的计划生成了任务且任务存在已执行
         Integer standardPlanHasDone = coreDrillTaskMapper.checkHasTaskIsDoneByPlanParentId(planId);
-        if (standardPlanHasDone == 1) {
+        if (ObjectUtil.equal(standardPlanHasDone, 1)) {
             //验证修改的字段是否符合要求
             String errorMsg = "有任务已执行或已过期,仅允许修改培训主题!";
             validatePlanForStandard(request, plan, errorMsg, 1);
@@ -453,18 +453,24 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
         if (ObjectUtil.equal(plan.getIssue(), 1)) {
             throw new SystemException("计划已完成发布!");
         }
-        // 下发 按钮显示逻辑:仅省联社安全保卫管理人员进入且由省联社管理安全保卫人员创建的计划才显示
-        //todo 判断当前人的角色信息
-        List<CoreDrillPlan> list = buildPlanData(plan, new ArrayList<>(), true);
+        List<CoreDrillPlan> planList = lambdaQuery().eq(CoreDrillPlan::getParentId, planId).select(CoreDrillPlan::getId).list();
+        if (planList.isEmpty()) {
+            planList = buildPlanData(plan, new ArrayList<>(), true);
+        } else {
+            planList.forEach(plan1 -> plan1.setPlanStatus(EduTrainingPlanStatus.USING.getCode()));
+            List<Long> collect = planList.stream().map(CoreDrillPlan::getId).collect(Collectors.toList());
+            coreDrillPlanMapper.updatePlanStatusByIdList(collect, EduTrainingPlanStatus.USING.getCode());
+        }
         //下发后修改为使用中
         plan.setPlanStatus(DrillPlanStatus.USING.getCode());
         plan.setIssue(1);
         this.updateById(plan);
         //事务提交后执行
+        List<CoreDrillPlan> finalPlanList = planList;
         TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() {
             @Override
             public void afterCommit() {
-                for (CoreDrillPlan drillPlan : list) {
+                for (CoreDrillPlan drillPlan : finalPlanList) {
                     CompletableFuture.runAsync(() -> {
                         //如果不是省联社或者办事处，状态启用，并且是无周期或者立即生效
                         if ((ObjectUtil.equal(DrillPlanStatus.USING.getCode(), plan.getPlanStatus()) && (ObjectUtil.equal(DrillPlanCycleEnum.NONE.getCode(), plan.getPlanCycle()) || ObjectUtil.equal(1, plan.getBuildTaskNow())))) {
@@ -483,6 +489,7 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
     public int revocationPlan(Long planId) {
         CoreDrillPlan plan = getById(planId);
         plan.setIssue(0);
+        plan.setPlanStatus(EduTrainingPlanStatus.DELETED.getCode());
         DateRange range = DateUtils.getStartAndEnd(new Date(), plan.getPlanCycle());
         List<Long> list = coreDrillPlanMapper.selectIdByParentId(planId);
         coreDrillPlanMapper.updatePlanStatusByIdOrParentId(planId, EduTrainingPlanStatus.DELETED.getCode());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -58,6 +58,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
@@ -339,7 +340,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         saveTaskAndRoleData(plan, start, end, execOrgList);
     }
 
-    private List<SysOrg> getExecOrgList(CoreDrillPlanDataVo plan, Date start, Date end){
+    private List<SysOrg> getExecOrgList(CoreDrillPlanDataVo plan, Date start, Date end) {
         List<CoreDrillPlanToExecOrg> planExecOrgList = plan.getPlanExecOrgList();
         List<SysOrg> orgList;
         if (ObjectUtil.isEmpty(planExecOrgList)) {
@@ -352,7 +353,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         List<Long> orgIdList = orgList.stream().map(SysOrg::getId).collect(Collectors.toList());
         String startTime = DateUtil.format(start, Constants.DAILY_FORMAT);
         String endTime = DateUtil.format(end, Constants.DAILY_FORMAT);
-        WorkTimeDto workTimeDto= new WorkTimeDto();
+        WorkTimeDto workTimeDto = new WorkTimeDto();
         workTimeDto.setOrgIdList(orgIdList);
         workTimeDto.setStartTime(startTime);
         workTimeDto.setEndTime(endTime);
@@ -366,7 +367,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         List<Long> workOrgIdList = workTimeList.stream().filter(time -> ObjectUtil.equal(time.getIsEnable(), WORK))
                 .map(SysWorkTime::getOrgId).collect(Collectors.toList());
         return orgList.stream().filter(org -> workOrgIdList.contains(org.getId())).collect(Collectors.toList());
-       // return orgList;
+        // return orgList;
 
     }
 
@@ -375,8 +376,15 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         List<CoreDrillTask> taskList = new ArrayList<>();
         List<CoreDrillTaskToRole> taskRoleList = new ArrayList<>();
         Map<Integer, DateRange> dateRangeMap = DateUtils.splitDateRange(start, end, plan.getExecTimes());
+
         for (SysOrg org : orgList) {
             for (int i = 1; i <= plan.getExecTimes(); i++) {
+                final LocalDateTime time = DateUtils.toLocalDateTime(DateUtils.getPreciseTime(dateRangeMap.get(i).getEndTime()));
+                if (time.isBefore(LocalDateTime.now())) {
+                    //如果任务的结束时间 已经小于当前时间则没必要生成任务了,
+                    //用于处理周期中生成多次任务,周期初的任务一经生成就无法执行(预期)的问题,
+                    continue;
+                }
                 CoreDrillTask trainingTask = new CoreDrillTask();
                 trainingTask.setId(IdWorker.getId());
                 trainingTask.setPlanId(plan.getId());
@@ -410,8 +418,6 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
                     taskRoleList.add(coreDrillTaskToRole);
                 }
             }
-
-
         }
         if (ObjectUtil.isNotEmpty(taskList)) {
             this.saveBatch(taskList);
@@ -635,7 +641,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
                 //此处因为planService会导致循环依赖
                 final CoreDrillPlanDataVo detailPlanData = coreDrillPlanMapper.getDetailPlanData(plan.getId());
                 detailPlanData.setFileList(ObjectUtil.isNotEmpty(detailPlanData.getFile()) ? JSON.parseArray(detailPlanData.getFile(), String.class) : null);
-                DateRange range = DateUtils.getStartAndEnd(finalDate, EduTrainingPlanCycleEnum.toCommmonEnum( plan.getPlanCycle()));
+                DateRange range = DateUtils.getStartAndEnd(finalDate, EduTrainingPlanCycleEnum.toCommmonEnum(plan.getPlanCycle()));
                 this.createTaskForNow(detailPlanData, range.getStartTime(), range.getEndTime());
             }, threadPoolTaskExecutor);
         }
@@ -883,7 +889,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
     @Override
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public Integer updateDrillTaskStatus() {
-        return coreDrillTaskMapper.updateTaskStatus();
+        return coreDrillTaskMapper.updateTaskStatus(DrillDoStatus.OVERDUE.getCode());
     }
 
     @Override

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingTaskServiceImpl.java

@@ -70,6 +70,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.NumberFormat;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
@@ -436,11 +437,17 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
     private void saveTaskAndRoleData(CoreEduTrainingPlanDataVo plan, Date start, Date end, List<SysOrg> orgList) {
         //List<CoreEduTrainingPlanToRole> planRoleList = plan.getPlanRoleList();
         List<CoreEduTrainingTask> taskList = new ArrayList<>();
-        List<CoreEduTrainingTaskToRole> taskRoleList = new ArrayList<>();
+        //List<CoreEduTrainingTaskToRole> taskRoleList = new ArrayList<>();
         Map<Integer, DateRange> dateRangeMap = DateUtils.splitDateRange(start, end, plan.getExecTimes());
         Date date = new Date();
         for (SysOrg org : orgList) {
             for (int i = 1; i <= plan.getExecTimes(); i++) {
+                final LocalDateTime time = DateUtils.toLocalDateTime(DateUtils.getPreciseTime(dateRangeMap.get(i).getEndTime()));
+                if (time.isBefore(LocalDateTime.now())) {
+                    //如果任务的结束时间 已经小于当前时间则没必要生成任务了,
+                    //用于处理周期中生成多次任务,周期初的任务一经生成就无法执行(预期)的问题,
+                    continue;
+                }
                 DateRange dateRange = dateRangeMap.get(i);
                 CoreEduTrainingTask trainingTask = new CoreEduTrainingTask();
                 trainingTask.setId(IdWorker.getId());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppPlanServiceImpl.java

@@ -215,7 +215,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
             baseMapper.updateById(ap);
             //撤回需要删除本周期所有任务
             DateRange dateRange = DateUtils.getStartAndEnd(new Date(), plan.getPlanCycle());
-            resumptionMapper.delete(new LambdaQueryWrapper<Resumption>().eq(Resumption::getPlanId, plan.getId()).between(Resumption::getYmdDate, dateRange.getStartTime(), dateRange.getEndTime()));
+            resumptionMapper.delete(new LambdaQueryWrapper<Resumption>().eq(Resumption::getPlanId, ap.getId()).between(Resumption::getYmdDate, dateRange.getStartTime(), dateRange.getEndTime()));
 
         }
         //设置下发状态为未下发

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/ICoreMonitoringRetrievalTaskService.java

@@ -112,62 +112,24 @@ public interface ICoreMonitoringRetrievalTaskService extends IService<CoreMonito
 
     /**
      * 根据计划删除所有任务
+     *
      * @param planId
      */
     void deleteAllTaskByPlanId(Long planId);
 
     /**
      * 删除日任务
+     *
      * @param planId
      * @param cycle
      * @param ymdDate
      */
-    void  deleteDayTaskByPlanId(Long planId, String cycle, LocalDate ymdDate);
-void  deleteDayTaskByTime(Long planId, String cycle,Date startTime,Date endTime);
-void  deleteDayTaskByTimeAndPlanId(Long planId, String cycle,Date startTime,Date endTime);
-    /**
-     * 删除周任务
-     * @param planId
-     * @param cycle
-     * @param week
-     * @param year
-     */
-    void  deleteWeekTaskByPlanId(Long planId, String cycle, String week, String year);
+    void deleteDayTaskByPlanId(Long planId, String cycle, LocalDate ymdDate);
 
-    /**
-     * 删除月任务
-     * @param planId
-     * @param cycle
-     * @param month
-     * @param year
-     */
-    void  deleteMonthTaskByPlanId(Long planId, String cycle, String month, String year);
+    void deleteDayTaskByTime(Long planId, String cycle, Date startTime, Date endTime);
 
-    /**
-     * 删除季度任务
-     * @param planId
-     * @param cycle
-     * @param quarter
-     * @param year
-     */
-    void  deleteQuarterTaskByPlanId(Long planId, String cycle, String quarter, String year);
+    void deleteDayTaskByTimeAndPlanId(Long planId, String cycle, Date startTime, Date endTime);
 
-    /**
-     * 删除半年任务
-     * @param planId
-     * @param cycle
-     * @param halfYear
-     * @param year
-     */
-    void  deleteHalfYearTaskByPlanId(Long planId, String cycle, String halfYear, String year);
-
-    /**
-     * 删除年任务
-     * @param planId
-     * @param cycle
-     * @param year
-     */
-    void  deleteYearTaskByPlanId(Long planId, String cycle, String year);
     void deleteWaitTaskByPlanId(Long planId);
 
     void updateDeleteTaskByPlanId(Long planId, Integer isDeleted);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/impl/CoreMonitoringRetrievalTaskServiceImpl.java

@@ -413,33 +413,10 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
 
     @Override
     public void deleteDayTaskByTimeAndPlanId(Long planId, String cycle, Date startTime, Date endTime) {
-
-    }
-
-    @Override
-    public void deleteWeekTaskByPlanId(Long planId, String cycle, String week, String year) {
-
+        coreMonitoringRetrievalTaskMapper.deleteDayTaskByTimeAndPlanId(planId,cycle,startTime,endTime);
     }
 
-    @Override
-    public void deleteMonthTaskByPlanId(Long planId, String cycle, String month, String year) {
-
-    }
-
-    @Override
-    public void deleteQuarterTaskByPlanId(Long planId, String cycle, String quarter, String year) {
 
-    }
-
-    @Override
-    public void deleteHalfYearTaskByPlanId(Long planId, String cycle, String halfYear, String year) {
-
-    }
-
-    @Override
-    public void deleteYearTaskByPlanId(Long planId, String cycle, String year) {
-
-    }
 
     @Override
     public void deleteWaitTaskByPlanId(Long planId) {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/controller/CoreSafecheckPlanController.java

@@ -116,20 +116,24 @@ public class CoreSafecheckPlanController extends BaseController {
             coreSafecheckPlanService.distributeToOrg(dto);
             //下发完成生成任务
             CoreSafecheckPlan plan = coreSafecheckPlanService.getById(dto.getId());
-            int cycle = Math.toIntExact(plan.getPlanCycle());
-            DateTime datetime = new DateTime();
-            datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
-            DateHelper dateHelper = new DateHelper(datetime);
-            Map<String, Date> map=null;
-            //如果无周期
-            if(cycle==6){
-                map = DateHelper.getStartAndEnd(dateHelper, null);
-                map.put("start", plan.getStartDate());
-                map.put("end", plan.getEndDate());
-            }else{
-                map = DateHelper.getStartAndEnd(dateHelper, cycle);
+            //如果选择了立即生效或者无周期
+            if(plan.isBuildTaskNow()||plan.getPlanCycle()==6){
+                int cycle = Math.toIntExact(plan.getPlanCycle());
+                DateTime datetime = new DateTime();
+                datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
+                DateHelper dateHelper = new DateHelper(datetime);
+                Map<String, Date> map=null;
+                //如果无周期
+                if(cycle==6){
+                    map = DateHelper.getStartAndEnd(dateHelper, null);
+                    map.put("start", plan.getStartDate());
+                    map.put("end", plan.getEndDate());
+                }else{
+                    map = DateHelper.getStartAndEnd(dateHelper, cycle);
+                }
+                jobBusiness.createTask(datetime, cycle, map.get("start"), map.get("end"));
             }
-            jobBusiness.createTask(datetime, cycle, map.get("start"), map.get("end"));
+
             return AjaxResult.success();
         } catch (Exception e) {
             e.printStackTrace();

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/domain/CoreSafecheckPlan.java

@@ -59,8 +59,7 @@ public class CoreSafecheckPlan extends BaseEntity {
     private String planName;
     @TableField(exist = false)
     private String checkRole;
-    @TableField(exist = false)
-    private String planOfOrgType;
+    private Integer planOfOrgType;
     /**
      * 检查角色
      */
@@ -221,7 +220,9 @@ public class CoreSafecheckPlan extends BaseEntity {
      * 检查次数
      */
     private Long count;
-
+    //涉及编辑内容
+    @TableField(exist = false)
+    private Integer hasEdit;
 
     @Override
     public String toString() {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/CoreSafecheckPlanServiceImpl.java

@@ -6,12 +6,15 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.xunmei.common.core.constant.SecurityConstants;
+import com.xunmei.common.core.domain.DateRange;
 import com.xunmei.common.core.utils.DateHelper;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.resumption.domain.AppPlan;
 import com.xunmei.core.resumption.domain.AppPlanToPoint;
 import com.xunmei.core.resumption.domain.AppPlanToRole;
+import com.xunmei.core.resumption.domain.Resumption;
 import com.xunmei.core.resumption.dto.DistributeDto;
 import com.xunmei.core.resumption.dto.DistributeStatusDto;
 import com.xunmei.core.resumption.vo.appPlan.ResumptionPlanPageVo;
@@ -55,6 +58,8 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
     private CoreSafecheckPlanToPointMapper coreSafecheckPlanToPointMapper;
     @Autowired
     private SafetyCheckJobBusiness safetyCheckJobBusiness;
+    @Autowired
+    private CoreSafetyTaskMapper coreSafetyTaskMapper;
 
     @Override
     public TableDataInfo<CoreSafecheckPlan> selectPage(CoreSafecheckPlan coreSafecheckPlan) {
@@ -103,13 +108,23 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
     public void distributeToOrg(DistributeDto dto) {
         for (DistributeStatusDto d :
                 dto.getOrgAndStatus()) {
+            CoreSafecheckPlan plan = baseMapper.selectOne(new LambdaQueryWrapper<CoreSafecheckPlan>().eq(CoreSafecheckPlan::getPlanOfOrgId, d.getOrgId()).eq(CoreSafecheckPlan::getParentId, dto.getId()));
+            //如果子计划计划已存在
+            if (plan != null) {
+                plan.setPlanStatus((long) (d.getStatus() > 0 ? 1 : 2));
+                plan.setDistributePlanStatus(d.getStatus().toString());
+                plan.setDistributeStatus("1");
+                baseMapper.updateById(plan);
+            }else{
 
             CoreSafecheckPlan coreSafecheckPlan = baseMapper.selectById(dto.getId());
             coreSafecheckPlan.setDistributeStatus("1");
             coreSafecheckPlan.setPlanOfOrgId(d.getOrgId());
-            coreSafecheckPlan.setPlanStatus((long) (d.getStatus() == 0 ? 2 : 1));
+            coreSafecheckPlan.setPlanStatus((long) (d.getStatus() > 0 ? 1 : 2));
             coreSafecheckPlan.setDistributePlanStatus(d.getStatus().toString());
             coreSafecheckPlan.setCreateTime(new Date());
+            //下发所属机构类型
+            coreSafecheckPlan.setPlanOfOrgType(orgService.selectSysOrgById(coreSafecheckPlan.getPlanOfOrgId(), SecurityConstants.INNER).getType());
             coreSafecheckPlan.setId(null);
 //            if (coreSafecheckPlan.getPlanCycle()==6){
 //                coreSafecheckPlan.setStartDate();
@@ -160,11 +175,13 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
                 }
             }
         }
+        }
         //更改下发状态
         CoreSafecheckPlan coreSafecheckPlan = new CoreSafecheckPlan();
         coreSafecheckPlan.setId(dto.getId());
         coreSafecheckPlan.setDistribute("1");
         coreSafecheckPlan.setPlanStatus(1L);
+        coreSafecheckPlan.setBuildTaskNow(coreSafecheckPlanMapper.selectById(dto.getId()).isBuildTaskNow());
         coreSafecheckPlanMapper.updateById(coreSafecheckPlan);
     }
 
@@ -178,11 +195,20 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
 //修改计划状态为停用
             ap.setPlanStatus(2L);
             baseMapper.updateById(ap);
+
+            //撤回需要删除本周期所有任务
+            DateRange dateRange = DateUtils.getStartAndEnd(new Date(), Math.toIntExact(plan.getPlanCycle()));
+            coreSafetyTaskMapper.delete(new LambdaQueryWrapper<CoreSafetyTask>().eq(CoreSafetyTask::getPlanId, ap.getId()).between(CoreSafetyTask::getYmdDate, dateRange.getStartTime(), dateRange.getEndTime()));
+
         }
         //设置下发状态为未下发
         plan.setDistribute("0");
-        plan.setPlanStatus(0L);
+        plan.setPlanStatus(2L);
         baseMapper.updateById(plan);
+        //撤回需要删除本周期所有任务
+        DateRange dateRange = DateUtils.getStartAndEnd(new Date(), Math.toIntExact(plan.getPlanCycle()));
+        coreSafetyTaskMapper.delete(new LambdaQueryWrapper<CoreSafetyTask>().eq(CoreSafetyTask::getPlanId, plan.getId()).between(CoreSafetyTask::getYmdDate, dateRange.getStartTime(), dateRange.getEndTime()));
+
     }
 
     @Override
@@ -191,7 +217,7 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
         //修改所有子计划
         List<CoreSafecheckPlan> appPlans = baseMapper.selectList(new LambdaQueryWrapper<CoreSafecheckPlan>().eq(CoreSafecheckPlan::getParentId, id));
         //如果不存在子计划直接返回
-        if(appPlans==null||appPlans.size()==0){
+        if (appPlans == null || appPlans.size() == 0) {
             return 0;
         }
         for (CoreSafecheckPlan ap :
@@ -216,7 +242,24 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
      */
     @Override
     public CoreSafecheckPlan selectCoreSafecheckPlanById(Long id) {
-        return coreSafecheckPlanMapper.selectCoreSafecheckPlanById(id);
+        CoreSafecheckPlan coreSafecheckPlan = coreSafecheckPlanMapper.selectCoreSafecheckPlanById(id);
+        Long sum=coreSafetyTaskMapper.selectCount(new LambdaQueryWrapper<CoreSafetyTask>().eq(CoreSafetyTask::getPlanId, id).in(CoreSafetyTask::getStatus, 3,4));
+        if (sum > 0) {
+            //如果存在完成或者逾期的任务设置编辑状态为1
+            coreSafecheckPlan.setHasEdit(1);
+        }
+        //查找子计划是否存在完成或者逾期的任务
+        List<CoreSafecheckPlan> appPlans = baseMapper.selectList(new LambdaQueryWrapper<CoreSafecheckPlan>().eq(CoreSafecheckPlan::getParentId, id));
+        for (CoreSafecheckPlan p :
+                appPlans) {
+            Long csum=coreSafetyTaskMapper.selectCount(new LambdaQueryWrapper<CoreSafetyTask>().eq(CoreSafetyTask::getPlanId, p.getId()).in(CoreSafetyTask::getStatus, 3,4));
+            if (csum > 0) {
+                //如果存在完成或者逾期的任务设置编辑状态为1
+                coreSafecheckPlan.setHasEdit(1);
+                break;
+            }
+        }
+        return coreSafecheckPlan;
     }
 
     /**
@@ -238,7 +281,7 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
      */
     @Override
     public void insertCoreSafecheckPlan(CoreSafecheckPlan coreSafecheckPlan) {
-        if(coreSafecheckPlan.getRulePointList().size()==0){
+        if (coreSafecheckPlan.getRulePointList().size() == 0) {
             throw new RuntimeException("未选择检查项!");
         }
 
@@ -250,6 +293,8 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
             coreSafecheckPlan.setCreateTime(DateUtils.getNowDate());
             coreSafecheckPlan.setModifiedBy(SecurityUtils.getUserId());
             coreSafecheckPlan.setDistribute("0");
+            //计划所属机构类型
+            coreSafecheckPlan.setPlanOfOrgType(orgService.selectSysOrgById(coreSafecheckPlan.getPlanOfOrgId(), SecurityConstants.INNER).getType());
             coreSafecheckPlanMapper.insert(coreSafecheckPlan);
 
         } else {
@@ -297,21 +342,21 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
             }
         }
 
-        //如果是新增计划并且勾选立即执行
-        if (pid==null&&coreSafecheckPlan.isBuildTaskNow()) {
+        //如果是新增计划并且勾选立即执行并且是行社或者无周期,立即生成计划
+        if (pid == null && coreSafecheckPlan.isBuildTaskNow() && (coreSafecheckPlan.getPlanOfOrgType() == 3 || coreSafecheckPlan.getPlanCycle() == 6)) {
             DateTime datetime = new DateTime();
             datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
             DateHelper dateHelper = new DateHelper(datetime);
             int cycle = Math.toIntExact(coreSafecheckPlan.getPlanCycle());
 //        SCHEDULEDTASKSLOG.info("开始生成每周常规安全检查任务!");
             try {
-                Map<String, Date> map=null;
+                Map<String, Date> map = null;
                 //如果无周期
-                if(cycle==6){
+                if (cycle == 6) {
                     map = DateHelper.getStartAndEnd(dateHelper, null);
                     map.put("start", coreSafecheckPlan.getStartDate());
                     map.put("end", coreSafecheckPlan.getEndDate());
-                }else{
+                } else {
                     map = DateHelper.getStartAndEnd(dateHelper, cycle);
                 }
 
@@ -320,72 +365,72 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
                 throw new RuntimeException("生成常规安全检查任务失败!");
             }
         }
-
-
-        //处理子计划
-        //拿到所有子计划
-        List<CoreSafecheckPlan> children = baseMapper.selectList(new LambdaQueryWrapper<CoreSafecheckPlan>().eq(CoreSafecheckPlan::getParentId, coreSafecheckPlan.getId()));
-        coreSafecheckPlan = baseMapper.selectById(coreSafecheckPlan.getId());
-        for (CoreSafecheckPlan p :
-                children) {
-            p.setPlanName(coreSafecheckPlan.getPlanName());
-            p.setBuildTaskNow(coreSafecheckPlan.isBuildTaskNow());
-            p.setCheckOrgType(coreSafecheckPlan.getCheckOrgType());
-            p.setCheckType(coreSafecheckPlan.getCheckType());
-            p.setCount(coreSafecheckPlan.getCount());
-            p.setDescription(coreSafecheckPlan.getDescription());
-            p.setExecOrgType(coreSafecheckPlan.getExecOrgType());
-            p.setPlanCycle(coreSafecheckPlan.getPlanCycle());
-            p.setPlanStatus(coreSafecheckPlan.getPlanStatus());
-            p.setSourceType(coreSafecheckPlan.getSourceType());
-            baseMapper.updateById(p);
-
-
-            //拿到父计划的所有角色映射
-            List<CoreSafecheckPlanToRole> roleList = coreSafecheckPlanToRoleMapper.selectList(new LambdaQueryWrapper<CoreSafecheckPlanToRole>().eq(CoreSafecheckPlanToRole::getPlanId, coreSafecheckPlan.getId()));
-            //再处理角色关系
-            if (roleList != null) {
-                //删除子计划原角色映射
-                coreSafecheckPlanToRoleMapper.deleteCoreSafecheckPlanToRoleByPlanId(p.getId());
-                for (CoreSafecheckPlanToRole r :
-                        roleList) {
-                    //添加来自父计划的角色映射
-                    coreSafecheckPlanToRoleMapper.insert(new CoreSafecheckPlanToRole(p.getId(), r.getRoleId()));
-
+//如果编辑需要处理子计划
+        if (pid == null) {
+            //处理子计划
+            //拿到所有子计划
+            List<CoreSafecheckPlan> children = baseMapper.selectList(new LambdaQueryWrapper<CoreSafecheckPlan>().eq(CoreSafecheckPlan::getParentId, coreSafecheckPlan.getId()));
+            coreSafecheckPlan = baseMapper.selectById(coreSafecheckPlan.getId());
+            for (CoreSafecheckPlan p :
+                    children) {
+                p.setPlanName(coreSafecheckPlan.getPlanName());
+                p.setBuildTaskNow(coreSafecheckPlan.isBuildTaskNow());
+                p.setCheckOrgType(coreSafecheckPlan.getCheckOrgType());
+                p.setCheckType(coreSafecheckPlan.getCheckType());
+                p.setCount(coreSafecheckPlan.getCount());
+                p.setDescription(coreSafecheckPlan.getDescription());
+                p.setExecOrgType(coreSafecheckPlan.getExecOrgType());
+                p.setPlanCycle(coreSafecheckPlan.getPlanCycle());
+                p.setPlanStatus(coreSafecheckPlan.getPlanStatus());
+                p.setSourceType(coreSafecheckPlan.getSourceType());
+                baseMapper.updateById(p);
+
+
+                //拿到父计划的所有角色映射
+                List<CoreSafecheckPlanToRole> roleList = coreSafecheckPlanToRoleMapper.selectList(new LambdaQueryWrapper<CoreSafecheckPlanToRole>().eq(CoreSafecheckPlanToRole::getPlanId, coreSafecheckPlan.getId()));
+                //再处理角色关系
+                if (roleList != null) {
+                    //删除子计划原角色映射
+                    coreSafecheckPlanToRoleMapper.deleteCoreSafecheckPlanToRoleByPlanId(p.getId());
+                    for (CoreSafecheckPlanToRole r :
+                            roleList) {
+                        //添加来自父计划的角色映射
+                        coreSafecheckPlanToRoleMapper.insert(new CoreSafecheckPlanToRole(p.getId(), r.getRoleId()));
+
+                    }
                 }
-            }
-            //再处理检查机构关系
-            List<CoreSafecheckPlanToExecOrg> execOrgList = coreSafecheckPlanToExecOrgMapper.selectList(new LambdaQueryWrapper<CoreSafecheckPlanToExecOrg>().eq(CoreSafecheckPlanToExecOrg::getPlanId, coreSafecheckPlan.getId()));
-            if (execOrgList != null) {
-                coreSafecheckPlanToExecOrgMapper.deleteCoreSafecheckPlanToExecOrgByPlanId(p.getId());
-                for (CoreSafecheckPlanToExecOrg org :
-                        execOrgList) {
-                    coreSafecheckPlanToExecOrgMapper.insert(new CoreSafecheckPlanToExecOrg(p.getId(), org.getOrgId()));
-
+                //再处理检查机构关系
+                List<CoreSafecheckPlanToExecOrg> execOrgList = coreSafecheckPlanToExecOrgMapper.selectList(new LambdaQueryWrapper<CoreSafecheckPlanToExecOrg>().eq(CoreSafecheckPlanToExecOrg::getPlanId, coreSafecheckPlan.getId()));
+                if (execOrgList != null) {
+                    coreSafecheckPlanToExecOrgMapper.deleteCoreSafecheckPlanToExecOrgByPlanId(p.getId());
+                    for (CoreSafecheckPlanToExecOrg org :
+                            execOrgList) {
+                        coreSafecheckPlanToExecOrgMapper.insert(new CoreSafecheckPlanToExecOrg(p.getId(), org.getOrgId()));
+
+                    }
                 }
-            }
-            //再处理受检机构关系
-            List<CoreSafecheckPlanToCheckOrg> checkOrgList = coreSafecheckPlanToCheckOrgMapper.selectList(new LambdaQueryWrapper<CoreSafecheckPlanToCheckOrg>().eq(CoreSafecheckPlanToCheckOrg::getPlanId, coreSafecheckPlan.getId()));
-            if (checkOrgList != null) {
-                coreSafecheckPlanToCheckOrgMapper.deleteCoreSafecheckPlanToCheckOrgByPlanId(p.getId());
-                for (CoreSafecheckPlanToCheckOrg org :
-                        checkOrgList) {
-                    coreSafecheckPlanToCheckOrgMapper.insert(new CoreSafecheckPlanToCheckOrg(p.getId(), org.getOrgId()));
-
+                //再处理受检机构关系
+                List<CoreSafecheckPlanToCheckOrg> checkOrgList = coreSafecheckPlanToCheckOrgMapper.selectList(new LambdaQueryWrapper<CoreSafecheckPlanToCheckOrg>().eq(CoreSafecheckPlanToCheckOrg::getPlanId, coreSafecheckPlan.getId()));
+                if (checkOrgList != null) {
+                    coreSafecheckPlanToCheckOrgMapper.deleteCoreSafecheckPlanToCheckOrgByPlanId(p.getId());
+                    for (CoreSafecheckPlanToCheckOrg org :
+                            checkOrgList) {
+                        coreSafecheckPlanToCheckOrgMapper.insert(new CoreSafecheckPlanToCheckOrg(p.getId(), org.getOrgId()));
+
+                    }
                 }
-            }
-            //再处理检查要点关系
-            List<CoreSafecheckPlanToPoint> rpList = coreSafecheckPlanToPointMapper.selectList(new LambdaQueryWrapper<CoreSafecheckPlanToPoint>().eq(CoreSafecheckPlanToPoint::getPlanId, coreSafecheckPlan.getId()));
-            if (rpList != null) {
-                coreSafecheckPlanToPointMapper.deleteCoreSafecheckPlanToPointByPlanId(p.getId());
-                for (CoreSafecheckPlanToPoint s :
-                        rpList) {
-                    coreSafecheckPlanToPointMapper.insert(new CoreSafecheckPlanToPoint(p.getId(), s.getPointId(), s.isPointScan(), s.isRequired()));
-
+                //再处理检查要点关系
+                List<CoreSafecheckPlanToPoint> rpList = coreSafecheckPlanToPointMapper.selectList(new LambdaQueryWrapper<CoreSafecheckPlanToPoint>().eq(CoreSafecheckPlanToPoint::getPlanId, coreSafecheckPlan.getId()));
+                if (rpList != null) {
+                    coreSafecheckPlanToPointMapper.deleteCoreSafecheckPlanToPointByPlanId(p.getId());
+                    for (CoreSafecheckPlanToPoint s :
+                            rpList) {
+                        coreSafecheckPlanToPointMapper.insert(new CoreSafecheckPlanToPoint(p.getId(), s.getPointId(), s.isPointScan(), s.isRequired()));
+
+                    }
                 }
             }
         }
-
     }
 
     /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/weather/service/impl/WeatherWarningServiceImpl.java

@@ -141,7 +141,7 @@ public class WeatherWarningServiceImpl extends ServiceImpl<WeatherWarningMapper,
         List<CityInfoVo> list = baseMapper.cityInfoVoList();
         List<CityInfoVo> lista = list.stream().filter(r->r.getGroupId().equals("-1")).collect(Collectors.toList());
         lista.forEach(r->{
-            SelectCityInfoVo selectCityInfoVo = SelectCityInfoVo.builder().value(r.getAreaId()).label(r.getNameCn()).children(new ArrayList<>()).build();
+            SelectCityInfoVo selectCityInfoVo = SelectCityInfoVo.builder().value(r.getAreaId()+r.getGroupId()).label(r.getNameCn()).children(new ArrayList<>()).build();
             List<CityInfoVo> listb = list.stream().filter(s->s.getGroupId().equals(r.getAreaId())||s.getAreaId().equals(r.getAreaId())).collect(Collectors.toList());
             listb.forEach(a->{
                 selectCityInfoVo.getChildren().add(SelectCityInfoVo.builder().value(a.getAreaId()).label(a.getNameCn()).build());

soc-modules/soc-modules-core/src/main/resources/mapper/drill/CoreDrillPlanMapper.xml

@@ -652,4 +652,11 @@
         where id = #{planId}
            or parent_id = #{planId}
     </update>
+
+    <update id="updatePlanStatusByIdList">
+        update core_drill_plan set plan_status = #{status} where id in
+        <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </update>
 </mapper>

soc-modules/soc-modules-core/src/main/resources/mapper/drill/CoreDrillTaskMapper.xml

@@ -331,7 +331,7 @@
 
     <update id="updateTaskStatus">
         update core_drill_task
-        set status=3
+        set status=#{status}
         where end_date <![CDATA[<]]> now()
           and status in (0, 1)
     </update>

soc-modules/soc-modules-core/src/main/resources/mapper/retrieval/CoreMonitoringRetrievalTaskMapper.xml

@@ -115,10 +115,10 @@
             and #{request.dateRange[1]}>=a.ymd_date
         </if>-->
         <if test="request.dateRange != null and request.dateRange.length>0">
-            and a.plan_start_time BETWEEN #{request.dateRange[0]}
+            and (a.plan_start_time BETWEEN #{request.dateRange[0]}
             and #{request.dateRange[1]}
            OR a.plan_end_time BETWEEN #{request.dateRange[0]}
-            and #{request.dateRange[1]}
+            and #{request.dateRange[1]})
         </if>
 
         <if test="request.status != null ">