From c2f1f022c75ffb0f2c9220db379c856e91f1b2df Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 10 Jul 2024 15:50:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=9A=E6=89=8D=E6=9E=97=E5=B2=97=E4=BD=8D?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=88=86=E9=83=A8=E3=80=81=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/job/vo/JobBrowserVO.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/com/engine/organization/entity/job/vo/JobBrowserVO.java b/src/com/engine/organization/entity/job/vo/JobBrowserVO.java index a6436b60..1a3f9440 100644 --- a/src/com/engine/organization/entity/job/vo/JobBrowserVO.java +++ b/src/com/engine/organization/entity/job/vo/JobBrowserVO.java @@ -19,7 +19,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @OrganizationTable(pageId = "98e9c62f-cd12-11ec-a15f-00ffcbed7123", - fields = "t.id, t.job_no, h.jobtitlename as name, t.sequence_id, t.scheme_id , t.grade_id , t.level_id , e.jobactivityname, f.jobgroupname ", + fields = "t.id, t.job_no,t.ec_company ,t.ec_department, h.jobtitlename as name, t.sequence_id, t.scheme_id , t.grade_id , t.level_id , e.jobactivityname, f.jobgroupname ", fromSql = "FROM jcl_org_job t" + " left join hrmjobtitles h on t.ec_jobTitle = h.id" + " left join hrmjobactivities e on h.jobactivityid =e.id" + @@ -41,6 +41,12 @@ public class JobBrowserVO { @OrganizationTableColumn(labelId = 547118, text = "编号", width = "25%", column = "job_no") private String jobNo; + @OrganizationTableColumn(labelId = 547332, text = "分部", width = "25%", column = "ec_company", transmethod = "com.engine.organization.transmethod.CompTransMethod.getSpanById") + private String subCompanyName; + + @OrganizationTableColumn(labelId = 547331, text = "部门", width = "25%", column = "ec_department", transmethod = "com.engine.organization.transmethod.DepartmentTransMethod.getSpanById") + private String departmentName; + @OrganizationTableColumn(labelId = 547595, text = "岗位名称", width = "25%", column = "name") private String jobName; @@ -50,13 +56,4 @@ public class JobBrowserVO { @OrganizationTableColumn(labelId = 547434, text = "所属职务", width = "25%", column = "jobActivityName") private String jobActivityName; - - //@OrganizationTableColumn(text = "等级方案", width = "25%", column = "scheme_id", transmethod = "com.engine.organization.transmethod.JobTransMethod.getSchemeName") - //private String schemeName; - //@OrganizationTableColumn(text = "职等", width = "25%", column = "level_id", transmethod = "com.engine.organization.transmethod.JobTransMethod.getLevelName") - //private String levelName; - //@OrganizationTableColumn(text = "职级", width = "25%", column = "grade_id", transmethod = "com.engine.organization.transmethod.JobTransMethod.getGradeName") - //private String gradeName; - //@OrganizationTableColumn(text = "岗位序列", width = "25%", column = "sequence_id", transmethod = "com.engine.organization.transmethod.JobTransMethod.getSequenceName") - //private String sequenceName; }