dev 合并 master

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/controller/DeviceCheckController.java

@@ -689,7 +689,8 @@ public class DeviceCheckController {
                     Integer detailId = task.getBillId();
                     Integer userCId = detailRepo.findById(detailId).get().getUserCId();
 
-                    if (task.getBillStatus().equals(END.id) && Objects.nonNull(userCId) && userIsProv(userCId)){
+                    if (task.getBillStatus().equals(END.id) && Objects.nonNull(userCId)  && userCId !=0 && userIsProv(userCId)){
+
                         checkResult = "无误";
                     }else {
                         checkResult = "等待省审核";

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

@@ -2294,6 +2294,10 @@ public class RepairController {
             String currentUserUnitName = userUtils.getCurrentUserUnitName();
             //查询维修详情
             List<RepairDetail> byDeviceRepairBillId = repairDetailDao.findByDeviceRepairBillId(repairBill.getId());
+
+            //进行过滤
+//            List<RepairDetail> repairDetails = byDeviceRepairBillId.stream().filter(repairDetail -> repairDetail.getRepairBackBillId() == null && repairDetail.getRepairStatus().equals(RepairStatusEnum.WAIT_REPAIR.id) && repairDetail.getLocationUnit().equals(repairDetail.getOwnUnit()))
+//                    .collect(Collectors.toList());
             List<RepairDetail> repairDetails = byDeviceRepairBillId.stream().filter(repairDetail -> {
                 if (!repairDetail.getLocationUnit().equals(repairDetail.getOwnUnit())) {
                     return repairDetail.getRepairBackBillId() == null && repairDetail.getRepairStatus().equals(RepairStatusEnum.WAIT_REPAIR.id) && repairDetail.getLocationUnit().equals(currentUserUnitName);
@@ -2307,6 +2311,10 @@ public class RepairController {
                 }
 
                 repairDetail.setRepairStatus(RepairStatusEnum.WAIT_SEND.id);
+//                if (repairDetail.getLocationUnit())
+//
+//                    repairDetail.setLocationUnit(repairDetail.getOwnUnit());
+
                 repairDetailDao.save(repairDetail);
             });
             //直接删除维修单

dev-union/src/main/resources/htmlTemplate/repair.html

@@ -402,7 +402,7 @@
             bottom: 0px;
             right: 150px;
 
-
+        }
         .oddrowcolor {
             background-color: #fff;
         }