he2802 hai 1 ano
pai
achega
335d52e013

+ 6 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserCertificateVo.java

@@ -132,4 +132,10 @@ public class UserCertificateVo {
 
 	@ApiModelProperty("专业类型")
 	private String majorType;
+
+	@ApiModelProperty("商品名称")
+	private String goodsName;
+
+	@ApiModelProperty("专业名称")
+	private String categoryName;
 }

+ 10 - 2
zhongzheng-system/src/main/resources/mapper/modules/user/UserCertificateMapper.xml

@@ -60,6 +60,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="moduleId" column="module_id"/>
         <result property="moreCertificateStatus" column="more_certificate_status"/>
         <result property="tenantId" column="tenant_id"/>
+        <result property="goodsName" column="goods_name"/>
+        <result property="categoryName" column="category_name"/>
     </resultMap>
 
     <select id="selectMaxId"   resultType="Long">
@@ -75,7 +77,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             c.certificate_name,
             cet.education_name,
             cpt.project_name,
-            cb.business_name
+            cb.business_name,
+            m.category_name,
+            g.goods_name
         FROM
             user_certificate uc
                 LEFT JOIN `user` u ON uc.user_id = u.user_id
@@ -84,6 +88,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN course_education_type cet ON uc.education_type_id = cet.id
                 LEFT JOIN course_project_type cpt ON uc.project_id = cpt.id
                 LEFT JOIN course_business cb ON uc.business_id = cb.id
+                LEFT JOIN goods g ON g.goods_id = uc.goods_id
+                LEFT JOIN major m ON g.major_id = m.id
         where 1=1
         <if test="typeId != null and typeId != ''">
             AND c.id = #{typeId}
@@ -128,7 +134,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         cet.education_name,
         cpt.project_name,
         cb.business_name,
-        ct.key_value
+        ct.key_value,
+        g.goods_name
         FROM
         user_certificate uc
         LEFT JOIN `user` u ON uc.user_id = u.user_id
@@ -137,6 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN course_education_type cet ON uc.education_type_id = cet.id
         LEFT JOIN course_project_type cpt ON uc.project_id = cpt.id
         LEFT JOIN course_business cb ON uc.business_id = cb.id
+        LEFT JOIN goods g ON g.goods_id = uc.goods_id
         where uc.certificate_code = #{certificateCode}
 
     </select>