From 808939c0fd8afc3d44e865f51bc4f267adbf0a85 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Mon, 18 Dec 2023 18:55:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E9=98=B3=E7=BC=96=E5=88=B6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/employee/vo/EmployeeTableVO.java   | 31 +++++++++++++------
 .../entity/staff/vo/StaffTableVO.java         | 13 ++++----
 .../organization/mapper/job/JobMapper.java    |  2 ++
 .../organization/mapper/job/JobMapper.xml     |  9 ++++++
 .../transmethod/JobTransMethod.java           |  6 ++++
 .../engine/organization/util/ConfigTrans.java |  5 ++-
 6 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java b/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java
index 96895d8d..208d6e7c 100644
--- a/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java
+++ b/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java
@@ -22,9 +22,13 @@ import lombok.NoArgsConstructor;
 @OrganizationTable(pageId = "80e7830c-18e8-4e14-8241-18821195ef31",
         fields = "t.id," +
                 "t.lastname," +
-                "t.mobile," +
-                "t.companystartdate," +
-                "t.sex",
+                "t.workcode," +
+                "t.sex," +
+                "t.status," +
+                "t.managerid," +
+                "t.jobtitle," +
+                "t.loginid," +
+                "t.seclevel",
         fromSql = "FROM hrmresource t ",
         orderby = "id",
         primarykey = "id",
@@ -35,17 +39,26 @@ public class EmployeeTableVO {
     @OrganizationTableColumn(column = "id", display = false)
     private Long id;
 
-    @OrganizationTableColumn(text = "姓名", width = "25%", column = "lastname")
+    @OrganizationTableColumn(text = "姓名", width = "10%", column = "lastname")
     private String lastname;
 
-    @OrganizationTableColumn(text = "性别", width = "25%", column = "sex",transmethod = "com.engine.organization.transmethod.JobTransMethod.getSexName")
+    @OrganizationTableColumn(text = "编号", width = "10%", column = "workcode")
+    private String workcode;
+
+    @OrganizationTableColumn(text = "性别", width = "10%", column = "sex",transmethod = "com.engine.organization.transmethod.JobTransMethod.getSexName")
     private String sex;
 
-    @OrganizationTableColumn(text = "手机", width = "25%", column = "mobile")
-    private String mobile;
+    @OrganizationTableColumn(text = "直接上级", width = "10%", column = "managerid",transmethod = "com.engine.organization.transmethod.ManagerDetachTransMethod.getManagerName")
+    private String managerid;
+
+    @OrganizationTableColumn(text = "岗位", width = "10%", column = "jobtitle",transmethod = "com.engine.organization.transmethod.JobTransMethod.getJobTitleName")
+    private String jobtitle;
+
+    @OrganizationTableColumn(text = "登录名", width = "10%", column = "loginid")
+    private String loginid;
 
-    @OrganizationTableColumn(text = "入职日期", width = "25%", column = "companystartdate")
-    private String companystartdate;
+    @OrganizationTableColumn(text = "安全级别", width = "10%", column = "seclevel")
+    private String seclevel;
 
 
 }
diff --git a/src/com/engine/organization/entity/staff/vo/StaffTableVO.java b/src/com/engine/organization/entity/staff/vo/StaffTableVO.java
index 4e2e5e0f..38b60fea 100644
--- a/src/com/engine/organization/entity/staff/vo/StaffTableVO.java
+++ b/src/com/engine/organization/entity/staff/vo/StaffTableVO.java
@@ -25,8 +25,11 @@ import lombok.NoArgsConstructor;
         operates = {
                 @OrganizationTableOperate(text = "编辑"),
                 @OrganizationTableOperate(index = "1", text = "删除"),
-                @OrganizationTableOperate(index = "2", text = "变更")
-        }, tableType = WeaTableType.CHECKBOX
+                @OrganizationTableOperate(index = "2", text = "变更"),
+                @OrganizationTableOperate(index = "3", text = "详情")
+        }, tableType = WeaTableType.CHECKBOX,
+        operatePopedom = @OperatePopedom(transmethod = "com.engine.organization.util.ConfigTrans.formatStaffOperates", otherpara = "column:control_dimension")
+
 
 )
 public class StaffTableVO {
@@ -35,11 +38,7 @@ public class StaffTableVO {
      */
     @OrganizationTableColumn(column = "id", display = false)
     private Long id;
-    /**
-     * 是否被引用
-     */
-    @OrganizationTableColumn(column = "isUsed", display = false)
-    private Integer isUsed;
+
     /**
      * 方案id
      */
diff --git a/src/com/engine/organization/mapper/job/JobMapper.java b/src/com/engine/organization/mapper/job/JobMapper.java
index e1a03e49..796691d1 100644
--- a/src/com/engine/organization/mapper/job/JobMapper.java
+++ b/src/com/engine/organization/mapper/job/JobMapper.java
@@ -149,4 +149,6 @@ public interface JobMapper {
     List<String> isAllowDelete(@Param("jobId") Long jobId);
 
     JobPO getJobByResource(@Param("resourcePO") ResourcePO resourcePO);
+
+    String selectJobTitleById(@Param("id") String id);
 }
diff --git a/src/com/engine/organization/mapper/job/JobMapper.xml b/src/com/engine/organization/mapper/job/JobMapper.xml
index fdf615f2..c41d004b 100644
--- a/src/com/engine/organization/mapper/job/JobMapper.xml
+++ b/src/com/engine/organization/mapper/job/JobMapper.xml
@@ -512,12 +512,21 @@
                                              t.ec_department = h.departmentid
         where h.status &lt; 4
     </select>
+
     <select id="isAllowDelete" resultType="java.lang.String">
         select t.id
         from jcl_org_job t
                  inner join hrmresource h on t.ec_jobtitle = h.jobtitle and t.ec_company = h.subcompanyid1 and
                                              t.ec_department = h.departmentid and t.id = #{jobId} and h.status &lt; 4
     </select>
+
+    <select id="selectJobTitleById" resultType="java.lang.String">
+        select jobtitlename
+        from hrmjobtitles where id = #{id}
+    </select>
+
+
+
     <select id="getJobByResource" resultType="com.engine.organization.entity.job.po.JobPO">
         select
         <include refid="baseColumns"/>
diff --git a/src/com/engine/organization/transmethod/JobTransMethod.java b/src/com/engine/organization/transmethod/JobTransMethod.java
index 2c09c921..5b500f1d 100644
--- a/src/com/engine/organization/transmethod/JobTransMethod.java
+++ b/src/com/engine/organization/transmethod/JobTransMethod.java
@@ -52,6 +52,12 @@ public class JobTransMethod {
         return schemeMapper.getSchemeByID(Long.parseLong(schemeId)).getSchemeName();
     }
 
+    public static String getJobTitleName(String jobTitle) {
+        JobMapper jobMapper = MapperProxyFactory.getProxy(JobMapper.class);
+        return jobMapper.selectJobTitleById(jobTitle);
+    }
+
+
     public static String getIsKeySpan(String isKey) {
         if ("1".equals(isKey)) {
             return "是";
diff --git a/src/com/engine/organization/util/ConfigTrans.java b/src/com/engine/organization/util/ConfigTrans.java
index 8d647d90..ddc3efb3 100644
--- a/src/com/engine/organization/util/ConfigTrans.java
+++ b/src/com/engine/organization/util/ConfigTrans.java
@@ -20,6 +20,7 @@ public class ConfigTrans {
         }
     }
 
+
     public static List<Object> formatSourceOperates(String id, String isDefault) {
         List list = Lists.newArrayList();
         list.add(true);
@@ -34,7 +35,9 @@ public class ConfigTrans {
     public static List<Object> formatStaffOperates(String id, String isDefault) {
         List list = Lists.newArrayList();
         list.add(true);
-        if ("0".equals(isDefault)) {
+        list.add(true);
+        list.add(true);
+        if ("3".equals(isDefault)) {
             list.add(true);
         } else {
             list.add(false);