From a7cd7d7605a4e1b2cc29dc37092aae78172dd5c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com> Date: Mon, 4 Aug 2025 09:38:49 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2TPM?= =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=B7=A5=E5=8D=95=E7=A1=AE=E8=AE=A4=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=9D=83=E9=99=90=E7=9A=84=E4=BA=BA=E5=91=98=E5=88=97?= =?UTF-8?q?=E8=A1=A8=202=EF=BC=8C=E7=BB=B4=E4=BF=AE=E5=8F=8D=E9=A6=88?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=E6=9F=A5=E9=87=8D=EF=BC=8C=E5=85=81?= =?UTF-8?q?=E8=AE=B8=E7=BB=B4=E4=BF=AE=E7=B1=BB=E5=9E=8B=E5=8C=BA=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/modules/pms/controller/EamController.java | 9 +++++++++ .../com/xujie/sys/modules/pms/mapper/EamMapper.java | 2 ++ .../com/xujie/sys/modules/pms/service/EamService.java | 2 ++ .../sys/modules/pms/service/Impl/EamServiceImpl.java | 7 +++++++ src/main/resources/mapper/pms/EamMapper.xml | 10 +++++++++- 5 files changed, 29 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java b/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java index b9d09259..4293fadf 100644 --- a/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java +++ b/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java @@ -2181,6 +2181,15 @@ public class EamController { return R.ok().put("rows", list); } + /** + * 获取维修工单确认按钮角色 人员列表 + */ + @PostMapping("/getConfirmButtonOperator") + public R getConfirmButtonOperator(){ + List list = eamService.getConfirmButtonOperator(); + return R.ok().put("rows", list); + } + /** * 获取反馈单号 */ diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java index 1c478ab3..56c3a1a7 100644 --- a/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java +++ b/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java @@ -499,4 +499,6 @@ public interface EamMapper { void updateEamDefectFeedBackPlanOperator(EamDefectFeedBackInData inData); void deleteCoreComponents(EamWorkOrderCoreComponentsData inData); + + List getConfirmButtonOperator(); } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/EamService.java b/src/main/java/com/xujie/sys/modules/pms/service/EamService.java index 779351f8..5a93f25c 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/EamService.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/EamService.java @@ -1192,4 +1192,6 @@ public interface EamService { void updateEamDefectFeedBackPlanOperator(EamDefectFeedBackInData inData); void deleteCoreComponents(EamWorkOrderCoreComponentsData inData); + + List getConfirmButtonOperator(); } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java index 1048739a..ae2c7d6b 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java @@ -3042,6 +3042,7 @@ public class EamServiceImpl implements EamService { searchParam.setBuNo(inData.getBuNo()); searchParam.setObjectInfo(inData.getObjectID()); searchParam.setDefectInfo(inData.getDefectID()); + searchParam.setRepairType(inData.getRepairType()); List eamGzData = eamMapper.getEamGzData(searchParam); if (!eamGzData.isEmpty() && !eamGzData.get(0).getPublicFacilitiesFlag().equals("Y") && ("已录入".equalsIgnoreCase(eamGzData.get(0).getStatus()) || "已下达".equalsIgnoreCase(eamGzData.get(0).getStatus()))){ @@ -3960,6 +3961,12 @@ public class EamServiceImpl implements EamService { eamMapper.deleteCoreComponents(inData); } + @Override + public List getConfirmButtonOperator() { + List list = eamMapper.getConfirmButtonOperator(); + return list; + } + /** * 员工考勤vs报工工时 */ diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml index c16f8e34..ff2fff40 100644 --- a/src/main/resources/mapper/pms/EamMapper.xml +++ b/src/main/resources/mapper/pms/EamMapper.xml @@ -2490,7 +2490,7 @@ left join eam_defect b on a.DefectID = b.DefectID left join eam_object c on a.ObjectID = c.ObjectID and a.site = c.site and a.bu_no = c.bu_no - a.site = #{site} and a.deleteFlag = 'N' and a.bu_no = #{buNo} + a.site = #{site} and a.deleteFlag = 'N' and a.bu_no = #{buNo} and a.repair_type = #{repairType} AND a.FeedBackID LIKE '%' + #{feedBackID}+'%' @@ -3769,4 +3769,12 @@ rs.site = #{site} and rs.bu_no = #{buNo} and rs.resource_id = #{objectID} and rs.part_no = #{partNo} and ps.coreFlag = 'Y' +