From 54e7f06671f70cee10f82576dbe412a14a957084 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 12 五月 2022 17:25:08 +0800
Subject: [PATCH] 完成巡检 通知员工功能
---
service-job/src/main/java/com/java110/job/task/inspection/GeneratorInspectionTaskTemplate.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/task/inspection/GeneratorInspectionTaskTemplate.java b/service-job/src/main/java/com/java110/job/task/inspection/GeneratorInspectionTaskTemplate.java
old mode 100644
new mode 100755
index dcf4c72..3b7ee8e
--- a/service-job/src/main/java/com/java110/job/task/inspection/GeneratorInspectionTaskTemplate.java
+++ b/service-job/src/main/java/com/java110/job/task/inspection/GeneratorInspectionTaskTemplate.java
@@ -3,9 +3,9 @@
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.inspectionPlan.InspectionPlanDto;
-import com.java110.dto.inspectionPlanStaff.InspectionPlanStaffDto;
-import com.java110.dto.inspectionRoute.InspectionRoutePointRelDto;
-import com.java110.dto.inspectionTask.InspectionTaskDto;
+import com.java110.dto.inspectionPlan.InspectionPlanStaffDto;
+import com.java110.dto.inspectionPlan.InspectionRoutePointRelDto;
+import com.java110.dto.inspectionPlan.InspectionTaskDto;
import com.java110.dto.task.TaskDto;
import com.java110.intf.community.*;
import com.java110.job.quartz.TaskSystemQuartz;
@@ -65,6 +65,7 @@
InspectionPlanDto inspectionPlanDto = new InspectionPlanDto();
inspectionPlanDto.setCommunityId(communityDto.getCommunityId());
inspectionPlanDto.setState(InspectionPlanDto.STATE_RUN);
+ inspectionPlanDto.setCurTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
List<InspectionPlanDto> inspectionPlanDtos = inspectionPlanInnerServiceSMOImpl.queryInspectionPlans(inspectionPlanDto);
for (InspectionPlanDto tmpInspectionPlanDto : inspectionPlanDtos) {
@@ -166,12 +167,15 @@
inspectionTaskPo.setInspectionPlanId(tmpInspectionPlanDto.getInspectionPlanId());
inspectionTaskPo.setCommunityId(tmpInspectionPlanDto.getCommunityId());
inspectionTaskPo.setIpStaffId(tmpInspectionPlanStaffDto.getIpStaffId());
- inspectionTaskPo.setPlanInsTime(nowTime + tmpInspectionPlanDto + ":00");
+ inspectionTaskPo.setPlanInsTime(nowTime + tmpInspectionPlanStaffDto.getStartTime() + ":00");
+ inspectionTaskPo.setPlanEndTime(nowTime + tmpInspectionPlanStaffDto.getEndTime() + ":00");
inspectionTaskPo.setPlanUserId(tmpInspectionPlanStaffDto.getStaffId());
inspectionTaskPo.setPlanUserName(tmpInspectionPlanStaffDto.getStaffName());
inspectionTaskPo.setSignType(tmpInspectionPlanDto.getSignType());
inspectionTaskPo.setTaskId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_taskId));
-
+ inspectionTaskPo.setOriginalPlanUserId(tmpInspectionPlanStaffDto.getStaffId());
+ inspectionTaskPo.setOriginalPlanUserName(tmpInspectionPlanStaffDto.getStaffName());
+ inspectionTaskPo.setTaskType("1000");
InspectionRoutePointRelDto inspectionRoutePointRelDto = new InspectionRoutePointRelDto();
inspectionRoutePointRelDto.setCommunityId(tmpInspectionPlanDto.getCommunityId());
@@ -187,6 +191,9 @@
inspectionTaskDetailPo.setInspectionId(tmpInspectionRoutePointRelDto.getInspectionId());
inspectionTaskDetailPo.setInspectionName(tmpInspectionRoutePointRelDto.getInspectionName());
inspectionTaskDetailPo.setTaskId(inspectionTaskPo.getTaskId());
+ inspectionTaskDetailPo.setPointStartTime(tmpInspectionRoutePointRelDto.getPointStartTime());
+ inspectionTaskDetailPo.setPointEndTime(tmpInspectionRoutePointRelDto.getPointEndTime());
+ inspectionTaskDetailPo.setSortNumber(tmpInspectionRoutePointRelDto.getSortNumber());
inspectionTaskDetailPo.setTaskDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_taskDetailId));
inspectionTaskDetailPos.add(inspectionTaskDetailPo);
}
--
Gitblit v1.8.0