xgxt_sd/zhxg_java
18
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
weishengyou
2026-01-07 16:24:56 +08:00
parent 2bb8c2b784 961f2bf887
commit 69e9147a92
14 changed files with 439 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dms-dormitory/src/main/resources/mapper/dormitory/SrsDormitoryStudentMapper.xml
View File

@@ -274,7 +274,7 @@
<select id="listSmokeEarly" parameterType="String" resultType="SrsStuReg"> <select id="listSmokeEarly" parameterType="String" resultType="com.srs.stureg.domain.SrsStuReg">
select a.BJDM,a.XB, a.KSH,a.is_smoke,a.is_early select a.BJDM,a.XB, a.KSH,a.is_smoke,a.is_early
from srs_stu_reg as a from srs_stu_reg as a
left join srs_class as b on a.BJDM = b.class_code left join srs_class as b on a.BJDM = b.class_code

58
srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java
View File

@@ -3,16 +3,12 @@ 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.service.ICphTeacherService; import com.srs.comprehensive.domain.Dto.SelectClass;
import com.srs.comprehensive.service.ISrsClassService; import com.srs.comprehensive.service.*;
import com.srs.comprehensive.service.ISrsMajorsService;
import com.srs.comprehensive.service.SyncDataService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -27,17 +23,19 @@ public class SyncDataController extends BaseController {
ISrsMajorsService iSrsMajorsService; ISrsMajorsService iSrsMajorsService;
@Autowired @Autowired
ISrsClassService iSrsClassService; ISrsClassService iSrsClassService;
@Autowired
ISrsStudentService iSrsStudentService;
//中间表教职工信息 //中间表教职工信息
@RequestMapping("/getEmployEEInfoList") @RequestMapping("/getEmployEEInfoList")
public TableDataInfo getEmployEEInfoList(){ public TableDataInfo getEmployEEInfoList(String zgh){
startPage(); startPage();
List<Map> list=syncDataService.getEmployEEInfoList(); List<Map> list=syncDataService.getEmployEEInfoList(zgh);
return getDataTable(list); return getDataTable(list);
} }
//同步教职工 //同步教职工
@RequestMapping("/synchronousEmployEEInfoList") @RequestMapping("/synchronousEmployEEInfoList")
public AjaxResult synchronousEmployEEInfoList(){ public AjaxResult synchronousEmployEEInfoList(){
List<Map> list=syncDataService.getEmployEEInfoList(); List<Map> list=syncDataService.getEmployEEInfoList(null);
iCphTeacherService.synchronousMYSQL(list);//同步教职工 iCphTeacherService.synchronousMYSQL(list);//同步教职工
iCphTeacherService.UsertbNew(); iCphTeacherService.UsertbNew();
return success(); return success();
@@ -58,19 +56,45 @@ 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();
}
@RequestMapping("/getStudentInfo")
public AjaxResult getStudentInfoList(@RequestParam("pageNum")Integer pageNum,
@RequestParam("pageSize") Integer pageSize,
@RequestParam(value = "stuNo", required = false)String stuNo){
int studentInfoNumber = syncDataService.getStudentInfoNumber(null);
List<Map> list=syncDataService.getStudentInfoList(pageNum,pageSize,stuNo,null);
return success(list).put("total", studentInfoNumber);
}
//同步学生
@RequestMapping("/synchronousStudent")
public AjaxResult synchronousStudent(String gradeCode){
int pageNum=1;
int pageSize=500;
int studentInfoNumber = syncDataService.getStudentInfoNumber(gradeCode);//总数
int sum=studentInfoNumber/ pageSize;//需要循环的次数
int sumS=studentInfoNumber%pageSize>0? sum + 1: sum;
List<Map> stuNoList = new ArrayList<>();
for (pageNum=1; pageNum <= sumS; pageNum++){
List<Map> list=syncDataService.getStudentInfoList(pageNum,pageSize,null,gradeCode);
List<Map> maps = iSrsStudentService.synchronousMYSQL(list);//同步到mysql
stuNoList.addAll(maps);
list.clear();
}
//iSrsStudentService.addStudentData(stuNoList);//添加到学生表
//iSrsStudentService.Usertb();//同步到用户表
return success();
} }
} }

65
srs-admin/src/main/java/com/srs/web/controller/routine/RtClassMettingContentController.java
View File

