优化

platform-dao/src/main/java/com/platform/dao/dto/sbUnuseddetail/SbUnusedDetailDTO.java

@@ -22,24 +22,24 @@ import java.time.LocalDate;
 public class SbUnusedDetailDTO extends BaseDTO implements Serializable {
 
       /**
-     * 
+     *
      */
         @NotNull(groups = {UpdateGroup.class}, message = "ID不能为空")
     private String id;
           /**
-     * 
+     *
      */
           private String sbUnusedId;
           /**
-     * 
+     *
      */
           private String sbId;
           /**
-     * 
+     *
      */
           private String createdUserId;
           /**
-     * 
+     *
      */
         private LocalDateTime createdTime;
       /**
@@ -51,11 +51,11 @@ public class SbUnusedDetailDTO extends BaseDTO implements Serializable {
        */
       private LocalDateTime createdTimeEnd;
           /**
-     * 
+     *
      */
           private String updateUserId;
           /**
-     * 
+     *
      */
         private LocalDateTime updateTime;
       /**

platform-dao/src/main/java/com/platform/dao/dto/upms/SysFileDTO.java

@@ -9,6 +9,7 @@ import lombok.experimental.Accessors;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * @Description 文件DTO
@@ -19,6 +20,7 @@ import java.time.LocalDateTime;
 @Data
 @Accessors(chain = true)
 public class SysFileDTO extends BaseDTO implements Serializable {
+    private List<String> targetIds;
 
     private static final long serialVersionUID = 1L;
 

platform-dao/src/main/java/com/platform/dao/entity/sbUnuseddetail/SbUnusedDetail.java

@@ -22,6 +22,7 @@ import javax.persistence.Transient;
 @Table(name = "t_sb_unused_detail")
 public class SbUnusedDetail implements Serializable{
 
+
     /**
      *
      */

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

@@ -22,6 +22,7 @@ public enum SysFileTypeEnum {
     SB_USE_FILE(2, "设备使用手册"),
     SB_WB_FILE(3, "设备维保手册"),
     SB_IMG(4, "设备图片"),
+    SB_XZ_IMG(4, "设备闲置图片"),
     REPAIR_APPLICATION_IMGS(11, "维修-报修图片"),
     REPAIR_APPLICATION_FILES(41, "维修-报修文件"),
     PREPARATION_APPLICATION_IMGS(43, "筹建-报修图片"),

platform-dao/src/main/java/com/platform/dao/vo/query/sbUnuseddetail/SbUnusedDetailVO.java

@@ -1,5 +1,6 @@
 package com.platform.dao.vo.query.sbUnuseddetail;
 
+import com.platform.dao.entity.upms.SysFile;
 import lombok.Data;
 import com.platform.common.bean.BaseVO;
 import com.platform.common.bean.BaseDTO;
@@ -10,6 +11,7 @@ import javax.validation.constraints.*;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.time.LocalDate;
+import java.util.List;
 
 /**
  * @Description 闲置详情表VO结果类
@@ -21,6 +23,8 @@ import java.time.LocalDate;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbUnusedDetailVO extends BaseVO implements Serializable{
+    private List<SysFile> usedFileList;
+
     private String positionName;
 
     private String sbName;

platform-dao/src/main/resources/mapper/sb/SbInfoMapper.xml

@@ -205,6 +205,7 @@ sb.check_type
             or sb.no like concat('%',#{keyword},'%')
             or sb.position_no like concat('%',#{keyword},'%')
             or sb.remark like concat('%',#{keyword},'%')
+            or sb.zzh like concat('%',#{keyword},'%')
             )
         </if>
         <if test="name != null and name!=''">

platform-dao/src/main/resources/mapper/sbUnuseddetail/SbUnusedDetailMapper.xml

@@ -57,6 +57,7 @@
         from t_sb_unused_detail as unusedDetails left join t_sb_info sbInfo
         on sbInfo.id = unusedDetails.sb_id
         left join t_sb_position position on position.id=sbInfo.position_id
+        left join t_sys_file file on file.target_id = unusedDetails.id
         <where>
             <include refid="List_Condition" />
         </where>

platform-service/src/main/java/com/platform/service/sbUnused/impl/SbUnusedServiceImpl.java

@@ -12,15 +12,15 @@ import com.platform.dao.dto.repair.RepairApplicationFormDTO;
 import com.platform.dao.dto.sb.SbInfoDTO;
 import com.platform.dao.dto.sbUnusedVerifyRecord.SbUnusedVerifyRecordDTO;
 import com.platform.dao.dto.sbUnuseddetail.SbUnusedDetailDTO;
+import com.platform.dao.dto.upms.SysFileDTO;
 import com.platform.dao.entity.sbUnusedVerifyRecord.SbUnusedVerifyRecord;
 import com.platform.dao.entity.sbUnuseddetail.SbUnusedDetail;
+import com.platform.dao.entity.upms.SysFile;
 import com.platform.dao.entity.upms.SysUser;
-import com.platform.dao.enums.SbUnusedStatusEnum;
-import com.platform.dao.enums.SysConfigEnum;
-import com.platform.dao.enums.WorkplaceBacklogDetailTypeEnum;
-import com.platform.dao.enums.WorkplaceBacklogTypeEnum;
+import com.platform.dao.enums.*;
 import com.platform.dao.mapper.sbUnusedVerifyRecord.SbUnusedVerifyRecordMapper;
 import com.platform.dao.mapper.sbUnuseddetail.SbUnusedDetailMapper;
+import com.platform.dao.mapper.upms.SysFileMapper;
 import com.platform.dao.mapper.upms.SysUserMapper;
 import com.platform.dao.util.MessageTemplateUtil;
 import com.platform.dao.vo.query.project.ProjectVO;
@@ -32,6 +32,7 @@ import com.platform.dao.vo.query.sbUnusedVerifyRecord.SbUnusedVerifyRecordVO;
 import com.platform.dao.vo.query.sbUnuseddetail.SbUnusedDetailVO;
 import com.platform.service.event.WorkplaceBacklogEvent;
 import com.platform.service.sbUnused.SbUnusedService;
+import com.platform.service.upms.SysFileService;
 import com.platform.service.util.SendMessageUtils;
 import org.springframework.stereotype.Service;
 import com.platform.service.base.impl.BaseServiceImpl;
@@ -44,6 +45,7 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Description 设备闲置表 service 实现类
@@ -58,6 +60,8 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
     private SbUnusedDetailMapper sbUnusedDetailMapper;
     private SbUnusedVerifyRecordMapper sbUnusedVerifyRecordMapper;
     private SysUserMapper sysUserMapper;
+    private final SysFileService sysFileService;
+    private SysFileMapper sysFileMapper;
 
     @Override
     public void modModelByDTO(SbUnusedDTO model) {
@@ -197,6 +201,22 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
         SbUnusedDetailDTO queryDetail = new SbUnusedDetailDTO();
         queryDetail.setSbUnusedId(id);
         List<SbUnusedDetailVO> sbUnusedDetailVOS = sbUnusedDetailMapper.selectList(queryDetail);
+        List<String> targetIds = sbUnusedDetailVOS.stream().map(SbUnusedDetailVO::getId).collect(Collectors.toList());
+        Weekend<SysFile> weekend = new Weekend<>(SysFile.class);
+        WeekendCriteria<SysFile,Object> weekendCriteria = weekend.weekendCriteria();
+        weekendCriteria.andIn(SysFile::getTargetId,targetIds);
+        weekendCriteria.andEqualTo(SysFile::getType,SysFileTypeEnum.SB_XZ_IMG.getValue());
+        List<SysFile> sysFiles = sysFileMapper.selectByExample(weekend);
+        for (SbUnusedDetailVO detailVO:sbUnusedDetailVOS){
+            List<SysFile> files = new ArrayList<>();
+            for (SysFile file:sysFiles){
+                if (file.getTargetId().equals(detailVO.getId())){
+                    files.add(file);
+                }
+            }
+            detailVO.setUsedFileList(files);
+        }
+
         vo.setSbUnusedDetailVOS(sbUnusedDetailVOS);
         SbUnusedVerifyRecordDTO dto = new SbUnusedVerifyRecordDTO();
         dto.setSbUnusedId(id);
@@ -282,6 +302,9 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
             detail.setCreatedUserId(userInfo.getUserId());
             detail.setUpdateTime(LocalDateTime.now());
             detail.setUpdateUserId(userInfo.getUserId());
+            dto.setId(detail.getId());
+            this.saveImageFile(dto);
+
             sbUnusedDetails.add(detail);
         }
         sbUnusedDetailMapper.insertListforComplex(sbUnusedDetails);
@@ -298,6 +321,10 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
         return unused;
     }
 
+    private void saveImageFile(SbInfoDTO model) {
+        sysFileService.saveFile(model.getId(), SysFileTypeEnum.SB_XZ_IMG.getValue(), model.getSbFileList());
+    }
+
     public void addRecord(UserInfo userInfo, SbUnused unused, String statusStr,String advice) {
         //添加流程记录
         SbUnusedVerifyRecord record = new SbUnusedVerifyRecord();