更新

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/CheckController.java

@@ -175,7 +175,10 @@ public class CheckController extends AbstractBaseController {
         int statu = -1;
         PlanTask planTask =null;
         if(requestParam.getPlanTaskId()!=null && requestParam.getPlanTaskId() !=0){
-            checkService.delCheckByTaskId(requestParam.getPlanTaskId());
+            Map<String, Object> map = checkService.selectCheckById(requestParam.getPlanTaskId());
+            if (!ObjectUtils.isEmpty(map)) {
+                checkService.delCheckByTaskId(requestParam.getPlanTaskId(), Long.valueOf((String) map.get("id")));
+            }
             planTask = planTaskService.selectPlanTaskStatus(requestParam.getPlanTaskId());
         }
         AgencyUserModel user = getUserInfo();

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/CheckMapper.java

@@ -4,6 +4,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.yeejoin.amos.patrol.dao.entity.Check;
 import org.apache.ibatis.annotations.Param;
 
 import com.yeejoin.amos.patrol.business.entity.mybatis.CheckDetailBo;
@@ -284,4 +285,8 @@ public interface CheckMapper extends BaseMapper {
 
 	int delCheckByTaskId(@Param(value = "taskId") Long taskId);
 
+	int delCheckInputByCheckId(@Param(value = "checkId") Long checkId);
+
+	Map<String, Object> selectCheckById(@Param(value = "taskId") Long taskId);
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/CheckServiceImpl.java

@@ -735,8 +735,14 @@ public class CheckServiceImpl implements ICheckService {
     }
 
     @Override
-    public void delCheckByTaskId(Long id) {
+    public Map<String, Object> selectCheckById(Long id) {
+        return checkMapper.selectCheckById(id);
+    }
+
+    @Override
+    public void delCheckByTaskId(Long id, Long checkId) {
         checkMapper.delCheckByTaskId(id);
+        checkMapper.delCheckInputByCheckId(checkId);
     }
 
     private CheckInput paraseText(CheckInput checkInput, String json, CheckInputParam item, String isScore) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/ICheckService.java

@@ -55,7 +55,9 @@ public interface ICheckService {
 
     void delCheckById(List<Long> ids);
 
-    void delCheckByTaskId(Long id);
+    void delCheckByTaskId(Long id, Long checkId);
+
+    Map<String, Object> selectCheckById(Long id);
 
     /**
      * 获取检查结果中所有不合格检查项

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -2165,4 +2165,17 @@
         WHERE pc.plan_task_id = #{taskId}
     </select>
 
+    <select id="delCheckInputByCheckId" resultType="int">
+        DELETE FROM
+            p_check_input pci
+        WHERE pci.check_id = #{checkId}
+    </select>
+
+    <select id="selectCheckById" resultType="java.util.HashMap">
+        SELECT  *
+            FROM
+            p_check pc
+        WHERE pc.plan_task_id = #{taskId}
+    </select>
+
 </mapper>
\ No newline at end of file