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

钱智，需求

This commit is contained in:
钱涛 2025-11-28 13:27:32 +08:00
parent 044b02e002
commit 55238f1dfe
5 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resource/WEB-INF/prop/hrmSalary.properties
View File

@ -1,5 +1,5 @@
log=false
defaultCloseNonStandard149=true
AESEncryptScrect=990EB004A1C862721C1513AE90038C9E
version=3.0.3.2510.01.ts
version=3.0.4.2510.01.ts
openFormulaForcedEditing=false

18
src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java
View File

@ -33,6 +33,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import weaver.conn.RecordSet;
import weaver.general.Util;
import weaver.hrm.User;
import weaver.hrm.company.DepartmentComInfo;
@ -530,8 +531,17 @@ public class RecordsBuildServiceImpl extends Service implements RecordsBuildServ
List<Long> employeeIds = list.stream().map(item -> item.getEmployeeId()).distinct().collect(Collectors.toList());
List<DataCollectionEmployee> employeeByIds = new ArrayList<>();
List<List<Long>> partition = Lists.partition(employeeIds, 1000);
for (List<Long> longs : partition) {
employeeByIds.addAll(getSalaryEmployeeService(user).getEmployeeByIdsAll(longs));
Map<Long,String> map = new HashMap<>();
for (List<Long> ids : partition) {
employeeByIds.addAll(getSalaryEmployeeService(user).getEmployeeByIdsAll(ids));
//获取实际工作地
RecordSet rs = new RecordSet();
String sql =String.format("select id ,field64 from cus_fielddata where scopeid =3 and id in(%s)",ids.stream().map(Object::toString).collect(Collectors.joining(","))) ;
rs.executeQuery(sql);
while (rs.next()) {
String processField = rs.getString("id");
String salaryName = rs.getString("field64");
}
}
if (CollectionUtils.isEmpty(employeeByIds)) {
return result;
@ -542,6 +552,10 @@ public class RecordsBuildServiceImpl extends Service implements RecordsBuildServ
Map<Long, TaxAgentPO> paymentMap = paymentList.stream().collect(Collectors.toMap(TaxAgentPO::getId, Function.identity()));
Map<Long, DataCollectionEmployee> collect = employeeByIds.stream().collect(Collectors.toMap(DataCollectionEmployee::getEmployeeId, Function.identity()));
DepartmentComInfo departmentComInfo = new DepartmentComInfo();
list.forEach(item -> {
Map<String, Object> record = new HashMap<>();
DataCollectionEmployee simpleEmployee = collect.get(item.getEmployeeId());

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

@ -7229,6 +7229,8 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
List<Map<String, Object>> list = getService(user).buildQzReport(dtos, (long) user.getUID(), false);
List<WeaTableColumnGroup> columns = Lists.newArrayList();
columns.add(new WeaTableColumnGroup("150", "公司名称", "paymentOrganizationName"));
columns.add(new WeaTableColumnGroup("150", "工号", "workcode"));

5
src/com/engine/salary/service/impl/SalaryCalcTaxServiceImpl.java
View File

@ -225,7 +225,6 @@ public class SalaryCalcTaxServiceImpl extends Service implements SalaryCalcTaxSe
// 查询薪资核算记录关联的异步算税请求记录
List<SalaryAcctCalcTaxReqPO> salaryAcctCalcTaxReqs = getSalaryAcctCalcTaxReqService(user).listByRecordId(salaryAcctRecord.getId());
if (CollectionUtils.isEmpty(salaryAcctCalcTaxReqs)) {
getSalaryAcctRecordService(user).updateMsg(salaryAcctRecordId,"请先计算个税再获取反馈");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(268184, "请先计算个税再获取反馈"));
}
// 查询薪资核算记录关联的薪资账套个税字段对应
@ -313,10 +312,10 @@ public class SalaryCalcTaxServiceImpl extends Service implements SalaryCalcTaxSe
getSalaryAcctResultService(user).batchSave(addResultPOS);
getSalaryAcctResultService(user).batchUpdate(updateResultPOS);
getSalaryAcctCalcTaxReqService(user).deleteByRecordId(salaryAcctRecord.getId());
//更新薪资核算记录最后操作日期
getSalaryAcctRecordService(user).updateDate(salaryAcctRecordId, new Date(), SalaryAcctOptEnum.RESULT.getDefaultLabel());
//清空异常信息
getSalaryAcctRecordService(user).updateMsg(salaryAcctRecordId,"");
//更新薪资核算记录最后操作日期
getSalaryAcctRecordService(user).updateDate(salaryAcctRecordId, new Date(), SalaryAcctOptEnum.RESULT.getDefaultLabel());
// 记录日志
getSalaryAcctResultService(user).writeBatchLog(salaryAcctRecord, Collections.emptyMap(), SalaryLogOperateTypeEnum.GET_CALC_TAX_FEEDBACK);
}

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

@ -106,6 +106,7 @@ public class SalaryAcctResultWrapper extends Service implements SalaryAcctResult
Map<String, Object> datas = new HashMap<>();
datas.put("pageInfo", page);
datas.put("columns", columns);
datas.put("msg", salaryAcctRecordPO.getMsg());
return datas;
}