zhoulisky 9 months ago
parent
commit
047cff6403

BIN
doc/xls导入模板/2-技术人员花名册 -2025-06.xls


+ 1 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/mapper/TechnicianMapper.xml

@@ -137,7 +137,7 @@
         LEFT JOIN
         (
             SELECT
-                t.unicode,t.`name`,t.gender,t.number, t.id_card,t.birthday, t.ethnic, t.secondary_unit, t.department,t.post,t.post_location,t.nature, t.hire_date, t.education, t.degree, t.school_name, t.major, t.rank, t.practicing_requirement,t.situation,t.personnel_type, t.remark
+                t.unicode,t.`name`,t.gender,t.number, t.id_card,t.birthday, t.ethnic, t.department,t.post,t.post_location,t.nature, t.hire_date, t.education, t.degree, t.school_name, t.major, t.rank, t.practicing_requirement,t.situation,t.personnel_type, t.remark
             FROM kd_technician t
             WHERE LEFT(t.year_and_month, 4) = #{ew.yearAndMonth}
             GROUP BY unicode

+ 3 - 2
kd-service/kd-scientific/src/main/java/org/sky/scientific/mapper/XmBgrzMapper.xml

@@ -38,8 +38,9 @@
         XM_ID,
         XMBH,
         COALESCE( (SELECT bgrz.BGHDZ FROM kd_xm_bgrz bgrz WHERE bgrz.XM_ID = xm.id AND bgrz.ZDMC = 'xmmc' ORDER BY bgrz.BGSXSJ DESC LIMIT 1), xm.XMMC ) AS XMMC,
-        COALESCE( (SELECT bgrz.BGHDZ FROM kd_xm_bgrz bgrz WHERE bgrz.XM_ID = xm.id AND bgrz.ZDMC = 'XMSQDW' ORDER BY bgrz.BGSXSJ DESC LIMIT 1),xm.XMSQDW) AS XMSQDW,
-        rz.ZDMC,BGQDZ,BGHDZ,BGSXSJ,BGYY,rz.attachment
+        COALESCE( (SELECT bgrz.BGHDZ FROM kd_xm_bgrz bgrz WHERE bgrz.XM_ID = xm.id AND bgrz.ZDMC = 'XMSQDWID' ORDER BY bgrz.BGSXSJ DESC LIMIT 1),xm.XMSQDWID) AS XMSQDWID,
+        (SELECT CONCAT_WS('/',(SELECT name FROM kd_department d2 WHERE d2.id = d1.parent_id), d1.`name`) as departmentName FROM kd_department d1 WHERE d1.id = XMSQDWID) AS XMSQDW,
+         rz.ZDMC,BGQDZ,BGHDZ,BGSXSJ,BGYY,rz.attachment
         FROM kd_xm_bgrz rz
         LEFT JOIN kd_xm xm ON rz.XM_ID = xm.id
         WHERE rz.is_deleted = 0

+ 1 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/mapper/XmMapper.xml

@@ -146,8 +146,8 @@
             COALESCE( (SELECT bgrz.BGHDZ FROM kd_xm_bgrz bgrz WHERE bgrz.XM_ID = xm.id AND bgrz.ZDMC = 'xmmc' ORDER BY bgrz.BGSXSJ DESC LIMIT 1), XMMC ) AS XMMC,
             XMBH,
             COALESCE( (SELECT bgrz.BGHDZ FROM kd_xm_bgrz bgrz WHERE bgrz.XM_ID = id AND bgrz.ZDMC = 'XMFZR' ORDER BY bgrz.BGSXSJ DESC LIMIT 1),XMFZR) AS XMFZR,
-            COALESCE( (SELECT bgrz.BGHDZ FROM kd_xm_bgrz bgrz WHERE bgrz.XM_ID = xm.id AND bgrz.ZDMC = 'XMSQDW' ORDER BY bgrz.BGSXSJ DESC LIMIT 1),XMSQDW) AS XMSQDW,
             COALESCE( (SELECT bgrz.BGHDZ FROM kd_xm_bgrz bgrz WHERE bgrz.XM_ID = xm.id AND bgrz.ZDMC = 'XMSQDWID' ORDER BY bgrz.BGSXSJ DESC LIMIT 1),xm.XMSQDWID) AS XMSQDWID,
+            (SELECT CONCAT_WS('/',(SELECT name FROM kd_department d2 WHERE d2.id = d1.parent_id), d1.`name`) as departmentName FROM kd_department d1 WHERE d1.id = XMSQDWID) AS XMSQDW,
             xm.XMKSSJ,
             COALESCE( (SELECT bgrz.BGHDZ FROM kd_xm_bgrz bgrz WHERE bgrz.XM_ID = xm.id AND bgrz.ZDMC = 'XMJSSJ' ORDER BY bgrz.BGSXSJ DESC LIMIT 1),XMJSSJ) AS XMJSSJ,
             YJLX,

+ 1 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/mapper/XmTechnicianHoursMapper.xml

@@ -38,7 +38,7 @@
         SELECT
         xt.id,
         xm.xmmc,xm.xmbh,xm.xm_id,
-        t.name, t.unicode, t.number,t.id_card,t.secondary_unit,t.department,t.nature,t.situation,t.personnel_type
+        t.name, t.unicode, t.number,t.id_card,t.department,t.nature,t.situation,t.personnel_type
         FROM kd_xm_technician xt
         LEFT JOIN kd_technician t on xt.unicode = t.unicode and t.year_and_month = #{ew.yearAndMonth}
         LEFT JOIN (

+ 5 - 5
kd-service/kd-scientific/src/main/java/org/sky/scientific/mapper/XmTechnicianMapper.xml

@@ -60,7 +60,7 @@
         SELECT
         xt.id,
         xm.*,
-        t.name, t.unicode, t.number,t.id_card,t.secondary_unit,t.department,t.nature,t.situation,t.personnel_type
+        t.name, t.unicode, t.number,t.id_card,t.department,t.nature,t.situation,t.personnel_type
         FROM kd_xm_technician xt
         LEFT JOIN kd_technician t on xt.unicode = t.unicode and t.year_and_month = #{ew.yearAndMonth}
         LEFT JOIN (
@@ -98,7 +98,7 @@
             resultMap="ResultXmTechnicianSummary">
         SELECT
         xm.XMMC,
-        t.unicode,t.name, t.number,t.id_card,t.secondary_unit,t.department,t.post,t.post_location,t.nature,t.situation,t.personnel_type,t.year_and_month
+        t.unicode,t.name, t.number,t.id_card,t.department_id,t.department,t.post,t.post_location,t.nature,t.situation,t.personnel_type,t.year_and_month
         FROM kd_xm_technician m
         LEFT JOIN kd_technician t on t.unicode = m.unicode and t.year_and_month = #{ew.yearAndMonth}
         LEFT JOIN (
@@ -116,7 +116,7 @@
             resultMap="ResultXmTechnicianSummary">
         SELECT
         xm.XMMC,
-        t.unicode,t.number,t.id_card, t.name,t.secondary_unit,t.department,t.post,t.post_location,t.nature,t.situation,t.personnel_type
+        t.unicode,t.number,t.id_card, t.name,t.department_id,t.department,t.post,t.post_location,t.nature,t.situation,t.personnel_type
         FROM kd_xm_technician m
         LEFT JOIN kd_technician t on t.unicode = m.unicode and left(t.year_and_month,4) = #{ew.yearAndMonth}
         LEFT JOIN (
@@ -134,12 +134,12 @@
         SELECT
         xt.unicode,
         COUNT(DISTINCT xm_id) as proCount,
-        t.`name`,t.number, t.id_card, t.secondary_unit, t.department, t.post, post_location, t.nature, t.situation , t.personnel_type
+        t.`name`,t.number, t.id_card, t.department_id,t.department, t.post, post_location, t.nature, t.situation , t.personnel_type
         FROM kd_xm_technician xt
         left join
         (
             select
-                unicode, NAME, number, id_card, secondary_unit , department, post, post_location, nature, situation , personnel_type
+                unicode, NAME, number, id_card, department_id , department, post, post_location, nature, situation , personnel_type
             from kd_technician temp
             where temp.unicode = unicode and temp.year_and_month = ( select max(year_and_month) from kd_technician where unicode = temp.unicode and LEFT(year_and_month, 4) = #{ew.yearAndMonth} group by unicode )
         ) t on xt.unicode = t.unicode