From 6f2d65a4be175599ea0ea7c0d27c9970bba36f78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Wed, 8 May 2024 10:49:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A4=BE=E4=BF=9D=E7=A6=8F?= =?UTF-8?q?=E5=88=A9=E6=96=B0=E5=BB=BA=E6=97=B6=E6=B2=A1=E6=9C=89=E5=B0=8F?= =?UTF-8?q?=E6=95=B0=E4=BD=8D=E5=92=8C=E8=BF=9B=E4=BD=8D=E8=A7=84=E5=88=99?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/SISchemeBiz.java | 4 +++- src/com/engine/salary/cmd/sischeme/SISchemeCopyCmd.java | 1 + .../engine/salary/cmd/sischeme/SISchemeDeleteCmd.java | 1 + .../engine/salary/cmd/sischeme/SISchemeGetFormCmd.java | 1 + .../engine/salary/cmd/sischeme/SISchemeInsertCmd.java | 1 + src/com/engine/salary/cmd/sischeme/SISchemeListCmd.java | 1 + .../engine/salary/cmd/sischeme/SISchemeUpdateCmd.java | 1 + .../salary/enums/sicategory/RententionRuleEnum.java | 9 +-------- .../engine/salary/service/impl/SISchemeServiceImpl.java | 6 +++--- 9 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/com/engine/salary/biz/SISchemeBiz.java b/src/com/engine/salary/biz/SISchemeBiz.java index 4079ebfab..686e617c8 100644 --- a/src/com/engine/salary/biz/SISchemeBiz.java +++ b/src/com/engine/salary/biz/SISchemeBiz.java @@ -11,6 +11,7 @@ import com.engine.salary.entity.sischeme.param.InsuranceSchemeReqParam; import com.engine.salary.entity.sischeme.po.InsuranceSchemeDetailPO; import com.engine.salary.entity.sischeme.po.InsuranceSchemePO; import com.engine.salary.entity.sischeme.vo.InsuranceSchemeFormVO; +import com.engine.salary.enums.SalaryRoundingModeEnum; import com.engine.salary.enums.sicategory.*; import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.mapper.siaccount.SIAccountUtilMapper; @@ -77,7 +78,8 @@ public class SISchemeBiz { .insuranceId(item.getId()) .insuranceName(item.getInsuranceName()) .paymentScope(e.getDefaultLabel()) - .rententionRule(String.valueOf(RententionRuleEnum.ROUND.getValue())) + .rententionRule(String.valueOf(SalaryRoundingModeEnum.ROUNDING.getValue())) + .validNum(2) .cycleSetting("000000000000") .paymentCycle("0") .accountType("0") diff --git a/src/com/engine/salary/cmd/sischeme/SISchemeCopyCmd.java b/src/com/engine/salary/cmd/sischeme/SISchemeCopyCmd.java index aa03b71f1..f00e56950 100644 --- a/src/com/engine/salary/cmd/sischeme/SISchemeCopyCmd.java +++ b/src/com/engine/salary/cmd/sischeme/SISchemeCopyCmd.java @@ -16,6 +16,7 @@ import java.util.Map; * @Date 2022/3/8 * @Version V1.0 **/ +@Deprecated public class SISchemeCopyCmd extends AbstractCommonCommand> { public SISchemeCopyCmd(Map params, User user) { diff --git a/src/com/engine/salary/cmd/sischeme/SISchemeDeleteCmd.java b/src/com/engine/salary/cmd/sischeme/SISchemeDeleteCmd.java index f2fc0dec4..488989936 100644 --- a/src/com/engine/salary/cmd/sischeme/SISchemeDeleteCmd.java +++ b/src/com/engine/salary/cmd/sischeme/SISchemeDeleteCmd.java @@ -19,6 +19,7 @@ import java.util.Map; * @Date 2022/3/8 * @Version V1.0 **/ +@Deprecated public class SISchemeDeleteCmd extends AbstractCommonCommand> { public SISchemeDeleteCmd(Map params, User user) { diff --git a/src/com/engine/salary/cmd/sischeme/SISchemeGetFormCmd.java b/src/com/engine/salary/cmd/sischeme/SISchemeGetFormCmd.java index d497c4c30..eb75b5ef1 100644 --- a/src/com/engine/salary/cmd/sischeme/SISchemeGetFormCmd.java +++ b/src/com/engine/salary/cmd/sischeme/SISchemeGetFormCmd.java @@ -19,6 +19,7 @@ import java.util.Objects; * @Date 2022/3/7 * @Version V1.0 **/ +@Deprecated public class SISchemeGetFormCmd extends AbstractCommonCommand> { public SISchemeGetFormCmd(Map params, User user) { diff --git a/src/com/engine/salary/cmd/sischeme/SISchemeInsertCmd.java b/src/com/engine/salary/cmd/sischeme/SISchemeInsertCmd.java index fbbe0918f..b4a554fba 100644 --- a/src/com/engine/salary/cmd/sischeme/SISchemeInsertCmd.java +++ b/src/com/engine/salary/cmd/sischeme/SISchemeInsertCmd.java @@ -16,6 +16,7 @@ import java.util.Map; * @Date 2022/3/8 * @Version V1.0 **/ +@Deprecated public class SISchemeInsertCmd extends AbstractCommonCommand> { public SISchemeInsertCmd(Map params, User user) { diff --git a/src/com/engine/salary/cmd/sischeme/SISchemeListCmd.java b/src/com/engine/salary/cmd/sischeme/SISchemeListCmd.java index f3657cdb2..44153bd57 100644 --- a/src/com/engine/salary/cmd/sischeme/SISchemeListCmd.java +++ b/src/com/engine/salary/cmd/sischeme/SISchemeListCmd.java @@ -17,6 +17,7 @@ import java.util.Objects; * @Date 2022/3/10 * @Version V1.0 **/ +@Deprecated public class SISchemeListCmd extends AbstractCommonCommand> { public SISchemeListCmd(Map params, User user) { diff --git a/src/com/engine/salary/cmd/sischeme/SISchemeUpdateCmd.java b/src/com/engine/salary/cmd/sischeme/SISchemeUpdateCmd.java index ae59e4d39..7910223e4 100644 --- a/src/com/engine/salary/cmd/sischeme/SISchemeUpdateCmd.java +++ b/src/com/engine/salary/cmd/sischeme/SISchemeUpdateCmd.java @@ -16,6 +16,7 @@ import java.util.Map; * @Date 2022/3/8 * @Version V1.0 **/ +@Deprecated public class SISchemeUpdateCmd extends AbstractCommonCommand> { public SISchemeUpdateCmd(Map params, User user) { diff --git a/src/com/engine/salary/enums/sicategory/RententionRuleEnum.java b/src/com/engine/salary/enums/sicategory/RententionRuleEnum.java index 0605dfa67..c48ebd3fb 100644 --- a/src/com/engine/salary/enums/sicategory/RententionRuleEnum.java +++ b/src/com/engine/salary/enums/sicategory/RententionRuleEnum.java @@ -6,14 +6,7 @@ import com.engine.salary.enums.BaseEnum; import java.math.BigDecimal; import java.util.Arrays; -/** - * 进位规则枚举 - *

Copyright: Copyright (c) 2022

- *

Company: 泛微软件

- * - * @author qiantao - * @version 1.0 - **/ +@Deprecated public enum RententionRuleEnum implements BaseEnum { ROUND(BigDecimal.ROUND_HALF_UP, "四舍五入", 84505), CEIL(BigDecimal.ROUND_UP, "向上舍入", 84506), diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java index d7483d542..1046dbdb4 100644 --- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java @@ -34,6 +34,7 @@ import com.engine.salary.entity.taxagent.param.TaxAgentManageRangeSaveParam; import com.engine.salary.entity.taxagent.param.TaxAgentRangeSaveParam; import com.engine.salary.entity.taxagent.po.TaxAgentPO; import com.engine.salary.enums.OperateTypeEnum; +import com.engine.salary.enums.SalaryRoundingModeEnum; import com.engine.salary.enums.UserStatusEnum; import com.engine.salary.enums.salarysob.TargetTypeEnum; import com.engine.salary.enums.siaccount.EmployeeStatusEnum; @@ -177,7 +178,6 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { @Override public Map getForm(Map params) { -// return commandExecutor.execute(new SISchemeGetFormCmd(params, user)); Map apidatas = new HashMap<>(16); Long id = null; @@ -185,7 +185,6 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { id =Long.valueOf(Util.null2String(params.get("id"))); } WelfareTypeEnum welfareTypeEnum = (WelfareTypeEnum)params.get("welfareTypeEnum"); -// InsuranceSchemeFormVO form = siSchemeBiz.getForm(id, welfareTypeEnum); InsuranceSchemeFormVO form = getForm(id, welfareTypeEnum); apidatas.put("form",form); //记录操作日志 @@ -2308,7 +2307,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { .insuranceId(item.getId()) .insuranceName(item.getInsuranceName()) .paymentScope(e.getDefaultLabel()) - .rententionRule(String.valueOf(RententionRuleEnum.ROUND.getValue())) + .rententionRule(String.valueOf(SalaryRoundingModeEnum.ROUNDING.getValue())) + .validNum(2) .cycleSetting("000000000000") .paymentCycle("0") .accountType("0")