From 0fd94d8aef3d3dbe5aa88d853ef68ef34a2d567f Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Fri, 30 May 2025 17:17:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8A=A5=E4=BF=AE=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E9=BB=98=E8=AE=A4=E5=AE=A1=E6=A0=B8=E5=AE=8C=E6=88=90?= =?UTF-8?q?=EF=BC=8C=E6=8A=A5=E4=BF=AE=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E3=80=81=E8=AE=BE=E5=A4=87=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/device/domain/EquRepairOrder.java | 11 ++++- .../op/device/domain/EquRepairWorkOrder.java | 9 +++++ .../service/impl/DevicePDAServiceImpl.java | 4 +- .../mapper/device/EquRepairOrderMapper.xml | 40 +++++++++++++++++-- .../device/EquRepairWorkOrderMapper.xml | 3 ++ .../op/open/service/impl/OpenServiceImpl.java | 2 +- 6 files changed, 61 insertions(+), 8 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairOrder.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairOrder.java index 7cd6a3124..a408691fc 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairOrder.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairOrder.java @@ -268,9 +268,18 @@ public class EquRepairOrder extends BaseEntity { //报修开始时间、结束时间 private String orderTimeStart; private String orderTimeEnd; - + private String bindEquipmentName; private Equipment equipment; + + public String getBindEquipmentName() { + return bindEquipmentName; + } + + public void setBindEquipmentName(String bindEquipmentName) { + this.bindEquipmentName = bindEquipmentName; + } + public Equipment getEquipment() { return equipment; } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java index 8f4f4ab82..5be2466c6 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java @@ -147,6 +147,7 @@ public class EquRepairWorkOrder extends BaseEntity { /////////////////////////////////////////////////////////设备表字段 @Excel(name = "设备名称") private String equipmentName;//设备名称 + private String bindEquipmentName; private String equipmentSpec;//规格型号 private String equipmentTypeName;//设备类型名称 private String equipmentLocation;//设备位置 @@ -208,6 +209,14 @@ public class EquRepairWorkOrder extends BaseEntity { private String fileList; private List files; + public String getBindEquipmentName() { + return bindEquipmentName; + } + + public void setBindEquipmentName(String bindEquipmentName) { + this.bindEquipmentName = bindEquipmentName; + } + //维修前 维修后 public String getAfterRepairFile() { return afterRepairFile; diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java index 0ab818a44..970533937 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java @@ -405,7 +405,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService { if (equOrder.getPlanType().equals("maintenance")) { equRepairOrder.setOrderSource("保养"); } - equRepairOrder.setOrderStatus("2"); + equRepairOrder.setOrderStatus("1"); HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String key = "#header.poolName"; equRepairOrder.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_", "")); @@ -576,7 +576,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService { equRepairOrder.setCreateBy(SecurityUtils.getUsername()); equRepairOrder.setOrderRepairmanCode(SecurityUtils.getUsername()); equRepairOrder.setOrderTime(DateUtils.getNowDate()); - equRepairOrder.setOrderStatus("2"); + equRepairOrder.setOrderStatus("1"); equRepairOrder.setOrderSource("手持PDA"); HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String key = "#header.poolName"; diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml index e06753d1d..3b65845fe 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml @@ -34,6 +34,7 @@ + @@ -76,8 +77,39 @@ - select order_id, order_code, equipment_code, order_desc, order_breakdown_time, order_source, order_time, order_handle, order_repairman_code,order_repairman_name, order_connection, order_status, order_relevance, order_picture, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time,factory_code,repair_destination,audit_opinion from equ_repair_order - + SELECT + order_id, + order_code, + ero.equipment_code, + be.equipment_name as equipment_name, + ebae.equipment_name as bind_equipment_name, + order_desc, + order_breakdown_time, + order_source, + order_time, + order_handle, + order_repairman_code, + order_repairman_name, + order_connection, + order_status, + order_relevance, + order_picture, + ero.attr1, + ero.attr2, + ero.attr3, + ero.del_flag, + ero.create_by, + ero.create_time, + ero.update_by, + ero.update_time, + ero.factory_code, + repair_destination, + audit_opinion + FROM + equ_repair_order ero + LEFT JOIN base_equipment be ON be.equipment_code = ero.equipment_code + LEFT JOIN equ_bind_auxiliary_equipment ebae ON ebae.auxiliary_equipment_code = be.equipment_code + diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml index 5d480a869..1a8f76823 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml @@ -51,6 +51,7 @@ + @@ -112,6 +113,7 @@ erwo.work_outsource, erwo.work_down_machine, erwo.equipment_code, + ebae.equipment_name as bind_equipment_name, erwo.work_reason, erwo.work_fault_desc, erwo.work_start_time, @@ -147,6 +149,7 @@ from equ_repair_work_order erwo left join base_equipment be on erwo.equipment_code = be.equipment_code left join equ_team et on erwo.work_team = et.team_code + LEFT JOIN equ_bind_auxiliary_equipment ebae ON ebae.auxiliary_equipment_code = erwo.equipment_code and ( erwo.result_inspect = '2' or erwo.result_inspect = '1') diff --git a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java index 806297dc0..e698dea2d 100644 --- a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java +++ b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java @@ -310,7 +310,7 @@ public class OpenServiceImpl implements OpenService { } equRepairOrder.setCreateTime(DateUtils.getNowDate()); equRepairOrder.setCreateBy(equRepairOrderDTO.getUserName()); - equRepairOrder.setOrderStatus("2"); // 报修单状态 + equRepairOrder.setOrderStatus("1"); // 报修单状态 equRepairOrder.setFactoryCode(equRepairOrderDTO.getFactory()); // 工厂 if (equRepairOrderDTO.getPhoneNumber() != null) { equRepairOrder.setOrderConnection(equRepairOrderDTO.getPhoneNumber()); // 联系方式