更新

dev-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBackBillController.java

@@ -176,7 +176,9 @@ public class AllotBackBillController {
 //        taskService.moveToNext(taskBto, allotBackReceiveVo.getReceiveUserbId());
         //分隔装备id信息
         List<FileVo> fileVoList = new ArrayList<>();
-        fileVoList.add(new FileVo("退回单", allotBackReceiveVo.getBillFileName(), allotBackReceiveVo.getBillFileUrl()));
+        if (allotBackReceiveVo.getBillFileName()!=null&&allotBackReceiveVo.getBillFileUrl()!=null) {
+            fileVoList.add(new FileVo("退回单", allotBackReceiveVo.getBillFileName(), allotBackReceiveVo.getBillFileUrl()));
+        }
 //        fileVoList.add(new FileVo("入库确认单", allotBackReceiveVo.getReceiveFileName(), allotBackReceiveVo.getReceiveFileUrl()));
         String deviceIdDetail = allotBackReceiveVo.getReceiveCheckDetail();
         if (deviceIdDetail != null) {

dev-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBillController.java

@@ -296,7 +296,9 @@ public class AllotBillController {
         TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.ALLOTING);
         AllotBill allotBillEntity = allotBillService.getOne(taskBto.getBillId());
         List<FileVo> fileVoList = new ArrayList<>();
-        fileVoList.add(new FileVo("配发单", allotReceiveVo.getBillFileName(), allotReceiveVo.getBillFileUrl()));
+        if (allotReceiveVo.getBillFileName()!=null&&allotReceiveVo.getBillFileUrl()!=null) {
+            fileVoList.add(new FileVo("配发单", allotReceiveVo.getBillFileName(), allotReceiveVo.getBillFileUrl()));
+        }
 //        fileVoList.add(new FileVo("入库确认单", allotReceiveVo.getReceiveFileName(), allotReceiveVo.getReceiveFileUrl()));
         //更新账单状态
         allotBillEntity.setAllotStatus(5);

dev-allot/src/main/java/com/tykj/dev/device/allot/subject/domin/AllotBackBill.java

@@ -168,9 +168,15 @@ public class AllotBackBill {
     @Column(name = "send_files",columnDefinition = "TEXT")
     private String sendFiles;
 
+    @Column(name = "apply_files",columnDefinition = "TEXT")
+    private String applyFiles;
+
     @Transient
     private List<FileRet> replyFileList = new ArrayList<>();
 
     @Transient
     private List<FileRet> sendFileList = new ArrayList<>();
+
+    @Transient
+    private List<FileRet> applyFileList = new ArrayList<>();
 }

dev-allot/src/main/java/com/tykj/dev/device/allot/subject/domin/AllotBill.java

@@ -246,12 +246,18 @@ public class AllotBill {
     @Column(name = "reply_files",columnDefinition = "TEXT")
     private String replyFiles;
 
+    @Column(name = "apply_files",columnDefinition = "TEXT")
+    private String applyFiles;
+
     @Column(name = "send_files",columnDefinition = "TEXT")
     private String sendFiles;
 
     @Transient
     private List<FileRet> replyFileList = new ArrayList<>();
 
+    @Transient
+    private List<FileRet> applyFileList = new ArrayList<>();
+
     @Transient
     private List<FileRet> sendFileList = new ArrayList<>();
 }

dev-allot/src/main/java/com/tykj/dev/device/allot/subject/vo/AllotBillSaveVo.java

@@ -85,6 +85,9 @@ public class AllotBillSaveVo {
     @ApiModelProperty(value = "入库类型")
     private Integer allotType;
 
+    @ApiModelProperty(value = "申请文号附件名")
+    private List<FileRet> applyFiles;
+
     @ApiModelProperty(value = "批复文号附件名")
     private List<FileRet> replyFiles;
 
@@ -94,6 +97,9 @@ public class AllotBillSaveVo {
         if(this.replyFiles!=null&&this.replyFiles.size()>0){
             allotBillEntity.setReplyFiles(FilesUtil.stringFileToList(this.replyFiles));
         }
+        if(this.applyFiles!=null&&this.applyFiles.size()>0){
+            allotBillEntity.setApplyFiles(FilesUtil.stringFileToList(this.applyFiles));
+        }
         allotBillEntity.setAllotStatus(2);
         allotBillEntity.setSendTime(TimestampUtil.getCurrentTimestamp());
         return allotBillEntity;
@@ -105,6 +111,9 @@ public class AllotBillSaveVo {
         if(this.replyFiles!=null&&this.replyFiles.size()>0){
             allotBillEntity.setReplyFiles(FilesUtil.stringFileToList(this.replyFiles));
         }
+        if(this.applyFiles!=null&&this.applyFiles.size()>0){
+            allotBillEntity.setApplyFiles(FilesUtil.stringFileToList(this.applyFiles));
+        }
         allotBillEntity.setBackStatus(0);
         allotBillEntity.setSendTime(TimestampUtil.getCurrentTimestamp());
         allotBillEntity.setBackCheckDetail(this.allotCheckDetail);

dev-apply/src/main/java/com/tykj/dev/device/apply/subject/domin/DeviceApplyBill.java

 package com.tykj.dev.device.apply.subject.domin;
 
+import com.tykj.dev.device.file.entity.FileRet;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,7 +13,9 @@ import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import javax.persistence.*;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * entity class for device_apply_bill
@@ -124,4 +127,19 @@ public class DeviceApplyBill {
 
     @Column(name = "apply_files",columnDefinition = "TEXT")
     private String applyFiles;
+
+    @Column(name = "apply_num_files",columnDefinition = "TEXT")
+    private String applyNumFiles;
+
+    @Column(name = "reply_files",columnDefinition = "TEXT")
+    private String replyFiles;
+
+    @Transient
+    private List<FileRet> replyFileList = new ArrayList<>();
+
+    @Transient
+    private List<FileRet> applyFileList = new ArrayList<>();
+
+    @Transient
+    private List<FileRet> applyNumFileList = new ArrayList<>();
 }

dev-apply/src/main/java/com/tykj/dev/device/apply/subject/vo/DeviceApplySaveVo.java

@@ -57,6 +57,12 @@ public class DeviceApplySaveVo {
     @ApiModelProperty(value = "申请附件")
     private List<FileRet> applyFiles;
 
+    @ApiModelProperty(value = "申请文号附件")
+    private List<FileRet> applyNumFiles;
+
+    @ApiModelProperty(value = "批复文号附件名")
+    private List<FileRet> replyFiles;
+
     public DeviceApplyBill toDo() {
         DeviceApplyBill deviceApplyBillEntity = new DeviceApplyBill();
         BeanUtils.copyProperties(this, deviceApplyBillEntity);
@@ -73,6 +79,12 @@ public class DeviceApplySaveVo {
         if(this.applyFiles!=null&&this.applyFiles.size()>0){
             deviceApplyBillEntity.setApplyFiles(FilesUtil.stringFileToList(this.applyFiles));
         }
+        if(this.applyNumFiles!=null&&this.applyNumFiles.size()>0){
+            deviceApplyBillEntity.setApplyNumFiles(FilesUtil.stringFileToList(this.applyNumFiles));
+        }
+        if(this.replyFiles!=null&&this.replyFiles.size()>0){
+            deviceApplyBillEntity.setReplyFiles(FilesUtil.stringFileToList(this.replyFiles));
+        }
         return deviceApplyBillEntity;
     }
 

dev-confirmcheck/pom.xml

@@ -38,6 +38,10 @@
             <groupId>com.tykj</groupId>
             <artifactId>dev-packing</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.tykj</groupId>
+            <artifactId>dev-file</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/controller/DeviceCheckController.java

@@ -15,6 +15,8 @@ import com.tykj.dev.device.confirmcheck.repository.DeviceCheckDetailDao;
 import com.tykj.dev.device.confirmcheck.repository.DeviceCheckStatDao;
 import com.tykj.dev.device.confirmcheck.service.ConfirmCheckService;
 import com.tykj.dev.device.confirmcheck.utils.ObjTransUtil;
+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;
 import com.tykj.dev.device.task.repository.TaskDao;
@@ -424,7 +426,7 @@ public class DeviceCheckController {
     public ResponseEntity<ResultObj> checkUserB(@PathVariable Integer id,
                                                 @RequestParam int checkStatus,
                                                 @RequestParam(required = false, defaultValue = "0") int checkUserAId,
-                                                @RequestParam(required = false, defaultValue = "0") int checkUserBId) {
+                                                @RequestParam(required = false, defaultValue = "0") int checkUserBId,@RequestBody List<FileRet> checkFiles) {
         log.info("[核查模块] 专管员B正在进行核查操作，核查账单id为 {} ,且审核状态为 : {}", id, checkStatus == 1 ? "通过" : "不通过");
         if (checkStatus == 0) {
             return ResponseEntity.status(400).body(new ResultObj<>("checkStatus不应该为0!"));
@@ -450,6 +452,12 @@ public class DeviceCheckController {
 
             // 如果是4流程的，则需要指定核查组成员A接任务
             detailRepo.updateCheckStatus(id, checkStatus);
+            //是否上传检查单
+            if (checkFiles!=null&&checkFiles.size()>0){
+                DeviceCheckDetail deviceCheckDetail = detailRepo.findById(id).get();
+                deviceCheckDetail.setCheckFiles(FilesUtil.stringFileToList(checkFiles));
+                detailRepo.save(deviceCheckDetail);
+            }
             if (userAId > 0 && userBId > 0) {
                 log.info("[核查模块] 该详情任务是一个4流程任务，推送到C状态...");
                 taskService.moveToNext(currentTask, userAId);

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/domain/DeviceCheckDetail.java

 package com.tykj.dev.device.confirmcheck.entity.domain;
 
+import com.tykj.dev.device.file.entity.FileRet;
 import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
 import com.tykj.dev.misc.base.BaseEntity;
 import com.tykj.dev.misc.utils.TimestampUtil;
@@ -14,6 +15,8 @@ import org.springframework.util.StringUtils;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -130,6 +133,12 @@ public class DeviceCheckDetail extends BaseEntity {
     @ApiModelProperty(value = "区块链记录id")
     private String recordId;
 
+    @Column(name = "check_files",columnDefinition = "TEXT")
+    private String checkFiles;
+
+    @Transient
+    private List<FileRet> checkFileList = new ArrayList<>();
+
     /**
      * 用于生成市级的核查详情账单的构造函数
      */

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/vo/CheckDetailVo.java

 package com.tykj.dev.device.confirmcheck.entity.vo;
 
+import com.tykj.dev.device.file.entity.FileRet;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -120,5 +122,5 @@ public class CheckDetailVo {
     @ApiModelProperty(value = "备注")
     private String  remark;
 
-
+    private List<FileRet> checkFileList = new ArrayList<>();
 }

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/service/impl/ConfirmCheckServiceImpl.java

@@ -309,6 +309,7 @@ public class ConfirmCheckServiceImpl implements ConfirmCheckService, CommandLine
     @Override
     public Page<CheckStatTableVo> findAllStatTable(String keyword, int page, int size) {
         List<CheckStatTableVo> tableVos = statDao.findAll().stream()
+                .filter(deviceCheckStat -> !"[]".equals(deviceCheckStat.getStatInfo()))
                 .map(objTransUtil::stat2TableVo)
                 .filter(vo -> keywordFilter(vo, keyword))
                 .collect(Collectors.toList());

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/utils/ObjTransUtil.java

@@ -7,6 +7,7 @@ import com.tykj.dev.device.confirmcheck.entity.domain.DeviceCheckBill;
 import com.tykj.dev.device.confirmcheck.entity.domain.DeviceCheckDetail;
 import com.tykj.dev.device.confirmcheck.entity.domain.DeviceCheckStat;
 import com.tykj.dev.device.confirmcheck.entity.vo.*;
+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;
 import com.tykj.dev.device.packing.service.PackingLibraryService;
@@ -302,6 +303,10 @@ public class ObjTransUtil {
 
         detailVo.setRemark(detailDo.getRemark());
 
+        //核查签字单
+        if (detailDo.getCheckFiles()!=null){
+            detailVo.setCheckFileList(FilesUtil.stringFileToList(detailDo.getCheckFiles()));
+        }
         return detailVo;
 
     }

dev-destroy/pom.xml

@@ -40,5 +40,9 @@
             <groupId>com.tykj.dev</groupId>
             <artifactId>blockcha</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.tykj</groupId>
+            <artifactId>dev-file</artifactId>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file

dev-destroy/src/main/java/com/tykj/dev/device/destroy/entity/domain/DeviceDestroyBill.java

@@ -158,7 +158,7 @@ public class DeviceDestroyBill {
     @ApiModelProperty(value = "区块链记录id")
     private String recordId;
 
-    @ApiModelProperty(value = "区块链记录id")
+    @ApiModelProperty(value = "单号")
     @Transient
     private String num;
 

dev-library/src/main/java/com/tykj/dev/device/library/service/impl/DeviceLibraryServiceImpl.java

@@ -13,6 +13,7 @@ import com.tykj.dev.device.library.subject.vo.DeviceStatisticsVo;
 import com.tykj.dev.device.user.subject.service.UserPublicService;
 import com.tykj.dev.device.user.util.UserUtils;
 import com.tykj.dev.misc.exception.ApiException;
+import com.tykj.dev.misc.utils.DeviceSeqUtil;
 import com.tykj.dev.misc.utils.GetTreeUtils;
 import com.tykj.dev.misc.utils.JacksonUtil;
 import com.tykj.dev.misc.utils.ResultUtil;
@@ -632,6 +633,9 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
             if (deviceLibrarySelectVo.getEndTime() != null) {
                 predicateBuilder.lt("updateTime", deviceLibrarySelectVo.getEndTime());
             }
+            if (deviceLibrarySelectVo.getSeqInterval()!=null){
+                predicateBuilder.in("seqNumber", DeviceSeqUtil.selectDeviceSeqs(deviceLibrarySelectVo.getSeqInterval()));
+            }
         }
         return predicateBuilder;
     }

dev-library/src/main/java/com/tykj/dev/device/library/subject/vo/DeviceLibrarySelectVo.java

@@ -77,4 +77,7 @@ public class DeviceLibrarySelectVo extends CustomPage {
 
     @ApiModelProperty(value = "是不是配件（0:不是，1:是）")
     private Integer isPart;
+
+    @ApiModelProperty(value = "序列号区间")
+    private String seqInterval;
 }

dev-misc/src/main/java/com/tykj/dev/misc/utils/DeviceSeqUtil.java

@@ -18,7 +18,7 @@ public class DeviceSeqUtil {
 
     public static void main(String[] args) {
         List<String> list=new ArrayList<>();
-        list.add("30338343766");
+        list.add(null);
         list.add("30338343767");
         list.add("30338343768");
         list.add("30338343769");
@@ -171,6 +171,50 @@ public class DeviceSeqUtil {
         return seqs;
     }
 
+    /**
+     * @param s 序列号区间字符串
+     * @return 查询的序列号列表
+     * 根据序列号规则和区间字符串查询一段序列号
+     */
+    public static List<String> selectDeviceSeqs(String s){
+        List<String> seqs = new ArrayList<>();
+        if (s!=null&&s.length()>0) {
+            //按,分隔多个区间
+            String[] strings = s.split(",");
+            if (strings.length==1){
+                if (isSingle(strings[0])) {
+                    String num1 = strings[0].replaceAll(".*[^\\d](?=(\\d+))", "");
+                    Long minSeq = Long.parseLong(num1);
+                    for (int i = 0; i < 1; i++) {
+                        StringBuffer stringBuffer = new StringBuffer();
+                        //拼接数字之前的字符串
+                        stringBuffer.append(s, 0, s.length() - num1.length());
+                        //将数字按长度格式化，缺位补0
+                        String codeFormat = "%0" + num1.length() + "d";
+                        stringBuffer.append(String.format(codeFormat, minSeq));
+                        seqs.add(stringBuffer.toString());
+                        minSeq++;
+                    }
+                }
+                else {
+                    seqs.addAll(getIntervalSeqs2(strings[0]));
+                }
+            }
+            else {
+                for (String str : strings) {
+                    if (str.length() > 0) {
+                        if (isSingle(str)) {
+                            seqs.add(str);
+                        } else {
+                            seqs.addAll(getIntervalSeqs2(str));
+                        }
+                    }
+                }
+            }
+        }
+        return seqs;
+    }
+
     /**
      * @param s 区间字符串
      * 判断是单个序列号还是序列号区间，若是单个序列号返回true，否则返回false
@@ -183,7 +227,7 @@ public class DeviceSeqUtil {
      * @param s 区间字符串
      * 根据区间字符串获取该区间序列号列表
      */
-    private static List<String> getIntervalSeqs(String s){
+    public static List<String> getIntervalSeqs(String s){
         List<String> stringList = new ArrayList<>();
         //根据-分隔
         String[] strings = s.split("-");
@@ -230,6 +274,57 @@ public class DeviceSeqUtil {
         return stringList;
     }
 
+    /**
+     * @param s 区间字符串
+     * 根据区间字符串获取该区间序列号列表(规则错误返空列表)
+     */
+    public static List<String> getIntervalSeqs2(String s){
+        List<String> stringList = new ArrayList<>();
+        //根据-分隔
+        String[] strings = s.split("-");
+        if(strings.length==2){
+            //左区间字符串
+            String s1 = strings[0];
+            //右区间字符串
+            String s2 = strings[1];
+            if (s1.length()!=s2.length()){
+                return stringList;
+            }
+            else {
+                //获得左区间最后几位的数字
+                String num1 = s1.replaceAll(".*[^\\d](?=(\\d+))", "");
+                //获得右区间最后几位的数字
+                String num2 = s2.replaceAll(".*[^\\d](?=(\\d+))", "");
+                if (num1.length() != num2.length()){
+                    return stringList;
+                }
+                else {
+                    Long minSeq = Long.parseLong(num1);
+                    Long maxSeq = Long.parseLong(num2);
+                    if (maxSeq<minSeq){
+                        return stringList;
+                    }
+                    else {
+                        while (minSeq<=maxSeq){
+                            StringBuffer stringBuffer = new StringBuffer();
+                            //拼接数字之前的字符串
+                            stringBuffer.append(s1, 0, s1.length()-num1.length());
+                            //将数字按长度格式化，缺位补0
+                            String codeFormat = "%0"+ num1.length() +"d";
+                            stringBuffer.append(String.format(codeFormat,minSeq));
+                            stringList.add(stringBuffer.toString());
+                            minSeq++;
+                        }
+                    }
+                }
+            }
+        }
+        else {
+            return stringList;
+        }
+        return stringList;
+    }
+
 
     /**
      * 将连续的序列号组合成一个字符串

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

@@ -174,7 +174,7 @@ public class PackingController {
                 packingLibraryService.update(p);
             }
         }
-        return ResponseEntity.ok("添加成功");
+        return ResponseEntity.ok(order);
     }
 
     @ApiOperation(value = "添加列装装备")

dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairBillSelectController.java

@@ -21,6 +21,7 @@ import com.tykj.dev.device.task.subject.bto.TaskBto;
 import com.tykj.dev.device.task.subject.vo.TaskSelectVo;
 import com.tykj.dev.device.task.subject.vo.TaskUserVo;
 import com.tykj.dev.device.task.utils.TaskUtils;
+import com.tykj.dev.device.user.subject.service.UserPublicService;
 import com.tykj.dev.misc.base.RepairStatusEnum;
 import com.tykj.dev.misc.utils.PageUtil;
 import com.tykj.dev.misc.utils.ResultUtil;
@@ -31,6 +32,8 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -70,6 +73,9 @@ public class RepairBillSelectController {
     @Autowired
     private RepairController repairController;
 
+    @Autowired
+    private UserPublicService userPublicService;
+
     @ApiOperation(value = "查询工作台维修装备数量", notes = "可以通过这个接口查询工作台维修装备数量")
     @GetMapping(value = "/repairNum")
     public ResponseEntity getRepairNum(){
@@ -88,10 +94,10 @@ public class RepairBillSelectController {
     public ResponseEntity selectRepairTasks(@RequestBody TaskSelectVo taskSelectVo){
         List<TaskUserVo> taskUserVos;
         if (taskSelectVo.getSelectNum()==2){
-            taskUserVos = taskService.getManageList(taskSelectVo).stream().filter(taskUserVo -> taskUserVo.getBillStatus()==704||taskUserVo.getBillStatus()==804).collect(Collectors.toList());
+            taskUserVos = taskService.getManageList(taskSelectVo).stream().filter(taskUserVo -> taskUserVo.getBillStatus()==704||taskUserVo.getBillStatus()==804).sorted(Comparator.comparing(TaskUserVo::getCreateTime,Comparator.nullsLast(Date::compareTo)).reversed()).collect(Collectors.toList());
         }
         else {
-            taskUserVos = taskService.getManageList(taskSelectVo).stream().filter(taskUserVo -> taskUserVo.getBusinessType()==5||taskUserVo.getBusinessType()==10).collect(Collectors.toList());
+            taskUserVos = taskService.getManageList(taskSelectVo).stream().filter(taskUserVo -> taskUserVo.getBusinessType()==5||taskUserVo.getBusinessType()==10).sorted(Comparator.comparing(TaskUserVo::getCreateTime,Comparator.nullsLast(Date::compareTo)).reversed()).collect(Collectors.toList());
         }
         return ResultUtil.success(PageUtil.getPerPage(taskSelectVo.getPage(), taskSelectVo.getSize(), taskUtils.orderByTopDesc(taskUserVos), taskSelectVo.getPageable()));
     }
@@ -161,6 +167,18 @@ public class RepairBillSelectController {
         List<Object> list = new ArrayList<>();
         //获取维修单
         RepairBackBill repairBackBill = repairBackBillService.getOne(id);
+        if (repairBackBill.getStartUseraId() != null) {
+            repairBackBill.setStartUserA(userPublicService.getOne(repairBackBill.getStartUseraId()).getName());
+        }
+        if (repairBackBill.getStartUserbId() != null) {
+            repairBackBill.setStartUserB(userPublicService.getOne(repairBackBill.getStartUserbId()).getName());
+        }
+        if (repairBackBill.getReceiveUseraId() != null) {
+            repairBackBill.setReceiveUserA(userPublicService.getOne(repairBackBill.getReceiveUseraId()).getName());
+        }
+        if (repairBackBill.getReceiveUserbId() != null) {
+            repairBackBill.setReceiveUserB(userPublicService.getOne(repairBackBill.getReceiveUserbId()).getName());
+        }
         list.add(repairBackBill);
         repairBackBill.setSendFileList(FilesUtil.stringFileToList(repairBackBill.getSendFiles()));
         List<DeviceLibrary> deviceLibraries = new ArrayList<>();

dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java

@@ -462,7 +462,9 @@ public class RepairController {
         //任务推至下一阶段
 //        taskService.moveToSpecial(taskBto,StatusEnum.REPAIRING);
         if (repairReceiveVo.getStatus()==0) {
-            fileVoList.add(new FileVo("维修单", repairSendBill.getBillFileName(), repairSendBill.getBillFileUrl()));
+            if (repairSendBill.getBillFileName()!=null&&repairSendBill.getBillFileUrl()!=null) {
+                fileVoList.add(new FileVo("维修单", repairSendBill.getBillFileName(), repairSendBill.getBillFileUrl()));
+            }
             taskService.moveToEnd(taskBto);
         }
         else {
@@ -869,9 +871,12 @@ public class RepairController {
 //            }
 //            RepairSendBill repairSendBill = deviceRepairSendBillDao.findByDeviceRepairBillId(taskBto.getBillId());
             repairBackBill = new RepairBackBill();
-            repairBackBill.setSendUnit(deviceRepairDetailService.getOne(repairReceiveVo.getDeviceList().get(0).getId()).getLocationUnit());
+            repairBackBill.setSendUnit(deviceLibraryService.getOne(repairReceiveVo.getDeviceList().get(0).getDeviceId()).getLocationUnit());
             repairBackBill.setReceiveUnit(userUtils.getCurrentUserUnitName());
             repairBackBill.setBackCheckDetail(repairReceiveVo.getReceiveCheckDetail());
+            repairBackBill.setStartUseraId(repairReceiveVo.getStartUseraId());
+            repairBackBill.setStartUserbId(repairReceiveVo.getStartUserbId());
+            repairBackBill.setReceiveUserbId(repairReceiveVo.getReceiveUserbId());
 //            repairBackBill.setDeviceRepairBillId(taskBto.getBillId());
         }
         String deviceIdDetail = repairReceiveVo.getReceiveCheckDetail();
@@ -891,7 +896,9 @@ public class RepairController {
         repairBackBill.setReceiveUserbId(repairReceiveVo.getReceiveUserbId());
         RepairBackBill repairBackBill1 = deviceRepairBackBillService.update(repairBackBill);
         List<FileVo> fileVoList = new ArrayList<>();
-        fileVoList.add(new FileVo("回执单", repairBackBill.getBillFileName(), repairBackBill.getBillFileUrl()));
+        if (repairBackBill.getBillFileName()!=null&&repairBackBill.getBillFileUrl()!=null) {
+            fileVoList.add(new FileVo("回执单", repairBackBill.getBillFileName(), repairBackBill.getBillFileUrl()));
+        }
 //        fileVoList.add(new FileVo("入库确认单", repairBackBill.getReceiveFileName(), repairBackBill.getReceiveFileUrl()));
         TaskBto taskBto2;
         Map<Integer,List<Integer>> messageMap = new HashMap<>();
@@ -1349,6 +1356,7 @@ public class RepairController {
                 repairBillDetailVo.setRepairBill(repairBill);
                 //获取装备列表
                 RepairSendBill repairSendBill = deviceRepairSendBillDao.findByDeviceRepairBillId(repairBill.getId());
+                repairSendBill.setSendFileList(FilesUtil.stringFileToList(repairSendBill.getSendFiles()));
                 repairBillDetailVo.setRepairSendBill(repairSendBill);
                 List<DeviceLibrary> deviceLibraries = new ArrayList<>();
                 if (repairSendBill.getRepairDeviceCheckDetail() != null) {
@@ -1402,6 +1410,7 @@ public class RepairController {
             case 10:
                 //获取维修退回单
                 RepairBackBill repairBackBill = deviceRepairBackBillService.getOne(taskBto.getBillId());
+                repairBackBill.setSendFileList(FilesUtil.stringFileToList(repairBackBill.getSendFiles()));
                 repairBillDetailVo.setRepairBackBill(repairBackBill);
                 //获取送修单
 //                RepairBill repairBill1 = deviceRepairBillService.getOne(taskService.get(taskBto.getParentTaskId()).getBillId());

dev-repair/src/main/java/com/tykj/dev/device/repair/subject/vo/RepairReceiveVo.java

@@ -59,6 +59,12 @@ public class RepairReceiveVo {
     @ApiModelProperty(value = "是否缺失单据（0：否，1：是）")
     private Integer status = 0;
 
+    @ApiModelProperty(value = "维修完成退回经办人id(省A岗)")
+    private Integer startUseraId;
+
+    @ApiModelProperty(value = "维修完成退回审核人id(省B岗)")
+    private Integer startUserbId;
+
     @ApiModelProperty(value = "维修装备详情列表")
     private List<DeviceDetailVo> deviceList = new ArrayList<>();
 }

dev-rfid/src/main/java/com/tykj/dev/rfid/service/impl/RfidServiceImpl.java

@@ -183,7 +183,8 @@ public class RfidServiceImpl implements RfidService {
             if (r.getDeviceTId() == null) {
                 rfidPrintVo.setMakeNumber(r.getProduceNumber());
                 rfidPrintVo.setDeviceNumber(r.getDeviceNumber());
-                rfidPrintVo.setContent(makeRfidNumber(r.getPartType(), r.getDeviceNumber(), r.getProduceNumber(), r.getDeviceType()));
+//                rfidPrintVo.setContent(makeRfidNumber(r.getPartType(), r.getDeviceNumber(), r.getProduceNumber(), r.getDeviceType()));
+                rfidPrintVo.setContent(r.getDeviceNumber());
                 rfidPrintVos.add(rfidPrintVo);
             } else {
                 DeviceLibrary device = deviceLibraryService.getOne(r.getDeviceTId());

dev-selfcheck/src/main/java/com/tykj/dev/device/selfcheck/controller/SelfCheckController.java

@@ -8,6 +8,7 @@ import com.tykj.dev.device.library.service.DeviceLibraryService;
 import com.tykj.dev.device.library.service.DeviceLogService;
 import com.tykj.dev.device.library.subject.Dto.DeviceLogDto;
 import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
+import com.tykj.dev.device.library.subject.vo.FileVo;
 import com.tykj.dev.device.selfcheck.base.SelfCheckSchedulerTask;
 import com.tykj.dev.device.selfcheck.service.SelfCheckBillService;
 import com.tykj.dev.device.selfcheck.subject.domin.SelfCheckBill;
@@ -260,6 +261,7 @@ public class SelfCheckController {
     public ResponseEntity addSelfExaminationBill(@RequestBody @Validated SelfCheckSaveVo selfCheckSaveVo) {
         //添加账单
         SelfCheckBill selfExaminationBillEntity;
+        List<FileVo> fileVoList = new ArrayList<>();
         if (selfCheckSaveVo.getTaskId()!=null){
             TaskBto taskBto = taskService.get(selfCheckSaveVo.getTaskId());
             TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.WAIT_SELF_CHECK);
@@ -289,6 +291,12 @@ public class SelfCheckController {
             }
             selfExaminationBillEntity.setNewDeviceDetail(stringBuffer.toString());
         }
+        if(selfCheckSaveVo.getCheckFiles()!=null&&selfCheckSaveVo.getCheckFiles().size()>0) {
+            selfExaminationBillEntity.setCheckFiles(FilesUtil.stringFileToList(selfCheckSaveVo.getCheckFiles()));
+            selfCheckSaveVo.getCheckFiles().forEach(fileRet -> {
+                fileVoList.add(new FileVo("自查单", fileRet.getName(), fileRet.getPreviewPath()));
+            });
+        }
         SelfCheckBill selfExaminationBillEntity1 = selfExaminationBillService.addEntity(selfExaminationBillEntity);
         Integer userId = userUtils.getCurrentUserId();
         String deviceIdDetail = selfCheckSaveVo.getCheckDetail();
@@ -343,7 +351,7 @@ public class SelfCheckController {
         for (String s:strings) {
             if (s.length()>=2) {
                 Integer id = Integer.parseInt(s.substring(0, s.length() - 1));
-                DeviceLogDto deviceLogDto = new DeviceLogDto(id,"发起自查",null);
+                DeviceLogDto deviceLogDto = new DeviceLogDto(id,"发起自查",fileVoList);
                 deviceLogService.addLog(deviceLogDto);
             }
         }

dev-selfcheck/src/main/java/com/tykj/dev/device/selfcheck/subject/vo/SelfCheckSaveVo.java

 package com.tykj.dev.device.selfcheck.subject.vo;
 
+import com.tykj.dev.device.file.entity.FileRet;
+import com.tykj.dev.device.file.service.FilesUtil;
 import com.tykj.dev.device.selfcheck.subject.domin.SelfCheckBill;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -54,11 +56,17 @@ public class SelfCheckSaveVo {
     @ApiModelProperty(name = "新增未记录装备RFID列表")
     private List<String> newDeviceList;
 
+    @ApiModelProperty(value = "检查附件名")
+    private List<FileRet> checkFiles;
+
     public SelfCheckBill toDo() {
         SelfCheckBill selfExaminationBillEntity = new SelfCheckBill();
         BeanUtils.copyProperties(this, selfExaminationBillEntity);
         selfExaminationBillEntity.setCheckTime(new Date());
         selfExaminationBillEntity.setCheckStatus(0);
+        if(this.checkFiles!=null&&this.checkFiles.size()>0){
+            selfExaminationBillEntity.setCheckFiles(FilesUtil.stringFileToList(this.checkFiles));
+        }
         return selfExaminationBillEntity;
     }
 }

dev-storage/src/main/java/com/tykj/dev/device/storage/controller/StorageBillController.java

@@ -231,7 +231,7 @@ public class StorageBillController {
         //3.存装备
         Integer parentId = null;
         for (DeviceLibrarySaveVo d : storageBillSaveVo.getDeviceLibrarySaveVoList()) {
-            if (d.getRfidCardId()==null||d.getRfidCardId()==""||deviceLibraryDao.getAllByRfidCardId(d.getRfidCardId()).size()==0) {
+            if (d.getRfidCardId()==null|| "".equals(d.getRfidCardId()) ||deviceLibraryDao.getAllByRfidCardId(d.getRfidCardId()).size()==0) {
                 DeviceLibrary saveEntity = new DeviceLibrary();
                 DeviceLibrary deviceLibraryEntity = new DeviceLibrary();
                 PackingLibrary packingLibraryEntity = packingLibraryService.getOne(d.getPackingId());
@@ -244,7 +244,7 @@ public class StorageBillController {
                 deviceLibraryEntity.setOwnUnit(userUtils.getCurrentUserUnitName());
                 deviceLibraryEntity.setPartParentId(null);
                 if (deviceLibraryEntity.getRfidCardId()==null||"".equals(deviceLibraryEntity.getRfidCardId())){
-                    deviceLibraryEntity.setRfidCardId(UUID.randomUUID().toString());
+                    deviceLibraryEntity.setRfidCardId(null);
                 }
                 //如果不是单独的配件，设置父装备id为上一个装备的id
                 if (d.getIsSinglePart() == 0) {

dev-storage/src/main/java/com/tykj/dev/device/storage/subject/domin/StorageBill.java

@@ -172,6 +172,12 @@ public class StorageBill {
     @Column(name = "reply_files",columnDefinition = "TEXT")
     private String replyFiles;
 
+    @Column(name = "apply_files",columnDefinition = "TEXT")
+    private String applyFiles;
+
     @Transient
     private List<FileRet> replyFileList = new ArrayList<>();
+
+    @Transient
+    private List<FileRet> applyFileList = new ArrayList<>();
 }

dev-storage/src/main/java/com/tykj/dev/device/storage/subject/vo/StorageBillSaveVo.java

@@ -74,6 +74,9 @@ public class StorageBillSaveVo {
     @ApiModelProperty(value = "批复文号附件名")
     private List<FileRet> replyFiles;
 
+    @ApiModelProperty(value = "申请文号附件名")
+    private List<FileRet> applyFiles;
+
 //    @NotNull(message = "receiveFileName不能为空")
     @ApiModelProperty(value = "入库单附件名")
     private String receiveFileName;
@@ -110,6 +113,9 @@ public class StorageBillSaveVo {
         if(this.replyFiles!=null&&this.replyFiles.size()>0){
             storageBillEntity.setReplyFiles(FilesUtil.stringFileToList(this.replyFiles));
         }
+        if(this.applyFiles!=null&&this.applyFiles.size()>0){
+            storageBillEntity.setApplyFiles(FilesUtil.stringFileToList(this.applyFiles));
+        }
         return storageBillEntity;
     }
 }

dev-task/src/main/java/com/tykj/dev/device/task/service/impl/TaskServiceImpl.java

@@ -354,9 +354,19 @@ public class TaskServiceImpl implements TaskService {
      */
     @Override
     public TaskBto get(Integer billId, Integer businessType) {
-        return taskDao.findByBillIdAndBusinessType(billId, businessType)
-                .orElseThrow(() -> new ApiException(String.format("要查询的数据不存在,查询的billId为 %d,businessType为 %d", billId, businessType)))
-                .parse2Bto();
+        List<Task> tasks = taskDao.findAllByBillIdAndBusinessType(billId, businessType);
+        if (tasks.size()==0){
+            throw new ApiException(String.format("要查询的数据不存在,查询的billId为 %d,businessType为 %d", billId, businessType));
+        }
+        else if (tasks.size()==1){
+            return tasks.get(0).parse2Bto();
+        }
+        else {
+            return tasks.stream().filter(task -> "exam".equals(task.getCustomInfo())).collect(Collectors.toList()).get(0).parse2Bto();
+        }
+//        return taskDao.findByBillIdAndBusinessType(billId, businessType)
+//                .orElseThrow(() -> new ApiException(String.format("要查询的数据不存在,查询的billId为 %d,businessType为 %d", billId, businessType)))
+//                .parse2Bto();
     }
 
     /**

dev-taskselect/src/main/java/com/tykj/dev/device/taskselect/controller/TaskSelectController.java

@@ -133,6 +133,7 @@ public class TaskSelectController {
                 storageBillEntity.setReceiveUserA(userPublicService.getOne(storageBillEntity.getReceiveUseraId()).getName());
                 storageBillEntity.setReceiveUserB(userPublicService.getOne(storageBillEntity.getReceiveUserbId()).getName());
                 storageBillEntity.setReplyFileList(FilesUtil.stringFileToList(storageBillEntity.getReplyFiles()));
+                storageBillEntity.setApplyFileList(FilesUtil.stringFileToList(storageBillEntity.getApplyFiles()));
                 list.add(storageBillEntity);
                 String str = storageBillEntity.getStorageDetail();
                 List<Integer> list1 = StringSplitUtil.userIdSplit(str);
@@ -171,12 +172,17 @@ public class TaskSelectController {
                     //查询可配发相同类型装备列表
                     list.add(deviceLibraryService.getAllotList(new DeviceLibrarySelectVo()).stream().filter(deviceLibraryEntity -> packingIdList.contains(deviceLibraryEntity.getPackingId())).sorted(Comparator.comparing(DeviceLibrary::getPackingId)).collect(Collectors.toList()));
                     //添加申请单
+                    deviceApplyBillEntity.setReplyFileList(FilesUtil.stringFileToList(deviceApplyBillEntity.getReplyFiles()));
+                    deviceApplyBillEntity.setApplyFileList(FilesUtil.stringFileToList(deviceApplyBillEntity.getApplyFiles()));
+                    deviceApplyBillEntity.setApplyNumFileList(FilesUtil.stringFileToList(deviceApplyBillEntity.getApplyNumFiles()));
                     list.add(deviceApplyBillEntity);
                     return ResponseEntity.ok(new ResultObj(list, "查询成功"));
                 }
 
                 AllotBill allotBillEntity = allotBillService.getOne(billId);
                 allotBillEntity.setReplyFileList(FilesUtil.stringFileToList(allotBillEntity.getReplyFiles()));
+                allotBillEntity.setApplyFileList(FilesUtil.stringFileToList(allotBillEntity.getApplyFiles()));
+                allotBillEntity.setSendFileList(FilesUtil.stringFileToList(allotBillEntity.getSendFiles()));
                 if (allotBillEntity.getSendUseraId() != null) {
                     allotBillEntity.setSenderUserA(userPublicService.getOne(allotBillEntity.getSendUseraId()).getName());
                 }
@@ -238,6 +244,9 @@ public class TaskSelectController {
                 if (allotBackBill.getReceiveUserbId() != null) {
                     allotBackBill.setReceiveUserb(userPublicService.getOne(allotBackBill.getReceiveUserbId()).getName());
                 }
+                allotBackBill.setSendFileList(FilesUtil.stringFileToList(allotBackBill.getSendFiles()));
+                allotBackBill.setReplyFileList(FilesUtil.stringFileToList(allotBackBill.getReplyFiles()));
+                allotBackBill.setApplyFileList(FilesUtil.stringFileToList(allotBackBill.getApplyFiles()));
                 list.add(allotBackBill);
                 String detail = allotBackBill.getBackCheckDetail();
                 List<DeviceLibrary> libraryArrayList = new ArrayList<>();
@@ -319,6 +328,9 @@ public class TaskSelectController {
             case 9:
                 DeviceApplyBill deviceApplyBillEntity = deviceApplyBillService.getOne(taskBto.getBillId());
                 deviceApplyBillEntity.setApplyUser(userPublicService.getOne(deviceApplyBillEntity.getApplyUseraId()).getName());
+                deviceApplyBillEntity.setReplyFileList(FilesUtil.stringFileToList(deviceApplyBillEntity.getReplyFiles()));
+                deviceApplyBillEntity.setApplyFileList(FilesUtil.stringFileToList(deviceApplyBillEntity.getApplyFiles()));
+                deviceApplyBillEntity.setApplyNumFileList(FilesUtil.stringFileToList(deviceApplyBillEntity.getApplyNumFiles()));
                 list.add(deviceApplyBillEntity);
                 List<Integer> idList = StringSplitUtil.userIdSplit(deviceApplyBillEntity.getApplyDetail());
                 List<Integer> packingIdList = new ArrayList<>();