change 3 år sedan
förälder
incheckning
6da1ac961a

+ 15 - 4
zhongzheng-admin/src/main/java/com/zhongzheng/controller/grade/ClassStudentController.java

@@ -11,10 +11,7 @@ import com.zhongzheng.modules.grade.service.IClassGradeInterfaceService;
 import com.zhongzheng.modules.grade.service.IClassGradeService;
 import com.zhongzheng.modules.grade.service.IClassGradeSysService;
 import com.zhongzheng.modules.grade.service.IClassGradeUserService;
-import com.zhongzheng.modules.grade.vo.ClassGradeInterfaceVo;
-import com.zhongzheng.modules.grade.vo.ClassGradeSysVo;
-import com.zhongzheng.modules.grade.vo.ClassGradeUserVo;
-import com.zhongzheng.modules.grade.vo.ClassGradeVo;
+import com.zhongzheng.modules.grade.vo.*;
 import com.zhongzheng.modules.user.bo.SubjectStudyRecordQueryBo;
 import com.zhongzheng.modules.user.bo.UserQueryBo;
 import com.zhongzheng.modules.user.service.IUserStudyRecordService;
@@ -87,4 +84,18 @@ public class ClassStudentController extends BaseController {
         List<SubjectStudyRecordVo> list = iUserStudyRecordService.listSection(bo);
         return getDataTable(list);
     }
+
+
+
+    /**
+     * 查询班级记录列表
+     */
+    @ApiOperation("查询班级记录列表")
+    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @GetMapping("/listUser")
+    public TableDataInfo<ClassGradeUserGoodsVo> listUser(ClassGradeUserQueryBo  bo) {
+        startPage();
+        List<ClassGradeUserGoodsVo> list = iClassGradeUserService.listUser(bo);
+        return getDataTable(list);
+    }
 }

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeUserMapper.java

@@ -3,9 +3,11 @@ package com.zhongzheng.modules.grade.mapper;
 import com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo;
 import com.zhongzheng.modules.grade.domain.ClassGradeUser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.grade.vo.ClassGradeUserGoodsVo;
 import com.zhongzheng.modules.grade.vo.ClassGradeUserVo;
 
 import java.util.Collection;
+import java.util.List;
 
 /**
  * 学员记录Mapper接口
@@ -16,4 +18,6 @@ import java.util.Collection;
 public interface ClassGradeUserMapper extends BaseMapper<ClassGradeUser> {
 
     Collection<ClassGradeUserVo> select(ClassGradeUserQueryBo bo);
+
+    List<ClassGradeUserGoodsVo> listUser(ClassGradeUserQueryBo bo);
 }

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/IClassGradeUserService.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.grade.service;
 
 import com.zhongzheng.modules.grade.domain.ClassGradeUser;
+import com.zhongzheng.modules.grade.vo.ClassGradeUserGoodsVo;
 import com.zhongzheng.modules.grade.vo.ClassGradeUserVo;
 import com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo;
 import com.zhongzheng.modules.grade.bo.ClassGradeUserAddBo;
@@ -49,4 +50,6 @@ public interface IClassGradeUserService extends IService<ClassGradeUser> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<ClassGradeUserGoodsVo> listUser(ClassGradeUserQueryBo bo);
 }

+ 6 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.grade.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.vo.ClassGradeUserGoodsVo;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -94,4 +95,9 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public List<ClassGradeUserGoodsVo> listUser(ClassGradeUserQueryBo bo) {
+        return baseMapper.listUser(bo);
+    }
 }

+ 83 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeUserGoodsVo.java

@@ -0,0 +1,83 @@
+package com.zhongzheng.modules.grade.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.zhongzheng.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 学员记录视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@ApiModel("学员记录视图对象")
+public class ClassGradeUserGoodsVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 学员ID */
+	@Excel(name = "学员ID")
+	@ApiModelProperty("学员ID")
+	private Long userId;
+	/** 班级id */
+	@Excel(name = "班级id")
+	@ApiModelProperty("班级id")
+	private Long gradeId;
+
+	@Excel(name = "商品编码")
+	@ApiModelProperty("商品编码")
+	private String goodsCode;
+	/** 1 进入 0移除 */
+	@Excel(name = "1 进入 0移除")
+	@ApiModelProperty("1 进入 0移除")
+	private Integer status;
+
+	/** 班级状态:1 有效 无效 */
+	@Excel(name = "班级状态:1 有效 无效")
+	@ApiModelProperty("班级状态:1 有效 无效")
+	private Integer gradeStatus;
+
+	/** 班级编码 */
+	@Excel(name = "班级编码")
+	@ApiModelProperty("班级编码")
+	private String gradeCode;
+
+	/** 班级名称 */
+	@Excel(name = "班级名称")
+	@ApiModelProperty("班级名称")
+	private String gradeName;
+
+	/** 年份 */
+	@Excel(name = "年份")
+	@ApiModelProperty("年份")
+	private Long year;
+
+
+	@ApiModelProperty("教育名称")
+	private String educationName;
+
+	@ApiModelProperty("项目名称")
+	private String projectName;
+
+	@ApiModelProperty("业务名称")
+	private String businessName;
+
+	@ApiModelProperty("院校名称")
+	private String schoolName;
+
+	/** 操作人 */
+	@Excel(name = "操作人")
+	@ApiModelProperty("操作人")
+	private String createBy;
+
+	/** 添加时间 */
+	@ApiModelProperty("添加时间")
+	private Long createTime;
+}

