he2802 2 years ago
parent
commit
a8f68e35c4

+ 1 - 2
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassNpUserInfoVo.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.grade.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.zhongzheng.common.type.EncryptHandler;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -57,12 +58,10 @@ public class ClassNpUserInfoVo implements Serializable {
 
     /// 身份证
     @ApiModelProperty("身份证")
-    @TableField(typeHandler = EncryptHandler.class)
     private String idNum;
 
     /// 手机号
     @ApiModelProperty("手机号")
-    @TableField(typeHandler = EncryptHandler.class)
     private String mobile;
 
     /// 是否完善必填信息,true是,false否

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

@@ -186,6 +186,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <collection property="gradeList" column="goods_id" select="findGradeList"/>
     </resultMap>
 
+    <resultMap type="com.zhongzheng.modules.grade.vo.ClassNpUserInfoVo" id="ClassNpUserInfoVoResult">
+        <result property="gradeId" column="grade_id"/>
+        <result property="tenantId" column="tenantId"/>
+        <result property="classNo" column="classNo"/>
+        <result property="platformName" column="platformName"/>
+        <result property="categoryName" column="categoryName"/>
+        <result property="name" column="name"/>
+        <result property="idNum" column="idNum" typeHandler="com.zhongzheng.common.type.EncryptHandler"/>
+        <result property="mobile" column="mobile" typeHandler="com.zhongzheng.common.type.EncryptHandler"/>
+        <result property="companyName" column="companyName"/>
+        <result property="orderTimeLong" column="orderTimeLong"/>
+        <result property="createTimeLong" column="createTimeLong"/>
+        <result property="doTimeLong" column="doTimeLong"/>
+        <result property="reportStatu" column="reportStatu"/>
+        <result property="studyQueueStatus" column="studyQueueStatus"/>
+        <result property="applyTimeLong" column="applyTimeLong"/>
+        <result property="userId" column="user_id"/>
+        <result property="subjectIds" column="subject_ids"/>
+    </resultMap>
+
     <select id="findGradeList" resultMap="ClassGradeVoResult">
         SELECT
             g.*,
@@ -903,7 +923,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ( SELECT COUNT( user_id ) AS num FROM class_grade_user WHERE grade_id = #{gradeId} AND `status` = 1 AND change_grade = 0 GROUP BY user_id ) a
     </select>
 
-    <select id="getGradeDetailByTenant" parameterType="com.zhongzheng.modules.grade.bo.ClassNpUserInfoBo" resultType="com.zhongzheng.modules.grade.vo.ClassNpUserInfoVo">
+    <select id="getGradeDetailByTenant" parameterType="com.zhongzheng.modules.grade.bo.ClassNpUserInfoBo" resultMap="ClassNpUserInfoVoResult" >
         SELECT
             CONCAT('',cg.tenant_id) as tenantId,
             cg.official_name as classNo,