更新

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

@@ -28,10 +28,7 @@ import com.tykj.dev.misc.base.BusinessEnum;
 import com.tykj.dev.misc.base.ResultObj;
 import com.tykj.dev.misc.base.StatusEnum;
 import com.tykj.dev.misc.exception.ApiException;
-import com.tykj.dev.misc.utils.MapperUtils;
-import com.tykj.dev.misc.utils.Snowflake;
-import com.tykj.dev.misc.utils.StringSplitUtil;
-import com.tykj.dev.misc.utils.TimestampUtil;
+import com.tykj.dev.misc.utils.*;
 import com.tykj.dev.rfid.service.InputOutputDeviceService;
 import com.tykj.dev.socket.MyWebSocket;
 import io.swagger.annotations.Api;
@@ -137,6 +134,7 @@ public class AllotBillController {
     @PostMapping(value = "/addAllotBill")
     @Transactional(rollbackFor = Exception.class)
     public ResponseEntity addAllotBill(@RequestBody @Validated AllotBillSaveVo allotBillSaveVo) {
+        deviceLibraryService.isInStockOrWaitRetired(StringSplitUtil.split(allotBillSaveVo.getAllotCheckDetail()));
         //1.添加配发单
         AllotBill a = allotBillSaveVo.toDo();
         a.setSendUseraId(userUtils.getCurrentUserId());
@@ -298,6 +296,7 @@ public class AllotBillController {
         Integer userId = userUtils.getCurrentUserId();
         //获取当前任务
         TaskBto taskBto = taskService.get(allotReceiveVo.getTaskId());
+        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()));
@@ -372,6 +371,7 @@ public class AllotBillController {
     public ResponseEntity receiveConfirm(@RequestBody @Validated AllotReceiveConfirmVo allotReceiveConfirmVo) {
         //获取任务和账单
         TaskBto taskBto = taskService.get(allotReceiveConfirmVo.getTaskId());
+        TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.ALLOTING);
         AllotBill allotBillEntity = allotBillService.getOne(taskBto.getBillId());
         String deviceIdDetail = allotBillEntity.getAllotCheckDetail();
         String[] strings = deviceIdDetail.split("x");
@@ -403,7 +403,7 @@ public class AllotBillController {
         if (allotReceiveConfirmVo.getStatus() == 1) {
             taskService.addInvolveUser(taskBto, userUtils.getCurrentUserId());
             //业务封存
-            taskService.update(taskService.moveToArchive(taskBto));
+            taskService.moveToEnd(taskBto);
             //更新账单状态
             AllotBill allotBillEntity2 = allotBillService.getOne(taskBto.getBillId());
             allotBillEntity2.setAllotStatus(4);
@@ -425,7 +425,7 @@ public class AllotBillController {
             ids.addAll(userDao.findAllByUnitsId(userPublicService.findUnitIdByName(allotBillEntity.getSendUnit())).stream()
                     .map(User::getUserId)
                     .collect(Collectors.toList()));
-            MessageBto messageBto = new MessageBto(taskBto.getId(),taskBto.getBusinessType(),allotBillEntity.getReceiveUnit()+"拒绝接收配发装备",ids);
+            MessageBto messageBto = new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"拒绝接收配发装备",ids);
             messageService.add(messageBto);
             //生成配发退回单
             AllotBackBill allotBackBill =new AllotBackBill();
@@ -532,6 +532,10 @@ public class AllotBillController {
     public ResponseEntity uploadFile(@RequestBody @Validated com.tykj.dev.device.allot.subject.vo.FileVo fileVo){
         //获取task
         TaskBto taskBto = taskService.get(fileVo.getTaskId());
+        List<StatusEnum> statusEnums = new ArrayList<>();
+        statusEnums.add(StatusEnum.WAIT_UPLOAD_CROSS_FILE);
+        statusEnums.add(StatusEnum.WAIT_UPLOAD_ALLOT_FILE);
+        TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),statusEnums);
         //不上传单据
         if (fileVo.getStatus()==0){
             taskService.moveToArchive(taskBto);

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

@@ -32,11 +32,11 @@ public class AllotBackReceiveVo {
     @ApiModelProperty(value = "配发单附件URL")
     private String billFileUrl;
 
-    @NotNull(message = "receiveFileName不能为空")
+//    @NotNull(message = "receiveFileName不能为空")
     @ApiModelProperty(value = "入库附件名字")
     private String receiveFileName;
 
-    @NotNull(message = "receiveFileUrl不能为空")
+//    @NotNull(message = "receiveFileUrl不能为空")
     @ApiModelProperty(value = "入库附件URL")
     private String receiveFileUrl;
 

dev-apply/src/main/java/com/tykj/dev/device/apply/controller/DeviceApplyController.java

@@ -36,6 +36,7 @@ import com.tykj.dev.misc.exception.ApiException;
 import com.tykj.dev.misc.utils.ResultUtil;
 import com.tykj.dev.misc.utils.Snowflake;
 import com.tykj.dev.misc.utils.StringSplitUtil;
+import com.tykj.dev.misc.utils.TaskDisposeUtil;
 import com.tykj.dev.rfid.service.InputOutputDeviceService;
 import com.tykj.dev.socket.MyWebSocket;
 import io.swagger.annotations.Api;
@@ -157,6 +158,7 @@ public class DeviceApplyController {
     @Transactional(rollbackFor = Exception.class)
     public ResponseEntity addDeviceApplyBillReplay(@RequestBody @Validated DeviceApplyConfirmVo deviceApplyConfirmVo) {
         TaskBto taskBto = taskService.get(deviceApplyConfirmVo.getTaskId());
+        TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.DEVICE_APPLY_CONFIRM);
         Integer userId = userUtils.getCurrentUserId();
         taskService.addInvolveUser(taskBto, userId);
         DeviceApplyBill applyBillEntity = deviceApplyBillService.getOne(taskBto.getBillId());
@@ -207,8 +209,10 @@ public class DeviceApplyController {
     @PostMapping("/allot")
     @Transactional(rollbackFor = Exception.class)
     public ResponseEntity allot(@RequestBody @Validated DeviceApplyAllotSaveVo deviceApplyAllotSaveVo) {
+        deviceLibraryService.isInStockOrWaitRetired(StringSplitUtil.split(deviceApplyAllotSaveVo.getAllotCheckDetail()));
         //获取配发的业务
         TaskBto taskBto = taskService.get(deviceApplyAllotSaveVo.getTaskId());
+        TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.WAIT_ALLOT);
         //获取申请的业务
         TaskBto applyTask = taskService.get(taskBto.getParentTaskId());
         Integer userId = userUtils.getCurrentUserId();
@@ -324,7 +328,7 @@ public class DeviceApplyController {
         //获取可配发装备,按列装Id筛选,列装Id排序
         applyDetailVo.setDeviceLibraries(deviceLibraryService.getAllotList(new DeviceLibrarySelectVo()).stream()
                 .filter(deviceLibraryEntity -> packingIdList.contains(deviceLibraryEntity.getPackingId()))
-                .sorted(Comparator.comparing(DeviceLibrary::getPackingId))
+                .sorted(Comparator.comparing(DeviceLibrary::getPackingId,Comparator.nullsLast(Integer::compareTo)))
                 .collect(Collectors.toList()));
         //添加业务日志
         List<TaskLogUserVo> applyLogUserVos = taskLogService.getByTaskId(taskBto.getId());
@@ -336,7 +340,7 @@ public class DeviceApplyController {
         }
         //按日志时间排序
         List<TaskLogUserVo> allLogUserVos = applyLogUserVos.stream()
-                .sorted(Comparator.comparing(TaskLogUserVo::getCreateTime))
+                .sorted(Comparator.comparing(TaskLogUserVo::getCreateTime,Comparator.nullsLast(Date::compareTo)))
                 .collect(Collectors.toList());
         applyDetailVo.setTaskLogUserVos(allLogUserVos);
         return ResponseEntity.ok(applyDetailVo);

dev-config/src/main/java/com/tykj/dev/config/LogType.java

@@ -152,7 +152,7 @@ public enum LogType {
 
     ALLOT_BACK_1(57, ALLOT_BACK.id, ORIGIN_STATUS.id, ALLOT_BACKING.id, "发起配发装备退回"),
 
-    ALLOT_BACK_2(58,ALLOT_BACK.id, ALLOT_BACKING.id, ALLOT_BACK_CONFIRM.id, "配发退回装备接收成功"),
+    ALLOT_BACK_2(58,ALLOT_BACK.id, ALLOT_BACKING.id, END.id, "配发退回装备接收成功"),
 
     ALLOT_BACK_3(59,ALLOT_BACK.id, ALLOT_BACK_CONFIRM.id, END.id, "配发退回装备接收审核成功"),
 
@@ -212,7 +212,7 @@ public enum LogType {
     ALLOT_10(84, ALLOT.id, WAIT_ALLOT.id, ALLOTING.id, "对(%receiveUnit)发起配发"),
     ALLOT_11(85, ALLOT.id, ALLOTING.id, ARCHIVE.id, "拒绝接收配发装备"),
     ALLOT_BACK_5(86, ALLOT_BACK.id, ALLOT_BACKING.id, END.id, "接收配发退回装备"),
-    REPAIR_SEND_10(87, REPAIR.id, ORIGIN_STATUS.id, END.id, "向(%receiveUnit)发起装备维修"),
+    REPAIR_SEND_10(87, REPAIR.id, ORIGIN_STATUS.id, WAIT_UPLOAD_FILE.id, "向(%receiveUnit)发起装备维修"),
     REPAIR_BACK_7(88, REPAIR_BACK.id, ORIGIN_STATUS.id, END.id, "维修退回装备接收并发起入库"),
     STORAGE_4(89, STORAGE.id, WAIT_STORAGE.id, ARCHIVE.id, "删除入库草稿"),
     SCRAP_1(90,SCRAP.id, ORIGIN_STATUS.id, WAIT_UPLOAD_SCRAP_FILE.id, "发起装备报废"),

dev-destroy/src/main/java/com/tykj/dev/device/destroy/controller/DeviceDestroyController.java

@@ -23,6 +23,7 @@ import com.tykj.dev.misc.base.StatusEnum;
 import com.tykj.dev.misc.utils.ListUtil;
 import com.tykj.dev.misc.utils.ResultUtil;
 import com.tykj.dev.misc.utils.StringSplitUtil;
+import com.tykj.dev.misc.utils.TaskDisposeUtil;
 import com.tykj.dev.rfid.service.InputOutputDeviceService;
 import com.tykj.dev.socket.MyWebSocket;
 import io.swagger.annotations.Api;
@@ -207,6 +208,7 @@ public class DeviceDestroyController {
     public ResponseEntity uploadDestroyFile(@RequestBody @Validated UploadDestroyFileVo uploadDestroyFileVo) {
         //获取当前task
         TaskBto taskBto = taskService.get(uploadDestroyFileVo.getTaskId());
+        TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.WAIT_UPLOAD_BILL_FILE);
         //获取销毁单
         DeviceDestroyBill deviceDestroyBill = deviceDestroyBillService.getOne(taskBto.getBillId());
         //更新销毁单

dev-library/src/main/java/com/tykj/dev/device/library/controller/DeviceLibraryController.java

@@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.constraints.Min;
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -165,7 +166,7 @@ public class DeviceLibraryController {
         List<DeviceLogUserVo> deviceLogEntities = deviceLogDao.getAllByDeviceIdAndType(id, 0).stream()
                 .map(DeviceLog::parse2Dto)
                 .map(DeviceLogDto::toVo)
-                .sorted(Comparator.comparing(DeviceLogUserVo::getCreateTime).reversed())
+                .sorted(Comparator.comparing(DeviceLogUserVo::getCreateTime,Comparator.nullsLast(Date::compareTo)).reversed())
                 .collect(Collectors.toList());
         //判断有没有维修新装备换新的情况
         List<DeviceLogUserVo> deviceLogUserVos = new ArrayList<>();
@@ -175,7 +176,7 @@ public class DeviceLibraryController {
                 deviceLogUserVos.addAll(deviceLogDao.getAllByDeviceIdAndType(integerList.get(i), 0).stream()
                         .map(DeviceLog::parse2Dto)
                         .map(DeviceLogDto::toVo)
-                        .sorted(Comparator.comparing(DeviceLogUserVo::getCreateTime).reversed())
+                        .sorted(Comparator.comparing(DeviceLogUserVo::getCreateTime,Comparator.nullsLast(Date::compareTo)).reversed())
                         .collect(Collectors.toList()));
             }
         }

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

@@ -118,4 +118,19 @@ public interface DeviceLibraryService {
      * 查询可清退装备
      */
     List<DeviceLibrary> getSendBackDevice(DeviceLibrarySelectVo deviceLibrarySelectVo);
+
+    /**
+     * 判断装备状态是否在库
+     */
+    void isInStock(List<Integer> ids);
+
+    /**
+     * 判断装备状态是否待退役
+     */
+    void isWaitRetired(List<Integer> ids);
+
+    /**
+     * 判断装备状态是否在库或待退役
+     */
+    void isInStockOrWaitRetired(List<Integer> ids);
 }

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

@@ -22,6 +22,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
+import org.springframework.http.ResponseEntity;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
@@ -303,7 +304,7 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
 //                deviceLibraryEntity -> Optional.ofNullable(nodeCollect.get(deviceLibraryEntity.getPartParentId())),
 //                DeviceLibrary::addChildNode
 //        );
-        return deviceLibraryEntities.stream().sorted(Comparator.comparing(DeviceLibrary::getLifeStatus)).collect(Collectors.toList());
+        return deviceLibraryEntities.stream().sorted(Comparator.comparing(DeviceLibrary::getLifeStatus,Comparator.nullsLast(Integer::compareTo))).collect(Collectors.toList());
     }
 
     public List<DeviceLibrary> getList2(DeviceLibrarySelectVo deviceLibrarySelectVo) {
@@ -382,6 +383,51 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
         return deviceLibraryDao.findAll(getSelectSpecification3(deviceLibrarySelectVo));
     }
 
+    /**
+     * 判断装备状态是否在库
+     *
+     * @param ids 装备id集合
+     */
+    @Override
+    public void isInStock(List<Integer> ids) {
+        ids.forEach(integer -> {
+            DeviceLibrary deviceLibrary = getOne(integer);
+            if (deviceLibrary.getLifeStatus()!=2){
+                throw new ApiException(ResponseEntity.status(303).body("序列号"+deviceLibrary.getSeqNumber()+"的装备已被其他专管员操作"));
+            }
+        });
+    }
+
+    /**
+     * 判断装备状态是否待退役
+     *
+     * @param ids
+     */
+    @Override
+    public void isWaitRetired(List<Integer> ids) {
+        ids.forEach(integer -> {
+            DeviceLibrary deviceLibrary = getOne(integer);
+            if (deviceLibrary.getLifeStatus()!=15){
+                throw new ApiException(ResponseEntity.status(303).body("序列号"+deviceLibrary.getSeqNumber()+"的装备已被其他专管员操作"));
+            }
+        });
+    }
+
+    /**
+     * 判断装备状态是否在库或待退役
+     *
+     * @param ids
+     */
+    @Override
+    public void isInStockOrWaitRetired(List<Integer> ids) {
+        ids.forEach(integer -> {
+            DeviceLibrary deviceLibrary = getOne(integer);
+            if (deviceLibrary.getLifeStatus()!=2&&deviceLibrary.getLifeStatus()!=15){
+                throw new ApiException(ResponseEntity.status(303).body("序列号"+deviceLibrary.getSeqNumber()+"的装备已被其他专管员操作"));
+            }
+        });
+    }
+
     @Override
     public List<DeviceLibrary> getAllList(DeviceLibrarySelectVo deviceLibrarySelectVo) {
         return deviceLibraryDao.findAll(getSelectSpecification4(deviceLibrarySelectVo));
@@ -478,7 +524,7 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
         String unit = userUtils.getCurrentUserUnitName();
         predicateBuilder.eq("ownUnit", unit);
         predicateBuilder.eq("locationUnit", unit);
-        predicateBuilder.eq("lifeStatus", 2);
+        predicateBuilder.eq("lifeStatus", 2,15);
         return predicateBuilder.build();
     }
 

dev-matching/src/main/java/com/tykj/dev/device/matching/controller/MatchingDeviceController.java

@@ -38,6 +38,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.constraints.Min;
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -200,7 +201,7 @@ public class MatchingDeviceController {
         List<DeviceLogUserVo> deviceLogs = deviceLogDao.getAllByDeviceIdAndType(id, 1).stream()
                 .map(DeviceLog::parse2Dto)
                 .map(DeviceLogDto::toVo)
-                .sorted(Comparator.comparing(DeviceLogUserVo::getCreateTime))
+                .sorted(Comparator.comparing(DeviceLogUserVo::getCreateTime,Comparator.nullsLast(Date::compareTo)))
                 .collect(Collectors.toList());
         list.add(deviceLogs);
         return ResponseEntity.ok(list);

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

 package com.tykj.dev.misc.utils;
 
-import com.tykj.dev.misc.MiscApplication;
 import com.tykj.dev.misc.exception.ApiException;
-import org.springframework.boot.SpringApplication;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestBody;
-import sun.jvm.hotspot.utilities.Interval;
 
 import java.util.ArrayList;
 import java.util.Comparator;

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

@@ -21,4 +21,12 @@ public class TaskDisposeUtil {
         }
 
     }
+
+
+    public static void isNotSubmit(Integer billStatus, StatusEnum statusEnum){
+        if (!statusEnum.id.equals(billStatus)){
+            throw new ApiException(ResponseEntity.status(303).body("本次任务已经被其他专管员完成,请处理其他任务"));
+        }
+
+    }
 }

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

@@ -157,7 +157,7 @@ public class PackingController {
         packingLibrary.setPackingStatus(2);
         packingLibrary.setShowOrder(99999);
         PackingLibrary packingLibrary1 = packingLibraryService.addEntity(packingLibrary);
-        List<PackingLibrary> packingLibraries1 = packingLibraryService.getInsertList(new SelectPack()).stream().sorted(Comparator.comparing(PackingLibrary::getModel)).collect(Collectors.toList());
+        List<PackingLibrary> packingLibraries1 = packingLibraryService.getInsertList(new SelectPack()).stream().sorted(Comparator.comparing(PackingLibrary::getModel,Comparator.nullsLast(String::compareTo))).collect(Collectors.toList());
         int order = 9999;
         for (int i=1;i<=packingLibraries1.size();i++){
             PackingLibrary packingLibrary2 = packingLibraries1.get(i-1);

dev-packing/src/main/java/com/tykj/dev/device/packing/service/impl/PackingLibraryServiceImpl.java

@@ -211,7 +211,7 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
                     || GlobalMap.getDeviceInvisibleRangeMap().get(packingLibrary.getInvisibleRange()).name.contains(content)
                     || GlobalMap.getDeviceSecretLevelMap().get(packingLibrary.getSecretLevel()).name.contains(content);
             return isSameModel && isSameName && isSameStatus && isSameSecretLevel && isContainContent;
-        }).sorted(Comparator.comparing(PackingLibrary::getShowOrder)).collect(Collectors.toList());
+        }).sorted(Comparator.comparing(PackingLibrary::getShowOrder,Comparator.nullsLast(Integer::compareTo))).collect(Collectors.toList());
     }
 
     /**

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

@@ -42,6 +42,7 @@ import com.tykj.dev.misc.exception.ApiException;
 import com.tykj.dev.misc.utils.ResultUtil;
 import com.tykj.dev.misc.utils.Snowflake;
 import com.tykj.dev.misc.utils.StringSplitUtil;
+import com.tykj.dev.misc.utils.TaskDisposeUtil;
 import com.tykj.dev.rfid.service.InputOutputDeviceService;
 import com.tykj.dev.socket.MyWebSocket;
 import io.swagger.annotations.Api;
@@ -239,7 +240,7 @@ public class RepairController {
         List<Integer> ids = userPublicService.findOtherUser(userUtils.getCurrentUserId());
         if (level == 1) {
             ownUnit = userUtils.getCurrentUnitId();
-            TaskBto taskBto = new TaskBto(StatusEnum.END.id, "维修业务", null, ".", repairBill1.getId(), 5, ownUnit, 1, null, userIds);
+            TaskBto taskBto = new TaskBto(StatusEnum.WAIT_UPLOAD_FILE.id, "维修业务", null, ".", repairBill1.getId(), 5, ownUnit, 1, null, userIds);
             saveEntity = taskService.start(taskBto);
         } else {
             ownUnit = userPublicService.findUnitIdByName(repairBill.getReceiveUnit());
@@ -410,6 +411,7 @@ public class RepairController {
     public ResponseEntity receiveDevice(@RequestBody @Validated RepairReceiveVo repairReceiveVo) {
         //获取当前任务
         TaskBto taskBto = taskService.get(repairReceiveVo.getTaskId());
+        TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.WAIT_RECEIVE);
         Integer userId = userUtils.getCurrentUserId();
         //获取维修单，送修单，装备详情，维修装备详情
         RepairBill repairBill = deviceRepairBillService.getOne(taskBto.getBillId());
@@ -513,17 +515,18 @@ public class RepairController {
     @Transactional(rollbackFor = Exception.class)
     public ResponseEntity uploadRepairBill(@RequestBody @Validated FileUploadVo fileUploadVo){
         TaskBto taskBto = taskService.get(fileUploadVo.getTaskId());
+        TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.WAIT_UPLOAD_FILE);
         Integer userId = userUtils.getCurrentUserId();
         taskService.addInvolveUser(taskBto,userId);
         taskService.moveToEnd(taskBto);
-        RepairSendBill repairSendBill = deviceRepairSendBillService.getOne(taskBto.getBillId());
+        RepairSendBill repairSendBill = deviceRepairSendBillDao.findByDeviceRepairBillId(taskBto.getBillId());
         repairSendBill.setBillFileName(fileUploadVo.getBillFileName());
         repairSendBill.setBillFileUrl(fileUploadVo.getBillFileUrl());
         deviceRepairSendBillService.update(repairSendBill);
         List<FileVo> fileVoList = new ArrayList<>();
         fileVoList.add(new FileVo("维修单", repairSendBill.getBillFileName(), repairSendBill.getBillFileUrl()));
         //添加装备日志
-        List<Integer> deviceIds = StringSplitUtil.split(repairSendBill.getRepairReciveCheckDetail());
+        List<Integer> deviceIds = StringSplitUtil.split(repairSendBill.getRepairDeviceCheckDetail());
         deviceIds.forEach(integer -> {
             //存装备日志
             DeviceLogDto deviceLogDto = new DeviceLogDto(integer, "上传送修单据", fileVoList);
@@ -805,6 +808,7 @@ public class RepairController {
         RepairBackBill repairBackBill;
         if (level == 2 || level == 3) {
             taskBto = taskService.get(repairReceiveVo.getTaskId());
+            TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.WAIT_BACK_RECEIVE);
             taskService.addInvolveUser(taskBto,userId);
             repairBackBill = deviceRepairBackBillService.getOne(taskBto.getBillId());
         } else {
@@ -893,14 +897,14 @@ public class RepairController {
 //            TaskLogBto taskLogBto2 = new TaskLogBto(taskBto2.getId(), "维修退回装备接收并发起入库", fileVoList);
 //            taskLogService.addLog(taskLogBto2);
         } else {
-            if (repairReceiveVo.getStatus()==0) {
+//            if (repairReceiveVo.getStatus()==0) {
                 //任务推至下一阶段
 //            taskService.update(taskService.moveToNext(taskBto, repairReceiveVo.getReceiveUserbId()));
-                taskBto2 = taskService.moveToEnd(taskBto);
-            }
-            else {
-                taskBto2 = taskService.moveToSpecial(taskBto,StatusEnum.WAIT_UPLOAD_BACK_FILE);
-            }
+            taskBto2 = taskService.moveToEnd(taskBto);
+//            }
+//            else {
+//                taskBto2 = taskService.moveToSpecial(taskBto,StatusEnum.WAIT_UPLOAD_BACK_FILE);
+//            }
             //获取维修详情
             List<RepairDetail> repairDetailList = repairDetailDao.findByRepairBackBillId(repairBackBill.getId());
             repairDetailList.forEach(repairDetail -> {
@@ -1019,6 +1023,7 @@ public class RepairController {
     @Transactional(rollbackFor = Exception.class)
     public ResponseEntity uploadRepairBackBill(@RequestBody @Validated FileUploadVo fileUploadVo){
         TaskBto taskBto = taskService.get(fileUploadVo.getTaskId());
+        TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.WAIT_UPLOAD_BACK_FILE);
         Integer userId = userUtils.getCurrentUserId();
         taskService.addInvolveUser(taskBto,userId);
         taskService.moveToEnd(taskBto);
@@ -1450,7 +1455,7 @@ public class RepairController {
                 repairDetail.setLocationUnit(deviceLibraryService.getOne(repairDetail.getDeviceId()).getLocationUnit());
                 deviceRepairDetailService.update(repairDetail);
             });
-            return ResponseEntity.ok(repairDetails.stream().filter(repairDetail -> repairDetail.getLocationUnit().equals(unitName)).sorted(Comparator.comparing(RepairDetail::getOwnUnit)).collect(Collectors.toList()));
+            return ResponseEntity.ok(repairDetails.stream().filter(repairDetail -> repairDetail.getLocationUnit().equals(unitName)).sorted(Comparator.comparing(RepairDetail::getOwnUnit,Comparator.nullsLast(String::compareTo))).collect(Collectors.toList()));
         }
         //送修装备
         else if(type==2){
@@ -1462,7 +1467,7 @@ public class RepairController {
                 repairDetail.setLocationUnit(deviceLibraryService.getOne(repairDetail.getDeviceId()).getLocationUnit());
                 deviceRepairDetailService.update(repairDetail);
             });
-            return ResponseEntity.ok(repairDetails1.stream().filter(repairDetail -> userPublicService.findUnitsNameByUserId(repairDetail.getCreateUserId()).equals(unitName)).sorted(Comparator.comparing(RepairDetail::getOwnUnit)).collect(Collectors.toList()));
+            return ResponseEntity.ok(repairDetails1.stream().filter(repairDetail -> userPublicService.findUnitsNameByUserId(repairDetail.getCreateUserId()).equals(unitName)).sorted(Comparator.comparing(RepairDetail::getOwnUnit,Comparator.nullsLast(String::compareTo))).collect(Collectors.toList()));
         }
         //待领取装备
         else if(type==3){
@@ -1471,7 +1476,7 @@ public class RepairController {
                 repairDetail.setLocationUnit(deviceLibraryService.getOne(repairDetail.getDeviceId()).getLocationUnit());
                 deviceRepairDetailService.update(repairDetail);
             });
-            return ResponseEntity.ok(repairDetails.stream().filter(repairDetail -> repairDetail.getLocationUnit().equals(unitName)).sorted(Comparator.comparing(RepairDetail::getOwnUnit)).collect(Collectors.toList()));
+            return ResponseEntity.ok(repairDetails.stream().filter(repairDetail -> repairDetail.getLocationUnit().equals(unitName)).sorted(Comparator.comparing(RepairDetail::getOwnUnit,Comparator.nullsLast(String::compareTo))).collect(Collectors.toList()));
         }
         else {
             throw new ApiException("type只能为1，2，3");

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

@@ -56,11 +56,11 @@ public class RepairBackBillSaveVo {
     @ApiModelProperty(value = "签发人")
     private String agent;
 
-    @NotNull(message = "fileName不能为空")
+//    @NotNull(message = "fileName不能为空")
     @ApiModelProperty(value = "出库附件文件名")
     private String fileName;
 
-    @NotNull(message = "fileUrl不能为空")
+//    @NotNull(message = "fileUrl不能为空")
     @ApiModelProperty(value = "出库附件文件地址URL")
     private String fileUrl;
 

dev-retired/src/main/java/com/tykj/dev/device/retired/controller/DeviceRetiredController.java

@@ -26,6 +26,7 @@ import com.tykj.dev.misc.base.StatusEnum;
 import com.tykj.dev.misc.utils.ListUtil;
 import com.tykj.dev.misc.utils.ResultUtil;
 import com.tykj.dev.misc.utils.StringSplitUtil;
+import com.tykj.dev.misc.utils.TaskDisposeUtil;
 import com.tykj.dev.socket.MyWebSocket;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -142,6 +143,7 @@ public class DeviceRetiredController {
     public ResponseEntity confirmDestroy(@RequestBody @Validated DeviceRetiredConfirmVo deviceRetiredConfirmVo) {
         //初始化需要的数据
         TaskBto task = taskService.get(deviceRetiredConfirmVo.getTaskId());
+        TaskDisposeUtil.isNotSubmit(task.getBillStatus(),StatusEnum.RETIRED_BUSINESS_NEED_CONFIRM);
         DeviceRetiredBill deviceRetiredBillEntity = deviceRetiredBillService.getOne(task.getBillId());
         //判断审核结果
         if (deviceRetiredConfirmVo.getResult() == 1) {

dev-rfid/src/main/java/com/tykj/dev/rfid/controller/RfidController.java

@@ -18,6 +18,7 @@ import com.tykj.dev.misc.base.BusinessEnum;
 import com.tykj.dev.misc.base.StatusEnum;
 import com.tykj.dev.misc.utils.ListUtil;
 import com.tykj.dev.misc.utils.ResultUtil;
+import com.tykj.dev.misc.utils.TaskDisposeUtil;
 import com.tykj.dev.rfid.entity.domin.LibraryWarningLog;
 import com.tykj.dev.rfid.entity.domin.RfidChangeBill;
 import com.tykj.dev.rfid.entity.domin.RfidChangeLog;
@@ -172,6 +173,7 @@ public class RfidController {
     public ResponseEntity confirmDestory(@RequestBody @Validated RfidChangeConfirmVo rfidChangeConfirmVo) {
         //初始化需要的数据
         TaskBto task = taskService.get(rfidChangeConfirmVo.getTaskId());
+        TaskDisposeUtil.isNotSubmit(task.getBillStatus(),StatusEnum.RFID_BUSINESS_NEED_CONFIRM);
         RfidChangeBill rfidChangeBill = rfidChangeBillService.getOne(task.getBillId());
         //生成日志所需的文件列表
         ArrayList<FileVo> billList = ListUtil.createList(

dev-scrap/src/main/java/com/tykj/dev/device/scrap/controller/DeviceScrapController.java

@@ -16,6 +16,7 @@ import com.tykj.dev.device.task.subject.bto.TaskBto;
 import com.tykj.dev.device.user.util.UserUtils;
 import com.tykj.dev.misc.base.StatusEnum;
 import com.tykj.dev.misc.utils.StringSplitUtil;
+import com.tykj.dev.misc.utils.TaskDisposeUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -119,6 +120,7 @@ public class DeviceScrapController {
     @Transactional(rollbackFor = Exception.class)
     public ResponseEntity uploadScrap(@RequestBody @Validated UploadVo uploadVo) {
         TaskBto taskBto = taskService.get(uploadVo.getTaskId());
+        TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.WAIT_UPLOAD_SCRAP_FILE);
         ScrapBill scrapBill = scrapBillService.getOne(taskBto.getBillId());
         scrapBill.setFileName(uploadVo.getFileName());
         scrapBill.setFileUrl(uploadVo.getFileUrl());

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

@@ -21,6 +21,7 @@ import com.tykj.dev.misc.base.BusinessEnum;
 import com.tykj.dev.misc.base.StatusEnum;
 import com.tykj.dev.misc.exception.ApiException;
 import com.tykj.dev.misc.utils.ResultUtil;
+import com.tykj.dev.misc.utils.TaskDisposeUtil;
 import com.tykj.dev.socket.MyWebSocket;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -261,6 +262,7 @@ public class SelfCheckController {
         SelfCheckBill selfExaminationBillEntity;
         if (selfCheckSaveVo.getTaskId()!=null){
             TaskBto taskBto = taskService.get(selfCheckSaveVo.getTaskId());
+            TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.WAIT_SELF_CHECK);
             selfExaminationBillEntity = selfExaminationBillService.getOne(taskBto.getBillId());
             selfExaminationBillEntity.setCheckTime(new Date());
             selfExaminationBillEntity.setCheckDetail(selfCheckSaveVo.getCheckDetail());
@@ -351,6 +353,7 @@ public class SelfCheckController {
     @Transactional(rollbackFor = Exception.class)
     public ResponseEntity selfExaminationConfirm(@RequestBody @Validated SelfCheckConfirmVo selfCheckConfirmVo) {
         TaskBto taskBto = taskService.get(selfCheckConfirmVo.getTaskId());
+        TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.SELF_CHECK_CONFIRM);
         SelfCheckBill selfExaminationBillEntity = selfExaminationBillService.getOne(taskBto.getBillId());
         if(selfCheckConfirmVo.getCheckFiles()!=null&&selfCheckConfirmVo.getCheckFiles().size()>0){
             selfExaminationBillEntity.setCheckFiles(FilesUtil.stringFileToList(selfCheckConfirmVo.getCheckFiles()));

dev-statistical/src/main/java/com/tykj/dev/statistical/service/impl/BigScreenServiceImpl.java

@@ -291,7 +291,7 @@ public class BigScreenServiceImpl implements BigScreenService {
                 //筛选出当前单位已完成的自查和核查账单，按更新时间排序
                 List<SelfCheckBill> selfCheckBillList = selfCheckBills.stream()
                         .filter(selfCheckBill -> selfCheckBill.getCheckUnit().equals(unitName))
-                        .sorted(Comparator.comparing(SelfCheckBill::getUpdateTime).reversed())
+                        .sorted(Comparator.comparing(SelfCheckBill::getUpdateTime,Comparator.nullsLast(Date::compareTo)).reversed())
                         .collect(Collectors.toList());
                 if (!selfCheckBillList.isEmpty()) {
                     SelfCheckBill s = selfCheckBillList.get(0);

dev-statistical/src/main/java/com/tykj/dev/statistical/service/impl/StatisticalServiceImpl.java

@@ -209,9 +209,9 @@ public class StatisticalServiceImpl implements StatisticalService {
         //获取所有自查单
         List<SelfCheckBill> selfCheckBills = selfCheckBillDao.findAll();
         //获取最近一次自查标题
-        List<SelfCheckBill> selfCheckBillList = selfCheckBills.stream().filter(selfCheckBill -> selfCheckBill.getCycle()!=null).sorted(Comparator.comparing(SelfCheckBill::getCreateTime).reversed()).collect(Collectors.toList());
+        List<SelfCheckBill> selfCheckBillList = selfCheckBills.stream().filter(selfCheckBill -> selfCheckBill.getCycle()!=null).sorted(Comparator.comparing(SelfCheckBill::getCreateTime,Comparator.nullsLast(Date::compareTo).reversed())).collect(Collectors.toList());
         if (selfCheckBillList.size()>0){
-            Map<String,Integer> selfCheckBillMap = selfCheckBills.stream().filter(selfCheckBill ->selfCheckBill.getCycle()!=null && selfCheckBill.getTitle().equals(selfCheckBillList.get(0).getTitle())).collect(Collectors.toMap(SelfCheckBill::getCheckUnit,SelfCheckBill::getCheckStatus));
+            Map<String,Integer> selfCheckBillMap = selfCheckBills.stream().filter(selfCheckBill ->selfCheckBill.getCycle()!=null && selfCheckBill.getTitle().equals(selfCheckBillList.get(0).getTitle())).collect(Collectors.toMap(SelfCheckBill::getCheckUnit,SelfCheckBill::getCheckStatus,(v1, v2)->v1));
             //获取所有市
             List<Area> areas = areaDao.findAreasByType(2);
             //遍历每个市
@@ -484,11 +484,11 @@ public class StatisticalServiceImpl implements StatisticalService {
                 //筛选出当前单位已完成的自查和核查账单，按更新时间排序
                 List<SelfCheckBill> selfCheckBillList = selfCheckBills.stream()
                         .filter(selfCheckBill -> selfCheckBill.getCheckUnit().equals(unitName) && selfCheckBill.getCheckedCount() != null)
-                        .sorted(Comparator.comparing(SelfCheckBill::getUpdateTime).reversed())
+                        .sorted(Comparator.nullsLast(Comparator.comparing(SelfCheckBill::getUpdateTime).reversed()))
                         .collect(Collectors.toList());
                 List<DeviceCheckDetail> deviceCheckDetailList = deviceCheckDetails.stream()
                         .filter(deviceCheckDetail -> deviceCheckDetail.getCheckUnit().equals(unitName) && deviceCheckDetail.getCheckedCount() != null)
-                        .sorted(Comparator.comparing(DeviceCheckDetail::getUpdateTime).reversed())
+                        .sorted(Comparator.nullsLast(Comparator.comparing(DeviceCheckDetail::getUpdateTime).reversed()))
                         .collect(Collectors.toList());
                 if (!selfCheckBillList.isEmpty()) {
                     check.setSelfCheckCount(selfCheckBillList.get(0).getCheckedCount());
@@ -537,7 +537,7 @@ public class StatisticalServiceImpl implements StatisticalService {
                 //筛选出上半年的自动核查按时间排序
                 List<DeviceCheckDetail> deviceCheckDetailList = deviceCheckDetails.stream()
                         .filter(deviceCheckDetail -> deviceCheckDetail.getTitle().contains("自动")&& deviceCheckDetail.getTitle().contains(unitName) && Date.from(deviceCheckDetail.getCreateTime().atZone(ZoneId.systemDefault()).toInstant()).after(dates.get(0))&& Date.from(deviceCheckDetail.getCreateTime().atZone(ZoneId.systemDefault()).toInstant()).before(dates.get(1)))
-                        .sorted(Comparator.comparing(DeviceCheckDetail::getCreateTime).reversed())
+                        .sorted(Comparator.nullsLast(Comparator.comparing(DeviceCheckDetail::getCreateTime).reversed()))
                         .collect(Collectors.toList());
                 if (deviceCheckDetailList.size()>0){
                     if (deviceCheckDetailList.get(0).getCheckStatus()==2){

dev-task/src/main/java/com/tykj/dev/device/task/controller/TaskController.java

@@ -20,10 +20,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -120,7 +117,7 @@ public class TaskController {
         }
         //按日志时间排序
         List<TaskLogUserVo> taskLogUserVoList = taskLogUserVos.stream()
-                .sorted(Comparator.comparing(TaskLogUserVo::getCreateTime).reversed())
+                .sorted(Comparator.comparing(TaskLogUserVo::getCreateTime,Comparator.nullsLast(Date::compareTo)).reversed())
                 .collect(Collectors.toList());
         return ResultUtil.success(taskLogUserVoList);
     }
@@ -144,7 +141,7 @@ public class TaskController {
         }
         //按日志时间排序
         List<TaskLogUserVo> taskLogUserVoList = taskLogUserVos.stream()
-                .sorted(Comparator.comparing(TaskLogUserVo::getCreateTime).reversed())
+                .sorted(Comparator.comparing(TaskLogUserVo::getCreateTime,Comparator.nullsLast(Date::compareTo)).reversed())
                 .collect(Collectors.toList());
         return ResultUtil.success(taskLogUserVoList);
     }
@@ -168,7 +165,7 @@ public class TaskController {
         }
         //按日志时间排序
         List<TaskLogUserVo> taskLogUserVoList = taskLogUserVos.stream()
-                .sorted(Comparator.comparing(TaskLogUserVo::getCreateTime).reversed())
+                .sorted(Comparator.comparing(TaskLogUserVo::getCreateTime,Comparator.nullsLast(Date::compareTo)).reversed())
                 .collect(Collectors.toList());
         return ResultUtil.success(taskLogUserVoList);
     }

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

@@ -19,6 +19,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import java.util.Comparator;
+import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
@@ -92,12 +93,12 @@ public class TaskLogServiceImpl implements TaskLogService {
         if (taskLogSelectVo!=null&&taskLogSelectVo.getStartTime()!=null&&taskLogSelectVo.getEndTime()!=null){
             return taskLogUserVos.stream()
                     .filter(taskLogUserVo -> taskLogUserVo.getCreateTime().after(taskLogSelectVo.getStartTime())&&taskLogUserVo.getCreateTime().before(taskLogSelectVo.getEndTime()))
-                    .sorted(Comparator.comparing(TaskLogUserVo::getCreateTime).reversed())
+                    .sorted(Comparator.comparing(TaskLogUserVo::getCreateTime,Comparator.nullsLast(Date::compareTo)).reversed())
                     .collect(Collectors.toList());
         }
         else {
             return taskLogUserVos.stream()
-                    .sorted(Comparator.comparing(TaskLogUserVo::getCreateTime).reversed())
+                    .sorted(Comparator.comparing(TaskLogUserVo::getCreateTime,Comparator.nullsLast(Date::compareTo)).reversed())
                     .collect(Collectors.toList());
         }
     }

dev-task/src/main/java/com/tykj/dev/device/task/utils/TaskUtils.java

@@ -6,6 +6,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -20,7 +21,7 @@ public class TaskUtils {
      *             按照日志创建时间降序排列
      */
     public List<TaskLog> orderByCreateTimeDesc(List<TaskLog> list) {
-        list.sort(Comparator.comparing(TaskLog::getCreateTime).reversed());
+        list.sort(Comparator.comparing(TaskLog::getCreateTime,Comparator.nullsLast(Date::compareTo)).reversed());
         return list;
     }
 
@@ -29,7 +30,7 @@ public class TaskUtils {
      *             按照日志创建时间增序排列
      */
     public List<TaskLog> orderByCreateTimeAsc(List<TaskLog> list) {
-        list.sort(Comparator.comparing(TaskLog::getCreateTime));
+        list.sort(Comparator.comparing(TaskLog::getCreateTime,Comparator.nullsLast(Date::compareTo)));
         return list;
     }
 
@@ -38,7 +39,7 @@ public class TaskUtils {
      *             按照跟踪时间增序排列
      */
     public List<TaskUserVo> orderByUserTimeDateAsc(List<TaskUserVo> list) {
-        list.sort(Comparator.comparing(TaskUserVo::getUserTimeDate));
+        list.sort(Comparator.comparing(TaskUserVo::getUserTimeDate,Comparator.nullsLast(Date::compareTo)));
         return list;
     }
 
@@ -47,7 +48,7 @@ public class TaskUtils {
      *             按照跟踪时间降序排列
      */
     public List<TaskUserVo> orderByUserTimeDateDesc(List<TaskUserVo> list) {
-        list.sort(Comparator.comparing(TaskUserVo::getUserTimeDate).reversed());
+        list.sort(Comparator.comparing(TaskUserVo::getUserTimeDate,Comparator.nullsLast(Date::compareTo)).reversed());
         return list;
     }
 
@@ -56,7 +57,7 @@ public class TaskUtils {
      *             按照待办时间增序排列
      */
     public List<TaskUserVo> orderByTrackingTimeDateAsc(List<TaskUserVo> list) {
-        list.sort(Comparator.comparing(TaskUserVo::getTrackingTimeDate));
+        list.sort(Comparator.comparing(TaskUserVo::getTrackingTimeDate,Comparator.nullsLast(Date::compareTo)));
         return list;
     }
 
@@ -65,7 +66,7 @@ public class TaskUtils {
      *             按照待办时间降序排列
      */
     public List<TaskUserVo> orderByTrackingTimeDateDesc(List<TaskUserVo> list) {
-        list.sort(Comparator.comparing(TaskUserVo::getTrackingTimeDate).reversed());
+        list.sort(Comparator.comparing(TaskUserVo::getTrackingTimeDate,Comparator.nullsLast(Date::compareTo)).reversed());
         return list;
     }
 
@@ -74,7 +75,7 @@ public class TaskUtils {
      *             按照发起时间降序排列
      */
     public List<TaskUserVo> orderByCreateTimeDesc2(List<TaskUserVo> list) {
-        list.sort(Comparator.comparing(TaskUserVo::getCreateTime).reversed());
+        list.sort(Comparator.comparing(TaskUserVo::getCreateTime,Comparator.nullsLast(Date::compareTo)).reversed());
         return list;
     }
 
@@ -83,7 +84,7 @@ public class TaskUtils {
      *             按照发起时间升序排列
      */
     public List<TaskUserVo> orderByCreateTimeAsc2(List<TaskUserVo> list) {
-        list.sort(Comparator.comparing(TaskUserVo::getCreateTime));
+        list.sort(Comparator.comparing(TaskUserVo::getCreateTime,Comparator.nullsLast(Date::compareTo)));
         return list;
     }
 

dev-union/src/main/java/com/tykj/dev/union/LogAspect.java

@@ -381,7 +381,7 @@ public class LogAspect {
 //                    }
                     if ((this.oldStatus.equals(StatusEnum.WAIT_BACK_RECEIVE.id) && this.newStatus.equals(StatusEnum.END.id))||
                             (this.oldStatus.equals(StatusEnum.ORIGIN_STATUS.id) && this.newStatus.equals(StatusEnum.END.id))) {
-                        this.fileVos.add(new FileVo("回执单", repairBackBill.getBillFileName(), repairBackBill.getBillFileUrl()));
+                        this.fileVos.add(new FileVo("签收单", repairBackBill.getReceiveFileName(), repairBackBill.getReceiveFileUrl()));
 //                        this.fileVos.add(new FileVo("入库确认单", repairBackBill.getReceiveFileName(), repairBackBill.getReceiveFileUrl()));
                     }
 //                    if ((this.oldStatus.equals(StatusEnum.ORIGIN_STATUS.id) && this.newStatus.equals(StatusEnum.WAIT_UPLOAD_BACK_FILE.id))

dev-user/src/main/java/com/tykj/dev/device/user/read/service/impl/MessageServiceImpl.java

@@ -16,6 +16,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import java.util.Comparator;
+import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
@@ -84,7 +85,7 @@ public class MessageServiceImpl implements MessageService {
                 .map(Message::parse2Bto)
                 .filter(messageBto -> messageBto.getInvolveUserIdList().contains(userId)&&!messageBto.getCompleteUserIdList().contains(userId))
                 .map(MessageBto::toVo)
-                .sorted(Comparator.comparing(MessageUserVo::getCreateTime).reversed())
+                .sorted(Comparator.comparing(MessageUserVo::getCreateTime,Comparator.nullsLast(Date::compareTo)).reversed())
                 .collect(Collectors.toList());
     }
 

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/UnitsServiceImpl.java

@@ -115,12 +115,12 @@ public class UnitsServiceImpl implements UnitsService {
                             }
                     );
                 }
-                leftNavigation.setLeftNavigations(leftNavigationList1.stream().sorted(Comparator.comparing(LeftNavigation::getOrder)).collect(Collectors.toList()));
+                leftNavigation.setLeftNavigations(leftNavigationList1.stream().sorted(Comparator.comparing(LeftNavigation::getOrder,Comparator.nullsLast(Integer::compareTo))).collect(Collectors.toList()));
                 leftNavigationList.add(leftNavigation);
             });
         }else if (thisArea.getType()==2){
             areas.forEach(area -> {
-                leftNavigationList.addAll(unitsDao.findAllByAreaId(area.getId()).stream().map(Units::toLeftNavigation).sorted(Comparator.comparing(LeftNavigation::getOrder)).collect(Collectors.toList()));
+                leftNavigationList.addAll(unitsDao.findAllByAreaId(area.getId()).stream().map(Units::toLeftNavigation).sorted(Comparator.comparing(LeftNavigation::getOrder,Comparator.nullsLast(Integer::compareTo))).collect(Collectors.toList()));
             });
         }else {
             return leftNavigationList;
@@ -293,7 +293,7 @@ public class UnitsServiceImpl implements UnitsService {
             leftNavigationList= unitsDao.findAllByAreaId(belongsArea.getId()).stream().map(Units::toLeftNavigation).collect(Collectors.toList());
         }
 
-        leftNavigation.setLeftNavigations(leftNavigationList.stream().sorted(Comparator.comparing(LeftNavigation::getOrder)).collect(Collectors.toList()));
+        leftNavigation.setLeftNavigations(leftNavigationList.stream().sorted(Comparator.comparing(LeftNavigation::getOrder,Comparator.nullsLast(Integer::compareTo))).collect(Collectors.toList()));
 
         return leftNavigation;
     }