From 4b041919235a0ae677a3985ac345d3916445ff8e Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Tue, 10 Nov 2020 16:45:31 +0800 Subject: [PATCH] 1 --- .../com/ccsens/mt/api/ExcelController.java | 30 +- .../mt/bean/dto/ProvinceCompeteDto.java | 27 ++ .../java/com/ccsens/mt/bean/vo/TableVo.java | 22 ++ .../persist/dao/CompeteProjectConfigDao.java | 18 ++ .../mt/persist/dao/CompeteProjectDao.java | 17 ++ .../com/ccsens/mt/service/ExcelService.java | 285 ++++++++++++++++++ .../com/ccsens/mt/service/IExcelService.java | 31 ++ .../mapper_dao/CompeteProjectConfigDao.xml | 19 ++ .../mapper_dao/CompeteProjectDao.xml | 9 + 9 files changed, 457 insertions(+), 1 deletion(-) create mode 100644 mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java create mode 100644 mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectDao.java create mode 100644 mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml create mode 100644 mt/src/main/resources/mapper_dao/CompeteProjectDao.xml 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 ec2ee354..4fc1403a 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ExcelController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ExcelController.java @@ -3,7 +3,8 @@ package com.ccsens.mt.api; import com.ccsens.cloudutil.annotation.MustLogin; import com.ccsens.mt.bean.dto.CompeteDto; -import com.ccsens.mt.service.ICompeteService; +import com.ccsens.mt.bean.dto.ProvinceCompeteDto; +import com.ccsens.mt.bean.vo.TableVo; import com.ccsens.mt.service.IExcelService; import com.ccsens.util.JsonResponse; import com.ccsens.util.bean.dto.QueryDto; @@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.io.IOException; +import java.util.List; /** * @author li @@ -78,6 +80,32 @@ public class ExcelController { return JsonResponse.newInstance().ok(path); } + @MustLogin + @ApiOperation(value = "日程安排中间表", notes = "") + @RequestMapping(value = "/dailyScheduleProcess", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse dailyScheduleProcess(@ApiParam @Validated @RequestBody CompeteDto.CompeteTime params) { + log.info("日程安排中间表：{}",params); + List dailyScheduleProcessList = excelService.dailyScheduleProcess(params); + return JsonResponse.newInstance().ok(dailyScheduleProcessList); + } + + @MustLogin + @ApiOperation(value = "日程安排更新", notes = "") + @RequestMapping(value = "/updateAndSearchSchedule", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse updateAndSearch(@ApiParam @Validated @RequestBody ProvinceCompeteDto.UpdateAndSearchList params) { + log.info("日程安排更新：{}",params); + excelService.updateAndSearch(params); + return JsonResponse.newInstance().ok(); + } + + @MustLogin + @ApiOperation(value = "xxx大赛报名表", notes = "") + @RequestMapping(value = "/enterInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse getEnterInfo(@ApiParam @Validated @RequestBody CompeteDto.CompeteTime params) { + log.info("日程安排更新：{}",params); + excelService.getCompeteJoinDetail(params); + return JsonResponse.newInstance().ok(); + } diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java index f57e3ab8..1d8447a2 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java @@ -127,4 +127,31 @@ public class ProvinceCompeteDto { @ApiModelProperty("教练证") private Long coachCertificate; //教练证（只有教练需要，文件类型） } + + @Data + @ApiModel("修改日程安排") + public static class UpdateAndSearch{ + @ApiModelProperty("参赛项目") + private String projectName; + @ApiModelProperty("参赛人/队伍") + private int joinNum; + @ApiModelProperty("单项时间") + private long singleTime; + @ApiModelProperty("场地") + private int siteNum; + @ApiModelProperty("场次") + private long games; + @ApiModelProperty("总时间") + private long timeSum; + @ApiModelProperty("项目开始时间") + private Long startTime; + @ApiModelProperty("项目结束时间") + private Long endTime; + } + + @Data + @ApiModel("修改日程安排") + public static class UpdateAndSearchList{ + private List updateAndSearchList; + } } 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 0cfcf459..7df4ca4f 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 @@ -110,4 +110,26 @@ public class TableVo { private List nums = new ArrayList<>(); } + @Data + @ApiModel("日程安排") + public static class DailyScheduleProcess{ + @ApiModelProperty("参赛项目") + private String projectName; + @ApiModelProperty("参赛人/队伍") + private int joinNum; + @ApiModelProperty("单项时间") + private long singleTime; + @ApiModelProperty("场地") + private int siteNum; + @ApiModelProperty("场次") + private long games; + @ApiModelProperty("总时间") + private long timeSum; + @ApiModelProperty("项目开始时间") + private Long startTime; + @ApiModelProperty("项目结束时间") + private Long endTime; + + } + } diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java new file mode 100644 index 00000000..023bb3f4 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java @@ -0,0 +1,18 @@ +package com.ccsens.mt.persist.dao; + +import com.ccsens.mt.bean.po.CompeteProjectConfig; +import com.ccsens.mt.bean.po.CompeteProjectConfigExample; +import com.ccsens.mt.persist.mapper.CompeteProjectConfigMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * + * @author: li + * + */ +public interface CompeteProjectConfigDao extends CompeteProjectConfigMapper { + CompeteProjectConfig selectByProjectId(@Param("projectId") Long projectId); + +} \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectDao.java new file mode 100644 index 00000000..2955fd3d --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectDao.java @@ -0,0 +1,17 @@ +package com.ccsens.mt.persist.dao; + +import com.ccsens.mt.bean.po.CompeteProject; +import com.ccsens.mt.bean.po.CompeteProjectConfig; +import com.ccsens.mt.persist.mapper.CompeteProjectConfigMapper; +import com.ccsens.mt.persist.mapper.CompeteProjectMapper; +import org.apache.ibatis.annotations.Param; + +/** + * + * @author: li + * + */ +public interface CompeteProjectDao extends CompeteProjectMapper { + CompeteProject getProjectByProjectName(@Param("projectName") String projectId); + +} \ No newline at end of file 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 0e8aef44..83eed9fe 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -3,6 +3,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdcardUtil; 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.TableVo; import com.ccsens.mt.persist.dao.*; @@ -60,6 +61,10 @@ public class ExcelService implements IExcelService { @Resource private CompetePlayerMapper competePlayerMapper; + @Resource + private CompeteProjectConfigDao competeProjectConfigDao; + @Resource + private CompeteProjectDao competeProjectDao; @Override public String dasaiduiwuxinxiWPS(QueryDto params) { @@ -303,6 +308,9 @@ public class ExcelService implements IExcelService { return path; } + + + private List getCompeteJoin(CompeteDto.CompeteTime params) { List competeJoinList = new ArrayList<>(); Long competeTimeId = params.getCompeteTimeId(); @@ -632,6 +640,7 @@ public class ExcelService implements IExcelService { return path; } + // private List competeAllCountList(CompeteDto.CompeteTime params){ // //根据大赛查类型 // Long competeTimeId = params.getCompeteTimeId(); @@ -759,5 +768,281 @@ public class ExcelService implements IExcelService { return path; } + + + + @Override + public List dailyScheduleProcess(CompeteDto.CompeteTime params) { + List dailyScheduleProcessList = new ArrayList<>(); + //查询项目 + CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(params.getCompeteTimeId()); + CompeteProjectExample competeProjectExample = new CompeteProjectExample(); + int level = 2; + competeProjectExample.createCriteria().andTypeEqualTo(competeTime.getType()).andLevelEqualTo((byte) level); + //项目集合 + List competeProjectList = competeProjectMapper.selectByExample(competeProjectExample); + for (CompeteProject competeProject : competeProjectList) { + //判断是否团队 + if (competeProject.getTeam() == 0) { + //不是团队 + CompeteProjectPlayerExample competeProjectPlayerExample = new CompeteProjectPlayerExample(); + competeProjectPlayerExample.createCriteria().andProjectIdEqualTo(competeProject.getId()); + long count = competeProjectPlayerMapper.countByExample(competeProjectPlayerExample); + TableVo.DailyScheduleProcess dailyScheduleProcess = new TableVo.DailyScheduleProcess(); + //队伍/人数 + dailyScheduleProcess.setJoinNum((int) count); + //项目名 + dailyScheduleProcess.setProjectName(competeProject.getName()); + + CompeteProjectConfig competeProjectConfig = competeProjectConfigDao.selectByProjectId(competeProject.getId()); + if (ObjectUtil.isNotNull(competeProjectConfig)) { + //单项时间 + dailyScheduleProcess.setSingleTime(competeProjectConfig.getProjectDuration()); + //场地 + dailyScheduleProcess.setSiteNum(competeProjectConfig.getSiteNum()); + //场次 + long times = count / competeProjectConfig.getSiteNum(); + dailyScheduleProcess.setGames(times); + //总时间 + long second = competeProjectConfig.getProjectDuration() * times; + dailyScheduleProcess.setTimeSum(second); + //项目开始时间 + dailyScheduleProcess.setStartTime(competeProjectConfig.getStartTime()); + //项目结束时间 + dailyScheduleProcess.setEndTime(competeProjectConfig.getEndTime()); + } + dailyScheduleProcessList.add(dailyScheduleProcess); + } else { + //是团队 + CompeteTeamExample competeTeamExample = new CompeteTeamExample(); + competeTeamExample.createCriteria().andProjectIdEqualTo(competeProject.getId()); + long count = competeTeamDao.countByExample(competeTeamExample); + TableVo.DailyScheduleProcess dailyScheduleProcess = new TableVo.DailyScheduleProcess(); + //队伍/人数 + dailyScheduleProcess.setJoinNum((int) count); + //项目名 + dailyScheduleProcess.setProjectName(competeProject.getName()); + + CompeteProjectConfig competeProjectConfig = competeProjectConfigDao.selectByProjectId(competeProject.getId()); + if (ObjectUtil.isNotNull(competeProjectConfig)) { + //单项时间 + dailyScheduleProcess.setSingleTime(competeProjectConfig.getProjectDuration()); + //场地 + dailyScheduleProcess.setSiteNum(competeProjectConfig.getSiteNum()); + //场次 + long times = count / competeProjectConfig.getSiteNum(); + dailyScheduleProcess.setGames(times); + //总时间 + long second = competeProjectConfig.getProjectDuration() * times; + dailyScheduleProcess.setTimeSum(second); + //项目开始时间 + dailyScheduleProcess.setStartTime(competeProjectConfig.getStartTime()); + //项目结束时间 + dailyScheduleProcess.setEndTime(competeProjectConfig.getEndTime()); + } + dailyScheduleProcessList.add(dailyScheduleProcess); + } + + } + return dailyScheduleProcessList; + } + + @Override + public List updateAndSearch(ProvinceCompeteDto.UpdateAndSearchList params) { + List dailyScheduleProcessList = new ArrayList<>(); + List updateAndSearchList = params.getUpdateAndSearchList(); + for (ProvinceCompeteDto.UpdateAndSearch updateAndSearch : updateAndSearchList){ + //根据项目查项目id + CompeteProject competeProject = competeProjectDao.getProjectByProjectName(updateAndSearch.getProjectName()); + long projectId = competeProject.getId(); + //查询数据库中现有数据对象 + CompeteProjectConfig competeProjectConfig = competeProjectConfigDao.selectByProjectId(projectId); + //修改单项时间，场地和开始结束时间 + competeProjectConfig.setProjectDuration(updateAndSearch.getSingleTime()); + competeProjectConfig.setSiteNum(updateAndSearch.getSiteNum()); + competeProjectConfig.setStartTime(updateAndSearch.getStartTime()); + competeProjectConfig.setEndTime(updateAndSearch.getEndTime()); + competeProjectConfigDao.updateByPrimaryKeySelective(competeProjectConfig); + //返回前台的对象赋值 + TableVo.DailyScheduleProcess dailyScheduleProcess = new TableVo.DailyScheduleProcess(); + //项目名 + dailyScheduleProcess.setProjectName(updateAndSearch.getProjectName()); + //参赛人或者队伍 + dailyScheduleProcess.setJoinNum(updateAndSearch.getJoinNum()); + //单项时间 + CompeteProjectConfig competeProjectConfig1 = competeProjectConfigDao.selectByProjectId(competeProject.getId()); + dailyScheduleProcess.setSingleTime(competeProjectConfig1.getProjectDuration()); + //场地 + dailyScheduleProcess.setSiteNum(competeProjectConfig1.getSiteNum()); + //场次 + long games = updateAndSearch.getJoinNum()/competeProjectConfig1.getSiteNum(); + dailyScheduleProcess.setGames(games); + //总时间 + long second = competeProjectConfig1.getProjectDuration()*games; + dailyScheduleProcess.setTimeSum(second); + //开始时间 + dailyScheduleProcess.setStartTime(competeProjectConfig1.getStartTime()); + //结束时间 + dailyScheduleProcess.setEndTime(competeProjectConfig1.getEndTime()); + dailyScheduleProcessList.add(dailyScheduleProcess); + } + return dailyScheduleProcessList; + } + + + @Override + public List getCompeteJoinDetail(CompeteDto.CompeteTime params) { + List competeJoinList = new ArrayList<>(); + Long competeTimeId = params.getCompeteTimeId(); + CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(competeTimeId); + int type = competeTime.getType(); + Byte level = 2; + CompeteProjectExample competeProjectExample = new CompeteProjectExample(); + competeProjectExample.createCriteria().andTypeEqualTo((byte) type).andLevelEqualTo(level); + //获取参赛项目集合 + List competeProjectList = competeProjectMapper.selectByExample(competeProjectExample); + for (CompeteProject competeProject : competeProjectList) { + String projectName = competeProject.getName(); + if (competeProject.getTeam() == 0) { + //如果不是团队项目，查询该项目下报名人数集合 + CompeteProjectPlayerExample competeProjectPlayerExample = new CompeteProjectPlayerExample(); + competeProjectPlayerExample.createCriteria().andProjectIdEqualTo(competeProject.getId()); + List competeProjectPlayerList = competeProjectPlayerMapper.selectByExample(competeProjectPlayerExample); + for (CompeteProjectPlayer competeProjectPlayer : competeProjectPlayerList) { + //查询每个报名人的详细信息下 + CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(competeProjectPlayer.getPlayerId()); + TableVo.CompeteJoin competeJoin = new TableVo.CompeteJoin(); + //姓名 + competeJoin.setName(competePlayer.getName()); + //身份证号 + competeJoin.setIdCard(competePlayer.getIdCard()); + //根据身份证获取选手年龄并赋值 + String idCard = competeJoin.getIdCard(); + int ageByIdCard = IdcardUtil.getAgeByIdCard(idCard); + competeJoin.setAge(ageByIdCard); + Byte gender = competePlayer.getGender(); + if (gender == 0) { + competeJoin.setGender("女"); + } else { + competeJoin.setGender("男"); + } + //查询单位,并赋值 + CompeteCompany competeCompany = competeCompanyMapper.selectByPrimaryKey(competePlayer.getCompanyId()); + if (ObjectUtil.isNotNull(competeCompany)) { + competeJoin.setJoinTeam(competeCompany.getName()); + } + //查询组别，并赋值 + CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(competePlayer.getCompeteGroupId()); + if (ObjectUtil.isNotNull(competeGroup)) { + competeJoin.setCompeteGroup(competePlayer.getName()); + } + //身份证明查询，并赋值 + CommonFile commonFile = commonFileMapper.selectByPrimaryKey(competePlayer.getIdCardFrontFile()); + if (ObjectUtil.isNotNull(commonFile)) { + competeJoin.setIdCardPromise(commonFile.getVisitLocation()); + } + //一寸证件照查询赋值 + CommonFile commonFile1 = commonFileMapper.selectByPrimaryKey(competePlayer.getIdPhotoFile()); + if (ObjectUtil.isNotNull(commonFile1)) { + competeJoin.setPicture(commonFile1.getVisitLocation()); + } + //学籍证明/俱乐部证明 + CommonFile commonFile2 = commonFileMapper.selectByPrimaryKey(competePlayer.getStudentRecordFile()); + if (ObjectUtil.isNotNull(commonFile2)) { + competeJoin.setStudentPromise(commonFile2.getVisitLocation()); + } + //体检证明 + CommonFile commonFile3 = commonFileMapper.selectByPrimaryKey(competePlayer.getHealthRecordFile()); + if (ObjectUtil.isNotNull(commonFile3)) { + competeJoin.setBodyTest(commonFile3.getVisitLocation()); + } + //人身意外伤害保险证明 + CommonFile commonFile4 = commonFileMapper.selectByPrimaryKey(competePlayer.getInsuranceRecordFile()); + if (ObjectUtil.isNotNull(commonFile4)) { + competeJoin.setBodyProtect(commonFile4.getVisitLocation()); + } + //参赛项目名赋值 + competeJoin.setCompeteProject(projectName); + competeJoinList.add(competeJoin); + } + + } else { //团队项目 + //获取参赛队伍集合 + CompeteTeamExample competeTeamExample = new CompeteTeamExample(); + competeTeamExample.createCriteria().andProjectIdEqualTo(competeProject.getId()); + List competeTeamList = competeTeamDao.selectByExample(competeTeamExample); + for (CompeteTeam competeTeam : competeTeamList) { + //获取队伍下的成员集合 + CompeteTeamMemberExample competeTeamMemberExample = new CompeteTeamMemberExample(); + competeTeamMemberExample.createCriteria().andCompeteTeamIdEqualTo(competeTeam.getId()); + List competeTeamMemberList = competeTeamMemberMapper.selectByExample(competeTeamMemberExample); + for (CompeteTeamMember competeTeamMember : competeTeamMemberList) { + //查询成员详细信息 + CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(competeTeamMember.getPlayerId()); + TableVo.CompeteJoin competeJoin = new TableVo.CompeteJoin(); + //姓名 + competeJoin.setName(competePlayer.getName()); + //身份证号 + competeJoin.setIdCard(competePlayer.getIdCard()); + //根据身份证获取选手年龄并赋值 + String idCard = competeJoin.getIdCard(); + int ageByIdCard = IdcardUtil.getAgeByIdCard(idCard); + competeJoin.setAge(ageByIdCard); + //性别 + Byte gender = competePlayer.getGender(); + if (gender == 0) { + competeJoin.setGender("女"); + } else { + competeJoin.setGender("男"); + } + + //查询单位,并赋值 + CompeteCompany competeCompany = competeCompanyMapper.selectByPrimaryKey(competePlayer.getCompanyId()); + if (ObjectUtil.isNotNull(competeCompany)) { + competeJoin.setJoinTeam(competeCompany.getName()); + } + //查询组别，并赋值 + CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(competePlayer.getCompeteGroupId()); + if (ObjectUtil.isNotNull(competeGroup)) { + competeJoin.setCompeteGroup(competePlayer.getName()); + } + //身份证明查询，并赋值 + CommonFile commonFile = commonFileMapper.selectByPrimaryKey(competePlayer.getIdCardFrontFile()); + if (ObjectUtil.isNotNull(commonFile)){ + competeJoin.setIdCardPromise(commonFile.getVisitLocation()); + } + //一寸证件照查询赋值 + CommonFile commonFile1 = commonFileMapper.selectByPrimaryKey(competePlayer.getIdPhotoFile()); + if (ObjectUtil.isNotNull(commonFile1)){ + competeJoin.setPicture(commonFile1.getVisitLocation()); + } + //学籍证明/俱乐部证明 + CommonFile commonFile2 = commonFileMapper.selectByPrimaryKey(competePlayer.getStudentRecordFile()); + if (ObjectUtil.isNotNull(commonFile2)){ + competeJoin.setStudentPromise(commonFile2.getVisitLocation()); + } + //体检证明 + CommonFile commonFile3 = commonFileMapper.selectByPrimaryKey(competePlayer.getHealthRecordFile()); + if (ObjectUtil.isNotNull(commonFile3)){ + competeJoin.setBodyTest(commonFile3.getVisitLocation()); + } + //人身意外伤害保险证明 + CommonFile commonFile4 = commonFileMapper.selectByPrimaryKey(competePlayer.getInsuranceRecordFile()); + if (ObjectUtil.isNotNull(commonFile4)){ + competeJoin.setBodyProtect(commonFile4.getVisitLocation()); + } + //参赛项目名赋值 + competeJoin.setCompeteProject(projectName); + competeJoinList.add(competeJoin); + } + } + } + } + return competeJoinList; + } + + + + } 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 23dc6648..db04abd4 100644 --- a/mt/src/main/java/com/ccsens/mt/service/IExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/IExcelService.java @@ -1,12 +1,19 @@ package com.ccsens.mt.service; import com.ccsens.mt.bean.dto.CompeteDto; +import com.ccsens.mt.bean.dto.ProvinceCompeteDto; +import com.ccsens.mt.bean.vo.TableVo; import com.ccsens.util.bean.dto.QueryDto; import com.ccsens.mt.bean.dto.CompeteDto; import com.ccsens.util.bean.dto.QueryDto; import java.io.IOException; +import java.util.List; +/** + * 文件操作 + * @author li + */ public interface IExcelService { /** * 导出大赛队伍信息表 @@ -30,6 +37,12 @@ public interface IExcelService { */ String competeJoin(QueryDto params) throws IOException; + /** + * XXXX大赛报名表 + * @param params 大赛id + * @return 返回失败的信息 + */ + List getCompeteJoinDetail(CompeteDto.CompeteTime params); /** @@ -46,4 +59,22 @@ public interface IExcelService { * @return 返回失败的信息 */ String competeAllCount(CompeteDto.CompeteTime params) throws IOException; + + /** + * 日程安排中间表 + * @param params 大赛id + * @return 返回失败的信息 + */ + List dailyScheduleProcess(CompeteDto.CompeteTime params); + + /** + * 更新并查询 + * @param params 大赛id + * @return 返回失败的信息 + */ + List updateAndSearch(ProvinceCompeteDto.UpdateAndSearchList params); + + + + } diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml new file mode 100644 index 00000000..4af60200 --- /dev/null +++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectDao.xml new file mode 100644 index 00000000..599eee15 --- /dev/null +++ b/mt/src/main/resources/mapper_dao/CompeteProjectDao.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file