qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复社保福利新建时没有小数位和进位规则对应问题

This commit is contained in:
钱涛 2024-05-08 10:49:08 +08:00
parent 6b0606f5a4
commit 6f2d65a4be
9 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/engine/salary/biz/SISchemeBiz.java
View File

@ -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")

1
src/com/engine/salary/cmd/sischeme/SISchemeCopyCmd.java
View File

@ -16,6 +16,7 @@ import java.util.Map;
* @Date 2022/3/8
* @Version V1.0
**/
@Deprecated
public class SISchemeCopyCmd extends AbstractCommonCommand<Map<String, Object>> {
public SISchemeCopyCmd(Map<String, Object> params, User user) {

1
src/com/engine/salary/cmd/sischeme/SISchemeDeleteCmd.java
View File

@ -19,6 +19,7 @@ import java.util.Map;
* @Date 2022/3/8
* @Version V1.0
**/
@Deprecated
public class SISchemeDeleteCmd extends AbstractCommonCommand<Map<String, Object>> {
public SISchemeDeleteCmd(Map<String, Object> params, User user) {

1
src/com/engine/salary/cmd/sischeme/SISchemeGetFormCmd.java
View File

@ -19,6 +19,7 @@ import java.util.Objects;
* @Date 2022/3/7
* @Version V1.0
**/
@Deprecated
public class SISchemeGetFormCmd extends AbstractCommonCommand<Map<String, Object>> {
public SISchemeGetFormCmd(Map<String, Object> params, User user) {

1
src/com/engine/salary/cmd/sischeme/SISchemeInsertCmd.java
View File

@ -16,6 +16,7 @@ import java.util.Map;
* @Date 2022/3/8
* @Version V1.0
**/
@Deprecated
public class SISchemeInsertCmd extends AbstractCommonCommand<Map<String, Object>> {
public SISchemeInsertCmd(Map<String, Object> params, User user) {

1
src/com/engine/salary/cmd/sischeme/SISchemeListCmd.java
View File

@ -17,6 +17,7 @@ import java.util.Objects;
* @Date 2022/3/10
* @Version V1.0
**/
@Deprecated
public class SISchemeListCmd extends AbstractCommonCommand<Map<String, Object>> {
public SISchemeListCmd(Map<String, Object> params, User user) {

1
src/com/engine/salary/cmd/sischeme/SISchemeUpdateCmd.java
View File

@ -16,6 +16,7 @@ import java.util.Map;
* @Date 2022/3/8
* @Version V1.0
**/
@Deprecated
public class SISchemeUpdateCmd extends AbstractCommonCommand<Map<String, Object>> {
public SISchemeUpdateCmd(Map<String, Object> params, User user) {

9
src/com/engine/salary/enums/sicategory/RententionRuleEnum.java
View File

@ -6,14 +6,7 @@ import com.engine.salary.enums.BaseEnum;
import java.math.BigDecimal;
import java.util.Arrays;
/**
* 进位规则枚举
* <p>Copyright: Copyright (c) 2022</p>
* <p>Company: 泛微软件</p>
*
* @author qiantao
* @version 1.0
**/
@Deprecated
public enum RententionRuleEnum implements BaseEnum<Integer> {
ROUND(BigDecimal.ROUND_HALF_UP, "四舍五入", 84505),
CEIL(BigDecimal.ROUND_UP, "向上舍入", 84506),

6
src/com/engine/salary/service/impl/SISchemeServiceImpl.java
View File

@ -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<String, Object> getForm(Map<String, Object> params) {
// return commandExecutor.execute(new SISchemeGetFormCmd(params, user));
Map<String, Object> 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")