From cd608005f75330ed933f4d4e618d9cf8c2764ee3 Mon Sep 17 00:00:00 2001 From: jiayang yue Date: Tue, 3 Jun 2025 12:10:39 +0800 Subject: [PATCH] =?UTF-8?q?2025.06.03=201=E3=80=81=09=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=EF=BC=9A100613=20=20=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=9A=E7=BB=B4=E4=BF=AE=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=20=20=20=20=20=20=20=20=20=20=20=20=E7=9B=AE=E5=89=8D?= =?UTF-8?q?=E6=8D=A2=E7=BA=BF=E4=B8=93=E5=AE=B6=E7=BB=84=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E3=80=81=E8=AE=BE=E5=A4=87=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E7=BB=84=E7=BB=B4=E4=BF=AE=E5=B7=A5=E5=8D=95=E9=83=BD=E6=9C=89?= =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E8=AE=B0=E5=BD=95=E5=8A=9F=E8=83=BD=202?= =?UTF-8?q?=E3=80=81=09=E9=97=AE=E9=A2=98=E7=BC=96=E5=8F=B7=EF=BC=9A200029?= =?UTF-8?q?=20=20=E9=97=AE=E9=A2=98=E6=8F=8F=E8=BF=B0=EF=BC=9A=E7=BB=B4?= =?UTF-8?q?=E4=BF=9D=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95=E9=87=8C=E7=9A=84?= =?UTF-8?q?=E7=BB=B4=E4=BF=9D=E9=A1=B9=E7=9B=AE=E5=8F=AF=E4=BB=A5=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=8E=92=E5=BA=8F=EF=BC=8C=E4=BF=9D=E5=85=BB?= =?UTF-8?q?=E6=96=B9=E4=BE=BF=20=E7=BB=B4=E4=BF=9D=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E9=87=8C=E7=9A=84=E7=BB=B4=E4=BF=9D=E9=A1=B9=E7=9B=AE=E7=9B=AE?= =?UTF-8?q?=E5=89=8D=E4=B8=8D=E5=8F=AF=E4=BB=A5=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=EF=BC=8C=E7=82=B9=E6=A3=80=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E9=87=8C=E7=9A=84=E7=82=B9=E6=A3=80=E9=A1=B9=E7=9B=AE=E5=90=8C?= =?UTF-8?q?=E7=90=86=EF=BC=8C=E5=8F=AF=E4=BB=A5=E5=8F=82=E8=80=83QMS?= =?UTF-8?q?=E9=87=8C=E7=9A=84=E6=A3=80=E9=AA=8C=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/pms/controller/EamController.java | 31 +++++++++ .../data/EamPropertiesModelDetailData.java | 10 +++ .../sys/modules/pms/mapper/EamMapper.java | 8 +++ .../sys/modules/pms/service/EamService.java | 4 ++ .../pms/service/Impl/EamServiceImpl.java | 27 ++++++++ src/main/resources/mapper/pms/EamMapper.xml | 69 +++++++++++++++++-- 6 files changed, 145 insertions(+), 4 deletions(-) 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 79efe359..bc74b322 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 @@ -2433,4 +2433,35 @@ public class EamController { eamService.updateRepairTypes(list); return R.ok(); } + + /** + * @Description 属性上移 + * @Title goUpItemEam + * @param inData + * @author yjy + * @date 2025/05/30 16:20 + * @return R + * @throw + */ + @PostMapping("/goUpItemEam") + @ResponseBody + public R goUpItemEam(@RequestBody EamPropertiesModelDetailData inData){ + eamService.goUpItem(inData); + return R.ok(); + } + /** + * @Description 属性下移 + * @Title goDownItemEam + * @param inData + * @author yjy + * @date 2025/05/30 16:20 + * @return R + * @throw + */ + @PostMapping("/goDownItemEam") + @ResponseBody + public R goDownItemEam(@RequestBody EamPropertiesModelDetailData inData){ + eamService.goDownItem(inData); + return R.ok(); + } } diff --git a/src/main/java/com/xujie/sys/modules/pms/data/EamPropertiesModelDetailData.java b/src/main/java/com/xujie/sys/modules/pms/data/EamPropertiesModelDetailData.java index fa54f1cf..98bea2b0 100644 --- a/src/main/java/com/xujie/sys/modules/pms/data/EamPropertiesModelDetailData.java +++ b/src/main/java/com/xujie/sys/modules/pms/data/EamPropertiesModelDetailData.java @@ -54,6 +54,8 @@ public class EamPropertiesModelDetailData { private String buDesc; private String checkType; + private Integer orderId; + public String getCheckType() { return checkType; } @@ -277,5 +279,13 @@ public class EamPropertiesModelDetailData { public void setSite(String site) { this.site = site; } + + public Integer getOrderId() { + return orderId; + } + + public void setOrderId(Integer orderId) { + this.orderId = orderId; + } } 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 a6bd0aea..54e938f2 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 @@ -479,4 +479,12 @@ public interface EamMapper { void updateMessageNotification(EamWorkOrderInData inData); void updateRepairTypes(EamWorkOrderInData inData); + + Integer getOrderId(EamPropertiesModelDetailData inData); + + EamPropertiesModelDetailData getUpItemdataEam(EamPropertiesModelDetailData inData); + + EamPropertiesModelDetailData getDownItemdataEam(EamPropertiesModelDetailData inData); + + void updateEamItemOrder(EamPropertiesModelDetailData inData); } 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 29d65a6f..07ae4b80 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 @@ -1180,4 +1180,8 @@ public interface EamService { void sendThreeColourLight(); void updateRepairTypes(List list); + + void goUpItem(EamPropertiesModelDetailData inData); + + void goDownItem(EamPropertiesModelDetailData inData); } 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 a2ee1f23..f7b4732a 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 @@ -904,6 +904,7 @@ public class EamServiceImpl implements EamService { itemDate.setCodeNo(inData.getCodeNo()); itemDate.setUserId(inData.getUserId()); itemDate.setCheckType(inData.getCheckType()); + itemDate.setOrderId(eamMapper.getOrderId(inData)); List checkDetail = eamMapper.checkModalDetails(itemDate); if (!checkDetail.isEmpty()) { if("A".equals(inData.getFunctionType()) || "B".equals(inData.getFunctionType())) { @@ -3779,6 +3780,32 @@ public class EamServiceImpl implements EamService { }); } + @Override + public void goUpItem(EamPropertiesModelDetailData inData) { + EamPropertiesModelDetailData checkData = eamMapper.getUpItemdataEam(inData); + if (checkData == null) { + throw new RuntimeException("XXX");//如果是第一个 那么不执行 随便给个提示 前端不显示 + } + Integer number = inData.getOrderId(); + inData.setOrderId(checkData.getOrderId()); + checkData.setOrderId(number); + eamMapper.updateEamItemOrder(inData); + eamMapper.updateEamItemOrder(checkData); + } + + @Override + public void goDownItem(EamPropertiesModelDetailData inData) { + EamPropertiesModelDetailData checkData = eamMapper.getDownItemdataEam(inData); + if (checkData == null) { + throw new RuntimeException("XXX");//如果是最后一个 那么不执行 随便给个提示 前端不显示 + } + Integer number = inData.getOrderId(); + inData.setOrderId(checkData.getOrderId()); + checkData.setOrderId(number); + eamMapper.updateEamItemOrder(inData); + eamMapper.updateEamItemOrder(checkData); + } + public Long calculateFutureTime(Date lastTime,String minutes) { Calendar calendar = Calendar.getInstance(); calendar.setTime(lastTime); diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml index 8896f8df..7369cbd3 100644 --- a/src/main/resources/mapper/pms/EamMapper.xml +++ b/src/main/resources/mapper/pms/EamMapper.xml @@ -442,10 +442,11 @@ b.MinValue, b.ItemRemark, b.ItemType, - a.check_type + a.check_type,a.order_id FROM eam_properties_model_detail a left join eam_properties_item b on a.function_type = b.itemType and a.properties_item_no = b.itemNo and a.site = b.site and a.bu_no = b.bu_no and a.check_type = b.check_type where a.function_type = #{functionType} and a.code_no = #{codeNo} and a.site = #{site} and a.bu_no = #{buNo} and a.check_type = #{checkType} + order by order_id @@ -3594,6 +3604,14 @@ + update eam_workOrder @@ -3611,4 +3629,47 @@ SET repair_type = #{repairType} WHERE site = #{site} AND bu_no = #{buNo} AND OrderNo = #{orderNo} + + update eam_properties_model_detail + set order_id=#{orderId} + where site = #{site} + and bu_no= #{buNo} + and properties_item_no = #{itemNo} + and code_no = #{codeNo} + and function_type = #{functionType} + + +