From 4d4827a2c4f3fd85d7832782750faa51b1eaa16b Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Wed, 26 Feb 2025 11:25:52 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=BC=81=E9=80=9A?= =?UTF-8?q?=E5=AD=A6=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=20=E6=A0=87?= =?UTF-8?q?=E5=87=86=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?enable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/organization/service/impl/ConfigServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/engine/organization/service/impl/ConfigServiceImpl.java b/src/com/engine/organization/service/impl/ConfigServiceImpl.java index 5b4d88f7..e126149b 100644 --- a/src/com/engine/organization/service/impl/ConfigServiceImpl.java +++ b/src/com/engine/organization/service/impl/ConfigServiceImpl.java @@ -48,7 +48,7 @@ public class ConfigServiceImpl extends Service implements ConfigService { public String ssoLogin(QTXConfigParam qtx) throws UnsupportedEncodingException { String hkUrl; BaseBean bb = new BaseBean(); - String enable = bb.getPropValue("qtx_sso_login", "enable"); + String enable = bb.getPropValue("hrmOrganization", "enable"); String userAgent = qtx.getUserAgent(); boolean termianal = MobileTerminalEnum.containsEnumValue(userAgent); if (VALUE_ONE.equals(enable)) { @@ -83,7 +83,7 @@ public class ConfigServiceImpl extends Service implements ConfigService { if (Objects.nonNull(qtxConfigPO)) { BeanUtils.copyProperties(datas, qtxConfigPO); } - map.put("isopenconfig",bb.getPropValue("qtx_sso_login","enable")); + map.put("isopenconfig",bb.getPropValue("hrmOrganization","enable")); map.put("columns",columns); map.put("datas", Collections.singletonList(datas)); return map; @@ -93,7 +93,7 @@ public class ConfigServiceImpl extends Service implements ConfigService { @Override public int saveConfigInfo(QTXConfigPO qtxConfigPO, String isopenconfig) { ConfigOperator ConfigOperator = new ConfigOperator(); - ConfigOperator.setProp("qtx_sso_login.properties", "enable", isopenconfig); + ConfigOperator.setProp("hrmOrganization.properties", "enable", isopenconfig); qtxConfigPO.setCreator(user.getUID()); qtxConfigPO.setCreateDate(OrganizationDateUtil.getFormatLocalDate(LocalDate.now())); getConfigMapper().deleteAll(); From 722e1b8fe6e9933341d01f5ba63f747a870efb18 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Thu, 6 Mar 2025 11:13:21 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=81=9A=E6=89=8D=E6=9E=97=E5=B2=97?= =?UTF-8?q?=E4=BD=8D=E5=A4=96=E9=83=A8=E6=90=9C=E7=B4=A2=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=20=E5=B2=97=E4=BD=8D=EF=BC=88=E5=88=86=E9=83=A8=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/api/browser/service/impl/JobBrowserService.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/com/api/browser/service/impl/JobBrowserService.java b/src/com/api/browser/service/impl/JobBrowserService.java index 5e60fd17..28cbeaf2 100644 --- a/src/com/api/browser/service/impl/JobBrowserService.java +++ b/src/com/api/browser/service/impl/JobBrowserService.java @@ -25,6 +25,7 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import weaver.conn.RecordSet; import weaver.general.Util; +import weaver.hrm.company.SubCompanyComInfo; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -77,13 +78,14 @@ public class JobBrowserService extends BrowserService { Map apidatas = new HashMap<>(); String q = Util.null2String(httpServletRequest.getParameter("q")); List sqlParams = new ArrayList<>(); + SubCompanyComInfo subInfo = new SubCompanyComInfo(); String keyword = ""; if (q.length() > 0) { keyword = "%" + q + "%"; } RecordSet rs = new RecordSet(); String sqlwhere = " where t.delete_type = 0 "; - String backfields = "t.id, t.job_no, h.jobtitlename as name "; + String backfields = "t.id,t.ec_company, t.job_no, h.jobtitlename as name "; String fromSql = "FROM jcl_org_job t left join hrmjobtitles h on t.ec_jobTitle = h.id "; String orderby = " order by t.id "; sqlwhere += " "; @@ -104,7 +106,8 @@ public class JobBrowserService extends BrowserService { Map item = new HashMap<>(3); item.put("id", Util.null2String(rs.getString("id"))); String name = Util.null2String(rs.getString("name")); - item.put("name", name); + String subCompanyname = subInfo.getSubCompanyname(Util.null2String(rs.getString("ec_company"))); + item.put("name", name+"("+subCompanyname+")"); item.put("title", name); datas.add(item); } From 2fe6013af1567b7e9ed99488182fed8eefb3c41a Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Mon, 10 Mar 2025 17:15:14 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84?= =?UTF-8?q?=E5=9B=BE=E5=A4=9A=E8=AF=AD=E8=A8=80=20key=E5=80=BC=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/organization/service/ChartService.java | 2 +- .../engine/organization/service/impl/ChartServiceImpl.java | 6 +++--- src/com/engine/organization/wrapper/OrgChartWrapper.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/engine/organization/service/ChartService.java b/src/com/engine/organization/service/ChartService.java index 99b0f721..768e1a93 100644 --- a/src/com/engine/organization/service/ChartService.java +++ b/src/com/engine/organization/service/ChartService.java @@ -100,7 +100,7 @@ public interface ChartService { * @param: [] * @return: java.util.Map */ - Map selectLabel(); + Map selectLabel(); /** * @Description: 历史版本删除 diff --git a/src/com/engine/organization/service/impl/ChartServiceImpl.java b/src/com/engine/organization/service/impl/ChartServiceImpl.java index 3fab7422..bdb6189d 100644 --- a/src/com/engine/organization/service/impl/ChartServiceImpl.java +++ b/src/com/engine/organization/service/impl/ChartServiceImpl.java @@ -715,9 +715,9 @@ public class ChartServiceImpl extends Service implements ChartService { } @Override - public Map selectLabel() { + public Map selectLabel() { RecordSet rs = new RecordSet(); - Map labelData = new HashMap<>(); + Map labelData = new HashMap<>(); //labelId集合 List labelIds = Arrays.asList(547190,547194,547196,547262,547282,547283,547284,547285,547286,547287,547292,547293,547294,547296,547298,547299,547300,547301,547302,547303,547304,547305,547307,547310,547313,547314,547315,547316,547317, 547318,547319,547320,547321,547322,547323,547324,547326,547327,547328,547329,547330,547331,547332,547333,547334,547345,547346,547447,547448,547468,547473,547475,547476,547477,547478,547478,547264,547265,547463,547464,547465, @@ -726,7 +726,7 @@ public class ChartServiceImpl extends Service implements ChartService { labelIds.forEach(item -> { rs.executeQuery("select labelName from HtmlLabelInfo where indexid = ? and languageid = ?",item,user.getLanguage()); if (rs.next()){ - labelData.put(item,HrmLabelVO.builder().labelName(Util.null2String(rs.getString("labelName"))).build()); + labelData.put(Util.null2String(item),HrmLabelVO.builder().labelName(Util.null2String(rs.getString("labelName"))).build()); } }); diff --git a/src/com/engine/organization/wrapper/OrgChartWrapper.java b/src/com/engine/organization/wrapper/OrgChartWrapper.java index 5346546a..ac99071d 100644 --- a/src/com/engine/organization/wrapper/OrgChartWrapper.java +++ b/src/com/engine/organization/wrapper/OrgChartWrapper.java @@ -91,7 +91,7 @@ public class OrgChartWrapper extends Service { return getChartService(user).recordStatistics(param); } - public Map selectLabel() { + public Map selectLabel() { return getChartService(user).selectLabel(); } From d2750025a5dc88f81055a815d92b41e400c18ace Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Fri, 14 Mar 2025 17:49:16 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=AE=80=E7=A7=B0?= =?UTF-8?q?=E5=8F=8A=E8=8A=B1=E5=90=8D=E5=86=8C=E6=A0=91=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/entity/department/bo/DepartmentBO.java | 2 +- .../organization/entity/department/dto/DepartmentListDTO.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java index 1b51b49b..4b1e3841 100644 --- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java +++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java @@ -171,7 +171,7 @@ public class DepartmentBO { tree.setPid(null == item.getSupDepId() ? "0" : item.getSupDepId().toString()); tree.setSelected(false); tree.setType("2"); - tree.setParentComp(null == item.getSupDepId() ? "0" : item.getSubCompanyId1().toString()); + tree.setParentComp(null == item.getSubCompanyId1() ? "0" : item.getSubCompanyId1().toString()); tree.setOrderNum(null == item.getShowOrder() ? 0.00 : item.getShowOrder().intValue()); tree.setShowOrderOfTree(null == item.getShowOrderOfTree() ? 0.00 : item.getShowOrderOfTree()); return tree; diff --git a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java index b16a3186..af6e170f 100644 --- a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java +++ b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java @@ -36,7 +36,7 @@ public class DepartmentListDTO { /** * 名称 */ - @TableTitle(labelId = 547141, title = "名称", dataIndex = "departmentMark", key = "departmentMark", width = "200") + @TableTitle(labelId = 547181, title = "简称", dataIndex = "departmentMark", key = "departmentMark", width = "200") private String departmentMark; /** @@ -48,7 +48,7 @@ public class DepartmentListDTO { /** * 简称 */ - @TableTitle(labelId = 547181, title = "简称", dataIndex = "departmentName", key = "departmentName") + @TableTitle(labelId = 547141, title = "名称", dataIndex = "departmentName", key = "departmentName") private String departmentName; /** From 418a302fcbf956d93789666f12eed91a71d56965 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Thu, 20 Mar 2025 09:34:45 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=AE=80=E7=A7=B0?= =?UTF-8?q?=E5=8F=8A=E8=8A=B1=E5=90=8D=E5=86=8C=E6=A0=91=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/department/bo/DepartmentBO.java | 9 +++++++++ .../entity/department/dto/DepartmentListDTO.java | 10 ++++++++++ 2 files changed, 19 insertions(+) diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java index 4b1e3841..7b539883 100644 --- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java +++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java @@ -10,6 +10,7 @@ import com.engine.organization.mapper.department.DepartmentMapper; import com.engine.organization.util.db.MapperProxyFactory; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; +import weaver.file.ImageFileManager; import weaver.general.Util; import weaver.hrm.company.DepartmentComInfo; import weaver.hrm.company.SubCompanyComInfo; @@ -38,8 +39,10 @@ public class DepartmentBO { } public static void setDeptLeader(List departments) { + for (DepartmentListDTO dept : departments) { dept.setBmfzr(getEmployeeNameById(dept.getId())); + List children = dept.getChildren(); if (CollectionUtils.isNotEmpty(children)){ setDeptLeader(children); @@ -227,5 +230,11 @@ public class DepartmentBO { } } + /** + * 获取部门自定义表字段（附件）显示值 跳转链接 + */ + private Map getImageFileName(Integer depetId){ + return null; + } } diff --git a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java index af6e170f..913d45a2 100644 --- a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java +++ b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java @@ -84,6 +84,16 @@ public class DepartmentListDTO { */ @TableTitle(labelId = 547186, title = "启用", dataIndex = "canceled", key = "canceled") private int canceled; + + /** + * 附件上传 + */ + @TableTitle(labelId = 17616, title = "附件上传", dataIndex = "imageFileName", key = "imageFileName") + private String imageFileName; + + private String fileUrl; + + /** * 操作列 */