修复缺陷

project_data/sql/0.0.3/soc/soc.sql

@@ -1198,7 +1198,7 @@ INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (120, 1726808689796902
 DELETE FROM sys_menu WHERE id =2332 or parent_id=2332 or id=01726875550324551681;
 DELETE FROM sys_role_menu WHERE menu_id =01726875550324551681;
 
-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 (01726875550324551681, '内容库管理', 2327, 5, '', NULL, NULL, 1, 0, 'F', '0', '0', 'safetycheck.rule:contentmanage', '1', NULL, NULL, 'jwx', '2023-11-21 16:09:49', '', 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 (01726875550324551681, '内容库管理', 2327, 5, '', NULL, NULL, 1, 0, 'F', '0', '0', 'safetycheck:rule:contentmanage', '1', NULL, NULL, 'jwx', '2023-11-21 16:09:49', '', NULL, '');
 INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (115, 01726875550324551681);
 INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (116, 01726875550324551681);
 INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (117, 01726875550324551681);
@@ -1366,6 +1366,11 @@ drop TABLE if EXISTS sys_bank_physical_defense_construction;
 -- update sys_dict_data set dict_sort =6 where dict_type='core_drill_type' and dict_label='防自然灾害应急预案' limit 1;
 -- update sys_dict_data set dict_sort =7 where dict_type='core_drill_type' and dict_label='其它应急预案' limit 1;
 
+ALTER TABLE `core_question` 
+MODIFY COLUMN `reform_status` int NULL DEFAULT NULL COMMENT '整改状态。10待整改，11已整改,12已逾期' AFTER `confirm_status`;
+delete from `sys_dict_data` Where dict_type='question_reform_status' and dict_value=12;
+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, '已逾期', '12', 'question_reform_status', NULL, 'default', 'N', '0', 'jwx', '2023-11-22 14:23:36', '', NULL, NULL);
+
 DELIMITER ??
 DROP PROCEDURE IF EXISTS schema_change ??
 CREATE PROCEDURE schema_change () BEGIN

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

@@ -43,4 +43,9 @@ public interface IQuestionReformService extends IService<Question> {
      * @throws Exception
      */
     void export(ReformPageDto pageDto, HttpServletResponse response) throws Exception;
+
+    /**
+     * 更新整改逾期状态
+     */
+    void updateReformOverdueState();
 }

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

@@ -102,7 +102,7 @@ public class QuestionReformServiceImpl extends ServiceImpl<QuestionMapper, Quest
         }
         if (ObjectUtil.isNotEmpty(query.getSearchKey())) {
             wrapper.and(w ->
-                    w.like(Question::getCheckContent, query.getSearchKey()).or().like(Question::getSrcTaskName, query.getSearchKey())
+                    w.like(Question::getCheckContent, query.getSearchKey()).or().like(Question::getQuestionDesc, query.getSearchKey())
             );
         }
         wrapper.orderByDesc(Question::getId);
@@ -185,4 +185,13 @@ public class QuestionReformServiceImpl extends ServiceImpl<QuestionMapper, Quest
         // 调用EasyExcel的导出方法
         EasyExcel.write(response.getOutputStream(), QuestionExportDto.class).sheet("Sheet1").doWrite(list);
     }
+
+    /**
+     * 更新整改逾期状态
+     */
+    @Override
+    public void updateReformOverdueState(){
+        LambdaUpdateWrapper<Question> wrapper=new LambdaUpdateWrapper();
+        wrapper.ge(Question::getConfirmStatus)
+    }
 }

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

@@ -108,7 +108,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
 
             if (ObjectUtil.isNotEmpty(query.getSearchKey())) {
                 wrapper.and(w ->
-                        w.like(Question::getCheckItem, query.getSearchKey()).or().like(Question::getSrcTaskName, query.getSearchKey())
+                        w.like(Question::getCheckContent, query.getSearchKey()).or().like(Question::getQuestionDesc, query.getSearchKey())
                 );
             }
         }

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

@@ -406,8 +406,15 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
             throw new ServiceException("任务已完成");
         }
 
+
         if (!isNewTask) {
             removeExistData(data.getId());
+        }else{
+            SysOrg checkOrg =null;
+            checkOrg = remoteOrgService.selectOrgById(data.getCheckOrgId(), SecurityConstants.INNER);
+            data.setBeCheckOrgType(org.getType().toString());
+            data.setBeCheckedOrgName(org.getShortName());
+            data.setCheckOrgName(checkOrg.getShortName());
         }
 
         LoginUser user = SecurityUtils.getLoginUser();
@@ -447,7 +454,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
             }
         }
         if (isNewTask) {
-            addTask(data, questions.size(), data.getIsSubmit());
+            addTask(data, questions.size(), data.getIsSubmit(),org);
         } else {
             updateTask(data, questions.size(), data.getIsSubmit());
         }
@@ -556,10 +563,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
      * @param isSubmit
      * @return
      */
-    private boolean addTask(TaskRegisterVo data, Integer exceptionCount, Integer isSubmit) {
-        SysOrg beCheckedOrg = remoteOrgService.selectOrgById(data.getBeCheckedOrgId(), SecurityConstants.INNER);
-        SysOrg checkOrg = remoteOrgService.selectOrgById(data.getCheckOrgId(), SecurityConstants.INNER);
-
+    private boolean addTask(TaskRegisterVo data, Integer exceptionCount, Integer isSubmit,SysOrg beCheckedOrg) {
         CoreSafetyTask task = new CoreSafetyTask();
         task.setId(data.getId());
         task.setPlanId(-1L);
@@ -567,10 +571,10 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
         task.setCount(1);
         task.setExceptionCount(exceptionCount.longValue());
         task.setOrgId(data.getBeCheckedOrgId());
-        task.setOrgName(beCheckedOrg.getShortName());
+        task.setOrgName(data.getBeCheckedOrgName());
         task.setOrgPath(beCheckedOrg.getPath());
         task.setCheckOrgId(data.getCheckOrgId());
-        task.setCheckOrgName(checkOrg.getShortName());
+        task.setCheckOrgName(data.getCheckOrgName());
         task.setStatus(ObjectUtil.equal(data.getIsSubmit(), 0) ? SafetyCheckTaskStatus.UnderWay.getValue() : SafetyCheckTaskStatus.Completed.getValue());
         task.setSourceType(1L);
         task.setBatchId(IDHelper.id());