From 7bc3a97bbb433025b4c8fe69d607c63d83a6d4f8 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Mon, 22 Jul 2024 16:59:30 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=8E=9F=E6=96=B9=E6=B3=95=E4=BF=9D=E7=95=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/util/response/ReturnResult.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/engine/organization/util/response/ReturnResult.java b/src/com/engine/organization/util/response/ReturnResult.java index 2f5562c0..0c7204fa 100644 --- a/src/com/engine/organization/util/response/ReturnResult.java +++ b/src/com/engine/organization/util/response/ReturnResult.java @@ -113,11 +113,11 @@ public class ReturnResult implements Serializable { * @param data * @return */ - //@Deprecated - //public static ReturnResult successed(T data) { - // - // return new ReturnResult<>(ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMessage(), data); - //} + @Deprecated + public static ReturnResult successed(T data) { + + return new ReturnResult<>(ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMessage(), data); + } /** * 多语言响应 From 5a230ea962167cdb572d22c22e85a56e6fd627ca Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Tue, 23 Jul 2024 10:02:43 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=80=E9=94=AE?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E6=89=80=E6=9C=89=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/organization/service/impl/HrmResourceServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index fbe393a8..994d70c3 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -589,6 +589,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic btnDatas.put("topMenu", topMenuList); btnDatas.put("rightMenu", rightMenuList); btnDatas.put("hasRight", true); + btnDatas.put("loginId", user.getUID()); return btnDatas; } From ec84cd6ccf2fabb9e9b86eacfeb630d44ad78d85 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Wed, 24 Jul 2024 15:41:32 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hrmresource/po/SearchTemplatePO.java | 1 + .../mapper/resource/HrmResourceMapper.java | 4 ++ .../mapper/resource/HrmResourceMapper.xml | 17 ++++++ .../resource/JclOrgCustomTemplateMapper.java | 4 +- .../resource/JclOrgCustomTemplateMapper.xml | 13 +++- .../service/HrmResourceService.java | 8 +++ .../service/impl/HrmResourceServiceImpl.java | 61 ++++++++++++++++--- .../web/HrmResourceController.java | 14 +++++ .../wrapper/HrmResourceWrapper.java | 4 ++ 9 files changed, 115 insertions(+), 11 deletions(-) diff --git a/src/com/engine/organization/entity/hrmresource/po/SearchTemplatePO.java b/src/com/engine/organization/entity/hrmresource/po/SearchTemplatePO.java index 4393a206..6fd748ca 100644 --- a/src/com/engine/organization/entity/hrmresource/po/SearchTemplatePO.java +++ b/src/com/engine/organization/entity/hrmresource/po/SearchTemplatePO.java @@ -26,4 +26,5 @@ public class SearchTemplatePO { private Integer creator; private Date createTime; private Date updateTime; + private Integer overall; } diff --git a/src/com/engine/organization/mapper/resource/HrmResourceMapper.java b/src/com/engine/organization/mapper/resource/HrmResourceMapper.java index 5e6039bc..816b1be1 100644 --- a/src/com/engine/organization/mapper/resource/HrmResourceMapper.java +++ b/src/com/engine/organization/mapper/resource/HrmResourceMapper.java @@ -55,6 +55,8 @@ public interface HrmResourceMapper { */ List getCustomTemplatesByUser(@Param("userId") Integer userId); + List getCustomOverAll(); + SearchTemplatePO getSearchTemplateById(@Param("id") String id); SearchTemplatePO getSearchTemplateByName(@Param("userId") Integer userId, @Param("name") String name); @@ -65,6 +67,8 @@ public interface HrmResourceMapper { SearchTemplatePO getUsedCustomTemplateByUser(@Param("userId") Integer userId); + SearchTemplatePO getOverallCustomTemplate(); + Integer insertSearchTemplate(SearchTemplatePO templatePO); Integer deleteSearchTemplate(@Param("id") Integer Id, @Param("userId") Integer userId); diff --git a/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml index 8097bea6..fd4847dc 100644 --- a/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml +++ b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml @@ -150,6 +150,13 @@ where creator = #{userId} + + @@ -445,9 +452,19 @@ select * from jcl_org_custom_template where ISUSED = 1 + and overall = 0 and creator = #{userId} + + + + + + + + diff --git a/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.xml b/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.xml index 0e37db0f..432e2ba2 100644 --- a/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.xml +++ b/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.xml @@ -14,12 +14,13 @@ + id,name,basic_fields, personal_fields,work_fields,isused, - creator,create_time,update_time + creator,create_time,update_time,overall select - from JCL_ORG_CUSTOM_TEMPLATE t where t.isused = #{isused} and t.creator = #{creator} + from JCL_ORG_CUSTOM_TEMPLATE t where t.isused = #{isused} and t.creator = #{creator} and overall is null @@ -183,6 +186,9 @@ work_fields, + + isused, + @@ -206,6 +212,9 @@ #{workFields}, + + #{isused}, + @@ -479,5 +488,12 @@ order by id + \ No newline at end of file diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index c450894c..532e2ba2 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -273,6 +273,9 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic templatePO.setCreator(user.getUID()); templatePO.setCreateTime(new Date()); templatePO.setUpdateTime(new Date()); + templatePO.setIsused("1"); + // 将之前的模板，isused置为null + getHrmResourceMapper().updateCustomTemplateUsed(user.getUID()); getHrmResourceMapper().insertSearchTemplate(templatePO); return templatePO.getId(); } @@ -630,6 +633,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic btnDatas.put("loginId", user.getUID()); //获取当前用户使用的列定制模板Id btnDatas.put("customTemplateId", getCustomTemplateId()); + btnDatas.put("searchTemplateId", getSearchTemplateId()); return btnDatas; } @@ -656,6 +660,22 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic return customTemplateId; } + /** + * 获取当前用户使用的查询模板Id + * + * @return + */ + private String getSearchTemplateId() { + + String searchTemplateId = "-1"; + SearchTemplatePO usedCustomTemplate = getHrmResourceMapper().getUsedSerarchTemplateByUser(user.getUID()); + if (null != usedCustomTemplate) { + searchTemplateId = usedCustomTemplate.getId().toString(); + } + + return searchTemplateId; + } + @Override public Map getTabForm(Map params) { Map apiDatas = new HashMap<>(); From 6af0092549a9ed337e4a47cb3ae8670dfe78d712 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 25 Jul 2024 16:56:03 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=88=97=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E6=A8=A1=E6=9D=BF=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ExportCommonServiceImpl.java | 36 +++++++++++++------ .../transmethod/HrmResourceTransMethod.java | 33 +++++++++++++++++ 2 files changed, 59 insertions(+), 10 deletions(-) diff --git a/src/com/engine/organization/service/impl/ExportCommonServiceImpl.java b/src/com/engine/organization/service/impl/ExportCommonServiceImpl.java index 5c2b1369..d755dfbf 100644 --- a/src/com/engine/organization/service/impl/ExportCommonServiceImpl.java +++ b/src/com/engine/organization/service/impl/ExportCommonServiceImpl.java @@ -14,12 +14,14 @@ import com.engine.organization.component.OrganizationWeaTable; import com.engine.organization.entity.department.bo.DepartmentBO; import com.engine.organization.entity.department.dto.DepartmentListDTO; import com.engine.organization.entity.department.po.DepartmentPO; +import com.engine.organization.entity.hrmresource.po.JclOrgCustomTemplatePO; import com.engine.organization.entity.hrmresource.po.SearchTemplatePO; import com.engine.organization.entity.hrmresource.vo.HrmResourceVO; import com.engine.organization.entity.staff.po.StaffPO; import com.engine.organization.entity.staff.vo.StaffTableVO; import com.engine.organization.mapper.department.DepartmentMapper; import com.engine.organization.mapper.resource.HrmResourceMapper; +import com.engine.organization.mapper.resource.JclOrgCustomTemplateMapper; import com.engine.organization.mapper.resource.ResourceMapper; import com.engine.organization.mapper.staff.StaffMapper; import com.engine.organization.mapper.staff.StaffPlanMapper; @@ -141,18 +143,31 @@ public class ExportCommonServiceImpl extends Service implements ExportCommonServ HrmResourceServiceImpl hrmResourceService = ServiceUtil.getService(HrmResourceServiceImpl.class,user); List allConditions = hrmResourceService.getAllConditions(); - List columnList; + JclOrgCustomTemplatePO jclOrgCustomTemplatePO = MapperProxyFactory.getProxy(JclOrgCustomTemplateMapper.class).queryIsusedTemp("1", String.valueOf(user.getUID())); - // 查询当前台账定制列 - SearchTemplatePO usedCustomTemplate = MapperProxyFactory.getProxy(HrmResourceMapper.class).getUsedCustomTemplateByUser(user.getUID()); - if (null == usedCustomTemplate) { - // 默认列定制 - String selectKeys = "-1_hrm_lastname,-1_hrm_departmentid,-1_hrm_jobtitle,-1_hrm_mobile,-1_hrm_telephone,-1_hrm_managerid"; - columnList = Arrays.asList(selectKeys.split(",")); - } else { - columnList = hrmResourceService.getSelectKeys(usedCustomTemplate); + //2.是否存在通用模板 + if (null == jclOrgCustomTemplatePO) { + jclOrgCustomTemplatePO = MapperProxyFactory.getProxy(JclOrgCustomTemplateMapper.class).queryOverAll(); } + String columns = ""; + if (jclOrgCustomTemplatePO != null) { + if (org.apache.commons.lang3.StringUtils.isNotBlank(jclOrgCustomTemplatePO.getBasicFields())) { + columns = jclOrgCustomTemplatePO.getBasicFields(); + } + if (org.apache.commons.lang3.StringUtils.isNotBlank(jclOrgCustomTemplatePO.getPersonalFields())) { + columns = columns + "," + jclOrgCustomTemplatePO.getPersonalFields(); + } + if (org.apache.commons.lang3.StringUtils.isNotBlank(jclOrgCustomTemplatePO.getWorkFields())) { + columns = columns + "," + jclOrgCustomTemplatePO.getWorkFields(); + } + } else { + //初次使用，无模板初始值 + columns = "-1_hrm_lastname,-1_hrm_departmentid,-1_hrm_subcompanyid1,-1_hrm_jobtitle,-1_hrm_mobile,-1_hrm_telephone,-1_hrm_managerid,-1_hrm_sporder"; + } + + List columnList = Arrays.asList(columns.split(",")); + BigDecimal decimal = new BigDecimal(100 / columnList.size()); @@ -168,7 +183,8 @@ public class ExportCommonServiceImpl extends Service implements ExportCommonServ weaTableColumn.setText(MapperProxyFactory.getProxy(HrmResourceMapper.class).queryLabelName(fieldName, scopeId, user.getLanguage())); weaTableColumn.setColumn(hrmResourceService.buildTableSql(columnName).replace(".", "_")); weaTableColumn.setDisplay(columnList.contains(columnName) ? WeaBoolAttr.TRUE : WeaBoolAttr.FALSE); - weaTableColumn.setTransmethod("com.engine.organization.transmethod.HrmResourceTransMethod.getFieldTrueValue"); + // 导出专用转换，去除html标签 + weaTableColumn.setTransmethod("com.engine.organization.transmethod.HrmResourceTransMethod.getFieldTrueValueExp"); weaTableColumn.setOtherpara(columnName); weaTableColumn.setWidth(decimal.setScale(2, RoundingMode.HALF_UP).doubleValue() + "%"); if (weaTableColumn.getDisplay().getBoolVal()) { diff --git a/src/com/engine/organization/transmethod/HrmResourceTransMethod.java b/src/com/engine/organization/transmethod/HrmResourceTransMethod.java index 35ae848f..c3313fd0 100644 --- a/src/com/engine/organization/transmethod/HrmResourceTransMethod.java +++ b/src/com/engine/organization/transmethod/HrmResourceTransMethod.java @@ -16,6 +16,13 @@ import weaver.hrm.definedfield.HrmFieldManager; */ public class HrmResourceTransMethod { + /** + * 字段展示内容转换，列表用 + * + * @param id + * @param para + * @return + */ public static String getFieldTrueValue(String id, String para) { HrmFieldManager hfm = new HrmFieldManager("HrmCustomFieldByInfoType", Integer.parseInt(para.split("_")[0])); String fieldName = para.substring(para.lastIndexOf("_") + 1); @@ -32,6 +39,32 @@ public class HrmResourceTransMethod { } } + /** + * 字段展示内容转换，导出用 + * + * @param id + * @param para + * @return + */ + public static String getFieldTrueValueExp(String id, String para) { + HrmFieldManager hfm = new HrmFieldManager("HrmCustomFieldByInfoType", Integer.parseInt(para.split("_")[0])); + String fieldName = para.substring(para.lastIndexOf("_") + 1); + JSONObject hrmFieldConf = hfm.getHrmFieldConf(fieldName); + User user = new User(); + user.setUid(1); + try { + if (hfm.isBaseField(fieldName) && "jobactivity".equals(fieldName)) { + hrmFieldConf.put("type", 282); + } + String fieldvalue = hfm.getFieldvalue(null, user, null, hrmFieldConf.getString("dmlurl"), hrmFieldConf.getInt("id"), hrmFieldConf.getInt("fieldhtmltype"), hrmFieldConf.getInt("type"), id, 0, fieldName); + // fieldvalue去除Html内容 + fieldvalue = fieldvalue.replaceAll("<[^>]*>", "").replaceAll(" ", ""); + return fieldvalue; + } catch (Exception e) { + return ""; + } + } + public static String getDepartmentName(String departmentId) { return MapperProxyFactory.getProxy(DepartmentMapper.class).getDeptNameById(Integer.parseInt(departmentId)); }