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 4dcfca2a4..820e0a089 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 @@ -300,13 +300,13 @@ public class EquOrder extends BaseEntity { private List detailList; - private List spareList; + private List spareList; - public List getSpareList() { + public List getSpareList() { return spareList; } - public void setSpareList(List spareList) { + public void setSpareList(List spareList) { this.spareList = spareList; } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/vo/InspectionWorkVO.java b/op-modules/op-device/src/main/java/com/op/device/domain/vo/InspectionWorkVO.java index 4189bab84..a2e126c74 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/vo/InspectionWorkVO.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/vo/InspectionWorkVO.java @@ -1,9 +1,6 @@ package com.op.device.domain.vo; -import com.op.device.domain.EquOrder; -import com.op.device.domain.EquOrderDetail; -import com.op.device.domain.EquOrderEquSpare; -import com.op.device.domain.Equipment; +import com.op.device.domain.*; import java.util.List; @@ -12,13 +9,13 @@ public class InspectionWorkVO { private EquOrder order; private Equipment equ; private List detailList; - private List spareList; + private List spareList; - public List getSpareList() { + public List getSpareList() { return spareList; } - public void setSpareList(List spareList) { + public void setSpareList(List spareList) { this.spareList = spareList; } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquSpareApplyMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquSpareApplyMapper.java index e11eaba40..6cb379bc4 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquSpareApplyMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquSpareApplyMapper.java @@ -68,4 +68,11 @@ public interface EquSpareApplyMapper { * @return */ int selectSerialNumber(); + + /** + * 通过上级工单code查询申领表list + * @param orderCode + * @return + */ + List selectEquSpareApplyListByParentCode(String orderCode); } 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 0defe8c21..ef9da765c 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 @@ -62,8 +62,6 @@ public class DevicePDAServiceImpl implements IDevicePDAService { private EquSpareApplyMapper equSpareApplyMapper; @Autowired private EquFileMapper equFileMapper; - @Autowired - private EquOrderEquSpareMapper equOrderEquSpareMapper; /** @@ -135,7 +133,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService { } // 备件 - List spareList = equOrderEquSpareMapper.selectEquOrderEquSpareByOrderCode(order.getOrderCode()); + List spareList = equSpareApplyMapper.selectEquSpareApplyListByParentCode(order.getOrderCode()); if (spareList != null) { order.setSpareList(spareList); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java index 59ddc2914..efd46e05f 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java @@ -48,13 +48,13 @@ public class EquOrderServiceImpl implements IEquOrderService { @Autowired private PersonMapper personMapper; @Autowired - private EquOrderEquSpareMapper equOrderEquSpareMapper; - @Autowired private EquRepairOrderMapper equRepairOrderMapper; @Autowired private EquFileMapper equFileMapper; @Autowired private EquPlanMapper equPlanMapper; + @Autowired + private EquSpareApplyMapper equSpareApplyMapper; /** * 查询计划工单 @@ -91,7 +91,7 @@ public class EquOrderServiceImpl implements IEquOrderService { order.setDetailList(detailList); // 备件 - List spareList = equOrderEquSpareMapper.selectEquOrderEquSpareByOrderCode(order.getOrderCode()); + List spareList = equSpareApplyMapper.selectEquSpareApplyListByParentCode(order.getOrderCode()); if (spareList.size() > 0) { order.setSpareList(spareList); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/InspectionWorkServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/InspectionWorkServiceImpl.java index c1430e2b5..5b5336e96 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/InspectionWorkServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/InspectionWorkServiceImpl.java @@ -36,7 +36,7 @@ public class InspectionWorkServiceImpl implements IInspectionWorkService { @Autowired private EquOrderEquSpareMapper equOrderEquSpareMapper; @Autowired - private EquOrderEquMapper equOrderEquMapper; + private EquSpareApplyMapper equSpareApplyMapper; /** * 查询巡检记录 @@ -57,7 +57,7 @@ public class InspectionWorkServiceImpl implements IInspectionWorkService { } // 查询备件信息 - List spareList = equOrderEquSpareMapper.selectEquOrderEquSpareByOrderCode(order.getOrderCode()); + List spareList = equSpareApplyMapper.selectEquSpareApplyListByParentCode(order.getOrderCode()); // 替换循环周期 order.setPlanLoopType(equOrderMapper.changeLoopType(order.getPlanLoopType())); diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquSpareApplyMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquSpareApplyMapper.xml index b21b57d0c..1203e6e49 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquSpareApplyMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquSpareApplyMapper.xml @@ -182,4 +182,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time) and del_flag = '0' + + \ No newline at end of file