更新

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

@@ -114,8 +114,8 @@ public class RepairBillSelectController {
         List<TaskUserVo> taskUserVos;
         //如果是待办
         if (taskSelectVo.getSelectNum()==2){
-            //筛选出状态为维修或领取待上传签收单的状态，状态为704或804
-            taskUserVos = taskService.getManageList(taskSelectVo).stream().filter(taskUserVo -> taskUserVo.getBillStatus()==704||taskUserVo.getBillStatus()==804).collect(Collectors.toList());
+            //筛选出状态为维修或领取待上传签收单的状态，状态为704或804\722\810
+            taskUserVos = taskService.getManageList(taskSelectVo).stream().filter(taskUserVo -> taskUserVo.getBusinessType()==5||taskUserVo.getBusinessType()==10).collect(Collectors.toList());
         }
         else {
             taskUserVos = taskService.getManageList(taskSelectVo).stream().filter(taskUserVo -> taskUserVo.getBusinessType()==5||taskUserVo.getBusinessType()==10).collect(Collectors.toList());

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

@@ -1556,7 +1556,7 @@ public class RepairController {
                 repairDetail.setConfigName();
             });
             //发起送修的单位为当前单位
-            List<RepairDetail> repairDetails2 = repairDetails1.stream().filter(repairDetail -> userPublicService.findUnitsNameByUserId(repairDetail.getCreateUserId()).equals(unitName)).collect(Collectors.toList());
+            List<RepairDetail> repairDetails2 = repairDetails1.stream().filter(repairDetail -> deviceRepairBillService.getOne(repairDetail.getDeviceRepairBillId()).getSendUnit().equals(unitName)).collect(Collectors.toList());
             return ResponseEntity.ok(PageUtil.getPerPage(repairTaskSelectVo.getPage(),repairTaskSelectVo.getSize(),repairDetails2,repairTaskSelectVo.getPageable()));
         }
         //待领取装备

dev-repair/src/main/java/com/tykj/dev/device/repair/subject/domin/RepairDetail.java

@@ -140,13 +140,13 @@ public class RepairDetail {
     @ApiModelProperty(value = "区块链记录id")
     private String recordId;
 
-    @ApiModelProperty(value = "维修记录信息")
+    @ApiModelProperty(value = "省维修记录信息")
     private String record;
 
-    @ApiModelProperty(value = "维修记录信息")
+    @ApiModelProperty(value = "市维修记录信息")
     private String record2;
 
-    @ApiModelProperty(value = "维修记录信息")
+    @ApiModelProperty(value = "县维修记录信息")
     private String record3;
 
     @ApiModelProperty(value = "领取单id")

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/UserServiceImpl.java

@@ -16,7 +16,6 @@ import com.tykj.dev.device.user.subject.dao.UserDao;
 import com.tykj.dev.device.user.subject.dao.UserRoleDao;
 import com.tykj.dev.device.user.subject.entity.*;
 import com.tykj.dev.device.user.subject.service.*;
-import com.tykj.dev.misc.base.StatusEnum;
 import com.tykj.dev.misc.exception.ApiException;
 import com.tykj.dev.misc.utils.SpringUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -508,7 +507,9 @@ public class UserServiceImpl implements UserService {
         user.setUnitsId(notIsUser.getUnitId());
         user.setShowOrder(3);
         user.setTrainStatus(5);
-        return userDao.save(user);
+        User user1 = userDao.save(user);
+        userCache.refresh(userDao.findAll());
+        return user1;
     }
 
     @Override