组织管理，岗位台账、岗位浏览按钮列表展示优化

src/com/api/browser/service/impl/JobBrowserService.java

@@ -78,10 +78,12 @@ public class JobBrowserService extends BrowserService {
         String q = Util.null2String(httpServletRequest.getParameter("q"));
         List<String> sqlParams = new ArrayList<>();
         String keyword = "";
-        if (q.length() > 0) keyword = "%" + q + "%";
+        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, t.sequence_id, t.scheme_id , t.grade_id , t.level_id ";
+        String backfields = "t.id, 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 += "  ";
@@ -99,7 +101,7 @@ public class JobBrowserService extends BrowserService {
         rs.executeQuery(sql, sqlParams);
         List<Map<String, String>> datas = new ArrayList<>();
         while (rs.next()) {
-            Map<String, String> item = new HashMap<>();
+            Map<String, String> item = new HashMap<>(3);
             item.put("id", Util.null2String(rs.getString("id")));
             String name = Util.null2String(rs.getString("name"));
             item.put("name", name);

src/com/engine/organization/entity/job/bo/JobBO.java

@@ -85,13 +85,10 @@ public class JobBO {
                         .jobTitleName(e.getJobTitleName())
                         .subCompanyName(e.getSubCompanyName())
                         .departmentName(e.getDepartmentName())
-                        //.sequenceName(e.getSequenceName())
-                        //.schemeName(e.getSchemeName())
-                        //.parentJob(e.getParentJob())
-                        //.parentJobName(null == poMaps.get(e.getParentJob()) ? "" : poMaps.get(e.getParentJob()).getJobName())
+                        .jobGroupName(e.getJobGroupName())
+                        .jobActivityName(e.getJobActivityName())
                         .isKey(JobTransMethod.getIsKeySpan(e.getIsKey()))
                         .showOrder(e.getShowOrder())
-                        //.forbiddenTag(e.getForbiddenTag())
                         .isUsed(0)
                         .build()).collect(Collectors.toList());
         List<String> usedIds = MapperProxyFactory.getProxy(JobMapper.class).listUsedId();

src/com/engine/organization/entity/job/dto/JobListDTO.java

@@ -51,16 +51,18 @@ public class JobListDTO {
      */
     @TableTitle(title = "所属部门", dataIndex = "departmentName", key = "departmentName")
     private String departmentName;
+
     /**
-     * 岗位序列
+     * 职务类别
      */
-    //@TableTitle(title = "岗位序列", dataIndex = "sequenceName", key = "sequenceName")
-    //private String sequenceName;
+    @TableTitle(title = "职务类别", dataIndex = "jobGroupName", key = "jobGroupName")
+    private String jobGroupName;
+
     /**
-     * 等级方案
+     * 所属职务
      */
-    //@TableTitle(title = "等级方案", dataIndex = "schemeName", key = "schemeName")
-    //private String schemeName;
+    @TableTitle(title = "所属职务", dataIndex = "jobActivityName", key = "jobActivityName")
+    private String jobActivityName;
     /**
      * 上级岗位
      */

src/com/engine/organization/entity/job/vo/JobBrowserVO.java

@@ -19,8 +19,11 @@ 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",
-        fromSql = "FROM jcl_org_job t left join hrmjobtitles h on t.ec_jobTitle = h.id  ",
+        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 ",
+        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" +
+                " left join hrmjobgroups f on e.jobgroupid =f.id ",
         orderby = "id",
         sortway = "asc",
         primarykey = "id",
@@ -41,6 +44,13 @@ public class JobBrowserVO {
     @OrganizationTableColumn(text = "岗位名称", width = "25%", column = "name")
     private String jobName;
 
+    @OrganizationTableColumn(text = "职务类别", width = "25%", column = "jobGroupName")
+    private String jobGroupName;
+
+    @OrganizationTableColumn(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")

src/com/engine/organization/mapper/job/JobMapper.xml

@@ -374,6 +374,8 @@
         b.departmentname ,
         c.sequence_name,
         d.scheme_name,
+        e.jobactivityname,
+        f.jobgroupname,
         <include refid="baseColumns"/>
         FROM jcl_org_job t
         left join hrmsubcompany a on
@@ -385,6 +387,8 @@
         left join jcl_org_scheme d on
         t.scheme_id = d.id
         left join hrmjobtitles h on t.ec_jobTitle = h.id
+        left join hrmjobactivities e on h.jobactivityid =e.id
+        left join hrmjobgroups f on e.jobgroupid =f.id
         WHERE t.delete_type = 0 order by ${orderSql}
     </select>