From 62e61258b99683bf31d2dd49b606c3dca30085ba Mon Sep 17 00:00:00 2001 From: zpl Date: Fri, 13 Aug 2021 09:41:25 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=82=B9=E6=A3=80=E3=80=81?= =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E7=94=A8=E6=88=B7=E5=90=8D=E7=A7=B0=E3=80=81?= =?UTF-8?q?=E4=B8=8D=E8=89=AF=E6=8F=8F=E8=BF=B0=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/common/constant/Constants.java | 8 ++++++++ .../mesnac/equip/dto/ResourceInspectTaskDto.java | 10 ++++++++++ .../mesnac/equip/model/ResourceRepairTask.java | 12 ++++++++++++ .../impl/ResourceRepairTaskServiceImpl.java | 15 +++++++-------- .../mapper/ResourceInspectTaskMapper.xml | 3 ++- .../resources/mapper/ResourceRepairTaskMapper.xml | 3 ++- 6 files changed, 41 insertions(+), 10 deletions(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java b/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java index d74e4366..40ba9000 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java +++ b/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"; //正常损坏 diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/dto/ResourceInspectTaskDto.java b/equip/src/main/java/com/foreverwin/mesnac/equip/dto/ResourceInspectTaskDto.java index 387878fe..17124e2a 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/dto/ResourceInspectTaskDto.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/dto/ResourceInspectTaskDto.java @@ -90,6 +90,16 @@ public class ResourceInspectTaskDto implements Serializable { private List taskItemDetailList; /**消耗备品**/ private List spareList; + /**用户名称**/ + private String fullName; + + public String getFullName() { + return fullName; + } + + public void setFullName(String fullName) { + this.fullName = fullName; + } public Integer getItemSeq() { return itemSeq; diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceRepairTask.java b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceRepairTask.java index ea5734e0..4870d081 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceRepairTask.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceRepairTask.java @@ -297,7 +297,19 @@ public class ResourceRepairTask extends Model { */ @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 getSpareList() { return spareList; diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java index 7cb7608f..e33fb29d 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java +++ b/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 ncCodeDescriptionByNcCode = ncCodeService.findNcCodeDescriptionByNcCode(ncCodeNo); + StringBuffer ncCodeDescription = new StringBuffer(""); + for (NcCodeDto ncCode:ncCodeDescriptionByNcCode) { + ncCodeDescription.append(ncCode.getDescription()).append(";"); + } + resourceRepairTask.setOther(ncCodeDescription.toString()); } - /* Collection collection = new ArrayList<>(); - for (int i = 0; i < ncSplit.length; i++) { - collection.add(HandleEnum.NC_CODE.getHandle(site,ncSplit[i])); - } - Collection ncCodes = ncCodeService.listByIds(collection); - if ( ncCodes.size() != ncSplit.length ){ - throw BusinessException.build("不良代码错误！！！"); - }*/ // 维修单号、维修HANDLE List nextNumber = nextNumberHelper.getNextNumber(site, Constants.RESOURCE_REPAIR_TASK, 1); resourceRepairTask.setRepairNo(nextNumber.get(0)); diff --git a/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml b/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml index 8543588c..c630b32d 100644 --- a/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml +++ b/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml @@ -643,11 +643,12 @@ - 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