diff --git a/web-adapter/src/main/java/com/zcloud/edu/app/study/AppStudentSignController.java b/web-adapter/src/main/java/com/zcloud/edu/app/study/AppStudentSignController.java index 8a0a584..23b39c1 100644 --- a/web-adapter/src/main/java/com/zcloud/edu/app/study/AppStudentSignController.java +++ b/web-adapter/src/main/java/com/zcloud/edu/app/study/AppStudentSignController.java @@ -53,6 +53,11 @@ public class AppStudentSignController { public MultiResponse listAll(@RequestBody ClassAppSignQry qry) { return studentSignService.listAll(qry); } + @ApiOperation("所有数据") + @PostMapping("/listAllNoGroup") + public MultiResponse listAllNoGroup(@RequestBody ClassAppSignQry qry) { + return studentSignService.listAllNoGroup(qry); + } @ApiOperation("详情") @GetMapping("/{id}") diff --git a/web-app/src/main/java/com/zcloud/edu/command/query/study/StudentSignQueryExe.java b/web-app/src/main/java/com/zcloud/edu/command/query/study/StudentSignQueryExe.java index 106858b..8ef1b96 100644 --- a/web-app/src/main/java/com/zcloud/edu/command/query/study/StudentSignQueryExe.java +++ b/web-app/src/main/java/com/zcloud/edu/command/query/study/StudentSignQueryExe.java @@ -67,6 +67,13 @@ public class StudentSignQueryExe { return MultiResponse.of(studentSignCOS); } + public MultiResponse executeListAllNogGroup(ClassAppSignQry qry) { + Map params = PageQueryHelper.toHashMap(qry); + List list = studentSignRepository.listAllByStudentNoGroup(params); + List studentSignCOS = studentSignCoConvertor.converDOsToCOs(list); + return MultiResponse.of(studentSignCOS); + } + public SingleResponse executeVerify(StudentSignVerifyQry qry) { ClassDO classDO = classRepository.getByClassId(qry.getClassId()); diff --git a/web-app/src/main/java/com/zcloud/edu/command/study/StudentExamRecordAddExe.java b/web-app/src/main/java/com/zcloud/edu/command/study/StudentExamRecordAddExe.java index 8ed7a67..04e6589 100644 --- a/web-app/src/main/java/com/zcloud/edu/command/study/StudentExamRecordAddExe.java +++ b/web-app/src/main/java/com/zcloud/edu/command/study/StudentExamRecordAddExe.java @@ -45,7 +45,6 @@ public class StudentExamRecordAddExe { private final TrainingUserRepository trainingUserRepository; @Transactional(rollbackFor = Exception.class) public SingleResponse execute(StudentExamRecordAddCmd cmd) { - System.out.println("StudentExamRecordAddCmd"+ cmd.toString()); ClassDO classDO = classRepository.getByClassId(cmd.getClassId()); Integer count = studentExamRecordRepository.countByStudentId(cmd.getStudentId()); if (count >= classDO.getNumberofexams()) { diff --git a/web-app/src/main/java/com/zcloud/edu/service/study/StudentSignServiceImpl.java b/web-app/src/main/java/com/zcloud/edu/service/study/StudentSignServiceImpl.java index 007e05a..14fb0eb 100644 --- a/web-app/src/main/java/com/zcloud/edu/service/study/StudentSignServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/edu/service/study/StudentSignServiceImpl.java @@ -60,6 +60,10 @@ public class StudentSignServiceImpl implements StudentSignServiceI { public MultiResponse listAll(ClassAppSignQry qry) { return studentSignQueryExe.executeListAll(qry); } + @Override + public MultiResponse listAllNoGroup(ClassAppSignQry qry) { + return studentSignQueryExe.executeListAllNogGroup(qry); + } @Override public SingleResponse verify(StudentSignVerifyQry qry) { diff --git a/web-client/src/main/java/com/zcloud/edu/api/study/StudentSignServiceI.java b/web-client/src/main/java/com/zcloud/edu/api/study/StudentSignServiceI.java index e3ac1a0..bdc8b91 100644 --- a/web-client/src/main/java/com/zcloud/edu/api/study/StudentSignServiceI.java +++ b/web-client/src/main/java/com/zcloud/edu/api/study/StudentSignServiceI.java @@ -26,6 +26,7 @@ public interface StudentSignServiceI { void removeBatch(Long[] ids); MultiResponse listAll(ClassAppSignQry qry); + MultiResponse listAllNoGroup(ClassAppSignQry qry); SingleResponse verify(StudentSignVerifyQry qry); } diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/study/StudentSignMapper.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/study/StudentSignMapper.java index 57a73fe..8818ed6 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/study/StudentSignMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/mapper/study/StudentSignMapper.java @@ -18,5 +18,6 @@ import java.util.Map; public interface StudentSignMapper extends BaseMapper { List listAll(@Param("params") Map params); List listAllByStudent(@Param("params") Map params); + List listAllByStudentNoGroup(@Param("params") Map 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 23e2e30..f615d73 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 @@ -58,6 +58,10 @@ public class StudentSignRepositoryImpl extends BaseRepositoryImpl listAllByStudent(Map params) { return studentSignMapper.listAllByStudent(params); } + @Override + public List listAllByStudentNoGroup(Map params) { + return studentSignMapper.listAllByStudentNoGroup(params); + } @Override public List listAllByStudentId(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 9c01238..1465762 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,8 @@ public interface StudentSignRepository extends BaseRepository { List listAllByStudent(Map params); + List listAllByStudentNoGroup(Map params); + List listAllByStudentId(Map params); Integer countByClassId(String classId); diff --git a/web-infrastructure/src/main/resources/mapper/study/StudentSignMapper.xml b/web-infrastructure/src/main/resources/mapper/study/StudentSignMapper.xml index 4b6f972..cb0444f 100644 --- a/web-infrastructure/src/main/resources/mapper/study/StudentSignMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/study/StudentSignMapper.xml @@ -71,6 +71,42 @@ + +