This commit is contained in:
Harryxzy 2025-09-28 12:28:43 +08:00
parent 6feba29cdf
commit 04bee08222
1 changed files with 5 additions and 2 deletions

View File

@ -1622,13 +1622,16 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
// 查询快照表中人员信息 // 查询快照表中人员信息
Map<Long, DataCollectionEmployee> employeeMap = SalaryEntityUtil.convert2Map(getSalaryEmployeeService(user).snapshot(empIds, SalaryDateUtil.localDateToDate(yearMonth.atDay(1))), DataCollectionEmployee::getEmployeeId); Map<Long, DataCollectionEmployee> employeeMap = SalaryEntityUtil.convert2Map(getSalaryEmployeeService(user).snapshot(empIds, SalaryDateUtil.localDateToDate(yearMonth.atDay(1))), DataCollectionEmployee::getEmployeeId);
// 获取直接人工分摊表中成本中心数据 // 获取直接人工分摊表中成本中心数据
String sql =" select user_code,sap_cost_center_name,sap_cost_center_name_desc from dws_oa.work_hour_apportion_report where month='"+salaryMonth+"'";
baseBean.writeLog("生成部门社保明细表 获取成本中心数据"+ sql);
Map<String, String> ltCbzxMap = new HashMap<>(); Map<String, String> ltCbzxMap = new HashMap<>();
String dataSourceId = baseBean.getPropValue("ltSalaryReport", "zjrycqgsft_data_source_id"); String dataSourceId = baseBean.getPropValue("ltSalaryReport", "zjrycqgsft_data_source_id");
RecordSetDataSource extRs = new RecordSetDataSource(dataSourceId); RecordSetDataSource extRs = new RecordSetDataSource(dataSourceId);
extRs.execute(" select user_code,sap_cost_center_name,sap_cost_center_name_desc from dws_oa.work_hour_apportion_report where month='"+salaryMonth+"'"); extRs.execute(sql);
while (extRs.next()) { while (extRs.next()) {
ltCbzxMap.put(extRs.getString("user_code"), extRs.getString("sap_cost_center_name_desc")); ltCbzxMap.put(extRs.getString("user_code"), extRs.getString("sap_cost_center_name_desc"));
} }
baseBean.writeLog("生成部门社保明细表 获取成本中心数据"+ ltCbzxMap.toString());
// 删除建模数据 // 删除建模数据
RecordSet rs = new RecordSet(); RecordSet rs = new RecordSet();
@ -3728,7 +3731,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
StringBuilder insertSql = new StringBuilder("insert into uf_kb (formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,nf,rjcz,xse,zndrts) values (") StringBuilder insertSql = new StringBuilder("insert into uf_kb (formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,nf,rjcz,xse,zndrts) values (")
.append(modeId).append(",1,0,").append(currDate).append(",").append(currTime).append(",") .append(modeId).append(",1,0,").append(currDate).append(",").append(currTime).append(",")
.append(year).append(",").append(gsxse.divide(empNums, 2, RoundingMode.HALF_UP).toPlainString()) .append(year).append(",").append(empNums.compareTo(new BigDecimal("0")) == 0 ? "0" : gsxse.divide(empNums, 2, RoundingMode.HALF_UP).toPlainString())
.append(",").append(gsxse).append(",").append(empNums.toString()).append(")"); .append(",").append(gsxse).append(",").append(empNums.toString()).append(")");
rs.execute(insertSql.toString()); rs.execute(insertSql.toString());
// 权限重构 // 权限重构