[清退、退役、报废、销毁] 添加新接口以及新的功能

dev-config/src/main/java/com/tykj/dev/config/base/FileName.java

@@ -19,7 +19,12 @@ public enum FileName {
     /**
      * 签收单
      */
-    SIGN(3,"签收单");
+    SIGN(3,"签收单"),
+
+    /**
+     * 销毁单
+     */
+    DESTROY(4,"销毁单");
 
     public Integer id;
 

dev-decommissioning/src/main/java/com/tykj/dev/device/decommissioning/service/DeviceDecommissioningDetailService.java

@@ -2,9 +2,11 @@ package com.tykj.dev.device.decommissioning.service;
 
 import com.tykj.dev.device.decommissioning.entity.DeviceDecommissioningDetail;
 import com.tykj.dev.device.decommissioning.entity.vo.DecommissioningSelectVo;
+import com.tykj.dev.device.file.entity.FileRet;
 import org.springframework.data.domain.Page;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author zjm
@@ -41,4 +43,6 @@ public interface DeviceDecommissioningDetailService {
 
     Page<DeviceDecommissioningDetail> findPageDeviceDecommissioningDetail(DecommissioningSelectVo decommissioningSelectVo);
 
+
+    Map<String, List<FileRet>> findByIdToFileMapList(Integer id);
 }

dev-decommissioning/src/main/java/com/tykj/dev/device/decommissioning/service/DeviceDecommissioningQueryService.java

@@ -4,6 +4,7 @@ import com.tykj.dev.device.decommissioning.entity.DeviceDecommissioningDetail;
 import com.tykj.dev.device.decommissioning.entity.vo.DecommissioningSelectVo;
 import com.tykj.dev.device.decommissioning.entity.vo.PagingVo;
 import com.tykj.dev.device.decommissioning.entity.vo.RepelManagementVo;
+import com.tykj.dev.device.file.entity.FileRet;
 import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
 import com.tykj.dev.device.task.subject.bto.TaskBto;
 import org.apache.poi.ss.formula.functions.T;
@@ -11,6 +12,7 @@ import org.springframework.data.domain.Page;
 
 import java.time.LocalDate;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author zjm
@@ -63,4 +65,8 @@ public interface DeviceDecommissioningQueryService {
 
     Page<DeviceDecommissioningDetail> findPageDeviceDecommissioningDetail(DecommissioningSelectVo decommissioningSelectVo);
 
+    /**
+     * 根据taskId查询相关文件接口（设备日志使用）
+     */
+    Map<String, List<FileRet>> findByTaskIdToFileMapList(Integer taskId);
 }

dev-decommissioning/src/main/java/com/tykj/dev/device/decommissioning/service/impl/DeviceDecommissioningDetailServiceImpl.java

@@ -4,11 +4,13 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.wenhao.jpa.PredicateBuilder;
 import com.github.wenhao.jpa.Specifications;
 import com.tykj.dev.blockcha.subject.service.BlockChainUtil;
+import com.tykj.dev.config.base.FileName;
 import com.tykj.dev.device.decommissioning.entity.DeviceDecommissioningDetail;
 import com.tykj.dev.device.decommissioning.entity.vo.DecommissioningSelectVo;
 import com.tykj.dev.device.decommissioning.entity.vo.RepelManagementVo;
 import com.tykj.dev.device.decommissioning.repository.DeviceDecommissioningDetailDao;
 import com.tykj.dev.device.decommissioning.service.DeviceDecommissioningDetailService;
+import com.tykj.dev.device.file.entity.FileRet;
 import com.tykj.dev.device.file.service.FilesUtil;
 import com.tykj.dev.device.library.repository.DeviceLibraryDao;
 import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
@@ -130,6 +132,22 @@ public class DeviceDecommissioningDetailServiceImpl implements DeviceDecommissio
         });
     }
 
