返聘

src/com/engine/salary/service/TaxAgentService.java

@@ -216,6 +216,14 @@ public interface TaxAgentService {
      */
     List<TaxAgentEmployeeDTO> listTaxAgentAndEmployee(Long employeeId);
 
+    /**
+     * 获取个税扣缴义务人和可查看的人员列表(扁平型)
+     *
+     * @param
+     * @return
+     */
+    List<TaxAgentEmployeeDTO> listAllTaxAgentAndEmployee();
+
     /**
      * 获取个税扣缴义务人和可查看的人员列表(树型)
      *

src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java

@@ -1249,7 +1249,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
         }
 
 
-        List<TaxAgentEmployeeDTO> taxAgentManageRangeEmployees = getTaxAgentService(user).listTaxAgentAndEmployee();
+        List<TaxAgentEmployeeDTO> taxAgentManageRangeEmployees = getTaxAgentService(user).listAllTaxAgentAndEmployee();
         List<SalaryArchivePO> oldPendingList = oldList.stream().filter(f -> f.getRunStatus().equals(SalaryArchiveStatusEnum.STOP_FROM_PENDING.getValue())).collect(Collectors.toList());
         boolean isNotExist = oldPendingList.stream().anyMatch(te -> taxAgentManageRangeEmployees.stream().noneMatch(p -> p.getEmployeeId() != null && p.getEmployeeId().equals(te.getEmployeeId()) && p.getTaxAgentId().equals(te.getTaxAgentId())));
         if (isNotExist) {

src/com/engine/salary/service/impl/TaxAgentServiceImpl.java

@@ -619,6 +619,33 @@ public class TaxAgentServiceImpl extends Service implements TaxAgentService {
         return listTaxAgentAndEmployee(null, employeeId);
     }
 
+    @Override
+    public List<TaxAgentEmployeeDTO> listAllTaxAgentAndEmployee() {
+        List<TaxAgentEmployeeDTO> taxAgentEmployeeList = Lists.newArrayList();
+
+        List<TaxAgentManageRangeEmployeeDTO> taxAgentManageRangeEmployeeList = listTaxAgentAndEmployeeTree();
+        taxAgentManageRangeEmployeeList.forEach(m -> {
+            List<TaxAgentManageRangeEmployeeDTO.TaxAgentEmployee> employeeList = m.getEmployeeList();
+            if (CollectionUtils.isEmpty(employeeList)) {
+                taxAgentEmployeeList.add(TaxAgentEmployeeDTO.builder()
+                        .taxAgentId(m.getTaxAgentId())
+                        .taxAgentName(m.getTaxAgentName())
+                        .employeeId(null)
+                        .username(null)
+                        .build());
+            } else {
+                employeeList.forEach(f -> taxAgentEmployeeList.add(TaxAgentEmployeeDTO.builder()
+                        .taxAgentId(m.getTaxAgentId())
+                        .taxAgentName(m.getTaxAgentName())
+                        .employeeId(f.getEmployeeId())
+                        .username(f.getUsername())
+                        .build()));
+            }
+        });
+
+        return taxAgentEmployeeList;
+    }
+
     @Override
     public List<TaxAgentManageRangeEmployeeDTO> listTaxAgentAndEmployeeTree(SalaryEmployeeStatusEnum employeeStatus, Long employeeId) {
         List<TaxAgentManageRangeEmployeeDTO> taxAgentManageRangeEmployeeList = Lists.newArrayList();
@@ -793,6 +820,8 @@ public class TaxAgentServiceImpl extends Service implements TaxAgentService {
         return taxAgentEmployeeList;
     }
 
+
+
     @Override
     public Collection<Long> listEmployeeIdsInTaxAgent(Long taxAgentId) {
         List<TaxAgentEmpPO> taxAgentEmpPOS = getTaxAgentEmpService(user).listByTaxAgentIds(Collections.singletonList(taxAgentId),UseEmployeeTypeEnum.ALL);