Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

project_data/sql/0.0.2/soc/soc.sql

@@ -686,4 +686,288 @@ END$$
 DELIMITER ;
 
 CALL add_column_if_not_exists();
-DROP PROCEDURE add_column_if_not_exists;
+DROP PROCEDURE add_column_if_not_exists;
+
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : 10.87.10.54
+ Source Server Type    : MySQL
+ Source Server Version : 80034
+ Source Host           : 10.87.10.54:3306
+ Source Schema         : soc
+
+ Target Server Type    : MySQL
+ Target Server Version : 80034
+ File Encoding         : 65001
+
+ Date: 25/09/2023 09:20:08
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for core_safecheck_plan
+-- ----------------------------
+DROP TABLE IF EXISTS `core_safecheck_plan`;
+CREATE TABLE `core_safecheck_plan`  (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `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 '检查机构类型',
+  `check_org_type` int NULL DEFAULT NULL COMMENT '受检机构类型',
+  `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 SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '立即生成任务',
+  `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
+  `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 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',
+  `source_type` int NULL DEFAULT 0 COMMENT '数据来源 0：检查计划 ，1：登记检查结果',
+  `plan_create_org_id` bigint NULL DEFAULT NULL COMMENT '计划创建机构id',
+  `plan_of_org_id` bigint NULL DEFAULT NULL COMMENT '计划所属机构id',
+  `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 SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `exec_org` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '检查机构',
+  `check_org` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '受检机构',
+  `des` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
+  `distribute_status` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '下发状态',
+  `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 SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '常规安全检查计划表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for core_safecheck_plan_to_check_org
+-- ----------------------------
+DROP TABLE IF EXISTS `core_safecheck_plan_to_check_org`;
+CREATE TABLE `core_safecheck_plan_to_check_org`  (
+  `plan_id` bigint NOT NULL COMMENT '计划id',
+  `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 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 SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '常规安全检查-受检机构关联表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for core_safecheck_plan_to_exec_org
+-- ----------------------------
+DROP TABLE IF EXISTS `core_safecheck_plan_to_exec_org`;
+CREATE TABLE `core_safecheck_plan_to_exec_org`  (
+  `plan_id` bigint NOT NULL COMMENT '计划id',
+  `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 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 SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '常规安全检查-检查机构关系表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for core_safecheck_plan_to_point
+-- ----------------------------
+DROP TABLE IF EXISTS `core_safecheck_plan_to_point`;
+CREATE TABLE `core_safecheck_plan_to_point`  (
+  `plan_id` bigint NOT NULL COMMENT '计划id',
+  `point_id` bigint NOT NULL COMMENT '检查要点id',
+  `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 SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `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
+-- ----------------------------
+DROP TABLE IF EXISTS `core_safecheck_plan_to_role`;
+CREATE TABLE `core_safecheck_plan_to_role`  (
+  `plan_id` bigint NOT NULL COMMENT '计划id',
+  `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 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 SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '常规安全检查计划执行角色关联表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for core_safety_task
+-- ----------------------------
+DROP TABLE IF EXISTS `core_safety_task`;
+CREATE TABLE `core_safety_task`  (
+  `id` bigint NOT NULL,
+  `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 SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '受检机构',
+  `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 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:补登',
+  `check_type` int NULL DEFAULT NULL COMMENT '0 常规安全检查 1 专项安全检查',
+  `check_cycle` int NULL DEFAULT 0 COMMENT '检查周期:0 无周期 1每日、2每周、3每月、4每季、5每半年、6每年',
+  `ymd_date` date NULL DEFAULT NULL COMMENT '年月日',
+  `ymd_day` int NULL DEFAULT NULL COMMENT '日',
+  `ymd_month` int NULL DEFAULT NULL COMMENT '月',
+  `ymd_quarter` int NULL DEFAULT NULL COMMENT '季',
+  `ymd_week` int NULL DEFAULT NULL COMMENT '周',
+  `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 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',
+  `start_time` datetime NULL DEFAULT NULL COMMENT '任务执行开始时间',
+  `end_time` datetime NULL DEFAULT NULL COMMENT '任务执行结束时间',
+  `plan_start_time` datetime NULL DEFAULT NULL COMMENT '计划开始时间',
+  `plan_end_time` datetime NULL DEFAULT NULL COMMENT '计划截止时间',
+  `role_id` bigint NULL DEFAULT NULL COMMENT '角色id',
+  `deleted` int NULL DEFAULT 0 COMMENT '是否删除0否1是',
+  `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 SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '登记簿pdf 文件地址',
+  `des` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
+  `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 SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `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 SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for core_safety_task_data
+-- ----------------------------
+DROP TABLE IF EXISTS `core_safety_task_data`;
+CREATE TABLE `core_safety_task_data`  (
+  `id` bigint NOT NULL DEFAULT 0,
+  `plan_id` bigint NULL DEFAULT NULL COMMENT '计划id',
+  `item_id` bigint NULL DEFAULT NULL COMMENT '检查项id',
+  `point_id` bigint NULL DEFAULT NULL COMMENT '要点id',
+  `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 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 SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '提交人名',
+  `is_add` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '是否为登记界面新增的。0：否，1：是',
+  `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 SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '安全检查项表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for core_safety_task_data_nfc
+-- ----------------------------
+DROP TABLE IF EXISTS `core_safety_task_data_nfc`;
+CREATE TABLE `core_safety_task_data_nfc`  (
+  `id` bigint NOT NULL DEFAULT 0,
+  `task_id` bigint NULL DEFAULT NULL COMMENT '检查任务id',
+  `task_data_id` bigint NULL DEFAULT NULL COMMENT '安全检查项id',
+  `nfc_id` bigint NOT NULL DEFAULT 0 COMMENT 'NFC id',
+  `submit_time` datetime NULL DEFAULT NULL COMMENT '提交时间',
+  `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 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 SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '安全检查nfc扫描表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for core_safety_task_data_remarkimg
+-- ----------------------------
+DROP TABLE IF EXISTS `core_safety_task_data_remarkimg`;
+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 SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '图片存放路径',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '安全检查产生图片表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for core_safetycheck_rule
+-- ----------------------------
+DROP TABLE IF EXISTS `core_safetycheck_rule`;
+CREATE TABLE `core_safetycheck_rule`  (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `type` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '类型',
+  `name` varchar(125) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '名称',
+  `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 SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '机构类型',
+  `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 SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `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 SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '安全检查内容库定义\r\n' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for core_safetycheck_rule_item
+-- ----------------------------
+DROP TABLE IF EXISTS `core_safetycheck_rule_item`;
+CREATE TABLE `core_safetycheck_rule_item`  (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `rule_id` bigint NOT NULL COMMENT '安全检查内容库定义id',
+  `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '检查项名称',
+  `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 SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `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 SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '安全检查内容库-检查项' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for core_safetycheck_rule_point
+-- ----------------------------
+DROP TABLE IF EXISTS `core_safetycheck_rule_point`;
+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 SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '检查内容',
+  `area_id` bigint NOT NULL COMMENT '检查区域,区域表id',
+  `business_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '要点关联的业务类型来源,要点业务类型,关联字典表code',
+  `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 SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `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 SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '安全检查内容库-检查内容' ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+DELETE from `sys_dict_type` WHERE id='question_confirm_status' or id='question_reform_status';
+INSERT INTO `sys_dict_type` (`dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( '问题确认状态', 'question_confirm_status', '0', '超级管理员', '2023-09-13 18:14:59', '', NULL, NULL);
+INSERT INTO `sys_dict_type` (`dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( '问题整改状态', 'question_reform_status', '0', '超级管理员', '2023-09-13 18:15:18', '', NULL, NULL);
+
+DELETE from `sys_dict_data` WHERE dict_type in ('question_confirm_status','question_reform_status');
+INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (360, 0, '待确认', '0', 'question_confirm_status', NULL, 'default', 'N', '0', '超级管理员', '2023-09-13 18:15:44', '', NULL, NULL);
+INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (361, 1, '提出异议', '1', 'question_confirm_status', NULL, 'default', 'N', '0', '超级管理员', '2023-09-13 18:16:01', '', NULL, NULL);
+INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (362, 2, '已确认', '2', 'question_confirm_status', NULL, 'default', 'N', '0', '超级管理员', '2023-09-13 18:16:18', '', NULL, NULL);
+INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (363, 3, '已关闭', '3', 'question_confirm_status', NULL, 'default', 'N', '0', '超级管理员', '2023-09-13 18:16:30', '', NULL, NULL);
+INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (364, 0, '未整改', '10', 'question_reform_status', NULL, 'default', 'N', '0', '超级管理员', '2023-09-13 18:17:38', '', NULL, NULL);
+INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (365, 1, '已整改', '11', 'question_reform_status', NULL, 'default', 'N', '0', '超级管理员', '2023-09-13 18:17:47', '', NULL, NULL);

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

@@ -94,6 +94,7 @@ public class CoreSafetyTask extends BaseEntity {
      * 0待检查,1检查完成
      */
     @ApiModelProperty(value = "0待检查,1检查完成")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Integer status;
 
     /**

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafetyTaskMapper.xml

@@ -228,6 +228,13 @@
             and t.status =#{task.status}
         </if>
 
+        <if test="task.checkSub==false">
+            and t.check_org_id=#{task.orgId}
+        </if>
+        <if test="task.checkSub==true">
+            and t.check_org_id in (select id from sys_org
+            where path like concat((select path from sys_org where id=#{task.orgId}),'%'))
+        </if>
         <if test="task.checkOrgIds!=null and task.checkOrgIds.size>0">
             and t.org_id in
             <foreach collection="task.checkOrgIds" close=")" open="(" separator="," item="id">
@@ -719,7 +726,7 @@
         group by t.plan_id,t.title,t.plan_start_time,t.plan_end_time,t.batch_id
     </select>
     <select id="selectNfcRecord" resultType="com.xunmei.core.safetyCheck.vo.CheckNfcRecord">
-        select t.scan_method, n.area_name, n.collection_area_name, n.img
+        select t.scan_method, n.area_name, n.collection_area_name, t.img,t.submit_time as execute_time
         from core_safety_task_data_nfc t
                  left join sys_nfc_bind n on n.id = t.nfc_id
         where t.task_id = #{taskId}