fix(配发，退回，维修领取，送修，决算，使用模块): 配发，退回，维修领取，送修修改了业务档案查询错误，决算，使用模块

dev-allot/src/main/java/com/tykj/dev/device/allot/service/impl/AllotBackBillServiceImpl.java

@@ -158,8 +158,8 @@ public class AllotBackBillServiceImpl implements AllotBackBillService {
         PredicateBuilder<AllotBackBill> predicateBuilder = Specifications.and();
         //或预言器，判断当前单位是不是发件或收件单位
         PredicateBuilder<AllotBackBill> predicateBuilder1 = Specifications.or();
-        predicateBuilder1.eq("sendUnit", userUtils.getCurrentUserUnitName());
-        predicateBuilder1.eq("receiveUnit", userUtils.getCurrentUserUnitName());
+        predicateBuilder1.eq("sendUnitId", userUtils.getCurrentUnitId());
+        predicateBuilder1.eq("receiveUnitId", userUtils.getCurrentUnitId());
         predicateBuilder.predicate(predicateBuilder1.build());
         if (allotBillSelectVo != null) {
             if (allotBillSelectVo.getReplayNumber() != null) {

dev-allot/src/main/java/com/tykj/dev/device/allot/service/impl/AllotBillServiceImpl.java

@@ -159,8 +159,8 @@ public class AllotBillServiceImpl implements AllotBillService {
         PredicateBuilder<AllotBill> predicateBuilder = Specifications.and();
         //或预言器，判断当前单位是不是发件或收件单位
         PredicateBuilder<AllotBill> predicateBuilder1 = Specifications.or();
-        predicateBuilder1.eq("sendUnit", userUtils.getCurrentUserUnitName());
-        predicateBuilder1.eq("receiveUnit", userUtils.getCurrentUserUnitName());
+        predicateBuilder1.eq("sendUnitId", userUtils.getCurrentUnitId());
+        predicateBuilder1.eq("receiveUnitId", userUtils.getCurrentUnitId());
         predicateBuilder.predicate(predicateBuilder1.build());
         if (allotBillSelectVo != null) {
             if (allotBillSelectVo.getReplayNumber() != null) {

dev-repair/src/main/java/com/tykj/dev/device/repair/service/impl/RepairBackBillServiceImpl.java

@@ -131,8 +131,8 @@ public class RepairBackBillServiceImpl implements RepairBackBillService {
     private Specification<RepairBackBill> getSelectSpecification(RepairBillSelectVo deviceRepairBillSelectVo) {
         PredicateBuilder<RepairBackBill> predicateBuilder = Specifications.and();
         PredicateBuilder<RepairBackBill> predicateBuilder1 = Specifications.or();
-        predicateBuilder1.eq("sendUnit", userUtils.getCurrentUserUnitName());
-        predicateBuilder1.eq("receiveUnit", userUtils.getCurrentUserUnitName());
+        predicateBuilder1.eq("sendUnitId", userUtils.getCurrentUnitId());
+        predicateBuilder1.eq("receiveUnitId", userUtils.getCurrentUnitId());
         predicateBuilder.predicate(predicateBuilder1.build());
         if (deviceRepairBillSelectVo != null) {
             if (deviceRepairBillSelectVo.getReceiveUnit() != null) {

dev-repair/src/main/java/com/tykj/dev/device/repair/service/impl/RepairBillServiceImpl.java

@@ -103,8 +103,8 @@ public class RepairBillServiceImpl implements RepairBillService {
     private Specification<RepairBill> getSelectSpecification(RepairBillSelectVo deviceRepairBillSelectVo) {
         PredicateBuilder<RepairBill> predicateBuilder = Specifications.and();
         PredicateBuilder<RepairBill> predicateBuilder1 = Specifications.or();
-        predicateBuilder1.eq("sendUnit", userUtils.getCurrentUserUnitName());
-        predicateBuilder1.eq("receiveUnit", userUtils.getCurrentUserUnitName());
+        predicateBuilder1.eq("sendUnitId", userUtils.getCurrentUnitId());
+        predicateBuilder1.eq("receiveUnitId", userUtils.getCurrentUnitId());
         predicateBuilder.predicate(predicateBuilder1.build());
         if (deviceRepairBillSelectVo != null) {
             if (deviceRepairBillSelectVo.getReceiveUnit() != null) {

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/DeviceRepelDetailServiceImpl.java

@@ -143,6 +143,11 @@ public class DeviceRepelDetailServiceImpl implements DeviceRepelDetailService {
 
     private Specification<DeviceRepelDetail> getFindRetiredSpecification(RepelDetailSelectVo repelDetailSelectVo) {
         PredicateBuilder<DeviceRepelDetail> predicateBuilder = Specifications.and();
+        PredicateBuilder<DeviceRepelDetail> predicateBuilder1 = Specifications.or();
+
+        predicateBuilder1.eq("sendUnitId",repelDetailSelectVo.getUnitId());
+        predicateBuilder1.eq("receiveUnitId",repelDetailSelectVo.getUnitId());
+        predicateBuilder.predicate(predicateBuilder1.build());
         if (repelDetailSelectVo.getStartTime() != null) {
             predicateBuilder.gt("createTime", repelDetailSelectVo.getStartTime());
         }
@@ -151,7 +156,7 @@ public class DeviceRepelDetailServiceImpl implements DeviceRepelDetailService {
         }
         predicateBuilder.eq("repelStatus", 2);
         predicateBuilder.eq("repelType",1,2);
-        predicateBuilder.eq("sendUnitId",repelDetailSelectVo.getUnitId());
+
         return predicateBuilder.build();
 
     }

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

@@ -365,7 +365,7 @@ public class DeviceUseReportServiceImpl implements DeviceUseReportService {
 //                .collect(toList());
         List<AllotBill> allotBillEntities = allotBillDao.findAll().stream()
                 .filter(allotBillEntity -> allotBillEntity.getAllotStatus() == 5 &&
-                        userUtils.getCurrentUserUnitName().equals(unitsService.findById(allotBillEntity.getReceiveUnitId()))
+                        userUtils.getCurrentUnitId().equals(allotBillEntity.getReceiveUnitId())
                         && allotBillEntity.getReceiveTime().after(date) && allotBillEntity.getReceiveTime().before(date2))
                 .collect(toList());
         //筛选出配发给其它单位的账单  发起配发