预约考试

zhongzheng-api/src/main/java/com/zhongzheng/controller/exam/ExamApplyController.java

@@ -12,7 +12,12 @@ import com.zhongzheng.modules.exam.service.IExamApplyGoodsService;
 import com.zhongzheng.modules.exam.service.IExamApplyService;
 import com.zhongzheng.modules.exam.service.IExamApplySiteService;
 import com.zhongzheng.modules.exam.vo.*;
+import com.zhongzheng.modules.user.bo.UserSubscribeAddBo;
+import com.zhongzheng.modules.user.bo.UserSubscribeEditBo;
+import com.zhongzheng.modules.user.bo.UserSubscribeQueryBo;
 import com.zhongzheng.modules.user.entity.ClientLoginUser;
+import com.zhongzheng.modules.user.service.IUserSubscribeService;
+import com.zhongzheng.modules.user.vo.UserSubscribeVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -42,6 +47,8 @@ public class ExamApplyController extends BaseController {
 
     private final WxTokenService wxTokenService;
 
+    private final IUserSubscribeService iUserSubscribeService;
+
     /**
      * 获取考试安排详细信息
      */
@@ -91,5 +98,38 @@ public class ExamApplyController extends BaseController {
         return AjaxResult.success(count);
     }
 
+    /**
+     * 新增用户预约考试
+     */
+    @ApiOperation("新增用户预约考试")
+    @Log(title = "用户预约考试", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Long> add(@RequestBody UserSubscribeAddBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        return AjaxResult.success(iUserSubscribeService.insertByAddBo(bo));
+    }
 
+    /**
+     * 查询用户预约考试列表
+     */
+    @ApiOperation("查询报考数据列表")
+    @GetMapping("/list")
+    public TableDataInfo<UserSubscribeVo> listSubscribe(UserSubscribeQueryBo bo) {
+        startPage();
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        List<UserSubscribeVo> list = iUserSubscribeService.listSubscribe(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 修改用户预约考试
+     */
+    @ApiOperation("修改用户预约考试")
+    @Log(title = "用户预约考试", businessType = BusinessType.UPDATE)
+    @PostMapping("edit")
+    public AjaxResult<Void> edit(@RequestBody UserSubscribeEditBo bo) {
+        return toAjax(iUserSubscribeService.updateByEditSingleBo(bo) ? 1 : 0);
+    }
 }

zhongzheng-api/src/main/java/com/zhongzheng/controller/grade/ClassGradeController.java

@@ -0,0 +1,57 @@
+package com.zhongzheng.controller.grade;
+
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.modules.grade.bo.*;
+import com.zhongzheng.modules.grade.service.*;
+import com.zhongzheng.modules.grade.vo.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 班级Controller
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Api(value = "班级控制器", tags = {"班级管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/grade/grade")
+public class ClassGradeController extends BaseController {
+
+    private final IClassGradeService iClassGradeService;
+
+    private final IClassGradeInterfaceService iClassGradeInterfaceService;
+
+    private final IClassGradeSysService iClassGradeSysService;
+
+    private final IClassGradeUserService iClassGradeUserService;
+
+    private final IUserPeriodService iUserPeriodService;
+
+    private final IUserPeriodStatusService userPeriodStatusService;
+
+    /**
+     * 查询班级列表
+     */
+    @ApiOperation("查询班级列表")
+    @GetMapping("/list")
+    public TableDataInfo<ClassGradeVo> list(ClassGradeQueryBo bo) {
+        startPage();
+        List<ClassGradeVo> list = iClassGradeService.queryList(bo);
+        return getDataTable(list);
+    }
+
+}

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

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 
@@ -17,9 +19,9 @@ import java.util.Date;
 @Data
 @ApiModel("用户预约考试添加对象")
 public class UserSubscribeAddBo {
-
     /** 绑定的商品 */
     @ApiModelProperty("绑定的商品")
+    @NotNull(message = "商品不能为空")
     private Long goodsId;
     /** 学员ID */
     @ApiModelProperty("学员ID")
@@ -47,9 +49,11 @@ public class UserSubscribeAddBo {
     private String remark;
     /** $column.columnComment */
     @ApiModelProperty("$column.columnComment")
+    @NotNull(message = "计划不能为空")
     private Long applyId;
     /** 1非补考学员 2补考学员 */
     @ApiModelProperty("1非补考学员 2补考学员")
+    @NotNull(message = "学员类型不能为空")
     private Integer studentType;
     /** 1 消耗次数 */
     @ApiModelProperty("1 消耗次数")
@@ -63,4 +67,32 @@ public class UserSubscribeAddBo {
     /** 更新时间 */
     @ApiModelProperty("更新时间")
     private Long updateTime;
+    /** 前培Id */
+    @ApiModelProperty("前培Id")
+    private Long beforeId;
+    /** 考试地点 */
+    @ApiModelProperty("考试地点")
+    @NotNull(message = "考试地点不能为空")
+    private String applySiteAddress;
+    /** 考试开始时间段 */
+    @ApiModelProperty("考试开始时间段")
+    private String applySiteStartTime;
+    /** 考试结束时间段 */
+    @ApiModelProperty("考试结束时间段")
+    private String applySiteEndTime;
+    /** 考试日期 */
+    @ApiModelProperty("考试日期")
+    private Long applySiteExamTime;
+    /** 考培地点 */
+    @ApiModelProperty("考培地点")
+    private String applySiteAddressTrain;
+    /** 考培开始时间段 */
+    @ApiModelProperty("考培开始时间段")
+    private String applySiteStartTrainTime;
+    /** 考培结束时间段 */
+    @ApiModelProperty("考培结束时间段")
+    private String applySiteEndTrainTime;
+    /** 考培日期 */
+    @ApiModelProperty("考培日期")
+    private Long applySiteExamTrainTime;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserSubscribeService.java

@@ -34,7 +34,7 @@ public interface IUserSubscribeService extends IService<UserSubscribe> {
 	 * @param bo 用户预约考试新增业务对象
 	 * @return
 	 */
-	Boolean insertByAddBo(UserSubscribeAddBo bo);
+	Long insertByAddBo(UserSubscribeAddBo bo);
 
 	/**
 	 * 根据编辑业务对象修改用户预约考试
@@ -43,6 +43,8 @@ public interface IUserSubscribeService extends IService<UserSubscribe> {
 	 */
 	Boolean updateByEditBo(UserSubscribeEditBo bo);
 
+	Boolean updateByEditSingleBo(UserSubscribeEditBo bo);
+
 	/**
 	 * 校验并删除数据
 	 * @param ids 主键集合

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserSubscribeServiceImpl.java

@@ -84,12 +84,15 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
     }
 
     @Override
-    public Boolean insertByAddBo(UserSubscribeAddBo bo) {
+    public Long insertByAddBo(UserSubscribeAddBo bo) {
         UserSubscribe add = BeanUtil.toBean(bo, UserSubscribe.class);
         validEntityBeforeSave(add);
+        add.setSubscribeStatus(1);
+        add.setExamStatus(0);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
+        this.save(add);
+        return add.getSubscribeId();
     }
 
     @Override
@@ -109,6 +112,14 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
         return true;
     }
 
+    @Override
+    public Boolean updateByEditSingleBo(UserSubscribeEditBo bo) {
+        UserSubscribe update = BeanUtil.toBean(bo, UserSubscribe.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
     /**
      * 保存前的数据校验
      *

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

@@ -45,6 +45,15 @@ public class UserSubscribeVo {
 	@ApiModelProperty("编码")
 	private String goodsCode;
 
+	/** 开始日期 */
+	@Excel(name = "报考开始日期")
+	@ApiModelProperty("报考开始日期")
+	private Long applyStartTime;
+	/** 结束日期 */
+	@Excel(name = "报考结束日期")
+	@ApiModelProperty("报考结束日期")
+	private Long applyEndTime;
+
 	/** 标准价格 */
 	@Excel(name = "标准价格")
 	@ApiModelProperty("标准价格")

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

@@ -55,6 +55,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="applySiteStartTrainTime" column="apply_site_start_train_time"/>
         <result property="applySiteEndTrainTime" column="apply_site_end_train_time"/>
         <result property="applySiteExamTrainTime" column="apply_site_exam_train_time"/>
+        <result property="applyStartTime" column="apply_start_time"/>
+        <result property="applyEndTime" column="apply_end_time"/>
     </resultMap>
 
     <select id="listSubscribe" parameterType="com.zhongzheng.modules.user.bo.UserSubscribeQueryBo" resultMap="UserSubscribeVo">
@@ -67,6 +69,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             (SELECT u.realname FROM `user` u where us.user_id = u.user_id) as realname,
             (SELECT u.id_card FROM `user` u where us.user_id = u.user_id) as id_card,
             (SELECT ea.apply_name FROM exam_apply ea where ea.apply_id = us.apply_id) as apply_name,
+            (SELECT ea.apply_start_time FROM exam_apply ea where ea.apply_id = us.apply_id) as apply_start_time,
+            (SELECT ea.applyEndTime FROM exam_apply ea where ea.apply_id = us.apply_id) as apply_end_time,
             (SELECT eb.before_name FROM exam_before eb where eb.before_id = us.before_id) as before_name
         FROM
             user_subscribe us