fix 前培次数

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

@@ -295,10 +295,38 @@ public class UserSubscribeController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:profile:export')")
     @Log(title = "导出错误数据", businessType = BusinessType.EXPORT)
     @PostMapping("/exportErrorNew")
-    public AjaxResult<Map<String,Object>> exportErrorNew(@RequestBody List<UserSubscribeErrorImport> bo) {
+    public AjaxResult<Map<String,Object>> exportErrorNew(@RequestBody List<UserSubscribeExport> bo) {
+        List<UserSubscribeExport> errorList = bo;
+        ExcelUtil<UserSubscribeExport> util = new ExcelUtil<UserSubscribeExport>(UserSubscribeExport.class);
+        String timeStr= LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        return util.exportEasyExcel(util.exportEasyData(errorList), "导出新增错误数据"+timeStr);
+    }
+
+    /**
+     * 导出前培错误数据
+     */
+    @ApiOperation("导出新增含考培错误数据")
+    @PreAuthorize("@ss.hasPermi('system:profile:export')")
+    @Log(title = "导出新增含考培错误数据", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportErrorTrain")
+    public AjaxResult<Map<String,Object>> exportErrorTrain(@RequestBody List<UserSubscribeTrainExport> bo) {
+        List<UserSubscribeTrainExport> errorList = bo;
+        ExcelUtil<UserSubscribeTrainExport> util = new ExcelUtil<UserSubscribeTrainExport>(UserSubscribeTrainExport.class);
+        String timeStr= LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        return util.exportEasyExcel(util.exportEasyData(errorList), "导出新增含考培错误数据"+timeStr);
+    }
+
+    /**
+     * 导出前培错误数据
+     */
+    @ApiOperation("导出前培错误数据")
+    @PreAuthorize("@ss.hasPermi('system:profile:export')")
+    @Log(title = "导出前培错误数据", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportErrorUpdate")
+    public AjaxResult<Map<String,Object>> exportErrorUpdate(@RequestBody List<UserSubscribeErrorImport> bo) {
         List<UserSubscribeErrorImport> errorList = bo;
         ExcelUtil<UserSubscribeErrorImport> util = new ExcelUtil<UserSubscribeErrorImport>(UserSubscribeErrorImport.class);
         String timeStr= LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-        return util.exportEasyExcel(util.exportEasyData(errorList), "导出错误数据"+timeStr);
+        return util.exportEasyExcel(util.exportEasyData(errorList), "导出登记错误数据"+timeStr);
     }
 }

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

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.exam.bo;
 
+import com.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -93,4 +94,10 @@ public class ExamApplyQueryBo extends BaseEntity {
 	/** 班级ID */
 	@ApiModelProperty("班级ID")
 	private Long gradeId;
+
+	/** 考试地点 */
+	@Excel(name = "*考试地点")
+	private String applySiteAddress;
+
+
 }

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

@@ -61,4 +61,6 @@ public interface ExamApplyMapper extends BaseMapper<ExamApply> {
 
     Long userStatusTrain(@Param("userId") Long userId,@Param("examTime") Long examTime,@Param("startTime") String startTime,@Param("endTime") String endTime);
 
+    Long checkSiteHave(ExamApplyQueryBo bo);
+
 }

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

@@ -691,6 +691,17 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 continue;
             }
 
+            ExamApplyQueryBo queryBo = new ExamApplyQueryBo();
+            queryBo.setApplyId(applyId);
+            queryBo.setApplySiteAddress(userSubscribeImport.getApplySiteAddress());
+            Long siteNum = examApplyMapper.checkSiteHave(queryBo);
+            if (Validator.isEmpty(siteNum)) {
+                userSubscribeImport.setCause("考试地点不存在");
+                userSubscribeImports.add(userSubscribeImport);
+                continue;
+            }
+
+
             if (userSubscribeImport.getApplySiteExamTime() != null) {
                 userSubscribeAddBo.setApplySiteExamTime(Convert.toLong(DateUtils.dateTime("yyyy/MM/dd",userSubscribeImport.getApplySiteExamTime()).getTime())/1000);
             } else {
@@ -723,6 +734,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             if (StringUtils.isEmpty(userSubscribeImport.getApplySiteAddressTrain())|| Validator.isEmpty(userSubscribeImport.getApplySiteExamTrainTime())|| Validator.isEmpty(userSubscribeImport.getApplySiteTime())) {
                 userSubscribeImport.setCause("考培数据错误");
                 userSubscribeImports.add(userSubscribeImport);
+                continue;
             }
             userSubscribeAddBo.setApplySiteAddressTrain(userSubscribeImport.getApplySiteAddressTrain());
 

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

@@ -30,13 +30,15 @@ public class UserSubscribeErrorImport {
 	@Excel(name = "*考试标题")
 	private String applyName;
 
-	@Excel(name = "*考试日期")
-	private String applySiteExamTime;
 
 	/** 考试地点 */
 	@Excel(name = "*考试地点")
 	private String applySiteAddress;
 
+
+	@Excel(name = "*考试日期")
+	private String applySiteExamTime;
+
 	/** 考试开始时间段 */
 	@Excel(name = "*考试时间段")
 	private String applySiteTime;
@@ -49,17 +51,6 @@ public class UserSubscribeErrorImport {
 	@Excel(name = "*商品名称")
 	private String goodsName;
 
-
-	/** 1非补考学员 2补考学员 */
-	@Excel(name = "*学员报名类型")
-	private String studentTypeName;
-
-	@Excel(name = "前培标题")
-	private String beforeName;
-
-	@Excel(name = "前培标记")
-	private String beforeStatus;
-
 	@Excel(name = "*考培地点")
 	private String applySiteAddressTrain;
 
@@ -69,23 +60,6 @@ public class UserSubscribeErrorImport {
 	@Excel(name = "*考培时间段")
 	private String applySiteTrainTime;
 
-	/** 1正常 2取消 */
-	@Excel(name = "*预约状态")
-	private String subscribeStatus;
-
-	@Excel(name = "*考试登记")
-	private String examStatus;
-
-	@Excel(name = "考试成绩")
-	private BigDecimal performance;
-
-	/** 1通过 0不通过 */
-	@Excel(name = "考试结果")
-	private String result;
-
-	@Excel(name = "证书编号")
-	private String certificateCode;
-
 	@Excel(name = "失败原因")
 	private String cause;
 }

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

@@ -53,4 +53,7 @@ public class UserSubscribeExport {
 	@Excel(name = "*商品名称",width = 30)
 	private String goodsName;
 
+	@Excel(name = "失败原因")
+	private String cause;
+
 }

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

@@ -59,4 +59,7 @@ public class UserSubscribeTrainExport {
 	@Excel(name = "*考培时间段",width = 30)
 	private String applySiteTrainTime;
 
+	@Excel(name = "失败原因")
+	private String cause;
+
 }

zhongzheng-system/src/main/resources/mapper/modules/exam/ExamApplyMapper.xml

@@ -382,4 +382,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND us.apply_site_start_train_time =#{startTime}
           AND us.apply_site_end_train_time =#{endTime}
     </select>
+
+    <select id="checkSiteHave" parameterType="com.zhongzheng.modules.exam.bo.ExamApplyQueryBo" resultType="long">
+        SELECT
+            COUNT( 1 )
+            FROM
+            exam_apply_site eas
+                LEFT JOIN exam_site es ON es.site_id = eas.site_id
+        WHERE
+            1=1
+        <if test="siteAddress != null and siteAddress != ''">
+            AND es.site_address = #{siteAddress}
+        </if>
+        <if test="applyId != null and applyId != ''">
+            AND eas.apply_id = #{applyId}
+        </if>
+    </select>
 </mapper>