From 259c40758fc9545b8bfd75a0bedeae8f97bcf958 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Wed, 27 Jul 2022 16:56:13 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=B3=BB=E7=BB=9F=E5=90=8D=202=E3=80=81?= =?UTF-8?q?=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E5=A2=9E=E5=8A=A0=E7=94=B3?= =?UTF-8?q?=E6=8A=A5=E9=A1=B9=E7=9B=AE=E5=90=8D=203=E3=80=81=E8=B4=A6?= =?UTF-8?q?=E5=A5=97=E5=AF=B9=E5=BA=94=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/sql/公式修改.sql | 3 +- src/com/engine/salary/biz/SIAccountBiz.java | 1 - src/com/engine/salary/biz/SIArchivesBiz.java | 4 +- .../entity/salaryitem/bo/SalaryItemBO.java | 50 ++++++++------ .../salaryitem/dto/SalaryItemListDTO.java | 8 ++- .../salary/enums/SalaryUserStatusEnum.java | 51 --------------- .../engine/salary/enums/UserStatusEnum.java | 65 ++++++++++--------- .../service/impl/RecordsBuildServiceImpl.java | 2 +- .../service/impl/SIAccountServiceImpl.java | 4 +- .../service/impl/SIImportServiceImpl.java | 2 +- .../service/impl/SISchemeServiceImpl.java | 2 +- .../engine/salary/util/ResponseResult.java | 8 +++ .../engine/salary/util/SalaryEnumUtil.java | 2 +- .../salary/web/SalaryItemController.java | 2 +- .../salary/wrapper/SalaryItemWrapper.java | 14 ++-- .../salary/wrapper/SalarySobItemWrapper.java | 29 +++++---- 16 files changed, 113 insertions(+), 134 deletions(-) delete mode 100644 src/com/engine/salary/enums/SalaryUserStatusEnum.java diff --git a/resource/sql/公式修改.sql b/resource/sql/公式修改.sql index 3e35fcea3..8631c0196 100644 --- a/resource/sql/公式修改.sql +++ b/resource/sql/公式修改.sql @@ -1,2 +1 @@ -update hrsa_formula set formula = 'if({薪资项目.当前累计应纳税所得额}<=36000){{薪资项目.当前累计应纳税所得额}<=36000){0;}else if({薪资项目.当前累计应纳税所得额}<=144000){2520;}else if({薪资项目.当前累计应纳税所得额}<=300000){16920;}else if({薪资项目.当前累计应纳税所得额}<=420000){31920;}else if({薪资项目.当前累计应纳税所得额}<=660000){52920;}else if({薪资项目.当前累计应纳税所得额}<=960000){85920;}else{181920;}', formulaRunScript = 'if(salaryItem_addUpTaxableIncome<=36000){0;}else if(salaryItem_addUpTaxableIncome<=144000){2520;}else if(salaryItem_addUpTaxableIncome<=300000){16920;}else if(salaryItem_addUpTaxableIncome<=420000){31920;}else if(salaryItem_addUpTaxableIncome<=660000){52920;}else if(salaryItem_addUpTaxableIncome<=960000){85920;}else{181920;}' where id = 1651742702735 - GO \ No newline at end of file +update hrsa_formula set formula = 'if({薪资项目.当前累计应纳税所得额}<=36000){0;}else if({薪资项目.当前累计应纳税所得额}<=144000){2520;}else if({薪资项目.当前累计应纳税所得额}<=300000){16920;}else if({薪资项目.当前累计应纳税所得额}<=420000){31920;}else if({薪资项目.当前累计应纳税所得额}<=660000){52920;}else if({薪资项目.当前累计应纳税所得额}<=960000){85920;}else{181920;}' where id = 1651742702735 \ No newline at end of file diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java index 55d424148..746bf2af2 100644 --- a/src/com/engine/salary/biz/SIAccountBiz.java +++ b/src/com/engine/salary/biz/SIAccountBiz.java @@ -537,7 +537,6 @@ public class SIAccountBiz extends Service { BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost()); Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum(); BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); - ; fundPerJsonMap.put(String.valueOf(e), result.toPlainString()); fundPer.add(result); }); diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index 2383af674..ba4366e89 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -927,7 +927,7 @@ public class SIArchivesBiz { map.put("siSchemeId", item.getSiSchemeId()); map.put("fundSchemeId", item.getFundSchemeId()); map.put("otherSchemeId", item.getOtherSchemeId()); - map.put("status", item.getUserStatus() != null ? UserStatusEnum.values()[item.getUserStatus()].getDescription() : ""); + map.put("status", item.getUserStatus() != null ? UserStatusEnum.values()[item.getUserStatus()].getDefaultLabel() : ""); if (socialItem != null) { map.put("socialName", insuranceSchemeMapper.querySchemeName(socialItem.getSocialSchemeId())); Map socialJson = JSON.parseObject(socialItem.getSocialPaymentBaseString(), new TypeReference>() { @@ -993,7 +993,7 @@ public class SIArchivesBiz { */ public Map getSearchCondition(User user) { - List userStatusOptions = Arrays.stream(UserStatusEnum.values()).map(e -> new SearchConditionOption(String.valueOf(e.getValue()), e.getDescription())).collect(Collectors.toList()); + List userStatusOptions = Arrays.stream(UserStatusEnum.values()).map(e -> new SearchConditionOption(String.valueOf(e.getValue()), e.getDefaultLabel())).collect(Collectors.toList()); List list = new SISchemeBiz().listAll(); List schemeOption = list.stream().filter(item -> Objects.equals(item.getWelfareType(), WelfareTypeEnum.SOCIAL_SECURITY.getValue())) diff --git a/src/com/engine/salary/entity/salaryitem/bo/SalaryItemBO.java b/src/com/engine/salary/entity/salaryitem/bo/SalaryItemBO.java index 655d2794d..972af6838 100644 --- a/src/com/engine/salary/entity/salaryitem/bo/SalaryItemBO.java +++ b/src/com/engine/salary/entity/salaryitem/bo/SalaryItemBO.java @@ -1,11 +1,15 @@ package com.engine.salary.entity.salaryitem.bo; +import com.engine.salary.annotation.SalaryTableColumn; import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.entity.salaryformula.ExpressFormula; import com.engine.salary.entity.salaryitem.dto.SalaryItemFormDTO; import com.engine.salary.entity.salaryitem.dto.SalaryItemListDTO; import com.engine.salary.entity.salaryitem.param.SalaryItemSaveParam; import com.engine.salary.entity.salaryitem.po.SalaryItemPO; +import com.engine.salary.entity.salaryitem.po.SysSalaryItemPO; +import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationLaborListDTO; +import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationWageListDTO; import com.engine.salary.enums.SalaryRoundingModeEnum; import com.engine.salary.enums.SalarySystemTypeEnum; import com.engine.salary.enums.SalaryValueTypeEnum; @@ -18,6 +22,7 @@ import org.apache.commons.lang3.math.NumberUtils; import weaver.conn.util.IdGenerator; import weaver.general.BaseBean; +import java.lang.reflect.Field; import java.util.*; import java.util.stream.Collectors; @@ -75,11 +80,12 @@ public class SalaryItemBO { * @param expressFormulas 公式详情 * @return */ - public static List convert2ListDTO(Collection salaryItems, List expressFormulas) { + public static List convert2ListDTO(Collection salaryItems, List expressFormulas,List sysSalaryItemPOS) { if (CollectionUtils.isEmpty(salaryItems)) { return Collections.emptyList(); } Map formulaMap = SalaryEntityUtil.convert2Map(expressFormulas, ExpressFormula::getId, ExpressFormula::getFormula); + Map sysSalaryItemNameMap = SalaryEntityUtil.convert2Map(sysSalaryItemPOS, SysSalaryItemPO::getId, SysSalaryItemPO::getName); return salaryItems.stream().map(salaryItemPO -> { SalaryRoundingModeEnum salaryRoundingModeEnum = SalaryRoundingModeEnum.parseByValue(salaryItemPO.getRoundingMode()); SalaryValueTypeEnum salaryValueTypeEnum = SalaryValueTypeEnum.parseByValue(salaryItemPO.getValueType()); @@ -87,6 +93,7 @@ public class SalaryItemBO { return SalaryItemListDTO.builder() .id(salaryItemPO.getId()) .name(salaryItemPO.getName()) + .systemName(sysSalaryItemNameMap.getOrDefault(salaryItemPO.getSysSalaryItemId(), StringUtils.EMPTY)) .useInEmployeeSalary(salaryItemPO.getUseInEmployeeSalary()) .useDefault(salaryItemPO.getUseDefault()) .roundingMode(Optional.ofNullable(salaryRoundingModeEnum) @@ -140,26 +147,27 @@ public class SalaryItemBO { * @return */ public static String buildTaxDeclarationColumn(String code) { -// // 是否是个税申报表（正常工资薪金所得）中的字段 -// for (Field declaredField : TaxDeclarationWageListDTO.class.getDeclaredFields()) { -// if (!declaredField.isAnnotationPresent(SalaryTableColumn.class)) { -// continue; -// } -// if (Objects.equals(code, declaredField.getName())) { -// SalaryTableColumn annotation = declaredField.getAnnotation(SalaryTableColumn.class); -// return SalaryI18nUtil.getI18nLabel((int) annotation.labelId(), annotation.label()); -// } -// } -// // 是否是个税申报表（劳务报酬所得）中的字段 -// for (Field declaredField : TaxDeclarationLaborListDTO.class.getDeclaredFields()) { -// if (!declaredField.isAnnotationPresent(SalaryTableColumn.class)) { -// continue; -// } -// if (Objects.equals(code, declaredField.getName())) { -// SalaryTableColumn annotation = declaredField.getAnnotation(SalaryTableColumn.class); -// return SalaryI18nUtil.getI18nLabel((int) annotation.labelId(), annotation.label()); -// } -// } + // 是否是个税申报表（正常工资薪金所得）中的字段 + for (Field declaredField : TaxDeclarationWageListDTO.class.getDeclaredFields()) { + if (!declaredField.isAnnotationPresent(SalaryTableColumn.class)) { + continue; + } + if (Objects.equals(code, declaredField.getName())) { + SalaryTableColumn annotation = declaredField.getAnnotation(SalaryTableColumn.class); + return SalaryI18nUtil.getI18nLabel((int) annotation.labelId(), annotation.text()); + } + } + // 是否是个税申报表（劳务报酬所得）中的字段 + for (Field declaredField : TaxDeclarationLaborListDTO.class.getDeclaredFields()) { + if (!declaredField.isAnnotationPresent(SalaryTableColumn.class)) { + continue; + } + // 时间紧迫，临时处理 + if (Objects.equals(code, declaredField.getName()) || Objects.equals(code, declaredField.getName() + "4")) { + SalaryTableColumn annotation = declaredField.getAnnotation(SalaryTableColumn.class); + return SalaryI18nUtil.getI18nLabel((int) annotation.labelId(), annotation.text()); + } + } return StringUtils.EMPTY; } diff --git a/src/com/engine/salary/entity/salaryitem/dto/SalaryItemListDTO.java b/src/com/engine/salary/entity/salaryitem/dto/SalaryItemListDTO.java index 79dd67bd3..96f7b0a5c 100644 --- a/src/com/engine/salary/entity/salaryitem/dto/SalaryItemListDTO.java +++ b/src/com/engine/salary/entity/salaryitem/dto/SalaryItemListDTO.java @@ -36,6 +36,10 @@ public class SalaryItemListDTO { @TableTitle(title = "名称",dataIndex = "name",key = "name") private String name; + @SalaryTableColumn(text = "系统名", width = "10%", column = "systemName") + @TableTitle(title = "系统名",dataIndex = "systemName",key = "systemName") + private String systemName; + //薪资档案引用 @SalaryTableColumn(text = "薪资档案引用", width = "10%", column = "useInEmployeeSalary") @TableTitle(title = "薪资档案引用",dataIndex = "useInEmployeeSalary",key = "useInEmployeeSalary") @@ -74,8 +78,8 @@ public class SalaryItemListDTO { //公式内容 private String formulaContent; -// @SalaryTableColumn(text = "个税申报表对应字段", width = "10%", column = "taxDeclarationColumn") -// @TableTitle(title = "个税申报表对应字段",dataIndex = "taxDeclarationColumn",key = "taxDeclarationColumn") + @SalaryTableColumn(text = "个税申报表对应字段", width = "10%", column = "taxDeclarationColumn") + @TableTitle(title = "个税申报表对应字段",dataIndex = "taxDeclarationColumn",key = "taxDeclarationColumn") private String taxDeclarationColumn; //备注 diff --git a/src/com/engine/salary/enums/SalaryUserStatusEnum.java b/src/com/engine/salary/enums/SalaryUserStatusEnum.java deleted file mode 100644 index 74102bef9..000000000 --- a/src/com/engine/salary/enums/SalaryUserStatusEnum.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.engine.salary.enums; - -import com.engine.salary.util.SalaryI18nUtil; - -import java.util.Arrays; -import java.util.Optional; - -/** - * @Description: 薪资-员工状态 - * @Author: wangxiangzhong - * @Date: 2021/11/1 16:06 - */ -public enum SalaryUserStatusEnum { - - normal("normal", "在职", 100120), - unavailable("unavailable", "离职", 85902), - locked("locked", "锁定", 102825), - unactive("unactive", "未激活", 102826), - detached("detached", "无公司", 102827), - temp("temp", "临时账号", 102828), - invited("invited", "已邀请", 102829); - - private String value; - - private String defaultLabel; - - private int labelId; - - SalaryUserStatusEnum(String value, String defaultLabel, int labelId) { - this.value = value; - this.defaultLabel = defaultLabel; - this.labelId = labelId; - } - - public String getValue() { - return value; - } - - public String getDefaultLabel() { - return defaultLabel; - } - - public int getLabelId() { - return labelId; - } - - public static String getDefaultLabelByValue(String value) { - Optional optional = Arrays.stream(SalaryUserStatusEnum.values()).filter(r -> r.getValue().equals(value)).findFirst(); - return optional.isPresent() ? SalaryI18nUtil.getI18nLabel(optional.get().getLabelId(), optional.get().getDefaultLabel()) : ""; - } -} diff --git a/src/com/engine/salary/enums/UserStatusEnum.java b/src/com/engine/salary/enums/UserStatusEnum.java index 3c7171410..7450ef9d3 100644 --- a/src/com/engine/salary/enums/UserStatusEnum.java +++ b/src/com/engine/salary/enums/UserStatusEnum.java @@ -6,50 +6,53 @@ import java.util.*; import java.util.stream.Collectors; /** - * @Author weaver_cl - * - * @Date 2022/3/17 - * @Version V1.0 - * The trial - * A formal - * temporary - * Try to postpone the - * fire - * departure - * retired - * invalid + * 人员状态 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 **/ -public enum UserStatusEnum { +public enum UserStatusEnum implements BaseEnum { - TRIAL(0, "试用"), - FORMAL(1, "正式"), - TEMPORARY(2, "临时"), - DELAY(3, "试用延期"), - FIRE(4, "解雇"), - DEPARTURE(5, "离职"), - RETIRED(6, "退休"), - INVALID(7, "无效"); + TRIAL(0, "试用", 1), + FORMAL(1, "正式", 1), + TEMPORARY(2, "临时", 1), + DELAY(3, "试用延期", 1), + FIRE(4, "解雇", 1), + DEPARTURE(5, "离职", 1), + RETIRED(6, "退休", 1), + INVALID(7, "无效", 1); private Integer value; - private String description; + private String defaultLabel; + private int labelId; - UserStatusEnum(Integer value, String description) { + UserStatusEnum(Integer value, String defaultLabel, int labelId) { this.value = value; - this.description = description; - } - - public String getDescription() { - return this.description; + this.defaultLabel = defaultLabel; + this.labelId = labelId; } + @Override public Integer getValue() { return value; } + @Override + public String getDefaultLabel() { + return defaultLabel; + } + + @Override + public Integer getLabelId() { + return labelId; + } + public static String getDefaultLabelByValue(Integer value) { Optional optional = Arrays.stream(UserStatusEnum.values()).filter(r -> r.getValue().equals(value)).findFirst(); - return optional.isPresent() ? optional.get().description : ""; + return optional.isPresent() ? optional.get().defaultLabel : ""; } public static List> getList() { @@ -58,7 +61,7 @@ public enum UserStatusEnum { .map(v -> { Map m = new HashMap(); m.put("id", v.value.toString()); - m.put("content", v.description); + m.put("content", v.defaultLabel); return m; }).collect(Collectors.toList()); } @@ -88,7 +91,7 @@ public enum UserStatusEnum { public static List getHrmStatusList() { return Arrays.stream(UserStatusEnum.values()) .filter(v -> v != INVALID) - .map(v -> HrmStatus.builder().id(v.value.toString()).name(v.description).build()).collect(Collectors.toList()); + .map(v -> HrmStatus.builder().id(v.value.toString()).name(v.defaultLabel).build()).collect(Collectors.toList()); } diff --git a/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java b/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java index 434d9f36e..963b1c8d4 100644 --- a/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java +++ b/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java @@ -64,7 +64,7 @@ public class RecordsBuildServiceImpl extends Service implements RecordsBuildServ record.put("department", simpleEmployee.getDepartmentName()); record.put("supplementaryMonth", item.getSupplementaryMonth()); record.put("mobile", simpleEmployee.getMobile()); - record.put("employeeStatus", simpleEmployee.getStatus() != null ? UserStatusEnum.values()[Integer.parseInt(simpleEmployee.getStatus())].getDescription() : ""); + record.put("employeeStatus", simpleEmployee.getStatus() != null ? UserStatusEnum.values()[Integer.parseInt(simpleEmployee.getStatus())].getDefaultLabel() : ""); ResourceFromEnum from = SalaryEnumUtil.enumMatchByValue(item.getResourceFrom(), ResourceFromEnum.values(), ResourceFromEnum.class); record.put("sourceFrom", SalaryI18nUtil.getI18nLabel(from.getLabelId(), from.getDefaultLabel())); record.put("socialPayOrg", paymentMap.get(item.getSocialPayOrg()) == null ? "" : paymentMap.get(item.getSocialPayOrg()).getName()); diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index dec5e0066..cf07d72e4 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -463,12 +463,12 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { List> permissions = new ArrayList<>(); for (int i = 0; i < records.size(); i++) { List permission = new ArrayList<>(); - if (UserStatusEnum.DEPARTURE.getDescription().equals(records.get(i).get("status"))) { + if (UserStatusEnum.DEPARTURE.getDefaultLabel().equals(records.get(i).get("status"))) { permission.add(new Permission(true, false)); permission.add(new Permission(false, false)); permissions.add(permission); } - if (UserStatusEnum.DEPARTURE.getDescription().equals(records.get(i).get("status"))) { + if (UserStatusEnum.DEPARTURE.getDefaultLabel().equals(records.get(i).get("status"))) { permission.add(new Permission(false, false)); permission.add(new Permission(true, false)); permissions.add(permission); diff --git a/src/com/engine/salary/service/impl/SIImportServiceImpl.java b/src/com/engine/salary/service/impl/SIImportServiceImpl.java index 1584d2278..7cbc6498c 100644 --- a/src/com/engine/salary/service/impl/SIImportServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIImportServiceImpl.java @@ -239,7 +239,7 @@ public class SIImportServiceImpl extends Service implements SIImportService { map.put(SalaryI18nUtil.getI18nLabel( 85429, "姓名"), item.getUserName()); map.put(SalaryI18nUtil.getI18nLabel( 86185, "部门"), item.getDepartmentName()); map.put(SalaryI18nUtil.getI18nLabel( 86186, "手机号"), item.getTelephone()); - map.put(SalaryI18nUtil.getI18nLabel( 86187, "员工状态"), item.getUserStatusEnum() == null ? "" : item.getUserStatusEnum().getDescription()); + map.put(SalaryI18nUtil.getI18nLabel( 86187, "员工状态"), item.getUserStatusEnum() == null ? "" : item.getUserStatusEnum().getDefaultLabel()); if (socialItem != null) { map.put(SalaryI18nUtil.getI18nLabel( 91323, "社保方案名称"), schemeMap.get(socialItem.getSocialSchemeId())); map.put(SalaryI18nUtil.getI18nLabel( 91325, "社保缴纳组织"), paymentMap.get(socialItem.getPaymentOrganization())); diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java index f3da9ffcd..8aac0db91 100644 --- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java @@ -670,7 +670,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { UserStatusEnum[] values = UserStatusEnum.values(); for (UserStatusEnum value : values) { if (value.getValue().equals(Integer.valueOf(userState))) { - return value.getDescription() + ""; + return value.getDefaultLabel() + ""; } } return userState; diff --git a/src/com/engine/salary/util/ResponseResult.java b/src/com/engine/salary/util/ResponseResult.java index fe09c3efe..14f2117cd 100644 --- a/src/com/engine/salary/util/ResponseResult.java +++ b/src/com/engine/salary/util/ResponseResult.java @@ -19,6 +19,14 @@ import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; +/** + * 请求执行器 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ @Slf4j public class ResponseResult { diff --git a/src/com/engine/salary/util/SalaryEnumUtil.java b/src/com/engine/salary/util/SalaryEnumUtil.java index 1ae3fe723..cf2abcd2c 100644 --- a/src/com/engine/salary/util/SalaryEnumUtil.java +++ b/src/com/engine/salary/util/SalaryEnumUtil.java @@ -11,7 +11,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * 枚举国家局 + * 枚举工具类 *

Copyright: Copyright (c) 2022

*

Company: 泛微软件

* diff --git a/src/com/engine/salary/web/SalaryItemController.java b/src/com/engine/salary/web/SalaryItemController.java index fc3c8d738..4ced22fbd 100644 --- a/src/com/engine/salary/web/SalaryItemController.java +++ b/src/com/engine/salary/web/SalaryItemController.java @@ -56,7 +56,7 @@ public class SalaryItemController { @Produces(MediaType.APPLICATION_JSON) public String listSalaryItem(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalaryItemSearchParam searchParam) { User user = HrmUserVarify.getUser(request, response); - return new ResponseResult>(user).run(getSalaryItemWrapper(user)::listPageV2, searchParam); + return new ResponseResult>(user).run(getSalaryItemWrapper(user)::listPage, searchParam); } diff --git a/src/com/engine/salary/wrapper/SalaryItemWrapper.java b/src/com/engine/salary/wrapper/SalaryItemWrapper.java index f390df6e4..2d4e42ae6 100644 --- a/src/com/engine/salary/wrapper/SalaryItemWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryItemWrapper.java @@ -71,7 +71,7 @@ public class SalaryItemWrapper extends Service { * @param searchParam 查询参数 * @return */ - public PageInfo listPageV2(SalaryItemSearchParam searchParam) { + public PageInfo listPage(SalaryItemSearchParam searchParam) { // 1、查询薪资项目 PageInfo page = getSalaryItemService(user).listPageByParam(searchParam); @@ -89,8 +89,11 @@ public class SalaryItemWrapper extends Service { //2、填充公式内容 Set formulaIds = SalaryEntityUtil.properties(salaryItemList, SalaryItemPO::getFormulaId); List expressFormulas = getSalaryFormulaService(user).listExpressFormula(formulaIds); + // 查询系统薪资项目 + Set sysSalaryItemIds = SalaryEntityUtil.properties(salaryItemList, SalaryItemPO::getSysSalaryItemId); + List sysSalaryItemPOS = getSysSalaryItemService(user).listByIds(sysSalaryItemIds); // 转换成薪资项目列表dto - List salaryItemListDTOS = SalaryItemBO.convert2ListDTO(salaryItemList, expressFormulas); + List salaryItemListDTOS = SalaryItemBO.convert2ListDTO(salaryItemList, expressFormulas, sysSalaryItemPOS); //3、被引用的薪资项目不能删除 Set salaryItemIds = SalaryEntityUtil.properties(salaryItemList, SalaryItemPO::getId); salarySobItems = getSalarySobItemService(user).listBySalaryItemIds(salaryItemIds); @@ -124,7 +127,7 @@ public class SalaryItemWrapper extends Service { // 排除被引用的薪资项目（被引用的薪资项目不可以删除） searchParam.setExcludeIds(salaryItemIds); // 转换成前端所需的数据格式 - return listPageV2(searchParam); + return listPage(searchParam); } @@ -142,8 +145,11 @@ public class SalaryItemWrapper extends Service { // 查询公式详情 Set formulaIds = SalaryEntityUtil.properties(salaryItemPOS, SalaryItemPO::getFormulaId); List expressFormulas = getSalaryFormulaService(user).listExpressFormula(formulaIds); + // 查询系统薪资项目 + Set sysSalaryItemIds = SalaryEntityUtil.properties(salaryItemPOS, SalaryItemPO::getSysSalaryItemId); + List sysSalaryItemPOS = getSysSalaryItemService(user).listByIds(sysSalaryItemIds); // 转换成薪资项目列表dto - return SalaryItemBO.convert2ListDTO(salaryItemPOS, expressFormulas); + return SalaryItemBO.convert2ListDTO(salaryItemPOS, expressFormulas, sysSalaryItemPOS); } /** diff --git a/src/com/engine/salary/wrapper/SalarySobItemWrapper.java b/src/com/engine/salary/wrapper/SalarySobItemWrapper.java index fce048769..66ca94f2b 100644 --- a/src/com/engine/salary/wrapper/SalarySobItemWrapper.java +++ b/src/com/engine/salary/wrapper/SalarySobItemWrapper.java @@ -9,17 +9,12 @@ import com.engine.salary.entity.salaryitem.bo.SalaryItemBO; import com.engine.salary.entity.salaryitem.dto.SalaryItemListDTO; import com.engine.salary.entity.salaryitem.param.SalaryItemSearchParam; import com.engine.salary.entity.salaryitem.po.SalaryItemPO; +import com.engine.salary.entity.salaryitem.po.SysSalaryItemPO; import com.engine.salary.entity.salarysob.dto.SalarySobItemAggregateDTO; import com.engine.salary.entity.salarysob.param.SalarySobItemSaveParam; import com.engine.salary.entity.salarysob.po.SalarySobItemGroupPO; -import com.engine.salary.service.SalaryFormulaService; -import com.engine.salary.service.SalaryItemService; -import com.engine.salary.service.SalarySobItemGroupService; -import com.engine.salary.service.SalarySobItemService; -import com.engine.salary.service.impl.SalaryFormulaServiceImpl; -import com.engine.salary.service.impl.SalaryItemServiceImpl; -import com.engine.salary.service.impl.SalarySobItemGroupServiceImpl; -import com.engine.salary.service.impl.SalarySobItemServiceImpl; +import com.engine.salary.service.*; +import com.engine.salary.service.impl.*; import com.engine.salary.util.SalaryEntityUtil; import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.page.PageInfo; @@ -41,20 +36,24 @@ import java.util.*; public class SalarySobItemWrapper extends Service { private SalarySobItemService getSalarySobItemService(User user) { - return (SalarySobItemService) ServiceUtil.getService(SalarySobItemServiceImpl.class, user); + return ServiceUtil.getService(SalarySobItemServiceImpl.class, user); } private SalarySobItemGroupService getSalarySobItemGroupService(User user) { - return (SalarySobItemGroupService) ServiceUtil.getService(SalarySobItemGroupServiceImpl.class, user); + return ServiceUtil.getService(SalarySobItemGroupServiceImpl.class, user); } private SalaryItemService getSalaryItemService(User user) { - return (SalaryItemService) ServiceUtil.getService(SalaryItemServiceImpl.class, user); + return ServiceUtil.getService(SalaryItemServiceImpl.class, user); } private SalaryFormulaService getSalaryFormulaService(User user) { - return (SalaryFormulaService) ServiceUtil.getService(SalaryFormulaServiceImpl.class, user); + return ServiceUtil.getService(SalaryFormulaServiceImpl.class, user); + } + + private SysSalaryItemService getSysSalaryItemService(User user) { + return ServiceUtil.getService(SysSalaryItemServiceImpl.class, user); } /** @@ -78,8 +77,11 @@ public class SalarySobItemWrapper extends Service { // 查询公式 Set formulaIds = SalaryEntityUtil.properties(salaryItemList, SalaryItemPO::getFormulaId); List expressFormulas = getSalaryFormulaService(user).listExpressFormula(formulaIds); + // 查询系统薪资项目 + Set sysSalaryItemIds = SalaryEntityUtil.properties(salaryItemList, SalaryItemPO::getSysSalaryItemId); + List sysSalaryItemPOS = getSysSalaryItemService(user).listByIds(sysSalaryItemIds); // 转换成薪资项目列表dto - dtoPage.setList(SalaryItemBO.convert2ListDTO(salaryItemList, expressFormulas)); + dtoPage.setList(SalaryItemBO.convert2ListDTO(salaryItemList, expressFormulas, sysSalaryItemPOS)); } return dtoPage; @@ -117,6 +119,7 @@ public class SalarySobItemWrapper extends Service { /** * 基础信息浏览按钮（下拉框） + * * @return */ public Collection> empFieldList() {