liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

花名册人员状态查询功能优化

This commit is contained in:
dxfeng 2023-03-01 16:26:10 +08:00
parent f5f5c26133
commit f8b60493f8
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
View File

@ -137,7 +137,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
table.setSqlwhere(sqlWhere); table.setSqlwhere(sqlWhere);
List<WeaTableColumn> weaTableColumnList = new ArrayList<>(); List<WeaTableColumn> weaTableColumnList = new ArrayList<>();
JclOrgCustomTemplatePO jclOrgCustomTemplatePO = MapperProxyFactory.getProxy(JclOrgCustomTemplateMapper.class).queryIsusedTemp("1", String.valueOf(user.getUID())); JclOrgCustomTemplatePO jclOrgCustomTemplatePO = MapperProxyFactory.getProxy(JclOrgCustomTemplateMapper.class).queryIsusedTemp("1", String.valueOf(user.getUID()));
String columns = null; String columns = "";
List<String> fields = new ArrayList<>(); List<String> fields = new ArrayList<>();
List<SearchConditionGroup> allConditions = getAllConditions(); List<SearchConditionGroup> allConditions = getAllConditions();
@ -638,7 +638,8 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
DBType dbType = DBType.get(new RecordSet().getDBType()); DBType dbType = DBType.get(new RecordSet().getDBType());
StringBuilder sb = new StringBuilder(" where 1=1 "); StringBuilder sb = new StringBuilder(" where 1=1 ");
if (params.containsKey("lastName")) { if (params.containsKey("lastName")) {
sb.append(" and t.status = 1"); // sb.append(" and t.status = 1");
sb.append(" and t.status < 4");
} }
for (Map.Entry<String, Object> entry : params.entrySet()) { for (Map.Entry<String, Object> entry : params.entrySet()) {
String key = entry.getKey(); String key = entry.getKey();
@ -659,6 +660,9 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
JobPO jobById = getJobMapper().getJobById(Long.parseLong(value)); JobPO jobById = getJobMapper().getJobById(Long.parseLong(value));
if (null != jobById) { if (null != jobById) {
sb.append(" and t.jobtitle ='").append(Util.null2String(jobById.getEcJobTitle())).append("' and t.subcompanyid1 = '").append(Util.null2String(jobById.getEcCompany())).append("' and t.departmentId ='").append(Util.null2String(jobById.getEcDepartment())).append("'"); sb.append(" and t.jobtitle ='").append(Util.null2String(jobById.getEcJobTitle())).append("' and t.subcompanyid1 = '").append(Util.null2String(jobById.getEcCompany())).append("' and t.departmentId ='").append(Util.null2String(jobById.getEcDepartment())).append("'");
} else {
sb = new StringBuilder(" where 1 = 2 ");
break;
} }
} }
@ -1097,7 +1101,11 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
break; break;
case SELECT://选择框 case SELECT://选择框
if (!"-1".equals(value)) { if (!"-1".equals(value)) {
sb.append(" and ").append(tableSql).append(" = '").append(value).append("' "); if ("t.status".equalsIgnoreCase(tableSql) && "10".equals(value)) {
sb.append(" and ").append(tableSql).append(" < 4 ");
} else {
sb.append(" and ").append(tableSql).append(" = '").append(value).append("' ");
}
} }
break; break;
case DATE: case DATE:
@ -1168,15 +1176,15 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
private void addEmptyForSelect(SearchConditionItem searchConditionItem) { private void addEmptyForSelect(SearchConditionItem searchConditionItem) {
searchConditionItem.setValue("-1"); searchConditionItem.setValue("-1");
if ("-1_hrm_status".equals(searchConditionItem.getDomkey()[0])) { if ("-1_hrm_status".equals(searchConditionItem.getDomkey()[0])) {
searchConditionItem.setValue("1"); // 默认赋值 在职状态
searchConditionItem.setValue("10");
} }
List<SearchConditionOption> options = searchConditionItem.getOptions(); List<SearchConditionOption> options = searchConditionItem.getOptions();
SearchConditionOption searchConditionOption = new SearchConditionOption(); SearchConditionOption searchConditionOption = new SearchConditionOption();
searchConditionOption.setKey("-1"); searchConditionOption.setKey("-1");
searchConditionOption.setShowname("全部");
options.add(0, searchConditionOption); options.add(0, searchConditionOption);
options.forEach(item -> { options.forEach(item -> item.setSelected(false));
item.setSelected(false);
});
} }
/** /**