同步数据功能修改
This commit is contained in:
@@ -3,6 +3,7 @@ package com.srs.web.controller.comprehensive;
|
|||||||
import com.srs.common.core.controller.BaseController;
|
import com.srs.common.core.controller.BaseController;
|
||||||
import com.srs.common.core.domain.AjaxResult;
|
import com.srs.common.core.domain.AjaxResult;
|
||||||
import com.srs.common.core.page.TableDataInfo;
|
import com.srs.common.core.page.TableDataInfo;
|
||||||
|
import com.srs.comprehensive.domain.Dto.SelectClass;
|
||||||
import com.srs.comprehensive.service.ICphTeacherService;
|
import com.srs.comprehensive.service.ICphTeacherService;
|
||||||
import com.srs.comprehensive.service.ISrsClassService;
|
import com.srs.comprehensive.service.ISrsClassService;
|
||||||
import com.srs.comprehensive.service.ISrsMajorsService;
|
import com.srs.comprehensive.service.ISrsMajorsService;
|
||||||
@@ -58,18 +59,18 @@ public class SyncDataController extends BaseController {
|
|||||||
}
|
}
|
||||||
//中间表班级
|
//中间表班级
|
||||||
@RequestMapping("/classInfoList")
|
@RequestMapping("/classInfoList")
|
||||||
public TableDataInfo classInfoList(String bjdm){
|
public TableDataInfo classInfoList(SelectClass selectClass){
|
||||||
startPage();
|
startPage();
|
||||||
List<Map> list=syncDataService.getClassInfoList(bjdm);
|
List<Map> list=syncDataService.getClassInfoList(selectClass);
|
||||||
return getDataTable(list);
|
return getDataTable(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
//同步班级
|
//同步班级
|
||||||
@RequestMapping("/synchronousClass")
|
@RequestMapping("/synchronousClass")
|
||||||
public AjaxResult synchronousClass(){
|
public AjaxResult synchronousClass(SelectClass selectClass){
|
||||||
List<Map> list=syncDataService.getClassInfoList(null);
|
List<Map> list=syncDataService.getClassInfoList(selectClass);
|
||||||
iSrsClassService.synchronousMYSQL(list);//同步班级
|
iSrsClassService.synchronousMYSQL(list);//同步班级
|
||||||
return success(list);
|
return success();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
package com.srs.comprehensive.domain.Dto;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class SelectClass {
|
||||||
|
public String bjdm;//班级代码
|
||||||
|
public String gradeCode;//年级代码
|
||||||
|
}
|
||||||
@@ -1,5 +1,7 @@
|
|||||||
package com.srs.comprehensive.mapper;
|
package com.srs.comprehensive.mapper;
|
||||||
|
|
||||||
|
import com.srs.comprehensive.domain.Dto.SelectClass;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
@@ -7,5 +9,5 @@ public interface SyncDataMapper {
|
|||||||
public List<Map> getEmployEEInfoList(String zgh);//教职工
|
public List<Map> getEmployEEInfoList(String zgh);//教职工
|
||||||
public List<Map> getSpecialtyInfoList(String zydm);//专业
|
public List<Map> getSpecialtyInfoList(String zydm);//专业
|
||||||
public List<Map> getSpecialtyALLInfo();//所有专业
|
public List<Map> getSpecialtyALLInfo();//所有专业
|
||||||
public List<Map> getClassInfoList(String bjdm);//班级
|
public List<Map> getClassInfoList(SelectClass selectClass);//班级
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package com.srs.comprehensive.service;
|
package com.srs.comprehensive.service;
|
||||||
|
|
||||||
|
import com.srs.comprehensive.domain.Dto.SelectClass;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
@@ -7,5 +9,5 @@ public interface SyncDataService {
|
|||||||
List<Map> getEmployEEInfoList(String zgh);//教职工
|
List<Map> getEmployEEInfoList(String zgh);//教职工
|
||||||
List<Map> getSpecialtyInfoList(String zydm);//专业
|
List<Map> getSpecialtyInfoList(String zydm);//专业
|
||||||
List<Map> getSpecialtyALLInfo();//所有专业
|
List<Map> getSpecialtyALLInfo();//所有专业
|
||||||
List<Map> getClassInfoList(String bjdm);//班级
|
List<Map> getClassInfoList(SelectClass selectClass);//班级
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -397,17 +397,17 @@ public class SrsClassServiceImpl extends ServiceImpl<SrsClassMapper,SrsClass> im
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//使用辅导员工号查询辅导员id
|
// //使用辅导员工号查询辅导员id
|
||||||
Object bjdmsobj=map.get("bjdm");
|
// Object bjdmsobj=map.get("bjdm");
|
||||||
if (bjdmsobj!=null) {
|
// if (bjdmsobj!=null) {
|
||||||
String gh =bjdmsobj.toString();//辅导员职工号
|
// String gh =bjdmsobj.toString();//辅导员职工号
|
||||||
if (gh!=null) {
|
// if (gh!=null) {
|
||||||
CphTeacher fdy = cphTeacherMapper.selectCphTeacher(gh);//辅导员
|
// CphTeacher fdy = cphTeacherMapper.selectCphTeacher(gh);//辅导员
|
||||||
if (fdy!=null) {
|
// if (fdy!=null) {
|
||||||
srsClass.setTeacherId(fdy.getTeacherId());//辅导员id
|
// srsClass.setTeacherId(fdy.getTeacherId());//辅导员id
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
Object bjmcobj=map.get("bjmc");
|
Object bjmcobj=map.get("bjmc");
|
||||||
if(bjmcobj!=null) {
|
if(bjmcobj!=null) {
|
||||||
srsClass.setClassName(bjmcobj.toString());
|
srsClass.setClassName(bjmcobj.toString());
|
||||||
@@ -425,8 +425,7 @@ public class SrsClassServiceImpl extends ServiceImpl<SrsClassMapper,SrsClass> im
|
|||||||
}
|
}
|
||||||
Object njid=map.get("njid");
|
Object njid=map.get("njid");
|
||||||
if (njid!=null) {
|
if (njid!=null) {
|
||||||
//通过sqlserver数据库的年级id查询年级代码,使用年级代码查询mysql的年级id
|
String njdm =njid.toString();//年级代码
|
||||||
String njdm = gets(Long.valueOf(njid.toString()));//年级代码
|
|
||||||
Long gradeId = srsClassMapper.getGradeId(njdm);//使用年级代码查询本地年级id
|
Long gradeId = srsClassMapper.getGradeId(njdm);//使用年级代码查询本地年级id
|
||||||
if (gradeId!=null) {
|
if (gradeId!=null) {
|
||||||
srsClass.setGradeId(gradeId);//年级编号
|
srsClass.setGradeId(gradeId);//年级编号
|
||||||
@@ -435,7 +434,7 @@ public class SrsClassServiceImpl extends ServiceImpl<SrsClassMapper,SrsClass> im
|
|||||||
srsClass.setStatus("0");
|
srsClass.setStatus("0");
|
||||||
Object zyidobj=map.get("zyid");
|
Object zyidobj=map.get("zyid");
|
||||||
if (zyidobj!=null) {
|
if (zyidobj!=null) {
|
||||||
String zydm = getzydm(Long.valueOf(zyidobj.toString()));//专业代码
|
String zydm =zyidobj.toString();//专业代码
|
||||||
//使用专业代码查询本地专业id
|
//使用专业代码查询本地专业id
|
||||||
if (zydm!=null) {
|
if (zydm!=null) {
|
||||||
Long zyid = srsMajorsMapper.selectMajorId(zydm);
|
Long zyid = srsMajorsMapper.selectMajorId(zydm);
|
||||||
@@ -445,16 +444,16 @@ public class SrsClassServiceImpl extends ServiceImpl<SrsClassMapper,SrsClass> im
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
//使用辅导员工号查询辅导员id
|
//使用辅导员工号查询辅导员id
|
||||||
Object bjdmsobj=map.get("bjdm");
|
// Object bjdmsobj=map.get("bjdm");
|
||||||
if (bjdmsobj!=null) {
|
// if (bjdmsobj!=null) {
|
||||||
String gh = getfdy(bjdmsobj.toString());//辅导员职工号
|
// String gh = getfdy(bjdmsobj.toString());//辅导员职工号
|
||||||
if (gh!=null) {
|
// if (gh!=null) {
|
||||||
CphTeacher fdy = cphTeacherMapper.selectCphTeacher(gh);//辅导员
|
// CphTeacher fdy = cphTeacherMapper.selectCphTeacher(gh);//辅导员
|
||||||
if (fdy!=null) {
|
// if (fdy!=null) {
|
||||||
srsClass.setTeacherId(fdy.getTeacherId());//辅导员id
|
// srsClass.setTeacherId(fdy.getTeacherId());//辅导员id
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
Object bjmcobj=map.get("bjmc");
|
Object bjmcobj=map.get("bjmc");
|
||||||
if(bjmcobj!=null) {
|
if(bjmcobj!=null) {
|
||||||
srsClass.setClassName(bjmcobj.toString());
|
srsClass.setClassName(bjmcobj.toString());
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package com.srs.comprehensive.service.impl;
|
|||||||
|
|
||||||
import com.srs.common.annotation.DataSource;
|
import com.srs.common.annotation.DataSource;
|
||||||
import com.srs.common.enums.DataSourceType;
|
import com.srs.common.enums.DataSourceType;
|
||||||
|
import com.srs.comprehensive.domain.Dto.SelectClass;
|
||||||
import com.srs.comprehensive.mapper.SyncDataMapper;
|
import com.srs.comprehensive.mapper.SyncDataMapper;
|
||||||
import com.srs.comprehensive.service.SyncDataService;
|
import com.srs.comprehensive.service.SyncDataService;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@@ -27,7 +28,7 @@ public class SyncDataServiceImpl implements SyncDataService {
|
|||||||
return syncDataMapper.getSpecialtyALLInfo();
|
return syncDataMapper.getSpecialtyALLInfo();
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public List<Map> getClassInfoList(String bjdm){
|
public List<Map> getClassInfoList(SelectClass selectClass){
|
||||||
return syncDataMapper.getClassInfoList(bjdm);
|
return syncDataMapper.getClassInfoList(selectClass);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
</where>
|
</where>
|
||||||
</select>
|
</select>
|
||||||
<select id="getSpecialtyInfoList" resultType="java.util.Map" parameterType="String">
|
<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
|
select b.JXZYBH as zydm,b.JXZYJC as zyjc,b.JXZYMC as zymc,a.BMBH,a.BMMC yxmc from from_gxsdxyxxzx_xzbm a left join from_gxsdxyxxzx_zyxx b on a.BMBH=b.JXZYSSYXBBH
|
||||||
<where>
|
<where>
|
||||||
b.JXZYBH is not null
|
b.JXZYBH is not null
|
||||||
<if test="zydm != null and zydm!= '' ">and b.JXZYBH=#{zydm}</if>
|
<if test="zydm != null and zydm!= '' ">and b.JXZYBH=#{zydm}</if>
|
||||||
@@ -25,10 +25,11 @@
|
|||||||
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
|
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
|
where b.JXZYBH is not null
|
||||||
</select>
|
</select>
|
||||||
<select id="getClassInfoList" resultType="java.util.Map" parameterType="String">
|
<select id="getClassInfoList" resultType="java.util.Map" parameterType="SelectClass">
|
||||||
select BJBH as bjdm,BJSSJXZYBH as zyid,BJMC as bjmc,BJSSNJ as njid from from_gxsdxyxxzx_class
|
select BJBH as bjdm,BJSSJXZYBH as zyid,BJMC as bjmc,BJSSNJ as njid,BJJC from from_gxsdxyxxzx_class
|
||||||
<where>
|
<where>
|
||||||
<if test="bjdm != null and bjdm!= '' ">and BJBH=#{bjdm}</if>
|
<if test="bjdm != null and bjdm!= '' ">and BJBH=#{bjdm}</if>
|
||||||
|
<if test="gradeCode != null and gradeCode!= '' ">and BJSSNJ=#{gradeCode}</if>
|
||||||
</where>
|
</where>
|
||||||
</select>
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|||||||
Reference in New Issue
Block a user