|
|
|
@ -90,6 +90,18 @@ public class AllowanceServiceImpl extends Service implements AllowanceService {
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//20240515产品需求变更,即使考勤方案未设置适用范围,对于通用津贴类型考勤项目,也要适用于全员
|
|
|
|
|
if (tyAllowanceIds.size() > 0) {
|
|
|
|
|
String empSql = "select id from hrmresource where 1=1 ";
|
|
|
|
|
if (targetEmpIdList.size() > 0) {
|
|
|
|
|
empSql = empSql + " and id not in (" + String.join(",",targetEmpIdList) + ")";
|
|
|
|
|
}
|
|
|
|
|
List<Map<String, Object>> empData = DbTools.getSqlToList(empSql);
|
|
|
|
|
for (Map<String, Object> empInfo : empData) {
|
|
|
|
|
targetEmpIdList.add(empInfo.get("id").toString());
|
|
|
|
|
empIdWithAllowanceInfo.put(empInfo.get("id").toString(), tyAllowanceIds);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//构建班次和津贴映射关系
|
|
|
|
|
Map<String, Map<String, Object>> allowanceIdWithKqxmInfo = new HashMap<>();
|
|
|
|
|
Map<String, List<String>> bcWithAllowanceInfo = new HashMap<>();
|
|
|
|
|