+    @Override
+    public Map<String, List<FileRet>> findByIdToFileMapList(Integer id) {
+        Map<String, List<FileRet>> map=new HashMap<>();
+        Optional<DeviceDecommissioningDetail> optional = deviceDecommissioningDetailDao.findById(id);
+        if (optional.isPresent()){
+            DeviceDecommissioningDetail deviceDecommissioningDetail=optional.get();
+            map.put(FileName.APPLY.name,FilesUtil.stringFileToList(deviceDecommissioningDetail.getApplyFiles()));
+            map.put(FileName.RECEIPT.name,FilesUtil.stringFileToList(deviceDecommissioningDetail.getOutboundFile()));
+            map.put(FileName.SIGN.name,FilesUtil.stringFileToList(deviceDecommissioningDetail.getBillFile()));
+            map.put(FileName.REPLY.name,FilesUtil.stringFileToList(deviceDecommissioningDetail.getReplyFiles()));
+            return map;
+        }else {
+            log.info("[退役] 详情查看错误，id没有找到{}",id);
+            throw new ApiException(ResponseEntity.status(500).body("退役详情id没有找到:"+id));
+        }
+    }
 
 
     private List<DeviceLibrary> findInvoleDevice(String involeDevice){

dev-decommissioning/src/main/java/com/tykj/dev/device/decommissioning/service/impl/DeviceDecommissioningQueryServiceImpl.java

@@ -8,6 +8,7 @@ import com.tykj.dev.device.decommissioning.entity.vo.PagingVo;
 import com.tykj.dev.device.decommissioning.entity.vo.RepelManagementVo;
 import com.tykj.dev.device.decommissioning.service.DeviceDecommissioningDetailService;
 import com.tykj.dev.device.decommissioning.service.DeviceDecommissioningQueryService;
+import com.tykj.dev.device.file.entity.FileRet;
 import com.tykj.dev.device.library.repository.DeviceLibraryDao;
 import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
 import com.tykj.dev.device.task.service.TaskService;
@@ -145,6 +146,12 @@ public class DeviceDecommissioningQueryServiceImpl implements DeviceDecommission
         return deviceDecommissioningDetailService.findPageDeviceDecommissioningDetail(decommissioningSelectVo);
     }
 
+    @Override
+    public Map<String, List<FileRet>> findByTaskIdToFileMapList(Integer taskId) {
+        TaskBto taskBto= taskService.get(taskId);
+        return deviceDecommissioningDetailService.findByIdToFileMapList(taskBto.getBillId());
+    }
+
     private Specification<DeviceLibrary> getRetiredSpecification(RepelManagementVo repelManagementVo) {
         PredicateBuilder<DeviceLibrary> predicateBuilder = getPredicateBuilder(repelManagementVo);
         predicateBuilder.eq("lifeStatus", DeviceLifeStatus.RETIRE.id);

dev-destroy/src/main/java/com/tykj/dev/device/destroy/service/DeviceDestroyBillService.java

@@ -3,9 +3,11 @@ package com.tykj.dev.device.destroy.service;
 
 import com.tykj.dev.device.destroy.entity.domain.DeviceDestroyBill;
 import com.tykj.dev.device.destroy.entity.vo.DestroySelectVo;
+import com.tykj.dev.device.file.entity.FileRet;
 import org.springframework.data.domain.Page;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 /**
@@ -40,4 +42,5 @@ public interface DeviceDestroyBillService {
 
     Page<DeviceDestroyBill> findPageDeviceDestroyBill(DestroySelectVo destroySelectVo);
 
+    Map<String, List<FileRet>> findByIdToFileMapList(Integer id);
 }

dev-destroy/src/main/java/com/tykj/dev/device/destroy/service/DeviceDestroyQueryService.java

@@ -2,9 +2,13 @@ package com.tykj.dev.device.destroy.service;
 
 import com.tykj.dev.device.destroy.entity.domain.DeviceDestroyBill;
 import com.tykj.dev.device.destroy.entity.vo.DestroySelectVo;
+import com.tykj.dev.device.file.entity.FileRet;
 import com.tykj.dev.device.task.subject.bto.TaskBto;
 import org.springframework.data.domain.Page;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author zjm
  * @version 1.0.0
@@ -26,4 +30,8 @@ public interface DeviceDestroyQueryService {
 
     Page<DeviceDestroyBill> findPageDeviceDestroyBill(DestroySelectVo destroySelectVo);
 
+    /**
+     * 根据taskId查询相关文件接口（设备日志使用）
+     */
+    Map<String,List<FileRet>> findByTaskIdToFileMapList(Integer taskId);
 }

