设备维修任务模块更新

equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceRepairTaskController.java

@@ -1,5 +1,6 @@
 package com.foreverwin.mesnac.equip.controller;
 
+import com.foreverwin.mesnac.common.enums.HandleEnum;
 import com.foreverwin.modular.core.util.R;
 import com.foreverwin.modular.core.util.FrontPage;
 import com.foreverwin.modular.core.util.CommonMethods;
@@ -16,7 +17,7 @@ import java.util.List;
 /**
  *
  * @author pavel.Liu
- * @since 2021-07-06
+ * @since 2021-07-07
  */
 @RestController
 @RequestMapping("/Z-RESOURCE-REPAIR-TASK")
@@ -45,7 +46,11 @@ public class ResourceRepairTaskController {
     @ResponseBody
     @GetMapping("")
     public R getResourceRepairTaskList(ResourceRepairTask resourceRepairTask){
-        return R.ok(resourceRepairTaskService.selectList(resourceRepairTask));
+        List<ResourceRepairTask> result;
+        QueryWrapper<ResourceRepairTask> queryWrapper = new QueryWrapper<>();
+        queryWrapper.setEntity(resourceRepairTask);
+        result = resourceRepairTaskService.list(queryWrapper);
+        return R.ok(result);
     }
 
     /**
@@ -66,16 +71,28 @@ public class ResourceRepairTaskController {
                 .like(ResourceRepairTask::getHandle, frontPage.getGlobalQuery())
                 .or().like(ResourceRepairTask::getSite, frontPage.getGlobalQuery())
                 .or().like(ResourceRepairTask::getRepairNo, frontPage.getGlobalQuery())
+                .or().like(ResourceRepairTask::getDescription, frontPage.getGlobalQuery())
                 .or().like(ResourceRepairTask::getStatus, frontPage.getGlobalQuery())
-                .or().like(ResourceRepairTask::getResourceBo, frontPage.getGlobalQuery())
-                .or().like(ResourceRepairTask::getUserNo, frontPage.getGlobalQuery())
-                .or().like(ResourceRepairTask::getNcCodeBo, frontPage.getGlobalQuery())
+                .or().like(ResourceRepairTask::getResourceNo, frontPage.getGlobalQuery())
+                .or().like(ResourceRepairTask::getReportUser, frontPage.getGlobalQuery())
+                .or().like(ResourceRepairTask::getNcCodeNo, frontPage.getGlobalQuery())
                 .or().like(ResourceRepairTask::getRepairType, frontPage.getGlobalQuery())
                 .or().like(ResourceRepairTask::getStopMachine, frontPage.getGlobalQuery())
-                .or().like(ResourceRepairTask::getNcDescription, frontPage.getGlobalQuery())
+                .or().like(ResourceRepairTask::getBreakDownDescription, frontPage.getGlobalQuery())
                 .or().like(ResourceRepairTask::getFindLink, frontPage.getGlobalQuery())
                 .or().like(ResourceRepairTask::getReportSource, frontPage.getGlobalQuery())
                 .or().like(ResourceRepairTask::getObjectBo, frontPage.getGlobalQuery())
+                .or().like(ResourceRepairTask::getRepairUsers, frontPage.getGlobalQuery())
+                .or().like(ResourceRepairTask::getCancelCode, frontPage.getGlobalQuery())
+                .or().like(ResourceRepairTask::getCancelDescription, frontPage.getGlobalQuery())
+                .or().like(ResourceRepairTask::getCancelUser, frontPage.getGlobalQuery())
+                .or().like(ResourceRepairTask::getDealWay, frontPage.getGlobalQuery())
+                .or().like(ResourceRepairTask::getPreliminaryReason, frontPage.getGlobalQuery())
+                .or().like(ResourceRepairTask::getDealWayDescription, frontPage.getGlobalQuery())
+                .or().like(ResourceRepairTask::getWaitDescription, frontPage.getGlobalQuery())
+                .or().like(ResourceRepairTask::getPrimaryReason, frontPage.getGlobalQuery())
+                .or().like(ResourceRepairTask::getPrimaryReasonDescription, frontPage.getGlobalQuery())
+                .or().like(ResourceRepairTask::getPrecautionMeasureDescription, frontPage.getGlobalQuery())
                 .or().like(ResourceRepairTask::getRemark, frontPage.getGlobalQuery())
                 .or().like(ResourceRepairTask::getOther, frontPage.getGlobalQuery())
                 .or().like(ResourceRepairTask::getAnother, frontPage.getGlobalQuery())
@@ -137,7 +154,42 @@ public class ResourceRepairTaskController {
     @ResponseBody
     @GetMapping("/saveRepairTask")
     public R saveRepairTask(ResourceRepairTask resourceRepairTask){
-        return R.ok(resourceRepairTaskService.saveRepairTask(resourceRepairTask));
+        try{
+            resourceRepairTaskService.saveRepairTask(resourceRepairTask);
+        }catch (Exception e){
+            R.failed("提报失败，"+e.getMessage());
+        }
+        return R.ok();
+    }
+
+    /**
+     * 条件查询，查询维修任务
+     *
+     * @return
+     */
+    @ResponseBody
+    @GetMapping("/findResourceRepairTaskList")
+    public R findResourceRepairTaskList(ResourceRepairTask resourceRepairTask){
+        try {
+            return R.ok(resourceRepairTaskService.findResourceRepairTaskList(resourceRepairTask));
+        }catch (Exception e){
+            return R.failed(""+e.getMessage());
+        }
+    }
+
+    /**
+     * 条件查询，查询维修任务
+     *
+     * @return
+     */
+    @ResponseBody
+    @GetMapping("/selOrStartRepairTask")
+    public R selOrStartRepairTask(ResourceRepairTask resourceRepairTask){
+        try {
+            return R.ok(resourceRepairTaskService.selOrStartRepairTask(resourceRepairTask));
+        }catch (Exception e){
+            return R.failed(""+e.getMessage());
+        }
     }
 
     /**
@@ -145,11 +197,66 @@ public class ResourceRepairTaskController {
      *
      * @return
      */
+    @PostMapping("/saveOrUpdateTaskInfo")
+    public R saveOrUpdateTaskInfo(@RequestBody ResourceRepairTask resourceRepairTask){
+        try {
+            return R.ok(resourceRepairTaskService.saveOrUpdateTaskInfo(resourceRepairTask));
+        }catch (Exception e){
+            return R.failed(""+e.getMessage());
+        }
+    }
+
+    /**
+     * 自定义sql，根据维修任务HANDLE，返回详细维修任务数据：
+     *  1、维修任务纠正预防；
+     *  2、维修任务数据修改。
+     * @return
+     */
     @ResponseBody
-    @GetMapping("/getRepairTaskList")
-    public R getRepairTaskList(ResourceRepairTask resourceRepairTask){
-        return R.ok(resourceRepairTaskService.selectList(resourceRepairTask));
+    @GetMapping("/findResourceRepairTaskByHandleAndSite")
+    public R findResourceRepairTaskByHandleAndSite(String repairNo){
+        String site = CommonMethods.getSite();
+        String handle = HandleEnum.RESOURCE_REPAIR_TASK.getHandle(site, repairNo);
+        try {
+            return R.ok(resourceRepairTaskService.findResourceRepairTaskByHandleAndSite(site,handle));
+        }catch (Exception e){
+            return R.failed(""+e.getMessage());
+        }
     }
 
+    /**
+     * 维修任务纠正预防，自定义sql，根据维修任务HANDLE，
+     * 返回详细维修任务数据
+     * @return
+     */
+    @PostMapping("/updateResourceRepairTaskByHandle")
+    public R updateResourceRepairTaskByHandle(@RequestBody ResourceRepairTask resourceRepairTask){
+        String handle = resourceRepairTask.getHandle();
+        ResourceRepairTask repairTask = resourceRepairTaskService.getById(handle);
+        repairTask.setPrimaryReason(resourceRepairTask.getPrimaryReason());
+        repairTask.setPrecautionMeasureDescription(resourceRepairTask.getPrecautionMeasureDescription());
+        repairTask.setPrimaryReasonDescription(resourceRepairTask.getPrimaryReasonDescription());
+        try {
+            return R.ok(resourceRepairTaskService.updateById(repairTask));
+        }catch (Exception e){
+            return R.failed("纠正预防更新失败："+e.getMessage());
+        }
+    }
+
+    /**
+     * 维修任务纠正预防，自定义sql，根据维修任务HANDLE，
+     * 返回详细维修任务数据
+     * @return
+     */
+    @PostMapping("/updateResourceRepairTaskInfoByHandle")
+    public R updateResourceRepairTaskInfoByHandle(@RequestBody ResourceRepairTask resourceRepairTask){
+        try {
+            return R.ok(resourceRepairTaskService.updateResourceRepairTaskInfoByHandle(resourceRepairTask));
+        }catch (Exception e){
+            return R.failed("维修任务数据更改失败："+e.getMessage());
+        }
+    }
+
+
 
 }

equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceRepairTaskMapper.java

@@ -2,8 +2,11 @@ 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;
+
 /**
  * <p>
  * 设备报修任务表 Mapper 接口
@@ -15,4 +18,19 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface ResourceRepairTaskMapper extends BaseMapper<ResourceRepairTask> {
 
+    /**
+     * 自定义sql：多条件查询，获取维修任务
+     * @param resourceRepairTask
+     * @return
+     */
+    List<ResourceRepairTask> findResourceRepairTaskList(ResourceRepairTask resourceRepairTask);
+
+    /**
+     * 自定义sql：根据维修任务HANDLE查询维修任务详细数据
+     * @param site
+     * @param handle
+     * @return
+     */
+    ResourceRepairTask findResourceRepairTaskByHandleAndSite(@Param("site") String site,@Param("handle") String handle);
+
 }

equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceRepairTask.java

@@ -6,17 +6,18 @@ 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 java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.IdType;
 
 /**
  * <p>
- * 设备报修任务表
+ * 设备报修/维修表
  * </p>
  *
  * @author pavel.Liu
- * @since 2021-07-06
+ * @since 2021-07-07
  */
 
 @TableName("Z_RESOURCE_REPAIR_TASK")
