维修

platform-dao/src/main/java/com/platform/dao/dto/repair/RepairApplicationFormDTO.java

@@ -286,6 +286,11 @@ public class RepairApplicationFormDTO extends BaseDTO implements Serializable {
      * 维修图片
      */
     private List<SysFile> repairFileList;
+
+    /**
+     * 报修附件
+     */
+    private List<SysFile> reoortFileList;
     /**
      * 维修文件
      */

platform-dao/src/main/java/com/platform/dao/vo/repair/RepairApplicationFormVO.java

@@ -436,4 +436,9 @@ public class RepairApplicationFormVO extends BaseVO implements Serializable {
      */
     private LocalDateTime planEndTime;
 
+    /**
+     * 报修附件
+     */
+    private List<SysFile> reportFileList;
+
 }

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -785,7 +785,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         List<SysFile> applicationFileList = ListUtils.newArrayList();
         List<SysFile> repairFileList = ListUtils.newArrayList();
         List<SysFile> checkFileList = ListUtils.newArrayList();
-        List<SysFile> reportFile = ListUtils.newArrayList();
+        List<SysFile> reportFileList = ListUtils.newArrayList();
         sysFiles.forEach(item -> {
             if (item.getType().equals(SysFileTypeEnum.REPAIR_APPLICATION_IMGS.getValue())) {
                 applicationFileList.add(item);
@@ -796,10 +796,14 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             if (item.getType().equals(SysFileTypeEnum.REPAIR_CHECK_IMGS.getValue())) {
                 checkFileList.add(item);
             }
+            if(item.getType().equals(SysFileTypeEnum.REPAIR_APPLICATION_FILES.getValue())){
+                reportFileList.add(item);
+            }
         });
         vo.setRepairFileList(repairFileList);
         vo.setApplicationFileList(applicationFileList);
         vo.setCheckFileList(checkFileList);
+        vo.setReportFileList(reportFileList);
         // 车间位置
         SbInfo sbInfo = sbInfoService.getModelById(vo.getSbId());
         if(StringUtils.isNotBlank(sbInfo.getPositionId())){

platform-service/src/main/java/com/platform/service/repair/strategy/AbstractRepairBaseStrategy.java

@@ -110,7 +110,7 @@ public abstract class AbstractRepairBaseStrategy implements RepairBaseStrategy{
         model.setUpdateTime(model.getApplyTime());
         model.setId(IdGeneratorUtils.getObjectId());
         sysFileService.saveFile(model.getId(), SysFileTypeEnum.REPAIR_APPLICATION_IMGS.getValue(), model.getApplicationFileList());
-        sysFileService.saveFile(model.getId(),SysFileTypeEnum.REPAIR_APPLICATION_FILES.getValue(),model.getRepairFileList());
+        sysFileService.saveFile(model.getId(),SysFileTypeEnum.REPAIR_APPLICATION_FILES.getValue(),model.getReoortFileList());
         RepairApplicationForm form = BeanConverterUtil.copyObjectProperties(model, RepairApplicationForm.class);
         return form;
     }