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 87eb1fb..d90ae4d 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 @@ -7,6 +7,7 @@ import com.srs.comprehensive.service.ICphTeacherService; import com.srs.comprehensive.service.SyncDataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -36,9 +37,9 @@ public class SyncDataController extends BaseController { } //专业 @RequestMapping("/getSpecialtyInfoList") - public TableDataInfo getSpecialtyInfoList(){ + public TableDataInfo getSpecialtyInfoList(String zydm){ startPage(); - List list=syncDataService.getSpecialtyInfoList(); + List list=syncDataService.getSpecialtyInfoList(zydm); return getDataTable(list); } } 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 bac3c0b..86ec885 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 @@ -5,5 +5,5 @@ import java.util.Map; public interface SyncDataMapper { public List getEmployEEInfoList();//教职工 - public List getSpecialtyInfoList();//专业 + public List getSpecialtyInfoList(String zydm);//专业 } 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 647db1f..5c97eda 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 @@ -5,5 +5,6 @@ import java.util.Map; public interface SyncDataService { List getEmployEEInfoList();//教职工 - List getSpecialtyInfoList();//专业 + List getSpecialtyInfoList(String zydm);//专业 + } 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 bafa633..7e4cc15 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 @@ -19,7 +19,8 @@ public class SyncDataServiceImpl implements SyncDataService { return syncDataMapper.getEmployEEInfoList(); } @Override - public List getSpecialtyInfoList() { - return syncDataMapper.getSpecialtyInfoList(); + public List getSpecialtyInfoList(String zydm) { + return syncDataMapper.getSpecialtyInfoList(zydm); } + } diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml index 6526ad4..d0002f1 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml @@ -11,8 +11,11 @@ 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%' - 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 - where b.JXZYBH is not null - + + b.JXZYBH is not null + and b.JXZYBH=#{zydm} + +