From 44ed332ed55d7511da5b1f0a1307653499428ffb Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Mon, 8 Apr 2024 17:57:59 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Decology=E7=9A=84=E5=A4=9A?= =?UTF-8?q?=E8=AF=AD=E8=A8=80=E5=AF=BC=E8=87=B4=E4=B9=B1=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/SalarySendInfoBiz.java | 8 ++++++-- .../entity/salaryBill/dto/SalarySendDetailListDTO.java | 3 +++ .../entity/salaryBill/dto/SalarySendInfoListDTO.java | 3 +++ .../entity/siarchives/po/InsuranceArchivesEmployeePO.java | 6 ++++++ .../engine/salary/entity/siexport/po/AccountExportPO.java | 4 +++- .../service/impl/SIAComparisonResultServiceImpl.java | 2 ++ .../engine/salary/service/impl/SIAccountServiceImpl.java | 1 + .../engine/salary/service/impl/SIArchivesServiceImpl.java | 1 + .../engine/salary/service/impl/SIExportServiceImpl.java | 1 + .../engine/salary/service/impl/SISchemeServiceImpl.java | 1 + 10 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/com/engine/salary/biz/SalarySendInfoBiz.java b/src/com/engine/salary/biz/SalarySendInfoBiz.java index a15aa7f02..df1bca38d 100644 --- a/src/com/engine/salary/biz/SalarySendInfoBiz.java +++ b/src/com/engine/salary/biz/SalarySendInfoBiz.java @@ -8,6 +8,7 @@ import com.engine.salary.entity.salaryBill.param.SalarySendDetailQueryParam; import com.engine.salary.entity.salaryBill.param.SalarySendInfoQueryParam; import com.engine.salary.entity.salaryBill.po.SalarySendInfoPO; import com.engine.salary.mapper.salarybill.SalarySendInfoMapper; +import com.engine.salary.util.SalaryI18nUtil; import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; import org.apache.ibatis.annotations.Param; @@ -27,7 +28,8 @@ public class SalarySendInfoBiz { SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { SalarySendInfoMapper mapper = sqlSession.getMapper(SalarySendInfoMapper.class); - return mapper.list(param); + List list = mapper.list(param); + return SalaryI18nUtil.i18nList(list); } finally { sqlSession.close(); } @@ -92,7 +94,9 @@ public class SalarySendInfoBiz { SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { SalarySendInfoMapper mapper = sqlSession.getMapper(SalarySendInfoMapper.class); - return mapper.detailList(param, otherSalaryAccRecordIds); + List detailList = mapper.detailList(param, otherSalaryAccRecordIds); + SalaryI18nUtil.i18nList(detailList); + return detailList; } finally { sqlSession.close(); } diff --git a/src/com/engine/salary/entity/salaryBill/dto/SalarySendDetailListDTO.java b/src/com/engine/salary/entity/salaryBill/dto/SalarySendDetailListDTO.java index e18392e20..4e87a6ad8 100644 --- a/src/com/engine/salary/entity/salaryBill/dto/SalarySendDetailListDTO.java +++ b/src/com/engine/salary/entity/salaryBill/dto/SalarySendDetailListDTO.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.salaryBill.dto; +import com.engine.salary.annotation.I18n; import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum; import lombok.AllArgsConstructor; import lombok.Builder; @@ -38,12 +39,14 @@ public class SalarySendDetailListDTO { private String email; // 姓名") + @I18n private String username; // 个税扣缴义务人") private String taxAgent; // 部门") + @I18n private String department; // 手机号") diff --git a/src/com/engine/salary/entity/salaryBill/dto/SalarySendInfoListDTO.java b/src/com/engine/salary/entity/salaryBill/dto/SalarySendInfoListDTO.java index 5eb79677b..9bc3753a6 100644 --- a/src/com/engine/salary/entity/salaryBill/dto/SalarySendInfoListDTO.java +++ b/src/com/engine/salary/entity/salaryBill/dto/SalarySendInfoListDTO.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.salaryBill.dto; +import com.engine.salary.annotation.I18n; import com.engine.salary.annotation.TableTitle; import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -26,6 +27,7 @@ public class SalarySendInfoListDTO { private Long employeeId; @TableTitle(title = "姓名", dataIndex = "username", key = "username") + @I18n private String username; @@ -35,6 +37,7 @@ public class SalarySendInfoListDTO { @TableTitle(title = "部门", dataIndex = "department", key = "department") + @I18n private String department; diff --git a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesEmployeePO.java b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesEmployeePO.java index fe5df5c44..2aa206984 100644 --- a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesEmployeePO.java +++ b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesEmployeePO.java @@ -1,5 +1,6 @@ package com.engine.salary.entity.siarchives.po; +import com.engine.salary.annotation.I18n; import com.engine.salary.enums.UserStatusEnum; import lombok.AllArgsConstructor; import lombok.Builder; @@ -26,6 +27,7 @@ public class InsuranceArchivesEmployeePO { */ private Long paymentOrganization; + @I18n private String userName; private BigDecimal departmentId; @@ -34,12 +36,16 @@ public class InsuranceArchivesEmployeePO { private String telephone; + @I18n private String departmentName; + /** * 分部 */ + @I18n private String subcompanyName; + private BigDecimal position; private Integer userStatus; diff --git a/src/com/engine/salary/entity/siexport/po/AccountExportPO.java b/src/com/engine/salary/entity/siexport/po/AccountExportPO.java index 0207e01c3..574c08b5c 100644 --- a/src/com/engine/salary/entity/siexport/po/AccountExportPO.java +++ b/src/com/engine/salary/entity/siexport/po/AccountExportPO.java @@ -1,7 +1,7 @@ package com.engine.salary.entity.siexport.po; +import com.engine.salary.annotation.I18n; import com.engine.salary.entity.siaccount.po.InsuranceAccountDetailPO; -import com.engine.salary.enums.UserStatusEnum; /** * @Author weaver_cl @@ -11,10 +11,12 @@ import com.engine.salary.enums.UserStatusEnum; **/ public class AccountExportPO extends InsuranceAccountDetailPO { + @I18n private String userName; private String telephone; + @I18n private String departmentName; private Integer userStatus; diff --git a/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java b/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java index 05512c23c..79f3ee877 100644 --- a/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java @@ -23,6 +23,7 @@ import com.engine.salary.service.SISchemeService; import com.engine.salary.sys.entity.vo.OrderRuleVO; import com.engine.salary.sys.service.SalarySysConfService; import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl; +import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.excel.ExcelUtilPlus; import com.engine.salary.util.page.Column; @@ -161,6 +162,7 @@ public class SIAComparisonResultServiceImpl extends Service implements SIACompar //非系统人员核算明细 List extAccountExportPOS = getInsuranceExportMapper().exportExtAccount(queryParam.getPaymentStatus(), insuranceExportParam); accountExportPOS.addAll(extAccountExportPOS); + SalaryI18nUtil.i18nList(accountExportPOS); //如果入参包含姓名信息 if (queryParam.getUserName() != null) { accountExportPOS = accountExportPOS.stream().filter(v -> v.getUserName().contains(queryParam.getUserName())).collect(Collectors.toList()); diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index 1c9521882..2b54dc5dc 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -1633,6 +1633,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { List extAccountExportPOS = getInsuranceExportMapper().exportExtAccount(PaymentStatusEnum.COMMON.getValue(), exportParam); accountExportPOS.addAll(extAccountExportPOS); encryptUtil.decryptList(accountExportPOS, AccountExportPO.class); + SalaryI18nUtil.i18nList(accountExportPOS); // 数据组装 List> records = getSIExportService(user).buildCommonRecords(accountExportPOS); diff --git a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java index 811127514..db58874a0 100644 --- a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java @@ -3568,6 +3568,7 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService pageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), page, InsuranceArchivesEmployeePO.class); } + SalaryI18nUtil.i18nList(pageInfo.getList()); List> records = null; log.info("buildTableData方法处理福利档案列表数据开始"); sw.start("buildTableData方法处理福利档案列表数据"); diff --git a/src/com/engine/salary/service/impl/SIExportServiceImpl.java b/src/com/engine/salary/service/impl/SIExportServiceImpl.java index 3c2ab86c4..b8fe30f57 100644 --- a/src/com/engine/salary/service/impl/SIExportServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIExportServiceImpl.java @@ -208,6 +208,7 @@ public class SIExportServiceImpl extends Service implements SIExportService { // } encryptUtil.decryptList(accountExportPOS, AccountExportPO.class); + SalaryI18nUtil.i18nList(accountExportPOS); List columns = new ArrayList<>(); List> records = new ArrayList<>(); // if (Objects.equals(PaymentStatusEnum.COMMON.getValue(), paymentStatus)) { diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java index 66945d79b..d7483d542 100644 --- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java @@ -590,6 +590,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { if (insuranceArchivesEmployeePOS == null) { insuranceArchivesEmployeePOS = new ArrayList<>(); } + SalaryI18nUtil.i18nList(insuranceArchivesEmployeePOS); List> records = buildTableData(insuranceArchivesEmployeePOS); List columns = buildWeaTableColumns(insuranceArchivesEmployeePOS, (long) user.getUID()); From 6a05269b2d15a8f9e80ad5d65eeade58ca854365 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Wed, 10 Apr 2024 14:20:30 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A4=84=E7=90=86LIKE=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/util/valid/ValidUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/engine/salary/util/valid/ValidUtil.java b/src/com/engine/salary/util/valid/ValidUtil.java index 8c0d0932d..569987ba2 100644 --- a/src/com/engine/salary/util/valid/ValidUtil.java +++ b/src/com/engine/salary/util/valid/ValidUtil.java @@ -232,7 +232,7 @@ public class ValidUtil { .replace("ｉｎ", "in") .replace("ＩＮ", "IN") .replace("ｌｉｋｅ", "like") - .replace("ＬＩＫＥ", "like") + .replace("ＬＩＫＥ", "LIKE") .replace("ｅｘｉｓｔｓ", "exists") .replace("ＥＸＩＳＴＳ", "EXISTS") .replace("ｂｅｔｗｅｅｎ", "between") From 23eba4950b6e1adcc97c2c4cb0f7581ded7f2ff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 11 Apr 2024 15:23:23 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A4=84=E7=90=86pdf=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SalaryBillServiceImpl.java | 6 ++++- .../engine/salary/util/SalaryEntityUtil.java | 25 +++++++++++++++---- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/src/com/engine/salary/service/impl/SalaryBillServiceImpl.java b/src/com/engine/salary/service/impl/SalaryBillServiceImpl.java index 755768cc2..143c1d67a 100644 --- a/src/com/engine/salary/service/impl/SalaryBillServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryBillServiceImpl.java @@ -255,8 +255,12 @@ public class SalaryBillServiceImpl extends Service implements SalaryBillService LocalRunnable localRunnable = new LocalRunnable() { @Override public void execute() { + // 获取人员完整信息 + Map allEmployeeMap = getEmployeeWholeInfo(enableSendList); //生成工资单pdf enableSendList.forEach(e -> { + // 构建人员信息 + SalaryBillBO.buildEmployeeInfo(salaryBillSendParam, allEmployeeMap.get(e.get("employeeId").toString())); SalaryBillBO.genPdf(e, salaryBillSendParam); }); @@ -574,7 +578,7 @@ public class SalaryBillServiceImpl extends Service implements SalaryBillService SalaryBillBO.sendMsg(salaryBillSendParam, Long.valueOf(e.get("id").toString()), Long.valueOf(e.get("employeeId").toString())); } - if (sendChannels.contains(MessageChannelEnum.EMAIL) || sendChannels.contains(MessageChannelEnum.SMS) || GEN_PDF) { + if (sendChannels.contains(MessageChannelEnum.EMAIL) || sendChannels.contains(MessageChannelEnum.SMS)) { // 构建人员信息 SalaryBillBO.buildEmployeeInfo(salaryBillSendParam, allEmployeeMap.get(e.get("employeeId").toString())); diff --git a/src/com/engine/salary/util/SalaryEntityUtil.java b/src/com/engine/salary/util/SalaryEntityUtil.java index 3cc5fe7dd..0b2a6d474 100644 --- a/src/com/engine/salary/util/SalaryEntityUtil.java +++ b/src/com/engine/salary/util/SalaryEntityUtil.java @@ -208,25 +208,40 @@ public class SalaryEntityUtil { } + /** + * 进位规则 + * @param newScale 小数位 + * @param rententionRule 进位规则 + * @param value 值 + * @return + */ public static BigDecimal carryRule(Integer newScale, Integer rententionRule, BigDecimal value) { - //四舍五入 RoundingMode roundingMode = RoundingMode.HALF_UP; + //原始数据 + if (Objects.equals(rententionRule, SalaryRoundingModeEnum.RAW_DATA.getValue())) { + roundingMode = RoundingMode.DOWN; + } + //四舍五入 + if (Objects.equals(rententionRule, SalaryRoundingModeEnum.ROUNDING.getValue())) { + roundingMode = RoundingMode.HALF_UP; + } //向上舍入 - if (Objects.equals(rententionRule, 3)) { + if (Objects.equals(rententionRule, SalaryRoundingModeEnum.ROUND_UP.getValue())) { roundingMode = RoundingMode.UP; } //向下舍入 - if (Objects.equals(rententionRule, 4)) { + if (Objects.equals(rententionRule, SalaryRoundingModeEnum.ROUND_DOWN.getValue())) { roundingMode = RoundingMode.DOWN; } //见分取角（只取保留小数后一位向上舍入） - if (Objects.equals(rententionRule, 5)) { + if (Objects.equals(rententionRule, SalaryRoundingModeEnum.CEILING.getValue())) { value = value.setScale(newScale + 1, RoundingMode.FLOOR); roundingMode = RoundingMode.UP; } //向上取偶 if (Objects.equals(rententionRule, SalaryRoundingModeEnum.UP_EVEN.getValue())) { - value = value.setScale(0, RoundingMode.UP); + value = value.setScale(newScale, RoundingMode.UP); + int number = value.intValue(); if (number % 2 != 0) { value = value.add(BigDecimal.valueOf(1)); From 8d7d3c3ec32dc6748d86e12d706ac8209bf442d7 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Fri, 12 Apr 2024 15:06:32 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=9D=9E=E7=B3=BB=E7=BB=9F=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E9=83=A8=E9=97=A8id=E3=80=81=E5=88=86=E9=83=A8id?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/mapper/extemp/ExternalEmployeeMapper.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/com/engine/salary/mapper/extemp/ExternalEmployeeMapper.xml b/src/com/engine/salary/mapper/extemp/ExternalEmployeeMapper.xml index 663c370ed..f09431009 100644 --- a/src/com/engine/salary/mapper/extemp/ExternalEmployeeMapper.xml +++ b/src/com/engine/salary/mapper/extemp/ExternalEmployeeMapper.xml @@ -638,15 +638,11 @@ department_name=#{departmentName}, - department_id=#{departmentId}, - subcompany_name=#{subcompanyName}, - subcompany_id=#{subcompanyId}, - jobtitle_name=#{jobtitleName},