BUG ：28157

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/PlanTaskMapper.java

@@ -113,7 +113,9 @@ public interface PlanTaskMapper extends BaseMapper {
 	 * @param planTaskId
 	 * @return
 	 */
-	List<PlanTaskPointInputItemBo> getPlanTaskPointInputItemByPlanTaskId(@Param(value = "planTaskId") Long planTaskId, @Param(value = "planTaskDetailStatus") String planTaskDetailStatus);
+	List<PlanTaskPointInputItemBo> getPlanTaskPointInputItemByPlanTaskId(@Param(value = "planTaskId") Long planTaskId,
+																		 @Param(value = "planTaskDetailStatus") String planTaskDetailStatus,
+																		 @Param(value = "planTaskDetailIsFinish") String planTaskDetailIsFinish);
 
 	/**
 	 * 条件查询数据

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/data/CheckRecordDataConsumer.java

@@ -3,19 +3,20 @@ package com.yeejoin.amos.patrol.business.data;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
-import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
-import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.patrol.business.constants.XJConstant;
 import com.yeejoin.amos.patrol.business.dao.mapper.CheckInputMapper;
 import com.yeejoin.amos.patrol.business.dao.mapper.CheckMapper;
 import com.yeejoin.amos.patrol.business.dao.mapper.PlanTaskDetailMapper;
 import com.yeejoin.amos.patrol.business.dao.mapper.PlanTaskMapper;
-import com.yeejoin.amos.patrol.business.dao.repository.*;
+import com.yeejoin.amos.patrol.business.dao.repository.IInputItemDao;
+import com.yeejoin.amos.patrol.business.dao.repository.IPlanTaskDao;
+import com.yeejoin.amos.patrol.business.dao.repository.IPlanTaskDetailDao;
 import com.yeejoin.amos.patrol.business.dto.CheckRecordDataDto;
 import com.yeejoin.amos.patrol.business.entity.mybatis.PlanTaskPointInputItemBo;
 import com.yeejoin.amos.patrol.common.enums.CheckStatusEnum;
+import com.yeejoin.amos.patrol.common.enums.PlanTaskDetailIsFinishEnum;
 import com.yeejoin.amos.patrol.common.enums.PlanTaskDetailStatusEnum;
 import com.yeejoin.amos.patrol.dao.entity.*;
 import lombok.extern.slf4j.Slf4j;
@@ -125,7 +126,7 @@ public class CheckRecordDataConsumer implements Runnable {
         List<Check> checks = new ArrayList<>();
         List<CheckInput> checkInputs = new ArrayList<>();
         planTasks.forEach(planTask -> {
-            List<PlanTaskPointInputItemBo> planTaskPointInputItems = planTaskMapper.getPlanTaskPointInputItemByPlanTaskId(planTask.getId(), PlanTaskDetailStatusEnum.QUALIFIED.getValue());
+            List<PlanTaskPointInputItemBo> planTaskPointInputItems = planTaskMapper.getPlanTaskPointInputItemByPlanTaskId(planTask.getId(), PlanTaskDetailStatusEnum.QUALIFIED.getValue(), Objects.toString(PlanTaskDetailIsFinishEnum.UNFINISHED.getValue()));
             Map<Long, Check> checkMap = new HashMap<>();
             Map<String, String> deptMap = new HashMap<>();
             StringBuffer deptName = new StringBuffer();

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/quartz/JobService.java

@@ -404,7 +404,7 @@ public class JobService implements IJobService {
      * @param planTask
      */
     private void createOmissionCheckRecord(PlanTask planTask) {
-        List<PlanTaskPointInputItemBo> planTaskPointInputItems = planTaskMapper.getPlanTaskPointInputItemByPlanTaskId(planTask.getId(), PlanTaskDetailStatusEnum.OMISSION.getValue());
+        List<PlanTaskPointInputItemBo> planTaskPointInputItems = planTaskMapper.getPlanTaskPointInputItemByPlanTaskId(planTask.getId(), PlanTaskDetailStatusEnum.OMISSION.getValue(),Objects.toString(PlanTaskDetailIsFinishEnum.OVERTIME.getValue()));
         Map<Long, Check> checkMap = new HashMap<>();
         Set<Long> checkIds = new HashSet<Long>();
         Map<String, String> deptMap = new HashMap<>();
@@ -565,7 +565,7 @@ public class JobService implements IJobService {
      * @param planTask
      */
     public void createCheckRecord(PlanTask planTask, String userId) {
-        List<PlanTaskPointInputItemBo> planTaskPointInputItems = planTaskMapper.getPlanTaskPointInputItemByPlanTaskId(planTask.getId(), PlanTaskDetailStatusEnum.QUALIFIED.getValue());
+        List<PlanTaskPointInputItemBo> planTaskPointInputItems = planTaskMapper.getPlanTaskPointInputItemByPlanTaskId(planTask.getId(), PlanTaskDetailStatusEnum.QUALIFIED.getValue(),null);
         Map<Long, Check> checkMap = new HashMap<>();
         Map<String, String> deptMap = new HashMap<>();
         StringBuffer deptName = new StringBuffer();

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -534,6 +534,9 @@
 				WHERE
 					pptd.task_no = ptd.id
 				AND ptd.id = #{planTaskId} and pptd.status = #{planTaskDetailStatus}
+				<if test="planTaskDetailIsFinish != null and planTaskDetailIsFinish !=''" >
+					and pptd.is_finish = #{planTaskDetailIsFinish}
+				</if>
 			) temp2 on(temp1.point_id = temp2.pointId
 		AND temp1.route_id = temp2.routeId)