From 35981de2d74f44eb10a60bfcbd9c995b980be021 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 22 二月 2023 18:55:31 +0800
Subject: [PATCH] 优化代码
---
service-job/src/main/java/com/java110/job/task/maintainance/GeneratorMaintainanceTaskTemplate.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/task/maintainance/GeneratorMaintainanceTaskTemplate.java b/service-job/src/main/java/com/java110/job/task/maintainance/GeneratorMaintainanceTaskTemplate.java
index 574e0a1..a02f8ca 100755
--- a/service-job/src/main/java/com/java110/job/task/maintainance/GeneratorMaintainanceTaskTemplate.java
+++ b/service-job/src/main/java/com/java110/job/task/maintainance/GeneratorMaintainanceTaskTemplate.java
@@ -6,6 +6,7 @@
import com.java110.dto.maintainancePlanMachine.MaintainancePlanMachineDto;
import com.java110.dto.maintainancePlanStaff.MaintainancePlanStaffDto;
import com.java110.dto.maintainanceTask.MaintainanceTaskDto;
+import com.java110.dto.maintainanceTaskDetail.MaintainanceTaskDetailDto;
import com.java110.dto.scheduleClassesStaff.ScheduleClassesStaffDto;
import com.java110.dto.task.TaskDto;
import com.java110.intf.community.*;
@@ -109,7 +110,7 @@
if (maintainanceTaskDetailPos.size() < 1) {
return;
}
- maintainanceTaskV1InnerServiceSMOImpl.saveMaintainanceTask(maintainanceTaskPos);
+ maintainanceTaskV1InnerServiceSMOImpl.saveMaintainanceTasks(maintainanceTaskPos);
maintainanceTaskV1InnerServiceSMOImpl.saveMaintainanceTaskDetail(maintainanceTaskDetailPos);
@@ -128,7 +129,7 @@
case MaintainancePlanDto.INSPECTION_PLAN_PERIOD_DAY:
hasCondition = hasGeneratorTaskConditionByDay(tmpMaintainancePlanDto, taskDto, communityDto, tmpMaintainancePlanStaffDto, maintainanceTaskPos, maintainanceTaskDetailPos);
break;
- case MaintainancePlanDto.INSPECTION_PLAN_PERIOD_WEEK:
+ case MaintainancePlanDto.INSPECTION_PLAN_PERIOD_NEXT_DAY:
hasCondition = hasGeneratorTaskConditionByWeek(tmpMaintainancePlanDto, taskDto, communityDto, tmpMaintainancePlanStaffDto, maintainanceTaskPos, maintainanceTaskDetailPos);
break;
}
@@ -151,6 +152,7 @@
maintainanceTaskPo.setOriginalPlanUserId(tmpMaintainancePlanStaffDto.getStaffId());
maintainanceTaskPo.setOriginalPlanUserName(tmpMaintainancePlanStaffDto.getStaffName());
maintainanceTaskPo.setTaskType("1000");
+ maintainanceTaskPo.setState(MaintainanceTaskDto.STATE_WAIT);
MaintainancePlanMachineDto maintainancePlanMachineDto = new MaintainancePlanMachineDto();
maintainancePlanMachineDto.setCommunityId(tmpMaintainancePlanDto.getCommunityId());
@@ -170,6 +172,7 @@
maintainanceTaskDetailPo.setPointEndTime(nowTime + "18:00:00");
maintainanceTaskDetailPo.setSortNumber("1");
maintainanceTaskDetailPo.setTaskDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_taskDetailId));
+ maintainanceTaskDetailPo.setState(MaintainanceTaskDetailDto.STATE_WAIT);
maintainanceTaskDetailPos.add(maintainanceTaskDetailPo);
}
maintainanceTaskPos.add(maintainanceTaskPo);
@@ -261,7 +264,7 @@
int subDay = DateUtil.daysBetween(DateUtil.getCurrentDate(), DateUtil.getDateFromStringB(tmpMaintainancePlanDto.getStartDate()));
- if(subDay % day != 0){
+ if (subDay % day != 0) {
return false;
}
@@ -269,7 +272,7 @@
//褰撳墠鏃堕棿鏄惁 鍒颁簡 宸℃浠诲姟鍓�30鍒嗛挓
int beforeTime = 30;
- String planTime = DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B) + " " + "09:00:00";
+ String planTime = DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B) + " " + "09:00:00";
Calendar calendar = Calendar.getInstance();
calendar.setTime(DateUtil.getDateFromStringA(planTime));
--
Gitblit v1.8.0