feat(单位模块): 添加了单位逻辑注释

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/vo/ModelNameGroup.java

@@ -34,7 +34,7 @@ public class ModelNameGroup {
     /**
      * 形态
      */
-    private String type;
+    private Integer isPart;
 
     /**
      * 装备id集合

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/vo/RepelManagementVo.java

@@ -67,6 +67,12 @@ public class RepelManagementVo extends CustomPage {
     @ApiModelProperty(value = "序列号模糊查询字段")
     private String seqDim;
 
+    /**
+     * 形态
+     */
+    private Integer isPart;
+
+
     @ApiModelProperty(value = "所在单位模糊查询字段")
     private String locationUnitDim;
 

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

@@ -284,10 +284,10 @@ public class RepelQueryServiceImpl implements RepelQueryService {
         deviceLibraries.forEach(
                 deviceLibrary -> {
                     List<Integer> ids=new ArrayList<>();
-                    String key=deviceLibrary.getModel()+deviceLibrary.getName()+deviceLibrary.getTypeName();
+                    String key=deviceLibrary.getModel()+deviceLibrary.getName()+deviceLibrary.getIsPart();
                     if (!modelNameGroupMap.containsKey(key)){
                         ids.add(deviceLibrary.getId());
-                        modelNameGroupMap.put(key,new ModelNameGroup(deviceLibrary.getModel(),deviceLibrary.getName(),deviceLibrary.getTypeName(),ids));
+                        modelNameGroupMap.put(key,new ModelNameGroup(deviceLibrary.getModel(),deviceLibrary.getName(),deviceLibrary.getIsPart(),ids));
                     }else {
                         ModelNameGroup modelNameGroup=modelNameGroupMap.get(key);
                         ids=modelNameGroupMap.get(key).getDevicesId() ;
@@ -550,8 +550,11 @@ public class RepelQueryServiceImpl implements RepelQueryService {
         PredicateBuilder<DeviceLibrary> predicateBuilder = getPredicateBuilder(repelManagementVo);
         //unitId为空，默认查询当前单位
         List<Integer> ids= repelDetailService.findYearAndUnitToDeviceList(new Date(repelManagementVo.getTime()),new Date(repelManagementVo.getEndTime()),repelManagementVo.getUnitId());
-        if (ids!=null&&ids.size()!=0) {
+        if (ids!=null&&ids. size()!=0) {
             predicateBuilder.in("id", ids.toArray());
+            if (repelManagementVo.getIsPart()!=null) {
+                predicateBuilder.eq("isPart", repelManagementVo.getIsPart());
+            }
             deviceLibraries = deviceLibraryDao.findAll(predicateBuilder.build()).stream().map(DeviceLibrary::setConfigName).collect(Collectors.toList());
         }
 
@@ -634,6 +637,9 @@ public class RepelQueryServiceImpl implements RepelQueryService {
         predicateBuilder.eq("lifeStatus", com.tykj.dev.config.base.DeviceLifeStatus.SEND_BACK_IN.id);
         Units units= unitsService.findById(repelManagementVo.getUnitId());
         predicateBuilder.eq("ownUnit",units.getName());
+        if (repelManagementVo.getIsPart()!=null){
+            predicateBuilder.eq("isPart",repelManagementVo.getIsPart());
+        }
         return predicateBuilder.build();
 
     }

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

@@ -95,8 +95,12 @@ public class UserServiceImpl implements UserService {
         //先判断用户名是否被注册
         User byName= userDao.findByNameAndUnitsId(user.getName(),user.getUnitsId());
         if (byName != null){
-            map.put("error",byName);
-            return map;
+            if (byName.getTrainStatus()==5 && byName.getUsername()==null){
+                user.setUserId(byName.getUserId());
+            }else {
+                map.put("error", byName);
+                return map;
+            }
 //            throw new ApiException(ResponseEntity.ok("同单位下有相同名称的专管员:"+user.getName()));
         }
         User byUsername = userDao.findByUsername(user.getUsername());