|
|
|
|
@ -63,10 +63,7 @@ import weaver.general.BaseBean;
|
|
|
|
|
import weaver.general.StringUtil;
|
|
|
|
|
import weaver.general.TimeUtil;
|
|
|
|
|
import weaver.general.Util;
|
|
|
|
|
import weaver.hrm.company.DepartmentComInfo;
|
|
|
|
|
import weaver.hrm.company.SubCompanyComInfo;
|
|
|
|
|
import weaver.hrm.definedfield.HrmFieldManager;
|
|
|
|
|
import weaver.hrm.privacy.PrivacyComInfo;
|
|
|
|
|
import weaver.systeminfo.SystemEnv;
|
|
|
|
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
|
|
@ -189,40 +186,25 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
List<SearchConditionItem> items = filterByDomkey(all, columnList);
|
|
|
|
|
List<String> privacyList = Arrays.asList("-1_hrm_mobile","-1_hrm_telephone","-1_hrm_mobilecall","-1_hrm_fax","-1_hrm_email");
|
|
|
|
|
for (SearchConditionItem item : items) {
|
|
|
|
|
String columnName = item.getDomkey()[0];
|
|
|
|
|
WeaTableColumn weaTableColumn = new WeaTableColumn();
|
|
|
|
|
|
|
|
|
|
if (columnName.equals("-1_cus_"+propValue)){
|
|
|
|
|
weaTableColumn.setOtherpara(columnName);
|
|
|
|
|
fields.add("t.id as " + buildTableSql(columnName).replace(".", "_"));
|
|
|
|
|
weaTableColumn.setTransmethod("com.engine.organization.transmethod.HrmResourceTransMethod.getOrgValue");
|
|
|
|
|
}else if(privacyList.contains(columnName)) {
|
|
|
|
|
fields.add(buildTableSql(columnName) + " as " + buildTableSql(columnName).replace(".", "_"));
|
|
|
|
|
PrivacyComInfo pc = new PrivacyComInfo();
|
|
|
|
|
Map<String, String> mapShowSets = pc.getMapShowSets();
|
|
|
|
|
String[] parts = columnName.split("_");
|
|
|
|
|
String fieldName = parts[parts.length - 1];
|
|
|
|
|
if (mapShowSets != null && mapShowSets.get("mobile") != null) {
|
|
|
|
|
weaTableColumn.setOtherpara("column:id+" + user.getUID() + "+"+fieldName+"");
|
|
|
|
|
weaTableColumn.setTransmethod("weaver.hrm.privacy.PrivacyComInfo.getSearchContent");
|
|
|
|
|
}else {
|
|
|
|
|
weaTableColumn.setOtherpara(fieldName+":"+user.getLanguage());
|
|
|
|
|
weaTableColumn.setTransmethod("weaver.hrm.HrmTransMethod.getDefineContent");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} else{
|
|
|
|
|
weaTableColumn.setOtherpara(columnName);
|
|
|
|
|
}else{
|
|
|
|
|
fields.add(buildTableSql(columnName) + " as " + buildTableSql(columnName).replace(".", "_"));
|
|
|
|
|
weaTableColumn.setTransmethod("com.engine.organization.transmethod.HrmResourceTransMethod.getFieldTrueValue");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
String scopeId = columnName.split("_")[0];
|
|
|
|
|
String fieldName = columnName.substring(columnName.lastIndexOf("_") + 1);
|
|
|
|
|
|
|
|
|
|
weaTableColumn.setText(getHrmResourceMapper().queryLabelName(fieldName, scopeId, user.getLanguage()));
|
|
|
|
|
weaTableColumn.setColumn(buildTableSql(columnName).replace(".", "_"));
|
|
|
|
|
|
|
|
|
|
weaTableColumn.setOtherpara(columnName);
|
|
|
|
|
weaTableColumn.setDisplay(columnList.contains(columnName) ? WeaBoolAttr.TRUE : WeaBoolAttr.FALSE);
|
|
|
|
|
weaTableColumn.setWidth(decimal.setScale(2, RoundingMode.HALF_UP).doubleValue() + "%");
|
|
|
|
|
weaTableColumnList.add(weaTableColumn);
|
|
|
|
|
@ -233,7 +215,6 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
|
|
|
|
|
weaTableColumn.setColumn("id");
|
|
|
|
|
weaTableColumn.setDisplay(WeaBoolAttr.FALSE);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
weaTableColumnList.add(weaTableColumn);
|
|
|
|
|
fields.add("t.id");
|
|
|
|
|
table.setBackfields(StringUtils.join(fields, ","));
|
|
|
|
|
@ -805,14 +786,9 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
|
|
|
|
|
createConditionItems(hrmFieldSearchConditionComInfo, hrmFieldsByScopeId, conditionItems);
|
|
|
|
|
Map<String, SearchConditionItem> allFieldsMap = conditionItems.stream().collect(Collectors.toMap(item -> item.getDomkey()[0], item -> item, (k1, k2) -> k1));
|
|
|
|
|
boolean isQuickSearch = "true".equals(Util.null2String(params.get("isQuickSearch")));
|
|
|
|
|
DepartmentComInfo deptInfo = new DepartmentComInfo();
|
|
|
|
|
SubCompanyComInfo subInfo = new SubCompanyComInfo();
|
|
|
|
|
|
|
|
|
|
DBType dbType = DBType.get(new RecordSet().getDBType());
|
|
|
|
|
StringBuilder sb = new StringBuilder(" where 1=1 ");
|
|
|
|
|
// 默认去除外部人员显示
|
|
|
|
|
sb.append( " and t.seclevel >= 0 ");
|
|
|
|
|
|
|
|
|
|
if (params.containsKey("lastName") || !params.containsKey("-1_hrm_status")) {
|
|
|
|
|
// sb.append(" and t.status = 1");
|
|
|
|
|
sb.append(" and t.status < 4");
|
|
|
|
|
@ -834,18 +810,10 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
|
|
|
|
|
sb.append(" and t.lastname ").append(dbType.like(value));
|
|
|
|
|
}
|
|
|
|
|
if ("companyId".equals(key)) {
|
|
|
|
|
ArrayList<Integer> list = new ArrayList<>();
|
|
|
|
|
list.add(Integer.parseInt(value));
|
|
|
|
|
subInfo.getSubCompanyLists(value,list);
|
|
|
|
|
String allSub = StringUtils.join(list,",");
|
|
|
|
|
sb.append(" and t.subcompanyid1 in(").append(allSub).append(")");
|
|
|
|
|
sb.append(" and t.subcompanyid1 ='").append(value).append("'");
|
|
|
|
|
}
|
|
|
|
|
if ("departmentId".equals(key)) {
|
|
|
|
|
ArrayList<Integer> list = new ArrayList<>();
|
|
|
|
|
list.add(Integer.parseInt(value));
|
|
|
|
|
deptInfo.getAllChildDeptByDepId(list,value);
|
|
|
|
|
String allDept = StringUtils.join(list,",");
|
|
|
|
|
sb.append(" and t.departmentId in (").append(allDept).append(")");
|
|
|
|
|
sb.append(" and t.departmentId ='").append(value).append("'");
|
|
|
|
|
}
|
|
|
|
|
if ("jobTitle".equals(key)) {
|
|
|
|
|
JobPO jobById = getJobMapper().getJobById(Long.parseLong(value));
|
|
|
|
|
|
