设备点检、维修用户名称、不良描述获取

common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java

@@ -128,6 +128,14 @@ public interface Constants {
     /**
      * 设备维修
      */
+    // 维修任务状态
+    String REPAIR_STATUS_NEW = "401"; // 新建/待维修
+    String REPAIR_STATUS_DOING = "501"; // 维修中
+    String REPAIR_STATUS_WAIT = "502"; // 维修等待
+    String REPAIR_STATUS_CLOSE = "302"; // 关闭
+    String REPAIR_STATUS_COMPLETE = "301"; // 维修完成
+    String REPAIR_STATUS_CONFIRM = "601"; // 报修单确认
+
     // 纠正预防-根本原因
     String PRIMARY_BURN_IN = "BI"; //部件老化
     String REASON_BREAK_DOWN = "BD"; //正常损坏

equip/src/main/java/com/foreverwin/mesnac/equip/dto/ResourceInspectTaskDto.java

@@ -90,6 +90,16 @@ public class ResourceInspectTaskDto implements Serializable {
     private List<ResourceInspectTaskParam> taskItemDetailList;
     /**消耗备品**/
     private List<ResourceInspectTaskSpare> spareList;
+    /**用户名称**/
+    private String fullName;
+
+    public String getFullName() {
+        return fullName;
+    }
+
+    public void setFullName(String fullName) {
+        this.fullName = fullName;
+    }
 
     public Integer getItemSeq() {
         return itemSeq;

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

@@ -297,7 +297,19 @@ public class ResourceRepairTask extends Model<ResourceRepairTask> {
     */
    @TableField(exist = false)
    private Integer seq;
+   /**
+    * 提报人名称
+    */
+   @TableField(exist = false)
+   private String reportUserName;
 
+   public String getReportUserName() {
+      return reportUserName;
+   }
+
+   public void setReportUserName(String reportUserName) {
+      this.reportUserName = reportUserName;
+   }
 
    public List<ResourceInspectTaskSpare> getSpareList() {
       return spareList;

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

@@ -5,6 +5,7 @@ import com.foreverwin.mesnac.common.enums.HandleEnum;
 import com.foreverwin.mesnac.common.helper.NextNumberHelper;
 import com.foreverwin.mesnac.equip.model.ResourceInspectTaskSpare;
 import com.foreverwin.mesnac.equip.service.ResourceInspectTaskSpareService;
+import com.foreverwin.mesnac.meapi.dto.NcCodeDto;
 import com.foreverwin.mesnac.meapi.model.NcCode;
 import com.foreverwin.mesnac.meapi.model.NwaUser;
 import com.foreverwin.mesnac.meapi.service.NcCodeService;
@@ -94,16 +95,14 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
                     throw BusinessException.build("不良代码错误！！！");
                 }
             }
+            List<NcCodeDto> ncCodeDescriptionByNcCode = ncCodeService.findNcCodeDescriptionByNcCode(ncCodeNo);
+            StringBuffer ncCodeDescription = new StringBuffer("");
+            for (NcCodeDto ncCode:ncCodeDescriptionByNcCode) {
+                ncCodeDescription.append(ncCode.getDescription()).append(";");
+            }
+            resourceRepairTask.setOther(ncCodeDescription.toString());
         }
 
-       /* Collection<String> collection = new ArrayList<>();
-        for (int i = 0; i < ncSplit.length; i++) {
-            collection.add(HandleEnum.NC_CODE.getHandle(site,ncSplit[i]));
-        }
-        Collection<NcCode> ncCodes = ncCodeService.listByIds(collection);
-        if ( ncCodes.size() != ncSplit.length ){
-            throw BusinessException.build("不良代码错误！！！");
-        }*/
         // 维修单号、维修HANDLE
         List<String> nextNumber = nextNumberHelper.getNextNumber(site, Constants.RESOURCE_REPAIR_TASK, 1);
         resourceRepairTask.setRepairNo(nextNumber.get(0));

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

@@ -643,11 +643,12 @@
 
     <!--自定义sql：模糊查询检验任务所有字段、车间、设备名称等字段-->
     <select id="findResourceInspectTaskList" resultType="com.foreverwin.mesnac.equip.dto.ResourceInspectTaskDto">
-        SELECT DISTINCT RIK.* ,RIP.PLAN_NO AS PLAN_NO ,
+        SELECT DISTINCT RIK.* , ZNU.FULL_NAME, RIP.PLAN_NO AS PLAN_NO ,
         R.RESRCE AS RESOURCE_NO ,R.DESCRIPTION AS RESOURCE_DESCRIPTION ,
         RTR.RESOURCE_TYPE_BO ,RT.RESOURCE_TYPE AS RESOURCE_TYPE_NO ,RT.DESCRIPTION AS RESOURCE_TYPE_DESCRIPTION ,
         WCT.DESCRIPTION AS WORK_CENTER
         FROM Z_RESOURCE_INSPECT_TASK RIK
+        LEFT JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME = RIK.EXECUTOR
         LEFT JOIN Z_INSPECT_PLAN_USER_GROUP ZG ON ZG.RESOURCE_INSPECT_PLAN_BO = RIK.RESOURCE_INSPECT_PLAN_BO
         LEFT JOIN USER_GROUP_MEMBER UGM ON UGM.USER_GROUP_BO = ZG.USER_GROUP_BO
         LEFT JOIN Z_RESOURCE_INSPECT_PLAN RIP ON RIK.RESOURCE_INSPECT_PLAN_BO = RIP.HANDLE

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

@@ -882,11 +882,12 @@
     <!--自定义sql-->
         <!--批量获取维修任务-->
     <select id="findResourceRepairTaskList" resultType="com.foreverwin.mesnac.equip.model.ResourceRepairTask">
-        SELECT DISTINCT RRT.*,R.DESCRIPTION AS RESOURCE_DESCRIPTION,R.RESRCE AS RESOURCE_NO,
+        SELECT DISTINCT RRT.*, ZNU.FULL_NAME AS REPORT_USER_NAME, R.DESCRIPTION AS RESOURCE_DESCRIPTION,R.RESRCE AS RESOURCE_NO,
         WCMA.WORK_CENTER_BO AS WORK_CENTER_BO,
         WCT.DESCRIPTION AS WORK_CENTER_DESCRIPTION
         FROM
         WIP.Z_RESOURCE_REPAIR_TASK RRT
+        LEFT JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME = RRT.REPORT_USER
         INNER JOIN WIP.RESRCE R ON RRT.SITE = R.SITE AND R.RESRCE = RRT.RESOURCE_NO
         LEFT JOIN WIP.WORK_CENTER_MEMBER WCM ON WCM.WORK_CENTER_OR_RESOURCE_GBO = R.HANDLE
         LEFT JOIN WIP.WORK_CENTER_MEMBER WCMA ON WCMA.WORK_CENTER_OR_RESOURCE_GBO = WCM.WORK_CENTER_BO