fix 导出错误

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

@@ -291,4 +291,18 @@ public class UserSubscribeController extends BaseController {
         ExcelUtil<UserSubscribeExportVo> util = new ExcelUtil<UserSubscribeExportVo>(UserSubscribeExportVo.class);
         return util.exportEasyExcel(util.exportEasyData(eList), bo.getApplyName()+"登记数据"+timeStr);
     }
+
+    /**
+     * 导出新增预约模板
+     */
+    @ApiOperation("导出新增错误预约")
+    @PreAuthorize("@ss.hasPermi('system:profile:export')")
+    @Log(title = "导出新增错误预约", businessType = BusinessType.EXPORT)
+    @GetMapping("/exportErrorNew")
+    public AjaxResult<Map<String,Object>> exportErrorNew(UserSubscribeExportErrorBo bo) {
+        List<UserSubscribeImport> errorList = bo.getList();
+        ExcelUtil<UserSubscribeImport> util = new ExcelUtil<UserSubscribeImport>(UserSubscribeImport.class);
+        String timeStr= LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        return util.exportEasyExcel(util.exportEasyData(errorList), "新增预约错误数据"+timeStr);
+    }
 }

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

@@ -0,0 +1,27 @@
+package com.zhongzheng.modules.user.bo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.zhongzheng.common.core.domain.BaseEntity;
+import com.zhongzheng.modules.user.vo.UserSubscribeImport;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+/**
+ * 用户预约考试分页查询对象 user_subscribe
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("用户预约考试导出模板对象")
+public class UserSubscribeExportErrorBo extends BaseEntity {
+
+	@ApiModelProperty("错误数组")
+	List<UserSubscribeImport> list;
+}

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

@@ -142,7 +142,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
         String dateString = formatter.format(times);
         String dateForma =null;
-        dateForma = dateString+" "+add.getApplySiteStartTime();
+        dateForma = dateString+" "+add.getApplySiteStartTime().replace("-", ":");
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
         Long time = sdf.parse(dateForma).getTime() / 1000;
         if (System.currentTimeMillis()/1000 > time){
@@ -168,7 +168,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
         String dateString = formatter.format(times);
         String dateForma =null;
-        dateForma = dateString+" "+add.getApplySiteStartTime();
+        dateForma = dateString+" "+add.getApplySiteStartTime().replace("-", ":");
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
         Long time = sdf.parse(dateForma).getTime() / 1000;
         if (System.currentTimeMillis()/1000 > time){

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

@@ -1,6 +1,6 @@
 package com.zhongzheng.modules.user.vo;
 
-import com.zhongzheng.common.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;