Merge branch 'dev' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot into dev

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

@@ -86,7 +86,7 @@ public class ClassGradeEditBo {
 
     /** 官方账号开通（有接口） */
     @ApiModelProperty("官方账号开通（有接口）")
-    private Long inInterfaceAccountId;
+    private Long interfaceAccountId;
 
     /** 官方账号开通（无接口） */
     @ApiModelProperty("官方账号开通（无接口）")

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

@@ -199,4 +199,9 @@ public class OrderGoodsVo {
 	@ApiModelProperty("官方信息推送状态 1是 0否")
 	private Long officialStatus;
 
+	/** 开班状态 0未开班(预报名) 1开班 */
+	@Excel(name = "开班状态 0未开班(预报名) 1开班")
+	@ApiModelProperty("开班状态 0未开班(预报名) 1开班")
+	private Integer classStatus;
+
 }

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

@@ -79,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="officialLearningUrl" column="official_learning_url"/>
         <result property="learnStatus" column="learn_status"/>
         <result property="officialStatus" column="official_status"/>
+        <result property="classStatus" column="class_status"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.order.bo.OrderGoodsQueryBo" resultMap="OrderGoodsResultVo">
@@ -150,7 +151,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         cg.learning_time_start,
         cg.official_learning_url,
         cgu.learn_status,
-        cgu.official_status
+        cgu.official_status,
+        cg.class_status
         FROM
         order_goods og
         LEFT JOIN class_grade cg on og.grade_id = cg.grade_id

zhongzheng-system/src/main/resources/mapper/modules/user/UserCourseAnswerMapper.xml

@@ -96,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND ISNULL(uca.assign_user_id )
         </if>
         <if test="msgType != null and msgType == 2">
-            AND uca.assign_user_id>0
+            AND uca.assign_user_id>0 AND uca.assign_answer_id is not null
         </if>
         <if test="searchKey != null and searchKey != '' ">
             and (g.goods_name like concat('%', #{searchKey}, '%') or uca.answer_text like concat('%', #{searchKey}, '%'))
@@ -115,7 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND g.business_id = #{businessId}
             </if>
         </if>
-        order by uca.answer_id
+        order by uca.create_time desc
     </select>
 
     <update id="delChildAnswer" parameterType="com.zhongzheng.modules.user.bo.UserCourseAnswerQueryBo" >