搜索条件新增

zhongzheng-api/src/main/java/com/zhongzheng/controller/inform/InformUserController.java

@@ -67,7 +67,9 @@ public class InformUserController extends BaseController {
     @ApiOperation("获取通知学员详细信息")
     @GetMapping("/{id}")
     public AjaxResult<InformUserVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iInformUserService.queryById(id));
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+
+        return AjaxResult.success(iInformUserService.queryByIdUser(id,loginUser.getUser().getUserId()));
     }
 
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/IInformUserService.java

@@ -54,4 +54,6 @@ public interface IInformUserService extends IService<InformUser> {
     List<InformUserVo> queryUserList(InformUserQueryBo bo);
 
     List<ExamUserApplyVo> listUserApply();
+
+	InformUserVo queryByIdUser(Long id, Long userId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/impl/InformUserServiceImpl.java

@@ -179,4 +179,21 @@ public class InformUserServiceImpl extends ServiceImpl<InformUserMapper, InformU
     public List<ExamUserApplyVo> listUserApply() {
         return baseMapper.listUserApply();
     }
+
+    @Override
+    public InformUserVo queryByIdUser(Long id, Long userId) {
+        InformUser db = this.baseMapper.selectById(id);
+        InformUserVo informUserVo = BeanUtil.toBean(db, InformUserVo.class);
+        if (informUserVo.getSystemStatus() == 2) {
+            InformVo informVo = informService.queryById(informUserVo.getInformId());
+            informVo.setInformExamVo(iInformExamService.queryExam(informVo.getInformId()));
+            informVo.setInformCourseVo(iInformCourseService.queryCourse(informVo.getInformId()));
+            informUserVo.setInformVo(informVo);
+        }
+        if(informUserVo.getGoodsId() != null && informUserVo.getGradeId() == null){
+            Long gradeId = baseMapper.selectGradeId(informUserVo.getGoodsId(),userId);
+            informUserVo.setGradeId(gradeId);
+        }
+        return informUserVo;
+    }
 }