From a22aa624dbb5be598b1fb44bf70b89d480ee01cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 22 Aug 2024 15:37:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/WEB-INF/salaryoptconfig.xml | 9 ++- .../salary/entity/auth/dto/AuthDataDTO.java | 14 +++- .../salary/entity/auth/dto/AuthMemberDTO.java | 2 +- .../salary/entity/auth/dto/AuthOptDTO.java | 4 ++ .../entity/auth/param/AuthDataSaveParam.java | 5 ++ .../auth/param/AuthMemberSaveParam.java | 2 + .../entity/auth/param/AuthOptSaveParam.java | 1 + .../entity/auth/param/AuthRoleSaveParam.java | 2 +- .../salary/entity/auth/po/AuthDataPO.java | 2 + .../salary/enums/auth/DataLinkEnum.java | 6 +- .../service/auth/AuthDataServiceImpl.java | 47 ++++++++----- .../service/auth/AuthMemberServiceImpl.java | 70 +++++++++++++------ .../service/auth/AuthOptServiceImpl.java | 1 + .../salary/service/auth/AuthServiceImpl.java | 15 ++-- .../impl/SalaryArchiveServiceImpl.java | 10 --- .../salary/web/SalarySobController.java | 11 +++ .../engine/salary/wrapper/AuthWrapper.java | 12 +++- .../salary/wrapper/SalaryArchiveWrapper.java | 3 +- .../salary/wrapper/SalarySobWrapper.java | 3 + 19 files changed, 149 insertions(+), 70 deletions(-) diff --git a/resource/WEB-INF/salaryoptconfig.xml b/resource/WEB-INF/salaryoptconfig.xml index 3b6b0e9a6..a0746c596 100644 --- a/resource/WEB-INF/salaryoptconfig.xml +++ b/resource/WEB-INF/salaryoptconfig.xml @@ -14,13 +14,20 @@ - + + + + + + + + diff --git a/src/com/engine/salary/entity/auth/dto/AuthDataDTO.java b/src/com/engine/salary/entity/auth/dto/AuthDataDTO.java index 58986ccf6..cd3d3600b 100644 --- a/src/com/engine/salary/entity/auth/dto/AuthDataDTO.java +++ b/src/com/engine/salary/entity/auth/dto/AuthDataDTO.java @@ -1,6 +1,7 @@ package com.engine.salary.entity.auth.dto; import com.engine.salary.annotation.TableTitle; +import com.engine.salary.enums.auth.DataLinkEnum; import com.engine.salary.enums.auth.DataTargetTypeEnum; import lombok.AllArgsConstructor; import lombok.Builder; @@ -15,7 +16,15 @@ public class AuthDataDTO { private Long id; - @TableTitle(title = "瀵硅薄绫诲瀷",dataIndex = "targetType",key = "targetType") + /** + * 杩炴帴绗︼紝浜ゃ佸苟銆佽ˉ + */ + @TableTitle(title = "杩炴帴",dataIndex = "linkName",key = "linkName") + private String linkName; + + private DataLinkEnum link; + + @TableTitle(title = "瀵硅薄绫诲瀷",dataIndex = "targetTypeName",key = "targetTypeName") private String targetTypeName; private DataTargetTypeEnum targetType; @@ -23,4 +32,7 @@ public class AuthDataDTO { private String targetName; private String target; + @TableTitle(title = "鎵规",dataIndex = "sortedIndex",key = "sortedIndex") + private Integer sortedIndex; + } diff --git a/src/com/engine/salary/entity/auth/dto/AuthMemberDTO.java b/src/com/engine/salary/entity/auth/dto/AuthMemberDTO.java index 699e48db8..fe0b24e98 100644 --- a/src/com/engine/salary/entity/auth/dto/AuthMemberDTO.java +++ b/src/com/engine/salary/entity/auth/dto/AuthMemberDTO.java @@ -15,7 +15,7 @@ public class AuthMemberDTO { private Long id; - @TableTitle(title = "瀵硅薄绫诲瀷",dataIndex = "targetType",key = "targetType") + @TableTitle(title = "瀵硅薄绫诲瀷",dataIndex = "targetTypeName",key = "targetTypeName") private String targetTypeName; private MemberTargetTypeEnum targetType; diff --git a/src/com/engine/salary/entity/auth/dto/AuthOptDTO.java b/src/com/engine/salary/entity/auth/dto/AuthOptDTO.java index c50e1bf33..2a71e4129 100644 --- a/src/com/engine/salary/entity/auth/dto/AuthOptDTO.java +++ b/src/com/engine/salary/entity/auth/dto/AuthOptDTO.java @@ -50,6 +50,10 @@ public class AuthOptDTO { @XStreamAsAttribute private String key; + @XStreamAlias("limit") + @XStreamAsAttribute + private String limit; + @XStreamImplicit(itemFieldName = "opt") private List opts; diff --git a/src/com/engine/salary/entity/auth/param/AuthDataSaveParam.java b/src/com/engine/salary/entity/auth/param/AuthDataSaveParam.java index 2e7e9e24e..86784082f 100644 --- a/src/com/engine/salary/entity/auth/param/AuthDataSaveParam.java +++ b/src/com/engine/salary/entity/auth/param/AuthDataSaveParam.java @@ -3,6 +3,8 @@ package com.engine.salary.entity.auth.param; import com.engine.salary.enums.auth.DataLinkEnum; import com.engine.salary.enums.auth.DataTargetTypeEnum; +import com.engine.salary.util.valid.Modify; +import com.engine.salary.util.valid.ModifyTypeEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -21,6 +23,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor public class AuthDataSaveParam { + private Long id; private Long roleId; @@ -28,8 +31,10 @@ public class AuthDataSaveParam { private DataTargetTypeEnum targetType; + @Modify(modifyType = ModifyTypeEnum.RESTORE_SQL) private String target; + @Modify(modifyType = ModifyTypeEnum.RESTORE_SQL) private String targetName; private Integer sortedIndex; diff --git a/src/com/engine/salary/entity/auth/param/AuthMemberSaveParam.java b/src/com/engine/salary/entity/auth/param/AuthMemberSaveParam.java index dfc715185..9486d1e96 100644 --- a/src/com/engine/salary/entity/auth/param/AuthMemberSaveParam.java +++ b/src/com/engine/salary/entity/auth/param/AuthMemberSaveParam.java @@ -15,6 +15,8 @@ import lombok.NoArgsConstructor; @AllArgsConstructor public class AuthMemberSaveParam { + private Long id; + private Long roleId; private MemberTargetTypeEnum targetType; diff --git a/src/com/engine/salary/entity/auth/param/AuthOptSaveParam.java b/src/com/engine/salary/entity/auth/param/AuthOptSaveParam.java index cea3df117..c720fedcc 100644 --- a/src/com/engine/salary/entity/auth/param/AuthOptSaveParam.java +++ b/src/com/engine/salary/entity/auth/param/AuthOptSaveParam.java @@ -18,6 +18,7 @@ public class AuthOptSaveParam { @Data public static class Opt { + private String page; private String opt; diff --git a/src/com/engine/salary/entity/auth/param/AuthRoleSaveParam.java b/src/com/engine/salary/entity/auth/param/AuthRoleSaveParam.java index 1d45ec604..edb128c22 100644 --- a/src/com/engine/salary/entity/auth/param/AuthRoleSaveParam.java +++ b/src/com/engine/salary/entity/auth/param/AuthRoleSaveParam.java @@ -24,7 +24,7 @@ public class AuthRoleSaveParam { private String name; - @DataCheck(require = true, max = 400, message = "鍚嶇О涓嶅厑璁镐负绌,鍚嶇О涓嶈兘瓒呰繃400涓瓧绗") + @DataCheck(require = false, max = 400, message = "鎻忚堪涓嶈兘瓒呰繃400涓瓧绗") private String description; /** diff --git a/src/com/engine/salary/entity/auth/po/AuthDataPO.java b/src/com/engine/salary/entity/auth/po/AuthDataPO.java index ff00e66a9..b29b6992a 100644 --- a/src/com/engine/salary/entity/auth/po/AuthDataPO.java +++ b/src/com/engine/salary/entity/auth/po/AuthDataPO.java @@ -1,6 +1,7 @@ package com.engine.salary.entity.auth.po; import com.engine.hrmelog.annotation.ElogTransform; +import com.engine.salary.enums.auth.DataLinkEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -28,6 +29,7 @@ public class AuthDataPO { /** * 杩炴帴绗︼紝浜ゃ佸苟銆佽ˉ + * @see DataLinkEnum */ @ElogTransform(name = "杩炴帴绗︼紝浜ゃ佸苟銆佽ˉ") private Integer link; diff --git a/src/com/engine/salary/enums/auth/DataLinkEnum.java b/src/com/engine/salary/enums/auth/DataLinkEnum.java index 37982b037..e99cbf9a6 100644 --- a/src/com/engine/salary/enums/auth/DataLinkEnum.java +++ b/src/com/engine/salary/enums/auth/DataLinkEnum.java @@ -20,19 +20,19 @@ import java.util.Set; public enum DataLinkEnum implements BaseEnum { - OR(1, "骞", 87627) { + OR(1, "骞堕泦杩愮畻", 87627) { @Override public Set calculation(Collection coll1, Collection coll2) { return new HashSet<>(CollectionUtil.union(coll1, coll2)); } }, - AND(2, "浜", 87626) { + AND(2, "浜ら泦杩愮畻", 87626) { @Override public Set calculation(Collection coll1, Collection coll2) { return new HashSet<>(CollectionUtil.intersection(coll1, coll2)); } }, - NOT_IN(3, "琛", 87626) { + NOT_IN(3, "琛ラ泦杩愮畻", 87626) { @Override public Set calculation(Collection coll1, Collection coll2) { return new HashSet<>(CollectionUtil.disjunction(coll1, coll2)); diff --git a/src/com/engine/salary/service/auth/AuthDataServiceImpl.java b/src/com/engine/salary/service/auth/AuthDataServiceImpl.java index 3d33df860..400ccb03c 100644 --- a/src/com/engine/salary/service/auth/AuthDataServiceImpl.java +++ b/src/com/engine/salary/service/auth/AuthDataServiceImpl.java @@ -64,22 +64,37 @@ public class AuthDataServiceImpl extends Service implements AuthDataService { throw new SalaryRunTimeException("瑙掕壊涓嶅瓨鍦紒"); } - AuthDataPO dataPO = AuthDataPO.builder() - .id(IdGenerator.generate()) - .roleId(param.getRoleId()) - .link(param.getLink().getValue()) - .targetType(param.getTargetType().getValue()) - .target(param.getTarget()) - .targetName(param.getTargetName()) - .sortedIndex(param.getSortedIndex()) - .creator((long) user.getUID()) - .createTime(now) - .updateTime(now) - .deleteType(0) - .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) - .build(); - - getAuthDataMapper().insertIgnoreNull(dataPO); + if(param.getId() == null){ + AuthDataPO dataPO = AuthDataPO.builder() + .id(IdGenerator.generate()) + .roleId(param.getRoleId()) + .link(param.getLink().getValue()) + .targetType(param.getTargetType().getValue()) + .target(param.getTarget()) + .targetName(param.getTargetName()) + .sortedIndex(param.getSortedIndex()) + .creator((long) user.getUID()) + .createTime(now) + .updateTime(now) + .deleteType(0) + .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) + .build(); + getAuthDataMapper().insertIgnoreNull(dataPO); + }else{ + getAuthDataMapper().getById(param.getId()); + AuthDataPO dataPO = AuthDataPO.builder() + .id(param.getId()) + .link(param.getLink().getValue()) + .targetType(param.getTargetType().getValue()) + .target(param.getTarget()) + .targetName(param.getTargetName()) + .sortedIndex(param.getSortedIndex()) + .creator((long) user.getUID()) + .updateTime(now) + .deleteType(0) + .build(); + getAuthDataMapper().updateIgnoreNull(dataPO); + } }); } diff --git a/src/com/engine/salary/service/auth/AuthMemberServiceImpl.java b/src/com/engine/salary/service/auth/AuthMemberServiceImpl.java index 58427cf2c..7860ca094 100644 --- a/src/com/engine/salary/service/auth/AuthMemberServiceImpl.java +++ b/src/com/engine/salary/service/auth/AuthMemberServiceImpl.java @@ -65,29 +65,55 @@ public class AuthMemberServiceImpl extends Service implements AuthMemberService } Date now = new Date(); - AuthMemberPO po = AuthMemberPO.builder() - .id(IdGenerator.generate()) - .roleId(param.getRoleId()) - .target(param.getTarget()) - .targetType(param.getTargetType().getValue()) - .targetName(param.getTargetName()) - .creator((long) user.getUID()) - .createTime(now) - .updateTime(now) - .deleteType(0) - .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) - .build(); - getAuthMemberMapper().insertIgnoreNull(po); + if (param.getId() == null) { + AuthMemberPO po = AuthMemberPO.builder() + .id(IdGenerator.generate()) + .roleId(param.getRoleId()) + .target(param.getTarget()) + .targetType(param.getTargetType().getValue()) + .targetName(param.getTargetName()) + .creator((long) user.getUID()) + .createTime(now) + .updateTime(now) + .deleteType(0) + .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) + .build(); + getAuthMemberMapper().insertIgnoreNull(po); + + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(rolePO.getTaxAgentId() + ""); + loggerContext.setTargetName(rolePO.getName() + "鎴愬憳锛" + po.getId()); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "鏂板鎴愬憳")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "鏂板鎴愬憳")); + loggerContext.setNewValues(po); + SalaryElogConfig.taxAgentLoggerTemplate.write(loggerContext); + } else { + AuthMemberPO oldPO = getAuthMemberMapper().getById(param.getId()); + AuthMemberPO newPo = AuthMemberPO.builder() + .id(param.getId()) + .target(param.getTarget()) + .targetType(param.getTargetType().getValue()) + .targetName(param.getTargetName()) + .creator((long) user.getUID()) + .updateTime(now) + .deleteType(0) + .build(); + getAuthMemberMapper().updateIgnoreNull(newPo); + + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(rolePO.getTaxAgentId() + ""); + loggerContext.setTargetName(rolePO.getName() + "鎴愬憳锛" + newPo.getId()); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "缂栬緫鎴愬憳")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "缂栬緫鎴愬憳")); + loggerContext.setOldValues(oldPO); + loggerContext.setNewValues(newPo); + SalaryElogConfig.taxAgentLoggerTemplate.write(loggerContext); + } - LoggerContext loggerContext = new LoggerContext<>(); - loggerContext.setUser(user); - loggerContext.setTargetId(rolePO.getTaxAgentId() + ""); - loggerContext.setTargetName(rolePO.getName() + "鎴愬憳锛" + po.getId()); - loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "鏂板鎴愬憳")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "鏂板鎴愬憳")); - loggerContext.setNewValues(po); - SalaryElogConfig.taxAgentLoggerTemplate.write(loggerContext); }); } diff --git a/src/com/engine/salary/service/auth/AuthOptServiceImpl.java b/src/com/engine/salary/service/auth/AuthOptServiceImpl.java index c4ad72c7b..d342c2ebf 100644 --- a/src/com/engine/salary/service/auth/AuthOptServiceImpl.java +++ b/src/com/engine/salary/service/auth/AuthOptServiceImpl.java @@ -39,6 +39,7 @@ public class AuthOptServiceImpl extends Service implements AuthOptService { XStream xStream = new XStream(); String resource = GCONST.getRootPath() + "WEB-INF" + File.separatorChar + "salaryoptconfig.xml"; File file = new File("H:\\code\\salary\\resource\\WEB-INF\\salaryoptconfig.xml"); +// File file = new File(resource); xStream.addPermission(AnyTypePermission.ANY); xStream.processAnnotations(AuthOptDTO.class); diff --git a/src/com/engine/salary/service/auth/AuthServiceImpl.java b/src/com/engine/salary/service/auth/AuthServiceImpl.java index 147b66ae8..a9672a6da 100644 --- a/src/com/engine/salary/service/auth/AuthServiceImpl.java +++ b/src/com/engine/salary/service/auth/AuthServiceImpl.java @@ -8,6 +8,7 @@ import com.engine.salary.entity.auth.dto.AuthDTO; import com.engine.salary.entity.auth.dto.EmpOpt; import com.engine.salary.entity.auth.dto.Opt; import com.engine.salary.enums.auth.AuthCheckTypeEnum; +import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.mapper.auth.AuthMapper; import com.engine.salary.service.TaxAgentService; import com.engine.salary.service.impl.TaxAgentServiceImpl; @@ -53,12 +54,6 @@ public class AuthServiceImpl extends Service implements AuthService { if (isChief) { list.forEach(t -> { try { - Method taxAgentIdFieldGetterMethod = t.getClass().getMethod(taxAgentIdFieldGetter); - Long taxAgentId = (Long) taxAgentIdFieldGetterMethod.invoke(t); - - Method employeeIdFieldGetterMethod = t.getClass().getMethod(employeeIdFieldGetter); - Long employeeId = (Long) employeeIdFieldGetterMethod.invoke(t); - Method optsFieldGetterMethod = t.getClass().getMethod(optsFieldGetter); Set opts = (Set) optsFieldGetterMethod.invoke(t); if (opts == null) { @@ -71,7 +66,7 @@ public class AuthServiceImpl extends Service implements AuthService { optsFieldSetterMethod.invoke(t, opts); } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) { - e.printStackTrace(); + throw new SalaryRunTimeException(e); } }); @@ -103,11 +98,9 @@ public class AuthServiceImpl extends Service implements AuthService { iterator.remove(); } } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) { - e.printStackTrace(); + throw new SalaryRunTimeException(e); } } - - return list; } @@ -149,7 +142,7 @@ public class AuthServiceImpl extends Service implements AuthService { } } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) { - e.printStackTrace(); + throw new SalaryRunTimeException(e); } } diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java index 2d79e3928..8afde0c90 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java @@ -216,9 +216,6 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe }.start(); } - - Boolean needAuth = getTaxAgentService(user).isNeedAuth(currentEmployeeId); - //鎺掑簭閰嶇疆 OrderRuleVO orderRule = getSalarySysConfService(user).orderRule(); queryParam.setOrderRule(orderRule); @@ -1067,16 +1064,9 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe @Override public Map queryTabTotal() { - long currentEmployeeId = user.getUID(); - // tab椤电鏁伴噺 Map result = new HashMap<>(); - Boolean needAuth = getTaxAgentService(user).isNeedAuth(currentEmployeeId); - - //鑾峰彇绠＄悊鐨勪汉鍛樿寖鍥 - List taxAgentEmployeeDTOS = getTaxAgentService(user).listTaxAgentAndEmployeeTree(currentEmployeeId); - Map> taxAgentEmployeesMap = SalaryEntityUtil.convert2Map(taxAgentEmployeeDTOS, TaxAgentManageRangeEmployeeDTO::getTaxAgentId, TaxAgentManageRangeEmployeeDTO::getEmployeeList); List list = getSalaryArchiveMapper().listAll(); list = getAuthService(user).auth(list,SalaryArchivePO.class); diff --git a/src/com/engine/salary/web/SalarySobController.java b/src/com/engine/salary/web/SalarySobController.java index cfb78aefd..5c5caeaec 100644 --- a/src/com/engine/salary/web/SalarySobController.java +++ b/src/com/engine/salary/web/SalarySobController.java @@ -87,6 +87,17 @@ public class SalarySobController { return new ResponseResult>(user).run(getSalarySobWrapper(user)::listPage, queryParam); } + /** + * 钖祫璐﹀鍒楄〃 + */ + @GET + @Path("/listByTaxAgent") + @Produces(MediaType.APPLICATION_JSON) + public String listSalarySob(@Context HttpServletRequest request, @Context HttpServletResponse response, @QueryParam(value = "taxAgentId") Long taxAgentId) { + User user = HrmUserVarify.getUser(request, response); + return new ResponseResult>(user).run(getSalarySobWrapper(user)::listByTaxAgent, taxAgentId); + } + /** * 钖祫璐﹀鍒楄〃 */ diff --git a/src/com/engine/salary/wrapper/AuthWrapper.java b/src/com/engine/salary/wrapper/AuthWrapper.java index 86d7b1c04..a0507c719 100644 --- a/src/com/engine/salary/wrapper/AuthWrapper.java +++ b/src/com/engine/salary/wrapper/AuthWrapper.java @@ -8,6 +8,7 @@ import com.engine.salary.entity.auth.dto.AuthOptDTO; import com.engine.salary.entity.auth.param.*; import com.engine.salary.entity.auth.po.AuthDataPO; import com.engine.salary.entity.auth.po.AuthMemberPO; +import com.engine.salary.enums.auth.DataLinkEnum; import com.engine.salary.enums.auth.DataTargetTypeEnum; import com.engine.salary.enums.auth.MemberTargetTypeEnum; import com.engine.salary.mapper.auth.AuthMapper; @@ -64,7 +65,8 @@ public class AuthWrapper extends Service { .target(po.getTarget()) .build()) .collect(Collectors.toList()); - PageInfo authMemberDTOPageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), dtos, AuthMemberDTO.class); + PageInfo authMemberDTOPageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), AuthMemberDTO.class); + authMemberDTOPageInfo.setList(dtos); authMemberDTOPageInfo.setTotal(total); return authMemberDTOPageInfo; } @@ -98,20 +100,26 @@ public class AuthWrapper extends Service { list = SalaryPageUtil.subList(param.getCurrent(), param.getPageSize(), list); List dtos = list.stream().map(po -> AuthDataDTO.builder() .id(po.getId()) + .link(DataLinkEnum.parseByValue(po.getLink())) + .linkName(DataLinkEnum.parseByValue(po.getLink()).getDefaultLabel()) .targetTypeName(DataTargetTypeEnum.parseByValue(po.getTargetType()).getDefaultLabel()) .targetType(DataTargetTypeEnum.parseByValue(po.getTargetType())) .targetName(po.getTargetName()) .target(po.getTarget()) + .sortedIndex(po.getSortedIndex()) .build()) .collect(Collectors.toList()); - PageInfo page = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), dtos, AuthDataDTO.class); + PageInfo page = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), AuthDataDTO.class); + page.setList(dtos); page.setTotal(total); return page; } public void saveData(List params) { + params.forEach(ValidUtil::modify); + getAuthDataService(user).save(params); } diff --git a/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java b/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java index 22a642feb..bcbda20c0 100644 --- a/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java @@ -198,8 +198,7 @@ public class SalaryArchiveWrapper extends Service { * @return */ public Map listPage(SalaryArchiveQueryParam queryParam) { - Map list = list(queryParam); - return list; + return list(queryParam); } diff --git a/src/com/engine/salary/wrapper/SalarySobWrapper.java b/src/com/engine/salary/wrapper/SalarySobWrapper.java index d5ab26b6b..7bfca57af 100644 --- a/src/com/engine/salary/wrapper/SalarySobWrapper.java +++ b/src/com/engine/salary/wrapper/SalarySobWrapper.java @@ -278,4 +278,7 @@ public class SalarySobWrapper extends Service { return taxAgentIds.contains(salarySobPO.getTaxAgentId())||Objects.isNull(salarySobPO.getTaxAgentId()); } + public List listByTaxAgent(Long taxAgentId) { + return getSalarySobService(user).listByTaxAgentId(taxAgentId); + } }