submit

zhongzheng-admin/src/main/java/com/zhongzheng/controller/user/DangAnController.java

@@ -9,10 +9,12 @@ import com.zhongzheng.modules.order.bo.OrderQueryBo;
 import com.zhongzheng.modules.order.service.IOrderService;
 import com.zhongzheng.modules.order.vo.OrderListVo;
 import com.zhongzheng.modules.user.bo.UserQueryBo;
+import com.zhongzheng.modules.user.bo.UserUsbRecordBo;
 import com.zhongzheng.modules.user.bo.UserVisitLogQueryBo;
 import com.zhongzheng.modules.user.service.IUserStudyRecordService;
 import com.zhongzheng.modules.user.service.IUserVisitLogService;
 import com.zhongzheng.modules.user.vo.ExamStudyRecordVo;
+import com.zhongzheng.modules.user.vo.UserUsbRecordVo;
 import com.zhongzheng.modules.user.vo.UserVisitLogVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -75,9 +77,9 @@ public class DangAnController extends BaseController {
 
     @ApiOperation("学员约考记录")
     @GetMapping("/listUserSubscribe")
-    public TableDataInfo<ClassPeriodStudentVo> getListUserSubscribe(ClassGradeUserQueryBo bo) {
+    public TableDataInfo<UserUsbRecordVo> getListUserSubscribe(UserUsbRecordBo bo) {
         startPage();
-        List<ClassPeriodStudentVo> list = iClassGradeUserService.listVideoUserPeriod(bo);
+        List<UserUsbRecordVo> list = iClassGradeUserService.getListUserSubscribe(bo);
         return getDataTable(list);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/IClassGradeUserService.java

@@ -6,7 +6,9 @@ import com.zhongzheng.modules.grade.domain.ClassGradeUser;
 import com.zhongzheng.modules.grade.vo.*;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhongzheng.modules.user.bo.UserQueryBo;
+import com.zhongzheng.modules.user.bo.UserUsbRecordBo;
 import com.zhongzheng.modules.user.domain.User;
+import com.zhongzheng.modules.user.vo.UserUsbRecordVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -148,4 +150,5 @@ public interface IClassGradeUserService extends IService<ClassGradeUser> {
 
 	List<ClassPeriodStudentVo> listBKUserPeriod(ClassGradeUserQueryBo bo);
 
+    List<UserUsbRecordVo> getListUserSubscribe(UserUsbRecordBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -58,10 +58,7 @@ import com.zhongzheng.modules.system.domain.SysOldOrg;
 import com.zhongzheng.modules.system.service.ISysConfigService;
 import com.zhongzheng.modules.system.service.ISysOldOrgService;
 import com.zhongzheng.modules.system.service.ISysUserService;
-import com.zhongzheng.modules.user.bo.SubjectStudyRecordQueryBo;
-import com.zhongzheng.modules.user.bo.UserBankRecordQueryBo;
-import com.zhongzheng.modules.user.bo.UserQueryBo;
-import com.zhongzheng.modules.user.bo.UserStudyRecordQueryBo;
+import com.zhongzheng.modules.user.bo.*;
 import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.user.domain.UserStudyRecordPhoto;
 import com.zhongzheng.modules.user.mapper.UserStudyRecordPhotoMapper;
@@ -3601,6 +3598,11 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         return this.baseMapper.listBKUserPeriod(bo);
     }
 
+    @Override
+    public List<UserUsbRecordVo> getListUserSubscribe(UserUsbRecordBo bo) {
+        return null;
+    }
+
 
     /**
      * 实体类转化成视图对象

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

@@ -0,0 +1,62 @@
+package com.zhongzheng.modules.user.bo;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 【请填写功能名称】视图对象 mall_package
+ *
+ * @author change
+ * @date 2021-06-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("【请填写功能名称】视图对象")
+public class UserUsbRecordBo extends BaseEntity {
+
+    /** 分页大小 */
+    @ApiModelProperty("分页大小")
+    private Integer pageSize;
+    /** 当前页数 */
+    @ApiModelProperty("当前页数")
+    private Integer pageNum;
+    /** 排序列 */
+    @ApiModelProperty("排序列")
+    private String orderByColumn;
+    /** 排序的方向desc或者asc */
+    @ApiModelProperty(value = "排序的方向", example = "asc,desc")
+    private String isAsc;
+
+    @ApiModelProperty("约考开始时间")
+    private Long subStartTime;
+
+    @ApiModelProperty("约考结束时间")
+    private Long subEndTime;
+
+    private Long educationTypeId;
+
+    private Long projectId;
+
+    private Long businessId;
+
+    private Long majorId;
+
+    @ApiModelProperty("课程名称")
+    private String goodsName;
+
+    @ApiModelProperty("预约状态：1已预约 2已取消 3已过期")
+    private Integer subscribeStatus;
+
+    @ApiModelProperty("考试时间")
+    private Long applyTime;
+
+    @ApiModelProperty("考试月份")
+    private String applyMonth;
+
+    @ApiModelProperty("考试场次")
+    private String applySession;
+
+}

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

@@ -0,0 +1,56 @@
+package com.zhongzheng.modules.user.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 【请填写功能名称】视图对象 mall_package
+ *
+ * @author change
+ * @date 2021-06-24
+ */
+@Data
+@ApiModel("【请填写功能名称】视图对象")
+public class UserUsbRecordVo {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("预约记录ID")
+    private Long subscribeId;
+
+    @ApiModelProperty("约考时间")
+    private Long createTime;
+
+    /** 课程名称 */
+    @ApiModelProperty("课程名称")
+    private String goodsName;
+
+    private Long educationTypeId;
+
+    private Long projectId;
+
+    private Long businessId;
+
+    private Long majorId;
+
+    @ApiModelProperty("业务类型")
+    private String businessName;
+
+    @ApiModelProperty("预约状态：1已预约 2已取消 3已过期")
+    private Integer subscribeStatus;
+
+    @ApiModelProperty("考试时间")
+    private Long applyTime;
+
+    @ApiModelProperty("考试地点")
+    private String applyAddress;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

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

@@ -459,7 +459,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN course_project_type cpt ON g.project_id = cpt.id
         LEFT JOIN user_wx_follow uwf ON u.union_id = uwf.union_id
         LEFT JOIN user_exam_goods ueg ON ueg.order_goods_id = og.order_goods_id
-        where 1=1
+        where 1=1 and cgu.`status` = 1
         <if test="sevenCode != null and sevenCode !='' ">
             AND cg.seven_code = #{sevenCode}
         </if>