學員信息

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

@@ -14,9 +14,11 @@ import com.zhongzheng.modules.grade.service.IClassGradeUserService;
 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.IUserService;
 import com.zhongzheng.modules.user.service.IUserStudyRecordService;
 import com.zhongzheng.modules.user.vo.GoodsStudyRecordVo;
 import com.zhongzheng.modules.user.vo.SubjectStudyRecordVo;
+import com.zhongzheng.modules.user.vo.UserVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -24,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -48,6 +51,30 @@ public class ClassStudentController extends BaseController {
 
     private final IUserStudyRecordService iUserStudyRecordService;
 
+    private final IUserService iUserService;
+
+
+    /**
+     * 查询學員用户列表
+     */
+    @ApiOperation("查询學員用户列表")
+    @PreAuthorize("@ss.hasPermi('app:user:list')")
+    @GetMapping("/listStudent")
+    public TableDataInfo<UserVo> listStudent(UserQueryBo bo) {
+        startPage();
+        List<UserVo> list = iUserService.selectList(bo);
+        for (UserVo userVo : list) {
+            ClassGradeUserQueryBo classGradeUserQueryBo = new ClassGradeUserQueryBo();
+            classGradeUserQueryBo.setUserId(userVo.getUserId());
+            List<Integer> status = new ArrayList<>();
+            status.add(1);
+            classGradeUserQueryBo.setStatus(status);
+            List<ClassGradeUserGoodsVo> classGradeUserGoodsVos = iClassGradeUserService.listUser(classGradeUserQueryBo);
+            userVo.setClassGradeUserGoodsVoList(classGradeUserGoodsVos);
+        }
+        return getDataTable(list);
+    }
+
     /**
      * 查询学员商品学习记录
      */

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeUserQueryBo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -44,5 +45,5 @@ public class ClassGradeUserQueryBo extends BaseEntity {
 	private Long gradeId;
 	/** 1 进入 0移除 */
 	@ApiModelProperty("1 进入 0移除")
-	private Integer status;
+	private List<Integer> status;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserAddBo.java

@@ -95,10 +95,50 @@ public class UserAddBo {
     private Long lastLoginTime;
     @ApiModelProperty("头像")
     private String avatar;
+
     /** 學員編碼 */
+    @Excel(name = "學員編碼")
     @ApiModelProperty("學員編碼")
     private String studentCode;
 
+    /** 工作年限 */
+    @Excel(name = "工作年限")
+    @ApiModelProperty("工作年限")
+    private Long workYear;
+    /** 公司名称 */
+    @Excel(name = "公司名称")
+    @ApiModelProperty("公司名称")
+    private String companyName;
+    /** 名族 */
+    @Excel(name = "名族")
+    @ApiModelProperty("名族")
+    private String nation;
+    /** 户口性质 */
+    @Excel(name = "户口性质 1農村 2城鎮")
+    @ApiModelProperty("户口性质 1農村 2城鎮")
+    private Integer census;
+    /** 籍贯 */
+    @Excel(name = "籍贯")
+    @ApiModelProperty("籍贯")
+    private String nativePlace;
+    /** 联系地址 */
+    @Excel(name = "联系地址")
+    @ApiModelProperty("联系地址")
+    private String contactAddress;
+    /** 收件地址 */
+    @Excel(name = "收件地址")
+    @ApiModelProperty("收件地址")
+    private String consigneeAddress;
+    /** 备注 */
+    @Excel(name = "备注")
+    @ApiModelProperty("备注")
+    private String remark;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    @ApiModelProperty("备注")
+    private String houseAddress;
+
     /** 1在职 0离职 */
     @Excel(name = "1在职 0离职")
     @ApiModelProperty("1在职 0离职")

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserEditBo.java

@@ -136,10 +136,45 @@ public class UserEditBo {
     @ApiModelProperty("头像")
     private String avatar;
 
+
     /** 學員編碼 */
+    @Excel(name = "學員編碼")
     @ApiModelProperty("學員編碼")
     private String studentCode;
 
+    /** 工作年限 */
+    @Excel(name = "工作年限")
+    @ApiModelProperty("工作年限")
+    private Long workYear;
+    /** 公司名称 */
+    @Excel(name = "公司名称")
+    @ApiModelProperty("公司名称")
+    private String companyName;
+    /** 名族 */
+    @Excel(name = "名族")
+    @ApiModelProperty("名族")
+    private String nation;
+    /** 户口性质 */
+    @Excel(name = "户口性质 1農村 2城鎮")
+    @ApiModelProperty("户口性质 1農村 2城鎮")
+    private Integer census;
+    /** 籍贯 */
+    @Excel(name = "籍贯")
+    @ApiModelProperty("籍贯")
+    private String nativePlace;
+    /** 联系地址 */
+    @Excel(name = "联系地址")
+    @ApiModelProperty("联系地址")
+    private String contactAddress;
+    /** 收件地址 */
+    @Excel(name = "收件地址")
+    @ApiModelProperty("收件地址")
+    private String consigneeAddress;
+    /** 备注 */
+    @Excel(name = "备注")
+    @ApiModelProperty("备注")
+    private String remark;
+
     /** 1在职 0离职 */
     @Excel(name = "1在职 0离职")
     @ApiModelProperty("1在职 0离职")

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserQueryBo.java

@@ -102,12 +102,35 @@ public class UserQueryBo extends BaseEntity {
 	@ApiModelProperty("状态 1正常 0关闭")
 	private List<Integer> status;
 
+
 	/** 學員編碼 */
 	@ApiModelProperty("學員編碼")
 	private String studentCode;
 
+	/** 工作年限 */
+	@ApiModelProperty("工作年限")
+	private Long workYear;
+	/** 公司名称 */
+	@ApiModelProperty("公司名称")
+	private String companyName;
+	/** 名族 */
+	@ApiModelProperty("名族")
+	private String nation;
+	/** 户口性质 */
+	@ApiModelProperty("户口性质 1農村 2城鎮")
+	private Integer census;
+	/** 籍贯 */
+	@ApiModelProperty("籍贯")
+	private String nativePlace;
+	/** 联系地址 */
+	@ApiModelProperty("联系地址")
+	private String contactAddress;
+	/** 收件地址 */
+	@ApiModelProperty("收件地址")
+	private String consigneeAddress;
+
+
 	/** 1在职 0离职 */
-	@Excel(name = "1在职 0离职")
 	@ApiModelProperty("1在职 0离职")
 	private Long jobStatus;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/User.java

@@ -173,6 +173,9 @@ private static final long serialVersionUID=1L;
     /** 备注 */
     private String remark;
 
+    /** 备注 */
+    private String houseAddress;
+
     /** 1在职 0离职 */
     private Long jobStatus;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserVo.java

@@ -3,13 +3,14 @@ package com.zhongzheng.modules.user.vo;
 import com.zhongzheng.common.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zhongzheng.common.utils.TelPhoneUtils;
+import com.zhongzheng.modules.grade.vo.ClassGradeUserGoodsVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -195,9 +196,9 @@ public class UserVo {
 	@ApiModelProperty("名族")
 	private String nation;
 	/** 户口性质 */
-	@Excel(name = "户口性质")
-	@ApiModelProperty("户口性质")
-	private String census;
+	@Excel(name = "户口性质 1農村 2城鎮")
+	@ApiModelProperty("户口性质 1農村 2城鎮")
+	private Integer census;
 	/** 籍贯 */
 	@Excel(name = "籍贯")
 	@ApiModelProperty("籍贯")
@@ -220,6 +221,11 @@ public class UserVo {
 	@ApiModelProperty("1在职 0离职")
 	private Long jobStatus;
 
+	/** 1在职 0离职 */
+	@Excel(name = "班級")
+	@ApiModelProperty("班級")
+	private List<ClassGradeUserGoodsVo> classGradeUserGoodsVoList;
+
 	public void setNull(){
 		this.setOpenId(null);
 		this.setIdCardImg1(null);

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

@@ -92,7 +92,12 @@
         FROM
         class_grade_user u
         where 1=1
-
+        <if test="status != null and status.size()!=0 ">
+            AND u.status in
+            <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="userId != null and userId != ''">
             and u.user_id= #{userId}
         </if>