fix 地区

zhongzheng-admin/src/main/java/com/zhongzheng/controller/grade/SaticScheduleTask.java

@@ -0,0 +1,19 @@
+package com.zhongzheng.controller.grade;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+
+import java.time.LocalDateTime;
+
+@Configuration      //1.主要用于标记配置类，兼备Component的效果。
+@EnableScheduling   // 2.开启定时任务
+public class SaticScheduleTask {
+    //3.添加定时任务
+    //@Scheduled(cron = "0/2 * * * * ?")
+    //或直接指定时间间隔，例如：5秒
+    //@Scheduled(fixedRate=5000)
+    private void configureTasks() {
+        System.err.println("执行静态定时任务时间: " + LocalDateTime.now());
+    }
+}

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

@@ -3,6 +3,10 @@ package com.zhongzheng.controller.user;
 import java.util.List;
 import java.util.Arrays;
 
+import cn.hutool.core.lang.Validator;
+import com.zhongzheng.common.core.domain.model.LoginUser;
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.modules.bank.vo.QuestionImport;
 import com.zhongzheng.modules.exam.vo.ExamApplyVo;
 import com.zhongzheng.modules.user.bo.*;
 import com.zhongzheng.modules.user.service.IUserExamGoodsService;
@@ -28,6 +32,7 @@ import com.zhongzheng.common.utils.poi.ExcelUtil;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 用户预约考试Controller
@@ -105,4 +110,23 @@ public class UserSubscribeController extends BaseController {
         return AjaxResult.success(userExamGoodsVo);
     }
 
+/*    @Log(title = "题目管理", businessType = BusinessType.IMPORT)
+    @ApiOperation("导入题目模板")
+    @PreAuthorize("@ss.hasPermi('system:apply:import')")
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
+    {
+        ExcelUtil<QuestionImport> util = new ExcelUtil<QuestionImport>(QuestionImport.class);
+        List<QuestionImport> questionList = util.importExcel(file.getInputStream());
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        String operName = loginUser.getUsername();
+        String message = iQuestionService.importQuestion(questionList, updateSupport, operName);
+        if(Validator.isNotEmpty(message)){
+            return AjaxResult.error(message);
+        }else{
+            return AjaxResult.success(message);
+        }
+
+    }*/
+
 }

zhongzheng-api/src/main/java/com/zhongzheng/controller/course/MajorExamineController.java

@@ -0,0 +1,58 @@
+package com.zhongzheng.controller.course;
+
+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.modules.course.bo.MajorExamineAddBo;
+import com.zhongzheng.modules.course.bo.MajorExamineEditBo;
+import com.zhongzheng.modules.course.bo.MajorExamineQueryBo;
+import com.zhongzheng.modules.course.service.IMajorExamineService;
+import com.zhongzheng.modules.course.vo.MajorExamineVo;
+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.List;
+
+/**
+ * 考期Controller
+ * 
+ * @author ruoyi
+ * @date 2021-10-09
+ */
+@Api(value = "考期控制器", tags = {"考期管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/course/examine")
+public class MajorExamineController extends BaseController {
+
+    private final IMajorExamineService iMajorExamineService;
+
+    /**
+     * 查询考期列表
+     */
+    @ApiOperation("查询考期列表")
+    @GetMapping("/list")
+    public TableDataInfo<MajorExamineVo> list(MajorExamineQueryBo bo) {
+        startPage();
+        List<MajorExamineVo> list = iMajorExamineService.queryList(bo);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 获取考期详细信息
+     */
+    @ApiOperation("获取考期详细信息")
+    @GetMapping("/{id}")
+    public AjaxResult<MajorExamineVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iMajorExamineService.queryById(id));
+    }
+
+
+}

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

