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

去除千分位

This commit is contained in:
钱涛 2022-08-04 16:17:05 +08:00
parent bdadbf4ca0
commit a91b411c08
1 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/com/engine/salary/biz/SIArchivesBiz.java
View File

@ -710,7 +710,7 @@ public class SIArchivesBiz {
page = socialSchemeMapper.queryEmployeeList(param);
page = page.stream().filter(f ->
// taxAgentEmployeeIds.contains(f.getEmployeeId())||
taxAgentIds.contains(f.getPaymentOrganization())
taxAgentIds.contains(f.getPaymentOrganization())
).collect(Collectors.toList());
// 填充总数和当页数据
// 分页参数
@ -724,10 +724,10 @@ public class SIArchivesBiz {
pageInfo = new PageInfo<>(page, InsuranceArchivesEmployeePO.class);
}
List<Map<String, Object>> records = null;
if (param.getExportData() != null && param.getExportData()){
records = buildTableData(page,true);
}else {
records = buildTableData(page,false);
if (param.getExportData() != null && param.getExportData()) {
records = buildTableData(page, true);
} else {
records = buildTableData(page, false);
}
List<WeaTableColumn> columns = buildWeaTableColumns(page, operateId);
@ -890,15 +890,15 @@ public class SIArchivesBiz {
}
public List<Map<String, Object>> buildTableData(List<InsuranceArchivesEmployeePO> insuranceArchivesEmployeePOS){
return buildTableData(insuranceArchivesEmployeePOS,false);
public List<Map<String, Object>> buildTableData(List<InsuranceArchivesEmployeePO> insuranceArchivesEmployeePOS) {
return buildTableData(insuranceArchivesEmployeePOS, false);
}
/**
* @param insuranceArchivesEmployeePOS
* @return
*/
public List<Map<String, Object>> buildTableData(List<InsuranceArchivesEmployeePO> insuranceArchivesEmployeePOS,boolean export) {
public List<Map<String, Object>> buildTableData(List<InsuranceArchivesEmployeePO> insuranceArchivesEmployeePOS, boolean export) {
List<TaxAgentPO> taxAgentPOS = getTaxAgentMapper().listAll();
Map<Long, TaxAgentPO> longTaxAgentPOMap = SalaryEntityUtil.convert2Map(taxAgentPOS, TaxAgentPO::getId);
@ -942,11 +942,7 @@ public class SIArchivesBiz {
Map<String, Object> socialJson = JSON.parseObject(socialItem.getSocialPaymentBaseString(), new TypeReference<Map<String, Object>>() {
});
if (socialJson != null) {
if (export){
map.putAll(socialJson);
}else {
SalaryEntityUtil.thousandthConvert(socialJson, map);
}
map.putAll(socialJson);
}
map.put("socialAccount", socialItem.getSocialAccount());
map.put("socialStartTime", socialItem.getSocialStartTime());
@ -958,11 +954,7 @@ public class SIArchivesBiz {
Map<String, Object> fundJson = JSON.parseObject(fundItem.getFundPaymentBaseString(), new TypeReference<Map<String, Object>>() {
});
if (fundJson != null) {
if (export){
map.putAll(fundJson);
}else {
SalaryEntityUtil.thousandthConvert(fundJson, map);
}
map.putAll(fundJson);
}
map.put("supplementFundAccount", fundItem.getSupplementFundAccount());
map.put("fundStartTime", fundItem.getFundStartTime());
@ -974,11 +966,7 @@ public class SIArchivesBiz {
Map<String, Object> otherJson = JSON.parseObject(otherItem.getOtherPaymentBaseString(), new TypeReference<Map<String, Object>>() {
});
if (otherJson != null) {
if (export){
map.putAll(otherJson);
}else {
SalaryEntityUtil.thousandthConvert(otherJson, map);
}
map.putAll(otherJson);
}
map.put("otherStartTime", otherItem.getOtherStartTime());
map.put("otherEndTime", otherItem.getOtherEndTime());