Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

mt/src/main/java/com/ccsens/mt/api/ExcelController.java

@@ -81,6 +81,13 @@ public class ExcelController {
     }
 
     @MustLogin
+    @ApiOperation(value = "比赛出场顺序", notes = "")
+    @RequestMapping(value = "/competitionOrder", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<String> competitionOrder(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteTime> params) throws IOException {
+        log.info("导出比赛出场顺序：{}",params);
+        String path = excelService.iCompetitionOrderService(params);
+        return JsonResponse.newInstance().ok(path);
+    }
     @ApiOperation(value = "日程安排中间表（查询）", notes = "")
     @RequestMapping(value = "/dailyScheduleProcess", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<TableVo.DailyScheduleProcess> dailyScheduleProcess(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteTime> params) {
@@ -107,6 +114,12 @@ public class ExcelController {
         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);
+    }
 }

mt/src/main/java/com/ccsens/mt/bean/vo/CompeteExcelVo.java

@@ -0,0 +1,62 @@
+package com.ccsens.mt.bean.vo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CompeteExcelVo {
+    @Data
+    @ApiModel("顺序表")
+    public static class TeamOrderPlayer {
+        @ApiModelProperty("组别id")
+        private String groupId;
+        @ApiModelProperty("组别名")
+        private String groupName;
+        @ApiModelProperty("单位信息")
+        private List<TeamOrderPlayerList> companyNameList;
+    }
+
+
+    @Data
+    @ApiModel("顺序表")
+    public static class TeamOrderPlayerList {
+        @ApiModelProperty("团队id")
+        private Long teamId;
+        @ApiModelProperty("单位名称")
+        private String companyName;
+        @ApiModelProperty("团队选手名字")
+        private String playerNames;
+    }
+
+    @Data
+    @ApiModel("所有项目")
+    public static class AllProject{
+        @ApiModelProperty("项目id")
+        private Long id;
+        @ApiModelProperty("项目名字")
+        private String projectName;
+        @ApiModelProperty("开始时间Long")
+        private Long startTime;
+        @ApiModelProperty("开始时间Str")
+        private String startTimeStr;
+        @ApiModelProperty("结束时间Long")
+        private Long endTime;
+        @ApiModelProperty("结束时间Str")
+        private String endTimeStr;
+        @ApiModelProperty("组别大小")
+        private int size;
+        @ApiModelProperty("是否为团队项目，0不是 1是")
+        private Byte team;
+        @ApiModelProperty("项目场地数量")
+        private int siteNum;
+        @ApiModelProperty("项目信息")
+        private List<TeamOrderPlayer> projectList;
+        @ApiModelProperty("月/日 上/下午")
+        private String year;
+    }
+}

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;
+
+    }
 }

mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java

@@ -3,6 +3,7 @@ package com.ccsens.mt.persist.dao;
 import com.ccsens.mt.bean.dto.ProvinceCompeteDto;
 import com.ccsens.mt.bean.po.CompeteCoach;
 import com.ccsens.mt.bean.po.CompeteCompany;
+import com.ccsens.mt.bean.vo.CompeteExcelVo;
 import com.ccsens.mt.bean.vo.CompeteVo;
 import com.ccsens.mt.bean.vo.ProvinceCompeteVo;
 import com.ccsens.mt.persist.mapper.CompeteCompanyMapper;
@@ -141,5 +142,6 @@ public interface CompeteCompanyDao extends CompeteCompanyMapper {
     int getTeamNumByPlayerIdAndGroup(@Param("competeTimeId")Long competeTimeId, @Param("playerId")Long playerId, @Param("projectId")Long projectId,
                                      @Param("companyId")Long companyId, @Param("gender")int gender, @Param("groupRemark")int groupRemark);
 
+    List<CompeteExcelVo.AllProject> selectProjectByType(Long id);
     List<ProvinceCompeteVo.PlayerInfoByGroup> queryPlayersByTeamProject(@Param("companyId")Long companyId, @Param("projectId")Long projectId);
 }

