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/ClassGradeQueryBo.java

@@ -128,4 +128,10 @@ public class ClassGradeQueryBo extends BaseEntity {
 	/** 查找key */
 	@ApiModelProperty("searchKey")
 	private String searchKey;
+
+	/**
+	 * 有接口标识(0无配置 1有接口 2无接口)
+	 */
+	@ApiModelProperty("有接口标识")
+	private Integer hasInterface;
 }

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

@@ -290,6 +290,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND s.goods_id =#{goodsId}
             ) >0
         </if>
+        <if test="hasInterface != null and hasInterface == 0">
+            AND g.interface_account_id is null AND g.no_interface_account_id is null
+        </if>
+        <if test="hasInterface != null and hasInterface == 1">
+            AND g.interface_account_id is not null
+        </if>
+        <if test="hasInterface != null and hasInterface == 2">
+            AND g.no_interface_account_id is not null
+        </if>
         order by g.create_time desc
     </select>
 

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

@@ -116,10 +116,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
         </if>
         <if test="sort != null and sort == 0">
-            order by uca.create_time
+            order by uca.create_time desc
         </if>
         <if test="sort == null and sort == ''">
-            order by uca.create_time desc
+            order by uca.create_time
         </if>
     </select>