Merge remote-tracking branch 'origin/master'

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

@@ -160,6 +160,16 @@ public class EquOrder extends BaseEntity {
 		this.planRestrict = planRestrict;
 	}
 
+	private String planRestrict;
+
+	public String getPlanRestrict() {
+		return planRestrict;
+	}
+
+	public void setPlanRestrict(String planRestrict) {
+		this.planRestrict = planRestrict;
+	}
+
 	public String getEquipmentName() {
 		return equipmentName;
 	}

op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderStandardMapper.java

@@ -70,12 +70,6 @@ public interface EquOrderStandardMapper {
      */
     List<EquOrderStandard> selectEquOrderStandardByParentCode(String code);
 
-    /**
-     * 图片数据绑定
-     * @param files
-     */
-    void insertBaseFileBatch(List<BaseFileData> files);
-
     /**
      * 手持维修工单关联检查项信息
      * @param equOrder

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

@@ -62,6 +62,8 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
     private EquEquipmentMapper equEquipmentMapper;
     @Autowired
     private  EquSpareApplyMapper equSpareApplyMapper;
+    @Autowired
+    private EquFileMapper equFileMapper;
 
 
     /**
@@ -186,9 +188,10 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
                         file.setSourceId(standard.getId());
                         file.setCreateBy(SecurityUtils.getUsername());
                         file.setCreateTime(new Date());
+                        file.setImageType("3");
                         files.add(file);
                     }
-                    equOrderStandardMapper.insertBaseFileBatch(files);
+                    equFileMapper.insertEquFileBatch(files);
                 }
 
                 // 校验标准信息-是否申请报修

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

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.op.common.core.context.SecurityContextHolder;
 import com.op.common.core.domain.BaseFileData;
@@ -50,6 +51,8 @@ public class EquOrderServiceImpl implements IEquOrderService {
     private EquOrderEquSpareMapper equOrderEquSpareMapper;
     @Autowired
     private EquRepairOrderMapper equRepairOrderMapper;
+    @Autowired
+    private EquFileMapper equFileMapper;
 
     /**
      * 查询计划工单
@@ -178,9 +181,10 @@ public class EquOrderServiceImpl implements IEquOrderService {
                         file.setSourceId(standard.getId());
                         file.setCreateBy(SecurityUtils.getUsername());
                         file.setCreateTime(new Date());
+                        file.setImageType("3");
                         files.add(file);
                     }
-                    equOrderStandardMapper.insertBaseFileBatch(files);
+                    equFileMapper.insertEquFileBatch(files);
                 }
 
                 // 校验标准信息-是否申请报修

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

@@ -236,4 +236,4 @@
             and eos.error_flag = '1'
         </where>
     </select>
-</mapper>
+</mapper>