From a162f191c6ab3fff7ba7b249847d558c86cbd4e9 Mon Sep 17 00:00:00 2001 From: Administrator <704728292@qq.com> Date: Tue, 27 May 2025 11:36:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E7=82=B9=E8=8A=B1=E5=90=8D=E5=86=8C?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=BF=94=E5=9B=9E=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EmployeeRelationController.java | 2 +- .../service/EmployeeRelationService.java | 2 +- .../impl/EmployeeRelationServiceImpl.java | 28 +++++++++++++------ 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/controller/EmployeeRelationController.java b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/controller/EmployeeRelationController.java index e57c92d..77691c6 100644 --- a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/controller/EmployeeRelationController.java +++ b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/controller/EmployeeRelationController.java @@ -336,7 +336,7 @@ public class EmployeeRelationController { */ @GetMapping("/getRosterInfoByDateRange") @WeaPermission(publicPermission = true) - public List>> saveQueryCondition( + public List> saveQueryCondition( @RequestParam("stratDate") String stratDate, @RequestParam("endDate") String endDate){ log.error("deleteTableInfo.stratDate:{},endDate:{}",stratDate,endDate); diff --git a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/EmployeeRelationService.java b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/EmployeeRelationService.java index 333487d..f14143b 100644 --- a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/EmployeeRelationService.java +++ b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/EmployeeRelationService.java @@ -31,5 +31,5 @@ public interface EmployeeRelationService { Map GetTableAlterStatements(); - List>> getRosterInfoByDateRange(String stratDate,String endDate); + List> getRosterInfoByDateRange(String stratDate,String endDate); } diff --git a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/EmployeeRelationServiceImpl.java b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/EmployeeRelationServiceImpl.java index 89dae53..ac1ea65 100644 --- a/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/EmployeeRelationServiceImpl.java +++ b/jcl-hrmorganization/secondev-jcl-hrmorganization/src/main/java/com/weaver/seconddev/jcl/organization/service/impl/EmployeeRelationServiceImpl.java @@ -794,11 +794,11 @@ public class EmployeeRelationServiceImpl implements EmployeeRelationService { } @Override - public List>> getRosterInfoByDateRange(String stratDate, String endDate) { + public List> getRosterInfoByDateRange(String stratDate, String endDate) { /** * 这里弄一个最终返回结果集 */ - List>> resultList = new ArrayList<>(); + List> resultList = new ArrayList<>(); /** * 查询离职记录表是否为空 */ @@ -807,7 +807,9 @@ public class EmployeeRelationServiceImpl implements EmployeeRelationService { //不存在 List> employeeInformation = queryEmployeeInformationInfo("uf_jcl_employee_information", stratDate, endDate); log.error("getRosterInfoByDateRange.employeeInformation:{}", employeeInformation); - resultList.add(employeeInformation); + if(employeeInformation.size()>0){ + resultList.addAll(employeeInformation); + } }else { //存在 //先按日期关联查询出员工信息 @@ -825,7 +827,9 @@ public class EmployeeRelationServiceImpl implements EmployeeRelationService { .map(Optional::get) .collect(Collectors.toList()); log.error("getRosterInfoByDateRange.resignationInfoNew:{}", resignationInfoNew); - resultList.add(resignationInfoNew); + if(resignationInfoNew.size()>0){ + resultList.addAll(resignationInfoNew); + } } /** @@ -836,7 +840,9 @@ public class EmployeeRelationServiceImpl implements EmployeeRelationService { //不存在 List> employeeInformationTx = queryEmployeeInformationInfo("uf_jcl_employee_information", stratDate, endDate); log.error("getRosterInfoByDateRange.employeeInformationTx:{}", employeeInformationTx); - resultList.add(employeeInformationTx); + if(employeeInformationTx.size()>0){ + resultList.addAll(employeeInformationTx); + } }else { //存在 //先按日期关联查询出员工信息 @@ -853,7 +859,9 @@ public class EmployeeRelationServiceImpl implements EmployeeRelationService { .map(Optional::get) .collect(Collectors.toList()); log.error("getRosterInfoByDateRange.retirementInfoNew:{}", retirementInfoNew); - resultList.add(retirementInfoNew); + if(retirementInfoNew.size()>0){ + resultList.addAll(retirementInfoNew); + } } /** @@ -864,7 +872,9 @@ public class EmployeeRelationServiceImpl implements EmployeeRelationService { //不存在 List> employeeInformationDd = queryEmployeeInformationInfo("uf_jcl_employee_information", stratDate, endDate); log.error("getRosterInfoByDateRange.employeeInformationDd:{}", employeeInformationDd); - resultList.add(employeeInformationDd); + if(employeeInformationDd.size()>0){ + resultList.addAll(employeeInformationDd); + } }else { //存在 //先按日期关联查询出员工信息 @@ -882,7 +892,9 @@ public class EmployeeRelationServiceImpl implements EmployeeRelationService { .map(Optional::get) .collect(Collectors.toList()); log.error("getRosterInfoByDateRange.transferInfoNew:{}", transferInfoNew); - resultList.add(transferInfoNew); + if(transferInfoNew.size()>0){ + resultList.addAll(transferInfoNew); + } } return resultList; }