feat(冲突): 解决合并冲突

CHANGELOG-m.md

+#  v0.9.0.1.2(2021-08-24)
+
+
+### Bug Fixes
+
+* **PDF模块:** 自行处理异常 ([b042544](https://git.yfzx.zjtys.com.cn/matrix/device-back/commits/b042544809de9d6ca4b6836cdbe5b130824a46ec))
+* **单位模块:** 过滤某些单位 ([0fbe290](https://git.yfzx.zjtys.com.cn/matrix/device-back/commits/0fbe29044a988499045a5c9b5585277ea73f5492))
+* **核查模块:** 丰富了refresh接口里的信息 ([6cfee6e](https://git.yfzx.zjtys.com.cn/matrix/device-back/commits/6cfee6e42ddb5108f15a3d610e90834525483118))
+* **版本回滚合并:** 版本回滚合并 ([1c6991c](https://git.yfzx.zjtys.com.cn/matrix/device-back/commits/1c6991c269a6775afb59b1d9e99316c9b39c5514))
+* **维修模块:** 修改部分bug ([84577cd](https://git.yfzx.zjtys.com.cn/matrix/device-back/commits/84577cd3a412be215fa36406fc4fff5d0b7f03a3))
+* **维修模块:** 修改部分bug ([58f504a](https://git.yfzx.zjtys.com.cn/matrix/device-back/commits/58f504a6fc6ebdd234c1b8d4adfa5186cf97d95e))
+* **自查模块,装备管理:** 修改部分bug ([a96297d](https://git.yfzx.zjtys.com.cn/matrix/device-back/commits/a96297d76d39589cd974a9338a971c7f441d3106))
+
+
+### Features
+
+* **列装模块,装备模块:** 修改列装，装备对应修改 ([9640893](https://git.yfzx.zjtys.com.cn/matrix/device-back/commits/96408939f8cc183025bd4c7d7bd58c6bd1c4a5fc))
+* **文件模块:** 添加维修模块的单据接口 ([2d19e02](https://git.yfzx.zjtys.com.cn/matrix/device-back/commits/2d19e029c4e20f49feb0af6063ed5832b801a943))
+* **清退、销毁、报废、丢失、退役模块:** 统一添加了根据任务id查询业务相关单据接口 ([ef5b5b6](https://git.yfzx.zjtys.com.cn/matrix/device-back/commits/ef5b5b6bcc7ae727edd33221e2ddb4af0cd8dd68))
+* **用户模块:** 单位列表左侧列表接口修改 ([c395480](https://git.yfzx.zjtys.com.cn/matrix/device-back/commits/c3954803aad0414647cfea47036d3e3c12f2f947)), closes [#2](https://git.yfzx.zjtys.com.cn/matrix/device-back/issues/2)
+* **系统配置:** 新增了库房存放位置 ([f61756d](https://git.yfzx.zjtys.com.cn/matrix/device-back/commits/f61756d90c36d520313aacd6790035a09633b2e1))
+* **维修模块:** 更新维修原因 ([8641f8d](https://git.yfzx.zjtys.com.cn/matrix/device-back/commits/8641f8dbf9e370914768fcb8b2fb18b30a9da33a))
+* **维修管理:** 新增了查询多个id的接口 ([157fbe9](https://git.yfzx.zjtys.com.cn/matrix/device-back/commits/157fbe98d3178741d83c765dd24c8aca2d079971))
+* **自查模块，装备管理模块:** 修改库房存放位置，系统自查 ([2bc956f](https://git.yfzx.zjtys.com.cn/matrix/device-back/commits/2bc956f4d226206e3dc8a98002212dd11b16cf3f))
+* **装备管理:** 新增了是否是配件字段 ([8b5ca58](https://git.yfzx.zjtys.com.cn/matrix/device-back/commits/8b5ca585b6f7a75ceaaf7f3d7dfa9ddcd808a44e))
+
+
+

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

@@ -1654,8 +1654,6 @@ public class RepairController {
             //发起送修的单位为当前单位  并且所在单位不是自己的
 //          //进行时间上面的优化
             List<Integer> sendRepairIds = repairDetails1.stream().map(RepairDetail::getDeviceRepairBillId).collect(Collectors.toList());
-            //通过id去查询
-//            List<String> sendUnits = deviceRepairBillService.findByIds(sendRepairIds).stream().map(RepairBill::getSendUnit).distinct().collect(Collectors.toList());
             //key为发起单位
             Map<String, List<RepairBill>> listMap = deviceRepairBillService.findByIds(sendRepairIds).stream().collect(Collectors.groupingBy(RepairBill::getSendUnit));
             if (!listMap.containsKey(unitName)){
@@ -2405,7 +2403,7 @@ public class RepairController {
         });
     }
 
-    private List<RepairDetail> sortMethod(List<CustomOrder> orders,List<RepairDetail> repairDetails2,List<RepairDetail> repairDetails1){
+    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());
@@ -2419,7 +2417,7 @@ public class RepairController {
         return  finalList;
     }
 
-    private List<WaitingRepairEquipmentVo> sortMethod1(List<CustomOrder> orders,List<WaitingRepairEquipmentVo> waitingRepairEquipmentVos,List<WaitingRepairEquipmentVo> waitingRepairEquipmentVoList){
+    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);
@@ -2443,6 +2441,7 @@ public class RepairController {
         }else {
             finalList = equipmentReceivedVos;
         }
+
         return  finalList;
     }