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

领悦凭证

This commit is contained in:
Harryxzy 2025-01-09 20:56:37 +08:00
parent 5afd786b88
commit c5863215cb
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/com/engine/salary/service/impl/LyPZServiceImpl.java
View File

@ -45,6 +45,7 @@ import weaver.general.Util;
import weaver.hrm.User;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
import java.util.stream.Collectors;
@ -230,10 +231,15 @@ public class LyPZServiceImpl extends Service implements LyPZService {
for (UfKjkmPO kjkm : ufKjkmList) {
// 获取该会计科目对应的辅助核算
BigDecimal value = new BigDecimal(0);
if (kjkm.getKmbm().equals(dkgrsdsBm) && queryParam.getPzlx().equals(LyPZTypeEnum.XZFFPZ.getValue())) {
value = (BigDecimal) kjkmValueMap.get(kjkm.getKmbm()+kjkm.getXzxm());
} else {
value = (BigDecimal) kjkmValueMap.get(kjkm.getKmbm());
try {
if (kjkm.getKmbm().equals(dkgrsdsBm) && queryParam.getPzlx().equals(LyPZTypeEnum.XZFFPZ.getValue())) {
value = ((BigDecimal) kjkmValueMap.get(kjkm.getKmbm()+kjkm.getXzxm())).setScale(2, RoundingMode.HALF_UP);
} else {
value = ((BigDecimal) kjkmValueMap.get(kjkm.getKmbm())).setScale(2, RoundingMode.HALF_UP);
}
} catch (Exception e) {
baseBean.writeLog("获取失败"+kjkm.getKmbm() +e);
value = new BigDecimal(0);
}
if (value != null && value.compareTo(BigDecimal.ZERO) != 0) {
LyPzPreview build = LyPzPreview.builder()
@ -499,11 +505,11 @@ public class LyPZServiceImpl extends Service implements LyPZService {
String sbgjjJtMzkswlkbm) {
String[] split = keyName.split("_split");
// "职能" / "职能项目名称"
String znxmmc = split.length > 1 ? split[0] : "";
String znxmmc = split.length > 0 ? split[0] : "";
// 职能项目类型 “职能”/“项目”
String znxmlx = split.length > 2 ? split[1] : "";
String znxmlx = split.length > 1 ? split[1] : "";
// 分部id
String subCompanyId = split.length > 3 ? split[2] : "0";
String subCompanyId = split.length > 2 ? split[2] : "0";
StringBuilder zySb = new StringBuilder();
if (pzlx.equals(LyPZTypeEnum.XZJTPZ.getValue())) {
@ -516,7 +522,8 @@ public class LyPZServiceImpl extends Service implements LyPZService {
zySb.append("职能");
} else {
// 分部名称
zySb.append(subCompanyMap.getOrDefault(Long.valueOf(subCompanyId), ""));
// zySb.append(subCompanyMap.getOrDefault(Long.valueOf(subCompanyId), "")).append(znxmmc);
zySb.append(znxmmc);
}
} else if (znxmlx.equals("项目/案场")) {
zySb.append(znxmmc);
@ -536,7 +543,8 @@ public class LyPZServiceImpl extends Service implements LyPZService {
zySb.append("职能");
} else {
// 分部名称
zySb.append(subCompanyMap.getOrDefault(Long.valueOf(subCompanyId), ""));
// zySb.append(subCompanyMap.getOrDefault(Long.valueOf(subCompanyId), "")).append(znxmmc);
zySb.append(znxmmc);
}
} else if (znxmlx.equals("项目/案场")) {
zySb.append(znxmmc);
@ -758,8 +766,16 @@ public class LyPZServiceImpl extends Service implements LyPZService {
// lyNCVoucher.setPkAccountingbook("12re23r32");
// 会计期间 非空
lyNCVoucher.setPeriod(String.valueOf(cal.get(Calendar.MONTH)+1));
String testPeriod = baseBean.getPropValue("lySalaryNCVoucherPushParam", "test_period");
if (StringUtils.isNotBlank(testPeriod)) {
lyNCVoucher.setPeriod(testPeriod);
}
// 制单日期 非空
lyNCVoucher.setPrepareddate(SalaryDateUtil.getFormatLocalDateTime(new Date()));
String testPrepareddate = baseBean.getPropValue("lySalaryNCVoucherPushParam", "test_prepareddate");
if (StringUtils.isNotBlank(testPrepareddate)) {
lyNCVoucher.setPrepareddate(testPrepareddate);
}
// 制单人 非空 （用户）
String pkPrepared = baseBean.getPropValue("lySalaryNCVoucherPushParam", "pk_prepared");
lyNCVoucher.setPkPrepared(pkPrepared);