dev-destroy/src/main/java/com/tykj/dev/device/destroy/service/Impl/DeviceDestroyBillServiceImpl.java

@@ -5,6 +5,7 @@ import com.github.wenhao.jpa.PredicateBuilder;
 import com.github.wenhao.jpa.Specifications;
 import com.tykj.dev.blockcha.subject.service.BlockChainUtil;
 import com.tykj.dev.config.base.DeviceLifeStatus;
+import com.tykj.dev.config.base.FileName;
 import com.tykj.dev.device.destroy.entity.domain.DeviceDestroyBill;
 import com.tykj.dev.device.destroy.entity.vo.DestroySelectVo;
 import com.tykj.dev.device.destroy.repository.DeviceDestroyBillDao;
@@ -29,9 +30,7 @@ import org.springframework.data.jpa.domain.Specification;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
@@ -126,6 +125,22 @@ public class DeviceDestroyBillServiceImpl implements DeviceDestroyBillService {
         });
     }
 
+    @Override
+    public Map<String, List<FileRet>> findByIdToFileMapList(Integer id) {
+        Map<String, List<FileRet>> map=new HashMap<>();
+        Optional<DeviceDestroyBill> optional = deviceDestroyBillDao.findById(id);
+        if (optional.isPresent()){
+            DeviceDestroyBill deviceDestroyBill=optional.get();
+            map.put(FileName.APPLY.name,FilesUtil.stringFileToList(deviceDestroyBill.getApplyFiles()));
+            map.put(FileName.DESTROY.name,FilesUtil.stringFileToList(deviceDestroyBill.getDestructionFiles()));
+            map.put(FileName.REPLY.name,FilesUtil.stringFileToList(deviceDestroyBill.getReplayFiles()));
+            return map;
+        }else {
+            log.info("[销毁] 详情查看错误，id没有找到{}",id);
+            throw new ApiException(ResponseEntity.status(500).body("销毁详情id没有找到:"+id));
+        }
+    }
+
     private Specification<DeviceDestroyBill> getFindRetiredSpecification(DestroySelectVo destroySelectVo) {
         PredicateBuilder<DeviceDestroyBill> predicateBuilder = Specifications.and();
         if (destroySelectVo.getStartTime() != null) {

dev-destroy/src/main/java/com/tykj/dev/device/destroy/service/Impl/DeviceDestroyQueryServiceImpl.java

@@ -4,6 +4,7 @@ import com.tykj.dev.device.destroy.entity.domain.DeviceDestroyBill;
 import com.tykj.dev.device.destroy.entity.vo.DestroySelectVo;
 import com.tykj.dev.device.destroy.service.DeviceDestroyBillService;
 import com.tykj.dev.device.destroy.service.DeviceDestroyQueryService;
+import com.tykj.dev.device.file.entity.FileRet;
 import com.tykj.dev.device.task.service.TaskService;
 import com.tykj.dev.device.task.subject.bto.TaskBto;
 import com.tykj.dev.device.task.subject.domin.Task;
@@ -17,6 +18,8 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 /**
@@ -64,4 +67,11 @@ public class DeviceDestroyQueryServiceImpl implements DeviceDestroyQueryService
     public Page<DeviceDestroyBill> findPageDeviceDestroyBill(DestroySelectVo destroySelectVo) {
         return deviceDestroyBillService.findPageDeviceDestroyBill(destroySelectVo);
     }
+
+
+    @Override
+    public Map<String, List<FileRet>> findByTaskIdToFileMapList(Integer taskId) {
+        TaskBto taskBto= taskService.get(taskId);
+        return deviceDestroyBillService.findByIdToFileMapList(taskBto.getBillId());
+    }
 }

dev-packing/pom.xml

@@ -33,6 +33,10 @@
             <groupId>com.tykj</groupId>
             <artifactId>dev-library</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.tykj</groupId>
+            <artifactId>dev-file</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.tykj.dev</groupId>
             <artifactId>blockcha</artifactId>

dev-packing/src/main/java/com/tykj/dev/device/packing/controller/PackingController.java

@@ -2,6 +2,7 @@ package com.tykj.dev.device.packing.controller;
 
 import com.tykj.dev.config.cache.ConfigCache;
 import com.tykj.dev.config.swagger.AutoDocument;
+import com.tykj.dev.device.file.service.FilesUtil;
 import com.tykj.dev.device.library.repository.DeviceLibraryDao;
 import com.tykj.dev.device.library.service.DeviceLibraryService;
 import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
@@ -292,6 +293,7 @@ public class PackingController {
         resultList.removeAll(childs);
         childs.forEach(packingLibrary -> {
             List<PackingLibrary> in = packingLibraryDao.findAllByPartParentIdAndPackingStatusIn(packingLibrary.getId(), statuses);
+            packingLibrary.setFileList(FilesUtil.stringFileToList(packingLibrary.getFileDb()));
             if (in == null || in.size() == 0) {
                 resultList.add(packingLibrary);
             }
@@ -676,6 +678,14 @@ public class PackingController {
             packingLibrary.setFileUrl(packingLibraryUpdateVo.getFileUrl());
             packingLibrary.setFileName(packingLibraryUpdateVo.getFileName());
         }
+        if (packingLibraryUpdateVo.getFileList()!=null&&!FilesUtil.stringFileToList(packingLibraryUpdateVo.getFileList()).equals(packingLibrary.getFileDb())){
+            //添加列装日志
+            PackingLog packingLog = new PackingLog();
+            packingLog.setRemark("更新列装设备文件");
+            packingLog.setPackingId(packingLibrary.getId());
+            packingLogService.add(packingLog);
+            packingLibrary.setFileDb(FilesUtil.stringFileToList(packingLibraryUpdateVo.getFileList()));
+        }
 
         packingLibraryService.update(packingLibrary);
         //发送阅知信息

dev-packing/src/main/java/com/tykj/dev/device/packing/subject/domin/PackingLibrary.java

 package com.tykj.dev.device.packing.subject.domin;
 
 import com.tykj.dev.config.cache.ConfigCache;
+import com.tykj.dev.device.file.entity.FileRet;
 import com.tykj.dev.misc.utils.SpringUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -153,6 +154,21 @@ public class PackingLibrary {
 
     @ApiModelProperty(value = "装备存放位置",notes = "默认是库房")
     private String storageLocation;
+
+    /**
+     * 附件Db
+     */
+    @ApiModelProperty(value = "附件名称")
+    @Column(name = "file_db",columnDefinition = "TEXT")
+    private String fileDb;
+
+    /**
+     * 附件名称集合
+     */
+    @Transient
+    @ApiModelProperty(value = "附件名称")
+    private List<FileRet> fileList;
+
     /**
      * 附件url地址
      */
@@ -249,6 +265,7 @@ public class PackingLibrary {
     @Transient
     private String natureName;
 
+
     @Transient
     private Integer devNum;
 

dev-packing/src/main/java/com/tykj/dev/device/packing/subject/vo/AddPack.java

 package com.tykj.dev.device.packing.subject.vo;
 
+import com.tykj.dev.device.file.entity.FileRet;
+import com.tykj.dev.device.file.service.FilesUtil;
 import com.tykj.dev.device.packing.subject.domin.PackingLibrary;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -7,7 +9,9 @@ import lombok.Data;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Repository;
 
+import javax.persistence.Transient;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * @author dengdiyi
@@ -75,6 +79,13 @@ public class AddPack {
     @ApiModelProperty(value = "附件路径", example = "没有先填一个空格")
     private String fileUrl;
 
+    /**
+     * 附件名称集合
+     */
+    @ApiModelProperty(value = "附件名称")
+    private List<FileRet> fileList;
+
+
     @ApiModelProperty(value = "父级ID", example = "1")
     private Integer partParentId;
 
@@ -83,6 +94,7 @@ public class AddPack {
         BeanUtils.copyProperties(this, packingLibraryEntity);
         packingLibraryEntity.setPackingStatus(2);
         packingLibraryEntity.setIsRoot(0);
+        packingLibraryEntity.setFileDb(FilesUtil.stringFileToList(fileList));
         return packingLibraryEntity;
     }
 }

dev-packing/src/main/java/com/tykj/dev/device/packing/subject/vo/PackingLibraryUpdateVo.java

 package com.tykj.dev.device.packing.subject.vo;
 
+import com.tykj.dev.device.file.entity.FileRet;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.stereotype.Repository;
 
+import javax.persistence.Transient;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * @author dengdiyi
@@ -78,4 +81,11 @@ public class PackingLibraryUpdateVo {
     @ApiModelProperty(value = "附件路径", example = "没有先填一个空格")
     private String fileUrl;
 
+    /**
+     * 附件名称集合
+     */
+    @ApiModelProperty(value = "附件名称")
+    private List<FileRet> fileList;
+
+
 }

dev-scrap/src/main/java/com/tykj/dev/device/scrap/service/ScrapQueryService.java

 package com.tykj.dev.device.scrap.service;
 
+import com.tykj.dev.device.file.entity.FileRet;
 import com.tykj.dev.device.scrap.subject.domin.Scrap;
 import com.tykj.dev.device.scrap.subject.vo.ScrapSelectVo;
 import com.tykj.dev.device.task.subject.bto.TaskBto;
 import org.springframework.data.domain.Page;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author zjm
  * @version 1.0.0
@@ -25,4 +29,8 @@ public interface ScrapQueryService {
 
     TaskBto findApplyIdToScrapTask(Integer applyId);
 
+    /**
+     * 根据taskId查询相关文件接口（设备日志使用）
+     */
+    Map<String, List<FileRet>> findByTaskIdToFileMapList(Integer taskId);
 }

dev-scrap/src/main/java/com/tykj/dev/device/scrap/service/ScrapService.java

 package com.tykj.dev.device.scrap.service;
 
+import com.tykj.dev.device.file.entity.FileRet;
 import com.tykj.dev.device.scrap.subject.domin.Scrap;
 import com.tykj.dev.device.scrap.subject.vo.ScrapSelectVo;
 import org.springframework.data.domain.Page;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 public interface ScrapService {
@@ -41,4 +43,5 @@ public interface ScrapService {
     Optional<Scrap> findApplyId(Integer applyId);
 
 
+    Map<String, List<FileRet>> findByIdToFileMapList(Integer id);
 }

dev-scrap/src/main/java/com/tykj/dev/device/scrap/service/impl/ScrapQueryServiceImpl.java

@@ -2,6 +2,7 @@ package com.tykj.dev.device.scrap.service.impl;
 
 import com.github.wenhao.jpa.PredicateBuilder;
 import com.github.wenhao.jpa.Specifications;
+import com.tykj.dev.device.file.entity.FileRet;
 import com.tykj.dev.device.scrap.service.ScrapQueryService;
 import com.tykj.dev.device.scrap.service.ScrapService;
 import com.tykj.dev.device.scrap.subject.domin.Scrap;
@@ -22,6 +23,8 @@ import org.springframework.stereotype.Service;
 import javax.persistence.Transient;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 /**
@@ -68,4 +71,10 @@ public class ScrapQueryServiceImpl implements ScrapQueryService {
             }
         }
     }
+
+    @Override
+    public Map<String, List<FileRet>> findByTaskIdToFileMapList(Integer taskId) {
+        TaskBto taskBto= taskService.get(taskId);
+        return scrapService.findByIdToFileMapList(taskBto.getBillId());
+    }
 }

dev-scrap/src/main/java/com/tykj/dev/device/scrap/service/impl/ScrapServiceImpl.java

@@ -4,6 +4,8 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.wenhao.jpa.PredicateBuilder;
 import com.github.wenhao.jpa.Specifications;
 import com.tykj.dev.blockcha.subject.service.BlockChainUtil;
+import com.tykj.dev.config.base.FileName;
+import com.tykj.dev.device.file.entity.FileRet;
 import com.tykj.dev.device.file.service.FilesUtil;
 import com.tykj.dev.device.library.repository.DeviceLibraryDao;
 import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
@@ -26,10 +28,7 @@ import org.springframework.stereotype.Service;
 
 import javax.persistence.Transient;
 import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
@@ -138,6 +137,23 @@ public class ScrapServiceImpl implements ScrapService {
         return scrapDao.findByApplyId(applyId);
     }
 
+    @Override
+    public Map<String, List<FileRet>> findByIdToFileMapList(Integer id) {
+        Map<String, List<FileRet>> map=new HashMap<>();
+        Optional<Scrap> optional = scrapDao.findById(id);
+        if (optional.isPresent()){
+            Scrap deviceDestroyBill=optional.get();
+            map.put(FileName.APPLY.name,FilesUtil.stringFileToList(deviceDestroyBill.getApplyFiles()));
+            map.put(FileName.DESTROY.name,FilesUtil.stringFileToList(deviceDestroyBill.getOutboundFile()));
+            map.put(FileName.REPLY.name,FilesUtil.stringFileToList(deviceDestroyBill.getReplyFiles()));
+            map.put(FileName.SIGN.name,FilesUtil.stringFileToList(deviceDestroyBill.getBillFile()));
+            return map;
+        }else {
+            log.info("[销毁] 详情查看错误，id没有找到{}",id);
+            throw new ApiException(ResponseEntity.status(500).body("销毁详情id没有找到:"+id));
+        }
+    }
+
 
     private List<DeviceLibrary> findInvoleDevice(String involeDevice){
         if (involeDevice!=null && !involeDevice.equals(",") ) {

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/DeviceRepelDetailServiceImpl.java

@@ -126,7 +126,7 @@ public class DeviceRepelDetailServiceImpl implements DeviceRepelDetailService {
         if (optional.isPresent()){
             DeviceRepelDetail deviceRepelDetail=optional.get();
             map.put(FileName.APPLY.name,FilesUtil.stringFileToList(deviceRepelDetail.getApplyFiles()));
-            map.put(FileName.RECEIPT.name,FilesUtil.stringFileToList(deviceRepelDetail.getApplyFiles()));
+            map.put(FileName.RECEIPT.name,FilesUtil.stringFileToList(deviceRepelDetail.getOutboundFile()));
             map.put(FileName.SIGN.name,FilesUtil.stringFileToList(deviceRepelDetail.getBillFile()));
             map.put(FileName.REPLY.name,FilesUtil.stringFileToList(deviceRepelDetail.getReplyFiles()));
             return map;

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelQueryServiceImpl.java

@@ -619,7 +619,6 @@ public class RepelQueryServiceImpl implements RepelQueryService {
 
     @Override
     public Map<String, List<FileRet>> findByTaskIdToFileMapList(Integer taskId) {
-        Map<String, List<FileRet>> map =new HashMap<>();
         TaskBto taskBto= taskService.get(taskId);
         return repelDetailService.findByIdToFileMapList(taskBto.getBillId());
     }