@@ -40,26 +41,31 @@ public class ResourceRepairTask extends Model<ResourceRepairTask> {
      */
    @TableField("REPAIR_NO")
    private String repairNo;
+    /**
+     * 描述
+     */
+   @TableField("DESCRIPTION")
+   private String description;
     /**
      * 状态
      */
    @TableField("STATUS")
    private String status;
     /**
-     * 设备HANDLE
+     * 设备编号
      */
-   @TableField("RESOURCE_BO")
-   private String resourceBo;
+   @TableField("RESOURCE_NO")
+   private String resourceNo;
     /**
-     * 用户HANDLE
+     * 提报人
      */
-   @TableField("USER_NO")
-   private String userNo;
+   @TableField("REPORT_USER")
+   private String reportUser;
     /**
      * 不良代码HANDLE
      */
-   @TableField("NC_CODE_BO")
-   private String ncCodeBo;
+   @TableField("NC_CODE_NO")
+   private String ncCodeNo;
     /**
      * 维修类型
      */
@@ -73,8 +79,8 @@ public class ResourceRepairTask extends Model<ResourceRepairTask> {
     /**
      * 故障描述补充
      */
-   @TableField("NC_DESCRIPTION")
-   private String ncDescription;
+   @TableField("BREAK_DOWN_DESCRIPTION")
+   private String breakDownDescription;
     /**
      * 发现环节
      */
@@ -111,7 +117,82 @@ public class ResourceRepairTask extends Model<ResourceRepairTask> {
    @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;
@@ -147,25 +228,70 @@ public class ResourceRepairTask extends Model<ResourceRepairTask> {
    private LocalDateTime modifiedDateTime;
 
    /**
-    * 设备编号
+    * 设备HANDLE
     */
    @TableField(exist = false)
-   private String resourceNo;
+   private String resourceBo;
+   /**
+    * 设备描述
+    */
+   @TableField(exist = false)
+   private String resourceDescription;
    /**
     * 设备类型
     */
    @TableField(exist = false)
-   private String resourceType;
+   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 ncName;
+   private String workCenterNo;
+   /**
+    * 车间HANDLE
+    */
+   @TableField(exist = false)
+   private String workCenterBo;
    /**
     * 车间
     */
    @TableField(exist = false)
-   private String workCenter;
+   private String workCenterDescription;
+   /**
+    * 比较时间，起
+    */
+   @TableField(exist = false)
+   private LocalDateTime compareStartTime;
+   /**
+    * 比较时间，终
+    */
+   @TableField(exist = false)
+   private LocalDateTime compareEndTime;
+   /**
+    * 备品清单
+    */
+   @TableField(exist = false)
+   private List<ResourceInspectTaskSpare> spareList;
    /**
     * 序号
     */
@@ -173,7 +299,119 @@ public class ResourceRepairTask extends Model<ResourceRepairTask> {
    private Integer seq;
 
 
+   public List<ResourceInspectTaskSpare> getSpareList() {
+      return spareList;
+   }
+
+   public void setSpareList(List<ResourceInspectTaskSpare> 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;
    }
@@ -198,6 +436,14 @@ public class ResourceRepairTask extends Model<ResourceRepairTask> {
       this.repairNo = repairNo;
    }
 
+   public String getDescription() {
+      return description;
+   }
+
+   public void setDescription(String description) {
+      this.description = description;
+   }
+
    public String getStatus() {
       return status;
    }
@@ -206,28 +452,28 @@ public class ResourceRepairTask extends Model<ResourceRepairTask> {
       this.status = status;
    }
 
-   public String getResourceBo() {
-      return resourceBo;
+   public String getResourceNo() {
+      return resourceNo;
    }
 
-   public void setResourceBo(String resourceBo) {
-      this.resourceBo = resourceBo;
+   public void setResourceNo(String resourceNo) {
+      this.resourceNo = resourceNo;
    }
 
-   public String getUserNo() {
-      return userNo;
+   public String getReportUser() {
+      return reportUser;
    }
 
-   public void setUserNo(String userNo) {
-      this.userNo = userNo;
+   public void setReportUser(String reportUser) {
+      this.reportUser = reportUser;
    }
 
-   public String getNcCodeBo() {
-      return ncCodeBo;
+   public String getNcCodeNo() {
+      return ncCodeNo;
    }
 
-   public void setNcCodeBo(String ncCodeBo) {
-      this.ncCodeBo = ncCodeBo;
+   public void setNcCodeNo(String ncCodeNo) {
+      this.ncCodeNo = ncCodeNo;
    }
 
    public String getRepairType() {
@@ -246,12 +492,12 @@ public class ResourceRepairTask extends Model<ResourceRepairTask> {
       this.stopMachine = stopMachine;
    }
 
-   public String getNcDescription() {
-      return ncDescription;
+   public String getBreakDownDescription() {
+      return breakDownDescription;
    }
 
-   public void setNcDescription(String ncDescription) {
-      this.ncDescription = ncDescription;
+   public void setBreakDownDescription(String breakDownDescription) {
+      this.breakDownDescription = breakDownDescription;
    }
 
    public String getFindLink() {
@@ -310,6 +556,126 @@ public class ResourceRepairTask extends Model<ResourceRepairTask> {
       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;
    }
@@ -372,19 +738,21 @@ 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_BO = "RESOURCE_BO";
+public static final String RESOURCE_NO = "RESOURCE_NO";
 
-public static final String USER_NO = "USER_NO";
+public static final String REPORT_USER = "REPORT_USER";
 
-public static final String NC_CODE_BO = "NC_CODE_BO";
+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 NC_DESCRIPTION = "NC_DESCRIPTION";
+public static final String BREAK_DOWN_DESCRIPTION = "BREAK_DOWN_DESCRIPTION";
 
 public static final String FIND_LINK = "FIND_LINK";
 
@@ -400,6 +768,36 @@ 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";
@@ -426,13 +824,14 @@ public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
          "handle = " + handle +
          ", site = " + site +
          ", repairNo = " + repairNo +
+         ", description = " + description +
          ", status = " + status +
-         ", resourceBo = " + resourceBo +
-         ", userNo = " + userNo +
-         ", ncCodeBo = " + ncCodeBo +
+         ", resourceNo = " + resourceNo +
+         ", reportUser = " + reportUser +
+         ", ncCodeNo = " + ncCodeNo +
          ", repairType = " + repairType +
          ", stopMachine = " + stopMachine +
-         ", ncDescription = " + ncDescription +
+         ", breakDownDescription = " + breakDownDescription +
          ", findLink = " + findLink +
          ", reportSource = " + reportSource +
          ", objectBo = " + objectBo +
@@ -440,6 +839,21 @@ public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
          ", 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 +

equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceRepairTaskService.java

@@ -26,6 +26,46 @@ public interface ResourceRepairTaskService extends IService<ResourceRepairTask>
 
     List<ResourceRepairTask> selectList(ResourceRepairTask resourceRepairTask);
 
-    String saveRepairTask(ResourceRepairTask resourceRepairTask);
+    void deleteRepairTaskList(ResourceRepairTask resourceRepairTask);
+
+    /**
+     * 维修提报，保存提报信息
+     * @param resourceRepairTask
+     */
+    void saveRepairTask(ResourceRepairTask resourceRepairTask);
+
+    /**
+     * 条件查询，查询维修任务
+     * @param resourceRepairTask
+     * @return
+     */
+    List<ResourceRepairTask> 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);
 
 }

equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java

@@ -3,9 +3,13 @@ package com.foreverwin.mesnac.equip.service.impl;
 import com.foreverwin.mesnac.common.constant.Constants;
 import com.foreverwin.mesnac.common.enums.HandleEnum;
 import com.foreverwin.mesnac.common.helper.NextNumberHelper;
-import com.foreverwin.mesnac.equip.model.Equip;
+import com.foreverwin.mesnac.equip.model.ResourceInspectTaskSpare;
 import com.foreverwin.mesnac.equip.service.EquipService;
+import com.foreverwin.mesnac.equip.service.ResourceInspectTaskSpareService;
+import com.foreverwin.mesnac.meapi.service.NcCodeService;
+import com.foreverwin.mesnac.meapi.service.ResrceService;
 import com.foreverwin.modular.core.exception.BusinessException;
+import com.foreverwin.modular.core.util.CommonMethods;
 import com.foreverwin.modular.core.util.FrontPage;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -17,7 +21,11 @@ import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.Duration;
+import java.time.LocalDateTime;
 import java.util.List;
+import java.util.UUID;
+
 /**
  * <p>
  * 设备报修任务表 服务实现类
@@ -38,6 +46,12 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
     private EquipService equipService;
     @Autowired
     private ResourceRepairTaskService resourceRepairTaskService;
+    @Autowired
+    private NcCodeService ncCodeService;
+    @Autowired
+    private ResourceInspectTaskSpareService resourceInspectTaskSpareService;
+    @Autowired
+    private ResrceService resrceService;
 
     @Override
     public IPage<ResourceRepairTask> selectPage(FrontPage<ResourceRepairTask> frontPage, ResourceRepairTask resourceRepairTask) {
@@ -54,20 +68,238 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
     }
 
     @Override
-    public String saveRepairTask(ResourceRepairTask resourceRepairTask) {
+    public void deleteRepairTaskList(ResourceRepairTask resourceRepairTask) {
+        QueryWrapper<ResourceRepairTask> queryWrapper = new QueryWrapper<>();
+        queryWrapper.setEntity(resourceRepairTask);
+        super.remove(queryWrapper);
+    }
+
+    @Override
+    public void saveRepairTask(ResourceRepairTask resourceRepairTask) {
         String site = resourceRepairTask.getSite();
-        String resourceNo = resourceRepairTask.getResourceBo();
-        String resourceBo = HandleEnum.RESOURCE.getHandle(site, resourceNo);
-        if ( equipService.getById(resourceBo) == null ){
+        // 设备编号
+        String resourceNo = resourceRepairTask.getResourceNo();
+        String resourceHandle = HandleEnum.RESOURCE.getHandle(site, resourceNo);
+        if ( equipService.getById(resourceHandle) == null ){
             throw BusinessException.build("设备编号错误！！！");
         }
-        resourceRepairTask.setResourceBo(resourceBo);
+        // 不良代码
+        String ncCOdeNo = resourceRepairTask.getNcCodeNo();
+        String ncCodeHandle = HandleEnum.NC_CODE.getHandle(site, ncCOdeNo);
+        if ( ncCodeService.getById(ncCodeHandle) == null ){
+            throw BusinessException.build("不良代码错误！！！");
+        }
+        // 维修单号、维修HANDLE
         List<String> 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);
-        return nextNumber.get(0);
     }
 
+    @Override
+    public List<ResourceRepairTask> 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<ResourceInspectTaskSpare> 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<ResourceInspectTaskSpare> 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<ResourceInspectTaskSpare> 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<ResourceInspectTaskSpare> 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<ResourceInspectTaskSpare> 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;
+    }
+
+
 
 }

equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml

@@ -7,13 +7,14 @@
         <id column="HANDLE" property="handle" />
         <result column="SITE" property="site" />
         <result column="REPAIR_NO" property="repairNo" />
+        <result column="DESCRIPTION" property="description" />
         <result column="STATUS" property="status" />
-        <result column="RESOURCE_BO" property="resourceBo" />
-        <result column="USER_NO" property="userNo" />
-        <result column="NC_CODE_BO" property="ncCodeBo" />
+        <result column="RESOURCE_NO" property="resourceNo" />
+        <result column="REPORT_USER" property="reportUser" />
+        <result column="NC_CODE_NO" property="ncCodeNo" />
         <result column="REPAIR_TYPE" property="repairType" />
         <result column="STOP_MACHINE" property="stopMachine" />
-        <result column="NC_DESCRIPTION" property="ncDescription" />
+        <result column="BREAK_DOWN_DESCRIPTION" property="breakDownDescription" />
         <result column="FIND_LINK" property="findLink" />
         <result column="REPORT_SOURCE" property="reportSource" />
         <result column="OBJECT_BO" property="objectBo" />
@@ -21,6 +22,21 @@
         <result column="PLAN_COMPLETE_DATE" property="planCompleteDate" />
         <result column="ACTUAL_START_DATE" property="actualStartDate" />
         <result column="ACTUAL_COMPLETE_DATE" property="actualCompleteDate" />
+        <result column="REPAIR_USERS" property="repairUsers" />
+        <result column="CANCEL_CODE" property="cancelCode" />
+        <result column="CANCEL_DATE" property="cancelDate" />
+        <result column="CANCEL_DESCRIPTION" property="cancelDescription" />
+        <result column="CANCEL_USER" property="cancelUser" />
+        <result column="DEAL_WAY" property="dealWay" />
+        <result column="PRELIMINARY_REASON" property="preliminaryReason" />
+        <result column="DEAL_WAY_DESCRIPTION" property="dealWayDescription" />
+        <result column="WAIT_TIME" property="waitTime" />
+        <result column="WAIT_START_DATE" property="waitStartDate" />
+        <result column="WAIT_END_DATE" property="waitEndDate" />
+        <result column="WAIT_DESCRIPTION" property="waitDescription" />
+        <result column="PRIMARY_REASON" property="primaryReason" />
+        <result column="PRIMARY_REASON_DESCRIPTION" property="primaryReasonDescription" />
+        <result column="PRECAUTION_MEASURE_DESCRIPTION" property="precautionMeasureDescription" />
         <result column="REMARK" property="remark" />
         <result column="OTHER" property="other" />
         <result column="ANOTHER" property="another" />
@@ -32,7 +48,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        HANDLE, SITE, REPAIR_NO, STATUS, RESOURCE_BO, USER_NO, NC_CODE_BO, REPAIR_TYPE, STOP_MACHINE, NC_DESCRIPTION, FIND_LINK, REPORT_SOURCE, OBJECT_BO, PLAN_START_DATE, PLAN_COMPLETE_DATE, ACTUAL_START_DATE, ACTUAL_COMPLETE_DATE, REMARK, OTHER, ANOTHER, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, MODIFIED_DATE_TIME
+        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
     </sql>
 
     <!-- BaseMapper标准查询/修改/删除 -->
@@ -69,13 +85,14 @@
             </if>
             <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
             <if test="ew.entity.repairNo!=null"> AND REPAIR_NO=#{ew.entity.repairNo}</if>
+            <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
             <if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
-            <if test="ew.entity.resourceBo!=null"> AND RESOURCE_BO=#{ew.entity.resourceBo}</if>
-            <if test="ew.entity.userNo!=null"> AND USER_NO=#{ew.entity.userNo}</if>
-            <if test="ew.entity.ncCodeBo!=null"> AND NC_CODE_BO=#{ew.entity.ncCodeBo}</if>
+            <if test="ew.entity.resourceNo!=null"> AND RESOURCE_NO=#{ew.entity.resourceNo}</if>
+            <if test="ew.entity.reportUser!=null"> AND REPORT_USER=#{ew.entity.reportUser}</if>
+            <if test="ew.entity.ncCodeNo!=null"> AND NC_CODE_NO=#{ew.entity.ncCodeNo}</if>
             <if test="ew.entity.repairType!=null"> AND REPAIR_TYPE=#{ew.entity.repairType}</if>
             <if test="ew.entity.stopMachine!=null"> AND STOP_MACHINE=#{ew.entity.stopMachine}</if>
-            <if test="ew.entity.ncDescription!=null"> AND NC_DESCRIPTION=#{ew.entity.ncDescription}</if>
+            <if test="ew.entity.breakDownDescription!=null"> AND BREAK_DOWN_DESCRIPTION=#{ew.entity.breakDownDescription}</if>
             <if test="ew.entity.findLink!=null"> AND FIND_LINK=#{ew.entity.findLink}</if>
             <if test="ew.entity.reportSource!=null"> AND REPORT_SOURCE=#{ew.entity.reportSource}</if>
             <if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if>
@@ -83,6 +100,21 @@
             <if test="ew.entity.planCompleteDate!=null"> AND PLAN_COMPLETE_DATE=#{ew.entity.planCompleteDate}</if>
             <if test="ew.entity.actualStartDate!=null"> AND ACTUAL_START_DATE=#{ew.entity.actualStartDate}</if>
             <if test="ew.entity.actualCompleteDate!=null"> AND ACTUAL_COMPLETE_DATE=#{ew.entity.actualCompleteDate}</if>
+            <if test="ew.entity.repairUsers!=null"> AND REPAIR_USERS=#{ew.entity.repairUsers}</if>
+            <if test="ew.entity.cancelCode!=null"> AND CANCEL_CODE=#{ew.entity.cancelCode}</if>
+            <if test="ew.entity.cancelDate!=null"> AND CANCEL_DATE=#{ew.entity.cancelDate}</if>
+            <if test="ew.entity.cancelDescription!=null"> AND CANCEL_DESCRIPTION=#{ew.entity.cancelDescription}</if>
+            <if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if>
+            <if test="ew.entity.dealWay!=null"> AND DEAL_WAY=#{ew.entity.dealWay}</if>
+            <if test="ew.entity.preliminaryReason!=null"> AND PRELIMINARY_REASON=#{ew.entity.preliminaryReason}</if>
+            <if test="ew.entity.dealWayDescription!=null"> AND DEAL_WAY_DESCRIPTION=#{ew.entity.dealWayDescription}</if>
+            <if test="ew.entity.waitTime!=null"> AND WAIT_TIME=#{ew.entity.waitTime}</if>
+            <if test="ew.entity.waitStartDate!=null"> AND WAIT_START_DATE=#{ew.entity.waitStartDate}</if>
+            <if test="ew.entity.waitEndDate!=null"> AND WAIT_END_DATE=#{ew.entity.waitEndDate}</if>
+            <if test="ew.entity.waitDescription!=null"> AND WAIT_DESCRIPTION=#{ew.entity.waitDescription}</if>
+            <if test="ew.entity.primaryReason!=null"> AND PRIMARY_REASON=#{ew.entity.primaryReason}</if>
+            <if test="ew.entity.primaryReasonDescription!=null"> AND PRIMARY_REASON_DESCRIPTION=#{ew.entity.primaryReasonDescription}</if>
+            <if test="ew.entity.precautionMeasureDescription!=null"> AND PRECAUTION_MEASURE_DESCRIPTION=#{ew.entity.precautionMeasureDescription}</if>
             <if test="ew.entity.remark!=null"> AND REMARK=#{ew.entity.remark}</if>
             <if test="ew.entity.other!=null"> AND OTHER=#{ew.entity.other}</if>
             <if test="ew.entity.another!=null"> AND ANOTHER=#{ew.entity.another}</if>
@@ -103,13 +135,14 @@
                 </if>
                 <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
                 <if test="ew.entity.repairNo!=null"> AND REPAIR_NO=#{ew.entity.repairNo}</if>
+                <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
                 <if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
-                <if test="ew.entity.resourceBo!=null"> AND RESOURCE_BO=#{ew.entity.resourceBo}</if>
-                <if test="ew.entity.userNo!=null"> AND USER_NO=#{ew.entity.userNo}</if>
-                <if test="ew.entity.ncCodeBo!=null"> AND NC_CODE_BO=#{ew.entity.ncCodeBo}</if>
+                <if test="ew.entity.resourceNo!=null"> AND RESOURCE_NO=#{ew.entity.resourceNo}</if>
+                <if test="ew.entity.reportUser!=null"> AND REPORT_USER=#{ew.entity.reportUser}</if>
+                <if test="ew.entity.ncCodeNo!=null"> AND NC_CODE_NO=#{ew.entity.ncCodeNo}</if>
                 <if test="ew.entity.repairType!=null"> AND REPAIR_TYPE=#{ew.entity.repairType}</if>
                 <if test="ew.entity.stopMachine!=null"> AND STOP_MACHINE=#{ew.entity.stopMachine}</if>
-                <if test="ew.entity.ncDescription!=null"> AND NC_DESCRIPTION=#{ew.entity.ncDescription}</if>
+                <if test="ew.entity.breakDownDescription!=null"> AND BREAK_DOWN_DESCRIPTION=#{ew.entity.breakDownDescription}</if>
                 <if test="ew.entity.findLink!=null"> AND FIND_LINK=#{ew.entity.findLink}</if>
                 <if test="ew.entity.reportSource!=null"> AND REPORT_SOURCE=#{ew.entity.reportSource}</if>
                 <if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if>
@@ -117,6 +150,21 @@
                 <if test="ew.entity.planCompleteDate!=null"> AND PLAN_COMPLETE_DATE=#{ew.entity.planCompleteDate}</if>
                 <if test="ew.entity.actualStartDate!=null"> AND ACTUAL_START_DATE=#{ew.entity.actualStartDate}</if>
                 <if test="ew.entity.actualCompleteDate!=null"> AND ACTUAL_COMPLETE_DATE=#{ew.entity.actualCompleteDate}</if>
+                <if test="ew.entity.repairUsers!=null"> AND REPAIR_USERS=#{ew.entity.repairUsers}</if>
+                <if test="ew.entity.cancelCode!=null"> AND CANCEL_CODE=#{ew.entity.cancelCode}</if>
+                <if test="ew.entity.cancelDate!=null"> AND CANCEL_DATE=#{ew.entity.cancelDate}</if>
+                <if test="ew.entity.cancelDescription!=null"> AND CANCEL_DESCRIPTION=#{ew.entity.cancelDescription}</if>
+                <if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if>
+                <if test="ew.entity.dealWay!=null"> AND DEAL_WAY=#{ew.entity.dealWay}</if>
+                <if test="ew.entity.preliminaryReason!=null"> AND PRELIMINARY_REASON=#{ew.entity.preliminaryReason}</if>
+                <if test="ew.entity.dealWayDescription!=null"> AND DEAL_WAY_DESCRIPTION=#{ew.entity.dealWayDescription}</if>
+                <if test="ew.entity.waitTime!=null"> AND WAIT_TIME=#{ew.entity.waitTime}</if>
+                <if test="ew.entity.waitStartDate!=null"> AND WAIT_START_DATE=#{ew.entity.waitStartDate}</if>
+                <if test="ew.entity.waitEndDate!=null"> AND WAIT_END_DATE=#{ew.entity.waitEndDate}</if>
+                <if test="ew.entity.waitDescription!=null"> AND WAIT_DESCRIPTION=#{ew.entity.waitDescription}</if>
+                <if test="ew.entity.primaryReason!=null"> AND PRIMARY_REASON=#{ew.entity.primaryReason}</if>
+                <if test="ew.entity.primaryReasonDescription!=null"> AND PRIMARY_REASON_DESCRIPTION=#{ew.entity.primaryReasonDescription}</if>
+                <if test="ew.entity.precautionMeasureDescription!=null"> AND PRECAUTION_MEASURE_DESCRIPTION=#{ew.entity.precautionMeasureDescription}</if>
                 <if test="ew.entity.remark!=null"> AND REMARK=#{ew.entity.remark}</if>
                 <if test="ew.entity.other!=null"> AND OTHER=#{ew.entity.other}</if>
                 <if test="ew.entity.another!=null"> AND ANOTHER=#{ew.entity.another}</if>
@@ -145,13 +193,14 @@
                     </if>
                     <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
                     <if test="ew.entity.repairNo!=null"> AND REPAIR_NO=#{ew.entity.repairNo}</if>
+                    <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
                     <if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
-                    <if test="ew.entity.resourceBo!=null"> AND RESOURCE_BO=#{ew.entity.resourceBo}</if>
-                    <if test="ew.entity.userNo!=null"> AND USER_NO=#{ew.entity.userNo}</if>
-                    <if test="ew.entity.ncCodeBo!=null"> AND NC_CODE_BO=#{ew.entity.ncCodeBo}</if>
+                    <if test="ew.entity.resourceNo!=null"> AND RESOURCE_NO=#{ew.entity.resourceNo}</if>
+                    <if test="ew.entity.reportUser!=null"> AND REPORT_USER=#{ew.entity.reportUser}</if>
+                    <if test="ew.entity.ncCodeNo!=null"> AND NC_CODE_NO=#{ew.entity.ncCodeNo}</if>
                     <if test="ew.entity.repairType!=null"> AND REPAIR_TYPE=#{ew.entity.repairType}</if>
                     <if test="ew.entity.stopMachine!=null"> AND STOP_MACHINE=#{ew.entity.stopMachine}</if>
-                    <if test="ew.entity.ncDescription!=null"> AND NC_DESCRIPTION=#{ew.entity.ncDescription}</if>
+                    <if test="ew.entity.breakDownDescription!=null"> AND BREAK_DOWN_DESCRIPTION=#{ew.entity.breakDownDescription}</if>
                     <if test="ew.entity.findLink!=null"> AND FIND_LINK=#{ew.entity.findLink}</if>
                     <if test="ew.entity.reportSource!=null"> AND REPORT_SOURCE=#{ew.entity.reportSource}</if>
                     <if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if>
@@ -159,6 +208,21 @@
                     <if test="ew.entity.planCompleteDate!=null"> AND PLAN_COMPLETE_DATE=#{ew.entity.planCompleteDate}</if>
                     <if test="ew.entity.actualStartDate!=null"> AND ACTUAL_START_DATE=#{ew.entity.actualStartDate}</if>
                     <if test="ew.entity.actualCompleteDate!=null"> AND ACTUAL_COMPLETE_DATE=#{ew.entity.actualCompleteDate}</if>
+                    <if test="ew.entity.repairUsers!=null"> AND REPAIR_USERS=#{ew.entity.repairUsers}</if>
+                    <if test="ew.entity.cancelCode!=null"> AND CANCEL_CODE=#{ew.entity.cancelCode}</if>
+                    <if test="ew.entity.cancelDate!=null"> AND CANCEL_DATE=#{ew.entity.cancelDate}</if>
+                    <if test="ew.entity.cancelDescription!=null"> AND CANCEL_DESCRIPTION=#{ew.entity.cancelDescription}</if>
+                    <if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if>
+                    <if test="ew.entity.dealWay!=null"> AND DEAL_WAY=#{ew.entity.dealWay}</if>
+                    <if test="ew.entity.preliminaryReason!=null"> AND PRELIMINARY_REASON=#{ew.entity.preliminaryReason}</if>
+                    <if test="ew.entity.dealWayDescription!=null"> AND DEAL_WAY_DESCRIPTION=#{ew.entity.dealWayDescription}</if>
+                    <if test="ew.entity.waitTime!=null"> AND WAIT_TIME=#{ew.entity.waitTime}</if>
+                    <if test="ew.entity.waitStartDate!=null"> AND WAIT_START_DATE=#{ew.entity.waitStartDate}</if>
+                    <if test="ew.entity.waitEndDate!=null"> AND WAIT_END_DATE=#{ew.entity.waitEndDate}</if>
+                    <if test="ew.entity.waitDescription!=null"> AND WAIT_DESCRIPTION=#{ew.entity.waitDescription}</if>
+                    <if test="ew.entity.primaryReason!=null"> AND PRIMARY_REASON=#{ew.entity.primaryReason}</if>
+                    <if test="ew.entity.primaryReasonDescription!=null"> AND PRIMARY_REASON_DESCRIPTION=#{ew.entity.primaryReasonDescription}</if>
+                    <if test="ew.entity.precautionMeasureDescription!=null"> AND PRECAUTION_MEASURE_DESCRIPTION=#{ew.entity.precautionMeasureDescription}</if>
                     <if test="ew.entity.remark!=null"> AND REMARK=#{ew.entity.remark}</if>
                     <if test="ew.entity.other!=null"> AND OTHER=#{ew.entity.other}</if>
                     <if test="ew.entity.another!=null"> AND ANOTHER=#{ew.entity.another}</if>
@@ -187,13 +251,14 @@
                     </if>
                     <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
                     <if test="ew.entity.repairNo!=null"> AND REPAIR_NO=#{ew.entity.repairNo}</if>
+                    <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
                     <if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
-                    <if test="ew.entity.resourceBo!=null"> AND RESOURCE_BO=#{ew.entity.resourceBo}</if>
-                    <if test="ew.entity.userNo!=null"> AND USER_NO=#{ew.entity.userNo}</if>
-                    <if test="ew.entity.ncCodeBo!=null"> AND NC_CODE_BO=#{ew.entity.ncCodeBo}</if>
+                    <if test="ew.entity.resourceNo!=null"> AND RESOURCE_NO=#{ew.entity.resourceNo}</if>
+                    <if test="ew.entity.reportUser!=null"> AND REPORT_USER=#{ew.entity.reportUser}</if>
+                    <if test="ew.entity.ncCodeNo!=null"> AND NC_CODE_NO=#{ew.entity.ncCodeNo}</if>
                     <if test="ew.entity.repairType!=null"> AND REPAIR_TYPE=#{ew.entity.repairType}</if>
                     <if test="ew.entity.stopMachine!=null"> AND STOP_MACHINE=#{ew.entity.stopMachine}</if>
-                    <if test="ew.entity.ncDescription!=null"> AND NC_DESCRIPTION=#{ew.entity.ncDescription}</if>
+                    <if test="ew.entity.breakDownDescription!=null"> AND BREAK_DOWN_DESCRIPTION=#{ew.entity.breakDownDescription}</if>
                     <if test="ew.entity.findLink!=null"> AND FIND_LINK=#{ew.entity.findLink}</if>
                     <if test="ew.entity.reportSource!=null"> AND REPORT_SOURCE=#{ew.entity.reportSource}</if>
                     <if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if>
@@ -201,6 +266,21 @@
                     <if test="ew.entity.planCompleteDate!=null"> AND PLAN_COMPLETE_DATE=#{ew.entity.planCompleteDate}</if>
                     <if test="ew.entity.actualStartDate!=null"> AND ACTUAL_START_DATE=#{ew.entity.actualStartDate}</if>
                     <if test="ew.entity.actualCompleteDate!=null"> AND ACTUAL_COMPLETE_DATE=#{ew.entity.actualCompleteDate}</if>
+                    <if test="ew.entity.repairUsers!=null"> AND REPAIR_USERS=#{ew.entity.repairUsers}</if>
+                    <if test="ew.entity.cancelCode!=null"> AND CANCEL_CODE=#{ew.entity.cancelCode}</if>
+                    <if test="ew.entity.cancelDate!=null"> AND CANCEL_DATE=#{ew.entity.cancelDate}</if>
+                    <if test="ew.entity.cancelDescription!=null"> AND CANCEL_DESCRIPTION=#{ew.entity.cancelDescription}</if>
+                    <if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if>
+                    <if test="ew.entity.dealWay!=null"> AND DEAL_WAY=#{ew.entity.dealWay}</if>
+                    <if test="ew.entity.preliminaryReason!=null"> AND PRELIMINARY_REASON=#{ew.entity.preliminaryReason}</if>
+                    <if test="ew.entity.dealWayDescription!=null"> AND DEAL_WAY_DESCRIPTION=#{ew.entity.dealWayDescription}</if>
+                    <if test="ew.entity.waitTime!=null"> AND WAIT_TIME=#{ew.entity.waitTime}</if>
+                    <if test="ew.entity.waitStartDate!=null"> AND WAIT_START_DATE=#{ew.entity.waitStartDate}</if>
+                    <if test="ew.entity.waitEndDate!=null"> AND WAIT_END_DATE=#{ew.entity.waitEndDate}</if>
+                    <if test="ew.entity.waitDescription!=null"> AND WAIT_DESCRIPTION=#{ew.entity.waitDescription}</if>
+                    <if test="ew.entity.primaryReason!=null"> AND PRIMARY_REASON=#{ew.entity.primaryReason}</if>
+                    <if test="ew.entity.primaryReasonDescription!=null"> AND PRIMARY_REASON_DESCRIPTION=#{ew.entity.primaryReasonDescription}</if>
+                    <if test="ew.entity.precautionMeasureDescription!=null"> AND PRECAUTION_MEASURE_DESCRIPTION=#{ew.entity.precautionMeasureDescription}</if>
                     <if test="ew.entity.remark!=null"> AND REMARK=#{ew.entity.remark}</if>
                     <if test="ew.entity.other!=null"> AND OTHER=#{ew.entity.other}</if>
                     <if test="ew.entity.another!=null"> AND ANOTHER=#{ew.entity.another}</if>
@@ -229,13 +309,14 @@
                     </if>
                     <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
                     <if test="ew.entity.repairNo!=null"> AND REPAIR_NO=#{ew.entity.repairNo}</if>
+                    <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
                     <if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
-                    <if test="ew.entity.resourceBo!=null"> AND RESOURCE_BO=#{ew.entity.resourceBo}</if>
-                    <if test="ew.entity.userNo!=null"> AND USER_NO=#{ew.entity.userNo}</if>
-                    <if test="ew.entity.ncCodeBo!=null"> AND NC_CODE_BO=#{ew.entity.ncCodeBo}</if>
+                    <if test="ew.entity.resourceNo!=null"> AND RESOURCE_NO=#{ew.entity.resourceNo}</if>
+                    <if test="ew.entity.reportUser!=null"> AND REPORT_USER=#{ew.entity.reportUser}</if>
+                    <if test="ew.entity.ncCodeNo!=null"> AND NC_CODE_NO=#{ew.entity.ncCodeNo}</if>
                     <if test="ew.entity.repairType!=null"> AND REPAIR_TYPE=#{ew.entity.repairType}</if>
                     <if test="ew.entity.stopMachine!=null"> AND STOP_MACHINE=#{ew.entity.stopMachine}</if>
-                    <if test="ew.entity.ncDescription!=null"> AND NC_DESCRIPTION=#{ew.entity.ncDescription}</if>
+                    <if test="ew.entity.breakDownDescription!=null"> AND BREAK_DOWN_DESCRIPTION=#{ew.entity.breakDownDescription}</if>
                     <if test="ew.entity.findLink!=null"> AND FIND_LINK=#{ew.entity.findLink}</if>
                     <if test="ew.entity.reportSource!=null"> AND REPORT_SOURCE=#{ew.entity.reportSource}</if>
                     <if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if>
@@ -243,6 +324,21 @@
                     <if test="ew.entity.planCompleteDate!=null"> AND PLAN_COMPLETE_DATE=#{ew.entity.planCompleteDate}</if>
                     <if test="ew.entity.actualStartDate!=null"> AND ACTUAL_START_DATE=#{ew.entity.actualStartDate}</if>
                     <if test="ew.entity.actualCompleteDate!=null"> AND ACTUAL_COMPLETE_DATE=#{ew.entity.actualCompleteDate}</if>
+                    <if test="ew.entity.repairUsers!=null"> AND REPAIR_USERS=#{ew.entity.repairUsers}</if>
+                    <if test="ew.entity.cancelCode!=null"> AND CANCEL_CODE=#{ew.entity.cancelCode}</if>
+                    <if test="ew.entity.cancelDate!=null"> AND CANCEL_DATE=#{ew.entity.cancelDate}</if>
+                    <if test="ew.entity.cancelDescription!=null"> AND CANCEL_DESCRIPTION=#{ew.entity.cancelDescription}</if>
+                    <if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if>
+                    <if test="ew.entity.dealWay!=null"> AND DEAL_WAY=#{ew.entity.dealWay}</if>
+                    <if test="ew.entity.preliminaryReason!=null"> AND PRELIMINARY_REASON=#{ew.entity.preliminaryReason}</if>
+                    <if test="ew.entity.dealWayDescription!=null"> AND DEAL_WAY_DESCRIPTION=#{ew.entity.dealWayDescription}</if>
+                    <if test="ew.entity.waitTime!=null"> AND WAIT_TIME=#{ew.entity.waitTime}</if>
+                    <if test="ew.entity.waitStartDate!=null"> AND WAIT_START_DATE=#{ew.entity.waitStartDate}</if>
+                    <if test="ew.entity.waitEndDate!=null"> AND WAIT_END_DATE=#{ew.entity.waitEndDate}</if>
+                    <if test="ew.entity.waitDescription!=null"> AND WAIT_DESCRIPTION=#{ew.entity.waitDescription}</if>
+                    <if test="ew.entity.primaryReason!=null"> AND PRIMARY_REASON=#{ew.entity.primaryReason}</if>
+                    <if test="ew.entity.primaryReasonDescription!=null"> AND PRIMARY_REASON_DESCRIPTION=#{ew.entity.primaryReasonDescription}</if>
+                    <if test="ew.entity.precautionMeasureDescription!=null"> AND PRECAUTION_MEASURE_DESCRIPTION=#{ew.entity.precautionMeasureDescription}</if>
                     <if test="ew.entity.remark!=null"> AND REMARK=#{ew.entity.remark}</if>
                     <if test="ew.entity.other!=null"> AND OTHER=#{ew.entity.other}</if>
                     <if test="ew.entity.another!=null"> AND ANOTHER=#{ew.entity.another}</if>
@@ -271,13 +367,14 @@
                     </if>
                     <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
                     <if test="ew.entity.repairNo!=null"> AND REPAIR_NO=#{ew.entity.repairNo}</if>
+                    <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
                     <if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
-                    <if test="ew.entity.resourceBo!=null"> AND RESOURCE_BO=#{ew.entity.resourceBo}</if>
-                    <if test="ew.entity.userNo!=null"> AND USER_NO=#{ew.entity.userNo}</if>
-                    <if test="ew.entity.ncCodeBo!=null"> AND NC_CODE_BO=#{ew.entity.ncCodeBo}</if>
+                    <if test="ew.entity.resourceNo!=null"> AND RESOURCE_NO=#{ew.entity.resourceNo}</if>
+                    <if test="ew.entity.reportUser!=null"> AND REPORT_USER=#{ew.entity.reportUser}</if>
+                    <if test="ew.entity.ncCodeNo!=null"> AND NC_CODE_NO=#{ew.entity.ncCodeNo}</if>
                     <if test="ew.entity.repairType!=null"> AND REPAIR_TYPE=#{ew.entity.repairType}</if>
                     <if test="ew.entity.stopMachine!=null"> AND STOP_MACHINE=#{ew.entity.stopMachine}</if>
-                    <if test="ew.entity.ncDescription!=null"> AND NC_DESCRIPTION=#{ew.entity.ncDescription}</if>
+                    <if test="ew.entity.breakDownDescription!=null"> AND BREAK_DOWN_DESCRIPTION=#{ew.entity.breakDownDescription}</if>
                     <if test="ew.entity.findLink!=null"> AND FIND_LINK=#{ew.entity.findLink}</if>
                     <if test="ew.entity.reportSource!=null"> AND REPORT_SOURCE=#{ew.entity.reportSource}</if>
                     <if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if>
@@ -285,6 +382,21 @@
                     <if test="ew.entity.planCompleteDate!=null"> AND PLAN_COMPLETE_DATE=#{ew.entity.planCompleteDate}</if>
                     <if test="ew.entity.actualStartDate!=null"> AND ACTUAL_START_DATE=#{ew.entity.actualStartDate}</if>
                     <if test="ew.entity.actualCompleteDate!=null"> AND ACTUAL_COMPLETE_DATE=#{ew.entity.actualCompleteDate}</if>
+                    <if test="ew.entity.repairUsers!=null"> AND REPAIR_USERS=#{ew.entity.repairUsers}</if>
+                    <if test="ew.entity.cancelCode!=null"> AND CANCEL_CODE=#{ew.entity.cancelCode}</if>
+                    <if test="ew.entity.cancelDate!=null"> AND CANCEL_DATE=#{ew.entity.cancelDate}</if>
+                    <if test="ew.entity.cancelDescription!=null"> AND CANCEL_DESCRIPTION=#{ew.entity.cancelDescription}</if>
+                    <if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if>
+                    <if test="ew.entity.dealWay!=null"> AND DEAL_WAY=#{ew.entity.dealWay}</if>
+                    <if test="ew.entity.preliminaryReason!=null"> AND PRELIMINARY_REASON=#{ew.entity.preliminaryReason}</if>
+                    <if test="ew.entity.dealWayDescription!=null"> AND DEAL_WAY_DESCRIPTION=#{ew.entity.dealWayDescription}</if>
+                    <if test="ew.entity.waitTime!=null"> AND WAIT_TIME=#{ew.entity.waitTime}</if>
+                    <if test="ew.entity.waitStartDate!=null"> AND WAIT_START_DATE=#{ew.entity.waitStartDate}</if>
+                    <if test="ew.entity.waitEndDate!=null"> AND WAIT_END_DATE=#{ew.entity.waitEndDate}</if>
+                    <if test="ew.entity.waitDescription!=null"> AND WAIT_DESCRIPTION=#{ew.entity.waitDescription}</if>
+                    <if test="ew.entity.primaryReason!=null"> AND PRIMARY_REASON=#{ew.entity.primaryReason}</if>
+                    <if test="ew.entity.primaryReasonDescription!=null"> AND PRIMARY_REASON_DESCRIPTION=#{ew.entity.primaryReasonDescription}</if>
+                    <if test="ew.entity.precautionMeasureDescription!=null"> AND PRECAUTION_MEASURE_DESCRIPTION=#{ew.entity.precautionMeasureDescription}</if>
                     <if test="ew.entity.remark!=null"> AND REMARK=#{ew.entity.remark}</if>
                     <if test="ew.entity.other!=null"> AND OTHER=#{ew.entity.other}</if>
                     <if test="ew.entity.another!=null"> AND ANOTHER=#{ew.entity.another}</if>
@@ -313,13 +425,14 @@
                     </if>
                     <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
                     <if test="ew.entity.repairNo!=null"> AND REPAIR_NO=#{ew.entity.repairNo}</if>
+                    <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
                     <if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
-                    <if test="ew.entity.resourceBo!=null"> AND RESOURCE_BO=#{ew.entity.resourceBo}</if>
-                    <if test="ew.entity.userNo!=null"> AND USER_NO=#{ew.entity.userNo}</if>
-                    <if test="ew.entity.ncCodeBo!=null"> AND NC_CODE_BO=#{ew.entity.ncCodeBo}</if>
+                    <if test="ew.entity.resourceNo!=null"> AND RESOURCE_NO=#{ew.entity.resourceNo}</if>
+                    <if test="ew.entity.reportUser!=null"> AND REPORT_USER=#{ew.entity.reportUser}</if>
+                    <if test="ew.entity.ncCodeNo!=null"> AND NC_CODE_NO=#{ew.entity.ncCodeNo}</if>
                     <if test="ew.entity.repairType!=null"> AND REPAIR_TYPE=#{ew.entity.repairType}</if>
                     <if test="ew.entity.stopMachine!=null"> AND STOP_MACHINE=#{ew.entity.stopMachine}</if>
-                    <if test="ew.entity.ncDescription!=null"> AND NC_DESCRIPTION=#{ew.entity.ncDescription}</if>
+                    <if test="ew.entity.breakDownDescription!=null"> AND BREAK_DOWN_DESCRIPTION=#{ew.entity.breakDownDescription}</if>
                     <if test="ew.entity.findLink!=null"> AND FIND_LINK=#{ew.entity.findLink}</if>
                     <if test="ew.entity.reportSource!=null"> AND REPORT_SOURCE=#{ew.entity.reportSource}</if>
                     <if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if>
@@ -327,6 +440,21 @@
                     <if test="ew.entity.planCompleteDate!=null"> AND PLAN_COMPLETE_DATE=#{ew.entity.planCompleteDate}</if>
                     <if test="ew.entity.actualStartDate!=null"> AND ACTUAL_START_DATE=#{ew.entity.actualStartDate}</if>
                     <if test="ew.entity.actualCompleteDate!=null"> AND ACTUAL_COMPLETE_DATE=#{ew.entity.actualCompleteDate}</if>
+                    <if test="ew.entity.repairUsers!=null"> AND REPAIR_USERS=#{ew.entity.repairUsers}</if>
+                    <if test="ew.entity.cancelCode!=null"> AND CANCEL_CODE=#{ew.entity.cancelCode}</if>
+                    <if test="ew.entity.cancelDate!=null"> AND CANCEL_DATE=#{ew.entity.cancelDate}</if>
+                    <if test="ew.entity.cancelDescription!=null"> AND CANCEL_DESCRIPTION=#{ew.entity.cancelDescription}</if>
+                    <if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if>
+                    <if test="ew.entity.dealWay!=null"> AND DEAL_WAY=#{ew.entity.dealWay}</if>
+                    <if test="ew.entity.preliminaryReason!=null"> AND PRELIMINARY_REASON=#{ew.entity.preliminaryReason}</if>
+                    <if test="ew.entity.dealWayDescription!=null"> AND DEAL_WAY_DESCRIPTION=#{ew.entity.dealWayDescription}</if>
+                    <if test="ew.entity.waitTime!=null"> AND WAIT_TIME=#{ew.entity.waitTime}</if>
+                    <if test="ew.entity.waitStartDate!=null"> AND WAIT_START_DATE=#{ew.entity.waitStartDate}</if>
+                    <if test="ew.entity.waitEndDate!=null"> AND WAIT_END_DATE=#{ew.entity.waitEndDate}</if>
+                    <if test="ew.entity.waitDescription!=null"> AND WAIT_DESCRIPTION=#{ew.entity.waitDescription}</if>
+                    <if test="ew.entity.primaryReason!=null"> AND PRIMARY_REASON=#{ew.entity.primaryReason}</if>
+                    <if test="ew.entity.primaryReasonDescription!=null"> AND PRIMARY_REASON_DESCRIPTION=#{ew.entity.primaryReasonDescription}</if>
+                    <if test="ew.entity.precautionMeasureDescription!=null"> AND PRECAUTION_MEASURE_DESCRIPTION=#{ew.entity.precautionMeasureDescription}</if>
                     <if test="ew.entity.remark!=null"> AND REMARK=#{ew.entity.remark}</if>
                     <if test="ew.entity.other!=null"> AND OTHER=#{ew.entity.other}</if>
                     <if test="ew.entity.another!=null"> AND ANOTHER=#{ew.entity.another}</if>
@@ -351,13 +479,14 @@
             HANDLE,
             <if test="site!=null">SITE,</if>
             <if test="repairNo!=null">REPAIR_NO,</if>
+            <if test="description!=null">DESCRIPTION,</if>
             <if test="status!=null">STATUS,</if>
-            <if test="resourceBo!=null">RESOURCE_BO,</if>
-            <if test="userNo!=null">USER_NO,</if>
-            <if test="ncCodeBo!=null">NC_CODE_BO,</if>
+            <if test="resourceNo!=null">RESOURCE_NO,</if>
+            <if test="reportUser!=null">REPORT_USER,</if>
+            <if test="ncCodeNo!=null">NC_CODE_NO,</if>
             <if test="repairType!=null">REPAIR_TYPE,</if>
             <if test="stopMachine!=null">STOP_MACHINE,</if>
-            <if test="ncDescription!=null">NC_DESCRIPTION,</if>
+            <if test="breakDownDescription!=null">BREAK_DOWN_DESCRIPTION,</if>
             <if test="findLink!=null">FIND_LINK,</if>
             <if test="reportSource!=null">REPORT_SOURCE,</if>
             <if test="objectBo!=null">OBJECT_BO,</if>
@@ -365,6 +494,21 @@
             <if test="planCompleteDate!=null">PLAN_COMPLETE_DATE,</if>
             <if test="actualStartDate!=null">ACTUAL_START_DATE,</if>
             <if test="actualCompleteDate!=null">ACTUAL_COMPLETE_DATE,</if>
+            <if test="repairUsers!=null">REPAIR_USERS,</if>
+            <if test="cancelCode!=null">CANCEL_CODE,</if>
+            <if test="cancelDate!=null">CANCEL_DATE,</if>
+            <if test="cancelDescription!=null">CANCEL_DESCRIPTION,</if>
+            <if test="cancelUser!=null">CANCEL_USER,</if>
+            <if test="dealWay!=null">DEAL_WAY,</if>
+            <if test="preliminaryReason!=null">PRELIMINARY_REASON,</if>
+            <if test="dealWayDescription!=null">DEAL_WAY_DESCRIPTION,</if>
+            <if test="waitTime!=null">WAIT_TIME,</if>
+            <if test="waitStartDate!=null">WAIT_START_DATE,</if>
+            <if test="waitEndDate!=null">WAIT_END_DATE,</if>
+            <if test="waitDescription!=null">WAIT_DESCRIPTION,</if>
+            <if test="primaryReason!=null">PRIMARY_REASON,</if>
+            <if test="primaryReasonDescription!=null">PRIMARY_REASON_DESCRIPTION,</if>
+            <if test="precautionMeasureDescription!=null">PRECAUTION_MEASURE_DESCRIPTION,</if>
             <if test="remark!=null">REMARK,</if>
             <if test="other!=null">OTHER,</if>
             <if test="another!=null">ANOTHER,</if>
@@ -377,13 +521,14 @@
             #{handle},
             <if test="site!=null">#{site},</if>
             <if test="repairNo!=null">#{repairNo},</if>
+            <if test="description!=null">#{description},</if>
             <if test="status!=null">#{status},</if>
-            <if test="resourceBo!=null">#{resourceBo},</if>
-            <if test="userNo!=null">#{userNo},</if>
-            <if test="ncCodeBo!=null">#{ncCodeBo},</if>
+            <if test="resourceNo!=null">#{resourceNo},</if>
+            <if test="reportUser!=null">#{reportUser},</if>
+            <if test="ncCodeNo!=null">#{ncCodeNo},</if>
             <if test="repairType!=null">#{repairType},</if>
             <if test="stopMachine!=null">#{stopMachine},</if>
-            <if test="ncDescription!=null">#{ncDescription},</if>
+            <if test="breakDownDescription!=null">#{breakDownDescription},</if>
             <if test="findLink!=null">#{findLink},</if>
             <if test="reportSource!=null">#{reportSource},</if>
             <if test="objectBo!=null">#{objectBo},</if>
@@ -391,6 +536,21 @@
             <if test="planCompleteDate!=null">#{planCompleteDate},</if>
             <if test="actualStartDate!=null">#{actualStartDate},</if>
             <if test="actualCompleteDate!=null">#{actualCompleteDate},</if>
+            <if test="repairUsers!=null">#{repairUsers},</if>
+            <if test="cancelCode!=null">#{cancelCode},</if>
+            <if test="cancelDate!=null">#{cancelDate},</if>
+            <if test="cancelDescription!=null">#{cancelDescription},</if>
+            <if test="cancelUser!=null">#{cancelUser},</if>
+            <if test="dealWay!=null">#{dealWay},</if>
+            <if test="preliminaryReason!=null">#{preliminaryReason},</if>
+            <if test="dealWayDescription!=null">#{dealWayDescription},</if>
+            <if test="waitTime!=null">#{waitTime},</if>
+            <if test="waitStartDate!=null">#{waitStartDate},</if>
+            <if test="waitEndDate!=null">#{waitEndDate},</if>
+            <if test="waitDescription!=null">#{waitDescription},</if>
+            <if test="primaryReason!=null">#{primaryReason},</if>
+            <if test="primaryReasonDescription!=null">#{primaryReasonDescription},</if>
+            <if test="precautionMeasureDescription!=null">#{precautionMeasureDescription},</if>
             <if test="remark!=null">#{remark},</if>
             <if test="other!=null">#{other},</if>
             <if test="another!=null">#{another},</if>
@@ -410,13 +570,14 @@
             #{handle},
             #{site},
             #{repairNo},
+            #{description},
             #{status},
-            #{resourceBo},
-            #{userNo},
-            #{ncCodeBo},
+            #{resourceNo},
+            #{reportUser},
+            #{ncCodeNo},
             #{repairType},
             #{stopMachine},
-            #{ncDescription},
+            #{breakDownDescription},
             #{findLink},
             #{reportSource},
             #{objectBo},
@@ -424,6 +585,21 @@
             #{planCompleteDate},
             #{actualStartDate},
             #{actualCompleteDate},
+            #{repairUsers},
+            #{cancelCode},
+            #{cancelDate},
+            #{cancelDescription},
+            #{cancelUser},
+            #{dealWay},
+            #{preliminaryReason},
+            #{dealWayDescription},
+            #{waitTime},
+            #{waitStartDate},
+            #{waitEndDate},
+            #{waitDescription},
+            #{primaryReason},
+            #{primaryReasonDescription},
+            #{precautionMeasureDescription},
             #{remark},
             #{other},
             #{another},
@@ -439,13 +615,14 @@
         UPDATE Z_RESOURCE_REPAIR_TASK <trim prefix="SET" suffixOverrides=",">
         <if test="et.site!=null">SITE=#{et.site},</if>
         <if test="et.repairNo!=null">REPAIR_NO=#{et.repairNo},</if>
+        <if test="et.description!=null">DESCRIPTION=#{et.description},</if>
         <if test="et.status!=null">STATUS=#{et.status},</if>
-        <if test="et.resourceBo!=null">RESOURCE_BO=#{et.resourceBo},</if>
-        <if test="et.userNo!=null">USER_NO=#{et.userNo},</if>
-        <if test="et.ncCodeBo!=null">NC_CODE_BO=#{et.ncCodeBo},</if>
+        <if test="et.resourceNo!=null">RESOURCE_NO=#{et.resourceNo},</if>
+        <if test="et.reportUser!=null">REPORT_USER=#{et.reportUser},</if>
+        <if test="et.ncCodeNo!=null">NC_CODE_NO=#{et.ncCodeNo},</if>
         <if test="et.repairType!=null">REPAIR_TYPE=#{et.repairType},</if>
         <if test="et.stopMachine!=null">STOP_MACHINE=#{et.stopMachine},</if>
-        <if test="et.ncDescription!=null">NC_DESCRIPTION=#{et.ncDescription},</if>
+        <if test="et.breakDownDescription!=null">BREAK_DOWN_DESCRIPTION=#{et.breakDownDescription},</if>
         <if test="et.findLink!=null">FIND_LINK=#{et.findLink},</if>
         <if test="et.reportSource!=null">REPORT_SOURCE=#{et.reportSource},</if>
         <if test="et.objectBo!=null">OBJECT_BO=#{et.objectBo},</if>
@@ -453,6 +630,21 @@
         <if test="et.planCompleteDate!=null">PLAN_COMPLETE_DATE=#{et.planCompleteDate},</if>
         <if test="et.actualStartDate!=null">ACTUAL_START_DATE=#{et.actualStartDate},</if>
         <if test="et.actualCompleteDate!=null">ACTUAL_COMPLETE_DATE=#{et.actualCompleteDate},</if>
+        <if test="et.repairUsers!=null">REPAIR_USERS=#{et.repairUsers},</if>
+        <if test="et.cancelCode!=null">CANCEL_CODE=#{et.cancelCode},</if>
+        <if test="et.cancelDate!=null">CANCEL_DATE=#{et.cancelDate},</if>
+        <if test="et.cancelDescription!=null">CANCEL_DESCRIPTION=#{et.cancelDescription},</if>
+        <if test="et.cancelUser!=null">CANCEL_USER=#{et.cancelUser},</if>
+        <if test="et.dealWay!=null">DEAL_WAY=#{et.dealWay},</if>
+        <if test="et.preliminaryReason!=null">PRELIMINARY_REASON=#{et.preliminaryReason},</if>
+        <if test="et.dealWayDescription!=null">DEAL_WAY_DESCRIPTION=#{et.dealWayDescription},</if>
+        <if test="et.waitTime!=null">WAIT_TIME=#{et.waitTime},</if>
+        <if test="et.waitStartDate!=null">WAIT_START_DATE=#{et.waitStartDate},</if>
+        <if test="et.waitEndDate!=null">WAIT_END_DATE=#{et.waitEndDate},</if>
+        <if test="et.waitDescription!=null">WAIT_DESCRIPTION=#{et.waitDescription},</if>
+        <if test="et.primaryReason!=null">PRIMARY_REASON=#{et.primaryReason},</if>
+        <if test="et.primaryReasonDescription!=null">PRIMARY_REASON_DESCRIPTION=#{et.primaryReasonDescription},</if>
+        <if test="et.precautionMeasureDescription!=null">PRECAUTION_MEASURE_DESCRIPTION=#{et.precautionMeasureDescription},</if>
         <if test="et.remark!=null">REMARK=#{et.remark},</if>
         <if test="et.other!=null">OTHER=#{et.other},</if>
         <if test="et.another!=null">ANOTHER=#{et.another},</if>
@@ -468,13 +660,14 @@
         UPDATE Z_RESOURCE_REPAIR_TASK <trim prefix="SET" suffixOverrides=",">
         SITE=#{et.site},
         REPAIR_NO=#{et.repairNo},
+        DESCRIPTION=#{et.description},
         STATUS=#{et.status},
-        RESOURCE_BO=#{et.resourceBo},
-        USER_NO=#{et.userNo},
-        NC_CODE_BO=#{et.ncCodeBo},
+        RESOURCE_NO=#{et.resourceNo},
+        REPORT_USER=#{et.reportUser},
+        NC_CODE_NO=#{et.ncCodeNo},
         REPAIR_TYPE=#{et.repairType},
         STOP_MACHINE=#{et.stopMachine},
-        NC_DESCRIPTION=#{et.ncDescription},
+        BREAK_DOWN_DESCRIPTION=#{et.breakDownDescription},
         FIND_LINK=#{et.findLink},
         REPORT_SOURCE=#{et.reportSource},
         OBJECT_BO=#{et.objectBo},
@@ -482,6 +675,21 @@
         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},
@@ -497,13 +705,14 @@
         UPDATE Z_RESOURCE_REPAIR_TASK <trim prefix="SET" suffixOverrides=",">
         <if test="et.site!=null">SITE=#{et.site},</if>
         <if test="et.repairNo!=null">REPAIR_NO=#{et.repairNo},</if>
+        <if test="et.description!=null">DESCRIPTION=#{et.description},</if>
         <if test="et.status!=null">STATUS=#{et.status},</if>
-        <if test="et.resourceBo!=null">RESOURCE_BO=#{et.resourceBo},</if>
-        <if test="et.userNo!=null">USER_NO=#{et.userNo},</if>
-        <if test="et.ncCodeBo!=null">NC_CODE_BO=#{et.ncCodeBo},</if>
+        <if test="et.resourceNo!=null">RESOURCE_NO=#{et.resourceNo},</if>
+        <if test="et.reportUser!=null">REPORT_USER=#{et.reportUser},</if>
+        <if test="et.ncCodeNo!=null">NC_CODE_NO=#{et.ncCodeNo},</if>
         <if test="et.repairType!=null">REPAIR_TYPE=#{et.repairType},</if>
         <if test="et.stopMachine!=null">STOP_MACHINE=#{et.stopMachine},</if>
-        <if test="et.ncDescription!=null">NC_DESCRIPTION=#{et.ncDescription},</if>
+        <if test="et.breakDownDescription!=null">BREAK_DOWN_DESCRIPTION=#{et.breakDownDescription},</if>
         <if test="et.findLink!=null">FIND_LINK=#{et.findLink},</if>
         <if test="et.reportSource!=null">REPORT_SOURCE=#{et.reportSource},</if>
         <if test="et.objectBo!=null">OBJECT_BO=#{et.objectBo},</if>
@@ -511,6 +720,21 @@
         <if test="et.planCompleteDate!=null">PLAN_COMPLETE_DATE=#{et.planCompleteDate},</if>
         <if test="et.actualStartDate!=null">ACTUAL_START_DATE=#{et.actualStartDate},</if>
         <if test="et.actualCompleteDate!=null">ACTUAL_COMPLETE_DATE=#{et.actualCompleteDate},</if>
+        <if test="et.repairUsers!=null">REPAIR_USERS=#{et.repairUsers},</if>
+        <if test="et.cancelCode!=null">CANCEL_CODE=#{et.cancelCode},</if>
+        <if test="et.cancelDate!=null">CANCEL_DATE=#{et.cancelDate},</if>
+        <if test="et.cancelDescription!=null">CANCEL_DESCRIPTION=#{et.cancelDescription},</if>
+        <if test="et.cancelUser!=null">CANCEL_USER=#{et.cancelUser},</if>
+        <if test="et.dealWay!=null">DEAL_WAY=#{et.dealWay},</if>
+        <if test="et.preliminaryReason!=null">PRELIMINARY_REASON=#{et.preliminaryReason},</if>
+        <if test="et.dealWayDescription!=null">DEAL_WAY_DESCRIPTION=#{et.dealWayDescription},</if>
+        <if test="et.waitTime!=null">WAIT_TIME=#{et.waitTime},</if>
+        <if test="et.waitStartDate!=null">WAIT_START_DATE=#{et.waitStartDate},</if>
+        <if test="et.waitEndDate!=null">WAIT_END_DATE=#{et.waitEndDate},</if>
+        <if test="et.waitDescription!=null">WAIT_DESCRIPTION=#{et.waitDescription},</if>
+        <if test="et.primaryReason!=null">PRIMARY_REASON=#{et.primaryReason},</if>
+        <if test="et.primaryReasonDescription!=null">PRIMARY_REASON_DESCRIPTION=#{et.primaryReasonDescription},</if>
+        <if test="et.precautionMeasureDescription!=null">PRECAUTION_MEASURE_DESCRIPTION=#{et.precautionMeasureDescription},</if>
         <if test="et.remark!=null">REMARK=#{et.remark},</if>
         <if test="et.other!=null">OTHER=#{et.other},</if>
         <if test="et.another!=null">ANOTHER=#{et.another},</if>
@@ -525,13 +749,14 @@
                     HANDLE=#{ew.entity.handle}
                     <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
                     <if test="ew.entity.repairNo!=null"> AND REPAIR_NO=#{ew.entity.repairNo}</if>
+                    <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
                     <if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
-                    <if test="ew.entity.resourceBo!=null"> AND RESOURCE_BO=#{ew.entity.resourceBo}</if>
-                    <if test="ew.entity.userNo!=null"> AND USER_NO=#{ew.entity.userNo}</if>
-                    <if test="ew.entity.ncCodeBo!=null"> AND NC_CODE_BO=#{ew.entity.ncCodeBo}</if>
+                    <if test="ew.entity.resourceNo!=null"> AND RESOURCE_NO=#{ew.entity.resourceNo}</if>
+                    <if test="ew.entity.reportUser!=null"> AND REPORT_USER=#{ew.entity.reportUser}</if>
+                    <if test="ew.entity.ncCodeNo!=null"> AND NC_CODE_NO=#{ew.entity.ncCodeNo}</if>
                     <if test="ew.entity.repairType!=null"> AND REPAIR_TYPE=#{ew.entity.repairType}</if>
                     <if test="ew.entity.stopMachine!=null"> AND STOP_MACHINE=#{ew.entity.stopMachine}</if>
-                    <if test="ew.entity.ncDescription!=null"> AND NC_DESCRIPTION=#{ew.entity.ncDescription}</if>
+                    <if test="ew.entity.breakDownDescription!=null"> AND BREAK_DOWN_DESCRIPTION=#{ew.entity.breakDownDescription}</if>
                     <if test="ew.entity.findLink!=null"> AND FIND_LINK=#{ew.entity.findLink}</if>
                     <if test="ew.entity.reportSource!=null"> AND REPORT_SOURCE=#{ew.entity.reportSource}</if>
                     <if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if>
@@ -539,6 +764,21 @@
                     <if test="ew.entity.planCompleteDate!=null"> AND PLAN_COMPLETE_DATE=#{ew.entity.planCompleteDate}</if>
                     <if test="ew.entity.actualStartDate!=null"> AND ACTUAL_START_DATE=#{ew.entity.actualStartDate}</if>
                     <if test="ew.entity.actualCompleteDate!=null"> AND ACTUAL_COMPLETE_DATE=#{ew.entity.actualCompleteDate}</if>
+                    <if test="ew.entity.repairUsers!=null"> AND REPAIR_USERS=#{ew.entity.repairUsers}</if>
+                    <if test="ew.entity.cancelCode!=null"> AND CANCEL_CODE=#{ew.entity.cancelCode}</if>
+                    <if test="ew.entity.cancelDate!=null"> AND CANCEL_DATE=#{ew.entity.cancelDate}</if>
+                    <if test="ew.entity.cancelDescription!=null"> AND CANCEL_DESCRIPTION=#{ew.entity.cancelDescription}</if>
+                    <if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if>
+                    <if test="ew.entity.dealWay!=null"> AND DEAL_WAY=#{ew.entity.dealWay}</if>
+                    <if test="ew.entity.preliminaryReason!=null"> AND PRELIMINARY_REASON=#{ew.entity.preliminaryReason}</if>
+                    <if test="ew.entity.dealWayDescription!=null"> AND DEAL_WAY_DESCRIPTION=#{ew.entity.dealWayDescription}</if>
+                    <if test="ew.entity.waitTime!=null"> AND WAIT_TIME=#{ew.entity.waitTime}</if>
+                    <if test="ew.entity.waitStartDate!=null"> AND WAIT_START_DATE=#{ew.entity.waitStartDate}</if>
+                    <if test="ew.entity.waitEndDate!=null"> AND WAIT_END_DATE=#{ew.entity.waitEndDate}</if>
+                    <if test="ew.entity.waitDescription!=null"> AND WAIT_DESCRIPTION=#{ew.entity.waitDescription}</if>
+                    <if test="ew.entity.primaryReason!=null"> AND PRIMARY_REASON=#{ew.entity.primaryReason}</if>
+                    <if test="ew.entity.primaryReasonDescription!=null"> AND PRIMARY_REASON_DESCRIPTION=#{ew.entity.primaryReasonDescription}</if>
+                    <if test="ew.entity.precautionMeasureDescription!=null"> AND PRECAUTION_MEASURE_DESCRIPTION=#{ew.entity.precautionMeasureDescription}</if>
                     <if test="ew.entity.remark!=null"> AND REMARK=#{ew.entity.remark}</if>
                     <if test="ew.entity.other!=null"> AND OTHER=#{ew.entity.other}</if>
                     <if test="ew.entity.another!=null"> AND ANOTHER=#{ew.entity.another}</if>
@@ -584,13 +824,14 @@
                     </if>
                     <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
                     <if test="ew.entity.repairNo!=null"> AND REPAIR_NO=#{ew.entity.repairNo}</if>
+                    <if test="ew.entity.description!=null"> AND DESCRIPTION=#{ew.entity.description}</if>
                     <if test="ew.entity.status!=null"> AND STATUS=#{ew.entity.status}</if>
-                    <if test="ew.entity.resourceBo!=null"> AND RESOURCE_BO=#{ew.entity.resourceBo}</if>
-                    <if test="ew.entity.userNo!=null"> AND USER_NO=#{ew.entity.userNo}</if>
-                    <if test="ew.entity.ncCodeBo!=null"> AND NC_CODE_BO=#{ew.entity.ncCodeBo}</if>
+                    <if test="ew.entity.resourceNo!=null"> AND RESOURCE_NO=#{ew.entity.resourceNo}</if>
+                    <if test="ew.entity.reportUser!=null"> AND REPORT_USER=#{ew.entity.reportUser}</if>
+                    <if test="ew.entity.ncCodeNo!=null"> AND NC_CODE_NO=#{ew.entity.ncCodeNo}</if>
                     <if test="ew.entity.repairType!=null"> AND REPAIR_TYPE=#{ew.entity.repairType}</if>
                     <if test="ew.entity.stopMachine!=null"> AND STOP_MACHINE=#{ew.entity.stopMachine}</if>
-                    <if test="ew.entity.ncDescription!=null"> AND NC_DESCRIPTION=#{ew.entity.ncDescription}</if>
+                    <if test="ew.entity.breakDownDescription!=null"> AND BREAK_DOWN_DESCRIPTION=#{ew.entity.breakDownDescription}</if>
                     <if test="ew.entity.findLink!=null"> AND FIND_LINK=#{ew.entity.findLink}</if>
                     <if test="ew.entity.reportSource!=null"> AND REPORT_SOURCE=#{ew.entity.reportSource}</if>
                     <if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if>
@@ -598,6 +839,21 @@
                     <if test="ew.entity.planCompleteDate!=null"> AND PLAN_COMPLETE_DATE=#{ew.entity.planCompleteDate}</if>
                     <if test="ew.entity.actualStartDate!=null"> AND ACTUAL_START_DATE=#{ew.entity.actualStartDate}</if>
                     <if test="ew.entity.actualCompleteDate!=null"> AND ACTUAL_COMPLETE_DATE=#{ew.entity.actualCompleteDate}</if>
+                    <if test="ew.entity.repairUsers!=null"> AND REPAIR_USERS=#{ew.entity.repairUsers}</if>
+                    <if test="ew.entity.cancelCode!=null"> AND CANCEL_CODE=#{ew.entity.cancelCode}</if>
+                    <if test="ew.entity.cancelDate!=null"> AND CANCEL_DATE=#{ew.entity.cancelDate}</if>
+                    <if test="ew.entity.cancelDescription!=null"> AND CANCEL_DESCRIPTION=#{ew.entity.cancelDescription}</if>
+                    <if test="ew.entity.cancelUser!=null"> AND CANCEL_USER=#{ew.entity.cancelUser}</if>
+                    <if test="ew.entity.dealWay!=null"> AND DEAL_WAY=#{ew.entity.dealWay}</if>
+                    <if test="ew.entity.preliminaryReason!=null"> AND PRELIMINARY_REASON=#{ew.entity.preliminaryReason}</if>
+                    <if test="ew.entity.dealWayDescription!=null"> AND DEAL_WAY_DESCRIPTION=#{ew.entity.dealWayDescription}</if>
+                    <if test="ew.entity.waitTime!=null"> AND WAIT_TIME=#{ew.entity.waitTime}</if>
+                    <if test="ew.entity.waitStartDate!=null"> AND WAIT_START_DATE=#{ew.entity.waitStartDate}</if>
+                    <if test="ew.entity.waitEndDate!=null"> AND WAIT_END_DATE=#{ew.entity.waitEndDate}</if>
+                    <if test="ew.entity.waitDescription!=null"> AND WAIT_DESCRIPTION=#{ew.entity.waitDescription}</if>
+                    <if test="ew.entity.primaryReason!=null"> AND PRIMARY_REASON=#{ew.entity.primaryReason}</if>
+                    <if test="ew.entity.primaryReasonDescription!=null"> AND PRIMARY_REASON_DESCRIPTION=#{ew.entity.primaryReasonDescription}</if>
+                    <if test="ew.entity.precautionMeasureDescription!=null"> AND PRECAUTION_MEASURE_DESCRIPTION=#{ew.entity.precautionMeasureDescription}</if>
                     <if test="ew.entity.remark!=null"> AND REMARK=#{ew.entity.remark}</if>
                     <if test="ew.entity.other!=null"> AND OTHER=#{ew.entity.other}</if>
                     <if test="ew.entity.another!=null"> AND ANOTHER=#{ew.entity.another}</if>
@@ -623,4 +879,65 @@
     </delete>
     <!-- BaseMapper标准查询/修改/删除 -->
 
+    <!--自定义sql-->
+        <!--批量获取维修任务-->
+    <select id="findResourceRepairTaskList" resultType="com.foreverwin.mesnac.equip.model.ResourceRepairTask">
+        SELECT RRT.*,R.DESCRIPTION AS RESOURCE_DESCRIPTION,R.RESRCE AS RESOURCE_NO,
+        NCT.DESCRIPTION AS NC_CODE_DESCRIPTION,WCT.DESCRIPTION AS WORK_CENTER_DESCRIPTION
+        FROM
+        WIP.Z_RESOURCE_REPAIR_TASK RRT
+        LEFT JOIN WIP.RESRCE R ON R.RESRCE = RRT.RESOURCE_NO
+        LEFT JOIN WIP.NC_CODE NC ON NC.NC_CODE = RRT.NC_CODE_NO
+        LEFT JOIN WIP.NC_CODE_T NCT ON NCT.NC_CODE_BO = NC.HANDLE
+        LEFT JOIN WIP.WORK_CENTER_MEMBER WCM ON WCM.WORK_CENTER_OR_RESOURCE_GBO = R.HANDLE
+        LEFT JOIN WIP.WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WCM.WORK_CENTER_BO
+        INNER JOIN WIP.RESOURCE_TYPE_RESOURCE RTR ON RTR.RESOURCE_BO = R.HANDLE
+        WHERE RRT.SITE = #{site} AND R.SITE = #{site} AND NC.SITE = #{site}
+        <if test="resourceBo != null and resourceBo != ''">
+            AND RRT.RESOURCE_BO = #{resourceBo}
+        </if>
+        <if test="resourceTypeBo != null and resourceTypeBo != ''">
+            AND RTR.RESOURCE_TYPE_BO = #{resourceTypeBo}
+        </if>
+        <if test="repairNo != null and repairNo != ''">
+            AND RRT.REPAIR_NO = #{repairNo}
+        </if>
+        <if test="status != null and status != ''">
+            AND RRT.STATUS = #{status}
+        </if>
+        <if test="workCenterBo != null and workCenterBo != ''">
+            AND WCM.WORK_CENTER_BO = #{workCenterBo}
+        </if>
+        <if test="resourceTypeBo != null and resourceTypeBo != ''">
+            AND RTR.RESOURCE_TYPE_BO = #{resourceTypeBo}
+        </if>
+        <if test="reportSource != null and reportSource != ''">
+            AND RRT.REPORT_SOURCE = #{reportSource}
+        </if>
+        <if test="compareStartTime != null and compareStartTime != ''">
+            AND RRT.PLAN_START_DATE &gt; #{compareStartTime}
+        </if>
+        <if test="compareEndTime != null and compareEndTime != ''">
+            AND RRT.PLAN_START_DATE &lt; #{compareEndTime}
+        </if>
+    </select>
+        <!--根据维修任务HANDLE获取维修任务详细数据-->
+    <select id="findResourceRepairTaskByHandleAndSite" resultType="com.foreverwin.mesnac.equip.model.ResourceRepairTask">
+        SELECT RRT.*,R.DESCRIPTION AS RESOURCE_DESCRIPTION,R.RESRCE AS RESOURCE_NO,
+        NCT.DESCRIPTION AS NC_CODE_DESCRIPTION,WCT.DESCRIPTION AS WORK_CENTER_DESCRIPTION
+        FROM
+        WIP.Z_RESOURCE_REPAIR_TASK RRT
+        LEFT JOIN WIP.RESRCE R ON R.RESRCE = RRT.RESOURCE_NO
+        LEFT JOIN WIP.NC_CODE NC ON NC.NC_CODE = RRT.NC_CODE_NO
+        LEFT JOIN WIP.NC_CODE_T NCT ON NCT.NC_CODE_BO = NC.HANDLE
+        LEFT JOIN WIP.WORK_CENTER_MEMBER WCM ON WCM.WORK_CENTER_OR_RESOURCE_GBO = R.HANDLE
+        LEFT JOIN WIP.WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WCM.WORK_CENTER_BO
+        INNER JOIN WIP.RESOURCE_TYPE_RESOURCE RTR ON RTR.RESOURCE_BO = R.HANDLE
+        WHERE RRT.SITE = #{site} AND RRT.HANDLE = #{handle}
+          AND R.SITE = #{site} AND NC.SITE = #{site}
+    </select>
+
+    <!--自定义sql-->
+
+
 </mapper>

meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ResrceService.java

@@ -47,4 +47,10 @@ public interface ResrceService extends IService<Resrce> {
     Resrce findByResrce(String resrce);
 
     List<Resrce> findAllResrce();
+
+    /**
+     * 仅修改设备状态
+     */
+    void updateResourceStatusByHandle(String handle,String status);
+
 }

meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ResrceServiceImpl.java

@@ -68,5 +68,12 @@ public class ResrceServiceImpl extends ServiceImpl<ResrceMapper, Resrce> 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);
+    }
+
 
 }