对练列表-是否已考

src/main/java/cn/breeze/elleai/application/service/AppExamineService.java

@@ -651,7 +651,7 @@ public class AppExamineService {
      * @param request
      * @return
      */
-    public PageResult<ExamineMobileDto> examineMobilePaginQuery(ExamineRequestDto request) {
+    public PageResult<ExamineMobileDto> examineMobilePaginQuery(UserPrincipal userPrincipal, ExamineRequestDto request) {
 
         ExamineRequestModel requestModel = BeanUtil.copyProperties(request, ExamineRequestModel.class);
         requestModel.setStatus(1);
@@ -663,6 +663,10 @@ public class AppExamineService {
         PageResult<ExamineMobileDto> pageResult = PageResult.of(request.getPageNo(), request.getPageSize(), (int) page.getTotalRow(), null);
 
         if(CollectionUtil.isNotEmpty(page.getRecords())) {
+            ExamineRecordRequestModel rm = new ExamineRecordRequestModel();
+            rm.setUserId(userPrincipal.getUserId());
+            List<ExamineRecordResponseModel> userRecordList = examineService.examineRecordList(rm);
+
             List<ExamineMobileDto> dtoList = page.getRecords().stream().map(v -> {
                 ExamineMobileDto dto = BeanUtil.copyProperties(v, ExamineMobileDto.class);
 
@@ -676,6 +680,12 @@ public class AppExamineService {
                 }
                 dto.setExamTotalCount(examCount);
 
+                // 是否已考
+                long count = userRecordList.stream().filter(u -> Objects.equals(u.getExamineId(), v.getId())).count();
+                if(count > 0) {
+                    dto.setExamFlag(true);
+                }
+
                 return dto;
             }).collect(Collectors.toList());
 
@@ -709,11 +719,12 @@ public class AppExamineService {
      * @param request
      * @return
      */
-    public PageResult<ExamineRecordMobileDto> examineRecordMobilePaginQuery(ExamineRecordMobileRequestDto request) {
+    public PageResult<ExamineRecordMobileDto> examineRecordMobilePaginQuery(UserPrincipal userPrincipal, ExamineRecordMobileRequestDto request) {
 
         ExamineRecordRequestModel requestModel = BeanUtil.copyProperties(request, ExamineRecordRequestModel.class);
         requestModel.setSortColumn("create_time");
         requestModel.setSortAsc(false);
+        requestModel.setUserId(userPrincipal.getUserId());
 
         Page<ExamineRecordResponseModel> page = examineService.examineRecordPaginQuery(requestModel);
 
@@ -744,8 +755,15 @@ public class AppExamineService {
      * @return
      */
     public PageResult<ExamineRecordDto> examineRecordPaginQuery(ExamineRecordRequestDto request) {
+
         ExamineRecordRequestModel requestModel = BeanUtil.copyProperties(request, ExamineRecordRequestModel.class);
+
+        ExamineRequestModel rm = new ExamineRequestModel();
+        rm.setName(request.getUserName());
+        examineService.examineList(rm);
+
         Page<ExamineRecordResponseModel> page = examineService.examineRecordPaginQuery(requestModel);
+
         PageResult<ExamineRecordDto> pageResult = PageResult.of(request.getPageNo(), request.getPageSize(), (int) page.getTotalRow(), null);
 
         if(CollectionUtil.isNotEmpty(page.getRecords())) {

src/main/java/cn/breeze/elleai/controller/front/ExamineMobileController.java

@@ -44,7 +44,7 @@ public class ExamineMobileController {
     public ApiResponse<PageResult<ExamineMobileDto>> list(
             @Parameter(hidden = true) UserPrincipal userPrincipal,
             @QueryParam ExamineRequestDto request) {
-        PageResult<ExamineMobileDto> pageResult = examineService.examineMobilePaginQuery(request);
+        PageResult<ExamineMobileDto> pageResult = examineService.examineMobilePaginQuery(userPrincipal, request);
         return ApiResponse.ok(pageResult);
     }
 
@@ -60,8 +60,7 @@ public class ExamineMobileController {
     public ApiResponse<PageResult<ExamineRecordMobileDto>> recordList(
             @Parameter(hidden = true) UserPrincipal userPrincipal,
             @QueryParam ExamineRecordMobileRequestDto request) {
-
-        PageResult<ExamineRecordMobileDto> pageResult = examineService.examineRecordMobilePaginQuery(request);
+        PageResult<ExamineRecordMobileDto> pageResult = examineService.examineRecordMobilePaginQuery(userPrincipal, request);
         return ApiResponse.ok(pageResult);
     }
 

src/main/java/cn/breeze/elleai/domain/sparring/service/ExamineServiceImpl.java

@@ -458,17 +458,17 @@ public class ExamineServiceImpl implements ExamineService {
         Integer pageNo = ObjectUtil.defaultIfNull(request.getPageNo(), 1);
         Integer pageSize = ObjectUtil.defaultIfNull(request.getPageSize(), 10);
 
-        QueryWrapper queryWrapper = QueryWrapper.create();
+        QueryWrapper queryWrapper = QueryWrapper.create()
+                .where(USER_EXAMINE_RECORD_ENTITY.DELETED.eq(0));
         if(StrUtil.isNotEmpty(request.getUserId())) {
-            queryWrapper.where(USER_EXAMINE_RECORD_ENTITY.USER_ID.eq(request.getUserId()));
+            queryWrapper.and(USER_EXAMINE_RECORD_ENTITY.USER_ID.eq(request.getUserId()));
         }
         if(Objects.nonNull(request.getExamineMode())) {
-            queryWrapper.where(USER_EXAMINE_RECORD_ENTITY.EXAMINE_MODE.eq(request.getExamineMode()));
+            queryWrapper.and(USER_EXAMINE_RECORD_ENTITY.EXAMINE_MODE.eq(request.getExamineMode()));
         }
         if(Objects.nonNull(request.getExamineId())) {
-            queryWrapper.where(USER_EXAMINE_RECORD_ENTITY.EXAMINE_ID.eq(request.getExamineId()));
+            queryWrapper.and(USER_EXAMINE_RECORD_ENTITY.EXAMINE_ID.eq(request.getExamineId()));
         }
-        queryWrapper.where(USER_EXAMINE_RECORD_ENTITY.DELETED.eq(0));
         queryWrapper.orderBy(USER_EXAMINE_RECORD_ENTITY.CREATE_TIME, false);
 
         Page<ExamineRecordResponseModel> page = userExamineRecordMapper.paginateAs(pageNo, pageSize, queryWrapper, ExamineRecordResponseModel.class);
@@ -479,17 +479,16 @@ public class ExamineServiceImpl implements ExamineService {
     @Override
     public List<ExamineRecordResponseModel> examineRecordList(ExamineRecordRequestModel request) {
 
-        QueryWrapper queryWrapper = QueryWrapper.create();
+        QueryWrapper queryWrapper = QueryWrapper.create().where(USER_EXAMINE_RECORD_ENTITY.DELETED.eq(0));
         if(StrUtil.isNotEmpty(request.getUserId())) {
-            queryWrapper.where(USER_EXAMINE_RECORD_ENTITY.USER_ID.eq(request.getUserId()));
+            queryWrapper.and(USER_EXAMINE_RECORD_ENTITY.USER_ID.eq(request.getUserId()));
         }
         if(Objects.nonNull(request.getExamineMode())) {
-            queryWrapper.where(USER_EXAMINE_RECORD_ENTITY.EXAMINE_MODE.eq(request.getExamineMode()));
+            queryWrapper.and(USER_EXAMINE_RECORD_ENTITY.EXAMINE_MODE.eq(request.getExamineMode()));
         }
         if(Objects.nonNull(request.getExamineId())) {
-            queryWrapper.where(USER_EXAMINE_RECORD_ENTITY.EXAMINE_ID.eq(request.getExamineId()));
+            queryWrapper.and(USER_EXAMINE_RECORD_ENTITY.EXAMINE_ID.eq(request.getExamineId()));
         }
-        queryWrapper.where(USER_EXAMINE_RECORD_ENTITY.DELETED.eq(0));
         return userExamineRecordMapper.selectListByQueryAs(queryWrapper, ExamineRecordResponseModel.class);
     }