mt/src/main/java/com/ccsens/mt/persist/dao/CompetePlayerDao.java

@@ -1,6 +1,8 @@
 package com.ccsens.mt.persist.dao;
 
+import com.ccsens.mt.bean.po.CompeteGroup;
 import com.ccsens.mt.bean.po.CompetePlayer;
+import com.ccsens.mt.bean.vo.CompeteExcelVo;
 import com.ccsens.mt.bean.vo.CompeteVo;
 import com.ccsens.mt.bean.vo.ProvinceCompeteVo;
 import com.ccsens.mt.bean.vo.TableVo;
@@ -73,4 +75,7 @@ public interface CompetePlayerDao extends CompetePlayerMapper {
     List<TableVo.CompeteAllCount> getTeamJoinNumByType(@Param("timeId")Long timeId);
 
     List<Integer> getTeamJoinNumByProjectId(@Param("projectId")Long projectId);
+
+    CompeteGroup selectBySexAndRemark(int gender, int groupRemark);
+    List<CompeteExcelVo.TeamOrderPlayer> selectSinglePlayerByProjectId(Long id);
 }

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 ();
 }

mt/src/main/java/com/ccsens/mt/persist/dao/CompeteTeamDao.java

@@ -1,5 +1,6 @@
 package com.ccsens.mt.persist.dao;
 
+import com.ccsens.mt.bean.vo.CompeteExcelVo;
 import com.ccsens.mt.bean.vo.CompeteVo;
 import com.ccsens.mt.persist.mapper.CompeteTeamMapper;
 import org.apache.ibatis.annotations.Param;
@@ -80,4 +81,6 @@ public interface CompeteTeamDao extends CompeteTeamMapper {
      * @return
      */
     List<CompeteVo.PlayerInfoByProject> getPlayerByProjectId(@Param("competeProjectId")Long competeProjectId, @Param("competeTimeId")Long competeTimeId);
+
+    List<CompeteExcelVo.TeamOrderPlayer> selectTeamMemberByProjectId(Long id);
 }

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);
+
+
 }

mt/src/main/java/com/ccsens/mt/service/ExcelService.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.ccsens.mt.bean.dto.CompeteDto;
 import com.ccsens.mt.bean.dto.ProvinceCompeteDto;
 import com.ccsens.mt.bean.po.*;
+import com.ccsens.mt.bean.vo.CompeteExcelVo;
 import com.ccsens.mt.bean.vo.TableVo;
 import com.ccsens.mt.persist.dao.*;
 import com.ccsens.mt.persist.mapper.*;
@@ -19,19 +20,26 @@ import com.ccsens.util.exception.BaseException;
 import com.ctc.wstx.util.DataUtil;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.map.HashedMap;
+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;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.unit.DataUnit;
+
 import javax.annotation.Resource;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.text.SimpleDateFormat;
+import java.util.*;
+
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.GregorianCalendar;
 import java.util.List;
 
 @Slf4j
