检查任务

project_data/sql/0.0.2/soc/soc.sql

@@ -542,7 +542,7 @@ CREATE TABLE `core_safety_task_data_remarkimg` (
                                                    KEY `data_id` (`remark_id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='安全检查产生图片表';
 
---调整core_safecheck_plan字段
+--调整安全检查字段
 DELIMITER $$
 CREATE PROCEDURE add_column_if_not_exists()
 BEGIN
@@ -581,4 +581,48 @@ END$$
 DELIMITER ;
 
 CALL add_column_if_not_exists();
-DROP PROCEDURE add_column_if_not_exists;
+DROP PROCEDURE add_column_if_not_exists;
+
+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 DEFAULT NULL COMMENT '标题',
+                                    `create_time` datetime(6) DEFAULT NULL COMMENT '创建时间',
+                                    `modified_id` bigint DEFAULT NULL COMMENT '最后修改人id',
+                                    `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 SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '受检机构',
+                                    `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 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:补登',
+                                    `check_type` int DEFAULT NULL COMMENT '0 常规安全检查 1 专项安全检查',
+                                    `check_cycle` int DEFAULT '0' COMMENT '检查周期:0 无周期 1每日、2每周、3每月、4每季、5每半年、6每年',
+                                    `ymd_date` date DEFAULT NULL COMMENT '年月日',
+                                    `ymd_day` int DEFAULT NULL COMMENT '日',
+                                    `ymd_month` int DEFAULT NULL COMMENT '月',
+                                    `ymd_quarter` int DEFAULT NULL COMMENT '季',
+                                    `ymd_week` int DEFAULT NULL COMMENT '周',
+                                    `ymd_year` int DEFAULT NULL COMMENT '年',
+                                    `ymd_halfyear` int DEFAULT NULL COMMENT '半年',
+                                    `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',
+                                    `start_time` datetime DEFAULT NULL COMMENT '任务执行开始时间',
+                                    `end_time` datetime DEFAULT NULL COMMENT '任务执行结束时间',
+                                    `plan_start_time` datetime DEFAULT NULL COMMENT '计划开始时间',
+                                    `plan_end_time` datetime DEFAULT NULL COMMENT '计划截止时间',
+                                    `role_id` bigint DEFAULT NULL COMMENT '角色id',
+                                    `deleted` int DEFAULT '0' COMMENT '是否删除0否1是',
+                                    `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 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
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;

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

@@ -34,7 +34,7 @@ public class CoreSafetyTask extends BaseEntity {
     /**
      * $column.columnComment
      */
-    private String id;
+    private Long id;
     @TableField(exist = false)
     private String roleName;
     @TableField(exist = false)
@@ -230,7 +230,7 @@ public class CoreSafetyTask extends BaseEntity {
      * 批次id,同一执行机构一个批次id
      */
     @ApiModelProperty(value = "批次id,同一执行机构一个批次id")
-    private String batchId;
+    private Long batchId;
 
     /**
      * 数据来源 0：检查计划 ，1：登记检查结果

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/job/SafetyCheckJobBusiness.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.utils.DateHelper;
+import com.xunmei.common.core.utils.IDHelper;
 import com.xunmei.core.safetyCheck.domain.*;
 import com.xunmei.core.safetyCheck.domain.CoreSafecheckPlan;
 import com.xunmei.core.safetyCheck.dto.SafetyTaskBuildDto;
@@ -322,7 +323,7 @@ public class SafetyCheckJobBusiness {
 
         DateHelper dateHelper = new DateHelper(datetime);
         List<CoreSafetyTask> ats = new ArrayList<>();
-        Map<Long, String> hashMap = new HashMap<>();
+        Map<Long, Long> hashMap = new HashMap<>();
         for (PlanTaskBuildVo taskPlan : tasks) {
             CoreSafetyTask checkTask = new CoreSafetyTask();
             checkTask.setTitle(taskPlan.getPlanName());
@@ -353,10 +354,11 @@ public class SafetyCheckJobBusiness {
             checkTask.setRoleId(taskPlan.getRole().getRoleId());
             checkTask.setIsQuestion(0L);
             checkTask.setSourceType(Long.valueOf(sourceType));
-            checkTask.setId(UUID.randomUUID().toString().replace("-", ""));
-            String batchId = hashMap.get(checkTask.getCheckOrgId());
+//            checkTask.setId(UUID.randomUUID().toString().replace("-", ""));
+            Long batchId = hashMap.get(checkTask.getCheckOrgId());
             if (ObjectUtil.isEmpty(batchId)) {
-                batchId = UUID.randomUUID().toString().replace("-", "");
+//                batchId = UUID.randomUUID().toString().replace("-", "");
+                batchId = IDHelper.id();
                 hashMap.put(checkTask.getCheckOrgId(), batchId);
             }
             checkTask.setBatchId(batchId);