merge

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

@@ -22,7 +22,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.text.ParseException;
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -53,6 +52,17 @@ public class UserMockSubscribeController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 模考导出
+     */
+    @ApiOperation("模考导出")
+    @GetMapping("/listSubscribe/export")
+    public AjaxResult<UserMockSubscribeVo> listSubscribeExport(UserMockSubscribeQueryBo bo) {
+        List<UserMockSubscribeVo> list = iUserMockSubscribeService.listSubscribe(bo);
+        ExcelUtil<UserMockSubscribeVo> util = new ExcelUtil<UserMockSubscribeVo>(UserMockSubscribeVo.class);
+        return util.exportExcel(list, "模考数据");
+    }
+
     /**
      * 导出用户预约模考列表
      */

zhongzheng-admin/src/main/resources/application-dev.yml

@@ -121,7 +121,7 @@ certificate:
 
 liveGotoURL: http://
 
-enCodeVersion: develop
+enCodeVersion: trial
 
 oldStudySys:
     syncPath: http://gdxypx.xy.com/System/BussinessApi/PostUserStudyRecords

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamApplyAddBo.java

@@ -2,9 +2,7 @@ package com.zhongzheng.modules.exam.bo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import java.util.Date;
 
 
 
@@ -68,6 +66,9 @@ public class ExamApplyAddBo {
     /** 是否需要签署承诺书 1是，0否 */
     @ApiModelProperty("编码")
     private Integer reportStatus;
+    /** 考场性质：1普通场，2专场 */
+    @ApiModelProperty("考场性质：1普通场，2专场 ")
+    private Integer applyNature;
 
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamApplyEditBo.java

@@ -74,5 +74,7 @@ public class ExamApplyEditBo {
     @ApiModelProperty("编码")
     private Integer reportStatus;
 
+    @ApiModelProperty("考场性质：1普通场，2专场 ")
+    private Integer applyNature;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/domain/ExamApply.java

@@ -1,14 +1,14 @@
 package com.zhongzheng.modules.exam.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+
 import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.zhongzheng.common.annotation.Excel;
 
 /**
  * 考试安排对象 exam_apply
@@ -47,22 +47,18 @@ private static final long serialVersionUID=1L;
     private Long updateTime;
     /** 1 启用 0未启用 -1删除 2已过期 */
     private Integer status;
-
     /** 商品类型 1视频2题库 3补考 4前培  */
     private Integer goodsType;
-
     /** 教育类型id */
     private Long educationTypeId;
-
     /** 业务层次id */
     private Long businessId;
-
     /** 项目ID */
     private Long projectId;
-
     /** 编码 */
     private String code;
-    
     /** 是否需要签署承诺书 1是，0否 */
     private Integer reportStatus;
+    /** 考场性质：1普通场，2专场 */
+    private Integer applyNature;
 }

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

@@ -1,16 +1,12 @@
 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;
 
 import java.math.BigDecimal;
-import java.util.Date;
-import java.util.Map;
-import java.util.HashMap;
-
-import com.zhongzheng.common.core.domain.BaseEntity;
 
 /**
  * 用户预约模考分页查询对象 user_mock_subscribe
@@ -109,6 +105,14 @@ public class UserMockSubscribeQueryBo extends BaseEntity {
 	@ApiModelProperty("考试结束时间")
 	private Long endTime;
 
+	/** 开始分数 */
+	@ApiModelProperty("开始分数")
+	private BigDecimal startScore;
+
+	/** 结束分数 */
+	@ApiModelProperty("结束分数")
+	private BigDecimal endScore;
+
 
 	/** 考试状态 0未考试 1已结束 */
 	@ApiModelProperty("考试状态 0未考试 1已结束")

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

@@ -1,14 +1,11 @@
 package com.zhongzheng.modules.user.vo;
 
 import com.zhongzheng.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
 
 
 /**
@@ -27,11 +24,9 @@ public class UserMockSubscribeVo {
 	private Long subscribeId;
 
 	/** 学员ID */
-	@Excel(name = "学员ID")
 	@ApiModelProperty("学员ID")
 	private Long userId;
 	/** 每场模考ID */
-	@Excel(name = "每场模考ID")
 	@ApiModelProperty("每场模考ID")
 	private Long eachExamId;
 	/** 学员姓名 */
@@ -42,24 +37,23 @@ public class UserMockSubscribeVo {
 	@Excel(name = "身份证")
 	@ApiModelProperty("身份证")
 	private String idCard;
+	@Excel(name = "手机号")
+	@ApiModelProperty("手机号")
+	private String telphone;
 	/** 1正常 2取消 */
-	@Excel(name = "1正常 2取消")
 	@ApiModelProperty("1正常 2取消")
 	private Integer subscribeStatus;
 	/** 1 已开通 0未开通 */
-	@Excel(name = "1 已开通 0未开通")
 	@ApiModelProperty("1 已开通 0未开通")
 	private Integer beforeStatus;
 	/** 0 待登记 1正常 2缺考 3作弊 4替考 */
-	@Excel(name = "0 待登记 1正常 2缺考 3作弊 4替考")
 	@ApiModelProperty("0 待登记 1正常 2缺考 3作弊 4替考")
 	private Integer examStatus;
 	/** 试卷标题 */
-	@Excel(name = "试卷标题")
+	@Excel(name = "试卷名称")
 	@ApiModelProperty("试卷标题")
 	private String examName;
 	/** 试卷ID */
-	@Excel(name = "试卷ID")
 	@ApiModelProperty("试卷ID")
 	private Integer examId;
 	/** 成绩 */
@@ -67,27 +61,23 @@ public class UserMockSubscribeVo {
 	@ApiModelProperty("成绩")
 	private Long performance;
 	/** 交卷状态 0未交卷 1手动交卷 2自动交卷 */
-	@Excel(name = "交卷状态 0未交卷 1手动交卷 2自动交卷")
 	@ApiModelProperty("交卷状态 0未交卷 1手动交卷 2自动交卷")
 	private Integer handStatus;
 	/** 1通过 0不通过 */
-	@Excel(name = "1通过 0不通过")
 	@ApiModelProperty("1通过 0不通过")
 	private Integer result;
 	/** 考试ID */
-	@Excel(name = "考试ID")
 	@ApiModelProperty("考试ID")
 	private Long applyId;
 	/** 考试绑定科目ID */
-	@Excel(name = "考试绑定科目ID")
 	@ApiModelProperty("考试绑定科目ID")
 	private Long mockMajorSubjectId;
 	/** 考试开始时间段 */
-	@Excel(name = "考试开始时间段")
+	@Excel(name = "考试开始时间")
 	@ApiModelProperty("考试开始时间段")
 	private String applySiteStartTime;
 	/** 考试结束时间段 */
-	@Excel(name = "考试结束时间段")
+	@Excel(name = "考试结束时间")
 	@ApiModelProperty("考试结束时间段")
 	private String applySiteEndTime;
 	/** 考试日期 */
@@ -96,52 +86,44 @@ public class UserMockSubscribeVo {
 	private Long applySiteExamTime;
 
 	/** 模考标题 */
-	@Excel(name = "模考标题")
+	@Excel(name = "模考名称")
 	@ApiModelProperty("模考标题")
 	private String applyName;
 
 	/** 教育类型id */
-	@Excel(name = "教育类型id")
 	@ApiModelProperty("教育类型id")
 	private Long educationTypeId;
 
 	/** 教育类型名称 */
-	@Excel(name = "教育类型名称")
 	@ApiModelProperty("教育类型名称")
 	private String educationName;
 
 	/** 业务层次id */
-	@Excel(name = "业务层次id")
 	@ApiModelProperty("业务层次id")
 	private Long businessId;
 
 	/** 业务层次名称 */
-	@Excel(name = "业务层次名称")
 	@ApiModelProperty("业务层次名称")
 	private String businessName;
 
 	/** 专业id */
-	@Excel(name = "专业id")
 	@ApiModelProperty("专业id")
 	private Long majorId;
 
 	/** 专业名字 */
-	@Excel(name = "专业名字")
+	@Excel(name = "报考专业")
 	@ApiModelProperty("专业名字")
 	private String categoryName;
 
 	/** 项目id */
-	@Excel(name = "项目id")
 	@ApiModelProperty("项目id")
 	private Long projectId;
 
 	/** 项目名字 */
-	@Excel(name = "项目名字")
 	@ApiModelProperty("项目名字")
 	private String projectName;
 
 	/** 科目id */
-	@Excel(name = "科目id")
 	@ApiModelProperty("科目id")
 	private Long subjectId;
 
@@ -151,81 +133,64 @@ public class UserMockSubscribeVo {
 	private String subjectName;
 
 	/** 开考限制时间 */
-	@Excel(name = "开考限制时间")
 	@ApiModelProperty("开考限制时间")
 	private String timeLimit;
 
 	/** 做题次数 */
-	@Excel(name = "做题次数")
 	@ApiModelProperty("做题次数")
 	private Integer doNum;
 
 	/** 第一次做题得分 */
-	@Excel(name = "第一次做题得分")
 	@ApiModelProperty("第一次做题得分")
 	private BigDecimal firstScore;
 
 	/** 第一次主观题待评分 0否 1是 */
-	@Excel(name = "第一次主观题待评分 0否 1是")
 	@ApiModelProperty("第一次主观题待评分 0否 1是")
 	private Integer firstSubjectiveScore;
 
 	/** 第一次交卷时间 */
-	@Excel(name = "第一次交卷时间")
 	@ApiModelProperty("第一次交卷时间")
 	private Long firstHandTime;
 
 	/** 能否做题 默认 能 0 否*/
-	@Excel(name = "能否做题 默认 能 0 否")
 	@ApiModelProperty("能否做题 默认 能 0 否")
 	private Integer canDo;
 
 	/** 重新预约 默认 否 1 是*/
-	@Excel(name = "重新预约 默认 否 1 是")
 	@ApiModelProperty("重新预约 默认 否 1 是")
 	private Integer reSubscribe;
 
 	/** 做题id */
-	@Excel(name = "做题id")
 	@ApiModelProperty("做题id")
 	private Long recordId;
 
 	/** 直播流地址 */
-	@Excel(name = "直播流地址")
 	@ApiModelProperty("直播流地址")
 	private String liveUrl;
 	/** 直播开始时间 */
-	@Excel(name = "直播开始时间")
 	@ApiModelProperty("直播开始时间")
 	private Long liveStartTime;
 	/** 直播结束时间 */
-	@Excel(name = "直播结束时间")
 	@ApiModelProperty("直播结束时间")
 	private Long liveEndTime;
 
 	/** 开考提醒 0不开启 1开启 */
-	@Excel(name = "开考提醒 0不开启 1开启")
 	@ApiModelProperty("开考提醒 0不开启 1开启")
 	private Integer mockRemind;
 	/** 预约直播 0不预约 1预约 */
-	@Excel(name = "预约直播 0不预约 1预约")
 	@ApiModelProperty("预约直播 0不预约 1预约")
 	private Integer liveSubscribe;
 	/** 前缀名称 */
-	@Excel(name = "前缀名称")
 	@ApiModelProperty("前缀名称")
 	private String prefixName;
 
 	/** 是否已发送开考通知 0否 1是 */
-	@Excel(name = "是否已发送开考通知 0否 1是")
 	@ApiModelProperty("是否已发送开考通知 0否 1是")
 	private Integer hasMockRemind;
 	/** 预约直播 0不预约 1预约 */
-	@Excel(name = "是否已发送直播通知 0否 1是")
 	@ApiModelProperty("是否已发送直播通知 0否 1是")
 	private Integer hasLiveSubscribe;
 	/** 节名称 */
-	@Excel(name = "节名称")
 	@ApiModelProperty("节名称")
 	private String name;
 

zhongzheng-system/src/main/resources/mapper/modules/top/TopOldOrderMapper.xml

@@ -167,6 +167,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="checkStatus != null">
             AND ot.check_status = #{checkStatus}
         </if>
+        <if test="refundStatus != null">
+            AND ot.refund_status = #{refundStatus}
+        </if>
         <if test="refundStatusList != null and refundStatusList.size()!=0 ">
             AND ot.refund_status in
             <foreach collection="refundStatusList" item="item" index="index" open="(" close=")" separator=",">
@@ -254,6 +257,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="checkStatus != null">
             AND o.check_status = #{checkStatus}
         </if>
+        <if test="refundStatus != null">
+            AND o.refund_status = #{refundStatus}
+        </if>
         <if test="refundStatusList != null and refundStatusList.size()!=0 ">
             AND o.refund_status in
             <foreach collection="refundStatusList" item="item" index="index" open="(" close=")" separator=",">

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

@@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="eachExamId" column="each_exam_id"/>
         <result property="realname" column="realname"/>
         <result property="idCard" column="id_card" typeHandler="com.zhongzheng.common.type.EncryptHandler"/>
+        <result property="telphone" column="telphone" typeHandler="com.zhongzheng.common.type.EncryptHandler"/>
         <result property="subscribeStatus" column="subscribe_status"/>
         <result property="beforeStatus" column="before_status"/>
         <result property="examStatus" column="exam_status"/>
@@ -122,6 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT 	ums.*,
                 u.realname,
                 u.id_card,
+                u.telphone,
                 mms.exam_id,
                 e.exam_name,
                 mms.subject_id,
@@ -177,6 +179,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="endTime != null and endTime != ''">
             AND ums.apply_site_exam_time &lt; #{endTime}
         </if>
+        <if test="startScore != null and startScore != ''">
+            AND ums.performance &gt;= #{startScore}
+        </if>
+        <if test="endScore != null and endScore != ''">
+            AND ums.performance &lt;= #{endScore}
+        </if>
         order by ums.create_time desc
     </select>
     <select id="listBySubject" parameterType="com.zhongzheng.modules.user.bo.UserMockSubscribeQueryBo" resultMap="UserMockSubscribeVoResult">