diff --git a/src/main/java/com/sztzjy/financial_bigdata/config/Constant.java b/src/main/java/com/sztzjy/financial_bigdata/config/Constant.java index 3654e15..cd9f7c4 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/config/Constant.java +++ b/src/main/java/com/sztzjy/financial_bigdata/config/Constant.java @@ -33,5 +33,6 @@ public class Constant { public static final String THEORY = "理论考试模块"; public static final String RESOURCE = "资源中心模块"; public static final String API_URL = "http://120.79.54.255:8889"; +// public static final String API_URL = "http://192.168.2.11:8889"; } diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/stu/ExerciseExperimentalTraining.java b/src/main/java/com/sztzjy/financial_bigdata/controller/stu/ExerciseExperimentalTraining.java index c97fb8d..a985736 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/controller/stu/ExerciseExperimentalTraining.java +++ b/src/main/java/com/sztzjy/financial_bigdata/controller/stu/ExerciseExperimentalTraining.java @@ -240,9 +240,9 @@ public class ExerciseExperimentalTraining { } catch (IOException e) { return false; } - if (resourceDataList != null) { + if(resourceDataList.size()>0){ return true; - } else { + }else { return false; } } diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuIndexController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuIndexController.java index 686004d..b15f378 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuIndexController.java +++ b/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuIndexController.java @@ -110,11 +110,8 @@ public class StuIndexController { @PostMapping("getIndexResourceCenter") public ResultEntity> getIndexResourceCenter(@RequestParam String schoolId, @RequestParam String systemOwner) { Map resourceTypeCount = null; - try { - resourceTypeCount = ResourceCenterApi.getResourceTypeCount(schoolId, systemOwner); - } catch (IOException e) { - return new ResultEntity(HttpStatus.BAD_REQUEST, "资源中心获取资源数量异常"); - } + resourceTypeCount = ResourceCenterApi.getResourceTypeCount(schoolId, systemOwner); +// return new ResultEntity(HttpStatus.BAD_REQUEST, "资源中心获取资源数量异常"); return new ResultEntity<>(resourceTypeCount); } diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuScoreController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuScoreController.java index 4a4f6a8..3c86ada 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuScoreController.java +++ b/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuScoreController.java @@ -6,7 +6,6 @@ import com.sztzjy.financial_bigdata.entity.*; import com.sztzjy.financial_bigdata.entity.resource_entity.SysThreeCatalog; import com.sztzjy.financial_bigdata.entity.stu_dto.StuTrainingDto; import com.sztzjy.financial_bigdata.mapper.StuTrainingMapper; -import com.sztzjy.financial_bigdata.mapper.SysCourseChapterMapper; import com.sztzjy.financial_bigdata.mapper.SysWeightMapper; import com.sztzjy.financial_bigdata.mapper.TrainingReportMapper; import com.sztzjy.financial_bigdata.resourceCenterAPI.CourseAPI; @@ -91,9 +90,10 @@ public class StuScoreController { @AnonymousAccess @ApiOperation("实验报告展示") @PostMapping("getReportByUserId") - public ResultEntity> getReportByUserId(@RequestParam String userId) { + public ResultEntity> getReportByUserId(@RequestParam String userId, + @RequestParam String systemOwner) { TrainingReportExample trainingReportExample = new TrainingReportExample(); - trainingReportExample.createCriteria().andUserIdEqualTo(userId); + trainingReportExample.createCriteria().andUserIdEqualTo(userId).andSystemOwnerEqualTo(systemOwner); List trainingReports = trainingReportMapper.selectByExampleWithBLOBs(trainingReportExample); return new ResultEntity<>(trainingReports); } @@ -107,7 +107,8 @@ public class StuScoreController { @RequestParam String trainingId, @ApiParam("章节ID") @RequestParam String chapterId, @ApiParam("章节名称") @RequestParam String chapterName, - @RequestParam String schoolId) { + @RequestParam String schoolId, + @RequestParam String systemOwner) { int size = (int) file.getSize() / (1024 * 1024); //拿到MB为单位的大小 String originalFilename = file.getOriginalFilename(); assert originalFilename != null; @@ -117,7 +118,7 @@ public class StuScoreController { } //老师评分后不允许上传 TrainingReportExample example = new TrainingReportExample(); - example.createCriteria().andSchoolIdEqualTo(schoolId).andUserIdEqualTo(userId).andChapterIdEqualTo(chapterId); + example.createCriteria().andSchoolIdEqualTo(schoolId).andUserIdEqualTo(userId).andChapterIdEqualTo(chapterId).andSystemOwnerEqualTo(systemOwner); List trainingReports = trainingReportMapper.selectByExampleWithBLOBs(example); if (!trainingReports.isEmpty()) { //上传过 TrainingReport trainingReport = trainingReports.get(0); @@ -145,6 +146,7 @@ public class StuScoreController { trainingReport.setUserId(userId); trainingReport.setSchoolId(schoolId); trainingReport.setReportSize(size); + trainingReport.setSystemOwner(systemOwner); StuTrainingWithBLOBs stuTrainingWithBLOBs = stuTrainingMapper.selectByPrimaryKey(trainingId); stuTrainingWithBLOBs.setReportId(trainingReport.getReportId()); // 第一次上传时设置实训表的报告ID trainingReportMapper.insert(trainingReport); diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaExamManageController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaExamManageController.java index 601e39e..b4455d0 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaExamManageController.java +++ b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaExamManageController.java @@ -4,12 +4,14 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sztzjy.financial_bigdata.annotation.AnonymousAccess; import com.sztzjy.financial_bigdata.entity.*; -import com.sztzjy.financial_bigdata.entity.resource_entity.SysObjectiveQuestions; import com.sztzjy.financial_bigdata.entity.resource_entity.dto.SysObjectiveQuestionsDto; import com.sztzjy.financial_bigdata.entity.tea_dto.TeaExamManageCountDto; import com.sztzjy.financial_bigdata.entity.tea_dto.TeaExamManageDto; import com.sztzjy.financial_bigdata.entity.tea_dto.TrainingDto; -import com.sztzjy.financial_bigdata.mapper.*; +import com.sztzjy.financial_bigdata.mapper.StuClassMapper; +import com.sztzjy.financial_bigdata.mapper.StuStudentExamMapper; +import com.sztzjy.financial_bigdata.mapper.TeaAndStudentExamMapper; +import com.sztzjy.financial_bigdata.mapper.TeaExamManageMapper; import com.sztzjy.financial_bigdata.resourceCenterAPI.CaseApi; import com.sztzjy.financial_bigdata.resourceCenterAPI.ObjectiveApi; import com.sztzjy.financial_bigdata.service.tea.ITeaExamManageService; @@ -70,7 +72,7 @@ public class TeaExamManageController { @AnonymousAccess @PostMapping("/getAllCount") @ApiOperation("***新增考试--获取题目总数量") - public ResultEntity getAllCount(@RequestParam String schoolId,@RequestParam String systemOwner) { + public ResultEntity getAllCount(@RequestParam String schoolId, @RequestParam String systemOwner) { try { Integer single = ObjectiveApi.selectCountSingle(schoolId, systemOwner); Integer many = ObjectiveApi.selectCountMany(schoolId, systemOwner); @@ -89,7 +91,7 @@ public class TeaExamManageController { @PostMapping("/selectObjectivityByType") @ApiOperation("***新增考试--选择客观题时展示") public ResultEntity> selectObjectivityByType(@ApiParam("0单选 1多选 2判断") @RequestParam String type, - @RequestParam String schoolId,@RequestParam String systemOwner) { + @RequestParam String schoolId, @RequestParam String systemOwner) { List list = null; try { list = ObjectiveApi.selectObjByType(type, schoolId, systemOwner); @@ -127,11 +129,12 @@ public class TeaExamManageController { public ResultEntity> selectExamList(@RequestParam Integer index, @RequestParam Integer size, @RequestParam(required = false) @ApiParam("考试名称") String examName, - @RequestParam String schoolId) { + @RequestParam String schoolId, + @RequestParam String systemOwner) { PageHelper.startPage(index, size); TeaExamManageExample teaExamManageExample = new TeaExamManageExample(); TeaExamManageExample.Criteria criteria = teaExamManageExample.createCriteria(); - criteria.andSchoolIdEqualTo(schoolId); + criteria.andSchoolIdEqualTo(schoolId).andSystemOwnerEqualTo(systemOwner); if (StringUtils.isNotBlank(examName)) { criteria.andExamNameEqualTo(examName); } diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaGradeManageController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaGradeManageController.java index 39c4b60..cb708a3 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaGradeManageController.java +++ b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaGradeManageController.java @@ -41,7 +41,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.IOException; import java.math.BigDecimal; -import java.text.SimpleDateFormat; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -78,9 +77,10 @@ public class TeaGradeManageController { @ApiOperation("考试模式--页面展示(学生端实战考核复用)") public ResultEntity> getExamInfo(@RequestParam Integer index, @RequestParam Integer size, - @ApiParam("ManyAnswer为考试时间,JudgeAnswer为发布人") @RequestParam String schoolId) { + @ApiParam("ManyAnswer为考试时间,JudgeAnswer为发布人") @RequestParam String schoolId, + @ApiParam("系统名称") @RequestParam String systemOwner) { - List teaExamManages = teaExamManageMapper.selectBySchoolId(schoolId); + List teaExamManages = teaExamManageMapper.selectBySchoolIdAndSystemOwner(schoolId, systemOwner); if (teaExamManages.isEmpty()) { return null; } @@ -149,7 +149,7 @@ public class TeaGradeManageController { @RequestParam(required = false) String classId, @RequestParam(required = false) String examManageId) { List list = getTeaExamAndUserDtos(schoolId, keyWord, classId, examManageId); - if (list == null||list.isEmpty()) { + if (list == null || list.isEmpty()) { return new ResultEntity>(new PageInfo<>()); } // 先对列表按照 totalScore 进行降序排序 @@ -416,7 +416,7 @@ public class TeaGradeManageController { @ApiParam("学号或姓名搜索框") @RequestParam(required = false) String keyWord, @RequestParam(required = false) String classId, @RequestParam String systemOwner) { - return new ResultEntity>(iTeaGradeManageService.getTrainingInfo(index, size, schoolId, keyWord, classId,systemOwner)); + return new ResultEntity>(iTeaGradeManageService.getTrainingInfo(index, size, schoolId, keyWord, classId, systemOwner)); } @AnonymousAccess @@ -427,7 +427,7 @@ public class TeaGradeManageController { @ApiParam("学号或姓名搜索框") @RequestParam(required = false) String keyWord, @RequestParam(required = false) String classId, @RequestParam String systemOwner) { - iTeaGradeManageService.exportTrainingInfo(response, schoolId, keyWord, classId,systemOwner); + iTeaGradeManageService.exportTrainingInfo(response, schoolId, keyWord, classId, systemOwner); } @AnonymousAccess @@ -457,10 +457,11 @@ public class TeaGradeManageController { @ApiOperation("练习模式--实训报告展示") public ResultEntity> getReportBySchoolID(@RequestParam Integer index, @RequestParam Integer size, - @RequestParam String schoolId) { + @RequestParam String schoolId, + @RequestParam String systemOwner) { PageHelper.startPage(index, size); TrainingReportExample reportExample = new TrainingReportExample(); - reportExample.createCriteria().andSchoolIdEqualTo(schoolId); + reportExample.createCriteria().andSchoolIdEqualTo(schoolId).andSystemOwnerEqualTo(systemOwner); List list = new AstList(); List trainingReports = reportMapper.selectByExampleWithBLOBs(reportExample); if (!trainingReports.isEmpty()) { @@ -496,7 +497,7 @@ public class TeaGradeManageController { @AnonymousAccess @PostMapping("/getChapterName") @ApiOperation("***评阅-章节下拉框") - public ResultEntity> getReportCorrect(String schoolId,String systemOwner) { + public ResultEntity> getReportCorrect(String schoolId, String systemOwner) { List list = null; try { list = CourseAPI.selectNameByCourseID(schoolId, systemOwner); @@ -553,7 +554,7 @@ public class TeaGradeManageController { @ApiOperation("练习模式--成绩详情页面设置权重") public void updateWeightByModule(@ApiParam("所有框必须传") @RequestBody SysWeight sysWeight) { SysWeightExample sysWeightExample = new SysWeightExample(); - sysWeightExample.createCriteria().andCourseIdEqualTo(sysWeight.getCourseId()); + sysWeightExample.createCriteria().andCourseIdEqualTo(sysWeight.getCourseId()).andSystemOwnerEqualTo(sysWeight.getSystemOwner()); List sysWeights = sysWeightMapper.selectByExample(sysWeightExample); if (!sysWeights.isEmpty()) {//有 update sysWeightMapper.updateByPrimaryKey(sysWeight); @@ -566,14 +567,14 @@ public class TeaGradeManageController { @AnonymousAccess @PostMapping("/getModuleBySchoolId") @ApiOperation("***练习模式--权重页面下拉选择模块框") - public ResultEntity>> getModuleBySchoolId(@RequestParam String schoolId,@RequestParam String systemOwner) { - List> list= null; + public ResultEntity>> getModuleBySchoolId(@RequestParam String schoolId, @RequestParam String systemOwner) { + List> list = null; try { List twoCatalogs = CourseAPI.selectCourseList(systemOwner, schoolId); for (int i = 0; i < twoCatalogs.size(); i++) { HashMap hashMap = new HashMap<>(); SysTwoCatalog sysTwoCatalog = twoCatalogs.get(i); - hashMap.put(sysTwoCatalog.getTwoId(),sysTwoCatalog.getTwoName()); + hashMap.put(sysTwoCatalog.getTwoId(), sysTwoCatalog.getTwoName()); list.add(hashMap); } } catch (IOException e) { @@ -586,9 +587,10 @@ public class TeaGradeManageController { @PostMapping("/getModuleByCourseId") @ApiOperation("练习模式--权重回显") public ResultEntity getModuleByCourseId(@RequestParam String courseId, - @RequestParam String schoolId) { + @RequestParam String schoolId, + @RequestParam String systemOwner) { SysWeightExample sysWeightExample = new SysWeightExample(); - sysWeightExample.createCriteria().andSchoolIdEqualTo(schoolId).andCourseIdEqualTo(courseId); + sysWeightExample.createCriteria().andSchoolIdEqualTo(schoolId).andCourseIdEqualTo(courseId).andSystemOwnerEqualTo(systemOwner); List sysWeights = sysWeightMapper.selectByExample(sysWeightExample); if (sysWeights.isEmpty()) { //todo 是否需要设置默认权重 @@ -605,8 +607,9 @@ public class TeaGradeManageController { @RequestParam Integer size, @RequestParam String schoolId, @RequestParam(required = false) String classId, - @ApiParam("学号/姓名搜索框") @RequestParam(required = false) String keyWord) { - return new ResultEntity<>(iTeaGradeManageService.getTheoryInfo(index, size, schoolId, classId, keyWord)); + @ApiParam("学号/姓名搜索框") @RequestParam(required = false) String keyWord, + @RequestParam String systemOwner) { + return new ResultEntity<>(iTeaGradeManageService.getTheoryInfo(index, size, schoolId, classId, keyWord,systemOwner)); } diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java index a3ed4d6..2d58b1d 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java +++ b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java @@ -217,6 +217,7 @@ public class UserController { @AnonymousAccess public String checkOrCreateForexSimulationUser(@RequestBody List zyUserInfoList, @RequestParam String systemOwner) { + System.out.println(systemOwner); List users = new ArrayList<>(); Map map = new HashMap<>(); for (int i = 0; i < zyUserInfoList.size(); i++) { diff --git a/src/main/java/com/sztzjy/financial_bigdata/entity/tea_dto/TeaExamManageDto.java b/src/main/java/com/sztzjy/financial_bigdata/entity/tea_dto/TeaExamManageDto.java index 74659cb..9ad2b66 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/entity/tea_dto/TeaExamManageDto.java +++ b/src/main/java/com/sztzjy/financial_bigdata/entity/tea_dto/TeaExamManageDto.java @@ -87,6 +87,9 @@ public class TeaExamManageDto { @ApiModelProperty("判断题答案(id, answer)") private String judgeAnswer; + @ApiModelProperty("系统名称") + private String systemOwner; + @Nullable private MultipartFile file; } diff --git a/src/main/java/com/sztzjy/financial_bigdata/entity/tea_dto/TrainingReportDto.java b/src/main/java/com/sztzjy/financial_bigdata/entity/tea_dto/TrainingReportDto.java index b5b4f73..f50a68c 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/entity/tea_dto/TrainingReportDto.java +++ b/src/main/java/com/sztzjy/financial_bigdata/entity/tea_dto/TrainingReportDto.java @@ -58,4 +58,6 @@ public class TrainingReportDto { @ApiModelProperty("教师评语") private String teacherComment; + @ApiModelProperty("归属系统") + private String systemOwner; } \ No newline at end of file diff --git a/src/main/java/com/sztzjy/financial_bigdata/mapper/TeaExamManageMapper.java b/src/main/java/com/sztzjy/financial_bigdata/mapper/TeaExamManageMapper.java index 7b26798..ae2066b 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/mapper/TeaExamManageMapper.java +++ b/src/main/java/com/sztzjy/financial_bigdata/mapper/TeaExamManageMapper.java @@ -3,16 +3,14 @@ package com.sztzjy.financial_bigdata.mapper; import com.sztzjy.financial_bigdata.entity.TeaExamManage; import com.sztzjy.financial_bigdata.entity.TeaExamManageExample; import com.sztzjy.financial_bigdata.entity.TeaExamManageWithBLOBs; - -import java.math.BigDecimal; -import java.util.List; -import java.util.Map; - import com.sztzjy.financial_bigdata.entity.stu_dto.ReceiveDto; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import java.util.List; +import java.util.Map; + @Mapper public interface TeaExamManageMapper { long countByExample(TeaExamManageExample example); @@ -49,10 +47,11 @@ public interface TeaExamManageMapper { List selectByUserId(@Param("userId") String userId); - List selectBySchoolId(@Param("schoolId")String schoolId); + List selectBySchoolIdAndSystemOwner(@Param("schoolId") String schoolId, + @Param("systemOwner") String systemOwner); @Select("select exam_name,exam_manage_id from tea_exam_manage where school_id =#{schoolId}") - List> selectNameAndIdBySchoolId(@Param("schoolId")String schoolId); + List> selectNameAndIdBySchoolId(@Param("schoolId") String schoolId); - ReceiveDto getLastExamScore(@Param("userId")String userId); + ReceiveDto getLastExamScore(@Param("userId") String userId); } \ No newline at end of file diff --git a/src/main/java/com/sztzjy/financial_bigdata/resourceCenterAPI/ResourceCenterApi.java b/src/main/java/com/sztzjy/financial_bigdata/resourceCenterAPI/ResourceCenterApi.java index 42b01ed..47f2d6b 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/resourceCenterAPI/ResourceCenterApi.java +++ b/src/main/java/com/sztzjy/financial_bigdata/resourceCenterAPI/ResourceCenterApi.java @@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.lang.reflect.Type; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -88,11 +89,19 @@ public class ResourceCenterApi { /** * 获取资源类型数量 */ - public static Map getResourceTypeCount(String schoolId ,String systemOwner) throws IOException { + public static Map getResourceTypeCount(String schoolId ,String systemOwner){ String requestBody="schoolId="+schoolId+"&systemOwner="+systemOwner; - JSONObject object = HttpUtils.sendPost( - getResourceTypeCount, - requestBody); + JSONObject object = null; + try { + object = HttpUtils.sendPost( + getResourceTypeCount, + requestBody); + } catch (IOException e) { + if(object==null){ + return new HashMap<>(); + } + e.printStackTrace(); + } Gson gson = new GsonBuilder() .registerTypeAdapter(Date.class, new DateTypeAdapter()) .create(); diff --git a/src/main/java/com/sztzjy/financial_bigdata/service/tea/ITeaGradeManageService.java b/src/main/java/com/sztzjy/financial_bigdata/service/tea/ITeaGradeManageService.java index a891015..3750499 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/service/tea/ITeaGradeManageService.java +++ b/src/main/java/com/sztzjy/financial_bigdata/service/tea/ITeaGradeManageService.java @@ -28,7 +28,7 @@ public interface ITeaGradeManageService { PageInfo getReportCorrect(String schoolId, Integer index, Integer size, String module, String classId, String keyWord); - PageInfo getTheoryInfo(Integer index, Integer size, String schoolId, String classId, String keyWord); + PageInfo getTheoryInfo(Integer index, Integer size, String schoolId, String classId, String keyWord,String systemOwner); void exportTheoryExamInfo(HttpServletResponse response,String classId, String schoolId); } diff --git a/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaExamManageServiceImpl.java b/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaExamManageServiceImpl.java index 6fc8b0f..97e53c5 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaExamManageServiceImpl.java +++ b/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaExamManageServiceImpl.java @@ -66,6 +66,7 @@ public class TeaExamManageServiceImpl implements ITeaExamManageService { teaAndStudentExam.setExamManageId(examManageId); teaAndStudentExam.setClassId(teaExamManagedto.getClassId()); teaAndStudentExam.setClassName(teaExamManagedto.getClassName()); + teaAndStudentExam.setSystemOwner(teaExamManagedto.getSystemOwner()); teaAndStudentExam.setId(IdUtil.randomUUID()); teaAndStudentExamMapper.insert(teaAndStudentExam); teaExamManageWithBLOBs.setExamManageId(examManageId); diff --git a/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaGradeManageServiceImpl.java b/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaGradeManageServiceImpl.java index 6e601b8..fb8198a 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaGradeManageServiceImpl.java +++ b/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaGradeManageServiceImpl.java @@ -51,8 +51,8 @@ public class TeaGradeManageServiceImpl implements ITeaGradeManageService { @Override - public PageInfo getTrainingInfo(Integer index, Integer size, String schoolId, String keyWord, String classId,String systemOwner) { - List list = getTeaTrainingInfoDTOS(schoolId, keyWord, classId,systemOwner); + public PageInfo getTrainingInfo(Integer index, Integer size, String schoolId, String keyWord, String classId, String systemOwner) { + List list = getTeaTrainingInfoDTOS(schoolId, keyWord, classId, systemOwner); assert !list.isEmpty(); list.sort(new TotalScoreComparator()); int i = 0; @@ -71,8 +71,8 @@ public class TeaGradeManageServiceImpl implements ITeaGradeManageService { * @Date 2024/3/19 */ @Override - public void exportTrainingInfo(HttpServletResponse response, String schoolId, String keyWord, String classId,String systemOwner) { - List list = getTeaTrainingInfoDTOS(schoolId, keyWord, classId,systemOwner); + public void exportTrainingInfo(HttpServletResponse response, String schoolId, String keyWord, String classId, String systemOwner) { + List list = getTeaTrainingInfoDTOS(schoolId, keyWord, classId, systemOwner); //导出的表名 String title = IdUtil.simpleUUID(); //表中第一行表头字段 @@ -229,20 +229,20 @@ public class TeaGradeManageServiceImpl implements ITeaGradeManageService { } @Override - public PageInfo getTheoryInfo(Integer index, Integer size, String schoolId, String classId, String keyWord) { + public PageInfo getTheoryInfo(Integer index, Integer size, String schoolId, String classId, String keyWord, String systemOwner) { PageHelper.startPage(index, size); - List list = getStuTheoryRecordPageInfo(schoolId, classId, keyWord); + List list = getStuTheoryRecordPageInfo(schoolId, classId, keyWord, systemOwner); PageInfo pageInfo = new PageInfo<>(list); return pageInfo; } //查询方法 - private List getStuTheoryRecordPageInfo(String schoolId, String classId, String keyWord) { + private List getStuTheoryRecordPageInfo(String schoolId, String classId, String keyWord, String systemOwner) { StuTheoryRecordExample s = new StuTheoryRecordExample(); StuTheoryRecordExample.Criteria criteria = s.createCriteria(); StuTheoryRecordExample.Criteria orCriteria = s.createCriteria(); - criteria.andSchoolIdEqualTo(schoolId); - orCriteria.andSchoolIdEqualTo(schoolId); + criteria.andSchoolIdEqualTo(schoolId).andSystemOwnerEqualTo(systemOwner); + orCriteria.andSchoolIdEqualTo(schoolId).andSystemOwnerEqualTo(systemOwner); if (StringUtils.isNotBlank(classId)) { criteria.andClassIdEqualTo(classId); orCriteria.andClassIdEqualTo(classId); @@ -288,7 +288,7 @@ public class TeaGradeManageServiceImpl implements ITeaGradeManageService { } - private List getTeaTrainingInfoDTOS(String schoolId, String keyWord, String classId,String systemOwner) { + private List getTeaTrainingInfoDTOS(String schoolId, String keyWord, String classId, String systemOwner) { StuUserExample userExample = new StuUserExample(); StuUserExample.Criteria criteria = userExample.createCriteria(); criteria.andSchoolIdEqualTo(schoolId).andRoleIdEqualTo(4); @@ -317,7 +317,7 @@ public class TeaGradeManageServiceImpl implements ITeaGradeManageService { StuTrainingExample stuTrainingExample = new StuTrainingExample(); stuTrainingExample.createCriteria().andUserIdIn(new ArrayList<>(userIds)); List stuTrainingsWithBLOBs = trainingMapper.selectByExampleWithBLOBs(stuTrainingExample); - if (stuTrainingsWithBLOBs.isEmpty()){ + if (stuTrainingsWithBLOBs.isEmpty()) { return Collections.emptyList(); } // 实训记录按用户ID分组 diff --git a/src/main/resources/mapper/TeaExamManageMapper.xml b/src/main/resources/mapper/TeaExamManageMapper.xml index 22ef503..632b45d 100644 --- a/src/main/resources/mapper/TeaExamManageMapper.xml +++ b/src/main/resources/mapper/TeaExamManageMapper.xml @@ -541,11 +541,12 @@ where exam_manage_id = #{examManageId,jdbcType=VARCHAR} - select from tea_exam_manage where school_id = #{schoolId,jdbcType=VARCHAR} + and system_owner = #{systemOwner,jdbcType=VARCHAR}