11-11-4

5 years ago · 99cd3aeb43
7 changed files with 104 additions and 3 deletions
--- a/mt/src/main/java/com/ccsens/mt/api/ExcelController.java
+++ b/mt/src/main/java/com/ccsens/mt/api/ExcelController.java
@ -101,12 +101,20 @@ public class ExcelController {
    @MustLogin
    @ApiOperation(value = "xxx大赛报名表（查询）", notes = "")
    @RequestMapping(value = "/enterInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<TableVo.DailyScheduleProcess> getEnterInfo(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteTime> params) {
+    public JsonResponse<TableVo.CompeteJoin> getEnterInfo(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteTime> params) {
        log.info("日程安排更新：{}",params);
        List<TableVo.CompeteJoin> competeJoinList = excelService.getCompeteJoinDetail(params.getParam());
        return JsonResponse.newInstance().ok(competeJoinList);
    }

+    @MustLogin
+    @ApiOperation(value = "日程安排（导出）", notes = "")
+    @RequestMapping(value = "/schedulePlanning", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<TableVo.SchedulePlanDetailAllIn> schedulePlanning(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteTime> params) {
+        log.info("日程安排更新：{}",params);
+        TableVo.SchedulePlan schedulePlanDetailAllInList = excelService.schedulePlanning(params.getParam());
+        return JsonResponse.newInstance().ok(schedulePlanDetailAllInList);
+    }


 }
--- a/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java
+++ b/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java
@ -134,7 +134,38 @@ public class TableVo {
        private Long startTime;
        @ApiModelProperty("项目结束时间")
        private Long endTime;
+    }
+
+
+    @Data
+    @ApiModel("日程安排上下午")
+    public  static  class SchedulePlan{
+        @ApiModelProperty("安排详情上午")
+        private List<SchedulePlanDetailAllIn> schedulePlanDetailListUp;
+        @ApiModelProperty("安排详情下午")
+        private List<SchedulePlanDetailAllIn> schedulePlanDetailListDown;
+    }

+    @Data
+    @ApiModel("日程安排")
+    public  static  class SchedulePlanDetail{
+        @ApiModelProperty("参赛项目")
+        private String projectName;
+        @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;
+
+    }
 }
--- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java
+++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java
@ -2,6 +2,7 @@ package com.ccsens.mt.persist.dao;

 import com.ccsens.mt.bean.po.CompeteProjectConfig;
 import com.ccsens.mt.bean.po.CompeteProjectConfigExample;
+import com.ccsens.mt.bean.vo.TableVo;
 import com.ccsens.mt.persist.mapper.CompeteProjectConfigMapper;
 import org.apache.ibatis.annotations.Param;

@ -14,5 +15,5 @@ import java.util.List;
 */
 public interface CompeteProjectConfigDao extends CompeteProjectConfigMapper {
    CompeteProjectConfig selectByProjectId(@Param("projectId") Long projectId);
-
+    List<TableVo.SchedulePlanDetail> selectDetail ();
 }
--- a/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteProjectMapper.java
+++ b/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteProjectMapper.java
@ -3,6 +3,8 @@ package com.ccsens.mt.persist.mapper;
 import com.ccsens.mt.bean.po.CompeteProject;
 import com.ccsens.mt.bean.po.CompeteProjectExample;
 import java.util.List;
+
+import com.ccsens.mt.bean.vo.TableVo;
 import org.apache.ibatis.annotations.Param;

 public interface CompeteProjectMapper {
@ -27,4 +29,6 @@ public interface CompeteProjectMapper {
    int updateByPrimaryKeySelective(CompeteProject record);

    int updateByPrimaryKey(CompeteProject record);
+
+
 }
--- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java
+++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java
@ -19,6 +19,7 @@ import com.ccsens.util.exception.BaseException;
 import com.ctc.wstx.util.DataUtil;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.time.DateUtils;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.stereotype.Service;
@ -32,6 +33,7 @@ import java.io.OutputStream;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.GregorianCalendar;
 import java.util.List;

@Slf4j
@ -1065,7 +1067,49 @@ public class ExcelService implements IExcelService {
        return competeJoinList;
    }

-
+    @Override
+    public TableVo.SchedulePlan schedulePlanning(CompeteDto.CompeteTime params) {
+        List<TableVo.SchedulePlanDetailAllIn> schedulePlanDetailListUp = new ArrayList<>();
+        List<TableVo.SchedulePlanDetailAllIn> schedulePlanDetailListDown = new ArrayList<>();
+        //关联查询项目名，该项目在config和project中都存在
+        List <TableVo.SchedulePlanDetail> schedulePlanDetailList  = competeProjectConfigDao.selectDetail();
+        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);
+            }
+        }
+        TableVo.SchedulePlan schedulePlan = new TableVo.SchedulePlan();
+        schedulePlan.setSchedulePlanDetailListDown(schedulePlanDetailListDown);
+        schedulePlan.setSchedulePlanDetailListUp(schedulePlanDetailListUp);
+        return schedulePlan;
+    }


 }
--- a/mt/src/main/java/com/ccsens/mt/service/IExcelService.java
+++ b/mt/src/main/java/com/ccsens/mt/service/IExcelService.java
@ -74,6 +74,12 @@ public interface IExcelService {
     */
    List<TableVo.DailyScheduleProcess> updateAndSearch(ProvinceCompeteDto.UpdateAndSearchList params);

+    /**
+     * 更新并查询
+     * @param  params 大赛id
+     * @return 返回失败的信息
+     */
+    TableVo.SchedulePlan schedulePlanning(CompeteDto.CompeteTime params);



--- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml
+++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml
@ -17,4 +17,11 @@
    where project_id = #{projectId}
    and rec_status = 0
  </select>
+  <select id="selectDetail" resultType="com.ccsens.mt.bean.vo.TableVo$SchedulePlanDetail" parameterType="java.util.Map">
+    SELECT a.start_time as startTime,
+    a.end_time as endTime,
+    b.name as projectName
+    FROM  t_compete_project_config a , t_compete_project b
+    where a.project_id = b.id
+  </select>
 </mapper>