diff --git a/dms-dormitory/src/main/resources/mapper/dormitory/SrsDormitoryStudentMapper.xml b/dms-dormitory/src/main/resources/mapper/dormitory/SrsDormitoryStudentMapper.xml index 93bc55f..5fe482f 100644 --- a/dms-dormitory/src/main/resources/mapper/dormitory/SrsDormitoryStudentMapper.xml +++ b/dms-dormitory/src/main/resources/mapper/dormitory/SrsDormitoryStudentMapper.xml @@ -274,7 +274,7 @@ - select a.BJDM,a.XB, a.KSH,a.is_smoke,a.is_early from srs_stu_reg as a left join srs_class as b on a.BJDM = b.class_code 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..82938ed 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 @@ -3,16 +3,12 @@ package com.srs.web.controller.comprehensive; import com.srs.common.core.controller.BaseController; import com.srs.common.core.domain.AjaxResult; import com.srs.common.core.page.TableDataInfo; -import com.srs.comprehensive.service.ICphTeacherService; -import com.srs.comprehensive.service.ISrsClassService; -import com.srs.comprehensive.service.ISrsMajorsService; -import com.srs.comprehensive.service.SyncDataService; +import com.srs.comprehensive.domain.Dto.SelectClass; +import com.srs.comprehensive.service.*; 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; +import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -27,17 +23,19 @@ public class SyncDataController extends BaseController { ISrsMajorsService iSrsMajorsService; @Autowired ISrsClassService iSrsClassService; + @Autowired + ISrsStudentService iSrsStudentService; //中间表教职工信息 @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(); @@ -58,19 +56,45 @@ public class SyncDataController extends BaseController { } //中间表班级 @RequestMapping("/classInfoList") - public TableDataInfo classInfoList(String bjdm){ + public TableDataInfo classInfoList(SelectClass selectClass){ startPage(); - List list=syncDataService.getClassInfoList(bjdm); + List list=syncDataService.getClassInfoList(selectClass); return getDataTable(list); } //同步班级 @RequestMapping("/synchronousClass") - public AjaxResult synchronousClass(){ - List list=syncDataService.getClassInfoList(null); + public AjaxResult synchronousClass(SelectClass selectClass){ + List list=syncDataService.getClassInfoList(selectClass); 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 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 stuNoList = new ArrayList<>(); + for (pageNum=1; pageNum <= sumS; pageNum++){ + List list=syncDataService.getStudentInfoList(pageNum,pageSize,null,gradeCode); + List maps = iSrsStudentService.synchronousMYSQL(list);//同步到mysql + stuNoList.addAll(maps); + list.clear(); + } + //iSrsStudentService.addStudentData(stuNoList);//添加到学生表 + //iSrsStudentService.Usertb();//同步到用户表 + return success(); } - } diff --git a/srs-admin/src/main/java/com/srs/web/controller/routine/RtClassMettingContentController.java b/srs-admin/src/main/java/com/srs/web/controller/routine/RtClassMettingContentController.java index bbeaf82..800cbd4 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/routine/RtClassMettingContentController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/routine/RtClassMettingContentController.java @@ -85,32 +85,31 @@ public class RtClassMettingContentController extends BaseController { @GetMapping("/listStu") @ApiOperation("学生查询辅导员班会内容列表") - public TableDataInfo listStu(RtClassMettingContent rtClassMettingContent) - { - List> list1 = rtClassMettingStuUploadService.listStuClass(getUsername()); - if(list1.size() == 0){ - throw new RuntimeException("未查询到您的学生信息，请联系管理员"); + public TableDataInfo listStu(RtClassMettingContent rtClassMettingContent) { + List> list1 = rtClassMettingStuUploadService.listStuClass(getUsername()); + if (list1.size() == 0) { + throw new RuntimeException("未查询到您的学生信息,请联系管理员"); } QueryWrapper studentQueryWrapper = new QueryWrapper<>(); studentQueryWrapper.eq("stu_no", getUsername()); studentQueryWrapper.last("limit 1"); - SrsStudent student=_stuMapper.selectOne(studentQueryWrapper); - if(student==null){ - return getDataTable(new ArrayList>()); + SrsStudent student = _stuMapper.selectOne(studentQueryWrapper); + if (student == null) { + return getDataTable(new ArrayList>()); } - Long classId=student.getClassId(); - if(classId==null){ - return getDataTable(new ArrayList>()); + Long classId = student.getClassId(); + if (classId == null) { + return getDataTable(new ArrayList>()); } - SrsClass srsClass=_classMapper.selectSrsClassByClassId(classId); - if(srsClass==null){ - return getDataTable(new ArrayList>()); + SrsClass srsClass = _classMapper.selectSrsClassByClassId(classId); + if (srsClass == null) { + return getDataTable(new ArrayList>()); } - Long teacherId=srsClass.getTeacherId(); + Long teacherId = srsClass.getTeacherId(); CphTeacher fdy = _fdyMapper.selectById(teacherId); - if(fdy==null){ - return getDataTable(new ArrayList>()); + if (fdy == null) { + return getDataTable(new ArrayList>()); } rtClassMettingContent.setCrTeacherNo(fdy.getEmployeeId()); startPage(); @@ -122,8 +121,7 @@ public class RtClassMettingContentController extends BaseController { @GetMapping("/listFdy") @ApiOperation("查询辅导员班会内容列表") - public TableDataInfo listFdy(RtClassMettingContent rtClassMettingContent) - { + public TableDataInfo listFdy(RtClassMettingContent rtClassMettingContent) { rtClassMettingContent.setCrTeacherNo(getUsername()); startPage(); List list = rtClassMettingContentService.selectRtClassMettingContentList(rtClassMettingContent); @@ -138,8 +136,7 @@ public class RtClassMettingContentController extends BaseController { //@PreAuthorize("@ss.hasPermi('classmetting:classMettingContent:list')") @GetMapping("/list") @ApiOperation("查询班会内容列表") - public TableDataInfo list(RtClassMettingContent rtClassMettingContent) - { + public TableDataInfo list(RtClassMettingContent rtClassMettingContent) { startPage(); List list = rtClassMettingContentService.selectRtClassMettingContentList(rtClassMettingContent); //list.add(1); @@ -153,8 +150,7 @@ public class RtClassMettingContentController extends BaseController { @Log(title = "班会内容", businessType = BusinessType.EXPORT) @PostMapping("/export") @ApiOperation("导出班会内容列表") - public void export(HttpServletResponse response, RtClassMettingContent rtClassMettingContent) - { + public void export(HttpServletResponse response, RtClassMettingContent rtClassMettingContent) { List list = rtClassMettingContentService.selectRtClassMettingContentList(rtClassMettingContent); ExcelUtil util = new ExcelUtil(RtClassMettingContent.class); util.exportExcel(response, list, "班会内容数据"); @@ -166,21 +162,19 @@ public class RtClassMettingContentController extends BaseController { //@PreAuthorize("@ss.hasPermi('classmetting:classMettingContent:query')") @GetMapping(value = "/{crId}") @ApiOperation("获取班会内容详细信息") - public AjaxResult getInfo(@PathVariable("crId") Long crId) - { + public AjaxResult getInfo(@PathVariable("crId") Long crId) { return success(rtClassMettingContentService.selectRtClassMettingContentByCrId(crId)); } @Log(title = "班会内容", businessType = BusinessType.INSERT) @PostMapping("/stuAdd") @ApiOperation("学生新增班会内容") - public AjaxResult stuAdd(@RequestBody RtClassMettingContent rtClassMettingContent) - { - List> list = rtClassMettingStuUploadService.listStuClass(getUsername()); - if(list.size() == 0){ - throw new RuntimeException("您的班级为空，请联系管理员"); + public AjaxResult stuAdd(@RequestBody RtClassMettingContent rtClassMettingContent) { + List> list = rtClassMettingStuUploadService.listStuClass(getUsername()); + if (list.size() == 0) { + throw new RuntimeException("您的班级为空,请联系管理员"); } - Map< String, Object > map = list.get(0); + Map map = list.get(0); rtClassMettingContent.setCrTeacherNo(map.get("t_no").toString()); rtClassMettingContent.setCreateBy(getUsername()); @@ -190,12 +184,11 @@ public class RtClassMettingContentController extends BaseController { /** * 新增班会内容 */ - // @PreAuthorize("@ss.hasPermi('classmetting:classMettingContent:add')") + // @PreAuthorize("@ss.hasPermi('classmetting:classMettingContent:add')") @Log(title = "班会内容", businessType = BusinessType.INSERT) @PostMapping("/add") @ApiOperation("新增班会内容") - public AjaxResult add(@RequestBody RtClassMettingContent rtClassMettingContent) - { + public AjaxResult add(@RequestBody RtClassMettingContent rtClassMettingContent) { rtClassMettingContent.setCrTeacherNo(getUsername()); rtClassMettingContent.setCreateBy(getUsername()); return rtClassMettingContentService.insertRtClassMettingContent(rtClassMettingContent); @@ -208,8 +201,7 @@ public class RtClassMettingContentController extends BaseController { @Log(title = "班会内容", businessType = BusinessType.UPDATE) @PostMapping("/update") @ApiOperation("修改班会内容") - public AjaxResult edit(@RequestBody RtClassMettingContent rtClassMettingContent) - { + public AjaxResult edit(@RequestBody RtClassMettingContent rtClassMettingContent) { rtClassMettingContent.setUpdateBy(getUsername()); return toAjax(rtClassMettingContentService.updateRtClassMettingContent(rtClassMettingContent)); } @@ -221,8 +213,7 @@ public class RtClassMettingContentController extends BaseController { @Log(title = "班会内容", businessType = BusinessType.DELETE) @PostMapping("/{crIds}") @ApiOperation("删除班会内容") - public AjaxResult remove(@PathVariable Long[] crIds) - { + public AjaxResult remove(@PathVariable Long[] crIds) { return toAjax(rtClassMettingContentService.deleteRtClassMettingContentByCrIds(crIds)); } } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Dto/SelectClass.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Dto/SelectClass.java new file mode 100644 index 0000000..241cb45 --- /dev/null +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Dto/SelectClass.java @@ -0,0 +1,9 @@ +package com.srs.comprehensive.domain.Dto; + +import lombok.Data; + +@Data +public class SelectClass { + public String bjdm;//班级代码 + public String gradeCode;//年级代码 +} 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..cf8f73d 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 @@ -1,11 +1,20 @@ 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.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);//班级 + public List getClassInfoList(SelectClass selectClass);//所有班级 + //统计学生数量 + int selectNumber(String gradCode); + /* + * 学生 + * */ + public List getStudentInfoList(@Param("offset") Integer offset, @Param("pageSize") Integer pageSize,@Param("stuNo") String stuNo,@Param("gradeCode") String gradeCode); } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsStudentService.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsStudentService.java index 04410a4..590e8fa 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsStudentService.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/ISrsStudentService.java @@ -148,6 +148,8 @@ public interface ISrsStudentService extends IService int initializePwd(); List sqlserverSynchronousMYSQL(List mapList); + List synchronousMYSQL(List mapList); + //添加学生 public void addStudentData(List mapList); 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..904a19b 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 @@ -1,11 +1,15 @@ package com.srs.comprehensive.service; +import com.srs.comprehensive.domain.Dto.SelectClass; + 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);//班级 + List getClassInfoList(SelectClass selectClass);//班级 + public int getStudentInfoNumber(String gradeCode); + public List getStudentInfoList(Integer pageNum,Integer pageSize,String stuNo,String gradeCode);//学生 } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsClassServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsClassServiceImpl.java index 697aab7..5d76f9a 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsClassServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsClassServiceImpl.java @@ -397,17 +397,17 @@ public class SrsClassServiceImpl extends ServiceImpl im } } } - //使用辅导员工号查询辅导员id - Object bjdmsobj=map.get("bjdm"); - if (bjdmsobj!=null) { - String gh =bjdmsobj.toString();//辅导员职工号 - if (gh!=null) { - CphTeacher fdy = cphTeacherMapper.selectCphTeacher(gh);//辅导员 - if (fdy!=null) { - srsClass.setTeacherId(fdy.getTeacherId());//辅导员id - } - } - } +// //使用辅导员工号查询辅导员id +// Object bjdmsobj=map.get("bjdm"); +// if (bjdmsobj!=null) { +// String gh =bjdmsobj.toString();//辅导员职工号 +// if (gh!=null) { +// CphTeacher fdy = cphTeacherMapper.selectCphTeacher(gh);//辅导员 +// if (fdy!=null) { +// srsClass.setTeacherId(fdy.getTeacherId());//辅导员id +// } +// } +// } Object bjmcobj=map.get("bjmc"); if(bjmcobj!=null) { srsClass.setClassName(bjmcobj.toString()); @@ -425,8 +425,7 @@ public class SrsClassServiceImpl extends ServiceImpl im } Object njid=map.get("njid"); if (njid!=null) { - //通过sqlserver数据库的年级id查询年级代码，使用年级代码查询mysql的年级id - String njdm = gets(Long.valueOf(njid.toString()));//年级代码 + String njdm =njid.toString();//年级代码 Long gradeId = srsClassMapper.getGradeId(njdm);//使用年级代码查询本地年级id if (gradeId!=null) { srsClass.setGradeId(gradeId);//年级编号 @@ -435,7 +434,7 @@ public class SrsClassServiceImpl extends ServiceImpl im srsClass.setStatus("0"); Object zyidobj=map.get("zyid"); if (zyidobj!=null) { - String zydm = getzydm(Long.valueOf(zyidobj.toString()));//专业代码 + String zydm =zyidobj.toString();//专业代码 //使用专业代码查询本地专业id if (zydm!=null) { Long zyid = srsMajorsMapper.selectMajorId(zydm); @@ -445,16 +444,16 @@ public class SrsClassServiceImpl extends ServiceImpl im } } //使用辅导员工号查询辅导员id - Object bjdmsobj=map.get("bjdm"); - if (bjdmsobj!=null) { - String gh = getfdy(bjdmsobj.toString());//辅导员职工号 - if (gh!=null) { - CphTeacher fdy = cphTeacherMapper.selectCphTeacher(gh);//辅导员 - if (fdy!=null) { - srsClass.setTeacherId(fdy.getTeacherId());//辅导员id - } - } - } +// Object bjdmsobj=map.get("bjdm"); +// if (bjdmsobj!=null) { +// String gh = getfdy(bjdmsobj.toString());//辅导员职工号 +// if (gh!=null) { +// CphTeacher fdy = cphTeacherMapper.selectCphTeacher(gh);//辅导员 +// if (fdy!=null) { +// srsClass.setTeacherId(fdy.getTeacherId());//辅导员id +// } +// } +// } Object bjmcobj=map.get("bjmc"); if(bjmcobj!=null) { srsClass.setClassName(bjmcobj.toString()); diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsStudentServiceImpl.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsStudentServiceImpl.java index ffc2a0e..7422857 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsStudentServiceImpl.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/SrsStudentServiceImpl.java @@ -787,6 +787,122 @@ public class SrsStudentServiceImpl extends ServiceImpl synchronousMYSQL(List mapList){ + //List srsStudentList = srsStudentMapper.selectSrsStudentList(null);//学生列表 + List 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 objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.orderByDesc("stu_no"); + for (pageNum=1; pageNum <= sumS; pageNum++) { + List srsStudentList = srsStudentMapper + .selectPage(new Page<>(pageNum, pageSize), objectQueryWrapper).getRecords(); + List 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 kshList2 = srsStudentList.stream() +// .map(SrsStudent::getStuNo) +// .collect(Collectors.toList()); +// +// List insertMap = mapList.stream() +// .filter(obj -> { +// Object xhObj = obj.get("xh"); +// return xhObj != null && !kshList2.contains(xhObj.toString()); +// }) +// .collect(Collectors.toList()); + Iterator 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 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> lists = ListSliceUtil.updateSlice(updateSrsStudent); + if (lists != null) { + for (List studentList : lists) { + srsStudentMapper.updateSrsStudentList(studentList); + } + } + } + } + return addMap; + } //添加学生 @Override 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..13005d0 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 @@ -2,6 +2,7 @@ package com.srs.comprehensive.service.impl; import com.srs.common.annotation.DataSource; import com.srs.common.enums.DataSourceType; +import com.srs.comprehensive.domain.Dto.SelectClass; import com.srs.comprehensive.mapper.SyncDataMapper; import com.srs.comprehensive.service.SyncDataService; import org.springframework.beans.factory.annotation.Autowired; @@ -15,8 +16,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) { @@ -27,7 +28,24 @@ public class SyncDataServiceImpl implements SyncDataService { return syncDataMapper.getSpecialtyALLInfo(); } @Override - public List getClassInfoList(String bjdm){ - return syncDataMapper.getClassInfoList(bjdm); + public List getClassInfoList(SelectClass selectClass){ + return syncDataMapper.getClassInfoList(selectClass); + } + //统计学生数量 + @Override + public int getStudentInfoNumber(String gradeCode) { + return syncDataMapper.selectNumber(gradeCode); + } + @Override + public List 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); } } diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml index bc2a4a9..a228b35 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SyncDataMapper.xml @@ -3,16 +3,19 @@ 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} + - + select BJBH as bjdm,BJSSJXZYBH as zyid,BJMC as bjmc,BJSSNJ as njid,BJJC from from_gxsdxyxxzx_class and BJBH=#{bjdm} + and BJSSNJ=#{gradeCode} + + diff --git a/srs-routine/src/main/java/com/srs/routine/domain/RtClassMettingContent.java b/srs-routine/src/main/java/com/srs/routine/domain/RtClassMettingContent.java index 15ef027..5bbe480 100644 --- a/srs-routine/src/main/java/com/srs/routine/domain/RtClassMettingContent.java +++ b/srs-routine/src/main/java/com/srs/routine/domain/RtClassMettingContent.java @@ -3,13 +3,19 @@ package com.srs.routine.domain; import java.util.Date; import java.util.List; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; 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.ApiModelProperty; -import lombok.*; -import com.srs.common.core.domain.BaseEntity; +import lombok.AllArgsConstructor; +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; /** - * 状态：0：保存、1：发布，2：停用，3：结束 + * 状态:0:保存、1:发布,2:停用,3:结束 */ - @ApiModelProperty("状态：0：保存、1：发布，2：停用，3：结束") + @ApiModelProperty("状态:0:保存、1:发布,2:停用,3:结束") @TableField("status") - @Excel(name = "状态：0：保存、1：发布，2：停用，3：结束") + @Excel(name = "状态:0:保存、1:发布,2:停用,3:结束") private String status; /** - * 删除标志（0代表存在 + * 删除标志(0代表存在 */ - @ApiModelProperty("删除标志（0代表存在") + @ApiModelProperty("删除标志(0代表存在") @TableField("del_flag") private String delFlag; @@ -158,4 +164,16 @@ private static final long serialVersionUID=1L; @TableField(exist = false) private List attachResourceList; + /** + * 学院ID(用于查询条件) + */ + @TableField(exist = false) + private Long deptId; + + /** + * 学院名称(用于显示) + */ + @TableField(exist = false) + private String deptName; + } diff --git a/srs-routine/src/main/resources/mapper/routine/RtClassMettingContentMapper.xml b/srs-routine/src/main/resources/mapper/routine/RtClassMettingContentMapper.xml index 6ed9460..d68cfbd 100644 --- a/srs-routine/src/main/resources/mapper/routine/RtClassMettingContentMapper.xml +++ b/srs-routine/src/main/resources/mapper/routine/RtClassMettingContentMapper.xml @@ -26,14 +26,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select rm.cr_id, rm.cr_no,rm.cr_cm_no,rm.cr_department_no,rm.cr_major_no, - mt.cm_title as cr_cm_title, - rm.cr_class_no,(select class_name from srs_class sc where sc.class_id=cr_class_no) as className, - - rm.cr_teacher_no,(select nick_name from sys_user u where u.user_name=cr_teacher_no) 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 + SELECT + rm.cr_id, + rm.cr_no, + rm.cr_cm_no, + rm.cr_department_no, + rm.cr_major_no, + mt.cm_title AS cr_cm_title, + 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