|
@@ -2,7 +2,10 @@ package com.zhongzheng.controller.user;
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.lang.Validator;
|
|
|
+import com.alibaba.fastjson.JSONArray;
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
|
|
|
import com.zhongzheng.common.annotation.Log;
|
|
|
import com.zhongzheng.common.core.controller.BaseController;
|
|
|
import com.zhongzheng.common.core.domain.AjaxResult;
|
|
@@ -10,7 +13,10 @@ import com.zhongzheng.common.core.page.TableDataInfo;
|
|
|
import com.zhongzheng.common.enums.BusinessType;
|
|
|
import com.zhongzheng.common.utils.DateUtils;
|
|
|
import com.zhongzheng.common.utils.poi.ExcelUtil;
|
|
|
+import com.zhongzheng.modules.exam.bo.ExamApplySiteTimeTwoAddBo;
|
|
|
+import com.zhongzheng.modules.exam.domain.ExamApplySiteTime;
|
|
|
import com.zhongzheng.modules.exam.service.IExamApplyGoodsService;
|
|
|
+import com.zhongzheng.modules.exam.service.IExamApplySiteTimeService;
|
|
|
import com.zhongzheng.modules.exam.vo.ExamSessionVo;
|
|
|
import com.zhongzheng.modules.user.bo.*;
|
|
|
import com.zhongzheng.modules.user.service.IUserExamGoodsService;
|
|
@@ -49,6 +55,8 @@ public class UserSubscribeController extends BaseController {
|
|
|
|
|
|
private final IExamApplyGoodsService iExamApplyGoodsService;
|
|
|
|
|
|
+ private final IExamApplySiteTimeService iExamApplySiteTimeService;
|
|
|
+
|
|
|
/**
|
|
|
* 查询用户预约考试列表
|
|
|
*/
|
|
@@ -211,6 +219,9 @@ public class UserSubscribeController extends BaseController {
|
|
|
String timeStr= LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
|
|
|
// map.put("goodsExcel",goodsUtil.exportEasyExcel(goodsUtil.exportEasyData(goodsList), bo.getApplyName()+"商品列表"+timeStr));
|
|
|
|
|
|
+ ExamApplySiteTime siteTime = iExamApplySiteTimeService.getOne(new LambdaQueryWrapper<ExamApplySiteTime>()
|
|
|
+ .eq(ExamApplySiteTime::getApplyId, bo.getApplyId())
|
|
|
+ .last("limit 1"));
|
|
|
if(Validator.isEmpty(bo.getApplySiteAddressTrain())){
|
|
|
UserSubscribeExport export = new UserSubscribeExport();
|
|
|
export.setRemark("导入时,请把示例删除");
|
|
@@ -218,8 +229,17 @@ public class UserSubscribeController extends BaseController {
|
|
|
export.setIdCard("44086921356895125365");
|
|
|
export.setApplyName(bo.getApplyName());
|
|
|
export.setApplySiteAddress(bo.getApplySiteAddress());
|
|
|
- export.setApplySiteExamTime("2021/10/21");
|
|
|
- export.setApplySiteTime("9:00-12:00");
|
|
|
+ if (ObjectUtils.isNotNull(siteTime)){
|
|
|
+ List<ExamApplySiteTimeTwoAddBo> siteTimeTwoAddBos = JSONArray.parseArray(siteTime.getSiteTime(), ExamApplySiteTimeTwoAddBo.class);
|
|
|
+ if (CollectionUtils.isNotEmpty(siteTimeTwoAddBos)){
|
|
|
+ ExamApplySiteTimeTwoAddBo twoAddBo = siteTimeTwoAddBos.get(0);
|
|
|
+ export.setApplySiteTime(String.format("%s-%s",twoAddBo.getStartTime(),twoAddBo.getEndTime()));
|
|
|
+ }
|
|
|
+ export.setApplySiteExamTime(DateUtils.timestampToDateFormat(siteTime.getExamTime(),"yyyy/MM/dd"));
|
|
|
+ }else {
|
|
|
+ export.setApplySiteExamTime("2021/10/21");
|
|
|
+ export.setApplySiteTime("9:00-12:00");
|
|
|
+ }
|
|
|
export.setMajorName("土建质量员");
|
|
|
// export.setCode("SP6415428604");
|
|
|
// export.setGoodsName("一级建造师继续教育(必修课+机电工程)");
|
|
@@ -242,8 +262,17 @@ public class UserSubscribeController extends BaseController {
|
|
|
export.setGoodsName("一级建造师继续教育(必修课+机电工程)");
|
|
|
|
|
|
export.setApplySiteAddressTrain(bo.getApplySiteAddressTrain());
|
|
|
- export.setApplySiteExamTrainTime("2021/10/21");
|
|
|
- export.setApplySiteTrainTime("9:00-12:00");
|
|
|
+ if (ObjectUtils.isNotNull(siteTime)){
|
|
|
+ List<ExamApplySiteTimeTwoAddBo> siteTimeTwoAddBos = JSONArray.parseArray(siteTime.getSiteTime(), ExamApplySiteTimeTwoAddBo.class);
|
|
|
+ if (CollectionUtils.isNotEmpty(siteTimeTwoAddBos)){
|
|
|
+ ExamApplySiteTimeTwoAddBo twoAddBo = siteTimeTwoAddBos.get(0);
|
|
|
+ export.setApplySiteTime(String.format("%s-%s",twoAddBo.getStartTime(),twoAddBo.getEndTime()));
|
|
|
+ }
|
|
|
+ export.setApplySiteExamTime(DateUtils.timestampToDateFormat(siteTime.getExamTime(),"yyyy/MM/dd"));
|
|
|
+ }else {
|
|
|
+ export.setApplySiteExamTime("2021/10/21");
|
|
|
+ export.setApplySiteTime("9:00-12:00");
|
|
|
+ }
|
|
|
|
|
|
List<UserSubscribeTrainExport> list = new ArrayList<>();
|
|
|
list.add(export);
|