From 2f48dfba53fed32d722af0ac8f510aae5c9b0ca7 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Mon, 4 Dec 2023 17:49:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E4=BF=AE+=E7=BB=B4=E4=BF=AE+=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=8F=AD=E7=BB=84+=E5=A7=94=E5=A4=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/op/device/domain/EquOrder.java | 11 +++++++++++ .../op/device/mapper/EquOrderStandardMapper.java | 4 ++-- .../device/service/impl/DevicePDAServiceImpl.java | 14 ++++++++------ .../service/impl/EquRepairOrderServiceImpl.java | 3 ++- .../impl/EquRepairWorkOrderServiceImpl.java | 3 ++- .../resources/mapper/device/EquOrderMapper.xml | 12 +++++++++--- .../mapper/device/EquOrderStandardMapper.xml | 7 +++++-- 7 files changed, 39 insertions(+), 15 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java index 3a9e700d..9d56f45c 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java @@ -207,6 +207,9 @@ public class EquOrder extends BaseEntity { private String picturePath; + //工具 + private String itemTools; + public String getPicturePath() { return picturePath; } @@ -663,6 +666,14 @@ public class EquOrder extends BaseEntity { return itemTypeName; } + //工具 + public String getItemTools() { + return itemTools; + } + public void setItemTools(String itemTools) { + this.itemTools = itemTools; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderStandardMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderStandardMapper.java index 41308b97..b04c8f74 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderStandardMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderStandardMapper.java @@ -79,12 +79,12 @@ public interface EquOrderStandardMapper { /** * 删除图片 */ - void deleteBaseFileBySourceId(String id); + void deleteBaseFileBySourceId(@Param("sourceId")String sourceId , @Param("imageType")String imageType); /** * 查询图片 */ - public List getBaseFileBatch(String id); + public List getBaseFileBatch(@Param("sourceId")String sourceId , @Param("imageType")String imageType); //PC查询点检巡检报修 List selectPdaEquOrderList(EquOrderStandard equOrderStandard); 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 00b38dca..3d1f7da5 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 @@ -620,7 +620,8 @@ public class DevicePDAServiceImpl implements IDevicePDAService { List standardLists = equOrderStandardMapper.selectPdaEquOrderList(equOrderStandard); for (EquOrderStandard standardList : standardLists) { //每个检查标准里面的照片 - List files = equOrderStandardMapper.getBaseFileBatch(standardList.getId()); + String imageType = "4"; + List files = equOrderStandardMapper.getBaseFileBatch(standardList.getId(),imageType); if (!CollectionUtils.isEmpty(files)) { standardList.setPicturePaths(files); } @@ -658,7 +659,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService { @Override @DS("#header.poolName") public AjaxResult updateMaintenanceRecords(EquRepairWorkOrder equRepairWorkOrder) { - try { +// try { //判断是否停机 EquRepairWorkOrder list = equRepairWorkOrderMapper.selectEquRepairWorkOrderByWorkId(equRepairWorkOrder.getWorkId()); if (list.getWorkDownMachine().equals("1")) { @@ -678,7 +679,8 @@ public class DevicePDAServiceImpl implements IDevicePDAService { List standardLists = checkList.getStandardList(); for (EquOrderStandard standardList : standardLists) { //先删除每个检查项标准图片 - equOrderStandardMapper.deleteBaseFileBySourceId(standardList.getId()); + String imageType = "4"; + equOrderStandardMapper.deleteBaseFileBySourceId(standardList.getId(),imageType); //图片批量新增 if (StringUtils.isNotEmpty(standardList.getPicturePath())) { String[] ids = standardList.getPicturePath().split(","); @@ -793,9 +795,9 @@ public class DevicePDAServiceImpl implements IDevicePDAService { equRepairWorkOrderMapper.updateEquipmentStatus(equEquipment); return success("提交成功，维修完成！"); - } catch (Exception e) { - return error("提交失败！"); - } +// } catch (Exception e) { +// return error("提交失败！"); +// } } /** diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java index e970b796..dfb15f3b 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java @@ -81,7 +81,8 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService { List standardLists = equOrderStandardMapper.selectPdaEquOrderList(equOrderStandard); for(EquOrderStandard standardList :standardLists){ //每个检查标准里面的照片 - List file = equOrderStandardMapper.getBaseFileBatch(standardList.getId()); + String imageType = "3"; + List file = equOrderStandardMapper.getBaseFileBatch(standardList.getId(),imageType); if (!CollectionUtils.isEmpty(file)) { standardList.setPicturePaths(file); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java index 790412b6..076051d4 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java @@ -77,7 +77,8 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService List standardLists = equOrderStandardMapper.selectPdaEquOrderList(equOrderStandard); for(EquOrderStandard standardList :standardLists){ //每个检查标准里面的照片 - List files = equOrderStandardMapper.getBaseFileBatch(standardList.getId()); + String imageType = "4"; + List files = equOrderStandardMapper.getBaseFileBatch(standardList.getId(),imageType); if (!CollectionUtils.isEmpty(files)) { standardList.setPicturePaths(files); } diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml index 05011613..3a437cbd 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml @@ -45,6 +45,7 @@ + @@ -300,11 +301,14 @@ eo.order_code, eo.repair_code, eo.work_code, + eo.plan_loop, + eo.plan_loop_type, eod.id, eod.item_name, eod.item_method, eod.item_type, - eod.item_type_name + eod.item_type_name, + eod.item_tools from equ_order eo left join equ_order_detail eod on eo.order_code = eod.order_code where eo.work_code = #{workCode} @@ -318,18 +322,20 @@ eo.order_code, eo.repair_code, eo.work_code, + eo.plan_loop, + eo.plan_loop_type, eod.id, eod.item_name, eod.item_method, eod.item_type, - eod.item_type_name + eod.item_type_name, + eod.item_tools from equ_order eo left join equ_order_detail eod on eo.order_code = eod.order_code where eo.repair_code = #{repairCode} and eo.del_flag = '0' - where source_id = #{sourceId} + and image_type = #{imageType}