优化加入保养任务

java110-bean/src/main/java/com/java110/dto/maintainanceTask/MaintainanceTaskDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.maintainanceTask;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -14,22 +15,29 @@ import java.util.Date;
  **/
 public class MaintainanceTaskDto extends PageDto implements Serializable {
 
+    public static final String STATE_WAIT = "20200405";
+    public static final String STATE_AUDIT = "20200406";
+    public static final String STATE_FINISH = "20200407";
+    public static final String STATE_TIMEOUT = "20200408";
+    public static final String STATE_NO = "20200409";
+
     private String planUserId;
-private String actInsTime;
-private String planInsTime;
-private String originalPlanUserName;
-private String transferDesc;
-private String actUserName;
-private String authDesc;
-private String originalPlanUserId;
-private String taskType;
-private String planId;
-private String planEndTime;
-private String planUserName;
-private String communityId;
-private String actUserId;
-private String taskId;
-private String mpsId;
+    private String actInsTime;
+    private String planInsTime;
+    private String originalPlanUserName;
+    private String transferDesc;
+    private String actUserName;
+    private String authDesc;
+    private String originalPlanUserId;
+    private String taskType;
+    private String planId;
+    private String planEndTime;
+    private String planUserName;
+    private String communityId;
+    private String actUserId;
+    private String taskId;
+    private String mpsId;
+    private String state;
 
 
     private Date createTime;
@@ -40,97 +48,128 @@ private String mpsId;
     public String getPlanUserId() {
         return planUserId;
     }
-public void setPlanUserId(String planUserId) {
+
+    public void setPlanUserId(String planUserId) {
         this.planUserId = planUserId;
     }
-public String getActInsTime() {
+
+    public String getActInsTime() {
         return actInsTime;
     }
-public void setActInsTime(String actInsTime) {
+
+    public void setActInsTime(String actInsTime) {
         this.actInsTime = actInsTime;
     }
-public String getPlanInsTime() {
+
+    public String getPlanInsTime() {
         return planInsTime;
     }
-public void setPlanInsTime(String planInsTime) {
+
+    public void setPlanInsTime(String planInsTime) {
         this.planInsTime = planInsTime;
     }
-public String getOriginalPlanUserName() {
+
+    public String getOriginalPlanUserName() {
         return originalPlanUserName;
     }
-public void setOriginalPlanUserName(String originalPlanUserName) {
+
+    public void setOriginalPlanUserName(String originalPlanUserName) {
         this.originalPlanUserName = originalPlanUserName;
     }
-public String getTransferDesc() {
+
+    public String getTransferDesc() {
         return transferDesc;
     }
-public void setTransferDesc(String transferDesc) {
+
+    public void setTransferDesc(String transferDesc) {
         this.transferDesc = transferDesc;
     }
-public String getActUserName() {
+
+    public String getActUserName() {
         return actUserName;
     }
-public void setActUserName(String actUserName) {
+
+    public void setActUserName(String actUserName) {
         this.actUserName = actUserName;
     }
-public String getAuthDesc() {
+
+    public String getAuthDesc() {
         return authDesc;
     }
-public void setAuthDesc(String authDesc) {
+
+    public void setAuthDesc(String authDesc) {
         this.authDesc = authDesc;
     }
-public String getOriginalPlanUserId() {
+
+    public String getOriginalPlanUserId() {
         return originalPlanUserId;
     }
-public void setOriginalPlanUserId(String originalPlanUserId) {
+
+    public void setOriginalPlanUserId(String originalPlanUserId) {
         this.originalPlanUserId = originalPlanUserId;
     }
-public String getTaskType() {
+
+    public String getTaskType() {
         return taskType;
     }
-public void setTaskType(String taskType) {
+
+    public void setTaskType(String taskType) {
         this.taskType = taskType;
     }
-public String getPlanId() {
+
+    public String getPlanId() {
         return planId;
     }
-public void setPlanId(String planId) {
+
+    public void setPlanId(String planId) {
         this.planId = planId;
     }
-public String getPlanEndTime() {
+
+    public String getPlanEndTime() {
         return planEndTime;
     }
-public void setPlanEndTime(String planEndTime) {
+
+    public void setPlanEndTime(String planEndTime) {
         this.planEndTime = planEndTime;
     }
-public String getPlanUserName() {
+
+    public String getPlanUserName() {
         return planUserName;
     }
-public void setPlanUserName(String planUserName) {
+
+    public void setPlanUserName(String planUserName) {
         this.planUserName = planUserName;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getActUserId() {
+
+    public String getActUserId() {
         return actUserId;
     }
-public void setActUserId(String actUserId) {
+
+    public void setActUserId(String actUserId) {
         this.actUserId = actUserId;
     }
-public String getTaskId() {
+
+    public String getTaskId() {
         return taskId;
     }
-public void setTaskId(String taskId) {
+
+    public void setTaskId(String taskId) {
         this.taskId = taskId;
     }
-public String getMpsId() {
+
+    public String getMpsId() {
         return mpsId;
     }
-public void setMpsId(String mpsId) {
+
+    public void setMpsId(String mpsId) {
         this.mpsId = mpsId;
     }
 
@@ -150,4 +189,12 @@ public void setMpsId(String mpsId) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
 }

java110-bean/src/main/java/com/java110/dto/maintainanceTaskDetail/MaintainanceTaskDetailDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.maintainanceTaskDetail;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -14,19 +15,34 @@ import java.util.Date;
  **/
 public class MaintainanceTaskDetailDto extends PageDto implements Serializable {
 
+    /**
+     *
+     * 20200405	未开始
+     20200406	待验收
+     20200407	巡检完成
+     20200408	已超时
+     20200409	缺勤
+     */
+
+    public static final String STATE_WAIT = "20200405";
+    public static final String STATE_AUDIT = "20200406";
+    public static final String STATE_FINISH = "20200407";
+    public static final String STATE_TIMEOUT = "20200408";
+    public static final String STATE_NO = "20200409";
+
     private String sendFlag;
-private String pointEndTime;
-private String inspectionTime;
-private String sortNumber;
-private String machineName;
-private String actUserName;
-private String taskDetailId;
-private String machineId;
-private String pointStartTime;
-private String state;
-private String communityId;
-private String actUserId;
-private String taskId;
+    private String pointEndTime;
+    private String inspectionTime;
+    private String sortNumber;
+    private String machineName;
+    private String actUserName;
+    private String taskDetailId;
+    private String machineId;
+    private String pointStartTime;
+    private String state;
+    private String communityId;
+    private String actUserId;
+    private String taskId;
 
 
     private Date createTime;
@@ -37,79 +53,104 @@ private String taskId;
     public String getSendFlag() {
         return sendFlag;
     }
-public void setSendFlag(String sendFlag) {
+
+    public void setSendFlag(String sendFlag) {
         this.sendFlag = sendFlag;
     }
-public String getPointEndTime() {
+
+    public String getPointEndTime() {
         return pointEndTime;
     }
-public void setPointEndTime(String pointEndTime) {
+
+    public void setPointEndTime(String pointEndTime) {
         this.pointEndTime = pointEndTime;
     }
-public String getInspectionTime() {
+
+    public String getInspectionTime() {
         return inspectionTime;
     }
-public void setInspectionTime(String inspectionTime) {
+
+    public void setInspectionTime(String inspectionTime) {
         this.inspectionTime = inspectionTime;
     }
-public String getSortNumber() {
+
+    public String getSortNumber() {
         return sortNumber;
     }
-public void setSortNumber(String sortNumber) {
+
+    public void setSortNumber(String sortNumber) {
         this.sortNumber = sortNumber;
     }
-public String getMachineName() {
+
+    public String getMachineName() {
         return machineName;
     }
-public void setMachineName(String machineName) {
+
+    public void setMachineName(String machineName) {
         this.machineName = machineName;
     }
-public String getActUserName() {
+
+    public String getActUserName() {
         return actUserName;
     }
-public void setActUserName(String actUserName) {
+
+    public void setActUserName(String actUserName) {
         this.actUserName = actUserName;
     }
-public String getTaskDetailId() {
+
+    public String getTaskDetailId() {
         return taskDetailId;
     }
-public void setTaskDetailId(String taskDetailId) {
+
+    public void setTaskDetailId(String taskDetailId) {
         this.taskDetailId = taskDetailId;
     }
-public String getMachineId() {
+
+    public String getMachineId() {
         return machineId;
     }
-public void setMachineId(String machineId) {
+
+    public void setMachineId(String machineId) {
         this.machineId = machineId;
     }
-public String getPointStartTime() {
+
+    public String getPointStartTime() {
         return pointStartTime;
     }
-public void setPointStartTime(String pointStartTime) {
+
+    public void setPointStartTime(String pointStartTime) {
         this.pointStartTime = pointStartTime;
     }
-public String getState() {
+
+    public String getState() {
         return state;
     }
-public void setState(String state) {
+
+    public void setState(String state) {
         this.state = state;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getActUserId() {
+
+    public String getActUserId() {
         return actUserId;
     }
-public void setActUserId(String actUserId) {
+
+    public void setActUserId(String actUserId) {
         this.actUserId = actUserId;
     }
-public String getTaskId() {
+
+    public String getTaskId() {
         return taskId;
     }
-public void setTaskId(String taskId) {
+
+    public void setTaskId(String taskId) {
         this.taskId = taskId;
     }
 

java110-bean/src/main/java/com/java110/po/maintainanceTask/MaintainanceTaskPo.java

@@ -17,6 +17,7 @@ package com.java110.po.maintainanceTask;
 
 import java.io.Serializable;
 import java.util.Date;
+
 /**
  * 类表述： Po 数据模型实体对象 基本保持与数据库模型一直 用于 增加修改删除 等时的数据载体
  * add by 吴学文 at 2022-11-08 15:51:01 mail: 928255095@qq.com
@@ -28,125 +29,165 @@ import java.util.Date;
 public class MaintainanceTaskPo implements Serializable {
 
     private String planUserId;
-private String actInsTime;
-private String planInsTime;
-private String originalPlanUserName;
-private String transferDesc;
-private String statusCd = "0";
-private String actUserName;
-private String authDesc;
-private String originalPlanUserId;
-private String taskType;
-private String planId;
-private String planEndTime;
-private String planUserName;
-private String communityId;
-private String actUserId;
-private String taskId;
-private String mpsId;
-public String getPlanUserId() {
+    private String actInsTime;
+    private String planInsTime;
+    private String originalPlanUserName;
+    private String transferDesc;
+    private String statusCd = "0";
+    private String actUserName;
+    private String authDesc;
+    private String originalPlanUserId;
+    private String taskType;
+    private String planId;
+    private String planEndTime;
+    private String planUserName;
+    private String communityId;
+    private String actUserId;
+    private String taskId;
+    private String mpsId;
+    private String state;
+
+    public String getPlanUserId() {
         return planUserId;
     }
-public void setPlanUserId(String planUserId) {
+
+    public void setPlanUserId(String planUserId) {
         this.planUserId = planUserId;
     }
-public String getActInsTime() {
+
+    public String getActInsTime() {
         return actInsTime;
     }
-public void setActInsTime(String actInsTime) {
+
+    public void setActInsTime(String actInsTime) {
         this.actInsTime = actInsTime;
     }
-public String getPlanInsTime() {
+
+    public String getPlanInsTime() {
         return planInsTime;
     }
-public void setPlanInsTime(String planInsTime) {
+
+    public void setPlanInsTime(String planInsTime) {
         this.planInsTime = planInsTime;
     }
-public String getOriginalPlanUserName() {
+
+    public String getOriginalPlanUserName() {
         return originalPlanUserName;
     }
-public void setOriginalPlanUserName(String originalPlanUserName) {
+
+    public void setOriginalPlanUserName(String originalPlanUserName) {
         this.originalPlanUserName = originalPlanUserName;
     }
-public String getTransferDesc() {
+
+    public String getTransferDesc() {
         return transferDesc;
     }
-public void setTransferDesc(String transferDesc) {
+
+    public void setTransferDesc(String transferDesc) {
         this.transferDesc = transferDesc;
     }
-public String getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-public String getActUserName() {
+
+    public String getActUserName() {
         return actUserName;
     }
-public void setActUserName(String actUserName) {
+
+    public void setActUserName(String actUserName) {
         this.actUserName = actUserName;
     }
-public String getAuthDesc() {
+
+    public String getAuthDesc() {
         return authDesc;
     }
-public void setAuthDesc(String authDesc) {
+
+    public void setAuthDesc(String authDesc) {
         this.authDesc = authDesc;
     }
-public String getOriginalPlanUserId() {
+
+    public String getOriginalPlanUserId() {
         return originalPlanUserId;
     }
-public void setOriginalPlanUserId(String originalPlanUserId) {
+
+    public void setOriginalPlanUserId(String originalPlanUserId) {
         this.originalPlanUserId = originalPlanUserId;
     }
-public String getTaskType() {
+
+    public String getTaskType() {
         return taskType;
     }
-public void setTaskType(String taskType) {
+
+    public void setTaskType(String taskType) {
         this.taskType = taskType;
     }
-public String getPlanId() {
+
+    public String getPlanId() {
         return planId;
     }
-public void setPlanId(String planId) {
+
+    public void setPlanId(String planId) {
         this.planId = planId;
     }
-public String getPlanEndTime() {
+
+    public String getPlanEndTime() {
         return planEndTime;
     }
-public void setPlanEndTime(String planEndTime) {
+
+    public void setPlanEndTime(String planEndTime) {
         this.planEndTime = planEndTime;
     }
-public String getPlanUserName() {
+
+    public String getPlanUserName() {
         return planUserName;
     }
-public void setPlanUserName(String planUserName) {
+
+    public void setPlanUserName(String planUserName) {
         this.planUserName = planUserName;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getActUserId() {
+
+    public String getActUserId() {
         return actUserId;
     }
-public void setActUserId(String actUserId) {
+
+    public void setActUserId(String actUserId) {
         this.actUserId = actUserId;
     }
-public String getTaskId() {
+
+    public String getTaskId() {
         return taskId;
     }
-public void setTaskId(String taskId) {
+
+    public void setTaskId(String taskId) {
         this.taskId = taskId;
     }
-public String getMpsId() {
+
+    public String getMpsId() {
         return mpsId;
     }
-public void setMpsId(String mpsId) {
+
+    public void setMpsId(String mpsId) {
         this.mpsId = mpsId;
     }
 
+    public String getState() {
+        return state;
+    }
 
-
+    public void setState(String state) {
+        this.state = state;
+    }
 }

service-job/src/main/java/com/java110/job/task/maintainance/GeneratorMaintainanceTaskTemplate.java

@@ -6,6 +6,7 @@ import com.java110.dto.maintainancePlan.MaintainancePlanDto;
 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.*;
@@ -170,6 +171,7 @@ public class GeneratorMaintainanceTaskTemplate extends TaskSystemQuartz {
             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 +263,7 @@ public class GeneratorMaintainanceTaskTemplate extends TaskSystemQuartz {
 
         int subDay = DateUtil.daysBetween(DateUtil.getCurrentDate(), DateUtil.getDateFromStringB(tmpMaintainancePlanDto.getStartDate()));
 
-        if(subDay % day != 0){
+        if (subDay % day != 0) {
             return false;
         }
 
@@ -269,7 +271,7 @@ public class GeneratorMaintainanceTaskTemplate extends TaskSystemQuartz {
         //当前时间是否 到了 巡检任务前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));