Skip to content

A
amos-boot-biz
Commit 22067365 authored by 麻笑宇's avatar 麻笑宇
Browse files
Options

Merge remote-tracking branch 'origin/develop_tzs_bugfix' into develop_tzs_bugfix

parents a17dc594 3ec15528
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 26 deletions
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/quartz/JobService.java
View file @ 22067365
...@@ -228,7 +228,7 @@ public class JobService implements IJobService { ...@@ -228,7 +228,7 @@ public class JobService implements IJobService {
updatePlanTaskAndDetailStatus(planTask); updatePlanTaskAndDetailStatus(planTask);
} }
} else { } else {
if (endTime.getTime() < timestamp) { if (endTime.getTime() > timestamp) {
log.error("项目初始化进行中监听器任务监控2222========"); log.error("项目初始化进行中监听器任务监控2222========");
ids = planTaskMapper.selectPlanTaskIdList(planTask.getPlanId(), PlanTaskFinishStatusEnum.NOTSTARTED.getValue()); ids = planTaskMapper.selectPlanTaskIdList(planTask.getPlanId(), PlanTaskFinishStatusEnum.NOTSTARTED.getValue());
if (!ObjectUtils.isEmpty(ids)) { if (!ObjectUtils.isEmpty(ids)) {
...@@ -261,6 +261,10 @@ public class JobService implements IJobService { ...@@ -261,6 +261,10 @@ public class JobService implements IJobService {
// TODO Auto-generated catch block // TODO Auto-generated catch block
log.info(e.getMessage()); log.info(e.getMessage());
e.printStackTrace(); e.printStackTrace();
} catch (Exception e) {
// TODO Auto-generated catch block
log.error("initPlanTaskJob execute error====>", e.getMessage());
e.printStackTrace();
} }
} }
// 重新更新统计表 -- 只更新当天统计的数据 // 重新更新统计表 -- 只更新当天统计的数据
...@@ -279,30 +283,33 @@ public class JobService implements IJobService { ...@@ -279,30 +283,33 @@ public class JobService implements IJobService {
} }
List<ESPlanTaskListDto> esPlanTaskListDtos = new ArrayList<>(); List<ESPlanTaskListDto> esPlanTaskListDtos = new ArrayList<>();
for (String id : ids) { for (String id : ids) {
ESPlanTaskListDto esPlanTaskListDto = esPlanTaskList.findById(id).get(); if (esPlanTaskList.findById(id).isPresent()) {
esPlanTaskListDto.setFinishStatus(String.valueOf(status)); ESPlanTaskListDto esPlanTaskListDto = esPlanTaskList.findById(id).get();
Map task = planTaskMapper.queryPlanTaskById(Long.valueOf(id)); log.info("修改esPlanTaskListDto==========" + esPlanTaskListDto);
esPlanTaskListDto.setFinshNum(ObjectUtils.isEmpty(task.get("finshNum")) ? "0" : task.get("finshNum").toString()); esPlanTaskListDto.setFinishStatus(String.valueOf(status));
esPlanTaskListDto.setOmission(ObjectUtils.isEmpty(task.get("omission")) ? "0" : task.get("omission").toString()); Map task = planTaskMapper.queryPlanTaskById(Long.valueOf(id));
esPlanTaskListDto.setUnqualified(ObjectUtils.isEmpty(task.get("unqualified")) ? "0" : task.get("unqualified").toString()); esPlanTaskListDto.setFinshNum(ObjectUtils.isEmpty(task.get("finshNum")) ? "0" : task.get("finshNum").toString());
esPlanTaskListDto.setUnplan(ObjectUtils.isEmpty(task.get("unplan")) ? "0" : task.get("unplan").toString()); esPlanTaskListDto.setOmission(ObjectUtils.isEmpty(task.get("omission")) ? "0" : task.get("omission").toString());
esPlanTaskListDto.setTaskPlanNum(ObjectUtils.isEmpty(task.get("taskPlanNum")) ? "0" : task.get("taskPlanNum").toString()); esPlanTaskListDto.setUnqualified(ObjectUtils.isEmpty(task.get("unqualified")) ? "0" : task.get("unqualified").toString());
List<PlanTaskDetail> planTaskDetailList = planTaskMapper.selectTaskDetails("('" + id + "')"); esPlanTaskListDto.setUnplan(ObjectUtils.isEmpty(task.get("unplan")) ? "0" : task.get("unplan").toString());
Long routId = planTaskMapper.selectRoutId(id); esPlanTaskListDto.setTaskPlanNum(ObjectUtils.isEmpty(task.get("taskPlanNum")) ? "0" : task.get("taskPlanNum").toString());
List<ESTaskDetailDto> esTaskDetailDtos = new ArrayList<>(); List<PlanTaskDetail> planTaskDetailList = planTaskMapper.selectTaskDetails("('" + id + "')");
for (PlanTaskDetail taskDetail : planTaskDetailList) { Long routId = planTaskMapper.selectRoutId(id);
AppPointCheckRespone appPointCheckRespone = planService.queryPointPlanTaskDetail(null, null, null, taskDetail.getTaskNo(), taskDetail.getPointId()); List<ESTaskDetailDto> esTaskDetailDtos = new ArrayList<>();
ESTaskDetailDto esTaskDetailDto = esTaskDetail.findById(String.valueOf(appPointCheckRespone.getId())).get(); for (PlanTaskDetail taskDetail : planTaskDetailList) {
JSONObject jsonObject = getCheckInput(routId, taskDetail.getPointId(), type, requestParam); AppPointCheckRespone appPointCheckRespone = planService.queryPointPlanTaskDetail(null, null, null, taskDetail.getTaskNo(), taskDetail.getPointId());
esTaskDetailDto.setPointStatus((status == 0 || status == 1) ? "0" : status == 2 ? "1" : "2"); ESTaskDetailDto esTaskDetailDto = esTaskDetail.findById(String.valueOf(appPointCheckRespone.getId())).get();
esTaskDetailDto.setTaskStatus(String.valueOf(status)); JSONObject jsonObject = getCheckInput(routId, taskDetail.getPointId(), type, requestParam);
appPointCheckRespone.setAppCheckInput(jsonObject); esTaskDetailDto.setPointStatus((status == 0 || status == 1) ? "0" : status == 2 ? "1" : "2");
esTaskDetailDto.setPointImgUrls(ObjectUtils.isEmpty(requestParam) ? new ArrayList<>() : requestParam.getCheckRecordImg()); esTaskDetailDto.setTaskStatus(String.valueOf(status));
esTaskDetailDtos.add(esTaskDetailDto); appPointCheckRespone.setAppCheckInput(jsonObject);
esTaskDetailDto.setPointImgUrls(ObjectUtils.isEmpty(requestParam) ? new ArrayList<>() : requestParam.getCheckRecordImg());
esTaskDetailDtos.add(esTaskDetailDto);
}
esTaskDetail.saveAll(esTaskDetailDtos);
esPlanTaskListDto.setPoints(planTaskDetailList);
esPlanTaskListDtos.add(esPlanTaskListDto);
} }
esTaskDetail.saveAll(esTaskDetailDtos);
esPlanTaskListDto.setPoints(planTaskDetailList);
esPlanTaskListDtos.add(esPlanTaskListDto);
} }
esPlanTaskList.saveAll(esPlanTaskListDtos); esPlanTaskList.saveAll(esPlanTaskListDtos);
} }
......
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/resources/db/mapper/dbTemplate_plan_task.xml
View file @ 22067365
...@@ -1613,7 +1613,7 @@ ...@@ -1613,7 +1613,7 @@
<select id="getPlanTaskListByPlanId" resultType="java.lang.Long"> <select id="getPlanTaskListByPlanId" resultType="java.lang.Long">
SELECT SELECT
* id
FROM FROM
"p_plan_task" "p_plan_task"
WHERE WHERE
...@@ -1777,7 +1777,7 @@ ...@@ -1777,7 +1777,7 @@
from from
"p_plan_task" "p_plan_task"
where id in where id in
<foreach item="id" collection="newList" index="index" open="(" separator="," close=")"> <foreach item="id" collection="ids" index="index" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment