[单位] 添加查询下级单位接口 不包括本级

dev-user/src/main/java/com/tykj/dev/device/user/subject/controller/UnitsController.java

@@ -72,6 +72,12 @@ public class UnitsController {
         return ResponseEntity.ok(unitsService.findBySubordinate(unitsId));
     }
 
+    @GetMapping(value = "/findBySubordinateNotOneself/{unitsId}")
+    @ApiOperation(value = "根据当前用户的单位ID查询下级单位对象不包括本级", notes = "单位")
+    public ResponseEntity findBySubordinateNotOneself(@PathVariable Integer unitsId) {
+        return ResponseEntity.ok(unitsService.findBySubordinateNotOneself(unitsId));
+    }
+
 
     @GetMapping(value = "/find/units/subordinate/{unitsId}")
     @ApiOperation(value = "根据当前用户的单位ID查询下级单位对象（不包括type为2的）", notes = "单位")

dev-user/src/main/java/com/tykj/dev/device/user/subject/controller/UserController.java

@@ -228,4 +228,10 @@ public class UserController {
         return ResponseEntity.ok(userService.findUnitNameListUser(unitNameVo));
     }
 
+    @PostMapping("/specialManager/list/{unitId}")
+    @ApiOperation(value = "根据单位id查询单位专管员")
+    public ResponseEntity findUnitName( @PathVariable Integer unitId){
+        return ResponseEntity.ok(userService.findUnitIdListUser(unitId));
+    }
+
 }

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

@@ -95,6 +95,15 @@ public interface UnitsService extends PublicService<Units> {
      */
     List<Units> findBySubordinate(Integer unitsId);
 
+
+    /**
+     * 根据单位id查询下级级对象(不包括自己)
+     *
+     * @param unitsId 单位id
+     * @return 单位对象
+     */
+    List<Units> findBySubordinateNotOneself(Integer unitsId);
+
     /**
      * 根据单位id查询下级单位名称集合
      *

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

@@ -172,4 +172,12 @@ public interface UserService extends PublicService<User> {
      * @return 人员集合
      */
     List<UserShenRe> findUnitNameListUser(UnitNameVo unitNameVo);
+
+
+    /**
+     * 根据单位id 查询单位下的专管员
+     */
+    List<UserShenRe> findUnitIdListUser(Integer unitId);
+
+
 }

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

@@ -159,6 +159,18 @@ public class UnitsServiceImpl implements UnitsService {
        return units1.stream().sorted(Comparator.comparing(Units::getShowOrder)).collect(Collectors.toList());
     }
 
+    @Override
+    public List<Units> findBySubordinateNotOneself(Integer unitsId) {
+        Units units =  unitsDao.findById(unitsId).get();
+        List<Integer> areaIds= areaDao.findAllByFatherId(units.getAreaId()).stream().map(Area::getId).collect(Collectors.toList());
+        List<Units> units1=  unitsDao.findAllByAreaIdIn(areaIds);
+        if (units.getLevel()==1){
+//            units1.add(units);
+            units1.addAll(unitsDao.findAllByType(2));
+        }
+        return units1.stream().sorted(Comparator.comparing(Units::getShowOrder)).collect(Collectors.toList());
+    }
+
     @Override
     public List<String> findBySubordinateUnitName(Integer unitsId) {
         Units units =  unitsDao.findById(unitsId).get();

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

@@ -174,7 +174,7 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public List<UserShenRe> findByUniteId1(Integer unitsId) {
-        return userDao.findAllByUnitsId(unitsId).stream().map(User::toRe).sorted(Comparator.comparing(UserShenRe::getShowOrder)).collect(Collectors.toList());
+        return userDao.findAllByUnitsId(unitsId).stream().filter(user -> user.getTrainStatus()!=5).map(User::toRe).sorted(Comparator.comparing(UserShenRe::getShowOrder)).collect(Collectors.toList());
     }
 
     @Override
@@ -485,6 +485,11 @@ public class UserServiceImpl implements UserService {
         return userDao.findAllByUnitsId(userPublicService.findUnitIdByName(unitNameVo.getUnitName())).stream().map(User::toRe).collect(Collectors.toList());
     }
 
+    @Override
+    public List<UserShenRe> findUnitIdListUser(Integer unitId) {
+        return userDao.findAllByUnitsId(unitId).stream().filter(user -> user.getTrainStatus()!=5).map(User::toRe).collect(Collectors.toList());
+    }
+
     private List<Integer> to(List<Integer> ids,Area area){
 
         if (area.getFatherId()==null){