refactor: 修改核查模块，市自动转发个区

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/common/CheckExamUnits.java

+package com.tykj.dev.device.confirmcheck.common;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author Ozoz.L cnljj1995@gmail.com
+ * on 11/10/21
+ */
+@Getter
+@AllArgsConstructor
+public enum CheckExamUnits {
+
+    PROVINCIAL(1,"省级"),
+
+    PROVINCIAL_UNDER(2, "省直属"),
+
+    CITY(3,"市级");
+
+    private final int id;
+
+    private final String name;
+}

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/domain/DeviceCheckDetail.java

@@ -161,6 +161,9 @@ public class DeviceCheckDetail extends BaseEntity {
     @Transient
     private List<FileRet> checkFileList = new ArrayList<>();
 
+    @ApiModelProperty(value = "手持终端信息字段")
+    private String checkCName = "";
+
     /**
      * 用于生成市级的核查详情账单的构造函数
      */

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/domain/DeviceCheckStat.java

@@ -55,7 +55,7 @@ public class DeviceCheckStat extends BaseEntity {
     private String statInfo;
 
     /**
-     * 检查类型，数据库里的数据结构是int类型，其中1为核查，2为检查
+     * 检查类型，数据库里的数据结构是int类型，其中0为核查，1为检查
      *
      * @see com.tykj.dev.device.confirmcheck.common.CheckTypeConvert
      */

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/vo/CheckExamDetailVo.java

@@ -3,6 +3,7 @@ package com.tykj.dev.device.confirmcheck.entity.vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -19,6 +20,7 @@ import java.util.List;
 @ApiModel("核查发起细节")
 @AllArgsConstructor
 @NoArgsConstructor
+@Builder
 public class CheckExamDetailVo {
 
     @ApiModelProperty(name = "核查组名称")

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/vo/CheckExamStartVo.java

+package com.tykj.dev.device.confirmcheck.entity.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * @author Ozoz.L cnljj1995@gmail.com
+ * on 11/11/21
+ */
+@Data
+@ApiModel("检查发起对象")
+public class CheckExamStartVo {
+
+    @ApiModelProperty(name = "业务标题", example = "浙江省手动核查测试")
+    private String title;
+
+    @ApiModelProperty(name = "截止时间", example = "2021-01-12")
+    private LocalDate endTime ;
+
+    @ApiModelProperty(name = "发起单位的id号")
+    private Integer unitId;
+
+    @ApiModelProperty(name = "检查统计业务id,如果是直接创建则给0",example = "0")
+    private Integer examStatId;
+
+    @ApiModelProperty(name = "需要被检查的区域id")
+    private List<Integer> unitIds;
+
+    @ApiModelProperty(name = "备注")
+    private String remark;
+}

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/vo/CheckExamVo.java

@@ -33,4 +33,5 @@ public class CheckExamVo {
     @ApiModelProperty(name = "发起检查细节")
     @JSONField(name = "detail")
     private List<CheckExamDetailVo> detail;
+
 }

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/vo/CheckUnitsExistVo.java

+package com.tykj.dev.device.confirmcheck.entity.vo;
+
+import com.tykj.dev.device.user.subject.entity.Units;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+/**
+ * @author Ozoz.L cnljj1995@gmail.com
+ * on 11/11/21
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CheckUnitsExistVo {
+
+    private Units units;
+
+    private boolean exist;
+}

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/vo/LinkCheckDetail.java

 package com.tykj.dev.device.confirmcheck.entity.vo;
 
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -13,6 +14,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 @Data
+@Builder
 public class LinkCheckDetail {
 
     /**

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/vo/LinkEscrowDetail.java

+package com.tykj.dev.device.confirmcheck.entity.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *
+ * LinkEscrowDetail
+ *
+ * @author Ozoz.L cnljj1995@gmail.com
+ * on 11/10/21
+ */
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+public class LinkEscrowDetail {
+
+    /**
+     * 代管业务ID
+     */
+    private Integer id;
+
+    private String checkUnit;
+
+    private String checkSituation;
+
+    private String checkResult;
+
+    private int remark;
+}

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/vo/LinkVo.java

@@ -52,7 +52,7 @@ public class LinkVo {
     private List<LinkCheckDetail> lcDetail;
 
     /**
-     * 里面装的都是自查数据
+     * 里面装的都是自核查数据
      */
     private List<LinkExamDetail> leDetail;
 

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/repository/DeviceCheckDetailDao.java

@@ -26,7 +26,7 @@ public interface DeviceCheckDetailDao extends JpaRepository<DeviceCheckDetail, I
 
     @Modifying
     @Query("update DeviceCheckDetail o set o.checkDetail=?2,o.checkResult = ?3,o.userAId =?4,o.userBId=?5,o.checkedCount=?6,o.terminalInfo=?7 where o.id=?1")
-    void updateCheckDetailWithT(Integer id, String checkDetail, String checkResult, int userAId, int userBId, Integer checkedCount,String terminalInfo);
+    void updateCheckDetailWithT(Integer id, String checkDetail, String checkResult, int userAId, int userBId, Integer checkedCount, String terminalInfo);
 
     /**
      * 根据id更新checkDetail 用于专管员B检查
@@ -52,4 +52,15 @@ public interface DeviceCheckDetailDao extends JpaRepository<DeviceCheckDetail, I
     @Modifying
     @Query("update DeviceCheckDetail o set o.checkUserAId =?2,o.checkUserBId=?3 where o.id =?1")
     void updateCheckUser(int id, int checkUserAId, int checkUserBId);
+
+    /**
+     * 更新 checkUserAId 与 checkUserBId
+     *
+     * @param id           detailId
+     * @param checkUserAId 核查组成员A
+     * @param checkUserBId 核查组成员B
+     */
+    @Modifying
+    @Query("update DeviceCheckDetail o set o.checkUserAId =?2,o.checkUserBId=?3, o.checkCName = ?4 where o.id =?1")
+    void updateCheckUserAbc(int id, int checkUserAId, int checkUserBId, String checkCName);
 }

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/repository/DeviceCheckStatDao.java

@@ -3,6 +3,9 @@ package com.tykj.dev.device.confirmcheck.repository;
 import com.tykj.dev.device.confirmcheck.entity.domain.DeviceCheckStat;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
+import java.util.Optional;
+
 /**
  * DeviceCheckStatRepo.
  *
@@ -10,4 +13,5 @@ import org.springframework.data.jpa.repository.JpaRepository;
  * @since 2020/8/16 at 5:26 下午
  */
 public interface DeviceCheckStatDao extends JpaRepository<DeviceCheckStat, Integer> {
+
 }

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/service/CheckUnitService.java

+package com.tykj.dev.device.confirmcheck.service;
+
+import com.tykj.dev.device.confirmcheck.entity.vo.CheckUnitsExistVo;
+import com.tykj.dev.device.user.subject.entity.Units;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Ozoz.L cnljj1995@gmail.com
+ * on 11/10/21
+ */
+public interface CheckUnitService {
+
+
+    /**
+     *  查询核查/检查的单位
+     *  包括省级、省本级、市
+     * @param isCheck true_过滤掉省(检查用)，false_不过滤省（核查用）
+     * @return map
+     */
+    Map<Integer, List<Units>> findCheckUnit(boolean isCheck);
+
+    List<Units> checkPossible(List<Integer> ids, boolean isCheck);
+
+
+    /**
+     * 根据给定的单位给出没有装备的单位
+     * @param ids 单位id
+     * @return 没有装备的单位id
+     */
+    List<Integer> findUnExistDevice(List<Integer> ids);
+
+    List<Integer> findExistDevice(List<Integer> ids);
+
+    /**
+     * 获取所有代管戴单位
+     * @return list
+     */
+    List<Units> findAllEscrow();
+}

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/service/EscrowService.java

+package com.tykj.dev.device.confirmcheck.service;
+
+import com.google.common.collect.ImmutableMap;
+import com.tykj.dev.device.user.subject.entity.Units;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author Ozoz.L cnljj1995@gmail.com
+ * on 11/9/21
+ */
+@Service
+public interface EscrowService {
+
+    /**
+     * 查询所有代管的单位
+     * @return units
+     */
+    List<Units> findAllEscrowUnit(boolean filter);
+
+    /**
+     * 检查代管单位是否有装备
+     * @return map
+     */
+    ImmutableMap checkPossible();
+}

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/service/ExamCheckService.java

+package com.tykj.dev.device.confirmcheck.service;
+
+import com.tykj.dev.device.confirmcheck.entity.vo.CheckExamVo;
+
+/**
+ * @author Ozoz.L cnljj1995@gmail.com
+ * on 11/14/21
+ */
+public interface ExamCheckService {
+
+
+    /**
+     * 发起检查
+     * @param checkExamVo vo
+     */
+    void startExam(CheckExamVo checkExamVo);
+
+
+}

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/service/impl/CheckUnitServiceImpl.java

+package com.tykj.dev.device.confirmcheck.service.impl;
+
+import com.google.common.collect.ImmutableMap;
+import com.tykj.dev.device.confirmcheck.service.CheckUnitService;
+import com.tykj.dev.device.library.repository.DeviceLibraryDao;
+import com.tykj.dev.device.user.cache.UnitsCache;
+import com.tykj.dev.device.user.subject.dao.AreaDao;
+import com.tykj.dev.device.user.subject.dao.AreaExhibitionDao;
+import com.tykj.dev.device.user.subject.dao.UnitsDao;
+import com.tykj.dev.device.user.subject.entity.Units;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static java.util.stream.Collectors.toList;
+
+/**
+ * @author Ozoz.L cnljj1995@gmail.com
+ * on 11/10/21
+ */
+@Slf4j
+@Service
+public class CheckUnitServiceImpl implements CheckUnitService {
+
+    @Autowired
+    private UnitsCache unitsCache;
+
+    @Autowired
+    private UnitsDao unitsRepo;
+
+    @Autowired
+    private AreaDao areaRepo;
+
+    @Autowired
+    private DeviceLibraryDao deviceRepo;
+
+    @Autowired
+    private AreaExhibitionDao AreaExRepo;
+
+    @Override
+    public Map<Integer, List<Units>> findCheckUnit(boolean filter) {
+
+        // 1 构建省级单位集合
+        List<Units> provinceUnits = new ArrayList<>(unitsRepo
+                .findAllByTypeInAndLevelIn(new ArrayList<>(2), new ArrayList<>(1))
+                .orElse(Collections.emptyList()));
+
+        // 过滤省局，逻辑为:如果不过滤，就加上省局
+        if (!filter) {
+            List<Units> pro = unitsRepo.
+                    findAllByTypeAndLevel(1, 1);
+            provinceUnits.add(pro.get(0));
+
+        }
+
+        // 2 构建省直属单位集合
+        List<Units> esAUnits = unitsRepo.findAllByEscrow(1).orElse(Collections.emptyList());
+
+        // 3 构建市
+        List<Units> cityUnits = unitsRepo.findAllByLevel(2);
+
+        if (filter) {
+            cityUnits.forEach(
+                    units -> units.setName(areaRepo.findNameById(units.getAreaId()))
+            );
+        }
+
+        return ImmutableMap.of(1, provinceUnits, 2, esAUnits, 3, cityUnits);
+    }
+
+    @Override
+    public List<Units> checkPossible(List<Integer> ids, boolean isCheck) {
+
+        if (isCheck) {
+            return unitsRepo.findAllById(findUnExistDevice(ids));
+        }
+
+        List<Integer> rs = new ArrayList<>(ids);
+
+        // 市本级id
+        List<Integer> city = unitsRepo.findAllByLevel(2).stream().map(Units::getUnitId).collect(toList());
+
+        // 市本级需要验证的id
+        List<Integer> contains = ids.stream().filter(city::contains).collect(toList());
+
+        for (Integer contain : contains) {
+            List<Integer> collect = unitsCache.findByIdSubordinateAndOneself(contain).stream().map(Units::getUnitId).collect(toList());
+            rs.addAll(collect);
+        }
+        // 去重
+        List<Integer> unitsIds = findUnExistDevice(rs);
+        return unitsRepo.findAllById(unitsIds.stream().distinct().collect(toList()));
+    }
+
+
+    @Override
+    public List<Integer> findUnExistDevice(List<Integer> ids) {
+        return ids.stream()
+                .filter(id -> deviceRepo
+                        .findAllByOwnUnit(
+                                unitsRepo.findById(id)
+                                        .orElse(Units.builder().name("未知").build()).getName())
+                        .size() == 0)
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public List<Integer> findExistDevice(List<Integer> ids) {
+        return ids.stream()
+                .filter(id -> deviceRepo
+                        .findAllByOwnUnit(
+                                unitsRepo.findById(id)
+                                        .orElse(Units.builder().name("未知").build()).getName())
+                        .size() != 0)
+                .collect(Collectors.toList());    }
+
+    @Override
+    public List<Units> findAllEscrow() {
+        return unitsRepo.findAllByEscrow(1).orElse(Collections.emptyList());
+    }
+}

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/service/impl/ConfirmCheckServiceImpl.java

@@ -336,7 +336,7 @@ public class ConfirmCheckServiceImpl implements ConfirmCheckService, CommandLine
         Units unit = unitsRepo.findById(checkBillSelectVo.getUnitId()).get();
         if(unit.getLevel() == 2) {
             Specification<DeviceCheckDetail> pred = Specifications.<DeviceCheckDetail>and()
-                    .eq("checkUnit", unit.getName())
+                    .eq("checkUnitId", checkBillSelectVo.getUnitId())
                     .build();
             List<CheckDetailVo> detailVoList = detailRepo.findAll(pred).stream()
                     .map(transUtil::CheckDetailDo2Vo)
@@ -351,7 +351,8 @@ public class ConfirmCheckServiceImpl implements ConfirmCheckService, CommandLine
                 checkStatTableVo.setShowType(1);
                 checkStatTableVo.setCreateTime(TimestampUtil.dateToLocalDateTime(checkDetailVo.getCheckTime()));
                 //设置完成情况
-                List<TaskUserVo> taskUserVos = taskService.findByBillIdAndBusinessType(checkDetailVo.getId(), 8).stream().map(Task::parse2Bto).map(TaskBto::toVo).collect(toList());
+                List<TaskUserVo> taskUserVos = taskService.findByBillIdAndBusinessType(checkDetailVo.getId(), 8)
+                        .stream().map(Task::parse2Bto).map(TaskBto::toVo).collect(toList());
                 if (taskUserVos.size() == 1) {
                     checkStatTableVo.setCompletion(taskUserVos.get(0).getStatus());
                 }
@@ -360,6 +361,7 @@ public class ConfirmCheckServiceImpl implements ConfirmCheckService, CommandLine
             tableVos.addAll(cityDetailToStatList);
         }
 
+
         return PageUtil.getPerPage(checkBillSelectVo.getPage(),checkBillSelectVo.getSize(),tableVos,checkBillSelectVo.getPageable());
 
     }

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/service/impl/EscrowServiceImpl.java

+package com.tykj.dev.device.confirmcheck.service.impl;
+
+import com.google.common.collect.ImmutableMap;
+import com.tykj.dev.device.confirmcheck.service.EscrowService;
+import com.tykj.dev.device.library.repository.DeviceLibraryDao;
+import com.tykj.dev.device.user.subject.dao.UnitsDao;
+import com.tykj.dev.device.user.subject.entity.Units;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static java.util.stream.Collectors.toList;
+
+/**
+ * @author Ozoz.L cnljj1995@gmail.com
+ * on 11/9/21
+ */
+@Service
+public class EscrowServiceImpl implements EscrowService {
+
+    @Autowired
+    private UnitsDao unitsDao;
+    @Autowired
+    private DeviceLibraryDao deviceRepo;
+
+    @Override
+    public List<Units> findAllEscrowUnit(boolean filter) {
+        List<Units> units = unitsDao.findAll().stream().filter(Units::isEscrow).collect(Collectors.toList());
+        if (filter) {
+            units = units.stream()
+                    .filter(unit -> deviceRepo.findAllByOwnUnit(unit.getName()).size() != 0)
+                    .collect(toList());
+        }
+        return units;
+    }
+
+
+    @Override
+    public ImmutableMap checkPossible() {
+        List<Units> units = unitsDao.findAll().stream().filter(Units::isEscrow).collect(Collectors.toList());
+        List<String> unitsStr = units.stream()
+                .filter(unit -> deviceRepo.findAllByOwnUnit(unit.getName()).size() == 0)
+                .map(Units::getName).collect(toList());
+
+        boolean findEmpty = unitsStr.isEmpty();
+
+        StringBuilder alertString = new StringBuilder("[");
+        if (!findEmpty) {
+            for (String s : unitsStr) {
+                alertString.append(s);
+            }
+        }
+
+        return ImmutableMap.of("empty", findEmpty, "msg", alertString + "]代管单位没有装备数据，将不进行检查，是否继续！");
+    }
+}

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/service/impl/ExamCheckServiceImpl.java

+package com.tykj.dev.device.confirmcheck.service.impl;
+
+import com.tykj.dev.device.confirmcheck.entity.vo.CheckExamVo;
+import com.tykj.dev.device.confirmcheck.service.ExamCheckService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author Ozoz.L cnljj1995@gmail.com
+ * on 11/14/21
+ */
+@Slf4j
+@Service
+public class ExamCheckServiceImpl implements ExamCheckService {
+
+
+
+    @Override
+    public void startExam(CheckExamVo checkExamVo) {
+
+        // 只有省级和市本级可以发起检查
+        //
+
+    }
+}

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/utils/ObjTransUtil.java

@@ -214,20 +214,20 @@ public class ObjTransUtil {
         String userBName = checkUserB == null ? "" : checkUserB.getName();
 
         //解析JSON并赋值
-        ObjectMapper objectMapper = new ObjectMapper();
-        CheckDeviceStatVo[] checkDeviceStatVos = new CheckDeviceStatVo[0];
-        try {
-            boolean isArray = objectMapper.readTree(statDo.getStatInfo()).isArray();
-            if (isArray) {
-                checkDeviceStatVos = JacksonUtil.readValue(statDo.getStatInfo(), CheckDeviceStatVo[].class);
-            } else {
-                CheckDeviceStatVo checkDeviceStatVo = JacksonUtil.readValue(statDo.getStatInfo(), CheckDeviceStatVo.class);
-                checkDeviceStatVos = new CheckDeviceStatVo[]{checkDeviceStatVo};
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        initialStat.setDeviceStatVoList(Arrays.asList(checkDeviceStatVos));
+//        ObjectMapper objectMapper = new ObjectMapper();
+//        CheckDeviceStatVo[] checkDeviceStatVos = new CheckDeviceStatVo[0];
+//        try {
+//            boolean isArray = objectMapper.readTree(statDo.getStatInfo()).isArray();
+//            if (isArray) {
+//                checkDeviceStatVos = JacksonUtil.readValue(statDo.getStatInfo(), CheckDeviceStatVo[].class);
+//            } else {
+//                CheckDeviceStatVo checkDeviceStatVo = JacksonUtil.readValue(statDo.getStatInfo(), CheckDeviceStatVo.class);
+//                checkDeviceStatVos = new CheckDeviceStatVo[]{checkDeviceStatVo};
+//            }
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//        }
+        initialStat.setDeviceStatVoList(Collections.emptyList());
         initialStat.setCheckUserAName(userAName);
         initialStat.setCheckUserBName(userBName);
         initialStat.setCheckType(statDo.getCheckType().getId());

dev-task/src/main/java/com/tykj/dev/device/task/repository/TaskDao.java

@@ -14,6 +14,8 @@ import java.util.Optional;
  */
 public interface TaskDao extends JpaRepository<Task, Integer>, JpaSpecificationExecutor<Task> {
 
+    Optional<List<Task>> findAllByOwnUnitInAndParentTaskId(List<Integer> ownIds, Integer parentId);
+
     /**
      * @param billId       账单id
      * @param businessType 业务类型

dev-task/src/main/java/com/tykj/dev/device/task/service/impl/TaskServiceImpl.java

@@ -1236,8 +1236,8 @@ public class TaskServiceImpl implements TaskService {
     }
 
     @Override
-    public void moveAllSonNodeToEnd(Integer taaskId) {
-        List<Task> tasks = taskDao.findAllByParentTaskId(taaskId);
+    public void moveAllSonNodeToEnd(Integer taskId) {
+        List<Task> tasks = taskDao.findAllByParentTaskId(taskId);
         if (tasks.size()>0){
             tasks.forEach(task -> {
                 moveToEnd(task.parse2Bto());

dev-user/src/main/java/com/tykj/dev/device/user/subject/dao/UnitsDao.java

@@ -4,6 +4,7 @@ import com.tykj.dev.device.user.subject.entity.Units;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.security.core.parameters.P;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -11,6 +12,23 @@ import java.util.Optional;
 
 @Repository
 public interface UnitsDao extends JpaRepository<Units, Integer>, JpaSpecificationExecutor<Units> {
+
+    /**
+     * 查询是否代管的单位
+     * @param tag 1_代管，0_非代管
+     * @return units
+     */
+    Optional<List<Units>> findAllByEscrow(Integer tag);
+
+
+    /**
+     * 根据Type和level查询单位
+     * @return units
+     */
+    Optional<List<Units>> findAllByTypeInAndLevelIn(List<Integer> type, List<Integer> level);
+
+    List<Units> findAllByTypeAndLevel(Integer type, Integer level);
+
     List<Units> findAllByLevel(Integer level);
 
     List<Units> findAllByAreaId(Integer areaId);
@@ -45,6 +63,10 @@ public interface UnitsDao extends JpaRepository<Units, Integer>, JpaSpecificatio
 
     Units findByAreaIdAndLevel(Integer areaId, Integer level);
 
+    default Units findByAreaIdEquals() {
+        return findByAreaIdEquals();
+    }
+
     Units findByAreaIdEquals(Integer areaId);
 
     List<Units> findAllByLevelIn(List<Integer> levels);

dev-user/src/main/java/com/tykj/dev/device/user/subject/entity/Units.java

@@ -7,6 +7,7 @@ import com.tykj.dev.misc.base.BeanHelper;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.SQLDelete;
@@ -31,6 +32,7 @@ import java.util.UUID;
 @ApiModel(value = "单位对象", description = "单位详细信息")
 @Where(clause = "id_del = 0")
 @SQLDelete(sql = "update user set id_del = 1 where id = ?")
+@Builder
 public class Units {
     /**
      * 单位id
@@ -70,6 +72,7 @@ public class Units {
      */
     @ApiModelProperty(value = "序列号", name = "code", example = "12321L")
     private String code;
+
     /**
      * 1.在系统单位
      * 2.省直属单位 areaid 0
@@ -142,6 +145,7 @@ public class Units {
         return mapper.map(this, UnitsTrainVo.class);
     }
 
+
     public LeftNavigation toLeftNavigation(){
         return new LeftNavigation(unitId,name,null, UUID.randomUUID().toString(),2,showOrder,null);
     }

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

 package com.tykj.dev.device.user.subject.service;
 
-import com.tykj.dev.device.user.base.enums.AuExample;
-import com.tykj.dev.device.user.subject.entity.bto.AreaUnit;
+        import com.tykj.dev.device.user.base.enums.AuExample;
+        import com.tykj.dev.device.user.subject.entity.bto.AreaUnit;
 
-import java.util.List;
+        import java.util.List;
 
 /**
  * AuService.