修复缺陷

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/mapper/QuestionFlowMapper.java

@@ -59,4 +59,6 @@ public interface QuestionFlowMapper extends BaseMapper<QuestionFlow> {
      * @return 结果
      */
     int deleteCoreQuestionFlowByIds(Long[] ids);
+
+    int deleteBySrc(int srcType,List<Long> taskIds);
 }

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

@@ -5,6 +5,7 @@ import com.xunmei.common.core.domain.panel.dto.PanelListDto;
 import com.xunmei.common.core.domain.panel.vo.PanelListVo;
 import com.xunmei.common.core.domain.panel.vo.WebPanelResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.core.question.QuestionSrcType;
 import com.xunmei.core.question.domain.Question;
 import com.xunmei.core.question.dto.QuestionConfirmDto;
 import com.xunmei.core.question.dto.QuestionPageDto;
@@ -40,6 +41,14 @@ public interface IQuestionService extends IService<Question> {
     Question handleQuestion(Question question);
 
     /**
+     * 按任务删除问题
+     * @param srcType
+     * @param taskIds
+     * @return
+     */
+    int delete(QuestionSrcType srcType,List<Long> taskIds);
+
+    /**
      * 查询隐患问题清单分页数据
      *
      * @param query  查询条件对象

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

@@ -3,6 +3,7 @@ package com.xunmei.core.question.service.impl;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.util.CollectionUtils;
 import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.C;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -221,6 +222,28 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
     }
 
     /**
+     * 按任务删除问题
+     *
+     * @param srcType
+     * @param taskIds
+     * @return
+     */
+    @Override
+    public int delete(QuestionSrcType srcType, List<Long> taskIds) {
+        if (ObjectUtil.isNull(srcType) || CollectionUtils.isEmpty(taskIds)) {
+            return 0;
+        }
+
+        questionFlowMapper.deleteBySrc(srcType.getValue(), taskIds);
+
+        LambdaQueryWrapper<Question> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Question::getSrcType, srcType.getValue())
+                .in(Question::getSrcTaskId, taskIds);
+
+        return baseMapper.delete(wrapper);
+    }
+
+    /**
      * 确认
      *
      * @return

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

@@ -28,6 +28,8 @@ import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.IDHelper;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.security.utils.SecurityUtils;
+import com.xunmei.core.question.QuestionSrcType;
+import com.xunmei.core.question.service.IQuestionService;
 import com.xunmei.core.registerbook.service.ICoreRegisterBookPdfService;
 import com.xunmei.core.resumption.domain.*;
 import com.xunmei.core.resumption.dto.DistributeDto;
@@ -103,6 +105,9 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
     @Autowired
     ICoreRegisterBookPdfService coreRegisterBookPdfService;
 
+    @Autowired
+    IQuestionService questionService;
+
     @Override
     public List<Long> selectItemIdsByPlanId(Long id) {
         return appPlanToItemMapper.selectItemIdsByPlanId(id);
@@ -414,6 +419,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         for (Long completedId : completedIds) {
             coreRegisterBookPdfService.deleteWithFile(completedId);
         }
+        questionService.delete(QuestionSrcType.SafetyCheck,completedIds);
     }
 
     /**

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

@@ -27,6 +27,8 @@ import com.xunmei.common.core.exception.SystemException;
 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.question.QuestionSrcType;
+import com.xunmei.core.question.service.IQuestionService;
 import com.xunmei.core.registerbook.service.ICoreRegisterBookPdfService;
 import com.xunmei.core.resumption.domain.AppPlan;
 import com.xunmei.core.resumption.domain.Resumption;
@@ -98,6 +100,9 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
     ICoreRegisterBookPdfService coreRegisterBookPdfService;
 
     @Autowired
+    IQuestionService questionService;
+
+    @Autowired
     private CoreSafecheckPlanToCheckOrgTypeMapper coreSafecheckPlanToCheckOrgTypeMapper;
 
     @Override
@@ -472,6 +477,8 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
         for (Long completedId : completedIds) {
             coreRegisterBookPdfService.deleteWithFile(completedId);
         }
+
+        questionService.delete(QuestionSrcType.SafetyCheck,completedIds);
     }
 
     /**

soc-modules/soc-modules-core/src/main/resources/mapper/question/QuestionFlowMapper.xml

@@ -122,4 +122,12 @@
             #{id}
         </foreach>
     </delete>
+
+    <delete id="deleteBySrc">
+        delete  from core_question_flow where  question_id in (
+            select  id from core_question where src_type=#{srcType} and src_task_id in
+        <foreach collection="taskIds" item="taskId" close=")" open="(" separator=",">
+            #{taskId}
+        </foreach> )
+    </delete>
 </mapper>