隐患问题清单功能实现

project_data/sql/0.0.2/soc 9月14号11.30 以后的增量部分脚本.sql

@@ -60,3 +60,45 @@ INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type
 INSERT INTO `sys_dict_data`( `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 ( 3, '离行式自助银行标准3', '3', 'org_extend_detached_standard', NULL, 'default', 'N', '0', '超级管理员', '2023-09-14 16:58:41', '', NULL, NULL);
 INSERT INTO `sys_dict_data`( `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 ( 1, '是', '1', 'org_extend_is', NULL, 'default', 'N', '0', '超级管理员', '2023-09-15 09:48:58', '', NULL, NULL);
 INSERT INTO `sys_dict_data`( `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 ( 2, '否', '0', 'org_extend_is', NULL, 'default', 'N', '0', '超级管理员', '2023-09-15 09:49:08', '', NULL, NULL);
+
+DROP TABLE IF EXISTS `core_question_flow`;
+DROP TABLE IF EXISTS `core_question`;
+CREATE TABLE `core_question_flow` (
+  `id` bigint NOT NULL,
+  `question_id` bigint DEFAULT NULL COMMENT '隐患问题id',
+  `executor_id` bigint DEFAULT NULL COMMENT '流程执行人',
+  `executor_name` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '流程执行人姓名',
+  `execute_time` datetime DEFAULT NULL COMMENT '流程操作时间',
+  `execute_status` int DEFAULT NULL COMMENT '流程执行结果。0：通过、1：未通过',
+  `execute_step` int DEFAULT NULL COMMENT '流程执行步骤.1确认，2异议审批,11整改',
+  `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`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='隐患问题审批流程';
+CREATE TABLE `core_question` (
+  `id` bigint NOT NULL,
+  `org_id` bigint DEFAULT NULL COMMENT '隐患所属机构',
+  `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：安全检查',
+  `src_task_id` bigint DEFAULT NULL COMMENT '来源任务id',
+  `src_task_name` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '来源任务名称',
+  `src_point_id` bigint DEFAULT NULL COMMENT '检查、履职内容id',
+  `src_data_point_id` bigint DEFAULT NULL COMMENT '检查、履职登记内容id',
+  `check_item` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '检查、履职项名称',
+  `check_content` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '检查内容',
+  `question_desc` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '隐患描述',
+  `submitor_id` bigint DEFAULT NULL COMMENT '提出人id',
+  `submitor_name` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '提出人名称',
+  `submit_time` datetime DEFAULT NULL COMMENT '发现时间',
+  `confirm_status` int DEFAULT NULL COMMENT '确认状态。0未确认，1提出异议，2已确认，3已关闭',
+  `reform_status` int DEFAULT NULL COMMENT '整改状态。10未整改，11已整改',
+  `reform_deadline` datetime DEFAULT NULL COMMENT '整改期限',
+  `create_time` datetime DEFAULT NULL,
+  `update_time` datetime DEFAULT NULL,
+  `create_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='隐患问题清单';
+UPDATE`sys_dict_data` SET `dict_label` = '待确认' WHERE `dict_code` = 360;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/vo/QuestionStepEnum.java → soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/QuestionStepEnum.java

@@ -1,4 +1,4 @@
-package com.xunmei.core.question.vo;
+package com.xunmei.core.question;
 
 public enum QuestionStepEnum {
     unconfirm(0),

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/dto/QuestionPageDto.java

@@ -16,5 +16,5 @@ public class QuestionPageDto extends PageDto<QuestionPageVo> {
 
     private Integer reformStatus;
 
-    private LocalDateTime[] submitRange;
+    private Date[] submitRange;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/service/impl/QuestionServiceImpl.java

@@ -4,9 +4,9 @@ import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.xunmei.common.core.constant.SecurityConstants;
@@ -21,12 +21,10 @@ import com.xunmei.core.question.dto.QuestionPageDto;
 import com.xunmei.core.question.dto.QuestionReformDto;
 import com.xunmei.core.question.vo.QuestionFlowVo;
 import com.xunmei.core.question.QuestionSrcType;
-import com.xunmei.core.question.vo.QuestionStepEnum;
+import com.xunmei.core.question.QuestionStepEnum;
 import com.xunmei.core.question.vo.QuestionVo;
 import com.xunmei.core.question.domain.QuestionFlow;
 import com.xunmei.core.question.mapper.QuestionFlowMapper;
-import com.xunmei.core.resumption.mapper.AppResumptionDataMapper;
-import com.xunmei.core.resumption.mapper.AppResumptionDataRemarkimgMapper;
 import com.xunmei.core.resumption.service.IAppResumptionDataRemarkimgService;
 import com.xunmei.system.api.RemoteOrgService;
 import org.springframework.beans.BeanUtils;
@@ -85,8 +83,8 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         }
         //时间范围查询
         if (ObjectUtil.isNotEmpty(query.getSubmitRange()) && query.getSubmitRange().length == 2) {
-            LocalDateTime start = LocalDateTimeUtil.beginOfDay(query.getSubmitRange()[0]);
-            LocalDateTime end = LocalDateTimeUtil.endOfDay(query.getSubmitRange()[1]);
+            Date start = DateUtil.beginOfDay(query.getSubmitRange()[0]);
+            Date end = DateUtil.endOfDay(query.getSubmitRange()[1]);
             wrapper.between(Question::getSubmitTime, start, end);
         }
         if (ObjectUtil.isNotEmpty(query.getSearchKey())) {
@@ -153,19 +151,21 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
     @Transactional
     public int insertQuestion(Question question) {
         question.setId(IDHelper.id());
-        question.setReformStatus(QuestionReformEnum.Unreform.getValue());
+
         if (ObjectUtil.equal(question.getSrcType(), QuestionSrcType.Resumption.getValue())) {
             question.setConfirmStatus(QuestionConfirmEnum.Confirmed.getValue());
-            QuestionFlow flow = new QuestionFlow();
-            flow.setQuestionId(question.getId());
-            flow.setExecuteTime(new Date());
-            flow.setExecutorId(SecurityUtils.getUserId());
-            flow.setExecutorName(SecurityUtils.getLoginUser().getName());
-            flow.setExecuteStatus(0);
-            flow.setExecuteStep(QuestionStepEnum.confirm.getValue());
-            questionFlowMapper.insert(flow);
+            question.setReformStatus(QuestionReformEnum.Unreform.getValue());
+//            QuestionFlow flow = new QuestionFlow();
+//            flow.setQuestionId(question.getId());
+//            flow.setExecuteTime(new Date());
+//            flow.setExecutorId(SecurityUtils.getUserId());
+//            flow.setExecutorName(SecurityUtils.getLoginUser().getName());
+//            flow.setExecuteStatus(0);
+//            flow.setExecuteStep(QuestionStepEnum.confirm.getValue());
+//            questionFlowMapper.insert(flow);
         } else {
             question.setConfirmStatus(QuestionConfirmEnum.Unconfirm.getValue());
+            question.setReformStatus(null);
         }
 
         return baseMapper.insert(question);
@@ -238,9 +238,9 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
 
         updateWrapper.eq(Question::getId, confirmDto.getId());
         if (ObjectUtil.equal(confirmDto.getStatus(), 0)) {
-            updateWrapper.set(Question::getConfirmStatus, QuestionConfirmEnum.Confirmed);
+            updateWrapper.set(Question::getConfirmStatus, QuestionConfirmEnum.Confirmed.getValue());
         } else {
-            updateWrapper.set(Question::getConfirmStatus, QuestionConfirmEnum.Dissent);
+            updateWrapper.set(Question::getConfirmStatus, QuestionConfirmEnum.Dissent.getValue());
         }
 
         questionFlowMapper.insert(flow);
@@ -277,7 +277,8 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
 
         updateWrapper.eq(Question::getId, confirmDto.getId());
         if (ObjectUtil.equal(confirmDto.getStatus(), 0)) {
-            updateWrapper.set(Question::getConfirmStatus, QuestionConfirmEnum.Closed.getValue());
+            updateWrapper.set(Question::getConfirmStatus, QuestionConfirmEnum.Closed.getValue())
+                    .set(Question::getReformStatus, null);
         } else {
             updateWrapper.set(Question::getConfirmStatus, QuestionConfirmEnum.Confirmed.getValue());
         }