优化

platform-dao/src/main/java/com/platform/dao/dto/sb/SbMeasureLogDTO.java

@@ -25,6 +25,8 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbMeasureLogDTO extends BaseDTO implements Serializable {
+    private List<SysFile> sbMeasureLogCredential;//设备变动凭证
+
     /**
      * 异常描述
      */

platform-dao/src/main/java/com/platform/dao/enums/SysFileTypeEnum.java

@@ -18,6 +18,7 @@ public enum SysFileTypeEnum {
     /**
      *
      */
+    SB_MEASURE_LOG_CREDENTIAL(60,"变动凭证"),
     SB_WX_FILE(1, "设备维修手册"),
     SB_USE_FILE(2, "设备使用手册"),
     SB_WB_FILE(3, "设备维保手册"),

platform-dao/src/main/java/com/platform/dao/vo/query/sb/SbMeasureLogVO.java

@@ -24,6 +24,8 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbMeasureLogVO extends BaseVO implements Serializable{
+    private List<SysFile> sbMeasureLogCredential;//设备变动凭证
+
     /**
      * 异常描述
      */

platform-rest/src/main/java/com/platform/rest/controller/sb/SbUpdateLogController.java

@@ -16,6 +16,7 @@ import com.platform.dao.entity.sb.SbMeasureLog;
 import com.platform.dao.entity.sb.SbUpdateLog;
 import com.platform.dao.enums.SbInfoStatusEnum;
 import com.platform.dao.enums.SbMeasureLogOtherTypeEnum;
+import com.platform.dao.enums.SysFileTypeEnum;
 import com.platform.dao.mapper.sb.SbInfoMapper;
 import com.platform.dao.mapper.sb.SbMeasureLogMapper;
 import com.platform.dao.mapper.sb.SbUpdateLogMapper;
@@ -24,6 +25,7 @@ import com.platform.dao.vo.export.sb.ExportSbMeasureLogVO;
 import com.platform.dao.vo.query.sb.SbMeasureLogVO;
 import com.platform.rest.log.annotation.SysLog;
 import com.platform.service.sb.SbMeasureLogService;
+import com.platform.service.upms.SysFileService;
 import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -45,7 +47,7 @@ import java.util.Map;
 @AllArgsConstructor
 @RequestMapping("/sb/update-logs")
 public class SbUpdateLogController {
-
+    private SysFileService sysFileService;
 
     private final SbMeasureLogMapper sbMeasureLogMapper;
     private final SbInfoMapper sbInfoMapper;
@@ -61,10 +63,11 @@ public class SbUpdateLogController {
     @PostMapping
     public R save(@Validated({AddGroup.class}) @RequestBody SbMeasureLogDTO dto) {
         setCreateUserInfo(dto);
-
-        dto.setId(IdGeneratorUtils.getObjectId());
+        String id = IdGeneratorUtils.getObjectId();
+        dto.setId(id);
         SbMeasureLog log = BeanConverterUtil.copyObjectProperties(dto,SbMeasureLog.class);
         sbMeasureLogMapper.insert(log);
+        sysFileService.saveFile(id, SysFileTypeEnum.SB_MEASURE_LOG_CREDENTIAL.getValue(),dto.getSbMeasureLogCredential());
         if (dto.getOtherType()!=null&&(dto.getOtherType().equals(SbMeasureLogOtherTypeEnum.IN_STORE.getValue()) ||
                 dto.getOtherType().equals(SbMeasureLogOtherTypeEnum.BAO_FEI.getValue()))){
             SbInfo sbInfo = new SbInfo();

platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -21,6 +21,7 @@ import com.platform.dao.dto.check.CheckStandardDTO;
 import com.platform.dao.dto.part.PartInfoDTO;
 import com.platform.dao.dto.sb.*;
 import com.platform.dao.dto.upms.SysDeptDTO;
+import com.platform.dao.dto.upms.SysFileDTO;
 import com.platform.dao.dto.upms.SysUserDeptDTO;
 import com.platform.dao.dto.workplace.WorkplaceBacklogDTO;
 import com.platform.dao.dto.workplace.WorkplaceBacklogUserDTO;
@@ -1899,6 +1900,19 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
         SbMeasureLogDTO sbMeasureLogDTO = new SbMeasureLogDTO();
         sbMeasureLogDTO.setSbIds(sbIds);
         List<SbMeasureLogVO> sbMeasureLogVOS = sbMeasureLogMapper.selectList(sbMeasureLogDTO);
+        SysFileDTO sysFileDTO = new SysFileDTO();
+        sysFileDTO.setType(SysFileTypeEnum.SB_MEASURE_LOG_CREDENTIAL.getValue());
+        List<SysFile> sysFiles = sysFileService.getModelListByDTO(sysFileDTO);
+
+            for (SbMeasureLogVO sbMeasureLogVO:sbMeasureLogVOS){
+                List<SysFile> sysFileList = new ArrayList<>();
+                for (SysFile sysFile:sysFiles){
+                    if (sysFile.getTargetId().equals(sbMeasureLogVO.getId())){
+                        sysFileList.add(sysFile);
+                    }
+            }
+                sbMeasureLogVO.setSbMeasureLogCredential(sysFileList);
+        }
         for (SbInfoVO sbInfoVO:sbList) {
             List<SbMeasureLogVO> logVOS = new ArrayList<>();
             for (SbMeasureLogVO vo : sbMeasureLogVOS) {