From ba1c0ad6cffaa8a6288a4e66d0598d16f1cccc10 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 13 十月 2021 11:00:35 +0800
Subject: [PATCH] 优化代码

---
 service-job/src/main/java/com/java110/job/task/inspection/GeneratorInspectionTaskTemplate.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 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 4ead634e..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;
@@ -168,11 +168,14 @@
         inspectionTaskPo.setCommunityId(tmpInspectionPlanDto.getCommunityId());
         inspectionTaskPo.setIpStaffId(tmpInspectionPlanStaffDto.getIpStaffId());
         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());
@@ -188,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