保养工单备件逻辑变更

op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java

@@ -300,13 +300,13 @@ public class EquOrder extends BaseEntity {
 
 	private List<EquOrderDetail> detailList;
 
-	private List<EquOrderEquSpare> spareList;
+	private List<EquSpareApply> spareList;
 
-	public List<EquOrderEquSpare> getSpareList() {
+	public List<EquSpareApply> getSpareList() {
 		return spareList;
 	}
 
-	public void setSpareList(List<EquOrderEquSpare> spareList) {
+	public void setSpareList(List<EquSpareApply> spareList) {
 		this.spareList = spareList;
 	}
 

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<EquOrderDetail> detailList;
-    private List<EquOrderEquSpare> spareList;
+    private List<EquSpareApply> spareList;
 
-    public List<EquOrderEquSpare> getSpareList() {
+    public List<EquSpareApply> getSpareList() {
         return spareList;
     }
 
-    public void setSpareList(List<EquOrderEquSpare> spareList) {
+    public void setSpareList(List<EquSpareApply> spareList) {
         this.spareList = spareList;
     }
 

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<EquSpareApply> selectEquSpareApplyListByParentCode(String orderCode);
 }

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<EquOrderEquSpare> spareList = equOrderEquSpareMapper.selectEquOrderEquSpareByOrderCode(order.getOrderCode());
+        List<EquSpareApply> spareList = equSpareApplyMapper.selectEquSpareApplyListByParentCode(order.getOrderCode());
         if (spareList != null) {
             order.setSpareList(spareList);
         }

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<EquOrderEquSpare> spareList = equOrderEquSpareMapper.selectEquOrderEquSpareByOrderCode(order.getOrderCode());
+        List<EquSpareApply> spareList = equSpareApplyMapper.selectEquSpareApplyListByParentCode(order.getOrderCode());
         if (spareList.size() > 0) {
             order.setSpareList(spareList);
         }

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<EquOrderEquSpare> spareList = equOrderEquSpareMapper.selectEquOrderEquSpareByOrderCode(order.getOrderCode());
+        List<EquSpareApply> spareList = equSpareApplyMapper.selectEquSpareApplyListByParentCode(order.getOrderCode());
 
         // 替换循环周期
         order.setPlanLoopType(equOrderMapper.changeLoopType(order.getPlanLoopType()));

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'
 	</select>
 
+	<select id="selectEquSpareApplyListByParentCode" parameterType="String" resultMap="EquSpareApplyResult">
+		<include refid="selectEquSpareApplyVo"/>
+		where parent_code = #{orderCode} and del_flag = '0'
+	</select>
+
 </mapper>