+ 61 - 11
zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhongzheng.modules.grade.mapper.ClassGradeUserMapper">
 
     <resultMap type="com.zhongzheng.modules.grade.domain.ClassGradeUser" id="ClassGradeUserResult">
@@ -25,18 +25,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="telPhone" column="telphone"/>
     </resultMap>
 
-    <select id="select" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo" resultMap="ClassGradeUserVoResult">
+
+    <resultMap type="com.zhongzheng.modules.grade.vo.ClassGradeUserGoodsVo" id="ClassGradeUserGoodsVoResult">
+        <result property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="gradeId" column="grade_id"/>
+        <result property="status" column="status"/>
+        <result property="goodsCode" column="goods_code"/>
+        <result property="gradeStatus" column="grade_status"/>
+        <result property="gradeCode" column="grade_code"/>
+        <result property="gradeName" column="grade_name"/>
+        <result property="year" column="year"/>
+        <result property="educationName" column="education_name"/>
+        <result property="projectName" column="project_name"/>
+        <result property="businessName" column="business_name"/>
+        <result property="schoolName" column="school_name"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+    </resultMap>
+
+    <select id="select" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo"
+            resultMap="ClassGradeUserVoResult">
         SELECT
-            g.*,
-            u.student_code,
-            u.realname,
-            u.id_card,
-            u.telphone
+        g.*,
+        u.student_code,
+        u.realname,
+        u.id_card,
+        u.telphone
         FROM
-            class_grade_user g
-                LEFT JOIN `user` u ON g.user_id = u.user_id
+        class_grade_user g
+        LEFT JOIN `user` u ON g.user_id = u.user_id
         WHERE
-            1 = 1
+        1 = 1
         <if test="status != null and status.size()!=0 ">
             AND g.status in
             <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
@@ -47,4 +67,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND g.grade_id = #{gradeId}
         </if>
     </select>
+
+    <select id="listUser" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo"
+            resultMap="ClassGradeUserGoodsVoResult">
+        SELECT
+        * ,
+        (select `code` FROM goods g LEFT JOIN class_grade_goods c on g.goods_id = c.goods_id where c.grade_id =
+        u.grade_id) as goods_code,
+        (select `year` FROM goods g LEFT JOIN class_grade_goods c on g.goods_id = c.goods_id where c.grade_id =
+        u.grade_id) as year,
+        (select goods_name FROM goods g LEFT JOIN class_grade_goods c on g.goods_id = c.goods_id where c.grade_id =
+        u.grade_id) as goods_name,
+        (select b.business_name FROM course_business b LEFT JOIN goods g on b.id = g.business_id LEFT JOIN
+        class_grade_goods c on g.goods_id = c.goods_id where c.grade_id = u.grade_id) as business_name,
+        (select b.project_name FROM course_project_type b LEFT JOIN goods g on b.id = g.project_id LEFT JOIN
+        class_grade_goods c on g.goods_id = c.goods_id where c.grade_id = u.grade_id) as project_name,
+        (select b.school_name FROM school b LEFT JOIN goods g on b.id = g.school_id LEFT JOIN class_grade_goods c on
+        g.goods_id = c.goods_id where c.grade_id = u.grade_id) as school_name,
+        (select b.education_name FROM course_education_type b LEFT JOIN goods g on b.id = g.education_type_id LEFT JOIN
+        class_grade_goods c on g.goods_id = c.goods_id where c.grade_id = u.grade_id) as education_name,
+        (SELECT g.grade_code FROM class_grade g where u.grade_id = g.class_id) as grade_code,
+        (SELECT g.class_name FROM class_grade g where u.grade_id = g.class_id) as grade_name,
+        (SELECT g.status FROM class_grade g where u.grade_id = g.class_id) as grade_status
+        FROM
+        class_grade_user u
+        where 1=1
+
+        <if test="userId != null and userId != ''">
+            and u.user_id= #{userId}
+        </if>
+    </select>
 </mapper>