@@ -57,6 +65,8 @@ public class ExcelService implements IExcelService {
     @Resource
     private CompeteGroupMapper competeGroupMapper;
     @Resource
+    private CompeteProjectConfigMapper competeProjectConfigMapper;
+    @Resource
     private CommonFileMapper commonFileMapper;
     @Resource
     private IProvinceService provinceService;
@@ -649,6 +659,184 @@ public class ExcelService implements IExcelService {
         return path;
     }
 
+    /**
+     * 导出出场顺序表
+     * @param params
+     * @return
+     */
+    @Override
+    public String iCompetitionOrderService(QueryDto<CompeteDto.CompeteTime> params) {
+        List<CompeteExcelVo.AllProject> competeProjectList= competeCompanyDao.selectProjectByType(params.getParam().getCompeteTimeId());
+        for (int i=0;i<competeProjectList.size();i++){
+            CompeteExcelVo.AllProject competeProject=competeProjectList.get(i);
+            SimpleDateFormat start=new SimpleDateFormat("HH:mm");
+            SimpleDateFormat end=new SimpleDateFormat("HH:mm");
+            SimpleDateFormat date=new SimpleDateFormat("MM-dd a");
+            String startStr=start.format(new Date(competeProject.getStartTime()));
+            competeProject.setStartTimeStr(startStr);
+
+            String endStr=end.format(new Date(competeProject.getEndTime()));
+            competeProject.setEndTimeStr(endStr);
+            String year=date.format(new Date(competeProject.getStartTime()));
+            competeProject.setYear(year);
+            int siteNum=competeProject.getSiteNum();
+            competeProject.setSiteNum(siteNum);
+            int size;
+            if(competeProject.getTeam().equals((byte) 0)){
+                List<CompeteExcelVo.TeamOrderPlayer> singleOrderPlayerList=competePlayerDao.selectSinglePlayerByProjectId(competeProject.getId());
+                size = singleOrderPlayerList.stream().mapToInt(singleOrderPlayer -> singleOrderPlayer.getCompanyNameList().size()).sum();
+                competeProject.setProjectList(singleOrderPlayerList);
+            }else {
+                List<CompeteExcelVo.TeamOrderPlayer>  teamOrderPlayerList= competeTeamDao.selectTeamMemberByProjectId(competeProject.getId());
+                size = teamOrderPlayerList.stream().mapToInt(teamOrderPlayer -> teamOrderPlayer.getCompanyNameList().size()).sum();
+                competeProject.setProjectList(teamOrderPlayerList);
+            }
+            competeProject.setSize(size);
+        }
+        String dasia=competeTimeDao.selectByPrimaryKey(params.getParam().getCompeteTimeId()).getName();
+        //创建excle表格对象
+        List<List<PoiUtil.PoiUtilCell>> biao = new ArrayList<>();
+        List<PoiUtil.PoiUtilCell> one = new ArrayList<>();
+        PoiUtil.PoiUtilCell yuandongyuan=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 6, 1);
+        yuandongyuan.setValue(dasia+"出场顺序表");
+        one.add(yuandongyuan);
+        biao.add(one);
+
+
+        for (int j=0 ;j<competeProjectList.size();j++){
+            List<PoiUtil.PoiUtilCell> three = new ArrayList<>();
+            PoiUtil.PoiUtilCell threeDate=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 6, 1);
+            if(j==0){
+                threeDate.setValue(competeProjectList.get(j).getYear());
+                three.add(threeDate);
+                biao.add(three);
+                List<PoiUtil.PoiUtilCell> two = new ArrayList<>();
+                PoiUtil.PoiUtilCell two1=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+                two1.setValue("时间");
+                PoiUtil.PoiUtilCell two2=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+                two2.setValue("项目");
+                PoiUtil.PoiUtilCell two3=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+                two3.setValue("组别");
+                PoiUtil.PoiUtilCell two4=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+                two4.setValue("场次/场地");
+                PoiUtil.PoiUtilCell two5=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+                two5.setValue("参赛单位");
+                PoiUtil.PoiUtilCell two6=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+                two6.setValue("参赛人员");
+                two.add(two1);
+                two.add(two2);
+                two.add(two3);
+                two.add(two4);
+                two.add(two5);
+                two.add(two6);
+                biao.add(two);
+            }else{
+                if (!competeProjectList.get(j).getYear().equals(competeProjectList.get(j-1).getYear())){
+                    threeDate.setValue(competeProjectList.get(j).getYear());
+                    three.add(threeDate);
+                    biao.add(three);
+                    List<PoiUtil.PoiUtilCell> two = new ArrayList<>();
+                    PoiUtil.PoiUtilCell two1=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+                    two1.setValue("时间");
+                    PoiUtil.PoiUtilCell two2=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+                    two2.setValue("项目");
+                    PoiUtil.PoiUtilCell two3=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+                    two3.setValue("组别");
+                    PoiUtil.PoiUtilCell two4=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+                    two4.setValue("场次/场地");
+                    PoiUtil.PoiUtilCell two5=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+                    two5.setValue("参赛单位");
+                    PoiUtil.PoiUtilCell two6=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+                    two6.setValue("参赛人员");
+                    two.add(two1);
+                    two.add(two2);
+                    two.add(two3);
+                    two.add(two4);
+                    two.add(two5);
+                    two.add(two6);
+                    biao.add(two);
+                }
+            }
+            //m行循环 是16次  k 是组次数得循环  4 次  n是组里面得循环
+            for(int k=0,m=0,n=0;m<competeProjectList.get(j).getSize();m++){
+                //代表一行
+                List<PoiUtil.PoiUtilCell> four = new ArrayList<>();
+                if(m==0){
+                    PoiUtil.PoiUtilCell fourOne=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, competeProjectList.get(j).getSize());
+                    fourOne.setValue(competeProjectList.get(j).getStartTimeStr()+"-"+competeProjectList.get(j).getEndTimeStr());
+                    four.add(fourOne);
+                    PoiUtil.PoiUtilCell fourTwo=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, competeProjectList.get(j).getSize());
+                    fourTwo.setValue(competeProjectList.get(j).getProjectName());
+                    four.add(fourTwo);
+                }else {
+                    four.add(new PoiUtil.PoiUtilCell());
+                    four.add(new PoiUtil.PoiUtilCell());
+                }
+
+                PoiUtil.PoiUtilCell fourThree=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, competeProjectList.get(j).getProjectList().get(k).getCompanyNameList().size());
+                if(n>0){
+                    fourThree=new PoiUtil.PoiUtilCell();
+                }else {
+                    fourThree.setValue(competeProjectList.get(j).getProjectList().get(k++).getGroupName());
+                    n++;
+                }
+                if(n==competeProjectList.get(j).getProjectList().get(k-1).getCompanyNameList().size()){
+                    n=0;
+                    //k++
+                }
+                four.add(fourThree);
+
+                PoiUtil.PoiUtilCell fourFour=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+                int x=competeProjectList.get(j).getTeam();
+                if(x<=0){
+                    x=2;
+                }
+                if((m+1)%x==0){
+                    fourFour.setValue(""+((m+1)/x)+"--"+x);
+                }else {
+                    fourFour.setValue(""+((m+1)/x+1)+"--"+((m+1)%x));
+                }
+                four.add(fourFour);
+                PoiUtil.PoiUtilCell fourFive=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+                if(n==0){
+                    log.info("j:{}, k:{}, n:{}", j,k,n);
+                    fourFive.setValue(competeProjectList.get(j).getProjectList().get(k-1).getCompanyNameList().get(n).getCompanyName());
+                }else {
+                    fourFive.setValue(competeProjectList.get(j).getProjectList().get(k-1).getCompanyNameList().get(n-1).getCompanyName());
+                }
+                four.add(fourFive);
+                PoiUtil.PoiUtilCell fourSix=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1);
+                if(n==0){
+                    fourSix.setValue(competeProjectList.get(j).getProjectList().get(k-1).getCompanyNameList().get(n).getPlayerNames());
+                }else {
+                    fourSix.setValue(competeProjectList.get(j).getProjectList().get(k-1).getCompanyNameList().get(n-1).getPlayerNames());
+                }
+                four.add(fourSix);
+                biao.add(four);
+            }
+        }
+
+        Workbook workbook = new XSSFWorkbook();
+        PoiUtil.exportWB("出场顺序",biao,workbook);
+        String filepath = "mt/" + DateUtil.today() + "/" + System.currentTimeMillis() + ".xlsx";
+        String path = PropUtil.path + filepath;
+        String path1="C:/d/"+filepath;//本地的路径
+        File tmpFile = new File(path);
+        if (!tmpFile.getParentFile().exists()) {
+            tmpFile.getParentFile().mkdirs();
+        }
+        File file = new File(path);
+        try {
+            OutputStream outputStream = new FileOutputStream(file);
+            workbook.write(outputStream);
+            outputStream.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return  PropUtil.domain + "file/download/know?path="+path;
+    }
+
+
 
 //    private List<TableVo.CompeteAllCount> competeAllCountList(CompeteDto.CompeteTime params){
 //        //根据大赛查类型
