fix(版本回滚合并): 版本回滚合并

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

@@ -39,6 +39,7 @@ import com.tykj.dev.device.user.subject.service.UnitsService;
 import com.tykj.dev.device.user.subject.service.UserPublicService;
 import com.tykj.dev.device.user.util.UserUtils;
 import com.tykj.dev.misc.base.BusinessEnum;
+import com.tykj.dev.misc.base.CustomOrder;
 import com.tykj.dev.misc.base.StatusEnum;
 import com.tykj.dev.misc.exception.ApiException;
 import com.tykj.dev.misc.utils.*;
@@ -48,12 +49,14 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
+import java.util.concurrent.Executor;
 import java.util.stream.Collectors;
 
 /**
@@ -568,6 +571,8 @@ public class RepairController {
 //
         //添加taskId
         repairBill2.setTaskId(saveEntity.getId());
+        //修改备注
+
         return ResultUtil.success(repairBill2);
     }
 
@@ -1629,9 +1634,11 @@ public class RepairController {
             });
             //所在为当前单位
             List<RepairDetail> repairDetails1 = repairDetails.stream().filter(repairDetail -> repairDetail.getLocationUnit().equals(unitName)).collect(Collectors.toList());
-            //按照时间排序
+            //默认按照时间排序
+            List<CustomOrder> orders = repairTaskSelectVo.getOrders();
             List<RepairDetail> repairDetails2 = repairDetails1.stream().sorted(Comparator.comparing(RepairDetail::getUpdateTime)).collect(Collectors.toList());
-            return ResponseEntity.ok(PageUtil.getPerPage(repairTaskSelectVo.getPage(), repairTaskSelectVo.getSize(), repairDetails2, repairTaskSelectVo.getPageable()));
+            List<RepairDetail> finalList = sortMethod(orders, repairDetails2, repairDetails1);
+            return ResponseEntity.ok(PageUtil.getPerPage(repairTaskSelectVo.getPage(), repairTaskSelectVo.getSize(), finalList, repairTaskSelectVo.getPageable()));
         }
         //送修装备
         else if (type == 2) {
@@ -1686,7 +1693,8 @@ public class RepairController {
 
             //按照时间排序
             List<WaitingRepairEquipmentVo> waitingRepairEquipmentVoList = waitingRepairEquipments.stream().sorted(Comparator.comparing(WaitingRepairEquipmentVo::getUpdateTime)).collect(Collectors.toList());
-            return ResponseEntity.ok(PageUtil.getPerPage(repairTaskSelectVo.getPage(), repairTaskSelectVo.getSize(), waitingRepairEquipmentVoList, repairTaskSelectVo.getPageable()));
+            List<WaitingRepairEquipmentVo> finalList = sortMethod1(repairTaskSelectVo.getOrders(), waitingRepairEquipments, waitingRepairEquipmentVoList);
+            return ResponseEntity.ok(PageUtil.getPerPage(repairTaskSelectVo.getPage(), repairTaskSelectVo.getSize(), finalList, repairTaskSelectVo.getPageable()));
         }
         //待领取装备
         else if (type == 3) {
@@ -1711,7 +1719,8 @@ public class RepairController {
             }
             //按照时间排序
             List<WaitingRepairEquipmentVo> waitingRepairEquipmentVoList = waitingRepairEquipments.stream().sorted(Comparator.comparing(WaitingRepairEquipmentVo::getUpdateTime)).collect(Collectors.toList());
-            return ResponseEntity.ok(PageUtil.getPerPage(repairTaskSelectVo.getPage(), repairTaskSelectVo.getSize(), waitingRepairEquipmentVoList, repairTaskSelectVo.getPageable()));
+            List<WaitingRepairEquipmentVo> finalList = sortMethod1(repairTaskSelectVo.getOrders(), waitingRepairEquipments, waitingRepairEquipmentVoList);
+            return ResponseEntity.ok(PageUtil.getPerPage(repairTaskSelectVo.getPage(), repairTaskSelectVo.getSize(), finalList, repairTaskSelectVo.getPageable()));
         }
         //已领取装备
         else if (type == 4) {
@@ -1754,7 +1763,8 @@ public class RepairController {
             }
             //按照时间排序
             List<EquipmentReceivedVo> equipmentReceivedVoList = equipmentReceivedVos.stream().sorted(Comparator.comparing(EquipmentReceivedVo::getUpdateTime)).collect(Collectors.toList());
-            return ResponseEntity.ok(PageUtil.getPerPage(repairTaskSelectVo.getPage(), repairTaskSelectVo.getSize(), equipmentReceivedVoList, repairTaskSelectVo.getPageable()));
+            List<EquipmentReceivedVo> finalList = sortMethod2(repairTaskSelectVo.getOrders(), equipmentReceivedVos, equipmentReceivedVoList);
+            return ResponseEntity.ok(PageUtil.getPerPage(repairTaskSelectVo.getPage(), repairTaskSelectVo.getSize(), finalList, repairTaskSelectVo.getPageable()));
         }
         //已报废装备
         else if (type == 5) {
@@ -1771,7 +1781,8 @@ public class RepairController {
             List<RepairDetail> repairDetails2 = repairDetails.stream().filter(repairDetail -> !hasYear || repairDetail.getUpdateTime().getYear() == year - 1900).collect(Collectors.toList());
            //按照时间排序
             List<RepairDetail> repairDetailList = repairDetails2.stream().sorted(Comparator.comparing(RepairDetail::getUpdateTime)).collect(Collectors.toList());
-            return ResponseEntity.ok(PageUtil.getPerPage(repairTaskSelectVo.getPage(), repairTaskSelectVo.getSize(), repairDetailList, repairTaskSelectVo.getPageable()));
+            List<RepairDetail> finalList = sortMethod(repairTaskSelectVo.getOrders(), repairDetailList, repairDetails);
+            return ResponseEntity.ok(PageUtil.getPerPage(repairTaskSelectVo.getPage(), repairTaskSelectVo.getSize(), finalList, repairTaskSelectVo.getPageable()));
         }
 //        else if (type == 6) {
 //            //0
@@ -1824,10 +1835,11 @@ public class RepairController {
             //按照时间排序
             List<WaitingRepairEquipmentVo> equipmentReceivedVoList = waitingRepairEquipments.stream().sorted(Comparator.comparing(WaitingRepairEquipmentVo::getUpdateTime)).collect(Collectors.toList());
 //            List<WaitingRepairEquipmentVo> waitingRepairEquipmentVoList = waitingRepairEquipments.stream().sorted(Comparator.comparing(WaitingRepairEquipmentVo::getUpdateTime)).collect(Collectors.toList());
-            return ResponseEntity.ok(PageUtil.getPerPage(repairTaskSelectVo.getPage(), repairTaskSelectVo.getSize(), equipmentReceivedVoList, repairTaskSelectVo.getPageable()));
+            List<WaitingRepairEquipmentVo> finalList = sortMethod1(repairTaskSelectVo.getOrders(), waitingRepairEquipments, equipmentReceivedVoList);
+            return ResponseEntity.ok(PageUtil.getPerPage(repairTaskSelectVo.getPage(), repairTaskSelectVo.getSize(), finalList, repairTaskSelectVo.getPageable()));
         }
         else {
-            throw new ApiException("type只能为1，2，3，4，5，6，7");
+            throw new ApiException("type只能为1，2，3，4，5，7");
         }
     }
 
@@ -2273,8 +2285,6 @@ public class RepairController {
 
             //添加日志
             deviceLogService.addAllLog(deviceLogDtos);
-
-//            sendBill.setDeviceLibraries(deviceLibraryList);
             sendBill.setDeviceLibraries(deviceLibraryList);
             repairSendBillService.delete(sendBill.getId());
 
@@ -2337,8 +2347,6 @@ public class RepairController {
 
             //添加日志
             deviceLogService.addAllLog(deviceLogDtos);
-
-//            sendBill.setDeviceLibraries(deviceLibraryList);
             repairBackBill.setDeviceLibraries(deviceLibraryList);
             repairSendBillService.delete(repairBackBill.getId());
 
@@ -2365,5 +2373,74 @@ public class RepairController {
         return ResponseEntity.ok(repairSendBillService.getFileList(taskId));
     }
 
+    @Qualifier("taskExecutor")
+    @Autowired
+    private Executor executor;
+    @GetMapping("updateRemark")
+    @ApiOperation("通过任务id查询维修退回账单中文件")
+    public void updateRemark(UpdateRemarkVos updateRemarkVos){
+        List<UpdateRemarkVo> remarkVos = updateRemarkVos.getUpdateRemarkVos();
+        //通过维修详情id查询
+        List<Integer> detailIds = remarkVos.stream().map(UpdateRemarkVo::getRepairDetailId).collect(Collectors.toList());
+        List<RepairDetail> repairDetails = repairDetailDao.findAllByIdIn(detailIds);
+        List<DeviceLogDto> dtoList = new ArrayList<>();
+        for (UpdateRemarkVo remarkVo : remarkVos) {
+            repairDetails.forEach(
+                    repairDetail -> {
+                        if (repairDetail.getId().equals(remarkVo.getRepairDetailId())){
+                            repairDetail.setRemark(remarkVo.getRemark());
+                            repairDetailDao.save(repairDetail);
+                            DeviceLogDto deviceLogDto = new DeviceLogDto(remarkVo.getDeviceId(), userUtils.getCurrentName()+"将维修原因修改为"+remarkVo.getRemark(), null,null,null);
+                            dtoList.add(deviceLogDto);
+                        }
+                    }
+            );
+        }
+        executor.execute(()->{
+            deviceLogService.addAllLog(dtoList);
+        });
+    }
+
+    private List<RepairDetail> sortMethod(List<CustomOrder> orders,List<RepairDetail> repairDetails2,List<RepairDetail> repairDetails1){
+//        List<CustomOrder> orders = repairTaskSelectVo.getOrders();
+        List<String> list = orders.stream().map(CustomOrder::getDirection).collect(Collectors.toList());
+//        List<RepairDetail> repairDetails2 = repairDetails1.stream().sorted(Comparator.comparing(RepairDetail::getUpdateTime)).collect(Collectors.toList());
+        List<RepairDetail> finalList = new ArrayList<>();
+        boolean b = list.stream().allMatch(Objects::isNull);
+        if (b){
+            finalList = repairDetails2;
+        }else {
+            finalList = repairDetails1;
+        }
+        return  finalList;
+    }
+
+    private List<WaitingRepairEquipmentVo> sortMethod1(List<CustomOrder> orders,List<WaitingRepairEquipmentVo> waitingRepairEquipmentVos,List<WaitingRepairEquipmentVo> waitingRepairEquipmentVoList){
+        List<String> list = orders.stream().map(CustomOrder::getDirection).collect(Collectors.toList());
+        List<WaitingRepairEquipmentVo> finalList = new ArrayList<>();
+        boolean b = list.stream().allMatch(Objects::isNull);
+        if (b){
+            //默认按照时间排序
+            finalList = waitingRepairEquipmentVoList;
+        }else {
+            finalList = waitingRepairEquipmentVos;
+        }
+        return  finalList;
+    }
+
+    private List<EquipmentReceivedVo> sortMethod2(List<CustomOrder> orders,List<EquipmentReceivedVo> equipmentReceivedVos,List<EquipmentReceivedVo> waitingRepairEquipmentVoList){
+//        List<EquipmentReceivedVo> equipmentReceivedVoList = equipmentReceivedVos.stream().sorted(Comparator.comparing(EquipmentReceivedVo::getUpdateTime)).collect(Collectors.toList());
+
+        List<String> list = orders.stream().map(CustomOrder::getDirection).collect(Collectors.toList());
+        List<EquipmentReceivedVo> finalList = new ArrayList<>();
+        boolean b = list.stream().allMatch(Objects::isNull);
+        if (b){
+            finalList = waitingRepairEquipmentVoList;
+        }else {
+            finalList = equipmentReceivedVos;
+        }
+        return  finalList;
+    }
+
 
 }

dev-repair/src/main/java/com/tykj/dev/device/repair/repository/RepairDetailDao.java

@@ -35,4 +35,6 @@ public interface RepairDetailDao extends JpaRepository<RepairDetail, Integer>, J
     @Modifying
     @Query("update RepairDetail r set r.record3 = :record where r.id = :id")
     void updateRecord3(String record,Integer id);
+
+    List<RepairDetail> findAllByIdIn(List<Integer> ids);
 }

dev-user/src/main/java/com/tykj/dev/device/user/read/controller/MessageController.java

@@ -60,7 +60,7 @@ public class MessageController {
         Boolean hasContentDim = messageSelectVo.getContentDim()!=null;
         Boolean hasOperatorDim = messageSelectVo.getOperatorDim()!=null;
         List<MessageUserVo> messageUserVos = messageService.getAllList(messageSelectVo);
-        messageUserVos.sort(Comparator.comparing(MessageUserVo::getIsTop).reversed().thenComparing(MessageUserVo::getCreateTime).reversed());
+//        messageUserVos.sort(Comparator.comparing(MessageUserVo::getIsTop).reversed().thenComparing(MessageUserVo::getCreateTime).reversed());
         //模糊查询筛选
         if (hasContentDim||hasOperatorDim) {
             messageUserVos = messageUserVos.stream().filter(messageUserVo -> {