diff --git a/mt/src/main/java/com/ccsens/mt/api/ExcelController.java b/mt/src/main/java/com/ccsens/mt/api/ExcelController.java index 9768148a..80ea10e5 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ExcelController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ExcelController.java @@ -117,9 +117,9 @@ public class ExcelController { @MustLogin @ApiOperation(value = "日程安排（导出）", notes = "") @RequestMapping(value = "/schedulePlanning", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse schedulePlanning(@ApiParam @Validated @RequestBody QueryDto params) { + public JsonResponse schedulePlanning(@ApiParam @Validated @RequestBody QueryDto params) { log.info("日程安排更新：{}",params); - TableVo.SchedulePlan schedulePlanDetailAllInList = excelService.schedulePlanning(params.getParam()); - return JsonResponse.newInstance().ok(schedulePlanDetailAllInList); + List schedulePlanDetailList = excelService.schedulePlanning(params.getParam()); + return JsonResponse.newInstance().ok(schedulePlanDetailList); } } diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java index 48fec61e..6b7698ff 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java @@ -180,13 +180,25 @@ public class TableVo { } + @Data + @ApiModel("日程安排上下午") + public static class SchedulePlanAll{ + @ApiModelProperty("项目所属日期") + private List schedulePlanList; + + } + @Data @ApiModel("日程安排上下午") public static class SchedulePlan{ + @ApiModelProperty("项目所属日期") + private String date; @ApiModelProperty("安排详情上午") - private List schedulePlanDetailListUp; + private List schedulePlanDetailListMorning; @ApiModelProperty("安排详情下午") - private List schedulePlanDetailListDown; + private List schedulePlanDetailListAfternoon; + @ApiModelProperty("安排详情晚上") + private List schedulePlanDetailListNight; } @Data @@ -194,21 +206,13 @@ public class TableVo { public static class SchedulePlanDetail{ @ApiModelProperty("参赛项目") private String projectName; - @ApiModelProperty("项目开始时间") + @ApiModelProperty("上午项目开始时间") private Long startTime; @ApiModelProperty("项目结束时间") private Long endTime; - @ApiModelProperty("项目所属日期") - private Long data; } - @Data - @ApiModel("日程安排组合") - public static class SchedulePlanDetailAllIn{ - @ApiModelProperty("字符拼接") - private String string; - @ApiModelProperty("项目所属日期") - private String data; - } + + } diff --git a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java index 6e9cd59c..24fc463a 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -1292,50 +1292,55 @@ public class ExcelService implements IExcelService { } @Override - public TableVo.SchedulePlan schedulePlanning(CompeteDto.CompeteTime params) { - List schedulePlanDetailListUp = new ArrayList<>(); - List schedulePlanDetailListDown = new ArrayList<>(); + public List schedulePlanning(CompeteDto.CompeteTime params) { + List schedulePlanDetailListMorning = new ArrayList<>(); + List schedulePlanDetailListAfternoon = new ArrayList<>(); + List schedulePlanDetailListNight = new ArrayList<>(); +// List schedulePlanList = new ArrayList<>(); //关联查询项目名，该项目在config和project中都存在 List schedulePlanDetailList = competeProjectConfigDao.selectDetail(); - TableVo.SchedulePlan schedulePlan = new TableVo.SchedulePlan(); - if (CollectionUtil.isNotEmpty(schedulePlanDetailList)) { - for (TableVo.SchedulePlanDetail schedulePlanDetail : schedulePlanDetailList) { - //项目名 - String projectName = schedulePlanDetail.getProjectName(); - //开始时间yyyy-MM-dd HH:mm:ss - long startTime = schedulePlanDetail.getStartTime(); - Date date = new Date(startTime); - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm"); - String sm = simpleDateFormat.format(date); - //结束时间 - long endTime = schedulePlanDetail.getEndTime(); - Date date1 = new Date(endTime); - SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("HH:mm"); - String em = simpleDateFormat1.format(date1); - //拼接 - String string = projectName + "(" + sm + "-" + em + ")"; - //项目开始日期 - SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("MM-dd"); - String md = simpleDateFormat2.format(date); - //上午项目 - if (Integer.parseInt(sm.substring(0, 2)) >= 6 && Integer.parseInt(sm.substring(0, 2)) <= 12) { - TableVo.SchedulePlanDetailAllIn schedulePlanDetailAllIn = new TableVo.SchedulePlanDetailAllIn(); - schedulePlanDetailAllIn.setData(md); - schedulePlanDetailAllIn.setString(string); - schedulePlanDetailListUp.add(schedulePlanDetailAllIn); - }//下午项目 - else if (Integer.parseInt(sm.substring(0, 2)) > 12 && Integer.parseInt(sm.substring(0, 2)) <= 18) { - TableVo.SchedulePlanDetailAllIn schedulePlanDetailAllIn1 = new TableVo.SchedulePlanDetailAllIn(); - schedulePlanDetailAllIn1.setData(md); - schedulePlanDetailAllIn1.setString(string); - schedulePlanDetailListDown.add(schedulePlanDetailAllIn1); - } - } - schedulePlan.setSchedulePlanDetailListDown(schedulePlanDetailListDown); - schedulePlan.setSchedulePlanDetailListUp(schedulePlanDetailListUp); - } - return schedulePlan; +// TableVo.SchedulePlanAll schedulePlanAll = new TableVo.SchedulePlanAll(); +// Set set = new HashSet(); +// if (CollectionUtil.isNotEmpty(schedulePlanDetailList)) { +// for (TableVo.SchedulePlanDetail schedulePlanDetail : schedulePlanDetailList) { +// //开始时间yyyy-MM-dd HH:mm:ss +// long startTime = schedulePlanDetail.getStartTime(); +// Date date = new Date(startTime); +// SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); +// String sm = simpleDateFormat.format(date); +// set.add(sm); +// //结束时间 +// long endTime = schedulePlanDetail.getEndTime(); +// Date date1 = new Date(endTime); +// SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("HH:mm"); +// String em = simpleDateFormat1.format(date1); + //当前项目开始日期 +// SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("MM-dd"); +// String sd = simpleDateFormat2.format(date); +// //上个项目开始日期 +// TableVo.SchedulePlanDetail schedulePlanDetail1 = schedulePlanDetailList.get(1); +// long startTime1 = schedulePlanDetail.getStartTime(); +// Date date1 = new Date(startTime); +// String sd1 = simpleDateFormat2.format(date1); + //上午项目 +// if (Integer.parseInt(sm.substring(0, 2)) >= 6 && Integer.parseInt(sm.substring(0, 2)) <= 12) { +// schedulePlanDetailListMorning.add(schedulePlanDetail); +// for (TableVo.SchedulePlanDetail schedulePlanDetail1 :schedulePlanDetailListMorning){ +// +// } +// }//下午项目 +// else if (Integer.parseInt(sm.substring(0, 2)) > 12 && Integer.parseInt(sm.substring(0, 2)) <= 18) { +// schedulePlanDetailListAfternoon.add(schedulePlanDetail); +// }//晚上 +// else if (Integer.parseInt(sm.substring(0, 2)) > 18 && Integer.parseInt(sm.substring(0, 2)) <= 24){ +// schedulePlanDetailListNight.add(schedulePlanDetail); +// } +// } +// +// +// } + return schedulePlanDetailList; } } diff --git a/mt/src/main/java/com/ccsens/mt/service/IExcelService.java b/mt/src/main/java/com/ccsens/mt/service/IExcelService.java index b941bda3..29fb90a6 100644 --- a/mt/src/main/java/com/ccsens/mt/service/IExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/IExcelService.java @@ -82,6 +82,6 @@ public interface IExcelService { * @param params 大赛id * @return 返回失败的信息 */ - TableVo.SchedulePlan schedulePlanning(CompeteDto.CompeteTime params); + List schedulePlanning(CompeteDto.CompeteTime params); } diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml index bb4152df..86c4dd88 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml @@ -31,17 +31,47 @@ + + + + + + + + + + + + + + - + SELECT + FROM_UNIXTIME(start_time/1000,'%y-%m-%d') as startDate, + if(a.aa = 1,p.`name`,null) as projectName, + if(a.aa = 0,p.`name`,null) as projectNamep, + if(a.aa = 1,c.start_time,null) as start_time, + if(a.aa = 0,c.start_time,null) as start_timeP, + if(a.aa = 1,c.end_time,null) as endTime, + if(a.aa = 0,c.end_time,null) as endTimeP + + FROM + `t_compete_project_config` c + LEFT JOIN t_compete_project p on c.project_id = p.id + LEFT JOIN ( + SELECT + id, + if(FROM_UNIXTIME(start_time/1000,'%h') <= 5,1 ,0) as aa + FROM + t_compete_project_config + )a on c.id = a.id + where c.project_id = p.id + ORDER BY c.start_time