Merge ranch 'dev' of git.yfzx.zjtys.com.cn:matrix/device-back into feature-check

dev-user/src/main/java/com/tykj/dev/device/user/cache/UnitsCache.java

@@ -4,6 +4,7 @@ import com.tykj.dev.device.user.subject.entity.Units;
 import lombok.Data;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -81,4 +82,20 @@ public class UnitsCache {
         return new ArrayList<>(idMap.values()).stream().filter(units -> areaIds.contains(units.getAreaId())).collect(Collectors.toList());
     }
 
+
+    /**
+     * 根据单位id的集合给集合进行排序
+     * @param ids 单位id集合
+     * @return 单位id集合
+     */
+    public List<Integer> sortReasonUnitsIds(List<Integer> ids){
+
+       return ids.stream().sorted(Comparator.comparing(id->idMap.get(id).getShowOrder())).collect(Collectors.toList());
+    }
+
+
+    public List<Units> sortReasonUnits(List<Units> unitsList){
+        return unitsList.stream().sorted(Comparator.comparing(Units::getShowOrder)).collect(Collectors.toList());
+    }
+
 }

dev-usereport/src/main/java/com/tykj/dev/device/usereport/service/impl/DeviceUseReportServiceImpl.java

@@ -367,14 +367,23 @@ public class DeviceUseReportServiceImpl implements DeviceUseReportService {
 //        List<AllotBill> allotBillEntities = allotBillDao.findAll().stream()
 //                .filter(allotBillEntity -> allotBillEntity.getAllotStatus() == 5 && userUtils.getCurrentUserUnitName().equals(allotBillEntity.getReceiveUnit()) && allotBillEntity.getReceiveTime().after(date) && allotBillEntity.getReceiveTime().before(date2))
 //                .collect(toList());
+        Integer unitId = userUtils.getCurrentUnitId();
         List<AllotBill> allotBillEntities = allotBillDao.findAll().stream()
                 .filter(allotBillEntity -> allotBillEntity.getAllotStatus() == 5 &&
-                        userUtils.getCurrentUnitId().equals(allotBillEntity.getReceiveUnitId())
+                        unitId.equals(allotBillEntity.getReceiveUnitId())
                         && allotBillEntity.getReceiveTime().after(date) && allotBillEntity.getReceiveTime().before(date2))
                 .collect(toList());
         //筛选出配发给其它单位的账单  发起配发
+//        List<AllotBill> allotBillEntities2 = allotBillDao.findAll().stream()
+//                .filter(allotBillEntity -> allotStatusList.contains(allotBillEntity.getAllotStatus()) &&
+//                        userUtils.getCurrentUserUnitName().equals(userPublicService.findUnitsNameByUserId(allotBillEntity.getSendUseraId()))
+//                        && allotBillEntity.getSendTime().after(date) && allotBillEntity.getSendTime().before(date2))
+//                .collect(toList());
+        String currentUserUnitName1 = userUtils.getCurrentUserUnitName();
         List<AllotBill> allotBillEntities2 = allotBillDao.findAll().stream()
-                .filter(allotBillEntity -> allotStatusList.contains(allotBillEntity.getAllotStatus()) && userUtils.getCurrentUserUnitName().equals(userPublicService.findUnitsNameByUserId(allotBillEntity.getSendUseraId())) && allotBillEntity.getSendTime().after(date) && allotBillEntity.getSendTime().before(date2))
+                .filter(allotBillEntity -> allotStatusList.contains(allotBillEntity.getAllotStatus()) &&
+                        currentUserUnitName1.equals(userPublicService.findUnitsNameByUserId(allotBillEntity.getSendUseraId()))
+                        && allotBillEntity.getSendTime().after(date) && allotBillEntity.getSendTime().before(date2))
                 .collect(toList());
         //接收配发装备
         if (allotBillEntities.size() > 0) {
@@ -397,7 +406,8 @@ public class DeviceUseReportServiceImpl implements DeviceUseReportService {
 //                .collect(toList());
         List<AllotBackBill> receiveAllotBackBills = allotBackBillDao.findAll().stream()
                 .filter(allotBackBill -> allotBackBill.getBackStatus() == 3 &&
-                        userUtils.getCurrentUserUnitName().equals(unitsCache.findById(allotBackBill.getReceiveUnitId()).getName())
+//                        userUtils.getCurrentUserUnitName().equals(unitsCache.findById(allotBackBill.getReceiveUnitId()).getName())
+                        currentUserUnitName1.equals(unitsCache.findById(allotBackBill.getReceiveUnitId()).getName())
                         && allotBackBill.getReceiveTime().after(date) && allotBackBill.getReceiveTime().before(date2))
                 .collect(toList());
         //接收退回
@@ -416,7 +426,8 @@ public class DeviceUseReportServiceImpl implements DeviceUseReportService {
 //                    .collect(toList());
             List<AllotBackBill> sendAllotBackBills = allotBackBillDao.findAll().stream()
                     .filter(allotBackBill -> allotStatusBackList.contains(allotBackBill.getBackStatus()) &&
-                            userUtils.getCurrentUserUnitName().equals(unitsCache.findById(allotBackBill.getSendUnitId()).getName())
+//                            userUtils.getCurrentUserUnitName().equals(unitsCache.findById(allotBackBill.getSendUnitId()).getName())
+                            currentUserUnitName1.equals(unitsCache.findById(allotBackBill.getSendUnitId()).getName())
                             && allotBackBill.getSendTime().after(date) && allotBackBill.getSendTime().before(date2))
                             .collect(toList());
             //发起退回