@@ -85,32 +85,31 @@ public class RtClassMettingContentController extends BaseController {
@GetMapping("/listStu") @GetMapping("/listStu")
@ApiOperation("学生查询辅导员班会内容列表") @ApiOperation("学生查询辅导员班会内容列表")
public TableDataInfo listStu(RtClassMettingContent rtClassMettingContent) public TableDataInfo listStu(RtClassMettingContent rtClassMettingContent) {
{ List<Map<String, Object>> list1 = rtClassMettingStuUploadService.listStuClass(getUsername());
List<Map< String, Object >> list1 = rtClassMettingStuUploadService.listStuClass(getUsername()); if (list1.size() == 0) {
if(list1.size() == 0){ throw new RuntimeException("未查询到您的学生信息,请联系管理员");
throw new RuntimeException("未查询到您的学生信息，请联系管理员");
} }
QueryWrapper<SrsStudent> studentQueryWrapper = new QueryWrapper<>(); QueryWrapper<SrsStudent> studentQueryWrapper = new QueryWrapper<>();
studentQueryWrapper.eq("stu_no", getUsername()); studentQueryWrapper.eq("stu_no", getUsername());
studentQueryWrapper.last("limit 1"); studentQueryWrapper.last("limit 1");
SrsStudent student=_stuMapper.selectOne(studentQueryWrapper); SrsStudent student = _stuMapper.selectOne(studentQueryWrapper);
if(student==null){ if (student == null) {
return getDataTable(new ArrayList<Map< String, Object >>()); return getDataTable(new ArrayList<Map<String, Object>>());
} }
Long classId=student.getClassId(); Long classId = student.getClassId();
if(classId==null){ if (classId == null) {
return getDataTable(new ArrayList<Map< String, Object >>()); return getDataTable(new ArrayList<Map<String, Object>>());
} }
SrsClass srsClass=_classMapper.selectSrsClassByClassId(classId); SrsClass srsClass = _classMapper.selectSrsClassByClassId(classId);
if(srsClass==null){ if (srsClass == null) {
return getDataTable(new ArrayList<Map< String, Object >>()); return getDataTable(new ArrayList<Map<String, Object>>());
} }
Long teacherId=srsClass.getTeacherId(); Long teacherId = srsClass.getTeacherId();
CphTeacher fdy = _fdyMapper.selectById(teacherId); CphTeacher fdy = _fdyMapper.selectById(teacherId);
if(fdy==null){ if (fdy == null) {
return getDataTable(new ArrayList<Map< String, Object >>()); return getDataTable(new ArrayList<Map<String, Object>>());
} }
rtClassMettingContent.setCrTeacherNo(fdy.getEmployeeId()); rtClassMettingContent.setCrTeacherNo(fdy.getEmployeeId());
startPage(); startPage();
@@ -122,8 +121,7 @@ public class RtClassMettingContentController extends BaseController {
@GetMapping("/listFdy") @GetMapping("/listFdy")
@ApiOperation("查询辅导员班会内容列表") @ApiOperation("查询辅导员班会内容列表")
public TableDataInfo listFdy(RtClassMettingContent rtClassMettingContent) public TableDataInfo listFdy(RtClassMettingContent rtClassMettingContent) {
{
rtClassMettingContent.setCrTeacherNo(getUsername()); rtClassMettingContent.setCrTeacherNo(getUsername());
startPage(); startPage();
List<RtClassMettingContent> list = rtClassMettingContentService.selectRtClassMettingContentList(rtClassMettingContent); List<RtClassMettingContent> list = rtClassMettingContentService.selectRtClassMettingContentList(rtClassMettingContent);
@@ -138,8 +136,7 @@ public class RtClassMettingContentController extends BaseController {
//@PreAuthorize("@ss.hasPermi('classmetting:classMettingContent:list')") //@PreAuthorize("@ss.hasPermi('classmetting:classMettingContent:list')")
@GetMapping("/list") @GetMapping("/list")
@ApiOperation("查询班会内容列表") @ApiOperation("查询班会内容列表")
public TableDataInfo list(RtClassMettingContent rtClassMettingContent) public TableDataInfo list(RtClassMettingContent rtClassMettingContent) {
{
startPage(); startPage();
List<RtClassMettingContent> list = rtClassMettingContentService.selectRtClassMettingContentList(rtClassMettingContent); List<RtClassMettingContent> list = rtClassMettingContentService.selectRtClassMettingContentList(rtClassMettingContent);
//list.add(1); //list.add(1);
@@ -153,8 +150,7 @@ public class RtClassMettingContentController extends BaseController {
@Log(title = "班会内容", businessType = BusinessType.EXPORT) @Log(title = "班会内容", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
@ApiOperation("导出班会内容列表") @ApiOperation("导出班会内容列表")
public void export(HttpServletResponse response, RtClassMettingContent rtClassMettingContent) public void export(HttpServletResponse response, RtClassMettingContent rtClassMettingContent) {
{
List<RtClassMettingContent> list = rtClassMettingContentService.selectRtClassMettingContentList(rtClassMettingContent); List<RtClassMettingContent> list = rtClassMettingContentService.selectRtClassMettingContentList(rtClassMettingContent);
ExcelUtil<RtClassMettingContent> util = new ExcelUtil<RtClassMettingContent>(RtClassMettingContent.class); ExcelUtil<RtClassMettingContent> util = new ExcelUtil<RtClassMettingContent>(RtClassMettingContent.class);
util.exportExcel(response, list, "班会内容数据"); util.exportExcel(response, list, "班会内容数据");
@@ -166,21 +162,19 @@ public class RtClassMettingContentController extends BaseController {
//@PreAuthorize("@ss.hasPermi('classmetting:classMettingContent:query')") //@PreAuthorize("@ss.hasPermi('classmetting:classMettingContent:query')")
@GetMapping(value = "/{crId}") @GetMapping(value = "/{crId}")
@ApiOperation("获取班会内容详细信息") @ApiOperation("获取班会内容详细信息")
public AjaxResult getInfo(@PathVariable("crId") Long crId) public AjaxResult getInfo(@PathVariable("crId") Long crId) {
{
return success(rtClassMettingContentService.selectRtClassMettingContentByCrId(crId)); return success(rtClassMettingContentService.selectRtClassMettingContentByCrId(crId));
} }
@Log(title = "班会内容", businessType = BusinessType.INSERT) @Log(title = "班会内容", businessType = BusinessType.INSERT)
@PostMapping("/stuAdd") @PostMapping("/stuAdd")
@ApiOperation("学生新增班会内容") @ApiOperation("学生新增班会内容")
public AjaxResult stuAdd(@RequestBody RtClassMettingContent rtClassMettingContent) public AjaxResult stuAdd(@RequestBody RtClassMettingContent rtClassMettingContent) {
{ List<Map<String, Object>> list = rtClassMettingStuUploadService.listStuClass(getUsername());
List<Map< String, Object >> list = rtClassMettingStuUploadService.listStuClass(getUsername()); if (list.size() == 0) {
if(list.size() == 0){ throw new RuntimeException("您的班级为空,请联系管理员");
throw new RuntimeException("您的班级为空，请联系管理员");
} }
Map< String, Object > map = list.get(0); Map<String, Object> map = list.get(0);
rtClassMettingContent.setCrTeacherNo(map.get("t_no").toString()); rtClassMettingContent.setCrTeacherNo(map.get("t_no").toString());
rtClassMettingContent.setCreateBy(getUsername()); rtClassMettingContent.setCreateBy(getUsername());
@@ -194,8 +188,7 @@ public class RtClassMettingContentController extends BaseController {
@Log(title = "班会内容", businessType = BusinessType.INSERT) @Log(title = "班会内容", businessType = BusinessType.INSERT)
@PostMapping("/add") @PostMapping("/add")
@ApiOperation("新增班会内容") @ApiOperation("新增班会内容")
public AjaxResult add(@RequestBody RtClassMettingContent rtClassMettingContent) public AjaxResult add(@RequestBody RtClassMettingContent rtClassMettingContent) {
{
rtClassMettingContent.setCrTeacherNo(getUsername()); rtClassMettingContent.setCrTeacherNo(getUsername());
rtClassMettingContent.setCreateBy(getUsername()); rtClassMettingContent.setCreateBy(getUsername());
return rtClassMettingContentService.insertRtClassMettingContent(rtClassMettingContent); return rtClassMettingContentService.insertRtClassMettingContent(rtClassMettingContent);
@@ -208,8 +201,7 @@ public class RtClassMettingContentController extends BaseController {
@Log(title = "班会内容", businessType = BusinessType.UPDATE) @Log(title = "班会内容", businessType = BusinessType.UPDATE)
@PostMapping("/update") @PostMapping("/update")
@ApiOperation("修改班会内容") @ApiOperation("修改班会内容")
public AjaxResult edit(@RequestBody RtClassMettingContent rtClassMettingContent) public AjaxResult edit(@RequestBody RtClassMettingContent rtClassMettingContent) {
{
rtClassMettingContent.setUpdateBy(getUsername()); rtClassMettingContent.setUpdateBy(getUsername());
return toAjax(rtClassMettingContentService.updateRtClassMettingContent(rtClassMettingContent)); return toAjax(rtClassMettingContentService.updateRtClassMettingContent(rtClassMettingContent));
} }
@@ -221,8 +213,7 @@ public class RtClassMettingContentController extends BaseController {
@Log(title = "班会内容", businessType = BusinessType.DELETE) @Log(title = "班会内容", businessType = BusinessType.DELETE)
@PostMapping("/{crIds}") @PostMapping("/{crIds}")
@ApiOperation("删除班会内容") @ApiOperation("删除班会内容")
public AjaxResult remove(@PathVariable Long[] crIds) public AjaxResult remove(@PathVariable Long[] crIds) {
{
return toAjax(rtClassMettingContentService.deleteRtClassMettingContentByCrIds(crIds)); return toAjax(rtClassMettingContentService.deleteRtClassMettingContentByCrIds(crIds));
} }
} }

9
srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Dto/SelectClass.java Normal file
View File

@@ -0,0 +1,9 @@
package com.srs.comprehensive.domain.Dto;
import lombok.Data;
@Data
public class SelectClass {
public String bjdm;//班级代码
public String gradeCode;//年级代码
}

13
srs-comprehensive/src/main/java/com/srs/comprehensive/mapper/SyncDataMapper.java
View File

@@ -1,11 +1,20 @@
package com.srs.comprehensive.mapper; package com.srs.comprehensive.mapper;
import com.srs.comprehensive.domain.Dto.SelectClass;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
public interface SyncDataMapper { public interface SyncDataMapper {
public List<Map> getEmployEEInfoList();//教职工 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);//所有班级
//统计学生数量
int selectNumber(String gradCode);
/*
* 学生
* */
public List<Map> getStudentInfoList(@Param("offset") Integer offset, @Param("pageSize") Integer pageSize,@Param("stuNo") String stuNo,@Param("gradeCode") String gradeCode);
} }

2
srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsStudentService.java
View File

@@ -148,6 +148,8 @@ public interface ISrsStudentService extends IService<SrsStudent>
int initializePwd(); int initializePwd();
List<Map> sqlserverSynchronousMYSQL(List<Map> mapList); List<Map> sqlserverSynchronousMYSQL(List<Map> mapList);
List<Map> synchronousMYSQL(List<Map> mapList);
//添加学生 //添加学生
public void addStudentData(List<Map> mapList); public void addStudentData(List<Map> mapList);

8
srs-comprehensive/src/main/java/com/srs/comprehensive/service/SyncDataService.java
View File

@@ -1,11 +1,15 @@
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;
public interface SyncDataService { public interface SyncDataService {
List<Map> getEmployEEInfoList();//教职工 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);//班级
public int getStudentInfoNumber(String gradeCode);
public List<Map> getStudentInfoList(Integer pageNum,Integer pageSize,String stuNo,String gradeCode);//学生
} }

47
srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsClassServiceImpl.java
View File

@@ -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());

116
srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsStudentServiceImpl.java
View File

@@ -787,6 +787,122 @@ public class SrsStudentServiceImpl extends ServiceImpl<SrsStudentMapper, SrsStud
} }
return addMap; return addMap;
} }
@Override
//@Transactional(rollbackFor = Exception.class)
public List<Map> synchronousMYSQL(List<Map> mapList){
//List<SrsStudent> srsStudentList = srsStudentMapper.selectSrsStudentList(null);//学生列表
List<Map> addMap = new ArrayList<>(mapList);//添加列表
Long aLong = srsStudentMapper.selectCount(null);//总数
int pageNum=1;
int pageSize=500;
long sum=aLong/ pageSize;//需要循环的次数
long sumS=aLong%pageSize>0? sum + 1: sum;
QueryWrapper<SrsStudent> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.orderByDesc("stu_no");
for (pageNum=1; pageNum <= sumS; pageNum++) {
List<SrsStudent> srsStudentList = srsStudentMapper
.selectPage(new Page<>(pageNum, pageSize), objectQueryWrapper).getRecords();
List<Map> updateMap = mapList.stream()
.filter(obj1 -> srsStudentList
.stream().anyMatch(obj2 -> {
Object xhObj = obj1.get("xh");
if (xhObj != null) {
String xh = xhObj.toString();
return obj2.getStuNo().equals(xh);
}
return false;
}))
.collect(Collectors.toList());
//添加需要
// List<String> kshList2 = srsStudentList.stream()
// .map(SrsStudent::getStuNo)
// .collect(Collectors.toList());
//
// List<Map> insertMap = mapList.stream()
// .filter(obj -> {
// Object xhObj = obj.get("xh");
// return xhObj != null && !kshList2.contains(xhObj.toString());
// })
// .collect(Collectors.toList());
Iterator<Map> iterator = addMap.iterator();
while (iterator.hasNext()) {
Map map = iterator.next();
for (Map m : updateMap) {
if (map.get("xh").toString().equals(m.get("xh").toString())) {
iterator.remove();
break;
}
}
}
//修改
List<SrsStudent> updateSrsStudent = new ArrayList<>();
for (Map map:updateMap){
SrsStudent srsStudent = new SrsStudent();
Object xhObj = map.get("xh");
if (xhObj != null) {
srsStudent.setStuNo(xhObj.toString());
}
Object xmObj = map.get("xm");
if (xmObj != null) {
srsStudent.setName(xmObj.toString());
}
Object xbObj = map.get("xb");
if (xbObj != null) {
srsStudent.setGender(xbObj.toString());
}
/*Object sfzhObj = map.get("sfzh");
if (sfzhObj != null && !Objects.equals(sfzhObj.toString(), "null")) {
if (sfzhObj.toString().length()>20){
srsStudent.setIdCard(sfzhObj.toString().substring(0,20));
}else {
srsStudent.setIdCard(sfzhObj.toString());
}
}*/
Object bjdmObj = map.get("bjdm");
if (bjdmObj != null) {
Long l = srsStudentMapper.selectClassId(bjdmObj.toString());
if (l != null) {
srsStudent.setClassId(l);
}
srsStudent.setClassCode(bjdmObj.toString());
}
// Object jtdzObj = map.get("jtdz");
// if (jtdzObj != null) {
// srsStudent.setAddress(jtdzObj.toString());
// }
Object sfzxobj=map.get("sfzx");
if (sfzxobj!=null) {
if(Objects.equals(sfzxobj.toString(), "1"))
{
srsStudent.setStatus("01");//在校状态
}else
if(Objects.equals(sfzxobj.toString(), "2"))
{
srsStudent.setStatus("02");//在校状态
}else
if(Objects.equals(sfzxobj.toString(), "3"))
{
srsStudent.setStatus("03");//在校状态
}else {
srsStudent.setStatus(sfzxobj.toString());//在校状态
}
}
srsStudent.setUpdateTime(DateUtils.getNowDate());
updateSrsStudent.add(srsStudent);
}
if (updateSrsStudent.size()!=0) {
List<List<SrsStudent>> lists = ListSliceUtil.updateSlice(updateSrsStudent);
if (lists != null) {
for (List<SrsStudent> studentList : lists) {
srsStudentMapper.updateSrsStudentList(studentList);
}
}
}
}
return addMap;
}
//添加学生 //添加学生
@Override @Override

26
srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SyncDataServiceImpl.java
View File

@@ -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;
@@ -15,8 +16,8 @@ public class SyncDataServiceImpl implements SyncDataService {
@Autowired @Autowired
private SyncDataMapper syncDataMapper; private SyncDataMapper syncDataMapper;
@Override @Override
public List<Map> getEmployEEInfoList() { public List<Map> getEmployEEInfoList(String zgh) {
return syncDataMapper.getEmployEEInfoList(); return syncDataMapper.getEmployEEInfoList(zgh);
} }
@Override @Override
public List<Map> getSpecialtyInfoList(String zydm) { public List<Map> getSpecialtyInfoList(String zydm) {
@@ -27,7 +28,24 @@ 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);
}
//统计学生数量
@Override
public int getStudentInfoNumber(String gradeCode) {
return syncDataMapper.selectNumber(gradeCode);
}
@Override
public List<Map> getStudentInfoList(Integer pageNum,Integer pageSize,String stuNo,String gradeCode) {
// 1. 参数校验：页码/条数不能为空，且≥1
if (pageNum == null || pageNum < 1) {
pageNum = 1;
}
if (pageSize == null || pageSize < 1) {
pageSize = 10; // 默认每页10条
}
int offset = (pageNum - 1) * pageSize;
return syncDataMapper.getStudentInfoList(offset,pageSize,stuNo,gradeCode);
} }
} }

38
srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml
View File

@@ -3,16 +3,19 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.srs.comprehensive.mapper.SyncDataMapper"> <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 SELECT TBA.GH as zgh,TBA.XM as xm,CASE
WHEN XBDM = 1 THEN '男' WHEN XBDM = 1 THEN '男'
WHEN XBDM = 2 THEN '女' WHEN XBDM = 2 THEN '女'
ELSE '未知' -- 可选：添加默认值，避免NULL 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 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%' <where>
TBA.ZGLBDM LIKE '1%'
<if test="zgh != null and zgh!= '' ">and TBA.GH=#{zgh}</if>
</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>
@@ -22,10 +25,33 @@
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>
<select id="selectNumber" resultType="java.lang.Integer" parameterType="String">
select count(1) as number from from_gxsdxyxxzx_student a left join from_gxsdxyxxzx_class b ON a.SZBJBH=b.BJBH
<where>
<if test="gradeCode != null and gradeCode != ''">and b.BJSSNJ=#{gradeCode}</if>
</where>
</select>
<select id="getStudentInfoList" resultType="java.util.Map">
SELECT ROW_NUMBER() OVER(ORDER BY TBA.XH) as xsid,TBA.XH as xh,TBA.XM as xm,CASE
WHEN TBA.XBDM = 1 THEN '男'
WHEN TBA.XBDM = 2 THEN '女'
ELSE '未知' -- 可选：添加默认值，避免NULL
END as xb,TBA.XSDQZTDM as sfzx,TBA.XSDQZTDMMC as status,TBA.MZDM as mz,TBB.BJMC as bjmc,
TBB.BJSSNJ,TBD.BMMC,TBC.JXZYMC
FROM `from_gxsdxyxxzx_student` TBA
LEFT JOIN from_gxsdxyxxzx_class TBB ON TBA.SZBJBH=TBB.BJBH
LEFT JOIN from_gxsdxyxxzx_zyxx TBC ON TBB.BJSSJXZYBH=TBC.JXZYBH
LEFT JOIN from_gxsdxyxxzx_xzbm TBD ON TBC.JXZYSSYXBBH=TBD.BMBH
where TBB.BJSSNJ&gt;=2019 and TBA.XH is not null
<if test="stuNo != null and stuNo != ''">and TBA.XH=#{stuNo}</if>
<if test="gradeCode != null and gradeCode != ''">and TBB.BJSSNJ=#{gradeCode}</if>
LIMIT #{offset}, #{pageSize}
</select>
</mapper> </mapper>

34
srs-routine/src/main/java/com/srs/routine/domain/RtClassMettingContent.java
View File

@@ -3,13 +3,19 @@ package com.srs.routine.domain;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.srs.common.annotation.Excel; import com.srs.common.annotation.Excel;
import com.baomidou.mybatisplus.annotation.*; import com.srs.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.*; import lombok.AllArgsConstructor;
import com.srs.common.core.domain.BaseEntity; import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
@@ -119,17 +125,17 @@ private static final long serialVersionUID=1L;
private String crAddr; private String crAddr;
/** /**
* 状态：0：保存、1：发布，2：停用，3：结束 * 状态:0:保存、1:发布,2:停用,3:结束
*/ */
@ApiModelProperty("状态：0：保存、1：发布，2：停用，3：结束") @ApiModelProperty("状态:0:保存、1:发布,2:停用,3:结束")
@TableField("status") @TableField("status")
@Excel(name = "状态：0：保存、1：发布，2：停用，3：结束") @Excel(name = "状态:0:保存、1:发布,2:停用,3:结束")
private String status; private String status;
/** /**
* 删除标志（0代表存在 * 删除标志(0代表存在
*/ */
@ApiModelProperty("删除标志（0代表存在") @ApiModelProperty("删除标志(0代表存在")
@TableField("del_flag") @TableField("del_flag")
private String delFlag; private String delFlag;
@@ -158,4 +164,16 @@ private static final long serialVersionUID=1L;
@TableField(exist = false) @TableField(exist = false)
private List<SrsAttachResource> attachResourceList; private List<SrsAttachResource> attachResourceList;
/**
* 学院ID(用于查询条件)
*/
@TableField(exist = false)
private Long deptId;
/**
* 学院名称(用于显示)
*/
@TableField(exist = false)
private String deptName;
} }

41
srs-routine/src/main/resources/mapper/routine/RtClassMettingContentMapper.xml
View File

@@ -26,14 +26,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectRtClassMettingContentVo"> <sql id="selectRtClassMettingContentVo">
select rm.cr_id, rm.cr_no,rm.cr_cm_no,rm.cr_department_no,rm.cr_major_no, SELECT
mt.cm_title as cr_cm_title, rm.cr_id,
rm.cr_class_no,(select class_name from srs_class sc where sc.class_id=cr_class_no) as className, rm.cr_no,
rm.cr_cm_no,
rm.cr_teacher_no,(select nick_name from sys_user u where u.user_name=cr_teacher_no) as cr_teacher_name, rm.cr_department_no,
rm.cr_content,rm.cr_text_content, rm.cr_major_no,
rm.cr_time, rm.cr_addr, rm.status, rm.del_flag, rm.create_by, rm.create_time, rm.update_by, rm.update_time, rm.remark mt.cm_title AS cr_cm_title,
from rt_class_metting_content rm left join rt_class_metting_theme mt on rm.cr_cm_no=mt.cm_no rm.cr_class_no,
sc.class_name AS className,
rm.cr_teacher_no,
u.nick_name AS cr_teacher_name,
rm.cr_content,
rm.cr_text_content,
rm.cr_time,
rm.cr_addr,
rm.status,
rm.del_flag,
rm.create_by,
rm.create_time,
rm.update_by,
rm.update_time,
rm.remark
FROM
rt_class_metting_content rm
LEFT JOIN
rt_class_metting_theme mt ON rm.cr_cm_no = mt.cm_no
LEFT JOIN
srs_class sc ON rm.cr_class_no = sc.class_id
LEFT JOIN
srs_majors sm ON sc.major_id = sm.major_id
LEFT JOIN
sys_user u ON rm.cr_teacher_no = u.user_name
</sql> </sql>
<select id="selectRtClassMettingContentList" parameterType="RtClassMettingContent" resultMap="RtClassMettingContentResult"> <select id="selectRtClassMettingContentList" parameterType="RtClassMettingContent" resultMap="RtClassMettingContentResult">
@@ -43,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="crCmNo != null and crCmNo != ''"> and rm.cr_cm_no = #{crCmNo}</if> <if test="crCmNo != null and crCmNo != ''"> and rm.cr_cm_no = #{crCmNo}</if>
<if test="crCmTitle != null and crCmTitle != ''"> and mt.cm_title like concat('%',#{crCmTitle},'%')</if> <if test="crCmTitle != null and crCmTitle != ''"> and mt.cm_title like concat('%',#{crCmTitle},'%')</if>
<if test="crDepartmentNo != null and crDepartmentNo != ''"> and rm.cr_department_no = #{crDepartmentNo}</if> <if test="crDepartmentNo != null and crDepartmentNo != ''"> and rm.cr_department_no = #{crDepartmentNo}</if>
<if test="deptId != null"> and sm.college_id = #{deptId}</if>
<if test="crMajorNo != null and crMajorNo != ''"> and rm.cr_major_no = #{crMajorNo}</if> <if test="crMajorNo != null and crMajorNo != ''"> and rm.cr_major_no = #{crMajorNo}</if>
<if test="crClassNo != null and crClassNo != ''"> and rm.cr_class_no = #{crClassNo}</if> <if test="crClassNo != null and crClassNo != ''"> and rm.cr_class_no = #{crClassNo}</if>
<if test="crTeacherNo != null and crTeacherNo != ''"> and rm.cr_teacher_no = #{crTeacherNo}</if> <if test="crTeacherNo != null and crTeacherNo != ''"> and rm.cr_teacher_no = #{crTeacherNo}</if>

119
srs-stureg/src/main/java/com/srs/stureg/domain/SrsStuReg.java
View File

@@ -23,8 +23,7 @@ import com.srs.common.core.domain.BaseEntity;
*/ */
@Data @Data
@TableName("srs_stu_reg") @TableName("srs_stu_reg")
public class SrsStuReg extends BaseEntity public class SrsStuReg extends BaseEntity {
{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@TableField(exist = false) @TableField(exist = false)
@@ -49,123 +48,169 @@ public class SrsStuReg extends BaseEntity
@TableField("is_change_SJHM") @TableField("is_change_SJHM")
private String isChangeSJHM; private String isChangeSJHM;
@TableId(value = "id",type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
private Long id; private Long id;
/** 学生姓名 */ /**
* 学生姓名
*/
@Excel(name = "学生姓名") @Excel(name = "学生姓名")
@TableField("XSXM") @TableField("XSXM")
private String XSXM; private String XSXM;
/** 考生号 */ /**
* 考生号
*/
@Excel(name = "考生号") @Excel(name = "考生号")
@TableField("KSH") @TableField("KSH")
private String KSH; private String KSH;
/** 身份证号 */ /**
* 身份证号
*/
@Excel(name = "身份证号") @Excel(name = "身份证号")
@TableField("SFZH") @TableField("SFZH")
@Sensitive(desensitizedType = DesensitizedType.ID_CARD) @Sensitive(desensitizedType = DesensitizedType.ID_CARD)
private String SFZH; private String SFZH;
/** 手机号 */ /**
* 手机号
*/
@Excel(name = "手机号") @Excel(name = "手机号")
@TableField("SJH") @TableField("SJH")
@Sensitive(desensitizedType = DesensitizedType.PHONE) @Sensitive(desensitizedType = DesensitizedType.PHONE)
private String SJH; private String SJH;
/** 性别 */ /**
* 性别
*/
@Excel(name = "性别") @Excel(name = "性别")
@TableField("XB") @TableField("XB")
private String XB; private String XB;
/** 政治面貌 */ /**
* 政治面貌
*/
@Excel(name = "政治面貌") @Excel(name = "政治面貌")
@TableField("ZZMM") @TableField("ZZMM")
private String ZZMM; private String ZZMM;
/** 民族 */ /**
* 民族
*/
@Excel(name = "民族") @Excel(name = "民族")
@TableField("MZ") @TableField("MZ")
private String MZ; private String MZ;
/** 校编学号 */ /**
* 校编学号
*/
@Excel(name = "校编学号") @Excel(name = "校编学号")
@TableField("XH") @TableField("XH")
private String XH; private String XH;
/** 学院 */ /**
* 学院
*/
@Excel(name = "学院") @Excel(name = "学院")
@TableField("XY") @TableField("XY")
private String XY; private String XY;
/** 学院代码 */ /**
* 学院代码
*/
@Excel(name = "学院代码") @Excel(name = "学院代码")
@TableField("XYDM") @TableField("XYDM")
private String XYDM; private String XYDM;
/** 专业 */ /**
* 专业
*/
@Excel(name = "专业") @Excel(name = "专业")
@TableField("ZY") @TableField("ZY")
private String ZY; private String ZY;
/** 专业代码 */ /**
* 专业代码
*/
@Excel(name = "专业代码") @Excel(name = "专业代码")
@TableField("ZYDM") @TableField("ZYDM")
private String ZYDM; private String ZYDM;
/** 班级 */ /**
* 班级
*/
@Excel(name = "班级") @Excel(name = "班级")
@TableField("BJ") @TableField("BJ")
private String BJ; private String BJ;
/** 班级代码 */ /**
* 班级代码
*/
@Excel(name = "班级代码") @Excel(name = "班级代码")
@TableField("BJDM") @TableField("BJDM")
private String BJDM; private String BJDM;
/** 毕业学校 */ /**
* 毕业学校
*/
@Excel(name = "毕业学校") @Excel(name = "毕业学校")
@TableField("last_school") @TableField("last_school")
private String lastSchool; private String lastSchool;
/** 毕业学校所在地 */ /**
* 毕业学校所在地
*/
@Excel(name = "毕业学校所在地") @Excel(name = "毕业学校所在地")
@TableField("last_school_addr") @TableField("last_school_addr")
private String lastSchoolAddr; private String lastSchoolAddr;
/** 家庭联系人姓名 */ /**
* 家庭联系人姓名
*/
@Excel(name = "家庭联系人姓名") @Excel(name = "家庭联系人姓名")
@TableField("fam_name") @TableField("fam_name")
private String famName; private String famName;
/** 与本人关系 */ /**
* 与本人关系
*/
@Excel(name = "与本人关系") @Excel(name = "与本人关系")
@TableField("fam_relation") @TableField("fam_relation")
private String famRelation; private String famRelation;
/** 家庭联系人电话 */ /**
* 家庭联系人电话
*/
@Excel(name = "家庭联系人电话") @Excel(name = "家庭联系人电话")
@TableField("fam_phone") @TableField("fam_phone")
@Sensitive(desensitizedType = DesensitizedType.PHONE) @Sensitive(desensitizedType = DesensitizedType.PHONE)
private String famPhone; private String famPhone;
/** 家庭现居地址 */ /**
* 家庭现居地址
*/
@Excel(name = "家庭现居地址") @Excel(name = "家庭现居地址")
@TableField("fam_now_addr") @TableField("fam_now_addr")
private String famNowAddr; private String famNowAddr;
/** 户籍所在地 */ /**
* 户籍所在地
*/
@Excel(name = "户籍所在地") @Excel(name = "户籍所在地")
@TableField("sfz_addr") @TableField("sfz_addr")
private String sfzAddr; private String sfzAddr;
/** 是否申请助学贷款 1：是，2：否*/ /**
* 是否申请助学贷款 1：是，2：否
*/
@Excel(name = "是否申请助学贷款") @Excel(name = "是否申请助学贷款")
@TableField("is_loan") @TableField("is_loan")
private String isLoan; private String isLoan;
/** 是否申请助学贷款 1：是，0：否*/ /**
* 是否申请助学贷款 1：是，0：否
*/
@Excel(name = "是否是定向生") @Excel(name = "是否是定向生")
@TableField("is_direction") @TableField("is_direction")
private String isDirection; private String isDirection;
@@ -175,13 +220,19 @@ public class SrsStuReg extends BaseEntity
private String loanNo; private String loanNo;
/** 学院id */ /**
* 学院id
*/
private Long deptId; private Long deptId;
/** 专业id */ /**
* 专业id
*/
private Long majorId; private Long majorId;
/** 所属班级ID */ /**
* 所属班级ID
*/
private Long classId; private Long classId;
@Excel(name = "是否退伍复学") @Excel(name = "是否退伍复学")
@@ -205,12 +256,16 @@ public class SrsStuReg extends BaseEntity
@Excel(name = "兴趣特长") @Excel(name = "兴趣特长")
@TableField("hobby") @TableField("hobby")
public String hobby; public String hobby;
/** 注册状态 */ /**
* 注册状态
*/
@Excel(name = "注册状态") @Excel(name = "注册状态")
@TableField("reg_status") @TableField("reg_status")
private String regStatus; private String regStatus;
/** 删除标志（0代表存在 */ /**
* 删除标志（0代表存在
*/
@TableField("del_flag") @TableField("del_flag")
private String delFlag; private String delFlag;
@TableField("LQZY") @TableField("LQZY")
@@ -221,7 +276,7 @@ public class SrsStuReg extends BaseEntity
private String PCDM; private String PCDM;
@TableField("TDDW") @TableField("TDDW")
private String TDDW; private String TDDW;
// @TableField("ZYDH") // @TableField("ZYDH")
// private String ZYDH; // private String ZYDH;
@TableField("XZNX") @TableField("XZNX")
private String XZNX; private String XZNX;