@@ -1065,7 +1253,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;
+    }
 
 
 }

mt/src/main/java/com/ccsens/mt/service/IExcelService.java

@@ -60,6 +60,9 @@ public interface IExcelService {
      */
     String competeAllCount(CompeteDto.CompeteTime params) throws IOException;
 
+
+    String iCompetitionOrderService(QueryDto<CompeteDto.CompeteTime> params);
+
     /**
      * 日程安排中间表
      * @param  params 大赛id
@@ -74,7 +77,11 @@ public interface IExcelService {
      */
     List<TableVo.DailyScheduleProcess> updateAndSearch(ProvinceCompeteDto.UpdateAndSearchList params);
 
-
-
+    /**
+     * 更新并查询
+     * @param  params 大赛id
+     * @return 返回失败的信息
+     */
+    TableVo.SchedulePlan schedulePlanning(CompeteDto.CompeteTime params);
 
 }

mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml

@@ -15,7 +15,14 @@
             <result column="memberMax" property="memberMax"/>
         </collection>
     </resultMap>
-
+    <resultMap id="projectMes" type="com.ccsens.mt.bean.vo.CompeteExcelVo$AllProject">
+        <id column="id" property="id"/>
+        <result column="team" property="team"/>
+        <result column="projectName" property="projectName" />
+        <result column="startTime" property="startTime" />
+        <result column="endTime" property="endTime" />
+        <result column="siteNum" property="siteNum" />
+    </resultMap>
     <resultMap id="group_player" type="com.ccsens.mt.bean.vo.ProvinceCompeteVo$GroupAndPlayer">
         <id column="groupId" property="groupId"/>
         <result column="groupName" property="groupName"/>
