From f79ad8681f7b61b554200798527a3783628804a4 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 12 Jan 2023 16:49:54 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/extend/bo/ExtendInfoBO.java | 30 +++++++++++++++++++ .../entity/extend/po/ExtendInfoPO.java | 2 ++ .../service/impl/HrmResourceServiceImpl.java | 18 +++++------ .../web/HrmResourceController.java | 1 + 4 files changed, 41 insertions(+), 10 deletions(-) diff --git a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java index 71166d97..c033a73a 100644 --- a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java +++ b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java @@ -81,6 +81,36 @@ public class ExtendInfoBO { } + /** + * 渲染列表时，根据每一列的viewAttr渲染 + * @param user + * @param infoPOList + * @param showLabel + * @param checkBox + * @return + */ + public static List> convertInfoListToTable(User user, List infoPOList, boolean showLabel, boolean checkBox) { + List> lsCol = new ArrayList<>(); + Map col; + + int width = 100 / infoPOList.size(); + for (ExtendInfoPO extendInfoPO : infoPOList) { + String tmpkey = extendInfoPO.getFieldName(); + col = new HashMap<>(); + col.put("title", extendInfoPO.getFieldNameDesc()); + col.put("key", tmpkey); + col.put("dataIndex", tmpkey); + col.put("com", getFieldDetailInfo(user, extendInfoPO, extendInfoPO.getViewAttr(), showLabel, width)); + col.put("width", width + "%"); + if (checkBox && Integer.valueOf(7).equals(extendInfoPO.getControlType())) { + col.put("checkType", "checkbox"); + } + lsCol.add(col); + } + return lsCol; + + } + public static List> convertInfoListToTable(User user, List infoPOList, int viewAttr, boolean showLabel) { return convertInfoListToTable(user, infoPOList, viewAttr, showLabel, false); } diff --git a/src/com/engine/organization/entity/extend/po/ExtendInfoPO.java b/src/com/engine/organization/entity/extend/po/ExtendInfoPO.java index da0033b1..57f48249 100644 --- a/src/com/engine/organization/entity/extend/po/ExtendInfoPO.java +++ b/src/com/engine/organization/entity/extend/po/ExtendInfoPO.java @@ -131,4 +131,6 @@ public class ExtendInfoPO { private int deleteType; private Date createTime; private Date updateTime; + + private Integer viewAttr; } diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index 098b5516..78189090 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -17,7 +17,6 @@ import com.engine.organization.entity.company.po.CompPO; import com.engine.organization.entity.department.bo.DepartmentBO; import com.engine.organization.entity.department.po.DepartmentPO; import com.engine.organization.entity.extend.bo.ExtendInfoBO; -import com.engine.organization.entity.extend.param.ExtendInfoParams; import com.engine.organization.entity.extend.po.ExtendInfoPO; import com.engine.organization.entity.hrmresource.bo.HrmRelationBO; import com.engine.organization.entity.hrmresource.param.HrmRelationSaveParam; @@ -35,7 +34,6 @@ import com.engine.organization.entity.searchtree.SearchTreeParams; import com.engine.organization.enums.HrmGroupEnum; import com.engine.organization.mapper.comp.CompMapper; import com.engine.organization.mapper.department.DepartmentMapper; -import com.engine.organization.mapper.extend.ExtMapper; import com.engine.organization.mapper.hrmresource.HrmRelationMapper; import com.engine.organization.mapper.hrmresource.SystemDataMapper; import com.engine.organization.mapper.job.JobMapper; @@ -55,12 +53,12 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.json.JSONException; import org.json.JSONObject; +import weaver.common.DateUtil; import weaver.conn.RecordSet; import weaver.general.StringUtil; import weaver.general.Util; import weaver.hrm.definedfield.HrmFieldManager; -import java.time.LocalDateTime; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; @@ -137,7 +135,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic WeaTableColumn weaTableColumn = new WeaTableColumn(); - List jsonObjectList = getHrmResourceMapper().queryAllResColumns(level,grade); + //List jsonObjectList = getHrmResourceMapper().queryAllResColumns(level, grade); // for (com.alibaba.fastjson.JSONObject jsonObject : jsonObjectList){ // System.out.println(jsonObject.getString("level_name")); // weaTableColumn.setText("职等"); @@ -476,10 +474,10 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic @Override public Map getCustomTemplate(Map params) { List infoPOList = new ArrayList<>(); - infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("name").fieldNameDesc("模板名称").fieldType("varchar(255)").controlType(1).browserType("1").customValue("[\"input\",\"text\",\"50\"]").showOrder(1).isrequired(0).isSystemDefault(0).build()); - infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("createTime").fieldNameDesc("创建时间").fieldType("date").controlType(1).browserType("1").customValue("[\"input\",\"text\",\"50\"]").showOrder(2).isrequired(0).isSystemDefault(0).build()); + infoPOList.add(ExtendInfoPO.builder().viewAttr(2).id(null).fieldName("name").fieldNameDesc("模板名称").fieldType("varchar(255)").controlType(1).browserType("1").customValue("[\"input\",\"text\",\"50\"]").showOrder(1).isrequired(0).isSystemDefault(0).build()); + infoPOList.add(ExtendInfoPO.builder().viewAttr(1).id(null).fieldName("createTime").fieldNameDesc("创建时间").fieldType("date").controlType(1).browserType("1").customValue("[\"input\",\"text\",\"50\"]").showOrder(2).isrequired(0).isSystemDefault(0).build()); Map tabInfoMap = new HashMap<>(); - tabInfoMap.put("columns", ExtendInfoBO.convertInfoListToTable(user, infoPOList, 2, false, true)); + tabInfoMap.put("columns", ExtendInfoBO.convertInfoListToTable(user, infoPOList, false, true)); List jclOrgCustomTemplatePOS = MapperProxyFactory.getProxy(JclOrgCustomTemplateMapper.class).listAll(); List isUsed = new ArrayList<>(); AtomicInteger index = new AtomicInteger(0); @@ -487,9 +485,9 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic Map resultMap = new HashMap<>(); resultMap.put("id", item.getId()); resultMap.put("name", item.getName()); - resultMap.put("createTime", item.getCreateTime()); + resultMap.put("createTime", DateUtil.getDate(item.getCreateTime())); - if(item.getIsused()!=null){ + if (item.getIsused() != null) { if (1 == item.getIsused()) { isUsed.add(index.get()); @@ -1067,7 +1065,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic private static String getFieldName(String fieldabel) { RecordSet recordSet = new RecordSet(); String fieldname = null; - recordSet.executeQuery("select fieldname from jcl_org_field where fieldlabel='" + fieldabel+"'"); + recordSet.executeQuery("select fieldname from jcl_org_field where fieldlabel='" + fieldabel + "'"); if (recordSet.next()) { fieldname = recordSet.getString("fieldname"); } diff --git a/src/com/engine/organization/web/HrmResourceController.java b/src/com/engine/organization/web/HrmResourceController.java index e8ea8c7e..dee144f0 100644 --- a/src/com/engine/organization/web/HrmResourceController.java +++ b/src/com/engine/organization/web/HrmResourceController.java @@ -332,6 +332,7 @@ public class HrmResourceController { } } + @POST @Path("/updateCustomTemplate") @Produces(MediaType.APPLICATION_JSON) public ReturnResult updateCustomTemplate(@Context HttpServletRequest request, @Context HttpServletResponse response) {