@@ -0,0 +1,48 @@
+package com.zhongzheng.controller.exam;
+
+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.modules.exam.bo.*;
+import com.zhongzheng.modules.exam.service.IExamBeforeGoodsService;
+import com.zhongzheng.modules.exam.service.IExamBeforeService;
+import com.zhongzheng.modules.exam.service.IExamBeforeUrlService;
+import com.zhongzheng.modules.exam.vo.ExamBeforeUrlVo;
+import com.zhongzheng.modules.exam.vo.ExamBeforeVo;
+import com.zhongzheng.modules.exam.vo.ExamNumberGoodsVo;
+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.List;
+
+/**
+ * 前培安排Controller
+ * 
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Api(value = "前培安排控制器", tags = {"前培安排管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/app/before")
+public class ExamBeforeController extends BaseController {
+
+    private final IExamBeforeService iExamBeforeService;
+    private final IExamBeforeUrlService iExamBeforeUrlService;
+    private final IExamBeforeGoodsService iExamBeforeGoodsService;
+
+    /**
+     * 获取前培安排详细信息
+     */
+    @ApiOperation("获得刷题地址")
+    @GetMapping("/address")
+    public AjaxResult<ExamBeforeVo> getAddressInfo(ExamBeforeQueryBo examBeforeQueryBo) {
+        return AjaxResult.success(iExamBeforeService.getAddressInfo(examBeforeQueryBo));
+    }
+}

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/course/bo/CourseBusinessQueryBo.java