@@ -347,6 +354,24 @@
             and t.rec_status = 0
             and m.rec_status = 0
     </select>
+    <select id="selectProjectByType" resultMap="projectMes">
+         select
+             tcp.id as id,
+             tcp.name as projectName,
+             tcp.team as team,
+             tcpc.start_time as startTime,
+             tcpc.end_time as endTime,
+             tcpc.site_num as siteNum
+         FROM t_compete_project tcp
+         left JOIN t_compete_time tct on tcp.type=tct.type
+         left JOIN t_compete_project_config tcpc on  tcpc.project_id=tcp.id
+         where
+             tct.id=#{id} and
+             tcp.rec_status=0 and
+             tcpc.rec_status=0 and
+             tct.rec_status=0
+         ORDER BY tcpc.start_time
+    </select>
     <select id="queryPlayersByTeamProject" resultType="com.ccsens.mt.bean.vo.ProvinceCompeteVo$PlayerInfoByGroup">
         SELECT
         p.id as playerId,
@@ -361,5 +386,4 @@
             and m.rec_status = 0
             and p.rec_status = 0
     </select>
-
 </mapper>

mt/src/main/resources/mapper_dao/CompetePlayerDao.xml

@@ -30,7 +30,15 @@
         <collection property="nums" ofType="Integer" column="projectId" select="getTeamJoinNumByProjectId">
         </collection>
     </resultMap>
-
+    <resultMap id="singleOrderPlayer" type="com.ccsens.mt.bean.vo.CompeteExcelVo$TeamOrderPlayer">
+        <id column="groupId" property="groupId" />
+        <result column="groupName" property="groupName" />
+        <collection property="companyNameList" ofType="com.ccsens.mt.bean.vo.CompeteExcelVo$TeamOrderPlayerList">
+            <id column="companyId" property="teamId"/>
+            <result column="companyName" property="companyName"/>
+            <result column="playerName" property="playerNames"/>
+        </collection>
+    </resultMap>
     <select id="getInfo" resultType="com.ccsens.mt.bean.vo.CompeteVo$GetPlayerInfo">
           SELECT
             p.id AS playerId,
