diff --git a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml index 82659d6e3..43bba1ce7 100644 --- a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml @@ -45,11 +45,10 @@ c.id as jobtitleId, e.companystartdate as companystartdate, e.mobile as mobile, - b.dismissdate as dismissdate + e.enddate as dismissdate from hrmresource e left join hrmdepartment d on e.departmentid = d.id left join hrmjobtitles c on e.jobtitle = c.id - left join bill_hrmdismiss b on e.id = b.resource_n where e.status not in (7) and (e.accounttype is null or e.accounttype = 0) AND e.id IN @@ -164,11 +163,10 @@ c.id as jobtitleId, e.companystartdate as companystartdate, e.mobile as mobile, - b.dismissdate as dismissdate + e.enddate as dismissdate from hrmresource e left join hrmdepartment d on e.departmentid = d.id left join hrmjobtitles c on e.jobtitle = c.id - left join bill_hrmdismiss b on e.id = b.resource_n where e.status not in (7) and (e.accounttype is null or e.accounttype = 0) AND e.id = #{id} diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java index 4b8d48c04..2fdd05e63 100644 --- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java @@ -58,7 +58,6 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook; import weaver.file.ImageFileManager; import java.io.InputStream; -import java.text.NumberFormat; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -194,9 +193,10 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { Boolean needAuth = getTaxAgentService().isNeedAuth(currentEmployeeId); if (needAuth) { List taxAgentEmployeeDTOS = getTaxAgentService().listTaxAgentAndEmployee(currentEmployeeId); - Set employeeIds = SalaryEntityUtil.properties(taxAgentEmployeeDTOS, TaxAgentEmployeeDTO::getEmployeeId); +// Set employeeIds = SalaryEntityUtil.properties(taxAgentEmployeeDTOS, TaxAgentEmployeeDTO::getEmployeeId); + Set taxAgentIds = SalaryEntityUtil.properties(taxAgentEmployeeDTOS, TaxAgentEmployeeDTO::getTaxAgentId); List list = getSocialSchemeMapper().queryEmployeeList(param); - return list.stream().filter(f -> employeeIds.contains(f.getEmployeeId())).collect(Collectors.toList()); + return list.stream().filter(f -> taxAgentIds.contains(f.getPaymentOrganization())).collect(Collectors.toList()); } return getSocialSchemeMapper().queryEmployeeList(param);