From 8b65050d71488dd0d0c0aca6aa007c129aed77f2 Mon Sep 17 00:00:00 2001 From: zhangyue Date: Wed, 28 Jan 2026 15:16:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=A6=E5=91=98=E8=80=83?= =?UTF-8?q?=E6=A0=B8=E6=88=90=E7=BB=A9=E7=BB=9F=E8=AE=A1=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../edu/web/archives/ArchivesController.java | 12 ++- .../zcloud/edu/web/study/ClassController.java | 2 +- .../command/query/study/ClassQueryExe.java | 7 ++ .../command/query/study/StudentQueryExe.java | 60 ++++++++++++--- .../edu/service/study/ClassServiceImpl.java | 5 ++ .../edu/service/study/StudentServiceImpl.java | 5 ++ .../zcloud/edu/api/study/ClassServiceI.java | 3 + .../zcloud/edu/api/study/StudentServiceI.java | 2 + .../edu/dto/clientobject/study/ClassCO.java | 3 + .../edu/dto/clientobject/study/StudentCO.java | 73 ++++++++++++++++++- .../dto/data/archives/ClassArchivesDTO.java | 11 +++ .../domain/model/archives/ClassArchivesE.java | 12 +++ .../domain/model/study/ClassCurriculumE.java | 5 -- .../edu/domain/model/study/StudentE.java | 1 + .../persistence/dataobject/study/ClassDO.java | 4 + .../dataobject/study/StudentDO.java | 66 ++++++++++++++++- .../persistence/mapper/study/ClassMapper.java | 4 + .../mapper/study/StudentMapper.java | 2 + .../impl/study/ClassRepositoryImpl.java | 12 ++- .../impl/study/StudentRepositoryImpl.java | 5 ++ .../impl/study/StudentSignRepositoryImpl.java | 5 ++ .../repository/study/ClassRepository.java | 3 + .../repository/study/StudentRepository.java | 4 +- .../study/StudentSignRepository.java | 1 + .../resources/mapper/study/ClassMapper.xml | 72 +++++++++++++++++- .../resources/mapper/study/StudentMapper.xml | 13 ++++ .../mapper/study/StudentSignMapper.xml | 5 +- 27 files changed, 366 insertions(+), 31 deletions(-) diff --git a/web-adapter/src/main/java/com/zcloud/edu/web/archives/ArchivesController.java b/web-adapter/src/main/java/com/zcloud/edu/web/archives/ArchivesController.java index 1a5b64e..84e6514 100644 --- a/web-adapter/src/main/java/com/zcloud/edu/web/archives/ArchivesController.java +++ b/web-adapter/src/main/java/com/zcloud/edu/web/archives/ArchivesController.java @@ -8,6 +8,7 @@ import com.zcloud.edu.api.study.ClassServiceI; import com.zcloud.edu.api.study.StudentServiceI; import com.zcloud.edu.dto.archives.ClassArchivesQry; import com.zcloud.edu.dto.clientobject.study.ClassCO; +import com.zcloud.edu.dto.clientobject.study.StudentCO; import com.zcloud.edu.dto.data.archives.ClassArchivesDTO; import com.zcloud.edu.dto.data.archives.PersonArchivesDTO; import com.zcloud.edu.dto.study.ClassPageQry; @@ -33,9 +34,8 @@ public class ArchivesController { @ApiOperation("分页") @PostMapping("/list") - public PageResponse page(@RequestBody ClassPageQry qry) { - qry.setEqCorpinfoId(AuthContext.getCurrentUser().getTenantId()); - return classService.appListPage(qry); + public PageResponse page(@RequestBody ClassPageQry qry) { + return classService.listStudentClass(qry); } @ApiOperation("查询学时证明") @@ -61,4 +61,10 @@ public class ArchivesController { return studentService.getClassSign(qry); } + @ApiOperation("学员考核成绩统计表") + @PostMapping("/getClassExamResult") + public SingleResponse getClassExamResult(@RequestBody ClassArchivesQry qry) { + return studentService.getClassExamResult(qry); + } + } diff --git a/web-adapter/src/main/java/com/zcloud/edu/web/study/ClassController.java b/web-adapter/src/main/java/com/zcloud/edu/web/study/ClassController.java index 67afa58..8da2f0a 100644 --- a/web-adapter/src/main/java/com/zcloud/edu/web/study/ClassController.java +++ b/web-adapter/src/main/java/com/zcloud/edu/web/study/ClassController.java @@ -71,7 +71,7 @@ public class ClassController { return MultiResponse.of(new ArrayList()); } @ApiOperation("统计人员班级数") - @GetMapping("/countStuClass") + @PostMapping("/countStuClass") public MultiResponse countStuClass(@RequestBody ClassCountQry qry) { return classService.countStuClass(qry); } diff --git a/web-app/src/main/java/com/zcloud/edu/command/query/study/ClassQueryExe.java b/web-app/src/main/java/com/zcloud/edu/command/query/study/ClassQueryExe.java index b1ce684..b47e07a 100644 --- a/web-app/src/main/java/com/zcloud/edu/command/query/study/ClassQueryExe.java +++ b/web-app/src/main/java/com/zcloud/edu/command/query/study/ClassQueryExe.java @@ -138,5 +138,12 @@ public class ClassQueryExe { List studentCOList = BeanUtil.copyToList(studentDOList, StudentCO.class); return MultiResponse.of(studentCOList); } + public PageResponse executeListStudentClass(ClassPageQry classPageQry) { + Map params = PageQueryHelper.toHashMap(classPageQry); + PageResponse pageResponse = classRepository.listStudentClassPage(params); + List examCenterCOS = studentCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + } diff --git a/web-app/src/main/java/com/zcloud/edu/command/query/study/StudentQueryExe.java b/web-app/src/main/java/com/zcloud/edu/command/query/study/StudentQueryExe.java index 0470170..b404a3a 100644 --- a/web-app/src/main/java/com/zcloud/edu/command/query/study/StudentQueryExe.java +++ b/web-app/src/main/java/com/zcloud/edu/command/query/study/StudentQueryExe.java @@ -20,6 +20,7 @@ import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -61,10 +62,9 @@ public class StudentQueryExe { ClassDO classDO = classRepository.getByClassId(studentDO.getClassId()); ClassE classE = new ClassE(); BeanUtils.copyProperties(classDO, classE); - + HashMap params = new HashMap(); + params.put("classId", studentDO.getClassId()); // 课程信息 - ClassCurriculumE classCurriculumE = new ClassCurriculumE(); - Map params = classCurriculumE.initListAllParams(studentDO.getClassId()); List curEList = classCurriculumRepository.listAll(params); List classCurList = BeanUtil.copyToList(curEList, ClassCurriculumE.class); @@ -91,10 +91,9 @@ public class StudentQueryExe { ClassDO classDO = classRepository.getByClassId(studentDO.getClassId()); ClassE classE = new ClassE(); BeanUtils.copyProperties(classDO, classE); - + HashMap params = new HashMap(); + params.put("classId", studentDO.getClassId()); // 课程信息 - ClassCurriculumE classCurriculumE = new ClassCurriculumE(); - Map params = classCurriculumE.initListAllParams(studentDO.getClassId()); List curEList = classCurriculumRepository.listAll(params); List classCurList = BeanUtil.copyToList(curEList, ClassCurriculumE.class); @@ -118,10 +117,9 @@ public class StudentQueryExe { ClassDO classDO = classRepository.getByClassId(studentDO.getClassId()); ClassE classE = new ClassE(); BeanUtils.copyProperties(classDO, classE); - + HashMap params = new HashMap(); + params.put("classId", studentDO.getClassId()); // 课程信息 - ClassCurriculumE classCurriculumE = new ClassCurriculumE(); - Map params = classCurriculumE.initListAllParams(studentDO.getClassId()); List curEList = classCurriculumRepository.listAll(params); List classCurList = BeanUtil.copyToList(curEList, ClassCurriculumE.class); @@ -143,9 +141,10 @@ public class StudentQueryExe { ClassE classE = new ClassE(); long stuCount = studentRepository.countByClassId(qry.getClassId()); BeanUtils.copyProperties(classDO, classE); + HashMap params = new HashMap(); + params.put("classId", qry.getClassId()); + // 课程信息 - ClassCurriculumE classCurriculumE = new ClassCurriculumE(); - Map params = classCurriculumE.initListAllParams(qry.getClassId()); List curEList = classCurriculumRepository.listAll(params); List classCurList = BeanUtil.copyToList(curEList, ClassCurriculumE.class); @@ -164,7 +163,46 @@ public class StudentQueryExe { } + public SingleResponse executeGetClassExamResult(ClassArchivesQry qry){ + // 班级信息 + ClassDO classDO = classRepository.getByClassId(qry.getClassId()); + ClassE classE = new ClassE(); + BeanUtils.copyProperties(classDO, classE); + HashMap params = new HashMap(); + params.put("classId", qry.getClassId()); + // 学员总数 + List stuList = studentRepository.listAll(params); + List stuCOList = BeanUtil.copyToList(stuList, StudentCO.class); + +// // 课程信息 +// List curEList = classCurriculumRepository.listAll(params); +// List classCurList = BeanUtil.copyToList(curEList, ClassCurriculumE.class); + + // 签到人员数量 + params.put("type",1); + List studentSignList = studentSignRepository.listAll(params); + ClassArchivesE classArchivesE = new ClassArchivesE(); + + // 整理数据 + classArchivesE.initClassExamResult(classE, stuList.size(), studentSignList.size()); + ClassArchivesDTO classArchivesDTO = new ClassArchivesDTO(); + BeanUtils.copyProperties(classArchivesE, classArchivesDTO); + // 获取通过和未通过学员 + List passStudentList = new ArrayList(); + List failStudentList = new ArrayList(); + stuCOList.forEach(stu -> { + if (stu.getState() == 0){ + failStudentList.add(stu); + } + if (stu.getState() == 1){ + passStudentList.add(stu); + } + }); + classArchivesDTO.setPassStudentList(passStudentList); + classArchivesDTO.setFailStudentList(failStudentList); + return SingleResponse.of(classArchivesDTO); + } } diff --git a/web-app/src/main/java/com/zcloud/edu/service/study/ClassServiceImpl.java b/web-app/src/main/java/com/zcloud/edu/service/study/ClassServiceImpl.java index dcf0c0e..43e218b 100644 --- a/web-app/src/main/java/com/zcloud/edu/service/study/ClassServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/edu/service/study/ClassServiceImpl.java @@ -88,5 +88,10 @@ public class ClassServiceImpl implements ClassServiceI { public MultiResponse countStuClass(ClassCountQry qry) { return classQueryExe.executeCountStuClass(qry); } + + @Override + public PageResponse listStudentClass(ClassPageQry qry) { + return classQueryExe.executeListStudentClass(qry); + } } diff --git a/web-app/src/main/java/com/zcloud/edu/service/study/StudentServiceImpl.java b/web-app/src/main/java/com/zcloud/edu/service/study/StudentServiceImpl.java index 76eefef..1696e15 100644 --- a/web-app/src/main/java/com/zcloud/edu/service/study/StudentServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/edu/service/study/StudentServiceImpl.java @@ -84,5 +84,10 @@ public class StudentServiceImpl implements StudentServiceI { public Long countStudent(String classId) { return studentQueryExe.executeCountStudent(classId); } + + @Override + public SingleResponse getClassExamResult(ClassArchivesQry qry) { + return studentQueryExe.executeGetClassExamResult(qry); + } } diff --git a/web-client/src/main/java/com/zcloud/edu/api/study/ClassServiceI.java b/web-client/src/main/java/com/zcloud/edu/api/study/ClassServiceI.java index f84fd0e..7319027 100644 --- a/web-client/src/main/java/com/zcloud/edu/api/study/ClassServiceI.java +++ b/web-client/src/main/java/com/zcloud/edu/api/study/ClassServiceI.java @@ -40,5 +40,8 @@ public interface ClassServiceI { SingleResponse statisticsCount(ClassPageQry qry); MultiResponse countStuClass(ClassCountQry qry); + + + PageResponse listStudentClass(ClassPageQry qry); } diff --git a/web-client/src/main/java/com/zcloud/edu/api/study/StudentServiceI.java b/web-client/src/main/java/com/zcloud/edu/api/study/StudentServiceI.java index d66fce2..6c79e28 100644 --- a/web-client/src/main/java/com/zcloud/edu/api/study/StudentServiceI.java +++ b/web-client/src/main/java/com/zcloud/edu/api/study/StudentServiceI.java @@ -38,5 +38,7 @@ public interface StudentServiceI { SingleResponse getClassSign(ClassArchivesQry qry); Long countStudent(String classId); + + SingleResponse getClassExamResult(ClassArchivesQry qry); } diff --git a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/study/ClassCO.java b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/study/ClassCO.java index 583f672..46e95ad 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/study/ClassCO.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/study/ClassCO.java @@ -49,6 +49,9 @@ public class ClassCO extends ClientObject { //机构ID @ApiModelProperty(value = "机构ID") private Long corpinfoId; + //机构ID + @ApiModelProperty(value = "所属单位") + private String corpName; //状态：1-未申请 2-待开班 3- 培训中 4-培训结束 @ApiModelProperty(value = "状态：1-未申请 2-待开班 3- 培训中 4-培训结束 ") private Integer state; diff --git a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/study/StudentCO.java b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/study/StudentCO.java index 14d0413..cec38c3 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/study/StudentCO.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/study/StudentCO.java @@ -82,7 +82,7 @@ public class StudentCO extends ClientObject { @ApiModelProperty(value = "考试签到状态 0-未签到 1-已签到") private Integer examSignFlag; //学员状态 0-未学习 1-已签到 2-考试通过 3-未签到 4-考试未通过 - @ApiModelProperty(value = "学员状态 0-未学习 1-已签到 2-考试通过 3-未签到 4-考试未通过") + @ApiModelProperty(value = "学员状态 0-未完成 1-已完成") private Integer state; //相关方id集合 @ApiModelProperty(value = "相关方id集合") @@ -108,6 +108,77 @@ public class StudentCO extends ClientObject { private Integer completeClassCount; + + + + + + //班级名称 + @ApiModelProperty(value = "班级名称") + @TableField(exist = false) + private String className; + //培训日期 开始时间 + @ApiModelProperty(value = "培训日期 开始时间") + @TableField(exist = false) + private String startTime; + //培训日期 结束日期 + @ApiModelProperty(value = "培训日期 结束日期") + @TableField(exist = false) + private String endTime; + //培训教师id + @ApiModelProperty(value = "培训教师id") + @TableField(exist = false) + private Long teacherId; + //教师名称 + @ApiModelProperty(value = "教师名称") + @TableField(exist = false) + private String teacherName; + //培训行业类型 + @ApiModelProperty(value = "培训行业类型") + @TableField(exist = false) + private String trainType; + //培训行业类型名称 + @ApiModelProperty(value = "培训行业类型名称") + @TableField(exist = false) + private String trainTypeName; + //培训地点 + @ApiModelProperty(value = "培训地点") + @TableField(exist = false) + private String trainingLocation; + //机构ID + @ApiModelProperty(value = "机构ID") + @TableField(exist = false) + private Long corpinfoId; + //所属单位 + @ApiModelProperty(value = "所属单位") + @TableField(exist = false) + private String corpName; + //状态：1-未申请 2-待开班 3- 培训中 4-培训结束 + @ApiModelProperty(value = "状态：1-未申请 2-待开班 3- 培训中 4-培训结束 ") + @TableField(exist = false) + private Integer classState; + //培训有效期日期 开始时间 + @ApiModelProperty(value = "培训有效期日期 开始时间") + @TableField(exist = false) + private String validStartTime; + //培训有效期日期 结束时间 + @ApiModelProperty(value = "培训有效期日期 结束时间") + @TableField(exist = false) + private String validEndTime; + //1考试0不考试 + @ApiModelProperty(value = "1考试0不考试") + @TableField(exist = false) + private Integer examination; + //考试次数只有考试时候有用 + @ApiModelProperty(value = "考试次数只有考试时候有用") + @TableField(exist = false) + private Integer numberofexams; + + + + + + //环境 @ApiModelProperty(value = "环境") private String env; diff --git a/web-client/src/main/java/com/zcloud/edu/dto/data/archives/ClassArchivesDTO.java b/web-client/src/main/java/com/zcloud/edu/dto/data/archives/ClassArchivesDTO.java index 36c0cb0..0146cb3 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/data/archives/ClassArchivesDTO.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/data/archives/ClassArchivesDTO.java @@ -1,5 +1,6 @@ package com.zcloud.edu.dto.data.archives; +import com.zcloud.edu.dto.clientobject.study.StudentCO; import com.zcloud.edu.dto.clientobject.study.StudentSignCO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -48,6 +49,9 @@ public class ClassArchivesDTO { //机构ID @ApiModelProperty(value = "机构ID") private Long corpinfoId; + //所属单位名称 + @ApiModelProperty(value = "所属单位名称") + private Long corpName; //状态：1-未申请 2-待开班 3- 培训中 4-培训结束 @ApiModelProperty(value = "状态：1-未申请 2-待开班 3- 培训中 4-培训结束 ") private Integer state; @@ -83,4 +87,11 @@ public class ClassArchivesDTO { @ApiModelProperty(value = "学员数") private Long studentCount; + @ApiModelProperty(value = "实际参加培训人数") + private Long signCount; + + @ApiModelProperty(value = "合格学员列表") + private List passStudentList; + @ApiModelProperty(value = "不合格学员列表") + private List failStudentList; } diff --git a/web-domain/src/main/java/com/zcloud/edu/domain/model/archives/ClassArchivesE.java b/web-domain/src/main/java/com/zcloud/edu/domain/model/archives/ClassArchivesE.java index 46ce250..36bbebb 100644 --- a/web-domain/src/main/java/com/zcloud/edu/domain/model/archives/ClassArchivesE.java +++ b/web-domain/src/main/java/com/zcloud/edu/domain/model/archives/ClassArchivesE.java @@ -83,6 +83,9 @@ public class ClassArchivesE extends BaseE { @ApiModelProperty(value = "学员数") private Long studentCount; + @ApiModelProperty(value = "实际参加培训人数") + private Long signCount; + public void initClassSign(ClassE classE, Long studentCount, List classCurList) { BeanUtils.copyProperties(classE, this); String trainSubject = classCurList.stream().map(ClassCurriculumE::getCurriculumName).collect(Collectors.joining(",")); @@ -91,5 +94,14 @@ public class ClassArchivesE extends BaseE { setStudentCount(studentCount); setClzId(classE.getId()); } + public void initClassExamResult(ClassE classE, Integer studentCount, Integer signCount) { + BeanUtils.copyProperties(classE, this); + setClassName(classE.getName()); +// String trainSubject = classCurList.stream().map(ClassCurriculumE::getCurriculumName).collect(Collectors.joining(",")); +// setTrainSubject(trainSubject); + setStudentCount(Long.valueOf(studentCount)); + setSignCount(Long.valueOf(signCount)); + setClzId(classE.getId()); + } } diff --git a/web-domain/src/main/java/com/zcloud/edu/domain/model/study/ClassCurriculumE.java b/web-domain/src/main/java/com/zcloud/edu/domain/model/study/ClassCurriculumE.java index 4fcc306..b37d568 100644 --- a/web-domain/src/main/java/com/zcloud/edu/domain/model/study/ClassCurriculumE.java +++ b/web-domain/src/main/java/com/zcloud/edu/domain/model/study/ClassCurriculumE.java @@ -100,11 +100,6 @@ public class ClassCurriculumE extends BaseE { }); } - public HashMap initListAllParams(String classId){ - HashMap params = new HashMap(); - params.put("classId", classId); - return params; - } } diff --git a/web-domain/src/main/java/com/zcloud/edu/domain/model/study/StudentE.java b/web-domain/src/main/java/com/zcloud/edu/domain/model/study/StudentE.java index 640ffd6..f991f21 100644 --- a/web-domain/src/main/java/com/zcloud/edu/domain/model/study/StudentE.java +++ b/web-domain/src/main/java/com/zcloud/edu/domain/model/study/StudentE.java @@ -116,5 +116,6 @@ public class StudentE extends BaseE { } } + } diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/study/ClassDO.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/study/ClassDO.java index 938d871..8f92040 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/study/ClassDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/study/ClassDO.java @@ -50,6 +50,10 @@ public class ClassDO extends BaseDO { //机构ID @ApiModelProperty(value = "机构ID") private Long corpinfoId; + //所属单位 + @ApiModelProperty(value = "所属单位") + @TableField(exist = false) + private String corpName; //状态：1-未申请 2-待开班 3- 培训中 4-培训结束 @ApiModelProperty(value = "状态：1-未申请 2-待开班 3- 培训中 4-培训结束 ") private Integer state; diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/study/StudentDO.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/study/StudentDO.java index 2e83837..d8d1845 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/study/StudentDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/study/StudentDO.java @@ -81,8 +81,8 @@ public class StudentDO extends BaseDO { //考试签到状态 0-未签到 1-已签到 @ApiModelProperty(value = "考试签到状态 0-未签到 1-已签到") private Integer examSignFlag; - //学员状态 0-未学习 1-已签到 2-考试通过 3-未签到 4-考试未通过 - @ApiModelProperty(value = "学员状态 0-未学习 1-已签到 2-考试通过 3-未签到 4-考试未通过") + //学员状态 0-未完成 1-已完成 + @ApiModelProperty(value = "学员状态 0-未完成 1-已完成") private Integer state; //相关方id集合 @ApiModelProperty(value = "相关方id集合") @@ -105,5 +105,67 @@ public class StudentDO extends BaseDO { @TableField(exist = false) private Integer completeClassCount; + + //班级名称 + @ApiModelProperty(value = "班级名称") + @TableField(exist = false) + private String className; + //培训日期 开始时间 + @ApiModelProperty(value = "培训日期 开始时间") + @TableField(exist = false) + private String startTime; + //培训日期 结束日期 + @ApiModelProperty(value = "培训日期 结束日期") + @TableField(exist = false) + private String endTime; + //培训教师id + @ApiModelProperty(value = "培训教师id") + @TableField(exist = false) + private Long teacherId; + //教师名称 + @ApiModelProperty(value = "教师名称") + @TableField(exist = false) + private String teacherName; + //培训行业类型 + @ApiModelProperty(value = "培训行业类型") + @TableField(exist = false) + private String trainType; + //培训行业类型名称 + @ApiModelProperty(value = "培训行业类型名称") + @TableField(exist = false) + private String trainTypeName; + //培训地点 + @ApiModelProperty(value = "培训地点") + @TableField(exist = false) + private String trainingLocation; + //机构ID + @ApiModelProperty(value = "机构ID") + @TableField(exist = false) + private Long corpinfoId; + //所属单位 + @ApiModelProperty(value = "所属单位") + @TableField(exist = false) + private String corpName; + //状态：1-未申请 2-待开班 3- 培训中 4-培训结束 + @ApiModelProperty(value = "状态：1-未申请 2-待开班 3- 培训中 4-培训结束 ") + @TableField(exist = false) + private Integer classState; + //培训有效期日期 开始时间 + @ApiModelProperty(value = "培训有效期日期 开始时间") + @TableField(exist = false) + private String validStartTime; + //培训有效期日期 结束时间 + @ApiModelProperty(value = "培训有效期日期 结束时间") + @TableField(exist = false) + private String validEndTime; + //1考试0不考试 + @ApiModelProperty(value = "1考试0不考试") + @TableField(exist = false) + private Integer examination; + //考试次数只有考试时候有用 + @ApiModelProperty(value = "考试次数只有考试时候有用") + @TableField(exist = false) + private Integer numberofexams; + } diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/study/ClassMapper.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/study/ClassMapper.java index 33c2b4b..2d20ee0 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/study/ClassMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/study/ClassMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zcloud.edu.persistence.dataobject.study.ClassDO; +import com.zcloud.edu.persistence.dataobject.study.StudentDO; import com.zcloud.edu.persistence.mapper.po.study.ClassQuestionPO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -25,9 +26,12 @@ public interface ClassMapper extends BaseMapper { List listStatistics(@Param("ew") QueryWrapper queryWrapper, String menuPerms); IPage listStuClassPage(IPage page, @Param("params") Map params, String menuPerms); + IPage listStudentClassPage(IPage page, @Param("params") Map params, String menuPerms); List countQuestionByClassId(String classId); ClassDO getInfoById(long id); + + ClassDO getInfoByClassId(String classId); } diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/study/StudentMapper.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/study/StudentMapper.java index 30585ad..2e1d598 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/study/StudentMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/study/StudentMapper.java @@ -27,6 +27,8 @@ public interface StudentMapper extends BaseMapper { List countStuClass(@Param("params") Map params); + List listAll(@Param("params") Map params); + } diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/study/ClassRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/study/ClassRepositoryImpl.java index c0b93dd..a337008 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/study/ClassRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/study/ClassRepositoryImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import com.zcloud.edu.persistence.dataobject.study.ClassDO; +import com.zcloud.edu.persistence.dataobject.study.StudentDO; import com.zcloud.edu.persistence.mapper.study.ClassMapper; import com.zcloud.edu.persistence.mapper.po.study.ClassQuestionPO; import com.zcloud.edu.persistence.repository.study.ClassRepository; @@ -56,11 +57,16 @@ public class ClassRepositoryImpl extends BaseRepositoryImpl listStudentClassPage(Map params) { + IPage iPage = new Query().getPage(params); + IPage result = classMapper.listStudentClassPage(iPage, params, null); + return PageHelper.pageToResponse(result, result.getRecords()); + } + @Override public ClassDO getByClassId(String classId) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("class_id", classId); - return classMapper.selectOne(queryWrapper); + return classMapper.getInfoByClassId(classId); } @Override diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/study/StudentRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/study/StudentRepositoryImpl.java index 5cebb40..84f4de1 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/study/StudentRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/study/StudentRepositoryImpl.java @@ -97,5 +97,10 @@ public class StudentRepositoryImpl extends BaseRepositoryImpl listAll(Map params) { + return studentMapper.listAll(params); + } + } diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/study/StudentSignRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/study/StudentSignRepositoryImpl.java index b69b618..5a1d324 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/study/StudentSignRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/impl/study/StudentSignRepositoryImpl.java @@ -69,5 +69,10 @@ public class StudentSignRepositoryImpl extends BaseRepositoryImpl { PageResponse listStuClassPage(Map params); + PageResponse listStudentClassPage(Map params); + ClassDO getByClassId(String classId); List countQuestionByClassId(String classId); diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/study/StudentRepository.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/study/StudentRepository.java index a02a8a1..4239eec 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/study/StudentRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/study/StudentRepository.java @@ -33,11 +33,9 @@ public interface StudentRepository extends BaseRepository { List countStuClass(Map params); - StudentDO findInfoByStudentId(String studentId); - - + List listAll(Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/study/StudentSignRepository.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/study/StudentSignRepository.java index 1117e20..5d182cc 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/study/StudentSignRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/repository/study/StudentSignRepository.java @@ -23,6 +23,7 @@ public interface StudentSignRepository extends BaseRepository { List listAllByStudentId(Map params); + Integer countByClassId(String classId); } diff --git a/web-infrastructure/src/main/resources/mapper/study/ClassMapper.xml b/web-infrastructure/src/main/resources/mapper/study/ClassMapper.xml index 8bdc92b..1e0f331 100644 --- a/web-infrastructure/src/main/resources/mapper/study/ClassMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/study/ClassMapper.xml @@ -38,10 +38,36 @@ c.numberofexams FROM class c - left join training_type t on t.training_type_id = c.train_type + left join training_type t on t.training_type_id = c.train_type WHERE c.id = #{id} + + diff --git a/web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml b/web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml index 83e5497..7343559 100644 --- a/web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml @@ -90,5 +90,18 @@ group by s.phone + + diff --git a/web-infrastructure/src/main/resources/mapper/study/StudentSignMapper.xml b/web-infrastructure/src/main/resources/mapper/study/StudentSignMapper.xml index cdc0065..d6bc1ad 100644 --- a/web-infrastructure/src/main/resources/mapper/study/StudentSignMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/study/StudentSignMapper.xml @@ -11,7 +11,7 @@ ss.* FROM student_sign ss - LEFT JOIN student s ON ss.student_id = ss.student_id + LEFT JOIN student s ON ss.student_id = s.student_id LEFT JOIN class cl ON cl.class_id = s.class_id @@ -20,6 +20,9 @@ AND ss.student_id = #{params.studentId} + + AND ss.type = #{params.type} + AND ss.delete_enum = 'FALSE' and ss.sign_url is not null and ss.sign_url != ''