预约考试

zhongzheng-api/src/main/java/com/zhongzheng/controller/plan/UserPlanController.java

@@ -107,12 +107,12 @@ public class UserPlanController extends BaseController {
     /**
      * 查询学习计划列表
      */
- /*   @ApiOperation("查询学员拥有商品能生成学习计划的商品")
+    @ApiOperation("查询学员拥有商品能生成学习计划的商品")
     @GetMapping("/listGoods")
     public TableDataInfo<GoodsVo> listGoods(UserPlanQueryBo bo) {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
         List<GoodsVo> list = iUserPlanService.listGoods(bo);
         return getDataTable(list);
-    }*/
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserPlanCourceAddBo.java

@@ -22,7 +22,7 @@ public class UserPlanCourceAddBo {
     @ApiModelProperty("计划id")
     private Long planId;
     /** 课程或题库学习计划 */
-    @ApiModelProperty("课程或题库学习计划")
+    @ApiModelProperty("视频商品ID")
     private Long sourceId;
     /** $column.columnComment */
     @ApiModelProperty("$column.columnComment")

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserPlanCourceEditBo.java

@@ -22,7 +22,7 @@ public class UserPlanCourceEditBo {
     private Long planId;
 
     /** 课程或题库学习计划 */
-    @ApiModelProperty("课程或题库学习计划")
+    @ApiModelProperty("视频商品ID")
     private Long sourceId;
 
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserPlanCourceQueryBo.java

@@ -40,6 +40,6 @@ public class UserPlanCourceQueryBo extends BaseEntity {
 	@ApiModelProperty("计划id")
 	private Long planId;
 	/** 课程或题库学习计划 */
-	@ApiModelProperty("课程或题库学习计划")
+	@ApiModelProperty("视频商品ID")
 	private Long sourceId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserPlanCourceVo.java

@@ -25,8 +25,8 @@ public class UserPlanCourceVo {
 	private Long planId;
 
 	/** 课程或题库学习计划 */
-	@Excel(name = "课程或题库学习计划")
-	@ApiModelProperty("课程或题库学习计划")
+	@Excel(name = "视频商品ID")
+	@ApiModelProperty("视频商品ID")
 	private Long sourceId;
 
 }

zhongzheng-system/src/main/resources/mapper/modules/inform/InformMapper.xml

@@ -102,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             IF((SELECT COUNT(iu.inform_id) FROM inform_user iu where i.inform_id=iu.inform_id and iu.send_status=1)=(SELECT COUNT(iu.inform_id) FROM inform_user iu where i.inform_id=iu.inform_id),1,
             IF((SELECT COUNT(iu.inform_id) FROM inform_user iu where i.inform_id=iu.inform_id and iu.send_status=1)<(SELECT COUNT(iu.inform_id) FROM inform_user iu where i.inform_id=iu.inform_id),3,4))) = #{userStatus}
         </if>
+        order by i.create_time desc
     </select>
 
     <select id="selectOrder" parameterType="long"  resultType="integer">