报修+维修+设备班组+委外

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)

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<BaseFileData> getBaseFileBatch(String id);
+    public List<BaseFileData> getBaseFileBatch(@Param("sourceId")String sourceId , @Param("imageType")String imageType);
 
     //PC查询点检巡检报修
     List<EquOrderStandard> selectPdaEquOrderList(EquOrderStandard equOrderStandard);

op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java

@@ -620,7 +620,8 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
                 List<EquOrderStandard> standardLists = equOrderStandardMapper.selectPdaEquOrderList(equOrderStandard);
                 for (EquOrderStandard standardList : standardLists) {
                     //每个检查标准里面的照片
-                    List<BaseFileData> files = equOrderStandardMapper.getBaseFileBatch(standardList.getId());
+                    String imageType = "4";
+                    List<BaseFileData> 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<EquOrderStandard> 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) {
+//        } catch (Exception e) {
-            return error("提交失败！");
+//            return error("提交失败！");
-        }
+//        }
     }
 
     /**

op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java

@@ -81,7 +81,8 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService {
 			List<EquOrderStandard> standardLists = equOrderStandardMapper.selectPdaEquOrderList(equOrderStandard);
 			for(EquOrderStandard standardList :standardLists){
 				//每个检查标准里面的照片
-				List<BaseFileData> file = equOrderStandardMapper.getBaseFileBatch(standardList.getId());
+				String imageType = "3";
+				List<BaseFileData> file = equOrderStandardMapper.getBaseFileBatch(standardList.getId(),imageType);
 				if (!CollectionUtils.isEmpty(file)) {
 					standardList.setPicturePaths(file);
 				}

op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java

@@ -77,7 +77,8 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService
 			List<EquOrderStandard> standardLists = equOrderStandardMapper.selectPdaEquOrderList(equOrderStandard);
 			for(EquOrderStandard standardList :standardLists){
 				//每个检查标准里面的照片
-				List<BaseFileData> files = equOrderStandardMapper.getBaseFileBatch(standardList.getId());
+				String imageType = "4";
+				List<BaseFileData> files = equOrderStandardMapper.getBaseFileBatch(standardList.getId(),imageType);
 				if (!CollectionUtils.isEmpty(files)) {
 					standardList.setPicturePaths(files);
 				}

op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml

@@ -45,6 +45,7 @@
 		<result property="itemMethod"	column="item_method"	/>
 		<result property="itemType"	column="item_type"	/>
 		<result property="itemTypeName"	column="item_type_name"	/>
+		<result property="itemTools"	column="item_tools"	/>
 
 		<result property="outsourceCode"	column="outsource_code"	/>
 	</resultMap>
@@ -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'
 	</select>
 
-
 	<!--  查询对应检查项id-->
 	<select id="getIdsByOrderCode" parameterType="EquOrder" resultType="java.lang.String">
 		select

op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml

@@ -268,8 +268,10 @@
         </foreach>
     </insert>
 
-    <delete id="deleteBaseFileBySourceId">
+    <delete id="deleteBaseFileBySourceId" parameterType="String">
-		delete from base_file where source_id = #{sourceId}
+		delete from base_file
+		where source_id = #{sourceId}
+		and image_type = #{imageType}
 	</delete>
 
     <delete id="delEquOrderStandardByorderIds" parameterType="String">
@@ -285,6 +287,7 @@
     <select id="getBaseFileBatch" resultMap="BaseFileResult">
         <include refid="selectBaseFileVo"/>
         where source_id = #{sourceId}
+        and image_type = #{imageType}
     </select>
 
     <update id="updateStandardAfterRepair" parameterType="EquOrderStandard">