From ee535fc2bfb8b9e8bcf249b962b1f5cd271e9d28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 19 Sep 2024 16:46:36 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=B8=9A=E5=8A=A1=E7=BA=BF-=E6=96=B0?= =?UTF-8?q?=E5=BB=BA=E7=B4=AF=E8=AE=A1=E4=B8=93=E9=A1=B9=E9=99=84=E5=8A=A0?= =?UTF-8?q?=E6=89=A3=E9=99=A4=202=E3=80=81=E4=B8=9A=E5=8A=A1=E7=BA=BF-?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/WEB-INF/salaryoptconfig.xml | 34 +++++--- resource/wiki/甯哥敤鏌ヨ.md | 7 +- .../salaryacct/po/SalaryAcctEmployeePO.java | 2 + .../SalaryStatisticsEmployeeServiceImpl.java | 77 +++++-------------- .../service/SalaryAcctEmployeeService.java | 1 + .../salary/service/auth/AuthService.java | 2 + .../salary/service/auth/AuthServiceImpl.java | 31 ++++++-- .../impl/AddUpDeductionServiceImpl.java | 22 ++---- .../impl/SalaryAcctEmployeeServiceImpl.java | 10 +++ 9 files changed, 97 insertions(+), 89 deletions(-) diff --git a/resource/WEB-INF/salaryoptconfig.xml b/resource/WEB-INF/salaryoptconfig.xml index 657964a6f..9e3d53351 100644 --- a/resource/WEB-INF/salaryoptconfig.xml +++ b/resource/WEB-INF/salaryoptconfig.xml @@ -10,6 +10,21 @@ + + + + + + + + + + + + + + + @@ -22,13 +37,7 @@ - - - - - - - + @@ -59,33 +68,40 @@ - - + + + + + + + + + diff --git a/resource/wiki/甯哥敤鏌ヨ.md b/resource/wiki/甯哥敤鏌ヨ.md index 368ed04c9..49fba1b6a 100644 --- a/resource/wiki/甯哥敤鏌ヨ.md +++ b/resource/wiki/甯哥敤鏌ヨ.md @@ -30,4 +30,9 @@ update hrsa_salary_sob_default_item set delete_type =3 where delete_type =0; update hrsa_salary_sob_item set delete_type= 3 where delete_type =0 and salary_item_id in (select id from hrsa_salary_item where delete_type=0 and system_type=1 and use_in_employee_salary =0 and code not in('ressueTotal','issuedTotal') ); -UPDATE hrsa_salary_item set delete_type = 3 where delete_type=0 and system_type=1 and use_in_employee_salary =0 and code not in('ressueTotal','issuedTotal'); \ No newline at end of file +UPDATE hrsa_salary_item set delete_type = 3 where delete_type=0 and system_type=1 and use_in_employee_salary =0 and code not in('ressueTotal','issuedTotal'); + + +# 寮鍚郴缁熺畻绋 +update hrsa_salary_sys_conf set conf_value = '1' where conf_key = 'taxDeclarationFunction' + diff --git a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java index d86941b8b..245f3b20c 100644 --- a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java +++ b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java @@ -1,6 +1,7 @@ package com.engine.salary.entity.salaryacct.po; import com.engine.hrmelog.annotation.ElogTransform; +import com.engine.salary.annotation.Auth; import com.engine.salary.annotation.I18n; import com.engine.salary.annotation.SalaryFormulaVar; import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum; @@ -28,6 +29,7 @@ import java.util.Date; @AllArgsConstructor //hrsa_salary_acct_emp @ElogTransform(name = "钖祫鏍哥畻浜哄憳") +@Auth(page = "salaryAcct") public class SalaryAcctEmployeePO { /** diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java index 3a6e00071..542988877 100644 --- a/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java +++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java @@ -9,8 +9,10 @@ import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO; import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO; import com.engine.salary.entity.salaryitem.po.SalaryItemPO; import com.engine.salary.entity.salarysob.po.SalarySobPO; +import com.engine.salary.entity.taxagent.param.TaxAgentQueryParam; import com.engine.salary.entity.taxagent.po.TaxAgentPO; import com.engine.salary.enums.UserStatusEnum; +import com.engine.salary.enums.auth.AuthFilterTypeEnum; import com.engine.salary.enums.datacollection.UseEmployeeTypeEnum; import com.engine.salary.enums.salarysob.SalaryEmployeeStatusEnum; import com.engine.salary.mapper.salaryacct.SalaryAcctEmployeeMapper; @@ -23,6 +25,8 @@ import com.engine.salary.report.entity.param.SalaryStatisticsEmployeeQueryParam; import com.engine.salary.report.entity.param.SalaryStatisticsEmployeeSalaryQueryParam; import com.engine.salary.report.service.SalaryStatisticsEmployeeService; import com.engine.salary.service.*; +import com.engine.salary.service.auth.AuthService; +import com.engine.salary.service.auth.AuthServiceImpl; import com.engine.salary.service.impl.*; import com.engine.salary.util.SalaryAssert; import com.engine.salary.util.SalaryDateUtil; @@ -33,7 +37,6 @@ import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import com.wbi.util.Util; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -89,13 +92,19 @@ public class SalaryStatisticsEmployeeServiceImpl extends Service implements Sala return ServiceUtil.getService(SalaryEmployeeServiceImpl.class, user); } + public AuthService getAuthService(User user) { + return ServiceUtil.getService(AuthServiceImpl.class, user); + } + @Override public PageInfo listPage(SalaryStatisticsEmployeeQueryParam queryParam) { List list = Collections.emptyList(); PageInfo page = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), list, SalaryStatisticsEmployeeListDTO.class); // 1.鍒嗘潈澶勭悊, 棣栧厛鑾峰彇涓◣鎵ｇ即涔夊姟浜哄弬鏁 - Collection taxAgentViews = getTaxAgentService(user).listAllTaxAgents((long) user.getUID()); + TaxAgentQueryParam taxAgentQueryParam = new TaxAgentQueryParam(); + taxAgentQueryParam.setFilterType(AuthFilterTypeEnum.QUERY_DATA); + Collection taxAgentViews = getTaxAgentService(user).listAuth(taxAgentQueryParam); List taxAgentIds = Objects.isNull(taxAgentViews) ? Lists.newArrayList() : taxAgentViews.stream().map(TaxAgentPO::getId).collect(Collectors.toList()); if (CollectionUtils.isEmpty(taxAgentIds)) { return page; @@ -109,39 +118,15 @@ public class SalaryStatisticsEmployeeServiceImpl extends Service implements Sala // 鏌ヨ钖祫鏍哥畻浜哄憳 List salaryAcctEmployeeList = getSalaryAcctEmployeeService(user).listByTaxAgentAndSalaryMonth(taxAgentIds, salaryMonths); + salaryAcctEmployeeList = getAuthService(user).auth(salaryAcctEmployeeList, AuthFilterTypeEnum.QUERY_DATA,SalaryAcctEmployeePO.class,"report"); + if (CollectionUtils.isEmpty(salaryAcctEmployeeList)) { return page; } -// if (queryParam.getEmployeeType() != null) { -// salaryAcctEmployeeList = salaryAcctEmployeeList.stream().filter(s -> queryParam.getEmployeeType().getValue().equals(s.getEmployeeType())).collect(Collectors.toList()); -// } -// // 澶栭儴浜哄憳id -// Set extEmployeeIds = Sets.newHashSet(); - // 鍐呴儴浜哄憳id - Set innerEmployeeIds = Sets.newHashSet(); - for (SalaryAcctEmployeePO sae : salaryAcctEmployeeList) { -// if (EmployeeTypeEnum.EXT_EMPLOYEE.getValue().equals(sae.getEmployeeType())) { -// extEmployeeIds.add(sae.getEmployeeId()); -// } else if (EmployeeTypeEnum.ORGANIZATION.getValue().equals(sae.getEmployeeType())) { -// innerEmployeeIds.add(sae.getEmployeeId()); -// } - innerEmployeeIds.add(sae.getEmployeeId()); - } + Set innerEmployeeIds = SalaryEntityUtil.properties(salaryAcctEmployeeList, SalaryAcctEmployeePO::getEmployeeId); // 3.鍏抽敭瀛楁悳绱㈠弬鏁 if (StringUtils.isNotEmpty(queryParam.getKeyword())) { -// if (CollectionUtils.isNotEmpty(extEmployeeIds)) { -// // 鏌ヨ澶栭儴浜哄憳 -// List extEmployeeList = new LambdaQueryChainWrapper<>(extEmployeeMapper) -// .eq(ExtEmployeePO::getTenantKey, tenantKey) -// .eq(ExtEmployeePO::getDeleteType, 0) -// .list(); -// Set finalExtEmployeeIds = extEmployeeIds; -// extEmployeeIds = extEmployeeList.stream() -// .filter(e -> finalExtEmployeeIds.contains(e.getId()) && (e.getUsername().contains(queryParam.getKeyword()) || (StringUtils.isNotEmpty(e.getCardNum()) && e.getCardNum().contains(queryParam.getKeyword())))) -// .map(ExtEmployeePO::getId) -// .collect(Collectors.toSet()); -// } if (CollectionUtils.isNotEmpty(innerEmployeeIds)) { List salaryEmployees = getSalaryEmployeeService(user).listAll(UseEmployeeTypeEnum.ALL); Set finalInnerEmployeeIds = innerEmployeeIds; @@ -149,38 +134,15 @@ public class SalaryStatisticsEmployeeServiceImpl extends Service implements Sala .filter(e -> finalInnerEmployeeIds.contains(e.getEmployeeId()) && (e.getUsername().contains(queryParam.getKeyword()) || (StringUtils.isNotEmpty(e.getWorkcode()) && e.getWorkcode().contains(queryParam.getKeyword())))) .map(DataCollectionEmployee::getEmployeeId) .collect(Collectors.toSet()); -// Map idNoMap = idNoMapByEmployeeIds(finalInnerEmployeeIds); -// for (Long k : idNoMap.keySet()) { -// if (idNoMap.get(k) != null && idNoMap.get(k).contains(queryParam.getKeyword())) { -// innerEmployeeIds.addAll(idNoMap.keySet()); -// } -// } } } - List innerEmployeeIdList = innerEmployeeIds.stream().sorted(Comparator.comparing(e -> e)).collect(Collectors.toList()); -// List extEmployeeIdList = extEmployeeIds.stream().sorted(Comparator.comparing(e -> e)).collect(Collectors.toList()); - // 鎺掑簭锛屽唴閮ㄥ憳宸ヤ紭鍏 - list = innerEmployeeIdList.stream().map(e -> SalaryStatisticsEmployeeListDTO.builder() - .id(e) -// .employeeType(EmployeeTypeEnum.ORGANIZATION.getValue()) - .build()).collect(Collectors.toList()); -// list.addAll(extEmployeeIdList.stream().map(e -> SalaryStatisticsEmployeeListDTO.builder() -// .id(e) -// .employeeType(EmployeeTypeEnum.EXT_EMPLOYEE.getValue()) -// .build()).collect(Collectors.toList())); + list = innerEmployeeIds.stream().map(e -> SalaryStatisticsEmployeeListDTO.builder().id(e).build()).collect(Collectors.toList()); // 绗竴椤垫暟鎹樉绀哄鐞 page = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), list, SalaryStatisticsEmployeeListDTO.class); List salaryStatisticsEmployeeListDTOs = page.getList(); List employeeIds = salaryStatisticsEmployeeListDTOs.stream().map(SalaryStatisticsEmployeeListDTO::getId).collect(Collectors.toList()); - // 鏌ヨ澶栭儴浜哄憳 -// List extEmployeeList = CollectionUtils.isEmpty(extEmployeeIdList) ? Lists.newArrayList() : new LambdaQueryChainWrapper<>(extEmployeeMapper) -// .eq(ExtEmployeePO::getTenantKey, tenantKey) -// .eq(ExtEmployeePO::getDeleteType, 0) -// .in(ExtEmployeePO::getId, extEmployeeIdList) -// .list(); -// Map extEmployeeMap = extEmployeeList.stream().collect(Collectors.toMap(ExtEmployeePO::getId, v -> v)); List simpleEmployeeList = getSalaryEmployeeService(user).getEmployeeByIdsAll(employeeIds); Map innerEmployeeMap = simpleEmployeeList.stream().collect(Collectors.toMap(DataCollectionEmployee::getEmployeeId, v -> v)); salaryStatisticsEmployeeListDTOs.forEach(e -> { @@ -295,11 +257,10 @@ public class SalaryStatisticsEmployeeServiceImpl extends Service implements Sala @Override public PageInfo listSalaryAcctEmp(SalaryStatisticsEmployeeSalaryQueryParam queryParam) { - List list = Collections.emptyList(); - PageInfo page = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), list, SalaryStatisticsEmployeeListDTO.class); - // 1.鍒嗘潈澶勭悊, 棣栧厛鑾峰彇涓◣鎵ｇ即涔夊姟浜哄弬鏁 - Collection taxAgentViews = getTaxAgentService(user).listAllTaxAgents((long) user.getUID()); + TaxAgentQueryParam param = TaxAgentQueryParam.builder().build(); + param.setFilterType(AuthFilterTypeEnum.QUERY_DATA); + Collection taxAgentViews = getTaxAgentService(user).listAuth(param); List taxAgentIds = Objects.isNull(taxAgentViews) ? Lists.newArrayList() : taxAgentViews.stream().map(TaxAgentPO::getId).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(queryParam.getTaxAgentIds())) { taxAgentIds = taxAgentIds.stream().filter(queryParam.getTaxAgentIds()::contains).collect(Collectors.toList()); @@ -323,6 +284,8 @@ public class SalaryStatisticsEmployeeServiceImpl extends Service implements Sala // 鏌ヨ钖祫鏍哥畻浜哄憳 List salaryAcctEmployeeList = getSalaryAcctEmployeeService(user).listByTaxAgentAndSalaryMonth(taxAgentIds, salaryMonths); + salaryAcctEmployeeList = getAuthService(user).auth(salaryAcctEmployeeList, AuthFilterTypeEnum.QUERY_DATA,SalaryAcctEmployeePO.class,"report"); + if (CollectionUtils.isNotEmpty(queryParam.getSubCompanyIds()) || CollectionUtils.isNotEmpty(queryParam.getDepartmentIds()) || StringUtils.isNotBlank(queryParam.getKeyword())) { // 鏍规嵁鍒嗛儴銆侀儴闂ㄧ瓫閫 List employeeList = getSalaryEmployeeService(user).listBySubCompanyOrDepartment(queryParam.getSubCompanyIds(), queryParam.getDepartmentIds()); diff --git a/src/com/engine/salary/service/SalaryAcctEmployeeService.java b/src/com/engine/salary/service/SalaryAcctEmployeeService.java index 6c506cb04..546110745 100644 --- a/src/com/engine/salary/service/SalaryAcctEmployeeService.java +++ b/src/com/engine/salary/service/SalaryAcctEmployeeService.java @@ -255,6 +255,7 @@ public interface SalaryAcctEmployeeService { * @return */ List listByTaxAgentAndSalaryMonth(List taxAgentIds, Set salaryMonths); + List listBySobAndSalaryMonth(List salarySobIds, Set salaryMonths); /** * 閿佸畾浜哄憳 diff --git a/src/com/engine/salary/service/auth/AuthService.java b/src/com/engine/salary/service/auth/AuthService.java index d29f21a03..b1962dc47 100644 --- a/src/com/engine/salary/service/auth/AuthService.java +++ b/src/com/engine/salary/service/auth/AuthService.java @@ -17,5 +17,7 @@ public interface AuthService { List auth(List list, AuthFilterTypeEnum filterType, Class clazz); + List auth(List list, AuthFilterTypeEnum filterType, Class clazz,String page); + Permission permission(String page); } diff --git a/src/com/engine/salary/service/auth/AuthServiceImpl.java b/src/com/engine/salary/service/auth/AuthServiceImpl.java index cff43bdb0..f2033cdb4 100644 --- a/src/com/engine/salary/service/auth/AuthServiceImpl.java +++ b/src/com/engine/salary/service/auth/AuthServiceImpl.java @@ -20,6 +20,7 @@ import com.engine.salary.service.impl.SalarySobServiceImpl; import com.engine.salary.service.impl.TaxAgentServiceImpl; import com.engine.salary.util.SalaryEntityUtil; import com.engine.salary.util.db.MapperProxyFactory; +import com.google.common.collect.Lists; import weaver.hrm.User; import java.lang.reflect.InvocationTargetException; @@ -44,9 +45,13 @@ public class AuthServiceImpl extends Service implements AuthService { return MapperProxyFactory.getProxy(AuthMapper.class); } - @Override public List auth(List list, AuthFilterTypeEnum filterType, Class clazz) { + return auth(list, filterType, clazz, null); + } + + @Override + public List auth(List list, AuthFilterTypeEnum filterType, Class clazz, String page) { Boolean isOpenDevolution = getTaxAgentService(user).isOpenDevolution(); boolean isAuth = clazz.isAnnotationPresent(Auth.class); @@ -91,7 +96,7 @@ public class AuthServiceImpl extends Service implements AuthService { List resultList = new ArrayList<>(); - String page = auth.page(); + page = page == null ? auth.page() : page; AuthCheckTypeEnum checkType = auth.checkType(); //缁欏悇绠＄悊鍛樿祴鍊煎搴旂殑鎵ｇ即涔夊姟浜烘潈闄 @@ -286,13 +291,27 @@ public class AuthServiceImpl extends Service implements AuthService { boolean able = false; - //濡傛灉鏄鐞嗗憳锛岃祴鍊肩鐞嗘潈闄愯繑鍥 - if (isChief || isAdminEnable) { + //涓嶉渶瑕侀壌鏉冪殑椤甸潰 + List noAuthPage = Lists.newArrayList("myBill"); + + //鍙厑璁告荤鐞嗚繘鍘荤殑鐣岄潰 + List chiefPage = Lists.newArrayList("auth"); + + if (noAuthPage.contains(page)) { opts.add("admin"); able = true; + } else if (chiefPage.contains(page)) { + opts.add("admin"); + able = isChief; } else { - opts = getAuthMapper().getOptsByPage(uid, page); - able = CollectionUtil.isNotEmpty(opts); + //濡傛灉鏄鐞嗗憳锛岃祴鍊肩鐞嗘潈闄愯繑鍥 + if (isChief || isAdminEnable) { + opts.add("admin"); + able = true; + } else { + opts = getAuthMapper().getOptsByPage(uid, page); + able = CollectionUtil.isNotEmpty(opts); + } } return Permission.builder() diff --git a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java index 55cc9fb38..46c8fef28 100644 --- a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java @@ -29,6 +29,7 @@ import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO; import com.engine.salary.entity.taxagent.bo.TaxAgentBO; import com.engine.salary.entity.taxagent.dto.TaxAgentEmployeeDTO; import com.engine.salary.entity.taxagent.dto.TaxAgentManageRangeEmployeeDTO; +import com.engine.salary.entity.taxagent.param.TaxAgentQueryParam; import com.engine.salary.entity.taxagent.po.TaxAgentPO; import com.engine.salary.enums.OperateTypeEnum; import com.engine.salary.enums.UserStatusEnum; @@ -500,7 +501,9 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction throw new SalaryRunTimeException("绋庢鎵灞炴湡涓嶈兘涓虹┖锛"); } // 鑾峰彇鎵鏈変釜绋庢墸缂翠箟鍔′汉 - Collection taxAgentList = getTaxAgentService(user).listTaxAgentAndEmployeeTree(currentEmployeeId); + TaxAgentQueryParam param = TaxAgentQueryParam.builder().build(); + param.setFilterType(AuthFilterTypeEnum.ADMIN_DATA); + Collection taxAgentList = getTaxAgentService(user).listAuth(param); //涓◣鎵ｇ即涔夊姟浜 String taxAgentId = Util.null2String(addUpDeductionRecordParam.getTaxAgentId()); // 鑾峰彇绉熸埛涓嬫墍鏈夌殑浜哄憳 @@ -515,7 +518,6 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction //鏌ヨ瀵逛簬浜哄憳淇℃伅瀵煎叆绛涢夌殑鍏ㄥ眬閰嶇疆 SalarySysConfPO salarySysConfPO = getSalarySysConfMapper().getOneByCode("matchEmployeeMode"); List insertData = new ArrayList<>(); - List taxAgentEmployees = Lists.newArrayList(); Date now = new Date(); //寰呮彃鍏ユ暟鎹簱瀵硅薄 AddUpDeduction addUpDeduction = AddUpDeduction.builder().tenantKey(DEFAULT_TENANT_KEY).createTime(now).updateTime(now).creator((long) user.getUID()).declareMonth(declareMonth).build(); @@ -530,27 +532,15 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction //涓◣鎵ｇ即涔夊姟浜轰笉鑳戒负绌 throw new SalaryRunTimeException("涓◣鎵ｇ即涔夊姟浜轰笉鑳戒负绌"); } else { - Optional optionalTemp = taxAgentList.stream().filter(m -> m.getTaxAgentName().equals(taxAgentName)).findFirst(); + Optional optionalTemp = taxAgentList.stream().filter(m -> m.getName().equals(taxAgentName)).findFirst(); if (optionalTemp.isPresent()) { - addUpDeduction.setTaxAgentId(optionalTemp.get().getTaxAgentId()); - taxAgentEmployees = optionalTemp.get().getEmployeeList(); + addUpDeduction.setTaxAgentId(optionalTemp.get().getId()); } else { //涓◣鎵ｇ即涔夊姟浜轰笉瀛樺湪鎴栦笉鍦ㄦ潈闄愯寖鍥村唴 throw new SalaryRunTimeException("涓◣鎵ｇ即涔夊姟浜轰笉瀛樺湪鎴栦笉鍦ㄦ潈闄愯寖鍥村唴"); } } - //fixme 鍒嗘潈鍒ゆ柇 -// if (openDevolution) { -// Optional optionalTaxAgentEmp = taxAgentEmployees.stream().filter(f -> f.getEmployeeId().equals(addUpDeduction.getEmployeeId())).findFirst(); -// if (!optionalTaxAgentEmp.isPresent()) { -// Map errorMessageMap = Maps.newHashMap(); -// errorMessageMap.put("message", rowIndex + "璇ユ潯鏁版嵁涓嶅湪涓◣鎵ｇ即涔夊姟浜轰汉鍛樿寖鍥村唴锛屼笉鍙鍏"); -// errorData.add(errorMessageMap); -// errorSum += 1; -// } -// } - // 鍒ゆ柇鏄惁鏈夋牳绠楄繃 if (CollectionUtils.isNotEmpty(salaryAcctEmployees)) { Optional optionalAcctEmp = salaryAcctEmployees.stream().filter(f -> f.getEmployeeId().equals(addUpDeduction.getEmployeeId()) && f.getTaxAgentId().equals(addUpDeduction.getTaxAgentId())).findFirst(); diff --git a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java index ec0db954c..fcba40a85 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java @@ -27,6 +27,8 @@ import com.engine.salary.mapper.salarysob.SobTaxLinkMapper; import com.engine.salary.mapper.sys.SalarySysConfMapper; import com.engine.salary.report.entity.param.SalaryStatisticsReportDataQueryParam; import com.engine.salary.service.*; +import com.engine.salary.service.auth.AuthService; +import com.engine.salary.service.auth.AuthServiceImpl; import com.engine.salary.sys.entity.vo.OrderRuleVO; import com.engine.salary.sys.service.SalarySysConfService; import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl; @@ -79,6 +81,10 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct return ServiceUtil.getService(SalaryAcctReportServiceImpl.class, user); } + public AuthService getAuthService(User user) { + return ServiceUtil.getService(AuthServiceImpl.class, user); + } + // private SalaryCheckResultDetailService salaryCheckResultDetailService; // private SalaryComparisonResultService salaryComparisonResultService; @@ -785,6 +791,10 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct return getSalaryAcctEmployeeMapper().listSome(SalaryAcctEmployeePO.builder().taxAgentIds(taxAgentIds).salaryMonths(salaryMonths).build()); } + @Override + public List listBySobAndSalaryMonth(List salarySobIds, Set salaryMonths) { + return getSalaryAcctEmployeeMapper().listSome(SalaryAcctEmployeePO.builder().salarySobIds(salarySobIds).salaryMonths(salaryMonths).build()); + } @Override public void lockEmp(SalaryAcctResultUpdateLockStatusParam updateParam) {