@@ -264,4 +272,32 @@
         and g.rec_status in (0,1)
         ORDER BY g.sequence
     </select>
+    <select id="selectBySexAndRemark" resultType="com.ccsens.mt.bean.po.CompeteGroup">
+        SELECT
+            tcg.`group_name` as groupName
+        FROM
+            t_compete_group tcg
+        WHERE
+            tcg.`sex`=#{sex}
+            and tcg.`group_remark`=#{remark}
+    </select>
+    <select id="selectSinglePlayerByProjectId" resultMap="singleOrderPlayer">
+        select
+             tcg.id as groupId,
+             tcg.group_name as groupName,
+             tcc.id as companyId,
+             tcc.name as companyName,
+		     tcp.name as playerName
+         FROM
+             t_compete_project_player tcpp
+             LEFT JOIN t_compete_player tcp on tcp.id=tcpp.player_id
+             LEFT JOIN t_compete_company tcc on tcp.company_id=tcc.id
+             LEFT JOIN t_compete_group tcg on tcg.id=tcp.compete_group_id
+         WHERE
+             tcpp.project_id=#{id}
+             and tcpp.rec_status=0
+             and tcp.rec_status=0
+             and tcc.rec_status=0
+             and tcg.rec_status=0
+    </select>
 </mapper>

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>

mt/src/main/resources/mapper_dao/CompeteTeamDao.xml

@@ -14,7 +14,15 @@
         <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
         <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
     </resultMap>
-
+    <resultMap id="teamOrderPlayer" type="com.ccsens.mt.bean.vo.CompeteExcelVo$TeamOrderPlayer">
+        <id column="groupId" property="groupId" />
+        <result column="groupName" property="groupName" />
+        <collection property="companyNameList" ofType="com.ccsens.mt.bean.vo.CompeteExcelVo$TeamOrderPlayerList">
+            <id column="teamId" property="teamId"/>
+            <result column="companyName" property="companyName"/>
+            <result column="playerNames" property="playerNames"/>
+        </collection>
+    </resultMap>
     <resultMap id="getTeamByProjectId" type="com.ccsens.mt.bean.vo.CompeteVo$TeamInfoByProject">
         <id column="teamId" property="teamId" />
         <result column="creatorId" property="creatorId" />
@@ -251,4 +259,25 @@
         and pp.rec_status = 0
         and p.rec_status = 0
     </select>
+    <select id="selectTeamMemberByProjectId" resultMap="teamOrderPlayer">
+        SELECT
+        tcg.id as groupId,
+        tct.id as teamId,
+        tcg.group_name as groupName,
+        tcc.`name` as companyName,
+        GROUP_CONCAT(tcp.`name` separator '、') as playerNames
+        FROM
+            `t_compete_team` tct
+            LEFT JOIN `t_compete_team_member` tctm ON tct.id = tctm.compete_team_id
+            LEFT JOIN t_compete_group tcg ON tct.gender_group = tcg.sex
+            AND tct.group_remark = tcg.group_remark
+            left JOIN t_compete_player tcp on tcp.id=tctm.player_id
+            left join t_compete_company tcc on tct.company_id=tcc.id
+
+        WHERE
+            tct.project_id = #{projectId}
+            AND tct.rec_status = 0
+            AND tctm.rec_status = 0
+            AND tcg.rec_status =0
+    </select>
 </mapper>

util/src/test/java/com/ccsens/util/OtherTest.java

@@ -9,6 +9,8 @@ import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 @Slf4j
 public class OtherTest {
@@ -36,5 +38,11 @@ public class OtherTest {
         System.out.println(file1);
         ImageUtil.scale(file1,file2,2);
     }
+    @Test
+    public void func3(){
+        SimpleDateFormat sdf2 = new SimpleDateFormat("MM-dd a");
+        String sd2 = sdf2.format(new Date(1605074997152L));
+        System.out.println(sd2);
+    }
 
 }