findResourceInspectTaskList(ResourceInspectTaskDto resourceInspectTaskDto);
+ LocalDateTime selectMaxCreateTimeByPlanBoAnd(ResourceInspectTask resourceInspectTask);
+
+
}
\ No newline at end of file
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceRepairTaskMapper.java b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceRepairTaskMapper.java
new file mode 100644
index 00000000..3b8b4644
--- /dev/null
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceRepairTaskMapper.java
@@ -0,0 +1,36 @@
+package com.foreverwin.mesnac.equip.mapper;
+
+import com.foreverwin.mesnac.equip.model.ResourceRepairTask;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ *
+ * 设备报修任务表 Mapper 接口
+ *
+ *
+ * @author pavel.Liu
+ * @since 2021-07-06
+ */
+@Repository
+public interface ResourceRepairTaskMapper extends BaseMapper {
+
+ /**
+ * 自定义sql：多条件查询，获取维修任务
+ * @param resourceRepairTask
+ * @return
+ */
+ List findResourceRepairTaskList(ResourceRepairTask resourceRepairTask);
+
+ /**
+ * 自定义sql：根据维修任务HANDLE查询维修任务详细数据
+ * @param site
+ * @param handle
+ * @return
+ */
+ ResourceRepairTask findResourceRepairTaskByHandleAndSite(@Param("site") String site,@Param("handle") String handle);
+
+}
\ No newline at end of file
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceRepairTask.java b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceRepairTask.java
new file mode 100644
index 00000000..07721003
--- /dev/null
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceRepairTask.java
@@ -0,0 +1,866 @@
+package com.foreverwin.mesnac.equip.model;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.IdType;
+
+/**
+ *
+ * 设备报修/维修表
+ *
+ *
+ * @author pavel.Liu
+ * @since 2021-07-07
+ */
+
+@TableName("Z_RESOURCE_REPAIR_TASK")
+
+public class ResourceRepairTask extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "HANDLE", type = IdType.INPUT)
+ private String handle;
+ /**
+ * 站点
+ */
+ @TableField("SITE")
+ private String site;
+ /**
+ * 维修编号
+ */
+ @TableField("REPAIR_NO")
+ private String repairNo;
+ /**
+ * 描述
+ */
+ @TableField("DESCRIPTION")
+ private String description;
+ /**
+ * 状态
+ */
+ @TableField("STATUS")
+ private String status;
+ /**
+ * 设备编号
+ */
+ @TableField("RESOURCE_NO")
+ private String resourceNo;
+ /**
+ * 提报人
+ */
+ @TableField("REPORT_USER")
+ private String reportUser;
+ /**
+ * 不良代码HANDLE
+ */
+ @TableField("NC_CODE_NO")
+ private String ncCodeNo;
+ /**
+ * 维修类型
+ */
+ @TableField("REPAIR_TYPE")
+ private String repairType;
+ /**
+ * 是否停机
+ */
+ @TableField("STOP_MACHINE")
+ private String stopMachine;
+ /**
+ * 故障描述补充
+ */
+ @TableField("BREAK_DOWN_DESCRIPTION")
+ private String breakDownDescription;
+ /**
+ * 发现环节
+ */
+ @TableField("FIND_LINK")
+ private String findLink;
+ /**
+ * 上报来源
+ */
+ @TableField("REPORT_SOURCE")
+ private String reportSource;
+ /**
+ * 关联来源-异常转维修
+ */
+ @TableField("OBJECT_BO")
+ private String objectBo;
+ /**
+ * 建议维修时间
+ */
+ @TableField("PLAN_START_DATE")
+ private LocalDateTime planStartDate;
+ /**
+ * 建议完成时间
+ */
+ @TableField("PLAN_COMPLETE_DATE")
+ private LocalDateTime planCompleteDate;
+ /**
+ * 实际维修时间
+ */
+ @TableField("ACTUAL_START_DATE")
+ private LocalDateTime actualStartDate;
+ /**
+ * 实际完成时间
+ */
+ @TableField("ACTUAL_COMPLETE_DATE")
+ private LocalDateTime actualCompleteDate;
+ /**
+ * 维修用户
+ */
+ @TableField("REPAIR_USERS")
+ private String repairUsers;
+ /**
+ * 取消代码
+ */
+ @TableField("CANCEL_CODE")
+ private String cancelCode;
+ /**
+ * 取消时间
+ */
+ @TableField("CANCEL_DATE")
+ private LocalDateTime cancelDate;
+ /**
+ * 取消描述
+ */
+ @TableField("CANCEL_DESCRIPTION")
+ private String cancelDescription;
+ /**
+ * 取消用户
+ */
+ @TableField("CANCEL_USER")
+ private String cancelUser;
+ /**
+ * 处理方式
+ */
+ @TableField("DEAL_WAY")
+ private String dealWay;
+ /**
+ * 初步原因
+ */
+ @TableField("PRELIMINARY_REASON")
+ private String preliminaryReason;
+ /**
+ * 处理方式描述
+ */
+ @TableField("DEAL_WAY_DESCRIPTION")
+ private String dealWayDescription;
+ /**
+ * 等待时间
+ */
+ @TableField("WAIT_TIME")
+ private Double waitTime;
+ /**
+ * 等待开始时间
+ */
+ @TableField("WAIT_START_DATE")
+ private LocalDateTime waitStartDate;
+ /**
+ * 等待结束时间
+ */
+ @TableField("WAIT_END_DATE")
+ private LocalDateTime waitEndDate;
+ /**
+ * 等待描述
+ */
+ @TableField("WAIT_DESCRIPTION")
+ private String waitDescription;
+ /**
+ * 根本原因
+ */
+ @TableField("PRIMARY_REASON")
+ private String primaryReason;
+ /**
+ * 根本原因描述
+ */
+ @TableField("PRIMARY_REASON_DESCRIPTION")
+ private String primaryReasonDescription;
+ /**
+ * 预防措施描述
+ */
+ @TableField("PRECAUTION_MEASURE_DESCRIPTION")
+ private String precautionMeasureDescription;
+ /**
+ * 备注
+ */
+ @TableField("REMARK")
+ private String remark;
+ /**
+ * 预留字段1
+ */
+ @TableField("OTHER")
+ private String other;
+ /**
+ * 预留字段2
+ */
+ @TableField("ANOTHER")
+ private String another;
+ /**
+ * 创建人
+ */
+ @TableField("CREATE_USER")
+ private String createUser;
+ /**
+ * 创建时间
+ */
+ @TableField("CREATED_DATE_TIME")
+ private LocalDateTime createdDateTime;
+ /**
+ * 修改人
+ */
+ @TableField("MODIFY_USER")
+ private String modifyUser;
+ /**
+ * 修改时间
+ */
+ @TableField("MODIFIED_DATE_TIME")
+ private LocalDateTime modifiedDateTime;
+
+ /**
+ * 设备HANDLE
+ */
+ @TableField(exist = false)
+ private String resourceBo;
+ /**
+ * 设备描述
+ */
+ @TableField(exist = false)
+ private String resourceDescription;
+ /**
+ * 设备类型
+ */
+ @TableField(exist = false)
+ private String resourceTypeNo;
+ /**
+ * 设备类型HANDLE
+ */
+ @TableField(exist = false)
+ private String resourceTypeBo;
+ /**
+ * 设备类型
+ */
+ @TableField(exist = false)
+ private String resourceTypeDescription;
+ /**
+ * 不良代码HANDLE
+ */
+ @TableField(exist = false)
+ private String ncCodeBo;
+ /**
+ * 不良名称
+ */
+ @TableField(exist = false)
+ private String ncCodeDescription;
+ /**
+ * 车间
+ */
+ @TableField(exist = false)
+ private String workCenterNo;
+ /**
+ * 车间HANDLE
+ */
+ @TableField(exist = false)
+ private String workCenterBo;
+ /**
+ * 车间
+ */
+ @TableField(exist = false)
+ private String workCenterDescription;
+ /**
+ * 比较时间，起
+ */
+ @TableField(exist = false)
+ private LocalDateTime compareStartTime;
+ /**
+ * 比较时间，终
+ */
+ @TableField(exist = false)
+ private LocalDateTime compareEndTime;
+ /**
+ * 备品清单
+ */
+ @TableField(exist = false)
+ private List spareList;
+ /**
+ * 序号
+ */
+ @TableField(exist = false)
+ private Integer seq;
+
+
+ public List getSpareList() {
+ return spareList;
+ }
+
+ public void setSpareList(List spareList) {
+ this.spareList = spareList;
+ }
+
+ public String getWorkCenterBo() {
+ return workCenterBo;
+ }
+
+ public void setWorkCenterBo(String workCenterBo) {
+ this.workCenterBo = workCenterBo;
+ }
+
+ public String getNcCodeBo() {
+ return ncCodeBo;
+ }
+
+ public void setNcCodeBo(String ncCodeBo) {
+ this.ncCodeBo = ncCodeBo;
+ }
+
+ public String getResourceBo() {
+ return resourceBo;
+ }
+
+ public void setResourceBo(String resourceBo) {
+ this.resourceBo = resourceBo;
+ }
+
+ public String getResourceDescription() {
+ return resourceDescription;
+ }
+
+ public void setResourceDescription(String resourceDescription) {
+ this.resourceDescription = resourceDescription;
+ }
+
+ public String getResourceTypeNo() {
+ return resourceTypeNo;
+ }
+
+ public void setResourceTypeNo(String resourceTypeNo) {
+ this.resourceTypeNo = resourceTypeNo;
+ }
+
+ public String getResourceTypeBo() {
+ return resourceTypeBo;
+ }
+
+ public void setResourceTypeBo(String resourceTypeBo) {
+ this.resourceTypeBo = resourceTypeBo;
+ }
+
+ public String getResourceTypeDescription() {
+ return resourceTypeDescription;
+ }
+
+ public void setResourceTypeDescription(String resourceTypeDescription) {
+ this.resourceTypeDescription = resourceTypeDescription;
+ }
+
+ public String getNcCodeDescription() {
+ return ncCodeDescription;
+ }
+
+ public void setNcCodeDescription(String ncCodeDescription) {
+ this.ncCodeDescription = ncCodeDescription;
+ }
+
+ public String getWorkCenterNo() {
+ return workCenterNo;
+ }
+
+ public void setWorkCenterNo(String workCenterNo) {
+ this.workCenterNo = workCenterNo;
+ }
+
+ public String getWorkCenterDescription() {
+ return workCenterDescription;
+ }
+
+ public void setWorkCenterDescription(String workCenterDescription) {
+ this.workCenterDescription = workCenterDescription;
+ }
+
+ public LocalDateTime getCompareStartTime() {
+ return compareStartTime;
+ }
+
+ public void setCompareStartTime(LocalDateTime compareStartTime) {
+ this.compareStartTime = compareStartTime;
+ }
+
+ public LocalDateTime getCompareEndTime() {
+ return compareEndTime;
+ }
+
+ public void setCompareEndTime(LocalDateTime compareEndTime) {
+ this.compareEndTime = compareEndTime;
+ }
+
+ public Integer getSeq() {
+ return seq;
+ }
+
+ public void setSeq(Integer seq) {
+ this.seq = seq;
+ }
+
+ /** ------------------------------------------------------------------------------------------------------ **/
+ public String getHandle() {
+ return handle;
+ }
+
+ public void setHandle(String handle) {
+ this.handle = handle;
+ }
+
+ public String getSite() {
+ return site;
+ }
+
+ public void setSite(String site) {
+ this.site = site;
+ }
+
+ public String getRepairNo() {
+ return repairNo;
+ }
+
+ public void setRepairNo(String repairNo) {
+ this.repairNo = repairNo;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public String getResourceNo() {
+ return resourceNo;
+ }
+
+ public void setResourceNo(String resourceNo) {
+ this.resourceNo = resourceNo;
+ }
+
+ public String getReportUser() {
+ return reportUser;
+ }
+
+ public void setReportUser(String reportUser) {
+ this.reportUser = reportUser;
+ }
+
+ public String getNcCodeNo() {
+ return ncCodeNo;
+ }
+
+ public void setNcCodeNo(String ncCodeNo) {
+ this.ncCodeNo = ncCodeNo;
+ }
+
+ public String getRepairType() {
+ return repairType;
+ }
+
+ public void setRepairType(String repairType) {
+ this.repairType = repairType;
+ }
+
+ public String getStopMachine() {
+ return stopMachine;
+ }
+
+ public void setStopMachine(String stopMachine) {
+ this.stopMachine = stopMachine;
+ }
+
+ public String getBreakDownDescription() {
+ return breakDownDescription;
+ }
+
+ public void setBreakDownDescription(String breakDownDescription) {
+ this.breakDownDescription = breakDownDescription;
+ }
+
+ public String getFindLink() {
+ return findLink;
+ }
+
+ public void setFindLink(String findLink) {
+ this.findLink = findLink;
+ }
+
+ public String getReportSource() {
+ return reportSource;
+ }
+
+ public void setReportSource(String reportSource) {
+ this.reportSource = reportSource;
+ }
+
+ public String getObjectBo() {
+ return objectBo;
+ }
+
+ public void setObjectBo(String objectBo) {
+ this.objectBo = objectBo;
+ }
+
+ public LocalDateTime getPlanStartDate() {
+ return planStartDate;
+ }
+
+ public void setPlanStartDate(LocalDateTime planStartDate) {
+ this.planStartDate = planStartDate;
+ }
+
+ public LocalDateTime getPlanCompleteDate() {
+ return planCompleteDate;
+ }
+
+ public void setPlanCompleteDate(LocalDateTime planCompleteDate) {
+ this.planCompleteDate = planCompleteDate;
+ }
+
+ public LocalDateTime getActualStartDate() {
+ return actualStartDate;
+ }
+
+ public void setActualStartDate(LocalDateTime actualStartDate) {
+ this.actualStartDate = actualStartDate;
+ }
+
+ public LocalDateTime getActualCompleteDate() {
+ return actualCompleteDate;
+ }
+
+ public void setActualCompleteDate(LocalDateTime actualCompleteDate) {
+ this.actualCompleteDate = actualCompleteDate;
+ }
+
+ public String getRepairUsers() {
+ return repairUsers;
+ }
+
+ public void setRepairUsers(String repairUsers) {
+ this.repairUsers = repairUsers;
+ }
+
+ public String getCancelCode() {
+ return cancelCode;
+ }
+
+ public void setCancelCode(String cancelCode) {
+ this.cancelCode = cancelCode;
+ }
+
+ public LocalDateTime getCancelDate() {
+ return cancelDate;
+ }
+
+ public void setCancelDate(LocalDateTime cancelDate) {
+ this.cancelDate = cancelDate;
+ }
+
+ public String getCancelDescription() {
+ return cancelDescription;
+ }
+
+ public void setCancelDescription(String cancelDescription) {
+ this.cancelDescription = cancelDescription;
+ }
+
+ public String getCancelUser() {
+ return cancelUser;
+ }
+
+ public void setCancelUser(String cancelUser) {
+ this.cancelUser = cancelUser;
+ }
+
+ public String getDealWay() {
+ return dealWay;
+ }
+
+ public void setDealWay(String dealWay) {
+ this.dealWay = dealWay;
+ }
+
+ public String getPreliminaryReason() {
+ return preliminaryReason;
+ }
+
+ public void setPreliminaryReason(String preliminaryReason) {
+ this.preliminaryReason = preliminaryReason;
+ }
+
+ public String getDealWayDescription() {
+ return dealWayDescription;
+ }
+
+ public void setDealWayDescription(String dealWayDescription) {
+ this.dealWayDescription = dealWayDescription;
+ }
+
+ public Double getWaitTime() {
+ return waitTime;
+ }
+
+ public void setWaitTime(Double waitTime) {
+ this.waitTime = waitTime;
+ }
+
+ public LocalDateTime getWaitStartDate() {
+ return waitStartDate;
+ }
+
+ public void setWaitStartDate(LocalDateTime waitStartDate) {
+ this.waitStartDate = waitStartDate;
+ }
+
+ public LocalDateTime getWaitEndDate() {
+ return waitEndDate;
+ }
+
+ public void setWaitEndDate(LocalDateTime waitEndDate) {
+ this.waitEndDate = waitEndDate;
+ }
+
+ public String getWaitDescription() {
+ return waitDescription;
+ }
+
+ public void setWaitDescription(String waitDescription) {
+ this.waitDescription = waitDescription;
+ }
+
+ public String getPrimaryReason() {
+ return primaryReason;
+ }
+
+ public void setPrimaryReason(String primaryReason) {
+ this.primaryReason = primaryReason;
+ }
+
+ public String getPrimaryReasonDescription() {
+ return primaryReasonDescription;
+ }
+
+ public void setPrimaryReasonDescription(String primaryReasonDescription) {
+ this.primaryReasonDescription = primaryReasonDescription;
+ }
+
+ public String getPrecautionMeasureDescription() {
+ return precautionMeasureDescription;
+ }
+
+ public void setPrecautionMeasureDescription(String precautionMeasureDescription) {
+ this.precautionMeasureDescription = precautionMeasureDescription;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public String getOther() {
+ return other;
+ }
+
+ public void setOther(String other) {
+ this.other = other;
+ }
+
+ public String getAnother() {
+ return another;
+ }
+
+ public void setAnother(String another) {
+ this.another = another;
+ }
+
+ public String getCreateUser() {
+ return createUser;
+ }
+
+ public void setCreateUser(String createUser) {
+ this.createUser = createUser;
+ }
+
+ public LocalDateTime getCreatedDateTime() {
+ return createdDateTime;
+ }
+
+ public void setCreatedDateTime(LocalDateTime createdDateTime) {
+ this.createdDateTime = createdDateTime;
+ }
+
+ public String getModifyUser() {
+ return modifyUser;
+ }
+
+ public void setModifyUser(String modifyUser) {
+ this.modifyUser = modifyUser;
+ }
+
+ public LocalDateTime getModifiedDateTime() {
+ return modifiedDateTime;
+ }
+
+ public void setModifiedDateTime(LocalDateTime modifiedDateTime) {
+ this.modifiedDateTime = modifiedDateTime;
+ }
+
+public static final String HANDLE = "HANDLE";
+
+public static final String SITE = "SITE";
+
+public static final String REPAIR_NO = "REPAIR_NO";
+
+public static final String DESCRIPTION = "DESCRIPTION";
+
+public static final String STATUS = "STATUS";
+
+public static final String RESOURCE_NO = "RESOURCE_NO";
+
+public static final String REPORT_USER = "REPORT_USER";
+
+public static final String NC_CODE_NO = "NC_CODE_NO";
+
+public static final String REPAIR_TYPE = "REPAIR_TYPE";
+
+public static final String STOP_MACHINE = "STOP_MACHINE";
+
+public static final String BREAK_DOWN_DESCRIPTION = "BREAK_DOWN_DESCRIPTION";
+
+public static final String FIND_LINK = "FIND_LINK";
+
+public static final String REPORT_SOURCE = "REPORT_SOURCE";
+
+public static final String OBJECT_BO = "OBJECT_BO";
+
+public static final String PLAN_START_DATE = "PLAN_START_DATE";
+
+public static final String PLAN_COMPLETE_DATE = "PLAN_COMPLETE_DATE";
+
+public static final String ACTUAL_START_DATE = "ACTUAL_START_DATE";
+
+public static final String ACTUAL_COMPLETE_DATE = "ACTUAL_COMPLETE_DATE";
+
+public static final String REPAIR_USERS = "REPAIR_USERS";
+
+public static final String CANCEL_CODE = "CANCEL_CODE";
+
+public static final String CANCEL_DATE = "CANCEL_DATE";
+
+public static final String CANCEL_DESCRIPTION = "CANCEL_DESCRIPTION";
+
+public static final String CANCEL_USER = "CANCEL_USER";
+
+public static final String DEAL_WAY = "DEAL_WAY";
+
+public static final String PRELIMINARY_REASON = "PRELIMINARY_REASON";
+
+public static final String DEAL_WAY_DESCRIPTION = "DEAL_WAY_DESCRIPTION";
+
+public static final String WAIT_TIME = "WAIT_TIME";
+
+public static final String WAIT_START_DATE = "WAIT_START_DATE";
+
+public static final String WAIT_END_DATE = "WAIT_END_DATE";
+
+public static final String WAIT_DESCRIPTION = "WAIT_DESCRIPTION";
+
+public static final String PRIMARY_REASON = "PRIMARY_REASON";
+
+public static final String PRIMARY_REASON_DESCRIPTION = "PRIMARY_REASON_DESCRIPTION";
+
+public static final String PRECAUTION_MEASURE_DESCRIPTION = "PRECAUTION_MEASURE_DESCRIPTION";
+
+public static final String REMARK = "REMARK";
+
+public static final String OTHER = "OTHER";
+
+public static final String ANOTHER = "ANOTHER";
+
+public static final String CREATE_USER = "CREATE_USER";
+
+public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME";
+
+public static final String MODIFY_USER = "MODIFY_USER";
+
+public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.handle;
+ }
+
+ @Override
+ public String toString() {
+ return "ResourceRepairTask{" +
+ "handle = " + handle +
+ ", site = " + site +
+ ", repairNo = " + repairNo +
+ ", description = " + description +
+ ", status = " + status +
+ ", resourceNo = " + resourceNo +
+ ", reportUser = " + reportUser +
+ ", ncCodeNo = " + ncCodeNo +
+ ", repairType = " + repairType +
+ ", stopMachine = " + stopMachine +
+ ", breakDownDescription = " + breakDownDescription +
+ ", findLink = " + findLink +
+ ", reportSource = " + reportSource +
+ ", objectBo = " + objectBo +
+ ", planStartDate = " + planStartDate +
+ ", planCompleteDate = " + planCompleteDate +
+ ", actualStartDate = " + actualStartDate +
+ ", actualCompleteDate = " + actualCompleteDate +
+ ", repairUsers = " + repairUsers +
+ ", cancelCode = " + cancelCode +
+ ", cancelDate = " + cancelDate +
+ ", cancelDescription = " + cancelDescription +
+ ", cancelUser = " + cancelUser +
+ ", dealWay = " + dealWay +
+ ", preliminaryReason = " + preliminaryReason +
+ ", dealWayDescription = " + dealWayDescription +
+ ", waitTime = " + waitTime +
+ ", waitStartDate = " + waitStartDate +
+ ", waitEndDate = " + waitEndDate +
+ ", waitDescription = " + waitDescription +
+ ", primaryReason = " + primaryReason +
+ ", primaryReasonDescription = " + primaryReasonDescription +
+ ", precautionMeasureDescription = " + precautionMeasureDescription +
+ ", remark = " + remark +
+ ", other = " + other +
+ ", another = " + another +
+ ", createUser = " + createUser +
+ ", createdDateTime = " + createdDateTime +
+ ", modifyUser = " + modifyUser +
+ ", modifiedDateTime = " + modifiedDateTime +
+ "}";
+ }
+}
\ No newline at end of file
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectPlanService.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectPlanService.java
index a563e93b..b3eb08ac 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectPlanService.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectPlanService.java
@@ -3,6 +3,7 @@ package com.foreverwin.mesnac.equip.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.foreverwin.mesnac.equip.model.ResourceInspectPlan;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.foreverwin.mesnac.equip.model.ResourceInspectTask;
import com.foreverwin.modular.core.util.FrontPage;
import java.util.List;
@@ -34,4 +35,10 @@ public interface ResourceInspectPlanService extends IService
+ * 设备报修任务表 服务类
+ *
+ *
+ * @author pavel.Liu
+ * @since 2021-07-06
+ */
+public interface ResourceRepairTaskService extends IService {
+
+ /**
+ * 分页查询
+ * @param frontPage
+ * @return
+ */
+ IPage selectPage(FrontPage frontPage, ResourceRepairTask resourceRepairTask);
+
+ List selectList(ResourceRepairTask resourceRepairTask);
+
+ void deleteRepairTaskList(ResourceRepairTask resourceRepairTask);
+
+ /**
+ * 维修提报，保存提报信息
+ * @param resourceRepairTask
+ */
+ void saveRepairTask(ResourceRepairTask resourceRepairTask);
+
+ /**
+ * 条件查询，查询维修任务
+ * @param resourceRepairTask
+ * @return
+ */
+ List findResourceRepairTaskList(ResourceRepairTask resourceRepairTask);
+
+ /**
+ * 根据HANDLE查询维修任务；
+ * 1、从总览界面，点击查询并返回维修任务；
+ * 2、点击开始维修，仅修改状态、维修人员
+ * @param resourceRepairTask
+ * @return
+ */
+ ResourceRepairTask selOrStartRepairTask(ResourceRepairTask resourceRepairTask);
+
+ /**
+ * 取消、等待、完成，均使用当前方法
+ * 1、状态码为301——维修中->维修完成
+ * 2、状态码为302——维修中->维修取消
+ * 3、状态码为502——维修中->维修等待
+ * 4、状态码为501——维修等待->维修中
+ * @param resourceRepairTask
+ * @return
+ */
+ ResourceRepairTask saveOrUpdateTaskInfo(ResourceRepairTask resourceRepairTask);
+
+ /**
+ * 自定义sql：根据维修任务HANDLE查询维修任务详细数据
+ **/
+ ResourceRepairTask findResourceRepairTaskByHandleAndSite(String site,String handle);
+
+ Boolean updateResourceRepairTaskInfoByHandle(ResourceRepairTask resourceRepairTask);
+
+}
\ No newline at end of file
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java
index fc9c5830..50c35e95 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java
@@ -7,7 +7,7 @@ import com.foreverwin.mesnac.common.model.InspectionItem;
import com.foreverwin.mesnac.common.model.InspectionItemDetail;
import com.foreverwin.mesnac.common.service.InspectionItemDetailService;
import com.foreverwin.mesnac.common.service.InspectionItemService;
-import com.foreverwin.mesnac.common.service.NextNumberService;
+import com.foreverwin.mesnac.equip.mapper.ResourceInspectTaskMapper;
import com.foreverwin.mesnac.equip.model.*;
import com.foreverwin.mesnac.equip.service.*;
import com.foreverwin.mesnac.meapi.model.UserGroup;
@@ -24,7 +24,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
-import java.time.ZoneOffset;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
@@ -59,6 +58,8 @@ public class ResourceInspectPlanServiceImpl extends ServiceImpl selectPage(FrontPage frontPage, ResourceInspectPlan resourceInspectPlan) {
@@ -350,6 +351,47 @@ public class ResourceInspectPlanServiceImpl extends ServiceImpl nextNumber = nextNumberHelper.getNextNumber(site, Constants.RESOURCE_INSPECT_TASK, 1);
+ inspectTask.setTaskNo(nextNumber.get(0));
+ inspectTask.setHandle(HandleEnum.RESOURCE_INSPECT_TASK.getHandle(site,nextNumber.get(0)));
+ resourceInspectTaskService.save(inspectTask);
+ }
+
/**
* 删除设备清单
*/
@@ -402,7 +444,7 @@ public class ResourceInspectPlanServiceImpl extends ServiceImpl taskParamList = resourceInspectTaskParamService.selectList(resourceInspectTaskParam);
+ task.setTaskItemDetailList(taskParamList);
+ // 获取备品清单
+ ResourceInspectTaskSpare resourceInspectTaskSpare = new ResourceInspectTaskSpare();
+ resourceInspectTaskSpare.setResourceInspectTaskBo(handle);
+ List taskSpareList = resourceInspectTaskSpareService.selectList(resourceInspectTaskSpare);
+ task.setTaskSpareList(taskSpareList);
+ return task;
+ }
+
@Override
public void saveOrUpdateTaskInfo(ResourceInspectTaskDto resourceInspectTaskDto) {
- // 站点、任务编号——任务handle
+ // 站点、任务编号——任务handle、执行人、状态
String site = CommonMethods.getSite();
String taskNo = resourceInspectTaskDto.getTaskNo();
String taskHandle = HandleEnum.RESOURCE_INSPECT_TASK.getHandle(site, taskNo);
String executor = resourceInspectTaskDto.getExecutor();
+ String status = resourceInspectTaskDto.getStatus();
// 检验项、备品清单
List taskItemDetailList = resourceInspectTaskDto.getTaskItemDetailList();
List taskSpareList = resourceInspectTaskDto.getTaskSpareList();
@@ -144,15 +188,23 @@ public class ResourceInspectTaskServiceImpl extends ServiceImpl taskParams = resourceInspectTaskParamService.selectList(resourceInspectTaskParam);
- if ( taskParams.size() > 0 ){
-
- }*/
resourceInspectTaskParamService.removeAll(resourceInspectTaskParam);
+
for (ResourceInspectTaskParam taskParam:taskItemDetailList) {
taskParam.setCreatedDateTime(LocalDateTime.now());
taskParam.setCreateUser(executor);
@@ -163,9 +215,6 @@ public class ResourceInspectTaskServiceImpl extends ServiceImpl
+ * 设备报修任务表 服务实现类
+ *
+ *
+ * @author pavel.Liu
+ * @since 2021-07-06
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class ResourceRepairTaskServiceImpl extends ServiceImpl implements ResourceRepairTaskService {
+
+ @Autowired
+ private NextNumberHelper nextNumberHelper;
+ @Autowired
+ private ResourceRepairTaskMapper resourceRepairTaskMapper;
+ @Autowired
+ private EquipService equipService;
+ @Autowired
+ private ResourceRepairTaskService resourceRepairTaskService;
+ @Autowired
+ private NcCodeService ncCodeService;
+ @Autowired
+ private ResourceInspectTaskSpareService resourceInspectTaskSpareService;
+ @Autowired
+ private ResrceService resrceService;
+
+ @Override
+ public IPage selectPage(FrontPage frontPage, ResourceRepairTask resourceRepairTask) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.setEntity(resourceRepairTask);
+ return super.page(frontPage.getPagePlus(), queryWrapper);
+ }
+
+ @Override
+ public List selectList(ResourceRepairTask resourceRepairTask) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.setEntity(resourceRepairTask);
+ return super.list(queryWrapper);
+ }
+
+ @Override
+ public void deleteRepairTaskList(ResourceRepairTask resourceRepairTask) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.setEntity(resourceRepairTask);
+ super.remove(queryWrapper);
+ }
+
+ @Override
+ public void saveRepairTask(ResourceRepairTask resourceRepairTask) {
+ String site = resourceRepairTask.getSite();
+ // 设备编号
+ String resourceNo = resourceRepairTask.getResourceNo();
+ String resourceHandle = HandleEnum.RESOURCE.getHandle(site, resourceNo);
+ if ( equipService.getById(resourceHandle) == null ){
+ throw BusinessException.build("设备编号错误！！！");
+ }
+ // 不良代码
+ String ncCOdeNo = resourceRepairTask.getNcCodeNo();
+ String ncCodeHandle = HandleEnum.NC_CODE.getHandle(site, ncCOdeNo);
+ if ( ncCodeService.getById(ncCodeHandle) == null ){
+ throw BusinessException.build("不良代码错误！！！");
+ }
+ // 维修单号、维修HANDLE
+ List nextNumber = nextNumberHelper.getNextNumber(site, Constants.RESOURCE_REPAIR_TASK, 1);
+ resourceRepairTask.setRepairNo(nextNumber.get(0));
+ resourceRepairTask.setHandle(HandleEnum.RESOURCE_REPAIR_TASK.getHandle(site,nextNumber.get(0)));
+ // 默认新建状态
+ resourceRepairTask.setStatus("401");
+ // 创建人、创建时间
+ String reportUser = resourceRepairTask.getReportUser();
+ if (reportUser == null){
+ throw BusinessException.build("提报人不能为空！！！");
+ }
+ resourceRepairTask.setCreateUser(reportUser);
+ resourceRepairTask.setCreatedDateTime(LocalDateTime.now());
+ resourceRepairTaskService.save(resourceRepairTask);
+ }
+
+ @Override
+ public List findResourceRepairTaskList(ResourceRepairTask resourceRepairTask) {
+ return resourceRepairTaskMapper.findResourceRepairTaskList(resourceRepairTask);
+ }
+
+ @Override
+ public ResourceRepairTask selOrStartRepairTask(ResourceRepairTask resourceRepairTask) {
+ // 根据HANDLE查询维修任务
+ String handle = resourceRepairTask.getHandle();
+ String stopMachine = resourceRepairTask.getStopMachine();
+ ResourceRepairTask repairTask = resourceRepairTaskService.getById(handle);
+ String site = repairTask.getSite();
+ String statusBo = repairTask.getStatus();
+ if (repairTask == null){
+ throw BusinessException.build("维修任务查询失败！！！");
+ }
+ String status = resourceRepairTask.getStatus();
+ if (statusBo.equals("301")){
+ // 根据维修任务HANDEL查询备品清单
+ ResourceInspectTaskSpare resourceInspectTaskSpare = new ResourceInspectTaskSpare();
+ resourceInspectTaskSpare.setResourceInspectTaskBo(handle);
+ List spareList = resourceInspectTaskSpareService.selectList(resourceInspectTaskSpare);
+ repairTask.setSpareList(spareList);
+ }
+ // 判断是否点击开始维修
+ if (stopMachine != null && status.equals("501")){
+ repairTask.setStatus("501");
+ repairTask.setActualStartDate(LocalDateTime.now());
+ repairTask.setRepairUsers(CommonMethods.getUser());
+ resourceRepairTaskService.updateById(repairTask);
+ // 修改设备状态---若stopMachie=Y，则状态改为非预定停机
+ if (stopMachine.equals("Y")){
+ String resourceNo = repairTask.getResourceNo();
+ String resourceBo = HandleEnum.RESOURCE.getHandle(site, resourceNo);
+ resrceService.updateResourceStatusByHandle(resourceBo,"5");
+ }
+ }
+ return repairTask;
+ }
+
+ @Override
+ public ResourceRepairTask saveOrUpdateTaskInfo(ResourceRepairTask resourceRepairTask) {
+ // 状态、HANDLE
+ String status = resourceRepairTask.getStatus();
+ String handle = resourceRepairTask.getHandle();
+ String user = CommonMethods.getUser();
+ ResourceRepairTask repairTask = resourceRepairTaskService.getById(handle);
+ String site = repairTask.getSite();
+ switch (status){
+ case "301":
+ List spareList = resourceRepairTask.getSpareList();
+ for (ResourceInspectTaskSpare spare:spareList) {
+ spare.setCreateUser(user);
+ spare.setHandle(HandleEnum.RESOURCE_INSPECT_TASK_SPARE.getHandle(site,UUID.randomUUID().toString()));
+ spare.setResourceInspectTaskBo(handle);
+ spare.setCreatedDateTime(LocalDateTime.now());
+ }
+ resourceInspectTaskSpareService.saveBatch(spareList);
+ repairTask.setSpareList(spareList);
+ // 完成时间、维修人员
+ repairTask.setActualCompleteDate(LocalDateTime.now());
+ repairTask.setRepairUsers(resourceRepairTask.getRepairUsers());
+ // 处理方式、处理方式描述、初步原因
+ repairTask.setDealWay(resourceRepairTask.getDealWay());
+ repairTask.setDealWayDescription(resourceRepairTask.getDealWayDescription());
+ repairTask.setPreliminaryReason(resourceRepairTask.getPreliminaryReason());
+ // 根本原因、根本原因描述、预防措施描述
+ repairTask.setPrimaryReason(resourceRepairTask.getPrimaryReason());
+ repairTask.setPrimaryReasonDescription(resourceRepairTask.getPrimaryReasonDescription());
+ repairTask.setPrecautionMeasureDescription(resourceRepairTask.getPrecautionMeasureDescription());
+ // 修改设备状态：判断维修前和维修结束的stopMachie字段是否修改
+ String stopMachine = resourceRepairTask.getStopMachine();
+ String stopMachineT = repairTask.getStopMachine();
+ if (!stopMachine.equals(stopMachineT)){
+ String resourceNo = repairTask.getResourceNo();
+ String resourceBo = HandleEnum.RESOURCE.getHandle(site, resourceNo);
+ resrceService.updateResourceStatusByHandle(resourceBo,stopMachineT.equals("N")?"301":"5");
+ }
+ break;
+ case "302":
+ // 取消代码、取消描述、取消时间、取消人员
+ repairTask.setCancelCode(resourceRepairTask.getCancelCode());
+ repairTask.setCancelDescription(resourceRepairTask.getCancelDescription());
+ repairTask.setCancelDate(LocalDateTime.now());
+ repairTask.setCancelUser(CommonMethods.getUser());
+ break;
+ case "502":
+ if (repairTask.getWaitStartDate() != null){
+ throw BusinessException.build("已有等待记录，不能再次进入等待状态！！！");
+ }else {
+ repairTask.setWaitStartDate(LocalDateTime.now());
+ repairTask.setWaitDescription(resourceRepairTask.getWaitDescription());
+ }
+ break;
+ case "501":
+ // 结束时间、等待时长
+ repairTask.setWaitEndDate(LocalDateTime.now());
+ Duration betweenTime = Duration.between(repairTask.getWaitStartDate(), repairTask.getWaitEndDate());
+ Long waitTime = betweenTime.toHours();
+ double v = waitTime.doubleValue();
+ repairTask.setWaitTime(v);
+ break;
+ }
+ /*// 维修完成
+ if (status.equals("301")){
+ // 耗用备品清单
+ List spareList = resourceRepairTask.getSpareList();
+ for (ResourceInspectTaskSpare spare:spareList) {
+ spare.setResourceInspectTaskBo(handle);
+ }
+ repairTask.setSpareList(spareList);
+ // 完成时间、维修人员
+ repairTask.setActualCompleteDate(LocalDateTime.now());
+ repairTask.setRepairUsers(resourceRepairTask.getRepairUsers());
+ // 处理方式、处理方式描述、初步原因
+ repairTask.setDealWay(resourceRepairTask.getDealWay());
+ repairTask.setDealWayDescription(resourceRepairTask.getDealWayDescription());
+ repairTask.setPreliminaryReason(resourceRepairTask.getPreliminaryReason());
+ // 根本原因、根本原因描述、预防措施描述
+ repairTask.setPrimaryReason(resourceRepairTask.getPrimaryReason());
+ repairTask.setPrimaryReasonDescription(resourceRepairTask.getPrimaryReasonDescription());
+ repairTask.setPrecautionMeasureDescription(resourceRepairTask.getPrecautionMeasureDescription());
+ }
+ // 取消任务
+ if (status.equals("302")){
+ // 取消代码、取消描述、取消时间、取消人员
+ repairTask.setCancelCode(resourceRepairTask.getCancelCode());
+ repairTask.setCancelDescription(resourceRepairTask.getCancelDescription());
+ repairTask.setCancelDate(LocalDateTime.now());
+ repairTask.setCancelUser(CommonMethods.getUser());
+ }
+ // 开始等待
+ if (status.equals("502")){
+ if (repairTask.getWaitStartDate() != null){
+ throw BusinessException.build("已有等待记录，不能再次进入等待状态！！！");
+ }else {
+ repairTask.setWaitStartDate(LocalDateTime.now());
+ }
+ }
+ // 结束等待
+ if (status.equals("501")){
+ // 结束时间、等待时长
+ repairTask.setWaitEndDate(LocalDateTime.now());
+ Duration betweenTime = Duration.between(repairTask.getWaitStartDate(), repairTask.getWaitEndDate());
+ Long waitTime = betweenTime.toHours();
+ double v = waitTime.doubleValue();
+ repairTask.setWaitTime(v);
+ }*/
+ // 状态、修改人、修改时间
+ repairTask.setStatus(status);
+ repairTask.setModifyUser(user);
+ repairTask.setModifiedDateTime(LocalDateTime.now());
+ resourceRepairTaskService.saveOrUpdate(repairTask);
+ return repairTask;
+ }
+
+ @Override
+ public ResourceRepairTask findResourceRepairTaskByHandleAndSite(String site, String handle) {
+ ResourceInspectTaskSpare taskSpare = new ResourceInspectTaskSpare();
+ taskSpare.setResourceInspectTaskBo(handle);
+ List spareList = resourceInspectTaskSpareService.selectList(taskSpare);
+ ResourceRepairTask repairTask = resourceRepairTaskMapper.findResourceRepairTaskByHandleAndSite(site, handle);
+ repairTask.setSpareList(spareList);
+ return repairTask;
+ }
+
+ @Override
+ public Boolean updateResourceRepairTaskInfoByHandle(ResourceRepairTask resourceRepairTask) {
+ String user = CommonMethods.getUser();
+ String site = CommonMethods.getSite();
+ String handle = resourceRepairTask.getHandle();
+ // 备品信息，全删全增
+ ResourceInspectTaskSpare resourceInspectTaskSpare = new ResourceInspectTaskSpare();
+ resourceInspectTaskSpare.setResourceInspectTaskBo(handle);
+ resourceInspectTaskSpareService.removeAll(resourceInspectTaskSpare);
+ List spareList = resourceRepairTask.getSpareList();
+ for (ResourceInspectTaskSpare spare:spareList) {
+ if (spare.getCreateUser() != null){
+ spare.setModifyUser(user);
+ spare.setModifiedDateTime(LocalDateTime.now());
+ }else {
+ spare.setCreateUser(user);
+ spare.setCreatedDateTime(LocalDateTime.now());
+ }
+ spare.setResourceInspectTaskBo(handle);
+ spare.setHandle(HandleEnum.RESOURCE_INSPECT_TASK_SPARE.getHandle(site,UUID.randomUUID().toString()));
+ }
+ resourceInspectTaskSpareService.saveBatch(spareList);
+ return resourceRepairTaskService.updateById(resourceRepairTask);
+ }
+
+ private Double minus(LocalDateTime startDate,LocalDateTime endDate){
+ return null;
+ }
+
+
+
+}
\ No newline at end of file
diff --git a/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml b/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml
index f777da27..dc108243 100644
--- a/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml
+++ b/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml
@@ -592,8 +592,10 @@
+
+
+
+
+
+
+
diff --git a/equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml b/equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml
new file mode 100644
index 00000000..0a063244
--- /dev/null
+++ b/equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml
@@ -0,0 +1,943 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ HANDLE, SITE, REPAIR_NO, DESCRIPTION, STATUS, RESOURCE_NO, REPORT_USER, NC_CODE_NO, REPAIR_TYPE, STOP_MACHINE, BREAK_DOWN_DESCRIPTION, FIND_LINK, REPORT_SOURCE, OBJECT_BO, PLAN_START_DATE, PLAN_COMPLETE_DATE, ACTUAL_START_DATE, ACTUAL_COMPLETE_DATE, REPAIR_USERS, CANCEL_CODE, CANCEL_DATE, CANCEL_DESCRIPTION, CANCEL_USER, DEAL_WAY, PRELIMINARY_REASON, DEAL_WAY_DESCRIPTION, WAIT_TIME, WAIT_START_DATE, WAIT_END_DATE, WAIT_DESCRIPTION, PRIMARY_REASON, PRIMARY_REASON_DESCRIPTION, PRECAUTION_MEASURE_DESCRIPTION, REMARK, OTHER, ANOTHER, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, MODIFIED_DATE_TIME
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ INSERT INTO Z_RESOURCE_REPAIR_TASK
+
+ HANDLE,
+ SITE,
+ REPAIR_NO,
+ DESCRIPTION,
+ STATUS,
+ RESOURCE_NO,
+ REPORT_USER,
+ NC_CODE_NO,
+ REPAIR_TYPE,
+ STOP_MACHINE,
+ BREAK_DOWN_DESCRIPTION,
+ FIND_LINK,
+ REPORT_SOURCE,
+ OBJECT_BO,
+ PLAN_START_DATE,
+ PLAN_COMPLETE_DATE,
+ ACTUAL_START_DATE,
+ ACTUAL_COMPLETE_DATE,
+ REPAIR_USERS,
+ CANCEL_CODE,
+ CANCEL_DATE,
+ CANCEL_DESCRIPTION,
+ CANCEL_USER,
+ DEAL_WAY,
+ PRELIMINARY_REASON,
+ DEAL_WAY_DESCRIPTION,
+ WAIT_TIME,
+ WAIT_START_DATE,
+ WAIT_END_DATE,
+ WAIT_DESCRIPTION,
+ PRIMARY_REASON,
+ PRIMARY_REASON_DESCRIPTION,
+ PRECAUTION_MEASURE_DESCRIPTION,
+ REMARK,
+ OTHER,
+ ANOTHER,
+ CREATE_USER,
+ CREATED_DATE_TIME,
+ MODIFY_USER,
+ MODIFIED_DATE_TIME,
+ VALUES
+
+ #{handle},
+ #{site},
+ #{repairNo},
+ #{description},
+ #{status},
+ #{resourceNo},
+ #{reportUser},
+ #{ncCodeNo},
+ #{repairType},
+ #{stopMachine},
+ #{breakDownDescription},
+ #{findLink},
+ #{reportSource},
+ #{objectBo},
+ #{planStartDate},
+ #{planCompleteDate},
+ #{actualStartDate},
+ #{actualCompleteDate},
+ #{repairUsers},
+ #{cancelCode},
+ #{cancelDate},
+ #{cancelDescription},
+ #{cancelUser},
+ #{dealWay},
+ #{preliminaryReason},
+ #{dealWayDescription},
+ #{waitTime},
+ #{waitStartDate},
+ #{waitEndDate},
+ #{waitDescription},
+ #{primaryReason},
+ #{primaryReasonDescription},
+ #{precautionMeasureDescription},
+ #{remark},
+ #{other},
+ #{another},
+ #{createUser},
+ #{createdDateTime},
+ #{modifyUser},
+ #{modifiedDateTime},
+
+
+
+
+ INSERT INTO Z_RESOURCE_REPAIR_TASK
+
+
+ VALUES
+
+ #{handle},
+ #{site},
+ #{repairNo},
+ #{description},
+ #{status},
+ #{resourceNo},
+ #{reportUser},
+ #{ncCodeNo},
+ #{repairType},
+ #{stopMachine},
+ #{breakDownDescription},
+ #{findLink},
+ #{reportSource},
+ #{objectBo},
+ #{planStartDate},
+ #{planCompleteDate},
+ #{actualStartDate},
+ #{actualCompleteDate},
+ #{repairUsers},
+ #{cancelCode},
+ #{cancelDate},
+ #{cancelDescription},
+ #{cancelUser},
+ #{dealWay},
+ #{preliminaryReason},
+ #{dealWayDescription},
+ #{waitTime},
+ #{waitStartDate},
+ #{waitEndDate},
+ #{waitDescription},
+ #{primaryReason},
+ #{primaryReasonDescription},
+ #{precautionMeasureDescription},
+ #{remark},
+ #{other},
+ #{another},
+ #{createUser},
+ #{createdDateTime},
+ #{modifyUser},
+ #{modifiedDateTime},
+
+
+
+
+
+ UPDATE Z_RESOURCE_REPAIR_TASK
+ SITE=#{et.site},
+ REPAIR_NO=#{et.repairNo},
+ DESCRIPTION=#{et.description},
+ STATUS=#{et.status},
+ RESOURCE_NO=#{et.resourceNo},
+ REPORT_USER=#{et.reportUser},
+ NC_CODE_NO=#{et.ncCodeNo},
+ REPAIR_TYPE=#{et.repairType},
+ STOP_MACHINE=#{et.stopMachine},
+ BREAK_DOWN_DESCRIPTION=#{et.breakDownDescription},
+ FIND_LINK=#{et.findLink},
+ REPORT_SOURCE=#{et.reportSource},
+ OBJECT_BO=#{et.objectBo},
+ PLAN_START_DATE=#{et.planStartDate},
+ PLAN_COMPLETE_DATE=#{et.planCompleteDate},
+ ACTUAL_START_DATE=#{et.actualStartDate},
+ ACTUAL_COMPLETE_DATE=#{et.actualCompleteDate},
+ REPAIR_USERS=#{et.repairUsers},
+ CANCEL_CODE=#{et.cancelCode},
+ CANCEL_DATE=#{et.cancelDate},
+ CANCEL_DESCRIPTION=#{et.cancelDescription},
+ CANCEL_USER=#{et.cancelUser},
+ DEAL_WAY=#{et.dealWay},
+ PRELIMINARY_REASON=#{et.preliminaryReason},
+ DEAL_WAY_DESCRIPTION=#{et.dealWayDescription},
+ WAIT_TIME=#{et.waitTime},
+ WAIT_START_DATE=#{et.waitStartDate},
+ WAIT_END_DATE=#{et.waitEndDate},
+ WAIT_DESCRIPTION=#{et.waitDescription},
+ PRIMARY_REASON=#{et.primaryReason},
+ PRIMARY_REASON_DESCRIPTION=#{et.primaryReasonDescription},
+ PRECAUTION_MEASURE_DESCRIPTION=#{et.precautionMeasureDescription},
+ REMARK=#{et.remark},
+ OTHER=#{et.other},
+ ANOTHER=#{et.another},
+ CREATE_USER=#{et.createUser},
+ CREATED_DATE_TIME=#{et.createdDateTime},
+ MODIFY_USER=#{et.modifyUser},
+ MODIFIED_DATE_TIME=#{et.modifiedDateTime},
+ WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}
+
+
+
+
+ UPDATE Z_RESOURCE_REPAIR_TASK
+ SITE=#{et.site},
+ REPAIR_NO=#{et.repairNo},
+ DESCRIPTION=#{et.description},
+ STATUS=#{et.status},
+ RESOURCE_NO=#{et.resourceNo},
+ REPORT_USER=#{et.reportUser},
+ NC_CODE_NO=#{et.ncCodeNo},
+ REPAIR_TYPE=#{et.repairType},
+ STOP_MACHINE=#{et.stopMachine},
+ BREAK_DOWN_DESCRIPTION=#{et.breakDownDescription},
+ FIND_LINK=#{et.findLink},
+ REPORT_SOURCE=#{et.reportSource},
+ OBJECT_BO=#{et.objectBo},
+ PLAN_START_DATE=#{et.planStartDate},
+ PLAN_COMPLETE_DATE=#{et.planCompleteDate},
+ ACTUAL_START_DATE=#{et.actualStartDate},
+ ACTUAL_COMPLETE_DATE=#{et.actualCompleteDate},
+ REPAIR_USERS=#{et.repairUsers},
+ CANCEL_CODE=#{et.cancelCode},
+ CANCEL_DATE=#{et.cancelDate},
+ CANCEL_DESCRIPTION=#{et.cancelDescription},
+ CANCEL_USER=#{et.cancelUser},
+ DEAL_WAY=#{et.dealWay},
+ PRELIMINARY_REASON=#{et.preliminaryReason},
+ DEAL_WAY_DESCRIPTION=#{et.dealWayDescription},
+ WAIT_TIME=#{et.waitTime},
+ WAIT_START_DATE=#{et.waitStartDate},
+ WAIT_END_DATE=#{et.waitEndDate},
+ WAIT_DESCRIPTION=#{et.waitDescription},
+ PRIMARY_REASON=#{et.primaryReason},
+ PRIMARY_REASON_DESCRIPTION=#{et.primaryReasonDescription},
+ PRECAUTION_MEASURE_DESCRIPTION=#{et.precautionMeasureDescription},
+ REMARK=#{et.remark},
+ OTHER=#{et.other},
+ ANOTHER=#{et.another},
+ CREATE_USER=#{et.createUser},
+ CREATED_DATE_TIME=#{et.createdDateTime},
+ MODIFY_USER=#{et.modifyUser},
+ MODIFIED_DATE_TIME=#{et.modifiedDateTime},
+ WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}
+
+
+
+
+ UPDATE Z_RESOURCE_REPAIR_TASK
+ SITE=#{et.site},
+ REPAIR_NO=#{et.repairNo},
+ DESCRIPTION=#{et.description},
+ STATUS=#{et.status},
+ RESOURCE_NO=#{et.resourceNo},
+ REPORT_USER=#{et.reportUser},
+ NC_CODE_NO=#{et.ncCodeNo},
+ REPAIR_TYPE=#{et.repairType},
+ STOP_MACHINE=#{et.stopMachine},
+ BREAK_DOWN_DESCRIPTION=#{et.breakDownDescription},
+ FIND_LINK=#{et.findLink},
+ REPORT_SOURCE=#{et.reportSource},
+ OBJECT_BO=#{et.objectBo},
+ PLAN_START_DATE=#{et.planStartDate},
+ PLAN_COMPLETE_DATE=#{et.planCompleteDate},
+ ACTUAL_START_DATE=#{et.actualStartDate},
+ ACTUAL_COMPLETE_DATE=#{et.actualCompleteDate},
+ REPAIR_USERS=#{et.repairUsers},
+ CANCEL_CODE=#{et.cancelCode},
+ CANCEL_DATE=#{et.cancelDate},
+ CANCEL_DESCRIPTION=#{et.cancelDescription},
+ CANCEL_USER=#{et.cancelUser},
+ DEAL_WAY=#{et.dealWay},
+ PRELIMINARY_REASON=#{et.preliminaryReason},
+ DEAL_WAY_DESCRIPTION=#{et.dealWayDescription},
+ WAIT_TIME=#{et.waitTime},
+ WAIT_START_DATE=#{et.waitStartDate},
+ WAIT_END_DATE=#{et.waitEndDate},
+ WAIT_DESCRIPTION=#{et.waitDescription},
+ PRIMARY_REASON=#{et.primaryReason},
+ PRIMARY_REASON_DESCRIPTION=#{et.primaryReasonDescription},
+ PRECAUTION_MEASURE_DESCRIPTION=#{et.precautionMeasureDescription},
+ REMARK=#{et.remark},
+ OTHER=#{et.other},
+ ANOTHER=#{et.another},
+ CREATE_USER=#{et.createUser},
+ CREATED_DATE_TIME=#{et.createdDateTime},
+ MODIFY_USER=#{et.modifyUser},
+ MODIFIED_DATE_TIME=#{et.modifiedDateTime},
+
+
+
+
+ HANDLE=#{ew.entity.handle}
+ AND SITE=#{ew.entity.site}
+ AND REPAIR_NO=#{ew.entity.repairNo}
+ AND DESCRIPTION=#{ew.entity.description}
+ AND STATUS=#{ew.entity.status}
+ AND RESOURCE_NO=#{ew.entity.resourceNo}
+ AND REPORT_USER=#{ew.entity.reportUser}
+ AND NC_CODE_NO=#{ew.entity.ncCodeNo}
+ AND REPAIR_TYPE=#{ew.entity.repairType}
+ AND STOP_MACHINE=#{ew.entity.stopMachine}
+ AND BREAK_DOWN_DESCRIPTION=#{ew.entity.breakDownDescription}
+ AND FIND_LINK=#{ew.entity.findLink}
+ AND REPORT_SOURCE=#{ew.entity.reportSource}
+ AND OBJECT_BO=#{ew.entity.objectBo}
+ AND PLAN_START_DATE=#{ew.entity.planStartDate}
+ AND PLAN_COMPLETE_DATE=#{ew.entity.planCompleteDate}
+ AND ACTUAL_START_DATE=#{ew.entity.actualStartDate}
+ AND ACTUAL_COMPLETE_DATE=#{ew.entity.actualCompleteDate}
+ AND REPAIR_USERS=#{ew.entity.repairUsers}
+ AND CANCEL_CODE=#{ew.entity.cancelCode}
+ AND CANCEL_DATE=#{ew.entity.cancelDate}
+ AND CANCEL_DESCRIPTION=#{ew.entity.cancelDescription}
+ AND CANCEL_USER=#{ew.entity.cancelUser}
+ AND DEAL_WAY=#{ew.entity.dealWay}
+ AND PRELIMINARY_REASON=#{ew.entity.preliminaryReason}
+ AND DEAL_WAY_DESCRIPTION=#{ew.entity.dealWayDescription}
+ AND WAIT_TIME=#{ew.entity.waitTime}
+ AND WAIT_START_DATE=#{ew.entity.waitStartDate}
+ AND WAIT_END_DATE=#{ew.entity.waitEndDate}
+ AND WAIT_DESCRIPTION=#{ew.entity.waitDescription}
+ AND PRIMARY_REASON=#{ew.entity.primaryReason}
+ AND PRIMARY_REASON_DESCRIPTION=#{ew.entity.primaryReasonDescription}
+ AND PRECAUTION_MEASURE_DESCRIPTION=#{ew.entity.precautionMeasureDescription}
+ AND REMARK=#{ew.entity.remark}
+ AND OTHER=#{ew.entity.other}
+ AND ANOTHER=#{ew.entity.another}
+ AND CREATE_USER=#{ew.entity.createUser}
+ AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}
+ AND MODIFY_USER=#{ew.entity.modifyUser}
+ AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}
+
+
+ ${ew.sqlSegment}
+
+
+
+
+ ${ew.sqlSegment}
+
+
+
+
+ DELETE FROM Z_RESOURCE_REPAIR_TASK WHERE HANDLE=#{handle}
+
+
+
+ DELETE FROM Z_RESOURCE_REPAIR_TASK
+
+
+
+
+ ${k} = #{cm[${k}]}
+
+
+
+
+
+
+
+ DELETE FROM Z_RESOURCE_REPAIR_TASK
+
+
+
+
+ HANDLE=#{ew.entity.handle}
+
+ AND SITE=#{ew.entity.site}
+ AND REPAIR_NO=#{ew.entity.repairNo}
+ AND DESCRIPTION=#{ew.entity.description}
+ AND STATUS=#{ew.entity.status}
+ AND RESOURCE_NO=#{ew.entity.resourceNo}
+ AND REPORT_USER=#{ew.entity.reportUser}
+ AND NC_CODE_NO=#{ew.entity.ncCodeNo}
+ AND REPAIR_TYPE=#{ew.entity.repairType}
+ AND STOP_MACHINE=#{ew.entity.stopMachine}
+ AND BREAK_DOWN_DESCRIPTION=#{ew.entity.breakDownDescription}
+ AND FIND_LINK=#{ew.entity.findLink}
+ AND REPORT_SOURCE=#{ew.entity.reportSource}
+ AND OBJECT_BO=#{ew.entity.objectBo}
+ AND PLAN_START_DATE=#{ew.entity.planStartDate}
+ AND PLAN_COMPLETE_DATE=#{ew.entity.planCompleteDate}
+ AND ACTUAL_START_DATE=#{ew.entity.actualStartDate}
+ AND ACTUAL_COMPLETE_DATE=#{ew.entity.actualCompleteDate}
+ AND REPAIR_USERS=#{ew.entity.repairUsers}
+ AND CANCEL_CODE=#{ew.entity.cancelCode}
+ AND CANCEL_DATE=#{ew.entity.cancelDate}
+ AND CANCEL_DESCRIPTION=#{ew.entity.cancelDescription}
+ AND CANCEL_USER=#{ew.entity.cancelUser}
+ AND DEAL_WAY=#{ew.entity.dealWay}
+ AND PRELIMINARY_REASON=#{ew.entity.preliminaryReason}
+ AND DEAL_WAY_DESCRIPTION=#{ew.entity.dealWayDescription}
+ AND WAIT_TIME=#{ew.entity.waitTime}
+ AND WAIT_START_DATE=#{ew.entity.waitStartDate}
+ AND WAIT_END_DATE=#{ew.entity.waitEndDate}
+ AND WAIT_DESCRIPTION=#{ew.entity.waitDescription}
+ AND PRIMARY_REASON=#{ew.entity.primaryReason}
+ AND PRIMARY_REASON_DESCRIPTION=#{ew.entity.primaryReasonDescription}
+ AND PRECAUTION_MEASURE_DESCRIPTION=#{ew.entity.precautionMeasureDescription}
+ AND REMARK=#{ew.entity.remark}
+ AND OTHER=#{ew.entity.other}
+ AND ANOTHER=#{ew.entity.another}
+ AND CREATE_USER=#{ew.entity.createUser}
+ AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}
+ AND MODIFY_USER=#{ew.entity.modifyUser}
+ AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}
+
+
+ ${ew.sqlSegment}
+
+
+
+
+ ${ew.sqlSegment}
+
+
+
+
+ DELETE FROM Z_RESOURCE_REPAIR_TASK WHERE HANDLE IN (
+ #{item}
+ )
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ResrceService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ResrceService.java
index 279c3786..abfae239 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ResrceService.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ResrceService.java
@@ -47,4 +47,10 @@ public interface ResrceService extends IService {
Resrce findByResrce(String resrce);
List findAllResrce();
+
+ /**
+ * 仅修改设备状态
+ */
+ void updateResourceStatusByHandle(String handle,String status);
+
}
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ResrceServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ResrceServiceImpl.java
index 6c9f72c6..7ce2ad29 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ResrceServiceImpl.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ResrceServiceImpl.java
@@ -68,5 +68,12 @@ public class ResrceServiceImpl extends ServiceImpl impleme
return resrceMapper.findAllResrce(site);
}
+ @Override
+ public void updateResourceStatusByHandle(String handle,String status) {
+ Resrce resrce = resrceMapper.selectById(handle);
+ resrce.setStatusBo("StatusBo:1000,"+status);
+ resrceMapper.updateById(resrce);
+ }
+
}
\ No newline at end of file