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 list=syncDataService.getEmployEEInfoList(); + List list=syncDataService.getEmployEEInfoList(zgh); return getDataTable(list); } //同步教职工 @RequestMapping("/synchronousEmployEEInfoList") public AjaxResult synchronousEmployEEInfoList(){ - List list=syncDataService.getEmployEEInfoList(); + List 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 getEmployEEInfoList();//教职工 + public List getEmployEEInfoList(String zgh);//教职工 public List getSpecialtyInfoList(String zydm);//专业 public List getSpecialtyALLInfo();//所有专业 public List 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 getEmployEEInfoList();//教职工 + List getEmployEEInfoList(String zgh);//教职工 List getSpecialtyInfoList(String zydm);//专业 List getSpecialtyALLInfo();//所有专业 List 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 getEmployEEInfoList() { - return syncDataMapper.getEmployEEInfoList(); + public List getEmployEEInfoList(String zgh) { + return syncDataMapper.getEmployEEInfoList(zgh); } @Override public List 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"> - 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 + + TBA.ZGLBDM LIKE '1%' + and TBA.GH=#{zgh} +