@@ -41,7 +41,7 @@ public class CourseBusinessQueryBo extends BaseEntity {
 	private String encoder;
 
 	/** 业务ID */
-	@ApiModelProperty("业务ID")
+	@ApiModelProperty("考期Id")
 	private Long id;
 
 	/** 项目名称 */

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

@@ -40,6 +40,9 @@ public class ExamBeforeQueryBo extends BaseEntity {
 	/** 前陪ID */
 	@ApiModelProperty("前陪ID")
 	private Long beforeId;
+	/** 商品ID */
+	@ApiModelProperty("商品ID")
+	private Long goodsId;
 	/** 编码 */
 	@ApiModelProperty("编码")
 	private String code;

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/mapper/ExamBeforeMapper.java

@@ -28,4 +28,6 @@ public interface ExamBeforeMapper extends BaseMapper<ExamBefore> {
     Integer countBeforeGoods(Long beforeId);
 
     Integer beforeGoods(Long beforeId);
+
+    Long verifyInfo(Long goodsId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/IExamBeforeService.java

@@ -52,4 +52,6 @@ public interface IExamBeforeService extends IService<ExamBefore> {
     List<ExamNumberGoodsVo> listGoods(ExamNumberGoodsQueryBo bo);
 
     ExamBeforeVo getGoodsInfo(ExamBeforeQueryBo bo);
+
+	ExamBeforeVo getAddressInfo(ExamBeforeQueryBo examBeforeQueryBo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamBeforeServiceImpl.java

@@ -144,4 +144,10 @@ public class ExamBeforeServiceImpl extends ServiceImpl<ExamBeforeMapper, ExamBef
         examBeforeVo.setGoodsId(array);
         return examBeforeVo;
     }
+
+    @Override
+    public ExamBeforeVo getAddressInfo(ExamBeforeQueryBo examBeforeQueryBo) {
+        Long verLong = baseMapper.verifyInfo(examBeforeQueryBo.getGoodsId());
+        return null;
+    }
 }

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/java/com/zhongzheng/modules/user/vo/UserSubscribeImport.java

@@ -0,0 +1,167 @@
+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;
+
+
+/**
+ * 用户预约考试视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@ApiModel("用户预约考试视图对象")
+public class UserSubscribeImport {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long subscribeId;
+
+	/** 绑定的商品 */
+	@Excel(name = "绑定的商品")
+	@ApiModelProperty("绑定的商品")
+	private Long goodsId;
+
+	/** 商品名称 */
+	@Excel(name = "商品名称")
+	@ApiModelProperty("商品名称")
+	private String goodsName;
+
+	@ApiModelProperty("专业名称")
+	private String categoryName;
+
+	/** 编码 */
+	@Excel(name = "编码")
+	@ApiModelProperty("编码")
+	private String goodsCode;
+
+	/** 开始日期 */
+	@Excel(name = "报考开始日期")
+	@ApiModelProperty("报考开始日期")
+	private Long applyStartTime;
+	/** 结束日期 */
+	@Excel(name = "报考结束日期")
+	@ApiModelProperty("报考结束日期")
+	private Long applyEndTime;
+
+	/** 标准价格 */
+	@Excel(name = "标准价格")
+	@ApiModelProperty("标准价格")
+	private BigDecimal standPrice;
+
+	/** 学员ID */
+	@Excel(name = "学员ID")
+	@ApiModelProperty("学员ID")
+	private Long userId;
+
+	/** 真实姓名 */
+	@Excel(name = "真实姓名")
+	@ApiModelProperty("真实姓名")
+	private String realname;
+	/** 身份证号 */
+	@Excel(name = "身份证号")
+	@ApiModelProperty("身份证号")
+	private String idCard;
+
+	/** 1正常 2取消 */
+	@Excel(name = "1正常 2取消")
+	@ApiModelProperty("1正常 2取消")
+	private Integer subscribeStatus;
+	/** 1 已开通 */
+	@Excel(name = "1 已开通")
+	@ApiModelProperty("1 已开通")
+	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 = "成绩")
+	@ApiModelProperty("成绩")
+	private Long performance;
+	/** 1通过 0不通过 */
+	@Excel(name = "1通过 0不通过")
+	@ApiModelProperty("1通过 0不通过")
+	private Integer result;
+	/** 证书编号 */
+	@Excel(name = "证书编号")
+	@ApiModelProperty("证书编号")
+	private String certificateCode;
+	/** 登记补充 */
+	@Excel(name = "登记补充")
+	@ApiModelProperty("登记补充")
+	private String remark;
+	/** $column.columnComment */
+	@Excel(name = "登记补充")
+	@ApiModelProperty("$column.columnComment")
+	private Long applyId;
+
+	/** 考试标题 */
+	@Excel(name = "考试标题")
+	@ApiModelProperty("考试标题")
+	private String applyName;
+
+	/** 1非补考学员 2补考学员 */
+	@Excel(name = "1非补考学员 2补考学员")
+	@ApiModelProperty("1非补考学员 2补考学员")
+	private Integer studentType;
+	/** 1 消耗次数 */
+	@Excel(name = "1 消耗次数")
+	@ApiModelProperty("1 消耗次数")
+	private Integer examExpend;
+	/** 1 前培次数消耗 */
+	@Excel(name = "1 前培次数消耗")
+	@ApiModelProperty("1 前培次数消耗")
+	private Integer beforeExpend;
+
+	/** 创建时间 */
+	@ApiModelProperty("创建时间")
+	private Long createTime;
+
+	/** 前培ID */
+	@ApiModelProperty("前培ID")
+	private Long beforeId;
+
+	/** 前培ID */
+	@ApiModelProperty("前培标题")
+	private String beforeName;
+
+	/** 考试地点 */
+	@Excel(name = "考试地点")
+	@ApiModelProperty("考试地点")
+	private String applySiteAddress;
+	/** 考试开始时间段 */
+	@Excel(name = "考试开始时间段")
+	@ApiModelProperty("考试开始时间段")
+	private String applySiteStartTime;
+	/** 考试结束时间段 */
+	@Excel(name = "考试结束时间段")
+	@ApiModelProperty("考试结束时间段")
+	private String applySiteEndTime;
+	/** 考试日期 */
+	@Excel(name = "考试日期")
+	@ApiModelProperty("考试日期")
+	private Long applySiteExamTime;
+	/** 考培地点 */
+	@Excel(name = "考培地点")
+	@ApiModelProperty("考培地点")
+	private String applySiteAddressTrain;
+	/** 考培开始时间段 */
+	@Excel(name = "考培开始时间段")
+	@ApiModelProperty("考培开始时间段")
+	private String applySiteStartTrainTime;
+	/** 考培结束时间段 */
+	@Excel(name = "考培结束时间段")
+	@ApiModelProperty("考培结束时间段")
+	private String applySiteEndTrainTime;
+	/** 考培日期 */
+	@Excel(name = "考培日期")
+	@ApiModelProperty("考培日期")
+	private Long applySiteExamTrainTime;
+}

zhongzheng-system/src/main/resources/mapper/modules/course/MajorExamineMapper.xml

@@ -50,6 +50,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item}
             </foreach>
         </if>
+        <if test="projectId != null and projectId!=''">
+            AND b.project_id = #{projectId}
+        </if>
+          <if test="id != null and id!=''">
+            AND b.id = #{id}
+        </if>
         order by b.update_time desc
     </select>
 </mapper>

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">

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

@@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             (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 ea.apply_end_time 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