fix 学习账号标记显示

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserMockSubscribeController.java

@@ -41,7 +41,7 @@ import io.swagger.annotations.ApiOperation;
 @Api(value = "用户预约模考控制器", tags = {"用户预约模考管理"})
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
-@RequestMapping("/user/subscribe")
+@RequestMapping("/mock/subscribe")
 public class UserMockSubscribeController extends BaseController {
 
     private final IUserMockSubscribeService iUserMockSubscribeService;
@@ -133,4 +133,14 @@ public class UserMockSubscribeController extends BaseController {
         List<UserMockSubscribeVo> list = iUserMockSubscribeService.listSubscribe(bo);
         return getDataTable(list);
     }
+
+    /**
+     * 获取预约模考详细信息
+     */
+    @ApiOperation("获取预约模考详细信息")
+    @PreAuthorize("@ss.hasPermi('system:subscribe:query')")
+    @GetMapping("/{subscribeId}")
+    public AjaxResult<UserMockSubscribeVo> getSubscribeInfo(@PathVariable("subscribeId" ) Long subscribeId) {
+        return AjaxResult.success(iUserMockSubscribeService.queryById(subscribeId));
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/service/impl/MockApplyServiceImpl.java

@@ -55,7 +55,7 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
     private IExamService iExamService;
 
     @Autowired
-    private ICourseSectionService iCourseectionService;
+    private ICourseSectionService iCourseSectionService;
 
     @Autowired
     private IGoodsService iGoodsService;
@@ -385,13 +385,17 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
                     List<MockMajorSubject> mockMajorSubjectList = iMockMajorSubjectService.list(lqw3);
                     List<MockMajorSubjectVo> mockMajorSubjectVoList = new ArrayList<>();
                     if (BeanUtil.isNotEmpty(mockMajorSubjectList)) {
+                        MockMajorSubjectVo mockMajorSubjectVo = new MockMajorSubjectVo();
                         mockMajorSubjectList.stream().forEach(mockMajorSubject -> {
                             LambdaQueryWrapper<Exam> lqw4 = Wrappers.lambdaQuery();
                             lqw4.eq(Validator.isNotEmpty(mockMajorSubject.getExamId()), Exam::getExamId, mockMajorSubject.getExamId());
                             Exam exam = iExamService.getOne(lqw4);
-                            LambdaQueryWrapper<CourseSection> lqw5 = Wrappers.lambdaQuery();
-                            lqw5.eq(Validator.isNotEmpty(mockMajorSubject.getSectionId()), CourseSection::getSectionId, mockMajorSubject.getSectionId());
-                            CourseSection courseSection = iCourseectionService.getOne(lqw5);
+                            if (Validator.isNotEmpty(mockMajorSubject.getSectionId())) {
+                                LambdaQueryWrapper<CourseSection> lqw5 = Wrappers.lambdaQuery();
+                                lqw5.eq(Validator.isNotEmpty(mockMajorSubject.getSectionId()), CourseSection::getSectionId, mockMajorSubject.getSectionId());
+                                CourseSection courseSection = iCourseSectionService.getOne(lqw5);
+                                mockMajorSubjectVo.setSectionName(courseSection.getName());
+                            }
 
                             LambdaQueryWrapper<MockMajorSubjectTime> lqw6 = Wrappers.lambdaQuery();
                             lqw6.eq(Validator.isNotEmpty(mockMajorSubject.getMockMajorSubjectId()), MockMajorSubjectTime::getMockMajorSubjectId, mockMajorSubject.getMockMajorSubjectId());
@@ -423,12 +427,11 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
                                 });
                             }
 
-                            MockMajorSubjectVo mockMajorSubjectVo = new MockMajorSubjectVo();
+
                             BeanUtils.copyProperties(mockMajorSubject, mockMajorSubjectVo);
                             mockMajorSubjectVo.setMockMajorSubjectTimeList(mockMajorSubjectTimeVoList);
                             mockMajorSubjectVo.setMockMajorSubjectGoodsList(mockMajorSubjectGoodsVoList);
                             mockMajorSubjectVo.setExamName(exam.getExamName());
-                            mockMajorSubjectVo.setSectionName(courseSection.getName());
                             mockMajorSubjectVoList.add(mockMajorSubjectVo);
                         });
                     }

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -653,6 +653,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			LEFT JOIN class_grade_goods cgu ON cg.grade_id = cgu.grade_id
 			LEFT JOIN goods g ON cgu.goods_id = g.goods_id
 			WHERE g.`status` = 1
+			  AND cg.`status` = 1
         <if test="businessId != null and businessId !=''">
             AND g.business_id = #{businessId}
         </if>