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

领悦 修改

This commit is contained in:
Harryxzy 2025-03-26 09:20:27 +08:00
parent f6b3845a83
commit 8814c7605e
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/engine/salary/entity/ly/po/LySalaryReportPO.java
View File

@ -76,15 +76,15 @@ public class LySalaryReportPO {
private String byyfJdndjx;
/**
* 本月应发_激励提成（经营）
* 本月应发_激励提成
*/
@Alias("本月应发_激励提成（经营）")
@Alias("本月应发_激励提成")
private String byyfJltcjy;
/**
* 本月应发_激励提成（市场）
* 本月应发_激励提成（市场） 修改为 代收代缴_社保/公积金补发补扣
*/
@Alias("本月应发_激励提成(市场）")
@Alias("代收代缴_社保公积金补发补扣")
private String byyfJltcsc;
/**

10
src/com/engine/salary/service/impl/LySalaryReportServiceImpl.java
View File

@ -301,7 +301,7 @@ public class LySalaryReportServiceImpl extends Service implements LySalaryReport
valueMap.put("ffgsqc", ffgsqc);
valueMap.put("fycdgsqc",fycdgsqc);
valueMap.put("znxmmc",znxmmc);
// 工资（含月度绩效）、福利等 = 应发合计-季度/年度绩效-激励提成(市场）-激励提成(经营）
// 工资（含月度绩效）、福利等 = 应发合计-季度/年度绩效-激励提成(市场）-激励提成(经营） 0325修改 不扣经营了
String yfhjValueStr = valueMap.getOrDefault(yfhjItemId.toString(), "0").toString();
BigDecimal yfhjValue = NumberUtils.isCreatable(yfhjValueStr) ? new BigDecimal(yfhjValueStr) : BigDecimal.valueOf(0);
String jdndjxValueStr = valueMap.getOrDefault(jdndjxItemId.toString(), "0").toString();
@ -310,7 +310,7 @@ public class LySalaryReportServiceImpl extends Service implements LySalaryReport
BigDecimal jltcscValue = NumberUtils.isCreatable(jltcscValueStr) ? new BigDecimal(jltcscValueStr) : BigDecimal.valueOf(0);
String jltcjyValueStr = valueMap.getOrDefault(jltcjyItemId.toString(), "0").toString();
BigDecimal jltcjyValue = NumberUtils.isCreatable(jltcjyValueStr) ? new BigDecimal(jltcjyValueStr) : BigDecimal.valueOf(0);
valueMap.put(gzfldItemId.toString(),yfhjValue.subtract(jdndjxValue).subtract(jltcscValue).subtract(jltcjyValue));
valueMap.put(gzfldItemId.toString(),yfhjValue.subtract(jdndjxValue).subtract(jltcscValue));
LySalaryReportPO build = LySalaryReportPO.builder()
.id(IdGenerator.generate())
@ -537,8 +537,7 @@ public class LySalaryReportServiceImpl extends Service implements LySalaryReport
byyfChildList.add(new WeaTableColumnGroup("150px", "应发合计", "byyfYfhj"));
byyfChildList.add(new WeaTableColumnGroup("150px", "月度绩效", "byyfYdjx"));
byyfChildList.add(new WeaTableColumnGroup("150px", "季度/年度绩效", "byyfJdndjx"));
byyfChildList.add(new WeaTableColumnGroup("150px", "激励提成（经营）", "byyfJltcjy"));
byyfChildList.add(new WeaTableColumnGroup("150px", "激励提成(市场）", "byyfJltcsc"));
byyfChildList.add(new WeaTableColumnGroup("150px", "激励提成", "byyfJltcjy"));
byyfChildList.add(new WeaTableColumnGroup("150px", "工资（含月度绩效）、福利等", "byyfGzfld"));
byyfGroup.setChildren(byyfChildList);
columns.add(byyfGroup);
@ -547,6 +546,7 @@ public class LySalaryReportServiceImpl extends Service implements LySalaryReport
List<WeaTableColumnGroup> dsdjChildList = new ArrayList<>();
dsdjChildList.add(new WeaTableColumnGroup("150px", "个人社保", "dsdjGrsb"));
dsdjChildList.add(new WeaTableColumnGroup("150px", "个人公积金", "dsdjGrgjj"));
dsdjChildList.add(new WeaTableColumnGroup("150px", "社保/公积金补发补扣", "byyfJltcsc"));
dsdjChildList.add(new WeaTableColumnGroup("150px", "个人所得税", "dsdjGrsds"));
dsdjGroup.setChildren(dsdjChildList);
columns.add(dsdjGroup);
@ -819,10 +819,10 @@ public class LySalaryReportServiceImpl extends Service implements LySalaryReport
row.add(lySalaryReportPO.getByyfYdjx() == null ? "" : lySalaryReportPO.getByyfYdjx());
row.add(lySalaryReportPO.getByyfJdndjx() == null ? "" : lySalaryReportPO.getByyfJdndjx());
row.add(lySalaryReportPO.getByyfJltcjy() == null ? "" : lySalaryReportPO.getByyfJltcjy());
row.add(lySalaryReportPO.getByyfJltcsc() == null ? "" : lySalaryReportPO.getByyfJltcsc());
row.add(lySalaryReportPO.getByyfGzfld() == null ? "" : lySalaryReportPO.getByyfGzfld());
row.add(lySalaryReportPO.getDsdjGrsb() == null ? "" : lySalaryReportPO.getDsdjGrsb());
row.add(lySalaryReportPO.getDsdjGrgjj() == null ? "" : lySalaryReportPO.getDsdjGrgjj());
row.add(lySalaryReportPO.getByyfJltcsc() == null ? "" : lySalaryReportPO.getByyfJltcsc());
row.add(lySalaryReportPO.getDsdjGrsds() == null ? "" : lySalaryReportPO.getDsdjGrsds());
row.add(lySalaryReportPO.getShkcxGz() == null ? "" : lySalaryReportPO.getShkcxGz());
row.add(lySalaryReportPO.getShkcxSdf() == null ? "" : lySalaryReportPO.getShkcxSdf());