通知列表

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformExamAddBo.java

@@ -47,4 +47,24 @@ public class InformExamAddBo {
     @Excel(name = "商品ID")
     @ApiModelProperty("商品ID")
     private Long goodsId;
+    @Excel(name = "商品名")
+    @ApiModelProperty("商品名")
+    private String goodsName;
+
+    @Excel(name = "商品名")
+    @ApiModelProperty("商品名")
+    private String subjectName;
+
+    @Excel(name = "章")
+    @ApiModelProperty("章")
+    private String chapterName;
+
+    @Excel(name = "模块")
+    @ApiModelProperty("模块")
+    private String moduleName;
+
+    @Excel(name = "试卷")
+    @ApiModelProperty("试卷")
+    private String examName;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformExamEditBo.java

@@ -51,4 +51,24 @@ public class InformExamEditBo {
     @ApiModelProperty("商品ID")
     private Long goodsId;
 
+    @Excel(name = "商品名")
+    @ApiModelProperty("商品名")
+    private String goodsName;
+
+    @Excel(name = "商品名")
+    @ApiModelProperty("商品名")
+    private String subjectName;
+
+    @Excel(name = "章")
+    @ApiModelProperty("章")
+    private String chapterName;
+
+    @Excel(name = "模块")
+    @ApiModelProperty("模块")
+    private String moduleName;
+
+    @Excel(name = "试卷")
+    @ApiModelProperty("试卷")
+    private String examName;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformExamQueryBo.java

@@ -55,4 +55,24 @@ public class InformExamQueryBo extends BaseEntity {
 	@Excel(name = "商品ID")
 	@ApiModelProperty("商品ID")
 	private Long goodsId;
+
+	@Excel(name = "商品名")
+	@ApiModelProperty("商品名")
+	private String goodsName;
+
+	@Excel(name = "商品名")
+	@ApiModelProperty("商品名")
+	private String subjectName;
+
+	@Excel(name = "章")
+	@ApiModelProperty("章")
+	private String chapterName;
+
+	@Excel(name = "模块")
+	@ApiModelProperty("模块")
+	private String moduleName;
+
+	@Excel(name = "试卷")
+	@ApiModelProperty("试卷")
+	private String examName;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/domain/InformCourse.java

@@ -44,4 +44,12 @@ private static final long serialVersionUID=1L;
     private Long chapterId;
     /** 题目位置 */
     private Long topicNum;
+    /** $column.columnComment */
+    private String sectionName;
+    /** $column.columnComment */
+    private String modulName;
+    /** $column.columnComment */
+    private String chapterName;
+    /** $column.columnComment */
+    private String courseName;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/domain/InformExam.java

@@ -47,4 +47,11 @@ private static final long serialVersionUID=1L;
     private Long topicNum;
 
     private Long goodsId;
+
+    /** $column.columnComment */
+    private String modulName;
+    /** $column.columnComment */
+    private String chapterName;
+    /** $column.columnComment */
+    private String examName;
 }

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

@@ -3,6 +3,10 @@ package com.zhongzheng.modules.inform.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo;
+import com.zhongzheng.modules.grade.mapper.ClassGradeUserMapper;
+import com.zhongzheng.modules.grade.vo.ClassGradeUserGoodsVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -16,6 +20,8 @@ import com.zhongzheng.modules.inform.mapper.InformUserMapper;
 import com.zhongzheng.modules.inform.vo.InformUserVo;
 import com.zhongzheng.modules.inform.service.IInformUserService;
 
+import javax.swing.plaf.nimbus.State;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -30,6 +36,9 @@ import java.util.stream.Collectors;
 @Service
 public class InformUserServiceImpl extends ServiceImpl<InformUserMapper, InformUser> implements IInformUserService {
 
+    @Autowired
+    private ClassGradeUserMapper classGradeUserMapper;
+
     @Override
     public InformUserVo queryById(Long id){
         InformUser db = this.baseMapper.selectById(id);
@@ -102,6 +111,20 @@ public class InformUserServiceImpl extends ServiceImpl<InformUserMapper, InformU
 
     @Override
     public List<InformUserVo> queryUserList(InformUserQueryBo bo) {
-        return baseMapper.queryUserList(bo);
+        List<InformUserVo> informUserVos = baseMapper.queryUserList(bo);
+        for (InformUserVo informUserVo : informUserVos) {
+            ClassGradeUserQueryBo classGradeUserQueryBo = new ClassGradeUserQueryBo();
+            classGradeUserQueryBo.setUserId(informUserVo.getUserId());
+            List<Integer> status = new ArrayList<>();
+            status.add(1);
+            classGradeUserQueryBo.setStatus(status);
+            List<ClassGradeUserGoodsVo> classGradeUserGoodsVos = classGradeUserMapper.listUser(classGradeUserQueryBo);
+            for (ClassGradeUserGoodsVo classGradeUserGoodsVo : classGradeUserGoodsVos) {
+                List<String> className = new ArrayList<>();
+                className.add(classGradeUserGoodsVo.getGradeName());
+                informUserVo.setClassName(className);
+            }
+        }
+        return informUserVos;
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/vo/InformUserVo.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -60,5 +60,5 @@ public class InformUserVo {
 
 	@Excel(name = "班级名称")
 	@ApiModelProperty("班级名称")
-	private String className;
+	private List<String> className;
 }

zhongzheng-system/src/main/resources/mapper/modules/inform/InformUserMapper.xml

@@ -22,7 +22,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="receiptStatus" column="receipt_status"/>
         <result property="realName" column="realname"/>
         <result property="telPhone" column="telphone"/>
-        <result property="className" column="class_name"/>
     </resultMap>
 
     <select id="queryUserList" parameterType="com.zhongzheng.modules.inform.bo.InformUserQueryBo" resultMap="InformUserVo">
@@ -32,7 +31,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             (SELECT u.realname FROM `user` u where iu.user_id=u.user_id) as realname,
             (SELECT u.telphone FROM `user` u where iu.user_id=u.user_id) as telphone,
             (SELECT u.id_card FROM `user` u where iu.user_id=u.user_id) as id_card,
-            (SELECT cg.class_name FROM class_grade_user cgu LEFT JOIN class_grade cg on cgu.grade_id=cg.grade_id where cgu.user_id=iu.user_id) as class_name,
             iu.send_time,
             iu.send_status
         FROM