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

金华交投修改

This commit is contained in:
Harryxzy 2025-08-08 14:40:54 +08:00
parent 14953f4bb1
commit faaec97f57
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
View File

@ -11,6 +11,7 @@ import com.engine.salary.entity.salaryacct.dto.SalaryAcctResultDetailDTO;
import com.engine.salary.entity.salaryacct.dto.SalaryAcctResultListColumnDTO;
import com.engine.salary.entity.salaryacct.param.*;
import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO;
import com.engine.salary.entity.salarysob.dto.SalaryApprovalDTO;
import com.engine.salary.exception.SalaryRunTimeException;
import com.engine.salary.service.*;
import com.engine.salary.service.impl.*;
@ -26,6 +27,7 @@ import org.apache.commons.lang.math.NumberUtils;
import org.apache.commons.lang3.StringUtils;
import weaver.conn.RecordSet;
import weaver.hrm.User;
import weaver.wechat.util.Utils;
import java.math.BigDecimal;
import java.util.*;
@ -298,6 +300,13 @@ public class SalaryAcctResultWrapper extends Service implements SalaryAcctResult
public List<Map<String, Object>> sumSalaryAcctResult4jtMobileField(SalaryAcctResultQueryParam queryParam) {
ValidUtil.doValidator(queryParam);
// 获取审批有哪些薪资项目
SalaryApprovalDTO approvalInfoByRecordId = getSalaryApprovalRuleService(user).getApprovalInfoByRecordId(queryParam.getSalaryAcctRecordIds().get(0));
if (approvalInfoByRecordId == null) {
return new ArrayList<>();
}
List<String> approvalItemIds = approvalInfoByRecordId.getApprovalItemGroup().stream().map(SalaryApprovalDTO.approvalItemGroup::getApprovalItems)
.flatMap(Collection::stream).map(item -> Utils.null2String(item.getSalaryItemId())).collect(Collectors.toList());
// 获取移动端需要展示哪些字段
RecordSet rs = new RecordSet();
rs.execute("select lcbdzdsjkm,sxzxm from uf_xzxmysb");
@ -305,7 +314,9 @@ public class SalaryAcctResultWrapper extends Service implements SalaryAcctResult
while (rs.next()) {
String zdm = rs.getString("lcbdzdsjkm");
String sxzxm = rs.getString("sxzxm");
relationMap.put(zdm, sxzxm);
if (approvalItemIds.contains(sxzxm)) {
relationMap.put(zdm, sxzxm);
}
}
List<Map<String, Object>> dataList = new ArrayList<>();