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

路维光电调整

This commit is contained in:
Harry-xzy 2025-09-01 17:19:18 +08:00
parent e246b9a905
commit b1a4d77020
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7337,15 +7337,15 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
List<WeaTableColumnGroup> childrenGroup = new ArrayList<>();
if (categoryOnlyComIds.contains(categoryId)) {
childrenGroup.add(new WeaTableColumnGroup("150", "基数", categoryId + "_base"));
childrenGroup.add(new WeaTableColumnGroup("150", "比例", categoryId + "_comProp"));
childrenGroup.add(new WeaTableColumnGroup("150", "比例(%)", categoryId + "_comProp"));
childrenGroup.add(new WeaTableColumnGroup("150", "金额", categoryId + "_com"));
} else {
List<WeaTableColumnGroup> perChildrenGroup = new ArrayList<>();
perChildrenGroup.add(new WeaTableColumnGroup("150", "比例", categoryId + "_perProp"));
perChildrenGroup.add(new WeaTableColumnGroup("150", "比例(%)", categoryId + "_perProp"));
perChildrenGroup.add(new WeaTableColumnGroup("150", "金额", categoryId + "_per"));
List<WeaTableColumnGroup> comChildrenGroup = new ArrayList<>();
comChildrenGroup.add(new WeaTableColumnGroup("150", "比例", categoryId + "_comProp"));
comChildrenGroup.add(new WeaTableColumnGroup("150", "比例(%)", categoryId + "_comProp"));
comChildrenGroup.add(new WeaTableColumnGroup("150", "金额", categoryId + "_com"));
childrenGroup.add(new WeaTableColumnGroup("150", "基数", categoryId + "_base"));
@ -7464,7 +7464,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
singleMap.put("username", employee.getUsername());
singleMap.put("taxAgentName", taxAgentMap.getOrDefault(detailPO.getPaymentOrganization(), ""));
singleMap.put("departmentName", detailPO.getDepartmentName());
singleMap.put("idNo", detailPO.getDepartmentName());
// singleMap.put("idNo", detailPO.getDepartmentName());
if (schemeForm != null) {
List<InsuranceSchemeDetailDTO> schemeDetailList = schemeForm.getSchemeDetailList();
// 过滤未开启缴纳的
@ -7528,7 +7528,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
// Map<String, String> iCategoryMap = SalaryEntityUtil.convert2Map(iCategoryPOS, po -> Utils.null2String(po.getId()), ICategoryPO::getInsuranceName);
for (String categoryId : categoryIds) {
columns.add(new WeaTableColumnGroup("150", "公积金缴纳基数", categoryId + "_base"));
columns.add(new WeaTableColumnGroup("150", "缴费比例", categoryId + "_comProp"));
columns.add(new WeaTableColumnGroup("150", "缴费比例(%)", categoryId + "_comProp"));
columns.add(new WeaTableColumnGroup("150", "个人缴存额", categoryId + "_per"));
columns.add(new WeaTableColumnGroup("150", "单位缴存额", categoryId + "_com"));
// if (categoryOnlyComIds.contains(categoryId)) {