From b00d93b6287eba6e4cfb8917810e915a7ffe5100 Mon Sep 17 00:00:00 2001
From: 15976874561 <2553956742@qq.com>
Date: Wed, 31 Dec 2025 11:18:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=95=99=E8=81=8C=E5=B7=A5?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/comprehensive/SyncDataController.java | 6 +++---
 .../com/srs/comprehensive/mapper/SyncDataMapper.java     | 2 +-
 .../com/srs/comprehensive/service/SyncDataService.java   | 2 +-
 .../comprehensive/service/impl/SyncDataServiceImpl.java  | 4 ++--
 .../resources/mapper/comprehensive/SyncDataMapper.xml    | 9 ++++++---
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java
index d980ce8..8ed262c 100644
--- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java
+++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java
@@ -29,15 +29,15 @@ public class SyncDataController extends BaseController {
     ISrsClassService iSrsClassService;
     //中间表教职工信息
     @RequestMapping("/getEmployEEInfoList")
-    public TableDataInfo getEmployEEInfoList(){
+    public TableDataInfo getEmployEEInfoList(String zgh){
         startPage();
-        List<Map> list=syncDataService.getEmployEEInfoList();
+        List<Map> list=syncDataService.getEmployEEInfoList(zgh);
         return getDataTable(list);
     }
     //同步教职工
     @RequestMapping("/synchronousEmployEEInfoList")
     public AjaxResult synchronousEmployEEInfoList(){
-        List<Map> list=syncDataService.getEmployEEInfoList();
+        List<Map> list=syncDataService.getEmployEEInfoList(null);
         iCphTeacherService.synchronousMYSQL(list);//同步教职工
         iCphTeacherService.UsertbNew();
         return success();
diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java
index 3cdeee3..b76ae44 100644
--- a/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java
+++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java
@@ -4,7 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 public interface SyncDataMapper {
-   public List<Map> getEmployEEInfoList();//教职工
+   public List<Map> getEmployEEInfoList(String zgh);//教职工
    public List<Map>  getSpecialtyInfoList(String zydm);//专业
    public  List<Map> getSpecialtyALLInfo();//所有专业
    public  List<Map> getClassInfoList(String bjdm);//班级
diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java
index e07e9c7..4a6bcd1 100644
--- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java
+++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java
@@ -4,7 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 public interface SyncDataService {
-    List<Map> getEmployEEInfoList();//教职工
+    List<Map> getEmployEEInfoList(String zgh);//教职工
     List<Map> getSpecialtyInfoList(String zydm);//专业
     List<Map> getSpecialtyALLInfo();//所有专业
     List<Map> getClassInfoList(String bjdm);//班级
diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java
index 28c334b..3af4303 100644
--- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java
+++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java
@@ -15,8 +15,8 @@ public class SyncDataServiceImpl implements SyncDataService {
     @Autowired
     private SyncDataMapper syncDataMapper;
     @Override
-    public List<Map> getEmployEEInfoList() {
-        return syncDataMapper.getEmployEEInfoList();
+    public List<Map> getEmployEEInfoList(String zgh) {
+        return syncDataMapper.getEmployEEInfoList(zgh);
     }
     @Override
     public List<Map> getSpecialtyInfoList(String zydm) {
diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml
index bc2a4a9..d48d2c0 100644
--- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml
+++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml
@@ -3,13 +3,16 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.srs.comprehensive.mapper.SyncDataMapper">
-    <select id="getEmployEEInfoList" resultType="java.util.Map">
+    <select id="getEmployEEInfoList" resultType="java.util.Map" parameterType="String">
         SELECT  TBA.GH as zgh,TBA.XM as xm,CASE
                                                WHEN XBDM = 1 THEN '男'
                                                WHEN XBDM = 2 THEN '女'
                                                ELSE '未知'  -- 可选：添加默认值，避免NULL
-            END as xb,TBD.BMMC as ksmc,TBD.BMMC as yxmc,TBD.BMBH as ksh,TBA.ZGDQZTDM as zgzt from  from_gxsdxyxxzx_teacher TBA LEFT JOIN from_gxsdxyxxzx_xzbm TBD ON TBA.SZBMBH=TBD.BMBH
-            WHERE TBA.ZGLBDM   LIKE '1%'
+            END as xb,TBA.MZDM,TBA.SZBMBH,TBA.ZGLBDM,TBA.ZGLBMC,TBA.ZGDQZTDM,TBA.ZGDQZTDMMC,TBA.ZGPXH,TBA.UPTIME,TBD.BMMC as ksmc,TBD.BMMC as yxmc,TBD.BMBH as ksh,TBA.ZGDQZTDM as zgzt from  from_gxsdxyxxzx_teacher TBA LEFT JOIN from_gxsdxyxxzx_xzbm TBD ON TBA.SZBMBH=TBD.BMBH
+        <where>
+            TBA.ZGLBDM   LIKE '1%'
+            <if test="zgh != null and zgh!= '' ">and TBA.GH=#{zgh}</if>
+        </where>
     </select>
         <select id="getSpecialtyInfoList" resultType="java.util.Map" parameterType="String">
         select  b.JXZYBH as zydm,b.JXZYJC as zyjc,b.JXZYMC as zymc,a.BMMC yxmc from from_gxsdxyxxzx_xzbm a left  join from_gxsdxyxxzx_zyxx b on a.BMBH=b.JXZYSSYXBBH