Przeglądaj źródła

个人档案部门暂时清除

jzh 1 rok temu
rodzic
commit
a5bc9c9c38

+ 1 - 1
zjugis-business/src/main/java/com/zjugis/business/flow/recruit/entity/RecruitDO.java

@@ -56,7 +56,7 @@ public class RecruitDO extends BaseEntity {
      * 部门名称
      */
     private String deptName;
-    
+
     /**
      * 年份
      */

+ 5 - 2
zjugis-module-adm/zjugis-module-adm-api/src/main/java/com/zjugis/module/adm/api/staff/dto/StaffRecordsDTO.java

@@ -16,7 +16,7 @@ import java.time.LocalDateTime;
  */
 
 @Data
-public class StaffRecordsDTO{
+public class StaffRecordsDTO {
 
     @Schema(description = "主键ID")
     private String id;
@@ -116,8 +116,11 @@ public class StaffRecordsDTO{
     @Schema(description = "紧急联系人姓名")
     private String jjlxrxm;
 
+    /**
+     * 1父母 2夫妻 3子女 4兄弟姐妹 5其他
+     */
     @Schema(description = "紧急联系人关系")
-    private String jjlxrgx;
+    private Integer jjlxrgx;
 
     @Schema(description = "基本情况备注")
     private String jbqkbz;

+ 2 - 13
zjugis-module-adm/zjugis-module-adm-biz/src/main/resources/mapper/staff/RecordsMapper.xml

@@ -3,12 +3,8 @@
 <mapper namespace="com.zjugis.module.adm.dal.mysql.staff.RecordsMapper">
 
     <select id="getRecordsPage" resultType="com.zjugis.module.adm.dal.dataobject.staff.StaffRecordSDO">
-        select t1.*,
-        t3.NAME as deptName,
-        t2.DEPT_ID as deptId
+        select t1.*
         from ADM_STAFF_RECORDS t1
-        left join SYSTEM_USER_DEPT t2 on t1.USER_ID = t2.USER_ID
-        left join SYSTEM_DEPT t3 on t2.DEPT_ID = t3.ID
 
         <where>
             DELETED=0
@@ -19,9 +15,6 @@
             <if test="params != null and params.state != null and params.state != ''">
                 AND t1.STATE = #{params.state}
             </if>
-            <if test="params != null and params.deptId != null and params.deptId != ''">
-                AND t2.DEPT_ID = #{params.deptId}
-            </if>
             <if test="params != null and params.zzmm != null and params.zzmm != ''">
                 AND t1.ZZMM = #{params.zzmm}
             </if>
@@ -57,12 +50,8 @@
     </select>
 
     <select id="selectStaffDetail" resultType="com.zjugis.module.adm.dal.dataobject.staff.StaffRecordSDO">
-        select t1.*,
-               t3.NAME    as deptName,
-               t2.DEPT_ID as deptId
+        select t1.*
         from ADM_STAFF_RECORDS t1
-                 left join SYSTEM_USER_DEPT t2 on t1.USER_ID = t2.USER_ID
-                 left join SYSTEM_DEPT t3 on t2.DEPT_ID = t3.ID
         where t1.USER_ID = #{userId}
     </select>
 </mapper>