维修完善

platform-dao/src/main/java/com/platform/dao/vo/query/customize/CustomFieldTemplateDataVO.java

@@ -1,5 +1,6 @@
 package com.platform.dao.vo.query.customize;
 
+import com.platform.dao.entity.upms.SysFile;
 import lombok.Data;
 import com.platform.common.bean.BaseVO;
 import com.platform.common.bean.BaseDTO;
@@ -11,6 +12,7 @@ import javax.validation.constraints.*;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.time.LocalDate;
+import java.util.List;
 
 /**
  * @Description 自定义报表VO结果类
@@ -130,7 +132,7 @@ public class CustomFieldTemplateDataVO extends BaseVO implements Serializable {
 
     private Double repairHours;
 
-    private String imageList;
+    private List<SysFile> imageList;
 
     private String file;
 }

platform-rest/src/main/java/com/platform/rest/controller/customize/CustomFieldTemplateDataController.java

@@ -164,7 +164,7 @@ public class CustomFieldTemplateDataController {
 
     @GetMapping("/repair/longyan/page")
     public R<AbstractPageResultBean<CustomFieldTemplateDataVO>> queryLongYan(CustomFieldTemplateDataDTO customFieldTemplateDataDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
-        return new R<>(customFieldTemplateDataService.selectPageList(customFieldTemplateDataDTO, pageNum, pageSize));
+        return new R<>(customFieldTemplateDataService.selectPageListRepairThree(customFieldTemplateDataDTO, pageNum, pageSize));
     }
 
     /**

platform-service/src/main/java/com/platform/service/customize/impl/CustomFieldTemplateDataServiceImpl.java

@@ -9,8 +9,10 @@ import com.platform.dao.dto.customize.CustomFieldTemplateDataDTO;
 import com.platform.dao.dto.repair.RepairRecordTemplateData;
 import com.platform.dao.dto.repair.RepairStatusTemplateData;
 import com.platform.dao.entity.customize.CustomFieldTemplateData;
+import com.platform.dao.entity.upms.SysFile;
 import com.platform.dao.enums.CustomFieldTemplateDataStatusEnum;
 import com.platform.dao.enums.CustomFieldTemplateDataTypeEnum;
+import com.platform.dao.enums.SysFileTypeEnum;
 import com.platform.dao.mapper.customize.CustomFieldTemplateDataMapper;
 import com.platform.dao.mapper.sb.SbInfoMapper;
 import com.platform.dao.vo.query.customize.CustomFieldTemplateDataVO;
@@ -18,6 +20,7 @@ import com.platform.service.base.impl.BaseServiceImpl;
 import com.platform.service.customize.BaseFormCheckService;
 import com.platform.service.customize.BaseFormCheckServiceFactory;
 import com.platform.service.customize.CustomFieldTemplateDataService;
+import com.platform.service.upms.SysFileService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -38,6 +41,7 @@ import java.util.List;
 @Service("customFieldTemplateDataService")
 public class CustomFieldTemplateDataServiceImpl extends BaseServiceImpl<CustomFieldTemplateDataMapper, CustomFieldTemplateData, CustomFieldTemplateDataDTO> implements CustomFieldTemplateDataService {
     private SbInfoMapper sbInfoMapper;
+    private SysFileService sysFileService;
 
     @Override
     public int batchDelete(List<String> ids) {
@@ -141,6 +145,7 @@ public class CustomFieldTemplateDataServiceImpl extends BaseServiceImpl<CustomFi
 
     @Override
     public AbstractPageResultBean<CustomFieldTemplateDataVO> selectPageListRepairThree(CustomFieldTemplateDataDTO record, int pageNum, int pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
         if(record.getDelFlag() == null){
             record.setDelFlag(false); // 默认正常数据
         }
@@ -165,9 +170,15 @@ public class CustomFieldTemplateDataServiceImpl extends BaseServiceImpl<CustomFi
         RepairRecordTemplateData data = JsonUtils.jsonToModel(vo.getData(),RepairRecordTemplateData.class);
         vo.setDataRemark(data.getRemark());
         vo.setRepairHours(data.getRepairMinutes());
-        vo.setImageList(data.getImageList());
-        vo.setFile(data.getFile());
-        return null;
+        List<SysFile> sysFiles = sysFileService.getListByTargetAndType(id, null);
+        List<SysFile> imageList = ListUtils.newArrayList();
+        sysFiles.forEach(item -> {
+            if (item.getType().equals(SysFileTypeEnum.REPAIR_REPAIR_IMGS.getValue())) {
+                imageList.add(item);
+            }
+        });
+        vo.setImageList(imageList);
+        return vo;
     }
 
     private void writeBackToRecord(AbstractPageResultBean<CustomFieldTemplateDataVO> pageInfos){

platform-service/src/main/java/com/platform/service/repair/strategy/impl/LongYanRepairStrategy.java

@@ -12,10 +12,7 @@ import com.platform.dao.entity.customize.CustomFieldTemplateData;
 import com.platform.dao.entity.repair.RepairApplicationForm;
 import com.platform.dao.entity.sb.SbInfo;
 import com.platform.dao.entity.upms.SysUser;
-import com.platform.dao.enums.RepairApplicationFormStatusEnum;
-import com.platform.dao.enums.SysConfigEnum;
-import com.platform.dao.enums.SysRoleCodeEnum;
-import com.platform.dao.enums.WorkplaceBacklogDetailTypeEnum;
+import com.platform.dao.enums.*;
 import com.platform.dao.mapper.customize.CustomFieldTemplateDataMapper;
 import com.platform.dao.mapper.upms.SysUserMapper;
 import com.platform.dao.util.MessageTemplateUtil;
@@ -110,6 +107,7 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
         dataInfo.setRemark(remark);
         dataInfo.setStatus(form.getStatus());
         data.setData(JsonUtils.objectToJson(dataInfo));
+        data.setDelFlag(0);
         customFieldTemplateDataMapper.insert(data);
     }
 
@@ -301,24 +299,30 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
         updData.setId(queryData.getId());
         updData.setUpdateTime(LocalDateTime.now());
         RepairRecordTemplateData dataInfo = JsonUtils.jsonToModel(queryData.getData(),RepairRecordTemplateData.class);
-        switch (type){
+        updData.setUpdateTime(LocalDateTime.now());
+        hours = DateUtils.getDurationHours(queryData.getCreatedTime(), updData.getUpdateTime());
+        dataInfo.setRepairMinutes(hours);
+        dataInfo.setRemark(form.getRemark());
+        // 保存维修记录图片
+        sysFileService.saveFile(queryData.getId(), SysFileTypeEnum.REPAIR_REPAIR_IMGS.getValue(), form.getRepairFileList());
+        /*switch (type){
             case CommonConstants.REPAIR_RECORD_EDIT_STOP: // 终止维修，计算时长
                 updData.setUpdateTime(LocalDateTime.now());
                 hours = DateUtils.getDurationHours(queryData.getCreatedTime(), updData.getUpdateTime());
                 dataInfo.setRepairMinutes(hours);
                 dataInfo.setRemark(form.getRemark());
-                dataInfo.setImageList(form.getImageList());
-                dataInfo.setFile(form.getFile());
+                //dataInfo.setImageList(form.getImageList());
+                //dataInfo.setFile(form.getFile());
                 break;
             case CommonConstants.REPAIR_RECORD_EDIT_ADD:    // 完成维修
                 updData.setUpdateTime(LocalDateTime.now());
                 hours = DateUtils.getDurationHours(queryData.getCreatedTime(), updData.getUpdateTime());
                 dataInfo.setRepairMinutes(hours);
-                dataInfo.setImageList(form.getImageList());
-                dataInfo.setFile(form.getFile());
+                //dataInfo.setImageList(form.getImageList());
+                //dataInfo.setFile(form.getFile());
                 dataInfo.setRemark(form.getRemark());
                 break;
-        }
+        }*/
         updData.setData(JsonUtils.objectToJson(dataInfo));
         customFieldTemplateDataMapper.updateByPrimaryKeySelective(updData);
         return hours;
@@ -342,6 +346,7 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
         dataInfo.setFile("");
         dataInfo.setImageList("");
         data.setData(JsonUtils.objectToJson(dataInfo));
+        data.setDelFlag(0);
         customFieldTemplateDataMapper.insert(data);
     }