he2802 před 1 rokem
rodič
revize
ed4ea90f81

+ 5 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderGoodsVo.java

@@ -390,4 +390,9 @@ public class OrderGoodsVo {
 	private String sevenPushReason;
 
 	private String sevenPushDate;
+
+	/** 专业名称 */
+	@ApiModelProperty("专业名称")
+	@Excel(name = "专业")
+	private String majorName;
 }

+ 2 - 0
zhongzheng-system/src/main/resources/mapper/modules/order/OrderGoodsMapper.xml

@@ -122,6 +122,7 @@
         <result property="mailSign" column="mail_sign"/>
         <result property="profileStatus" column="profile_status"/>
         <result property="profileChangeStatus" column="profile_change_status"/>
+        <result property="majorName" column="major_name"/>
     </resultMap>
 
     <select id="selectListBybo" parameterType="com.zhongzheng.modules.order.bo.OrderGoodsQueryBo"
@@ -482,6 +483,7 @@
         og.order_goods_id,
         og.seven_year as order_year,
         og.grade_id,
+        (SELECT m.category_name FROM  major m  where m.id = g.major_id) as major_name,
         (SELECT
         COUNT( m.id )
         FROM