diff --git a/src/com/engine/salary/component/WeaTableColumnGroup.java b/src/com/engine/salary/component/WeaTableColumnGroup.java new file mode 100644 index 000000000..7e44507e4 --- /dev/null +++ b/src/com/engine/salary/component/WeaTableColumnGroup.java @@ -0,0 +1,25 @@ +package com.engine.salary.component; + +import com.cloudstore.eccom.pc.table.WeaTableColumn; +import lombok.Data; + +import java.util.List; + +@Data +public class WeaTableColumnGroup extends WeaTableColumn { + + + private List children; + + public WeaTableColumnGroup() { + } + + public WeaTableColumnGroup(String width, String text, String column) { + super(width, text, column); + } + + public WeaTableColumnGroup(String width, String text, String column, List children) { + super(width, text, column); + this.children = children; + } +} diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java index f8b6665ac..b8e0e8b7a 100644 --- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java +++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java @@ -2,6 +2,7 @@ package com.engine.salary.entity.salaryacct.bo; import com.cloudstore.eccom.pc.table.WeaTableColumn; import com.engine.salary.annotation.SalaryFormulaVar; +import com.engine.salary.component.WeaTableColumnGroup; import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.salaryacct.dto.ConsolidatedTaxDetailDTO; @@ -95,19 +96,17 @@ public class SalaryAcctResultBO { columns.add(new WeaTableColumn("150", salarySobEmpFieldDTO.getFieldName(), salarySobEmpFieldDTO.getFieldId())); } // 薪资项目分组下的薪资项目 + // 薪资项目分组下的薪资项目 for (SalarySobItemGroupDTO salarySobItemGroupDTO : salarySobItemAggregateDTO.getItemGroups()) { if (CollectionUtils.isEmpty(salarySobItemGroupDTO.getItems())) { continue; } -// Map group = Maps.newHashMap(); -// group.put("groupName", salarySobItemGroupDTO.getName()); -// group.put("groupId", String.valueOf(salarySobItemGroupDTO.getId())); - List childrenColumns = Lists.newArrayList(); + List childrenColumns = Lists.newArrayList(); for (SalarySobItemDTO salarySobItemDTO : salarySobItemGroupDTO.getItems()) { - columns.add(new WeaTableColumn("150", salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId())); -// childrenColumns.add(new WeaTableColumn("150", salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId())); + childrenColumns.add(new WeaTableColumnGroup("150", salarySobItemDTO.getName(), "" + salarySobItemDTO.getSalaryItemId())); } -// group.put("list", childrenColumns); + WeaTableColumnGroup weaTableColumnWapper = new WeaTableColumnGroup("150", salarySobItemGroupDTO.getName(), String.valueOf(salarySobItemGroupDTO.getId()),childrenColumns); + columns.add(weaTableColumnWapper); } // 没有分类的薪资项目 for (SalarySobItemDTO salarySobItemDTO : salarySobItemAggregateDTO.getItems()) { diff --git a/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java b/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java index 8ef64cf69..b18ca9ac6 100644 --- a/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java @@ -1,10 +1,8 @@ package com.engine.salary.wrapper; import com.cloudstore.eccom.pc.table.WeaTableColumn; -import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; -import com.engine.salary.component.SalaryWeaTable; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.salaryacct.dto.ConsolidatedTaxDetailDTO; import com.engine.salary.entity.salaryacct.dto.SalaryAcctResultDetailDTO; @@ -12,7 +10,6 @@ import com.engine.salary.entity.salaryacct.param.SalaryAcctCalculateParam; import com.engine.salary.entity.salaryacct.param.SalaryAcctResultQueryParam; import com.engine.salary.entity.salaryacct.param.SalaryAcctResultSaveParam; import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO; -import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveListDTO; import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.service.*; import com.engine.salary.service.impl.*; @@ -84,17 +81,9 @@ public class SalaryAcctResultWrapper extends Service { // 构建薪资核算结果列表的表头 List columns = getSalaryAcctExcelService(user).listWeaTableColumn(salaryAcctRecordPO); - SalaryWeaTable table = new SalaryWeaTable(user, SalaryArchiveListDTO.class); - table.setColumns(columns); - - - WeaResultMsg result = new WeaResultMsg(false); - result.putAll(table.makeDataResult()); - result.success(); - Map datas = new HashMap<>(); datas.put("pageInfo", page); - datas.put("dataKey",result.getResultMap()); + datas.put("columns",columns); return datas; }