liuliang
/
hrm-attendance
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

考勤，出勤津贴数据生成功能中人员范围ids获取逻辑优化

Browse Source
zm_dev
sy 1 year ago
parent 0110b41c3f
commit eb93dd383c
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File

32
src/com/engine/common/util/CommonUtil.java
Unescape Escape View File

@ -248,15 +248,15 @@ public class CommonUtil {
List<String> empIdList = new ArrayList<>();
String sql = "select dxlx,aqjb,dx from uf_jcl_syzz where modeid=? and dataid = ?";
//适用组织所有值集合
List<Map<String,Object>> organzationList = DbTools.getSqlToList(sql,modeId, dataId);
List<Map<String,Object>> organizationList = DbTools.getSqlToListKeySmallLetter(sql,modeId, dataId);
//分组
List<Map<String, String>> empIdInfos = new ArrayList<>();
List<Map<String, String>> empGroupIdInfos = new ArrayList<>();
List<Map<String, String>> depIdInfos = new ArrayList<>();
List<Map<String, String>> subCompanyIdInfos = new ArrayList<>();
for (Map<String,Object> organzation:organzationList){
String id = Util.null2String(organzation.get("dx")).split("-")[0];
String securityLevel = Util.null2String(organzation.get("aqjb"));
for (Map<String,Object> organization : organizationList){
String id = Util.null2String(organization.get("dx")).split("-")[0];
String securityLevel = Util.null2String(organization.get("aqjb"));
String[] securityLevelArr = securityLevel.split("-");
String minSecurityLevel = securityLevel.substring(0, 1).equals("-") ? "" : securityLevelArr[0];
String maxSecurityLevel = "";
@ -265,25 +265,25 @@ public class CommonUtil {
} else if (securityLevelArr.length == 2) {
maxSecurityLevel = securityLevelArr[1];
}
if (ApplicableOrganizationEnum.PERSONNEL.getKey().equals(organzation.get("dxlx"))){
if (ApplicableOrganizationEnum.PERSONNEL.getKey().equals(organization.get("dxlx"))){
Map<String,String> infoItem = new HashMap<>();
infoItem.put("id", id);
infoItem.put("minSecurityLevel", minSecurityLevel);
infoItem.put("maxSecurityLevel", maxSecurityLevel);
empIdInfos.add(infoItem);
}else if (ApplicableOrganizationEnum.PERSONNEL_GROUP.getKey().equals(organzation.get("dxlx"))){
}else if (ApplicableOrganizationEnum.PERSONNEL_GROUP.getKey().equals(organization.get("dxlx"))){
Map<String,String> infoItem = new HashMap<>();
infoItem.put("id", id);
infoItem.put("minSecurityLevel", minSecurityLevel);
infoItem.put("maxSecurityLevel", maxSecurityLevel);
empGroupIdInfos.add(infoItem);
}else if (ApplicableOrganizationEnum.DEPARTMENT.getKey().equals(organzation.get("dxlx"))){
}else if (ApplicableOrganizationEnum.DEPARTMENT.getKey().equals(organization.get("dxlx"))){
Map<String,String> infoItem = new HashMap<>();
infoItem.put("id", id);
infoItem.put("minSecurityLevel", minSecurityLevel);
infoItem.put("maxSecurityLevel", maxSecurityLevel);
depIdInfos.add(infoItem);
}else if (ApplicableOrganizationEnum.SUBCOMPANY.getKey().equals(organzation.get("dxlx"))){
}else if (ApplicableOrganizationEnum.SUBCOMPANY.getKey().equals(organization.get("dxlx"))){
Map<String,String> infoItem = new HashMap<>();
infoItem.put("id", id);
infoItem.put("minSecurityLevel", minSecurityLevel);
@ -329,10 +329,10 @@ public class CommonUtil {
if (!maxSecurityLevel.equals("")) {
querySql = querySql + " and seclevel <= " +maxSecurityLevel;
}
List<Map<String,Object>> datas = DbTools.getSqlToList(querySql);
List<Map<String,Object>> datas = DbTools.getSqlToListKeySmallLetter(querySql);
log.info("querySql : " + querySql);
if (datas.size() > 0) {
log.info("datas : " + datas);
log.info("datas.size : " + datas.size());
datas.forEach(f -> empIdList.add(f.get("id").toString()));
}
}
@ -351,10 +351,10 @@ public class CommonUtil {
if (!maxSecurityLevel.equals("")) {
querySql = querySql + " and seclevel <= " +maxSecurityLevel;
}
List<Map<String,Object>> datas = DbTools.getSqlToList(querySql);
List<Map<String,Object>> datas = DbTools.getSqlToListKeySmallLetter(querySql);
log.info("querySql : " + querySql);
if (datas.size() > 0) {
log.info("datas : " + datas);
log.info("datas.size : " + datas.size());
datas.forEach(f -> empIdList.add(f.get("id").toString()));
}
}
@ -372,10 +372,10 @@ public class CommonUtil {
if (!maxSecurityLevel.equals("")) {
querySql = querySql + " and seclevel <= " +maxSecurityLevel;
}
List<Map<String,Object>> datas = DbTools.getSqlToList(querySql);
List<Map<String,Object>> datas = DbTools.getSqlToListKeySmallLetter(querySql);
log.info("querySql : " + querySql);
if (datas.size() > 0) {
log.info("datas : " + datas);
log.info("datas.size : " + datas.size());
datas.forEach(f -> empIdList.add(f.get("id").toString()));
}
}
@ -391,7 +391,7 @@ public class CommonUtil {
public static List<String> getEmpGroupUserIds(String empGroupId){
String sql = "select b.mainid,b.empid,b.filters,b.bdate,b.edate,a.list_type from uf_ryqz a left join uf_ryqz_dt1 b on a.id=b.mainid where mainid = " + empGroupId;
List<Map<String,Object>> personGroupDataList = DbTools.getSqlToList(sql);
List<Map<String,Object>> personGroupDataList = DbTools.getSqlToListKeySmallLetter(sql);
List<String> empIdList = new ArrayList<>();
for (Map<String,Object> personGroupData :personGroupDataList){
@ -414,7 +414,7 @@ public class CommonUtil {
sql = sql+ " and "+filters;
}
log.info("getPersonnelGroupingByPerson filter sql : {}",sql);
List<Map<String,Object>> dataList = DbTools.getSqlToList(sql);
List<Map<String,Object>> dataList = DbTools.getSqlToListKeySmallLetter(sql);
for (Map<String,Object> dataMap :dataList){
String hrmId = Util.null2String(dataMap.get("id"));
String seclevel = Util.null2String(dataMap.get("seclevel"));

Write Preview
Loading…
Cancel
Save