From 6ac651e8bdad434cfec64d6b82c6d1766dcee483 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 6 Feb 2023 09:49:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8A=B1=E5=90=8D=E5=86=8C=EF=BC=8C=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/HrmResourceServiceImpl.java | 56 ++++++++----------- .../transmethod/HrmResourceTransMethod.java | 11 ++-- 2 files changed, 26 insertions(+), 41 deletions(-) diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index d96881b1..96c2668f 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -86,8 +86,6 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic private static final String RIGHT_NAME = "Roster:All"; - private static final String level = getFieldName("职等"); - private static final String grade = getFieldName("职级"); private HrmRelationMapper getHrmRelationMapper() { return MapperProxyFactory.getProxy(HrmRelationMapper.class); @@ -179,24 +177,8 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic weaTableColumnList.add(weaTableColumn); } } -// if (StringUtils.isNotBlank(columns)) { -// String[] tmp = columns.split(","); -// for (int i = 0; i < tmp.length; i++) { -// String scopeId = tmp[i].split("_")[0]; -// String fieldName = tmp[i].substring(tmp[i].lastIndexOf("_") + 1); -// WeaTableColumn weaTableColumn = new WeaTableColumn(); -// weaTableColumn.setText(getHrmResourceMapper().queryLabelName(fieldName, scopeId)); -// weaTableColumn.setColumn(buildTableSql(tmp[i]).replace(".", "_")); -// weaTableColumn.setDisplay(WeaBoolAttr.TRUE); -// weaTableColumn.setTransmethod("com.engine.organization.transmethod.HrmResourceTransMethod.getFieldTrueValue"); -// String param = tmp[i]; -// weaTableColumn.setOtherpara(param); -// weaTableColumnList.add(weaTableColumn); -// } -// } // 增加id字段,跳转人员卡片 WeaTableColumn weaTableColumn = new WeaTableColumn(); -// weaTableColumn.setText("id"); weaTableColumn.setColumn("id"); weaTableColumn.setDisplay(WeaBoolAttr.FALSE); @@ -654,15 +636,20 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic DBType dbType = DBType.get(new RecordSet().getDBType()); - StringBuilder sb = new StringBuilder(" where 1=1 and t.status <4 "); + StringBuilder sb = new StringBuilder(" where 1=1 "); for (Map.Entry entry : params.entrySet()) { + String key = entry.getKey(); String value = Util.null2String(entry.getValue()); - if (StringUtils.isBlank(value)) { + if ("lastName".equals(key)) { + if (StringUtils.isNotBlank(value)) { + sb.append(" and t.lastname ").append(dbType.like(value)); + } + sb.append(" and t.status = 1"); continue; } - String key = entry.getKey(); - if ("lastName".equals(key)) { - sb.append(" and t.lastname ").append(dbType.like(value)); + + if (StringUtils.isBlank(value)) { + continue; } SearchConditionItem searchConditionItem = allFieldsMap.get(key); // 根据不同的类型,不同的查询方式 @@ -918,6 +905,9 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic hrmFieldBean.setDmlurl(cusFormFieldPO.getDmlUrl()); hrmFieldBean.setIssystem("hrm".equals(cusFormFieldPO.getTableName()) ? "1" : "0"); hrmFieldBean.setIsFormField(true); + if ("-1_hrm_status".equals(hrmFieldBean.getFieldname())) { + hrmFieldBean.setFieldvalue("1"); + } SearchConditionItem searchConditionItem = hrmFieldSearchConditionComInfo.getSearchConditionItem(hrmFieldBean, user); conditionItems.add(searchConditionItem); // 如果为下拉框,添加一条空选项 @@ -1095,6 +1085,10 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic sb.append(" and ").append(dbType.ifNull(tableSql, "0")).append(" = '").append(value).append("' "); break; case SELECT://选择框 + if (!"-1".equals(value)) { + sb.append(" and ").append(tableSql).append(" = '").append(value).append("' "); + } + break; case DATE: case DATEPICKER: case TIMEPICKER: @@ -1161,10 +1155,13 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic * @param searchConditionItem */ private void addEmptyForSelect(SearchConditionItem searchConditionItem) { - searchConditionItem.setValue(""); + searchConditionItem.setValue("-1"); + if ("-1_hrm_status".equals(searchConditionItem.getDomkey()[0])) { + searchConditionItem.setValue("1"); + } List options = searchConditionItem.getOptions(); SearchConditionOption searchConditionOption = new SearchConditionOption(); - searchConditionOption.setKey(""); + searchConditionOption.setKey("-1"); options.add(0, searchConditionOption); options.forEach(item -> { item.setSelected(false); @@ -1194,13 +1191,4 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic return selectKeys; } - private static String getFieldName(String fieldabel) { - RecordSet recordSet = new RecordSet(); - String fieldname = null; - recordSet.executeQuery("select fieldname from jcl_org_field where fieldlabel='" + fieldabel + "'"); - if (recordSet.next()) { - fieldname = recordSet.getString("fieldname"); - } - return fieldname; - } } diff --git a/src/com/engine/organization/transmethod/HrmResourceTransMethod.java b/src/com/engine/organization/transmethod/HrmResourceTransMethod.java index db9c0f91..bcdcfbc9 100644 --- a/src/com/engine/organization/transmethod/HrmResourceTransMethod.java +++ b/src/com/engine/organization/transmethod/HrmResourceTransMethod.java @@ -6,7 +6,6 @@ import com.engine.organization.mapper.department.DepartmentMapper; import com.engine.organization.mapper.hrmresource.SystemDataMapper; import com.engine.organization.util.db.MapperProxyFactory; import org.json.JSONObject; -import weaver.conn.RecordSet; import weaver.hrm.User; import weaver.hrm.definedfield.HrmFieldManager; @@ -19,15 +18,13 @@ public class HrmResourceTransMethod { public static String getFieldTrueValue(String id, String para) { HrmFieldManager hfm = new HrmFieldManager("HrmCustomFieldByInfoType", Integer.parseInt(para.split("_")[0])); - hfm.getCustomFields(); - - String fieldName = hfm.getFieldname(); - JSONObject hrmFieldConf = hfm.getHrmFieldConf(para.substring(para.lastIndexOf("_") + 1)); - String hrmData = id; + // hfm.getCustomFields(); + String fieldName = para.substring(para.lastIndexOf("_") + 1); + JSONObject hrmFieldConf = hfm.getHrmFieldConf(fieldName); User user = new User(); user.setUid(1); try { - return hfm.getFieldvalue(null, user, null, hrmFieldConf.getString("dmlurl"), hrmFieldConf.getInt("id"), hrmFieldConf.getInt("fieldhtmltype"), hrmFieldConf.getInt("type"), hrmData, 0, fieldName); + return hfm.getFieldvalue(null, user, null, hrmFieldConf.getString("dmlurl"), hrmFieldConf.getInt("id"), hrmFieldConf.getInt("fieldhtmltype"), hrmFieldConf.getInt("type"), id, 0, fieldName); } catch (Exception e) { return ""; }