From d831e3e8b6cf8405969bfb06679f0643e1830869 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Tue, 10 Nov 2020 16:35:37 +0800 Subject: [PATCH 01/80] 20201110mtV1.4 --- .../com/ccsens/mt/api/ProvinceController.java | 14 ++++++- .../mt/bean/dto/ProvinceCompeteDto.java | 15 +++++++ .../mt/persist/dao/CompeteCompanyDao.java | 11 +++++ .../ccsens/mt/service/IProvinceService.java | 7 ++++ .../ccsens/mt/service/ProvinceService.java | 34 +++++++++++++-- .../mapper_dao/CompeteCompanyDao.xml | 42 ++++++++++++++++++- tall/src/main/resources/druid-dev.yml | 2 +- tall/src/main/resources/druid-prod.yml | 2 +- tall/src/main/resources/druid-test.yml | 2 +- 9 files changed, 120 insertions(+), 9 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java index 920f75c3..d5e4dbeb 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java @@ -186,9 +186,19 @@ public class ProvinceController { @ApiOperation(value = "查找团体比赛已报名的选手信息", notes = "") @RequestMapping(value = "/teamProject/player", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse> getPlayerByTeamProject(@ApiParam @Validated @RequestBody QueryDto params) { - log.info("查询教练或领队的详细信息：{}",params); + log.info("查找团体比赛已报名的选手信息：{}",params); List groupAndPlayer = provinceService.getPlayerByTeamProject(params.getParam()); - log.info("查询教练或领队的详细信息：{}",groupAndPlayer); + log.info("查找团体比赛已报名的选手信息：{}",groupAndPlayer); + return JsonResponse.newInstance().ok(groupAndPlayer); + } + + @MustLogin + @ApiOperation(value = "团体报名查询可以参加和已经参加的选手", notes = "") + @RequestMapping(value = "/rule/player", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> getPlayerByTeamProjectWithRule(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("团体报名查询可以参加和已经参加的选手：{}",params); + List groupAndPlayer = provinceService.getPlayerByTeamProjectWithRule(params.getParam()); + log.info("团体报名查询可以参加和已经参加的选手：{}",groupAndPlayer); return JsonResponse.newInstance().ok(groupAndPlayer); } } 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 c4037cb6..423b39eb 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 @@ -140,4 +140,19 @@ public class ProvinceCompeteDto { @ApiModelProperty("项目id") private Long projectId; } + + @Data + @ApiModel("查找团队项目下符合规则的选手信息") + public static class GetPlayerByTeamProjectWithRule{ + @NotNull(message = "请先填写基础信息") + @ApiModelProperty("参赛单位id") + private Long companyId; + @NotNull(message = "请选择项目") + @ApiModelProperty("项目id") + private Long projectId; + @ApiModelProperty("性别组") + private int gender; + @ApiModelProperty("组别信息") + private int groupRemark; + } } diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java index 50874fc4..023a69cc 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java @@ -116,4 +116,15 @@ public interface CompeteCompanyDao extends CompeteCompanyMapper { * @return */ List selectByCompanyId(@Param("companyId")Long companyId); + + /** + * 查找该项目下所有可以参赛和已经参赛的选手 + * @param companyId 单位id + * @param projectId 项目id + * @param type 比赛类型 + * @param groupRemark 组别备注信息 + * @param gender 性别 0女 1男 2混合 + * @return 返回选手信息 + */ + List getPlayerByTeamProjectWithRule(@Param("companyId")Long companyId, @Param("projectId")Long projectId, @Param("type")Byte type, @Param("groupRemark")int groupRemark, @Param("gender")int gender); } diff --git a/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java index 7d5111fa..965a40a3 100644 --- a/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java @@ -138,4 +138,11 @@ public interface IProvinceService { * @return 返回参加的选手的详细信息，按组别分类 */ List getPlayerByTeamProject(ProvinceCompeteDto.GetPlayerByTeamProject param); + + /** + * 查找团队下符合规则的选手信息 + * @param param 单位id 项目id 组别和性别信息 + * @return 返回所有可参赛的选手和已经参赛的选手 + */ + List getPlayerByTeamProjectWithRule(ProvinceCompeteDto.GetPlayerByTeamProjectWithRule param); } diff --git a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java index 3233b232..5eaf9556 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -213,7 +213,8 @@ public class ProvinceService implements IProvinceService { if(StrUtil.isNotEmpty(param.getPlayerName())){player.setName(param.getPlayerName());} if(StrUtil.isNotEmpty(param.getIdCard())){player.setIdCard(param.getIdCard());} if(ObjectUtil.isNotNull(param.getGender())){player.setGender((byte) param.getGender());} - if(ObjectUtil.isNotNull(param.getGroupId())){player.setCompeteGroupId(param.getGroupId());} + if(ObjectUtil.isNotNull(competeGroup)){player.setCompeteGroupId(competeGroup.getId());} + if(ObjectUtil.isNotNull(param.getGroupRemark())){player.setGroupRemark((byte) param.getGroupRemark());} if(ObjectUtil.isNotNull(param.getCompeteId())){player.setCompanyId(param.getCompeteId());} if(ObjectUtil.isNotNull(param.getIdCardFront())){player.setIdCardFrontFile(param.getIdCardFront());} @@ -632,12 +633,39 @@ public class ProvinceService implements IProvinceService { */ @Override public List getPlayerByTeamProject(ProvinceCompeteDto.GetPlayerByTeamProject param) { + List groupAndPlayerList = null; //查找项目 CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId()); if(ObjectUtil.isNotNull(competeProject)){ - List groupAndPlayerList = competeCompanyDao.getPlayerByTeamProject(param.getProjectId(),competeProject.getType()); + groupAndPlayerList = competeCompanyDao.getPlayerByTeamProject(param.getProjectId(),competeProject.getType()); } - return null; + return groupAndPlayerList; + } + + /** + * 查找符合参赛规则的选手信息 + */ + @Override + public List getPlayerByTeamProjectWithRule(ProvinceCompeteDto.GetPlayerByTeamProjectWithRule param) { + List groupAndPlayerList = new ArrayList<>(); + //查找项目 + CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId()); + if(ObjectUtil.isNotNull(competeProject) && competeProject.getTeam() == 1){ + //如果同单位不限组别 + if(competeProject.getJoinRule() == 1){ + groupAndPlayerList = competeCompanyDao.queryPlayerByGroupId(competeProject.getType(),param.getCompanyId(),null,param.getProjectId()); + } + //如果同单位限制组别 + if(competeProject.getJoinRule() == 0){ + /*每个单位每个组别可以报名，报名过其他组的选手不能再次报名， + 例：1单位a同学报名了q比赛的小学男子组，a同学就无法再报名q比赛小学混合组 + b同学报名了r比赛的小学混合组，b同学就无法再报名r比赛的女子组和男子组，无论b同学是男还是女*/ + //查找此单位下所有该组的选手，如果选择混合组，则男女都查找 + //排除已经报名别的组的选手 + groupAndPlayerList = competeCompanyDao.getPlayerByTeamProjectWithRule(param.getCompanyId(),competeProject.getId(),competeProject.getType(),param.getGroupRemark(),param.getGender()); + } + } + return groupAndPlayerList; } } diff --git a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml index 33da3934..1eda459c 100644 --- a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml @@ -50,7 +50,7 @@ if(pp.id is null and a.mId is null,0,1) as joinProject FROM t_compete_group cg - LEFT JOIN t_compete_player p on cg.sex = p.gender_group and cg.group_remark = p.group_remark + LEFT JOIN t_compete_player p on (cg.id = p.compete_group_id or (cg.sex = p.gender and cg.group_remark = p.group_remark)) LEFT JOIN t_compete_project_player pp on p.id = pp.player_id and pp.project_id = #{projectId} and pp.rec_status = 0 LEFT JOIN ( SELECT @@ -283,5 +283,45 @@ where tcc.`company_id`= #{companyId} + \ No newline at end of file diff --git a/tall/src/main/resources/druid-dev.yml b/tall/src/main/resources/druid-dev.yml index 7b6e738f..9b9ea832 100644 --- a/tall/src/main/resources/druid-dev.yml +++ b/tall/src/main/resources/druid-dev.yml @@ -27,7 +27,7 @@ spring: testOnReturn: false testWhileIdle: true timeBetweenEvictionRunsMillis: 60000 - url: jdbc:mysql://49.233.89.188:3306/tall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai + url: jdbc:mysql://49.233.89.188:3306/tall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true username: root validationQuery: SELECT 1 FROM DUAL env: CCSENS_TALL \ No newline at end of file diff --git a/tall/src/main/resources/druid-prod.yml b/tall/src/main/resources/druid-prod.yml index ee0316bc..20a6ff77 100644 --- a/tall/src/main/resources/druid-prod.yml +++ b/tall/src/main/resources/druid-prod.yml @@ -28,7 +28,7 @@ spring: testOnReturn: false testWhileIdle: true timeBetweenEvictionRunsMillis: 60000 - url: jdbc:mysql://127.0.0.1/tall?useUnicode=true&characterEncoding=UTF-8 + url: jdbc:mysql://127.0.0.1/tall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true username: root validationQuery: SELECT 1 FROM DUAL env: CCSENS_HEALTH \ No newline at end of file diff --git a/tall/src/main/resources/druid-test.yml b/tall/src/main/resources/druid-test.yml index b52b019f..656c54f2 100644 --- a/tall/src/main/resources/druid-test.yml +++ b/tall/src/main/resources/druid-test.yml @@ -29,7 +29,7 @@ spring: testWhileIdle: true timeBetweenEvictionRunsMillis: 60000 # url: jdbc:mysql://127.0.0.1/tall?useUnicode=true&characterEncoding=UTF-8 - url: jdbc:mysql://test.tall.wiki/tall?useUnicode=true&characterEncoding=UTF-8 + url: jdbc:mysql://test.tall.wiki/tall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true username: root validationQuery: SELECT 1 FROM DUAL env: CCSENS_TALL \ No newline at end of file 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 02/80] 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 From 8182bc87ec7f27cef31f07b30d089377d06b778c Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Tue, 10 Nov 2020 18:23:53 +0800 Subject: [PATCH 03/80] 20201110mtV1.6 --- .../java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java | 2 ++ .../java/com/ccsens/mt/service/ProvinceService.java | 9 ++++++++- mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml | 10 +++++----- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java index 88911e1d..450b41a3 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java @@ -81,6 +81,8 @@ public class ProvinceCompeteVo { private String name; @ApiModelProperty("是否是团队项目 0否 1是") private byte team; + @ApiModelProperty("参赛规则 0限制组别 1不限组别") + private byte joinRule; @ApiModelProperty("最少人数") private int memberMin; @ApiModelProperty("最多人数") diff --git a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java index 5eaf9556..604dd8e7 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -620,6 +620,13 @@ public class ProvinceService implements IProvinceService { } } +// /** +// * 参加个人比赛 +// */ +// private void joinTiwnProject(){ +// +// } + /** * 查找教练详细信息 */ @@ -633,7 +640,7 @@ public class ProvinceService implements IProvinceService { */ @Override public List getPlayerByTeamProject(ProvinceCompeteDto.GetPlayerByTeamProject param) { - List groupAndPlayerList = null; + List groupAndPlayerList = new ArrayList<>(); //查找项目 CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId()); if(ObjectUtil.isNotNull(competeProject)){ diff --git a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml index 1eda459c..64153f6d 100644 --- a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml @@ -127,6 +127,7 @@ p.id as id, p.`name` as `name`, team, + p.join_rule as joinRule, member_min as memberMin, member_max as memberMax, if( @@ -233,11 +234,10 @@ + \ No newline at end of file diff --git a/util/src/main/java/com/ccsens/util/CodeEnum.java b/util/src/main/java/com/ccsens/util/CodeEnum.java index 9d96e5ce..0806e037 100644 --- a/util/src/main/java/com/ccsens/util/CodeEnum.java +++ b/util/src/main/java/com/ccsens/util/CodeEnum.java @@ -175,6 +175,7 @@ public enum CodeEnum { CONTACTS_NAME_EMPTY(144,"联系人名称不能为空",true), MEMBER_NUM_ERROR(145,"参赛人数不满足比赛人数要求",true), GENDER_ERROR(146,"请选择正确的性别",true), + JOIN_AUTH_GROUP(147,"已参加了其他组别，无法再次报名",true), ; @@ -183,7 +184,10 @@ public enum CodeEnum { this.msg = "请上传"+msg; return this; } - + public static String mtJoinAuthGroup(String msg){ + msg = msg+"已参加了其他组别，无法再次报名"; + return msg; + } public CodeEnum mtProjectMsg(String msg){ this.msg = msg+"项目参赛次数已满"; return this; From 756ebf8a2e66d13ccbaa95136d652a15147f39b7 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Wed, 11 Nov 2020 10:51:54 +0800 Subject: [PATCH 05/80] 20201111v1.1 --- .../ccsens/mt/bean/vo/ProvinceCompeteVo.java | 4 ++++ .../mt/persist/dao/CompeteCompanyDao.java | 4 +++- .../ccsens/mt/service/ProvinceService.java | 12 ++++++---- .../mapper_dao/CompeteCompanyDao.xml | 22 +++++++++++++++++-- 4 files changed, 35 insertions(+), 7 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java index 450b41a3..dcd6c676 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java @@ -48,6 +48,10 @@ public class ProvinceCompeteVo { private Long groupId; @ApiModelProperty("组别名字") private String groupName; + @ApiModelProperty("性别组") + private int gender; + @ApiModelProperty("组别信息") + private int groupRemark; @ApiModelProperty("选手信息") private List playerList; } diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java index 6266f255..f79d8f8e 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java @@ -102,7 +102,7 @@ public interface CompeteCompanyDao extends CompeteCompanyMapper { * @param type * @return */ - List getPlayerByTeamProject(@Param("projectId")Long projectId, @Param("type")Byte type); + List getPlayerByTeamProject(@Param("companyId")Long companyId, @Param("projectId")Long projectId, @Param("type")Byte type); /** * 根据大赛id查看当前大赛所有队伍信息,以及联系人的信息 * @param CompeteTimeId 大赛CompeteTimeId @@ -140,4 +140,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 queryPlayersByTeamProject(@Param("companyId")Long companyId, @Param("projectId")Long projectId); } diff --git a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java index b1ab657c..50d5e977 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -635,8 +635,8 @@ public class ProvinceService implements IProvinceService { competeTeam.setCompeteTimeId(param.getCompeteTimeId()); competeTeam.setProjectId(param.getProjectId()); competeTeam.setCompanyId(param.getCompanyId()); - competeTeam.setCompanyId((long) param.getGender()); - competeTeam.setCompanyId((long) param.getGroupRemark()); + competeTeam.setGenderGroup((byte) param.getGender()); + competeTeam.setGroupRemark((byte) param.getGroupRemark()); //添加团队表 competeTeamDao.insertSelective(competeTeam); } @@ -754,7 +754,7 @@ public class ProvinceService implements IProvinceService { //查找项目 CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId()); if(ObjectUtil.isNotNull(competeProject)){ - groupAndPlayerList = competeCompanyDao.getPlayerByTeamProject(param.getProjectId(),competeProject.getType()); + groupAndPlayerList = competeCompanyDao.getPlayerByTeamProject(param.getCompanyId(),param.getProjectId(),competeProject.getType()); } return groupAndPlayerList; } @@ -770,7 +770,11 @@ public class ProvinceService implements IProvinceService { if(ObjectUtil.isNotNull(competeProject) && competeProject.getTeam() == 1){ //如果同单位不限组别 if(competeProject.getJoinRule() == 1){ - groupAndPlayerList = competeCompanyDao.queryPlayerByGroupId(competeProject.getType(),param.getCompanyId(),null,param.getProjectId()); +// groupAndPlayerList = competeCompanyDao.queryPlayerByGroupId(competeProject.getType(),param.getCompanyId(),null,param.getProjectId()); + List playerInfoByGroupList = competeCompanyDao.queryPlayersByTeamProject(param.getCompanyId(),param.getProjectId()); + ProvinceCompeteVo.GroupAndPlayer groupAndPlayer = new ProvinceCompeteVo.GroupAndPlayer(); + groupAndPlayer.setGroupName("不限制组别"); + groupAndPlayer.setPlayerList(playerInfoByGroupList); } //如果同单位限制组别 if(competeProject.getJoinRule() == 0){ diff --git a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml index 467c77f3..f8ae9d5b 100644 --- a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml @@ -19,6 +19,8 @@ + + @@ -245,8 +247,8 @@ LEFT JOIN t_compete_player p on m.player_id = p.id WHERE t.project_id = #{projectId} - and - g.type = #{type} + and t.company_id = #{companyId} + and g.type = #{type} and g.rec_status = 0 and t.rec_status = 0 and m.rec_status = 0 @@ -289,6 +291,8 @@ g.group_name as groupName, p.id as playerId, p.`name` as playerName, + a.mRemark as groupRemark, + a.mGender as gender, if(a.tId is null,0,1) as joinProject FROM t_compete_group g @@ -339,5 +343,19 @@ and t.rec_status = 0 and m.rec_status = 0 + \ No newline at end of file From 134e1e44b73e4cd42b96d85fcb08c63f985b11e9 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Wed, 11 Nov 2020 13:22:30 +0800 Subject: [PATCH 06/80] 20201111v1.3 --- .../com/ccsens/mt/api/ProvinceController.java | 10 ++++ .../mt/bean/dto/ProvinceCompeteDto.java | 8 ++++ .../ccsens/mt/bean/vo/ProvinceCompeteVo.java | 2 + .../ccsens/mt/service/IProvinceService.java | 6 +++ .../ccsens/mt/service/ProvinceService.java | 47 ++++++++++++++++--- .../mapper_dao/CompeteCompanyDao.xml | 6 ++- 6 files changed, 72 insertions(+), 7 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java index d5e4dbeb..1b8daeb3 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java @@ -201,4 +201,14 @@ public class ProvinceController { log.info("团体报名查询可以参加和已经参加的选手：{}",groupAndPlayer); return JsonResponse.newInstance().ok(groupAndPlayer); } + + @MustLogin + @ApiOperation(value = "删除报名的队伍", notes = "") + @RequestMapping(value = "/del/team", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse delJoinTeam(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("删除报名的队伍：{}",params); + provinceService.delJoinTeam(params.getParam()); + log.info("删除报名的队伍"); + 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 e6de7633..6e72f124 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 @@ -159,4 +159,12 @@ public class ProvinceCompeteDto { @ApiModelProperty("组别信息") private int groupRemark; } + + @Data + @ApiModel("删除参赛队伍") + public static class DelTeam{ + @NotNull(message = "队伍id") + @ApiModelProperty("队伍id") + private Long teamId; + } } diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java index dcd6c676..3fb471a7 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java @@ -52,6 +52,8 @@ public class ProvinceCompeteVo { private int gender; @ApiModelProperty("组别信息") private int groupRemark; + @ApiModelProperty("团队id") + private Long teamId; @ApiModelProperty("选手信息") private List playerList; } diff --git a/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java index 965a40a3..53f30e7d 100644 --- a/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java @@ -145,4 +145,10 @@ public interface IProvinceService { * @return 返回所有可参赛的选手和已经参赛的选手 */ List getPlayerByTeamProjectWithRule(ProvinceCompeteDto.GetPlayerByTeamProjectWithRule param); + + /** + * 删除参赛的队伍 + * @param param ok + */ + void delJoinTeam(ProvinceCompeteDto.DelTeam param); } diff --git a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java index 50d5e977..cbf48c89 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -754,7 +754,23 @@ public class ProvinceService implements IProvinceService { //查找项目 CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId()); if(ObjectUtil.isNotNull(competeProject)){ - groupAndPlayerList = competeCompanyDao.getPlayerByTeamProject(param.getCompanyId(),param.getProjectId(),competeProject.getType()); + if(competeProject.getJoinRule() == 0) { + groupAndPlayerList = competeCompanyDao.getPlayerByTeamProject(param.getCompanyId(), param.getProjectId(), competeProject.getType()); + }else { + List playerInfoByGroupList = competeCompanyDao.queryPlayersByTeamProject(param.getCompanyId(),param.getProjectId()); +// groupAndPlayerList = competeCompanyDao.queryPlayersByTeamProject(param.getCompanyId(),param.getProjectId()); + ProvinceCompeteVo.GroupAndPlayer groupAndPlayer = new ProvinceCompeteVo.GroupAndPlayer(); + + CompeteTeamExample teamExample = new CompeteTeamExample(); + teamExample.createCriteria().andProjectIdEqualTo(param.getProjectId()).andCompanyIdEqualTo(param.getCompanyId()); + List teamList = competeTeamDao.selectByExample(teamExample); + if(CollectionUtil.isNotEmpty(teamList)){ + groupAndPlayer.setTeamId(teamList.get(0).getId()); + } + groupAndPlayer.setGroupName("不限制组别"); + groupAndPlayer.setPlayerList(playerInfoByGroupList); + groupAndPlayerList.add(groupAndPlayer); + } } return groupAndPlayerList; } @@ -770,11 +786,11 @@ public class ProvinceService implements IProvinceService { if(ObjectUtil.isNotNull(competeProject) && competeProject.getTeam() == 1){ //如果同单位不限组别 if(competeProject.getJoinRule() == 1){ -// groupAndPlayerList = competeCompanyDao.queryPlayerByGroupId(competeProject.getType(),param.getCompanyId(),null,param.getProjectId()); - List playerInfoByGroupList = competeCompanyDao.queryPlayersByTeamProject(param.getCompanyId(),param.getProjectId()); - ProvinceCompeteVo.GroupAndPlayer groupAndPlayer = new ProvinceCompeteVo.GroupAndPlayer(); - groupAndPlayer.setGroupName("不限制组别"); - groupAndPlayer.setPlayerList(playerInfoByGroupList); + groupAndPlayerList = competeCompanyDao.queryPlayerByGroupId(competeProject.getType(),param.getCompanyId(),null,param.getProjectId()); +// List playerInfoByGroupList = competeCompanyDao.queryPlayersByTeamProject(param.getCompanyId(),param.getProjectId()); +// ProvinceCompeteVo.GroupAndPlayer groupAndPlayer = new ProvinceCompeteVo.GroupAndPlayer(); +// groupAndPlayer.setGroupName("不限制组别"); +// groupAndPlayer.setPlayerList(playerInfoByGroupList); } //如果同单位限制组别 if(competeProject.getJoinRule() == 0){ @@ -788,5 +804,24 @@ public class ProvinceService implements IProvinceService { } return groupAndPlayerList; } + + @Override + public void delJoinTeam(ProvinceCompeteDto.DelTeam param) { + CompeteTeam competeTeam = competeTeamDao.selectByPrimaryKey(param.getTeamId()); + if(ObjectUtil.isNotNull(competeTeam)){ + competeTeam.setRecStatus((byte) 2); + competeTeamDao.updateByPrimaryKeySelective(competeTeam); + + CompeteTeamMemberExample teamMemberExample = new CompeteTeamMemberExample(); + teamMemberExample.createCriteria().andCompeteTeamIdEqualTo(param.getTeamId()); + List teamMemberList = teamMemberMapper.selectByExample(teamMemberExample); + if(CollectionUtil.isNotEmpty(teamMemberList)){ + teamMemberList.forEach(teamMember -> { + teamMember.setRecStatus((byte) 2); + teamMemberMapper.updateByPrimaryKeySelective(teamMember); + }); + } + } + } } diff --git a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml index f8ae9d5b..57baa676 100644 --- a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml @@ -21,6 +21,7 @@ + @@ -239,7 +240,10 @@ g.id as groupId, g.group_name as groupName, p.id as playerId, - p.`name` as playerName + p.`name` as playerName, + t.gender_group as gender, + t.group_remark as groupRemark, + t.id as teamId FROM t_compete_group g LEFT JOIN t_compete_team t on g.sex = t.gender_group and g.group_remark = t.group_remark From 0171df597084f84c33579112ef36a75330c387d2 Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Wed, 11 Nov 2020 13:29:59 +0800 Subject: [PATCH 07/80] 11-11 --- .../com/ccsens/mt/api/ExcelController.java | 16 ++-- .../com/ccsens/mt/api/ProvinceController.java | 18 ++--- .../mt/bean/dto/ProvinceCompeteDto.java | 11 ++- .../java/com/ccsens/mt/bean/vo/TableVo.java | 9 ++- .../com/ccsens/mt/service/ExcelService.java | 80 ++++++++++++------- .../ccsens/mt/service/IProvinceService.java | 12 +-- .../ccsens/mt/service/ProvinceService.java | 20 ++--- mt/src/main/resources/application.yml | 4 +- .../mapper_dao/CompeteProjectConfigDao.xml | 3 +- .../mapper_dao/CompeteProjectDao.xml | 3 +- 10 files changed, 106 insertions(+), 70 deletions(-) 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 4fc1403a..899f0c7c 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ExcelController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ExcelController.java @@ -83,28 +83,28 @@ public class ExcelController { @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) { + public JsonResponse dailyScheduleProcess(@ApiParam @Validated @RequestBody QueryDto params) { log.info("日程安排中间表：{}",params); - List dailyScheduleProcessList = excelService.dailyScheduleProcess(params); + List dailyScheduleProcessList = excelService.dailyScheduleProcess(params.getParam()); 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) { + public JsonResponse updateAndSearch(@ApiParam @Validated @RequestBody QueryDto params) { log.info("日程安排更新：{}",params); - excelService.updateAndSearch(params); - return JsonResponse.newInstance().ok(); + List dailyScheduleProcessList = excelService.updateAndSearch(params.getParam()); + return JsonResponse.newInstance().ok(dailyScheduleProcessList); } @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) { + public JsonResponse getEnterInfo(@ApiParam @Validated @RequestBody QueryDto params) { log.info("日程安排更新：{}",params); - excelService.getCompeteJoinDetail(params); - return JsonResponse.newInstance().ok(); + List competeJoinList = excelService.getCompeteJoinDetail(params.getParam()); + return JsonResponse.newInstance().ok(competeJoinList); } diff --git a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java index d5e4dbeb..e26611ba 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java @@ -182,15 +182,15 @@ public class ProvinceController { return JsonResponse.newInstance().ok(coachInfo); } - @MustLogin - @ApiOperation(value = "查找团体比赛已报名的选手信息", notes = "") - @RequestMapping(value = "/teamProject/player", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse> getPlayerByTeamProject(@ApiParam @Validated @RequestBody QueryDto params) { - log.info("查找团体比赛已报名的选手信息：{}",params); - List groupAndPlayer = provinceService.getPlayerByTeamProject(params.getParam()); - log.info("查找团体比赛已报名的选手信息：{}",groupAndPlayer); - return JsonResponse.newInstance().ok(groupAndPlayer); - } +// @MustLogin +// @ApiOperation(value = "查找团体比赛已报名的选手信息", notes = "") +// @RequestMapping(value = "/teamProject/player", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) +// public JsonResponse> getPlayerByTeamProject(@ApiParam @Validated @RequestBody QueryDto params) { +// log.info("查找团体比赛已报名的选手信息：{}",params); +//// List groupAndPlayer = provinceService.getPlayerByTeamProject(params.getParam()); +// log.info("查找团体比赛已报名的选手信息：{}",groupAndPlayer); +// return JsonResponse.newInstance().ok(groupAndPlayer); +// } @MustLogin @ApiOperation(value = "团体报名查询可以参加和已经参加的选手", notes = "") 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 a2351388..1fe89e25 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 @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotNull; +import java.util.Date; import java.util.List; /** @@ -133,18 +134,20 @@ public class ProvinceCompeteDto { @Data @ApiModel("修改日程安排") public static class UpdateAndSearch{ + @ApiModelProperty("项目id") + private Long projectId; @ApiModelProperty("参赛项目") private String projectName; @ApiModelProperty("参赛人/队伍") private int joinNum; @ApiModelProperty("单项时间") - private long singleTime; + private Long singleTime; @ApiModelProperty("场地") private int siteNum; @ApiModelProperty("场次") - private long games; + private Long games; @ApiModelProperty("总时间") - private long timeSum; + private Long timeSum; @ApiModelProperty("项目开始时间") private Long startTime; @ApiModelProperty("项目结束时间") @@ -156,6 +159,7 @@ public class ProvinceCompeteDto { public static class UpdateAndSearchList { private List updateAndSearchList; } + @ApiModel("查找团队项目下已参加的选手信息") public static class GetPlayerByTeamProject{ @NotNull(message = "请先填写基础信息") @@ -164,6 +168,7 @@ public class ProvinceCompeteDto { @NotNull(message = "请选择项目") @ApiModelProperty("项目id") private Long projectId; + } @Data 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 7df4ca4f..f4b9bef8 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 @@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -17,6 +18,8 @@ public class TableVo { @Data @ApiModel("XXXX大赛报名表") public static class CompeteJoin{ + @ApiModelProperty("参赛id") + private Long projectId; @ApiModelProperty("参赛项目") private String competeProject; @ApiModelProperty("组别") @@ -113,6 +116,8 @@ public class TableVo { @Data @ApiModel("日程安排") public static class DailyScheduleProcess{ + @ApiModelProperty("参赛id") + private Long projectId; @ApiModelProperty("参赛项目") private String projectName; @ApiModelProperty("参赛人/队伍") @@ -122,9 +127,9 @@ public class TableVo { @ApiModelProperty("场地") private int siteNum; @ApiModelProperty("场次") - private long games; + private double games; @ApiModelProperty("总时间") - private long timeSum; + private double timeSum; @ApiModelProperty("项目开始时间") private Long startTime; @ApiModelProperty("项目结束时间") 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 83eed9fe..b4adbe69 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -16,6 +16,8 @@ import com.ccsens.util.WebConstant; import com.ccsens.util.bean.dto.QueryDto; import com.ccsens.util.exception.BaseException; +import com.ctc.wstx.util.DataUtil; +import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; @@ -27,7 +29,9 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.List; @Slf4j @@ -383,6 +387,8 @@ public class ExcelService implements IExcelService { // } //参赛项目名赋值 competeJoin.setCompeteProject(projectName); + //项目id + competeJoin.setProjectId(competeProject.getId()); competeJoinList.add(competeJoin); } @@ -453,6 +459,8 @@ public class ExcelService implements IExcelService { // } //参赛项目名赋值 competeJoin.setCompeteProject(projectName); + //项目id + competeJoin.setProjectId(competeProject.getId()); competeJoinList.add(competeJoin); } } @@ -538,7 +546,8 @@ public class ExcelService implements IExcelService { @Override - public String competeJoinCount(CompeteDto.CompeteTime params) throws IOException { + public String + competeJoinCount(CompeteDto.CompeteTime params) throws IOException { List competeOverviewList = competeJoinCountList(params); String path = getExcelFilePathForCompeteJoinCount(competeOverviewList); return path; @@ -793,7 +802,8 @@ public class ExcelService implements IExcelService { dailyScheduleProcess.setJoinNum((int) count); //项目名 dailyScheduleProcess.setProjectName(competeProject.getName()); - + //项目id + dailyScheduleProcess.setProjectId(competeProject.getId()); CompeteProjectConfig competeProjectConfig = competeProjectConfigDao.selectByProjectId(competeProject.getId()); if (ObjectUtil.isNotNull(competeProjectConfig)) { //单项时间 @@ -801,10 +811,11 @@ public class ExcelService implements IExcelService { //场地 dailyScheduleProcess.setSiteNum(competeProjectConfig.getSiteNum()); //场次 - long times = count / competeProjectConfig.getSiteNum(); + double a = (double)count / (double)competeProjectConfig.getSiteNum(); + double times = Math.ceil(a); dailyScheduleProcess.setGames(times); //总时间 - long second = competeProjectConfig.getProjectDuration() * times; + double second = competeProjectConfig.getProjectDuration() * times; dailyScheduleProcess.setTimeSum(second); //项目开始时间 dailyScheduleProcess.setStartTime(competeProjectConfig.getStartTime()); @@ -816,13 +827,14 @@ public class ExcelService implements IExcelService { //是团队 CompeteTeamExample competeTeamExample = new CompeteTeamExample(); competeTeamExample.createCriteria().andProjectIdEqualTo(competeProject.getId()); - long count = competeTeamDao.countByExample(competeTeamExample); + int count = (int) competeTeamDao.countByExample(competeTeamExample); TableVo.DailyScheduleProcess dailyScheduleProcess = new TableVo.DailyScheduleProcess(); //队伍/人数 dailyScheduleProcess.setJoinNum((int) count); //项目名 dailyScheduleProcess.setProjectName(competeProject.getName()); - + //项目id + dailyScheduleProcess.setProjectId(competeProject.getId()); CompeteProjectConfig competeProjectConfig = competeProjectConfigDao.selectByProjectId(competeProject.getId()); if (ObjectUtil.isNotNull(competeProjectConfig)) { //单项时间 @@ -830,10 +842,12 @@ public class ExcelService implements IExcelService { //场地 dailyScheduleProcess.setSiteNum(competeProjectConfig.getSiteNum()); //场次 - long times = count / competeProjectConfig.getSiteNum(); + double a = (double)count / (double)competeProjectConfig.getSiteNum(); + double times = Math.ceil(a); dailyScheduleProcess.setGames(times); //总时间 - long second = competeProjectConfig.getProjectDuration() * times; + double second = competeProjectConfig.getProjectDuration() * times; + dailyScheduleProcess.setTimeSum(second); dailyScheduleProcess.setTimeSum(second); //项目开始时间 dailyScheduleProcess.setStartTime(competeProjectConfig.getStartTime()); @@ -852,38 +866,45 @@ public class ExcelService implements IExcelService { 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 competeProjectConfig = competeProjectConfigDao.selectByProjectId(updateAndSearch.getProjectId()); //修改单项时间，场地和开始结束时间 + if (ObjectUtil.isNotNull(competeProjectConfig)){ competeProjectConfig.setProjectDuration(updateAndSearch.getSingleTime()); competeProjectConfig.setSiteNum(updateAndSearch.getSiteNum()); competeProjectConfig.setStartTime(updateAndSearch.getStartTime()); competeProjectConfig.setEndTime(updateAndSearch.getEndTime()); - competeProjectConfigDao.updateByPrimaryKeySelective(competeProjectConfig); + CompeteProjectConfigExample competeProjectConfigExample = new CompeteProjectConfigExample(); + competeProjectConfigExample.createCriteria().andProjectIdEqualTo(updateAndSearch.getProjectId()); + int num = competeProjectConfigDao.updateByExampleSelective(competeProjectConfig,competeProjectConfigExample); + System.out.println(num); + } //返回前台的对象赋值 TableVo.DailyScheduleProcess dailyScheduleProcess = new TableVo.DailyScheduleProcess(); //项目名 dailyScheduleProcess.setProjectName(updateAndSearch.getProjectName()); + //项目id + dailyScheduleProcess.setProjectId(updateAndSearch.getProjectId()); //参赛人或者队伍 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()); + CompeteProjectConfig competeProjectConfig1 = competeProjectConfigDao.selectByProjectId(updateAndSearch.getProjectId()); + if (ObjectUtil.isNotNull(competeProjectConfig1)) { + dailyScheduleProcess.setSingleTime(competeProjectConfig1.getProjectDuration()); + //场地 + dailyScheduleProcess.setSiteNum(competeProjectConfig1.getSiteNum()); + //场次 + double a = (double) updateAndSearch.getJoinNum() /(double) competeProjectConfig1.getSiteNum(); + double games = Math.ceil(a); + dailyScheduleProcess.setGames(games); + //总时间 + double second = competeProjectConfig1.getProjectDuration() * games; + dailyScheduleProcess.setTimeSum(second); + //开始时间 + dailyScheduleProcess.setStartTime(competeProjectConfig1.getStartTime()); + //项目结束时间 + dailyScheduleProcess.setEndTime(competeProjectConfig1.getEndTime()); + } dailyScheduleProcessList.add(dailyScheduleProcess); } return dailyScheduleProcessList; @@ -912,6 +933,8 @@ public class ExcelService implements IExcelService { //查询每个报名人的详细信息下 CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(competeProjectPlayer.getPlayerId()); TableVo.CompeteJoin competeJoin = new TableVo.CompeteJoin(); + //项目id + competeJoin.setProjectId(competeProject.getId()); //姓名 competeJoin.setName(competePlayer.getName()); //身份证号 @@ -980,6 +1003,8 @@ public class ExcelService implements IExcelService { //查询成员详细信息 CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(competeTeamMember.getPlayerId()); TableVo.CompeteJoin competeJoin = new TableVo.CompeteJoin(); + //项目id + competeJoin.setProjectId(competeProject.getId()); //姓名 competeJoin.setName(competePlayer.getName()); //身份证号 @@ -995,7 +1020,6 @@ public class ExcelService implements IExcelService { } else { competeJoin.setGender("男"); } - //查询单位,并赋值 CompeteCompany competeCompany = competeCompanyMapper.selectByPrimaryKey(competePlayer.getCompanyId()); if (ObjectUtil.isNotNull(competeCompany)) { diff --git a/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java index 965a40a3..1fff7087 100644 --- a/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java @@ -132,12 +132,12 @@ public interface IProvinceService { */ ProvinceCompeteVo.GetCoach getCoachInfo(CompeteDto.LeaderId param); - /** - * 查找团队项目下已参加的选手信息 - * @param param 单位id和团体项目id - * @return 返回参加的选手的详细信息，按组别分类 - */ - List getPlayerByTeamProject(ProvinceCompeteDto.GetPlayerByTeamProject param); +// /** +// * 查找团队项目下已参加的选手信息 +// * @param param 单位id和团体项目id +// * @return 返回参加的选手的详细信息，按组别分类 +// */ +// List getPlayerByTeamProject(ProvinceCompeteDto.GetPlayerByTeamProject param); /** * 查找团队下符合规则的选手信息 diff --git a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java index 5eaf9556..abbade58 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -631,16 +631,16 @@ public class ProvinceService implements IProvinceService { /** * 查找团体项目下的参赛选手信息 */ - @Override - public List getPlayerByTeamProject(ProvinceCompeteDto.GetPlayerByTeamProject param) { - List groupAndPlayerList = null; - //查找项目 - CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId()); - if(ObjectUtil.isNotNull(competeProject)){ - groupAndPlayerList = competeCompanyDao.getPlayerByTeamProject(param.getProjectId(),competeProject.getType()); - } - return groupAndPlayerList; - } +// @Override +// public List getPlayerByTeamProject(ProvinceCompeteDto.GetPlayerByTeamProject param) { +// List groupAndPlayerList = null; +// //查找项目 +// CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId()); +// if(ObjectUtil.isNotNull(competeProject)){ +// groupAndPlayerList = competeCompanyDao.getPlayerByTeamProject(param.getProjectId(),competeProject.getType()); +// } +// return groupAndPlayerList; +// } /** * 查找符合参赛规则的选手信息 diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index 5889ff7f..5c2cd5c4 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: test - include: common, util-test \ No newline at end of file + active: dev + include: common, util-dev \ No newline at end of file diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml index 4af60200..66940463 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml @@ -14,6 +14,7 @@ \ 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 index 599eee15..233fac8c 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectDao.xml @@ -4,6 +4,7 @@ \ No newline at end of file From 9e9310d8a4a58625d2f6fa27710e9b6c7e5dcf31 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Wed, 11 Nov 2020 13:38:41 +0800 Subject: [PATCH 08/80] 20201111v1.4 --- .../com/ccsens/mt/api/ProvinceController.java | 18 +++++++++--------- .../mt/bean/dto/ProvinceCompeteDto.java | 1 + .../ccsens/mt/service/IProvinceService.java | 19 ++++++------------- 3 files changed, 16 insertions(+), 22 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java index 7e7d5aaa..1b8daeb3 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java @@ -182,15 +182,15 @@ public class ProvinceController { return JsonResponse.newInstance().ok(coachInfo); } -// @MustLogin -// @ApiOperation(value = "查找团体比赛已报名的选手信息", notes = "") -// @RequestMapping(value = "/teamProject/player", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) -// public JsonResponse> getPlayerByTeamProject(@ApiParam @Validated @RequestBody QueryDto params) { -// log.info("查找团体比赛已报名的选手信息：{}",params); -//// List groupAndPlayer = provinceService.getPlayerByTeamProject(params.getParam()); -// log.info("查找团体比赛已报名的选手信息：{}",groupAndPlayer); -// return JsonResponse.newInstance().ok(groupAndPlayer); -// } + @MustLogin + @ApiOperation(value = "查找团体比赛已报名的选手信息", notes = "") + @RequestMapping(value = "/teamProject/player", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> getPlayerByTeamProject(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("查找团体比赛已报名的选手信息：{}",params); + List groupAndPlayer = provinceService.getPlayerByTeamProject(params.getParam()); + log.info("查找团体比赛已报名的选手信息：{}",groupAndPlayer); + return JsonResponse.newInstance().ok(groupAndPlayer); + } @MustLogin @ApiOperation(value = "团体报名查询可以参加和已经参加的选手", notes = "") 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 75a4840c..c5c636b9 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 @@ -164,6 +164,7 @@ public class ProvinceCompeteDto { private List updateAndSearchList; } + @Data @ApiModel("查找团队项目下已参加的选手信息") public static class GetPlayerByTeamProject{ @NotNull(message = "请先填写基础信息") diff --git a/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java index ac2324aa..d83db6eb 100644 --- a/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java @@ -88,13 +88,6 @@ public interface IProvinceService { */ ProvinceCompeteVo.CompeteCompanyHeadList queryCoach(ProvinceCompeteDto.CompanyIdVo param); -// /** -// * 添加领队和教练信息 -// * @param -// * @param -// * @return -// */ -// void saveCoach(CompeteDto.AddCoach param); /** * 删除领队和教练信息 @@ -132,12 +125,12 @@ public interface IProvinceService { */ ProvinceCompeteVo.GetCoach getCoachInfo(CompeteDto.LeaderId param); -// /** -// * 查找团队项目下已参加的选手信息 -// * @param param 单位id和团体项目id -// * @return 返回参加的选手的详细信息，按组别分类 -// */ -// List getPlayerByTeamProject(ProvinceCompeteDto.GetPlayerByTeamProject param); + /** + * 查找团队项目下已参加的选手信息 + * @param param 单位id和团体项目id + * @return 返回参加的选手的详细信息，按组别分类 + */ + List getPlayerByTeamProject(ProvinceCompeteDto.GetPlayerByTeamProject param); /** * 查找团队下符合规则的选手信息 From 7280af79ca1951e850706cf4c5b1218824833e45 Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Wed, 11 Nov 2020 14:14:17 +0800 Subject: [PATCH 09/80] 11-11-3 --- .../main/java/com/ccsens/mt/api/ExcelController.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 899f0c7c..92ffa3bb 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ExcelController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ExcelController.java @@ -34,7 +34,7 @@ public class ExcelController { private IExcelService excelService; @MustLogin - @ApiOperation(value = "xxx大赛报名表", notes = "") + @ApiOperation(value = "xxx大赛报名表(导出)", notes = "") @RequestMapping(value = "/competeJoin", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse competeJoin(@ApiParam @Validated @RequestBody QueryDto params) throws IOException { log.info("xxx大赛报名表：{}",params); @@ -44,7 +44,7 @@ public class ExcelController { @MustLogin - @ApiOperation(value = "参赛人数统计表", notes = "") + @ApiOperation(value = "参赛人数统计表(导出)", notes = "") @RequestMapping(value = "/competeJoinCount", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse competeJoinCount(@ApiParam @Validated @RequestBody QueryDto params) throws IOException { log.info("参赛人数统计表：{}",params); @@ -54,7 +54,7 @@ public class ExcelController { @MustLogin - @ApiOperation(value = "XXX比赛报名汇总表", notes = "") + @ApiOperation(value = "XXX比赛报名汇总表(导出)", notes = "") @RequestMapping(value = "/competeAllCount", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse competeAllCount(@ApiParam @Validated @RequestBody QueryDto params) throws IOException { log.info("XXX比赛报名汇总表：{}",params); @@ -81,7 +81,7 @@ public class ExcelController { } @MustLogin - @ApiOperation(value = "日程安排中间表", notes = "") + @ApiOperation(value = "日程安排中间表（查询）", notes = "") @RequestMapping(value = "/dailyScheduleProcess", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse dailyScheduleProcess(@ApiParam @Validated @RequestBody QueryDto params) { log.info("日程安排中间表：{}",params); @@ -90,7 +90,7 @@ public class ExcelController { } @MustLogin - @ApiOperation(value = "日程安排更新", notes = "") + @ApiOperation(value = "日程安排更新（查询）", notes = "") @RequestMapping(value = "/updateAndSearchSchedule", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse updateAndSearch(@ApiParam @Validated @RequestBody QueryDto params) { log.info("日程安排更新：{}",params); @@ -99,7 +99,7 @@ public class ExcelController { } @MustLogin - @ApiOperation(value = "xxx大赛报名表", notes = "") + @ApiOperation(value = "xxx大赛报名表（查询）", notes = "") @RequestMapping(value = "/enterInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse getEnterInfo(@ApiParam @Validated @RequestBody QueryDto params) { log.info("日程安排更新：{}",params); From bf10ce34d572feebded4e920ee1b002c2e186302 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Wed, 11 Nov 2020 16:11:59 +0800 Subject: [PATCH 10/80] 20201111v1.6 --- mt/src/main/resources/application.yml | 4 ++-- mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index 5c2cd5c4..5889ff7f 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: dev - include: common, util-dev \ No newline at end of file + active: test + include: common, util-test \ No newline at end of file diff --git a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml index 57baa676..2f06dfc0 100644 --- a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml @@ -53,7 +53,7 @@ if(pp.id is null and a.mId is null,0,1) as joinProject FROM t_compete_group cg - LEFT JOIN t_compete_player p on (cg.id = p.compete_group_id or (cg.sex = p.gender and cg.group_remark = p.group_remark)) + LEFT JOIN t_compete_player p on cg.id = p.compete_group_id LEFT JOIN t_compete_project_player pp on p.id = pp.player_id and pp.project_id = #{projectId} and pp.rec_status = 0 LEFT JOIN ( SELECT From 99cd3aeb43e721381336064a7dcd48d9d3a9bc9a Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Wed, 11 Nov 2020 19:18:12 +0800 Subject: [PATCH 11/80] 11-11-4 --- .../com/ccsens/mt/api/ExcelController.java | 10 +++- .../java/com/ccsens/mt/bean/vo/TableVo.java | 31 +++++++++++++ .../persist/dao/CompeteProjectConfigDao.java | 3 +- .../persist/mapper/CompeteProjectMapper.java | 4 ++ .../com/ccsens/mt/service/ExcelService.java | 46 ++++++++++++++++++- .../com/ccsens/mt/service/IExcelService.java | 6 +++ .../mapper_dao/CompeteProjectConfigDao.xml | 7 +++ 7 files changed, 104 insertions(+), 3 deletions(-) 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 92ffa3bb..5a66c731 100644 --- 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 getEnterInfo(@ApiParam @Validated @RequestBody QueryDto params) { + public JsonResponse getEnterInfo(@ApiParam @Validated @RequestBody QueryDto params) { log.info("日程安排更新：{}",params); List 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 schedulePlanning(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("日程安排更新：{}",params); + TableVo.SchedulePlan schedulePlanDetailAllInList = excelService.schedulePlanning(params.getParam()); + return JsonResponse.newInstance().ok(schedulePlanDetailAllInList); + } } 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 f4b9bef8..6e26d9fc 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 @@ -134,7 +134,38 @@ public class TableVo { private Long startTime; @ApiModelProperty("项目结束时间") private Long endTime; + } + + + @Data + @ApiModel("日程安排上下午") + public static class SchedulePlan{ + @ApiModelProperty("安排详情上午") + private List schedulePlanDetailListUp; + @ApiModelProperty("安排详情下午") + private List 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; + + } } 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 index 023bb3f4..27166e46 100644 --- 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 selectDetail (); } \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteProjectMapper.java b/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteProjectMapper.java index 47e4d6e6..323f429b 100644 --- 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); + + } \ 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 b4adbe69..65e5bf53 100644 --- 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 schedulePlanDetailListUp = new ArrayList<>(); + List schedulePlanDetailListDown = new ArrayList<>(); + //关联查询项目名，该项目在config和project中都存在 + List 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; + } } 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 db04abd4..cfa61f56 100644 --- 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 updateAndSearch(ProvinceCompeteDto.UpdateAndSearchList params); + /** + * 更新并查询 + * @param params 大赛id + * @return 返回失败的信息 + */ + TableVo.SchedulePlan 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 66940463..a7bd62b3 100644 --- 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 + \ No newline at end of file From 61aac0c3f7a7f1cf9fd3e8fde4c13934490b3224 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Wed, 11 Nov 2020 20:12:31 +0800 Subject: [PATCH 12/80] =?UTF-8?q?11-11=2020=EF=BC=9A12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/mt/api/ExcelController.java | 9 +- .../com/ccsens/mt/bean/vo/CompeteExcelVo.java | 62 ++++++ .../mt/persist/dao/CompeteCompanyDao.java | 3 + .../mt/persist/dao/CompetePlayerDao.java | 5 + .../ccsens/mt/persist/dao/CompeteTeamDao.java | 3 + .../com/ccsens/mt/service/ExcelService.java | 188 +++++++++++++++++- .../com/ccsens/mt/service/IExcelService.java | 2 + mt/src/main/resources/application.yml | 4 +- .../mapper_dao/CompeteCompanyDao.xml | 28 ++- .../resources/mapper_dao/CompetePlayerDao.xml | 38 +++- .../resources/mapper_dao/CompeteTeamDao.xml | 31 ++- .../test/java/com/ccsens/util/OtherTest.java | 8 + 12 files changed, 372 insertions(+), 9 deletions(-) create mode 100644 mt/src/main/java/com/ccsens/mt/bean/vo/CompeteExcelVo.java 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..ae9f61d4 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ExcelController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ExcelController.java @@ -78,7 +78,14 @@ public class ExcelController { return JsonResponse.newInstance().ok(path); } - + @MustLogin + @ApiOperation(value = "比赛出场顺序", notes = "") + @RequestMapping(value = "/competitionOrder", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse competitionOrder(@ApiParam @Validated @RequestBody QueryDto params) throws IOException { + log.info("导出比赛出场顺序：{}",params); + String path = excelService.iCompetitionOrderService(params); + return JsonResponse.newInstance().ok(path); + } } diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteExcelVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteExcelVo.java new file mode 100644 index 00000000..84e8bb67 --- /dev/null +++ b/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 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 projectList; + @ApiModelProperty("月/日 上/下午") + private String year; + } +} diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java index 6266f255..0c86cb20 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java +++ b/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; @@ -140,4 +141,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 selectProjectByType(Long id); } diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompetePlayerDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompetePlayerDao.java index 024d2545..a9284b3a 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompetePlayerDao.java +++ b/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 getTeamJoinNumByType(@Param("timeId")Long timeId); List getTeamJoinNumByProjectId(@Param("projectId")Long projectId); + + CompeteGroup selectBySexAndRemark(int gender, int groupRemark); + List selectSinglePlayerByProjectId(Long id); } diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteTeamDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteTeamDao.java index 4351f731..dbc96eae 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteTeamDao.java +++ b/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 getPlayerByProjectId(@Param("competeProjectId")Long competeProjectId, @Param("competeTimeId")Long competeTimeId); + + List selectTeamMemberByProjectId(Long id); } 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..d06dd136 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.IdcardUtil; import cn.hutool.core.util.ObjectUtil; import com.ccsens.mt.bean.dto.CompeteDto; 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.*; @@ -16,18 +17,21 @@ import com.ccsens.util.WebConstant; import com.ccsens.util.bean.dto.QueryDto; import com.ccsens.util.exception.BaseException; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.map.HashedMap; 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.util.ArrayList; -import java.util.List; +import java.text.SimpleDateFormat; +import java.util.*; @Slf4j @Service @@ -52,6 +56,8 @@ public class ExcelService implements IExcelService { @Resource private CompeteGroupMapper competeGroupMapper; @Resource + private CompeteProjectConfigMapper competeProjectConfigMapper; + @Resource private CommonFileMapper commonFileMapper; @Resource private IProvinceService provinceService; @@ -632,6 +638,184 @@ public class ExcelService implements IExcelService { return path; } + /** + * 导出出场顺序表 + * @param params + * @return + */ + @Override + public String iCompetitionOrderService(QueryDto params) { + List competeProjectList= competeCompanyDao.selectProjectByType(params.getParam().getCompeteTimeId()); + for (int i=0;i singleOrderPlayerList=competePlayerDao.selectSinglePlayerByProjectId(competeProject.getId()); + size = singleOrderPlayerList.stream().mapToInt(singleOrderPlayer -> singleOrderPlayer.getCompanyNameList().size()).sum(); + competeProject.setProjectList(singleOrderPlayerList); + }else { + List 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> biao = new ArrayList<>(); + List 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 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 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 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 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 competeAllCountList(CompeteDto.CompeteTime params){ // //根据大赛查类型 // Long competeTimeId = params.getCompeteTimeId(); 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..63ccc6b3 100644 --- a/mt/src/main/java/com/ccsens/mt/service/IExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/IExcelService.java @@ -46,4 +46,6 @@ public interface IExcelService { * @return 返回失败的信息 */ String competeAllCount(CompeteDto.CompeteTime params) throws IOException; + + String iCompetitionOrderService(QueryDto params); } diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index 5889ff7f..5c2cd5c4 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: test - include: common, util-test \ No newline at end of file + active: dev + include: common, util-dev \ No newline at end of file diff --git a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml index 467c77f3..369fc77d 100644 --- a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml @@ -15,7 +15,14 @@ - + + + + + + + + @@ -339,5 +346,22 @@ and t.rec_status = 0 and m.rec_status = 0 - + \ No newline at end of file diff --git a/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml b/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml index 24d3a093..1dcb019d 100644 --- a/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml +++ b/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml @@ -30,7 +30,15 @@ - + + + + + + + + + + + \ No newline at end of file diff --git a/mt/src/main/resources/mapper_dao/CompeteTeamDao.xml b/mt/src/main/resources/mapper_dao/CompeteTeamDao.xml index 43f85a30..9bbbc68b 100644 --- a/mt/src/main/resources/mapper_dao/CompeteTeamDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteTeamDao.xml @@ -14,7 +14,15 @@ - + + + + + + + + + @@ -251,4 +259,25 @@ and pp.rec_status = 0 and p.rec_status = 0 + \ No newline at end of file diff --git a/util/src/test/java/com/ccsens/util/OtherTest.java b/util/src/test/java/com/ccsens/util/OtherTest.java index 723727e2..b3472d1a 100644 --- a/util/src/test/java/com/ccsens/util/OtherTest.java +++ b/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); + } } From 9bb13ac9ccffa950da61b30bf130f0db61bf6ecf Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Wed, 11 Nov 2020 21:23:59 +0800 Subject: [PATCH 13/80] =?UTF-8?q?20201111=E4=B8=8B=E7=8F=AD=E5=89=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/mt/api/ExcelController.java | 2 +- .../ccsens/mt/service/ProvinceService.java | 85 ++++++++++++------- mt/src/main/resources/application.yml | 4 +- .../main/java/com/ccsens/util/CodeEnum.java | 2 + 4 files changed, 61 insertions(+), 32 deletions(-) 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 92ffa3bb..7ba8e0a3 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ExcelController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ExcelController.java @@ -101,7 +101,7 @@ public class ExcelController { @MustLogin @ApiOperation(value = "xxx大赛报名表（查询）", notes = "") @RequestMapping(value = "/enterInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse getEnterInfo(@ApiParam @Validated @RequestBody QueryDto params) { + public JsonResponse getEnterInfo(@ApiParam @Validated @RequestBody QueryDto params) { log.info("日程安排更新：{}",params); List competeJoinList = excelService.getCompeteJoinDetail(params.getParam()); return JsonResponse.newInstance().ok(competeJoinList); diff --git a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java index d4dfd051..255bcdb5 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -120,7 +120,6 @@ public class ProvinceService implements IProvinceService { player.setId(snowflake.nextId()); player.setName(param.getPlayerName()); - if(ObjectUtil.isNull(param.getCompeteId())){ throw new BaseException(CodeEnum.NOT_COMPANY); } //身份证不能为空，且正确 if(StrUtil.isEmpty(param.getIdCard()) || !IdcardUtil.isValidCard(param.getIdCard())){throw new BaseException(CodeEnum.ID_CARD_ERROR);} @@ -159,7 +158,7 @@ public class ProvinceService implements IProvinceService { //判断各种证件是否为空 if(ObjectUtil.isNull(param.getIdCardFront()) && ObjectUtil.isNotNull(param.getIdCardBack())){ param.setIdCardFront(param.getIdCardBack()); - param.setIdCardBack(null); + param.setIdCardBack(0L); } if(ObjectUtil.isNull(param.getIdCardFront())){ throw new BaseException(CodeEnum.PHOTO_IS_EMPTY.mtMsgPhoto("身份证/户口本信息")); } if(ObjectUtil.isNull(param.getIdPhone())){ throw new BaseException(CodeEnum.PHOTO_IS_EMPTY.mtMsgPhoto("证件照")); } @@ -184,7 +183,7 @@ public class ProvinceService implements IProvinceService { CompetePlayer player = competePlayerDao.selectByPrimaryKey(param.getPlayerId()); log.info("查找需要修改的选手信息：{}",player); if(ObjectUtil.isNull(player)){ throw new BaseException(CodeEnum.PARAM_ERROR); } - //身份证不能为空，且正确 + //身份证正确 if(!IdcardUtil.isValidCard(param.getIdCard())){throw new BaseException(CodeEnum.ID_CARD_ERROR);} //是否已注册 CompetePlayerExample competePlayerExample = new CompetePlayerExample(); @@ -211,14 +210,24 @@ public class ProvinceService implements IProvinceService { } //字段不为空则修改 if(StrUtil.isNotEmpty(param.getPlayerName())){player.setName(param.getPlayerName());} - if(StrUtil.isNotEmpty(param.getIdCard())){player.setIdCard(param.getIdCard());} - if(ObjectUtil.isNotNull(param.getGender())){player.setGender((byte) param.getGender());} - if(ObjectUtil.isNotNull(competeGroup)){player.setCompeteGroupId(competeGroup.getId());} - if(ObjectUtil.isNotNull(param.getGroupRemark())){player.setGroupRemark((byte) param.getGroupRemark());} + + if(getJoinProject(player.getId()) && (!param.getIdCard().equalsIgnoreCase(player.getIdCard()) + || param.getGroupRemark() != player.getGroupRemark())){ + throw new BaseException(CodeEnum.ALREADY_JOIN_PROJECT); + } +// if(StrUtil.isNotEmpty(param.getIdCard())){player.setIdCard(param.getIdCard());} +// if(ObjectUtil.isNotNull(param.getGender())){player.setGender((byte) param.getGender());} +// if(ObjectUtil.isNotNull(competeGroup)){player.setCompeteGroupId(competeGroup.getId());} +// if(ObjectUtil.isNotNull(param.getGroupRemark())){player.setGroupRemark((byte) param.getGroupRemark());} + if(ObjectUtil.isNotNull(param.getCompeteId())){player.setCompanyId(param.getCompeteId());} - if(ObjectUtil.isNotNull(param.getIdCardFront())){player.setIdCardFrontFile(param.getIdCardFront());} - if(ObjectUtil.isNotNull(param.getIdCardBack())){player.setIdCardBackFile(param.getIdCardBack());} +// if(ObjectUtil.isNotNull(param.getIdCardFront())){ + player.setIdCardFrontFile(param.getIdCardFront() == null ? 0 : param.getIdCardFront()); +// } +// if(ObjectUtil.isNotNull(param.getIdCardBack())){ + player.setIdCardBackFile(param.getIdCardBack() == null ? 0 : param.getIdCardBack()); +// } if(ObjectUtil.isNotNull(param.getIdPhone())){player.setIdPhotoFile(param.getIdPhone());} if(ObjectUtil.isNotNull(param.getStudentRecord())){player.setStudentRecordFile(param.getStudentRecord());} if(ObjectUtil.isNotNull(param.getHealthRecord())){player.setHealthRecordFile(param.getHealthRecord());} @@ -399,28 +408,31 @@ public class ProvinceService implements IProvinceService { Long playerId = param.getPlayerId(); CompetePlayer competePlayer = competePlayerMapper.selectByPrimaryKey(playerId); if (ObjectUtil.isNotNull(competePlayer)){ + if(getJoinProject(playerId)){ + throw new BaseException(CodeEnum.ALREADY_JOIN_PROJECT_DEL); + } competePlayer.setRecStatus((byte) 2); competePlayerMapper.updateByPrimaryKeySelective(competePlayer); - //删除成员报名的信息 - CompeteProjectPlayerExample projectPlayerExample = new CompeteProjectPlayerExample(); - projectPlayerExample.createCriteria().andPlayerIdEqualTo(playerId); - List projectPlayerList = projectPlayerMapper.selectByExample(projectPlayerExample); - if(CollectionUtil.isNotEmpty(projectPlayerList)){ - projectPlayerList.forEach(projectPlayer -> { - projectPlayer.setRecStatus((byte) 2); - projectPlayerMapper.updateByPrimaryKeySelective(projectPlayer); - }); - } - //团队 - CompeteTeamMemberExample memberExample = new CompeteTeamMemberExample(); - memberExample.createCriteria().andPlayerIdEqualTo(playerId); - List memberList = teamMemberMapper.selectByExample(memberExample); - if(CollectionUtil.isNotEmpty(memberList)){ - memberList.forEach(member -> { - member.setRecStatus((byte) 2); - teamMemberMapper.updateByPrimaryKeySelective(member); - }); - } +// //删除成员报名的信息 +// CompeteProjectPlayerExample projectPlayerExample = new CompeteProjectPlayerExample(); +// projectPlayerExample.createCriteria().andPlayerIdEqualTo(playerId); +// List projectPlayerList = projectPlayerMapper.selectByExample(projectPlayerExample); +// if(CollectionUtil.isNotEmpty(projectPlayerList)){ +// projectPlayerList.forEach(projectPlayer -> { +// projectPlayer.setRecStatus((byte) 2); +// projectPlayerMapper.updateByPrimaryKeySelective(projectPlayer); +// }); +// } +// //团队 +// CompeteTeamMemberExample memberExample = new CompeteTeamMemberExample(); +// memberExample.createCriteria().andPlayerIdEqualTo(playerId); +// List memberList = teamMemberMapper.selectByExample(memberExample); +// if(CollectionUtil.isNotEmpty(memberList)){ +// memberList.forEach(member -> { +// member.setRecStatus((byte) 2); +// teamMemberMapper.updateByPrimaryKeySelective(member); +// }); +// } // CompetePlayerExample competePlayerExample = new CompetePlayerExample(); // competePlayerExample.createCriteria().andIdEqualTo(playerId); // competePlayerMapper.updateByExampleSelective(competePlayer,competePlayerExample); @@ -824,5 +836,20 @@ public class ProvinceService implements IProvinceService { } } } + + + /** + * 查询运动员是否参加了比赛 + */ + private boolean getJoinProject(Long playerId){ + CompeteProjectPlayerExample projectPlayerExample = new CompeteProjectPlayerExample(); + projectPlayerExample.createCriteria().andPlayerIdEqualTo(playerId); + if(projectPlayerMapper.countByExample(projectPlayerExample) == 0){ + return false; + } + CompeteTeamMemberExample teamMemberExample = new CompeteTeamMemberExample(); + teamMemberExample.createCriteria().andPlayerIdEqualTo(playerId); + return teamMemberMapper.countByExample(teamMemberExample) != 0; + } } diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index 5889ff7f..d082c0ea 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: test - include: common, util-test \ No newline at end of file + active: prod + include: common, util-prod \ No newline at end of file diff --git a/util/src/main/java/com/ccsens/util/CodeEnum.java b/util/src/main/java/com/ccsens/util/CodeEnum.java index 0806e037..6fcb0eb5 100644 --- a/util/src/main/java/com/ccsens/util/CodeEnum.java +++ b/util/src/main/java/com/ccsens/util/CodeEnum.java @@ -176,6 +176,8 @@ public enum CodeEnum { MEMBER_NUM_ERROR(145,"参赛人数不满足比赛人数要求",true), GENDER_ERROR(146,"请选择正确的性别",true), JOIN_AUTH_GROUP(147,"已参加了其他组别，无法再次报名",true), + ALREADY_JOIN_PROJECT(148,"该选手已经参加了比赛，不可修改身份证组别等信息",true), + ALREADY_JOIN_PROJECT_DEL(149,"取消报名后可删除",true), ; From d481a3e238534d0b88f72646a467954b73ce9b36 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Thu, 12 Nov 2020 16:26:15 +0800 Subject: [PATCH 14/80] =?UTF-8?q?=E6=96=B0=E5=BB=BAcontroller?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/mt/api/CompeteTaskController.java | 13 +++++++++++++ .../com/ccsens/mt/api/CompeteVedioController.java | 14 ++++++++++++++ .../java/com/ccsens/mt/api/SigninController.java | 4 ++++ 3 files changed, 31 insertions(+) create mode 100644 mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java create mode 100644 mt/src/main/java/com/ccsens/mt/api/CompeteVedioController.java diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java new file mode 100644 index 00000000..c89c3775 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java @@ -0,0 +1,13 @@ +package com.ccsens.mt.api; + +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Api(tags = "日程", description = "") +@RestController +@RequestMapping("/task") +@Slf4j +public class CompeteTaskController { +} diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteVedioController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteVedioController.java new file mode 100644 index 00000000..f823e4a3 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteVedioController.java @@ -0,0 +1,14 @@ +package com.ccsens.mt.api; + +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Api(tags = "视频", description = "") +@RestController +@RequestMapping("/vedio") +@Slf4j +public class CompeteVedioController { + +} diff --git a/mt/src/main/java/com/ccsens/mt/api/SigninController.java b/mt/src/main/java/com/ccsens/mt/api/SigninController.java index bb885b2a..e5aab45b 100644 --- a/mt/src/main/java/com/ccsens/mt/api/SigninController.java +++ b/mt/src/main/java/com/ccsens/mt/api/SigninController.java @@ -112,4 +112,8 @@ public class SigninController { return JsonResponse.newInstance().ok(getSignInfoVoList); } + + + + } From 8c9de4ff365e21c0ace05012dcbe03e10c81d2fd Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Thu, 12 Nov 2020 16:57:45 +0800 Subject: [PATCH 15/80] 20201112v1.0 --- .../ccsens/mt/api/CompeteScoreController.java | 11 +- .../mt/bean/dto/ProvinceCompeteDto.java | 2 +- .../ccsens/mt/bean/po/CompeteCountScore.java | 172 ++ .../mt/bean/po/CompeteCountScoreExample.java | 1051 ++++++++++++ .../ccsens/mt/bean/po/CompetePlayerLook.java | 95 ++ .../mt/bean/po/CompetePlayerLookExample.java | 621 +++++++ .../mt/bean/po/CompeteProjectConfig.java | 232 +-- .../bean/po/CompeteProjectConfigExample.java | 1480 ++++++++--------- .../ccsens/mt/bean/po/CompeteStartOrder.java | 95 ++ .../mt/bean/po/CompeteStartOrderExample.java | 621 +++++++ .../com/ccsens/mt/bean/po/CompeteVideo.java | 59 +- .../mt/bean/po/CompeteVideoExample.java | 262 ++- .../mapper/CompeteCountScoreMapper.java | 30 + .../mapper/CompetePlayerLookMapper.java | 30 + .../mapper/CompeteProjectConfigMapper.java | 58 +- .../mapper/CompeteStartOrderMapper.java | 30 + .../ccsens/mt/service/ProvinceService.java | 10 +- .../mapper_raw/CompeteCountScoreMapper.xml | 354 ++++ .../mapper_raw/CompetePlayerLookMapper.xml | 243 +++ .../mapper_raw/CompeteProjectConfigMapper.xml | 550 +++--- .../mapper_raw/CompeteStartOrderMapper.xml | 243 +++ .../mapper_raw/CompeteVideoMapper.xml | 123 +- 22 files changed, 4929 insertions(+), 1443 deletions(-) create mode 100644 mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScore.java create mode 100644 mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreExample.java create mode 100644 mt/src/main/java/com/ccsens/mt/bean/po/CompetePlayerLook.java create mode 100644 mt/src/main/java/com/ccsens/mt/bean/po/CompetePlayerLookExample.java create mode 100644 mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrder.java create mode 100644 mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrderExample.java create mode 100644 mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteCountScoreMapper.java create mode 100644 mt/src/main/java/com/ccsens/mt/persist/mapper/CompetePlayerLookMapper.java create mode 100644 mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteStartOrderMapper.java create mode 100644 mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml create mode 100644 mt/src/main/resources/mapper_raw/CompetePlayerLookMapper.xml create mode 100644 mt/src/main/resources/mapper_raw/CompeteStartOrderMapper.xml diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java index a855fda7..a1262f24 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java @@ -24,7 +24,7 @@ import javax.annotation.Resource; @Slf4j @Api(tags = "线上体育竞技比赛", description = "") @RestController -@RequestMapping("/compete") +@RequestMapping("/compete/score") public class CompeteScoreController { @Resource private ICompeteService competeService; @@ -38,14 +38,7 @@ public class CompeteScoreController { return JsonResponse.newInstance().ok(playerList); } -// @MustLogin -// @ApiOperation(value = "查看单个选手的信息和分数", notes = "") -// @RequestMapping(value = "/get/player", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) -// public JsonResponse getPlayerInfo(@ApiParam @Validated @RequestBody QueryDto params) { -// log.info("查询比赛项目上的参赛选手列表：{}",params); -// CompeteVo.QueryPlayerList playerList = competeService.queryPlayerList(params); -// return JsonResponse.newInstance().ok(playerList); -// } + } 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 c5c636b9..b40721cd 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 @@ -124,7 +124,7 @@ public class ProvinceCompeteDto { @ApiModelProperty("姓名") private String name; //姓名 @ApiModelProperty("性别") - private String gender; //性别 + private int gender; //性别 @ApiModelProperty("联系方式") private String phone; //联系方式 @ApiModelProperty("身份证号") diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScore.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScore.java new file mode 100644 index 00000000..d06a7d6b --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScore.java @@ -0,0 +1,172 @@ +package com.ccsens.mt.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class CompeteCountScore implements Serializable { + private Long id; + + private Long competeTimeId; + + private Long projectId; + + private Long siteOrderId; + + private Long chiefJudgmentScore; + + private Integer judgmentAScore; + + private Integer judgmentBScore2; + + private Integer shouldTimes; + + private Integer deductTimes; + + private String deductCause; + + private Integer finalScore; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getCompeteTimeId() { + return competeTimeId; + } + + public void setCompeteTimeId(Long competeTimeId) { + this.competeTimeId = competeTimeId; + } + + public Long getProjectId() { + return projectId; + } + + public void setProjectId(Long projectId) { + this.projectId = projectId; + } + + public Long getSiteOrderId() { + return siteOrderId; + } + + public void setSiteOrderId(Long siteOrderId) { + this.siteOrderId = siteOrderId; + } + + public Long getChiefJudgmentScore() { + return chiefJudgmentScore; + } + + public void setChiefJudgmentScore(Long chiefJudgmentScore) { + this.chiefJudgmentScore = chiefJudgmentScore; + } + + public Integer getJudgmentAScore() { + return judgmentAScore; + } + + public void setJudgmentAScore(Integer judgmentAScore) { + this.judgmentAScore = judgmentAScore; + } + + public Integer getJudgmentBScore2() { + return judgmentBScore2; + } + + public void setJudgmentBScore2(Integer judgmentBScore2) { + this.judgmentBScore2 = judgmentBScore2; + } + + public Integer getShouldTimes() { + return shouldTimes; + } + + public void setShouldTimes(Integer shouldTimes) { + this.shouldTimes = shouldTimes; + } + + public Integer getDeductTimes() { + return deductTimes; + } + + public void setDeductTimes(Integer deductTimes) { + this.deductTimes = deductTimes; + } + + public String getDeductCause() { + return deductCause; + } + + public void setDeductCause(String deductCause) { + this.deductCause = deductCause == null ? null : deductCause.trim(); + } + + public Integer getFinalScore() { + return finalScore; + } + + public void setFinalScore(Integer finalScore) { + this.finalScore = finalScore; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", competeTimeId=").append(competeTimeId); + sb.append(", projectId=").append(projectId); + sb.append(", siteOrderId=").append(siteOrderId); + sb.append(", chiefJudgmentScore=").append(chiefJudgmentScore); + sb.append(", judgmentAScore=").append(judgmentAScore); + sb.append(", judgmentBScore2=").append(judgmentBScore2); + sb.append(", shouldTimes=").append(shouldTimes); + sb.append(", deductTimes=").append(deductTimes); + sb.append(", deductCause=").append(deductCause); + sb.append(", finalScore=").append(finalScore); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreExample.java new file mode 100644 index 00000000..d5ff54db --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreExample.java @@ -0,0 +1,1051 @@ +package com.ccsens.mt.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class CompeteCountScoreExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public CompeteCountScoreExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdIsNull() { + addCriterion("compete_time_id is null"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdIsNotNull() { + addCriterion("compete_time_id is not null"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdEqualTo(Long value) { + addCriterion("compete_time_id =", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdNotEqualTo(Long value) { + addCriterion("compete_time_id <>", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdGreaterThan(Long value) { + addCriterion("compete_time_id >", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdGreaterThanOrEqualTo(Long value) { + addCriterion("compete_time_id >=", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdLessThan(Long value) { + addCriterion("compete_time_id <", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdLessThanOrEqualTo(Long value) { + addCriterion("compete_time_id <=", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdIn(List values) { + addCriterion("compete_time_id in", values, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdNotIn(List values) { + addCriterion("compete_time_id not in", values, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdBetween(Long value1, Long value2) { + addCriterion("compete_time_id between", value1, value2, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdNotBetween(Long value1, Long value2) { + addCriterion("compete_time_id not between", value1, value2, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andProjectIdIsNull() { + addCriterion("project_id is null"); + return (Criteria) this; + } + + public Criteria andProjectIdIsNotNull() { + addCriterion("project_id is not null"); + return (Criteria) this; + } + + public Criteria andProjectIdEqualTo(Long value) { + addCriterion("project_id =", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotEqualTo(Long value) { + addCriterion("project_id <>", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdGreaterThan(Long value) { + addCriterion("project_id >", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdGreaterThanOrEqualTo(Long value) { + addCriterion("project_id >=", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdLessThan(Long value) { + addCriterion("project_id <", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdLessThanOrEqualTo(Long value) { + addCriterion("project_id <=", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdIn(List values) { + addCriterion("project_id in", values, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotIn(List values) { + addCriterion("project_id not in", values, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdBetween(Long value1, Long value2) { + addCriterion("project_id between", value1, value2, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotBetween(Long value1, Long value2) { + addCriterion("project_id not between", value1, value2, "projectId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdIsNull() { + addCriterion("site_order_id is null"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdIsNotNull() { + addCriterion("site_order_id is not null"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdEqualTo(Long value) { + addCriterion("site_order_id =", value, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdNotEqualTo(Long value) { + addCriterion("site_order_id <>", value, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdGreaterThan(Long value) { + addCriterion("site_order_id >", value, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdGreaterThanOrEqualTo(Long value) { + addCriterion("site_order_id >=", value, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdLessThan(Long value) { + addCriterion("site_order_id <", value, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdLessThanOrEqualTo(Long value) { + addCriterion("site_order_id <=", value, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdIn(List values) { + addCriterion("site_order_id in", values, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdNotIn(List values) { + addCriterion("site_order_id not in", values, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdBetween(Long value1, Long value2) { + addCriterion("site_order_id between", value1, value2, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdNotBetween(Long value1, Long value2) { + addCriterion("site_order_id not between", value1, value2, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentScoreIsNull() { + addCriterion("chief_judgment_score is null"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentScoreIsNotNull() { + addCriterion("chief_judgment_score is not null"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentScoreEqualTo(Long value) { + addCriterion("chief_judgment_score =", value, "chiefJudgmentScore"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentScoreNotEqualTo(Long value) { + addCriterion("chief_judgment_score <>", value, "chiefJudgmentScore"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentScoreGreaterThan(Long value) { + addCriterion("chief_judgment_score >", value, "chiefJudgmentScore"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentScoreGreaterThanOrEqualTo(Long value) { + addCriterion("chief_judgment_score >=", value, "chiefJudgmentScore"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentScoreLessThan(Long value) { + addCriterion("chief_judgment_score <", value, "chiefJudgmentScore"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentScoreLessThanOrEqualTo(Long value) { + addCriterion("chief_judgment_score <=", value, "chiefJudgmentScore"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentScoreIn(List values) { + addCriterion("chief_judgment_score in", values, "chiefJudgmentScore"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentScoreNotIn(List values) { + addCriterion("chief_judgment_score not in", values, "chiefJudgmentScore"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentScoreBetween(Long value1, Long value2) { + addCriterion("chief_judgment_score between", value1, value2, "chiefJudgmentScore"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentScoreNotBetween(Long value1, Long value2) { + addCriterion("chief_judgment_score not between", value1, value2, "chiefJudgmentScore"); + return (Criteria) this; + } + + public Criteria andJudgmentAScoreIsNull() { + addCriterion("judgment_a_score is null"); + return (Criteria) this; + } + + public Criteria andJudgmentAScoreIsNotNull() { + addCriterion("judgment_a_score is not null"); + return (Criteria) this; + } + + public Criteria andJudgmentAScoreEqualTo(Integer value) { + addCriterion("judgment_a_score =", value, "judgmentAScore"); + return (Criteria) this; + } + + public Criteria andJudgmentAScoreNotEqualTo(Integer value) { + addCriterion("judgment_a_score <>", value, "judgmentAScore"); + return (Criteria) this; + } + + public Criteria andJudgmentAScoreGreaterThan(Integer value) { + addCriterion("judgment_a_score >", value, "judgmentAScore"); + return (Criteria) this; + } + + public Criteria andJudgmentAScoreGreaterThanOrEqualTo(Integer value) { + addCriterion("judgment_a_score >=", value, "judgmentAScore"); + return (Criteria) this; + } + + public Criteria andJudgmentAScoreLessThan(Integer value) { + addCriterion("judgment_a_score <", value, "judgmentAScore"); + return (Criteria) this; + } + + public Criteria andJudgmentAScoreLessThanOrEqualTo(Integer value) { + addCriterion("judgment_a_score <=", value, "judgmentAScore"); + return (Criteria) this; + } + + public Criteria andJudgmentAScoreIn(List values) { + addCriterion("judgment_a_score in", values, "judgmentAScore"); + return (Criteria) this; + } + + public Criteria andJudgmentAScoreNotIn(List values) { + addCriterion("judgment_a_score not in", values, "judgmentAScore"); + return (Criteria) this; + } + + public Criteria andJudgmentAScoreBetween(Integer value1, Integer value2) { + addCriterion("judgment_a_score between", value1, value2, "judgmentAScore"); + return (Criteria) this; + } + + public Criteria andJudgmentAScoreNotBetween(Integer value1, Integer value2) { + addCriterion("judgment_a_score not between", value1, value2, "judgmentAScore"); + return (Criteria) this; + } + + public Criteria andJudgmentBScore2IsNull() { + addCriterion("judgment_b_score2 is null"); + return (Criteria) this; + } + + public Criteria andJudgmentBScore2IsNotNull() { + addCriterion("judgment_b_score2 is not null"); + return (Criteria) this; + } + + public Criteria andJudgmentBScore2EqualTo(Integer value) { + addCriterion("judgment_b_score2 =", value, "judgmentBScore2"); + return (Criteria) this; + } + + public Criteria andJudgmentBScore2NotEqualTo(Integer value) { + addCriterion("judgment_b_score2 <>", value, "judgmentBScore2"); + return (Criteria) this; + } + + public Criteria andJudgmentBScore2GreaterThan(Integer value) { + addCriterion("judgment_b_score2 >", value, "judgmentBScore2"); + return (Criteria) this; + } + + public Criteria andJudgmentBScore2GreaterThanOrEqualTo(Integer value) { + addCriterion("judgment_b_score2 >=", value, "judgmentBScore2"); + return (Criteria) this; + } + + public Criteria andJudgmentBScore2LessThan(Integer value) { + addCriterion("judgment_b_score2 <", value, "judgmentBScore2"); + return (Criteria) this; + } + + public Criteria andJudgmentBScore2LessThanOrEqualTo(Integer value) { + addCriterion("judgment_b_score2 <=", value, "judgmentBScore2"); + return (Criteria) this; + } + + public Criteria andJudgmentBScore2In(List values) { + addCriterion("judgment_b_score2 in", values, "judgmentBScore2"); + return (Criteria) this; + } + + public Criteria andJudgmentBScore2NotIn(List values) { + addCriterion("judgment_b_score2 not in", values, "judgmentBScore2"); + return (Criteria) this; + } + + public Criteria andJudgmentBScore2Between(Integer value1, Integer value2) { + addCriterion("judgment_b_score2 between", value1, value2, "judgmentBScore2"); + return (Criteria) this; + } + + public Criteria andJudgmentBScore2NotBetween(Integer value1, Integer value2) { + addCriterion("judgment_b_score2 not between", value1, value2, "judgmentBScore2"); + return (Criteria) this; + } + + public Criteria andShouldTimesIsNull() { + addCriterion("should_times is null"); + return (Criteria) this; + } + + public Criteria andShouldTimesIsNotNull() { + addCriterion("should_times is not null"); + return (Criteria) this; + } + + public Criteria andShouldTimesEqualTo(Integer value) { + addCriterion("should_times =", value, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesNotEqualTo(Integer value) { + addCriterion("should_times <>", value, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesGreaterThan(Integer value) { + addCriterion("should_times >", value, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesGreaterThanOrEqualTo(Integer value) { + addCriterion("should_times >=", value, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesLessThan(Integer value) { + addCriterion("should_times <", value, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesLessThanOrEqualTo(Integer value) { + addCriterion("should_times <=", value, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesIn(List values) { + addCriterion("should_times in", values, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesNotIn(List values) { + addCriterion("should_times not in", values, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesBetween(Integer value1, Integer value2) { + addCriterion("should_times between", value1, value2, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesNotBetween(Integer value1, Integer value2) { + addCriterion("should_times not between", value1, value2, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andDeductTimesIsNull() { + addCriterion("deduct_times is null"); + return (Criteria) this; + } + + public Criteria andDeductTimesIsNotNull() { + addCriterion("deduct_times is not null"); + return (Criteria) this; + } + + public Criteria andDeductTimesEqualTo(Integer value) { + addCriterion("deduct_times =", value, "deductTimes"); + return (Criteria) this; + } + + public Criteria andDeductTimesNotEqualTo(Integer value) { + addCriterion("deduct_times <>", value, "deductTimes"); + return (Criteria) this; + } + + public Criteria andDeductTimesGreaterThan(Integer value) { + addCriterion("deduct_times >", value, "deductTimes"); + return (Criteria) this; + } + + public Criteria andDeductTimesGreaterThanOrEqualTo(Integer value) { + addCriterion("deduct_times >=", value, "deductTimes"); + return (Criteria) this; + } + + public Criteria andDeductTimesLessThan(Integer value) { + addCriterion("deduct_times <", value, "deductTimes"); + return (Criteria) this; + } + + public Criteria andDeductTimesLessThanOrEqualTo(Integer value) { + addCriterion("deduct_times <=", value, "deductTimes"); + return (Criteria) this; + } + + public Criteria andDeductTimesIn(List values) { + addCriterion("deduct_times in", values, "deductTimes"); + return (Criteria) this; + } + + public Criteria andDeductTimesNotIn(List values) { + addCriterion("deduct_times not in", values, "deductTimes"); + return (Criteria) this; + } + + public Criteria andDeductTimesBetween(Integer value1, Integer value2) { + addCriterion("deduct_times between", value1, value2, "deductTimes"); + return (Criteria) this; + } + + public Criteria andDeductTimesNotBetween(Integer value1, Integer value2) { + addCriterion("deduct_times not between", value1, value2, "deductTimes"); + return (Criteria) this; + } + + public Criteria andDeductCauseIsNull() { + addCriterion("deduct_cause is null"); + return (Criteria) this; + } + + public Criteria andDeductCauseIsNotNull() { + addCriterion("deduct_cause is not null"); + return (Criteria) this; + } + + public Criteria andDeductCauseEqualTo(String value) { + addCriterion("deduct_cause =", value, "deductCause"); + return (Criteria) this; + } + + public Criteria andDeductCauseNotEqualTo(String value) { + addCriterion("deduct_cause <>", value, "deductCause"); + return (Criteria) this; + } + + public Criteria andDeductCauseGreaterThan(String value) { + addCriterion("deduct_cause >", value, "deductCause"); + return (Criteria) this; + } + + public Criteria andDeductCauseGreaterThanOrEqualTo(String value) { + addCriterion("deduct_cause >=", value, "deductCause"); + return (Criteria) this; + } + + public Criteria andDeductCauseLessThan(String value) { + addCriterion("deduct_cause <", value, "deductCause"); + return (Criteria) this; + } + + public Criteria andDeductCauseLessThanOrEqualTo(String value) { + addCriterion("deduct_cause <=", value, "deductCause"); + return (Criteria) this; + } + + public Criteria andDeductCauseLike(String value) { + addCriterion("deduct_cause like", value, "deductCause"); + return (Criteria) this; + } + + public Criteria andDeductCauseNotLike(String value) { + addCriterion("deduct_cause not like", value, "deductCause"); + return (Criteria) this; + } + + public Criteria andDeductCauseIn(List values) { + addCriterion("deduct_cause in", values, "deductCause"); + return (Criteria) this; + } + + public Criteria andDeductCauseNotIn(List values) { + addCriterion("deduct_cause not in", values, "deductCause"); + return (Criteria) this; + } + + public Criteria andDeductCauseBetween(String value1, String value2) { + addCriterion("deduct_cause between", value1, value2, "deductCause"); + return (Criteria) this; + } + + public Criteria andDeductCauseNotBetween(String value1, String value2) { + addCriterion("deduct_cause not between", value1, value2, "deductCause"); + return (Criteria) this; + } + + public Criteria andFinalScoreIsNull() { + addCriterion("final_score is null"); + return (Criteria) this; + } + + public Criteria andFinalScoreIsNotNull() { + addCriterion("final_score is not null"); + return (Criteria) this; + } + + public Criteria andFinalScoreEqualTo(Integer value) { + addCriterion("final_score =", value, "finalScore"); + return (Criteria) this; + } + + public Criteria andFinalScoreNotEqualTo(Integer value) { + addCriterion("final_score <>", value, "finalScore"); + return (Criteria) this; + } + + public Criteria andFinalScoreGreaterThan(Integer value) { + addCriterion("final_score >", value, "finalScore"); + return (Criteria) this; + } + + public Criteria andFinalScoreGreaterThanOrEqualTo(Integer value) { + addCriterion("final_score >=", value, "finalScore"); + return (Criteria) this; + } + + public Criteria andFinalScoreLessThan(Integer value) { + addCriterion("final_score <", value, "finalScore"); + return (Criteria) this; + } + + public Criteria andFinalScoreLessThanOrEqualTo(Integer value) { + addCriterion("final_score <=", value, "finalScore"); + return (Criteria) this; + } + + public Criteria andFinalScoreIn(List values) { + addCriterion("final_score in", values, "finalScore"); + return (Criteria) this; + } + + public Criteria andFinalScoreNotIn(List values) { + addCriterion("final_score not in", values, "finalScore"); + return (Criteria) this; + } + + public Criteria andFinalScoreBetween(Integer value1, Integer value2) { + addCriterion("final_score between", value1, value2, "finalScore"); + return (Criteria) this; + } + + public Criteria andFinalScoreNotBetween(Integer value1, Integer value2) { + addCriterion("final_score not between", value1, value2, "finalScore"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompetePlayerLook.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompetePlayerLook.java new file mode 100644 index 00000000..1ae39e6c --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompetePlayerLook.java @@ -0,0 +1,95 @@ +package com.ccsens.mt.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class CompetePlayerLook implements Serializable { + private Long id; + + private Long companyId; + + private Byte lookStatus; + + private Long lookTime; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + + public Byte getLookStatus() { + return lookStatus; + } + + public void setLookStatus(Byte lookStatus) { + this.lookStatus = lookStatus; + } + + public Long getLookTime() { + return lookTime; + } + + public void setLookTime(Long lookTime) { + this.lookTime = lookTime; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", companyId=").append(companyId); + sb.append(", lookStatus=").append(lookStatus); + sb.append(", lookTime=").append(lookTime); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompetePlayerLookExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompetePlayerLookExample.java new file mode 100644 index 00000000..275797fe --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompetePlayerLookExample.java @@ -0,0 +1,621 @@ +package com.ccsens.mt.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class CompetePlayerLookExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public CompetePlayerLookExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andCompanyIdIsNull() { + addCriterion("company_id is null"); + return (Criteria) this; + } + + public Criteria andCompanyIdIsNotNull() { + addCriterion("company_id is not null"); + return (Criteria) this; + } + + public Criteria andCompanyIdEqualTo(Long value) { + addCriterion("company_id =", value, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdNotEqualTo(Long value) { + addCriterion("company_id <>", value, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdGreaterThan(Long value) { + addCriterion("company_id >", value, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdGreaterThanOrEqualTo(Long value) { + addCriterion("company_id >=", value, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdLessThan(Long value) { + addCriterion("company_id <", value, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdLessThanOrEqualTo(Long value) { + addCriterion("company_id <=", value, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdIn(List values) { + addCriterion("company_id in", values, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdNotIn(List values) { + addCriterion("company_id not in", values, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdBetween(Long value1, Long value2) { + addCriterion("company_id between", value1, value2, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdNotBetween(Long value1, Long value2) { + addCriterion("company_id not between", value1, value2, "companyId"); + return (Criteria) this; + } + + public Criteria andLookStatusIsNull() { + addCriterion("look_status is null"); + return (Criteria) this; + } + + public Criteria andLookStatusIsNotNull() { + addCriterion("look_status is not null"); + return (Criteria) this; + } + + public Criteria andLookStatusEqualTo(Byte value) { + addCriterion("look_status =", value, "lookStatus"); + return (Criteria) this; + } + + public Criteria andLookStatusNotEqualTo(Byte value) { + addCriterion("look_status <>", value, "lookStatus"); + return (Criteria) this; + } + + public Criteria andLookStatusGreaterThan(Byte value) { + addCriterion("look_status >", value, "lookStatus"); + return (Criteria) this; + } + + public Criteria andLookStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("look_status >=", value, "lookStatus"); + return (Criteria) this; + } + + public Criteria andLookStatusLessThan(Byte value) { + addCriterion("look_status <", value, "lookStatus"); + return (Criteria) this; + } + + public Criteria andLookStatusLessThanOrEqualTo(Byte value) { + addCriterion("look_status <=", value, "lookStatus"); + return (Criteria) this; + } + + public Criteria andLookStatusIn(List values) { + addCriterion("look_status in", values, "lookStatus"); + return (Criteria) this; + } + + public Criteria andLookStatusNotIn(List values) { + addCriterion("look_status not in", values, "lookStatus"); + return (Criteria) this; + } + + public Criteria andLookStatusBetween(Byte value1, Byte value2) { + addCriterion("look_status between", value1, value2, "lookStatus"); + return (Criteria) this; + } + + public Criteria andLookStatusNotBetween(Byte value1, Byte value2) { + addCriterion("look_status not between", value1, value2, "lookStatus"); + return (Criteria) this; + } + + public Criteria andLookTimeIsNull() { + addCriterion("look_time is null"); + return (Criteria) this; + } + + public Criteria andLookTimeIsNotNull() { + addCriterion("look_time is not null"); + return (Criteria) this; + } + + public Criteria andLookTimeEqualTo(Long value) { + addCriterion("look_time =", value, "lookTime"); + return (Criteria) this; + } + + public Criteria andLookTimeNotEqualTo(Long value) { + addCriterion("look_time <>", value, "lookTime"); + return (Criteria) this; + } + + public Criteria andLookTimeGreaterThan(Long value) { + addCriterion("look_time >", value, "lookTime"); + return (Criteria) this; + } + + public Criteria andLookTimeGreaterThanOrEqualTo(Long value) { + addCriterion("look_time >=", value, "lookTime"); + return (Criteria) this; + } + + public Criteria andLookTimeLessThan(Long value) { + addCriterion("look_time <", value, "lookTime"); + return (Criteria) this; + } + + public Criteria andLookTimeLessThanOrEqualTo(Long value) { + addCriterion("look_time <=", value, "lookTime"); + return (Criteria) this; + } + + public Criteria andLookTimeIn(List values) { + addCriterion("look_time in", values, "lookTime"); + return (Criteria) this; + } + + public Criteria andLookTimeNotIn(List values) { + addCriterion("look_time not in", values, "lookTime"); + return (Criteria) this; + } + + public Criteria andLookTimeBetween(Long value1, Long value2) { + addCriterion("look_time between", value1, value2, "lookTime"); + return (Criteria) this; + } + + public Criteria andLookTimeNotBetween(Long value1, Long value2) { + addCriterion("look_time not between", value1, value2, "lookTime"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectConfig.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectConfig.java index 91e3bfe0..71dbd537 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectConfig.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectConfig.java @@ -1,117 +1,117 @@ -package com.ccsens.mt.bean.po; - -import java.io.Serializable; -import java.util.Date; - -public class CompeteProjectConfig implements Serializable { - private Long id; - - private Long projectId; - - private Integer siteNum; - - private Long startTime; - - private Long endTime; - - private Date createdAt; - - private Date updatedAt; - - private Byte recStatus; - - private Long projectDuration; - - private static final long serialVersionUID = 1L; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Long getProjectId() { - return projectId; - } - - public void setProjectId(Long projectId) { - this.projectId = projectId; - } - - public Integer getSiteNum() { - return siteNum; - } - - public void setSiteNum(Integer siteNum) { - this.siteNum = siteNum; - } - - public Long getStartTime() { - return startTime; - } - - public void setStartTime(Long startTime) { - this.startTime = startTime; - } - - public Long getEndTime() { - return endTime; - } - - public void setEndTime(Long endTime) { - this.endTime = endTime; - } - - public Date getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(Date createdAt) { - this.createdAt = createdAt; - } - - public Date getUpdatedAt() { - return updatedAt; - } - - public void setUpdatedAt(Date updatedAt) { - this.updatedAt = updatedAt; - } - - public Byte getRecStatus() { - return recStatus; - } - - public void setRecStatus(Byte recStatus) { - this.recStatus = recStatus; - } - - public Long getProjectDuration() { - return projectDuration; - } - - public void setProjectDuration(Long projectDuration) { - this.projectDuration = projectDuration; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", projectId=").append(projectId); - sb.append(", siteNum=").append(siteNum); - sb.append(", startTime=").append(startTime); - sb.append(", endTime=").append(endTime); - sb.append(", createdAt=").append(createdAt); - sb.append(", updatedAt=").append(updatedAt); - sb.append(", recStatus=").append(recStatus); - sb.append(", projectDuration=").append(projectDuration); - sb.append("]"); - return sb.toString(); - } +package com.ccsens.mt.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class CompeteProjectConfig implements Serializable { + private Long id; + + private Long projectId; + + private Integer siteNum; + + private Long startTime; + + private Long endTime; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private Long projectDuration; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getProjectId() { + return projectId; + } + + public void setProjectId(Long projectId) { + this.projectId = projectId; + } + + public Integer getSiteNum() { + return siteNum; + } + + public void setSiteNum(Integer siteNum) { + this.siteNum = siteNum; + } + + public Long getStartTime() { + return startTime; + } + + public void setStartTime(Long startTime) { + this.startTime = startTime; + } + + public Long getEndTime() { + return endTime; + } + + public void setEndTime(Long endTime) { + this.endTime = endTime; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + public Long getProjectDuration() { + return projectDuration; + } + + public void setProjectDuration(Long projectDuration) { + this.projectDuration = projectDuration; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", projectId=").append(projectId); + sb.append(", siteNum=").append(siteNum); + sb.append(", startTime=").append(startTime); + sb.append(", endTime=").append(endTime); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append(", projectDuration=").append(projectDuration); + sb.append("]"); + return sb.toString(); + } } \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectConfigExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectConfigExample.java index 590e4e41..60c3f955 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectConfigExample.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteProjectConfigExample.java @@ -1,741 +1,741 @@ -package com.ccsens.mt.bean.po; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class CompeteProjectConfigExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public CompeteProjectConfigExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Long value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Long value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Long value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Long value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andProjectIdIsNull() { - addCriterion("project_id is null"); - return (Criteria) this; - } - - public Criteria andProjectIdIsNotNull() { - addCriterion("project_id is not null"); - return (Criteria) this; - } - - public Criteria andProjectIdEqualTo(Long value) { - addCriterion("project_id =", value, "projectId"); - return (Criteria) this; - } - - public Criteria andProjectIdNotEqualTo(Long value) { - addCriterion("project_id <>", value, "projectId"); - return (Criteria) this; - } - - public Criteria andProjectIdGreaterThan(Long value) { - addCriterion("project_id >", value, "projectId"); - return (Criteria) this; - } - - public Criteria andProjectIdGreaterThanOrEqualTo(Long value) { - addCriterion("project_id >=", value, "projectId"); - return (Criteria) this; - } - - public Criteria andProjectIdLessThan(Long value) { - addCriterion("project_id <", value, "projectId"); - return (Criteria) this; - } - - public Criteria andProjectIdLessThanOrEqualTo(Long value) { - addCriterion("project_id <=", value, "projectId"); - return (Criteria) this; - } - - public Criteria andProjectIdIn(List values) { - addCriterion("project_id in", values, "projectId"); - return (Criteria) this; - } - - public Criteria andProjectIdNotIn(List values) { - addCriterion("project_id not in", values, "projectId"); - return (Criteria) this; - } - - public Criteria andProjectIdBetween(Long value1, Long value2) { - addCriterion("project_id between", value1, value2, "projectId"); - return (Criteria) this; - } - - public Criteria andProjectIdNotBetween(Long value1, Long value2) { - addCriterion("project_id not between", value1, value2, "projectId"); - return (Criteria) this; - } - - public Criteria andSiteNumIsNull() { - addCriterion("site_num is null"); - return (Criteria) this; - } - - public Criteria andSiteNumIsNotNull() { - addCriterion("site_num is not null"); - return (Criteria) this; - } - - public Criteria andSiteNumEqualTo(Integer value) { - addCriterion("site_num =", value, "siteNum"); - return (Criteria) this; - } - - public Criteria andSiteNumNotEqualTo(Integer value) { - addCriterion("site_num <>", value, "siteNum"); - return (Criteria) this; - } - - public Criteria andSiteNumGreaterThan(Integer value) { - addCriterion("site_num >", value, "siteNum"); - return (Criteria) this; - } - - public Criteria andSiteNumGreaterThanOrEqualTo(Integer value) { - addCriterion("site_num >=", value, "siteNum"); - return (Criteria) this; - } - - public Criteria andSiteNumLessThan(Integer value) { - addCriterion("site_num <", value, "siteNum"); - return (Criteria) this; - } - - public Criteria andSiteNumLessThanOrEqualTo(Integer value) { - addCriterion("site_num <=", value, "siteNum"); - return (Criteria) this; - } - - public Criteria andSiteNumIn(List values) { - addCriterion("site_num in", values, "siteNum"); - return (Criteria) this; - } - - public Criteria andSiteNumNotIn(List values) { - addCriterion("site_num not in", values, "siteNum"); - return (Criteria) this; - } - - public Criteria andSiteNumBetween(Integer value1, Integer value2) { - addCriterion("site_num between", value1, value2, "siteNum"); - return (Criteria) this; - } - - public Criteria andSiteNumNotBetween(Integer value1, Integer value2) { - addCriterion("site_num not between", value1, value2, "siteNum"); - return (Criteria) this; - } - - public Criteria andStartTimeIsNull() { - addCriterion("start_time is null"); - return (Criteria) this; - } - - public Criteria andStartTimeIsNotNull() { - addCriterion("start_time is not null"); - return (Criteria) this; - } - - public Criteria andStartTimeEqualTo(Long value) { - addCriterion("start_time =", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeNotEqualTo(Long value) { - addCriterion("start_time <>", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeGreaterThan(Long value) { - addCriterion("start_time >", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeGreaterThanOrEqualTo(Long value) { - addCriterion("start_time >=", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeLessThan(Long value) { - addCriterion("start_time <", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeLessThanOrEqualTo(Long value) { - addCriterion("start_time <=", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeIn(List values) { - addCriterion("start_time in", values, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeNotIn(List values) { - addCriterion("start_time not in", values, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeBetween(Long value1, Long value2) { - addCriterion("start_time between", value1, value2, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeNotBetween(Long value1, Long value2) { - addCriterion("start_time not between", value1, value2, "startTime"); - return (Criteria) this; - } - - public Criteria andEndTimeIsNull() { - addCriterion("end_time is null"); - return (Criteria) this; - } - - public Criteria andEndTimeIsNotNull() { - addCriterion("end_time is not null"); - return (Criteria) this; - } - - public Criteria andEndTimeEqualTo(Long value) { - addCriterion("end_time =", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeNotEqualTo(Long value) { - addCriterion("end_time <>", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeGreaterThan(Long value) { - addCriterion("end_time >", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeGreaterThanOrEqualTo(Long value) { - addCriterion("end_time >=", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeLessThan(Long value) { - addCriterion("end_time <", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeLessThanOrEqualTo(Long value) { - addCriterion("end_time <=", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeIn(List values) { - addCriterion("end_time in", values, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeNotIn(List values) { - addCriterion("end_time not in", values, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeBetween(Long value1, Long value2) { - addCriterion("end_time between", value1, value2, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeNotBetween(Long value1, Long value2) { - addCriterion("end_time not between", value1, value2, "endTime"); - return (Criteria) this; - } - - public Criteria andCreatedAtIsNull() { - addCriterion("created_at is null"); - return (Criteria) this; - } - - public Criteria andCreatedAtIsNotNull() { - addCriterion("created_at is not null"); - return (Criteria) this; - } - - public Criteria andCreatedAtEqualTo(Date value) { - addCriterion("created_at =", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtNotEqualTo(Date value) { - addCriterion("created_at <>", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtGreaterThan(Date value) { - addCriterion("created_at >", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { - addCriterion("created_at >=", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtLessThan(Date value) { - addCriterion("created_at <", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtLessThanOrEqualTo(Date value) { - addCriterion("created_at <=", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtIn(List values) { - addCriterion("created_at in", values, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtNotIn(List values) { - addCriterion("created_at not in", values, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtBetween(Date value1, Date value2) { - addCriterion("created_at between", value1, value2, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtNotBetween(Date value1, Date value2) { - addCriterion("created_at not between", value1, value2, "createdAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtIsNull() { - addCriterion("updated_at is null"); - return (Criteria) this; - } - - public Criteria andUpdatedAtIsNotNull() { - addCriterion("updated_at is not null"); - return (Criteria) this; - } - - public Criteria andUpdatedAtEqualTo(Date value) { - addCriterion("updated_at =", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtNotEqualTo(Date value) { - addCriterion("updated_at <>", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtGreaterThan(Date value) { - addCriterion("updated_at >", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { - addCriterion("updated_at >=", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtLessThan(Date value) { - addCriterion("updated_at <", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { - addCriterion("updated_at <=", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtIn(List values) { - addCriterion("updated_at in", values, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtNotIn(List values) { - addCriterion("updated_at not in", values, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtBetween(Date value1, Date value2) { - addCriterion("updated_at between", value1, value2, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { - addCriterion("updated_at not between", value1, value2, "updatedAt"); - return (Criteria) this; - } - - public Criteria andRecStatusIsNull() { - addCriterion("rec_status is null"); - return (Criteria) this; - } - - public Criteria andRecStatusIsNotNull() { - addCriterion("rec_status is not null"); - return (Criteria) this; - } - - public Criteria andRecStatusEqualTo(Byte value) { - addCriterion("rec_status =", value, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusNotEqualTo(Byte value) { - addCriterion("rec_status <>", value, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusGreaterThan(Byte value) { - addCriterion("rec_status >", value, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { - addCriterion("rec_status >=", value, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusLessThan(Byte value) { - addCriterion("rec_status <", value, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusLessThanOrEqualTo(Byte value) { - addCriterion("rec_status <=", value, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusIn(List values) { - addCriterion("rec_status in", values, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusNotIn(List values) { - addCriterion("rec_status not in", values, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusBetween(Byte value1, Byte value2) { - addCriterion("rec_status between", value1, value2, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { - addCriterion("rec_status not between", value1, value2, "recStatus"); - return (Criteria) this; - } - - public Criteria andProjectDurationIsNull() { - addCriterion("project_duration is null"); - return (Criteria) this; - } - - public Criteria andProjectDurationIsNotNull() { - addCriterion("project_duration is not null"); - return (Criteria) this; - } - - public Criteria andProjectDurationEqualTo(Long value) { - addCriterion("project_duration =", value, "projectDuration"); - return (Criteria) this; - } - - public Criteria andProjectDurationNotEqualTo(Long value) { - addCriterion("project_duration <>", value, "projectDuration"); - return (Criteria) this; - } - - public Criteria andProjectDurationGreaterThan(Long value) { - addCriterion("project_duration >", value, "projectDuration"); - return (Criteria) this; - } - - public Criteria andProjectDurationGreaterThanOrEqualTo(Long value) { - addCriterion("project_duration >=", value, "projectDuration"); - return (Criteria) this; - } - - public Criteria andProjectDurationLessThan(Long value) { - addCriterion("project_duration <", value, "projectDuration"); - return (Criteria) this; - } - - public Criteria andProjectDurationLessThanOrEqualTo(Long value) { - addCriterion("project_duration <=", value, "projectDuration"); - return (Criteria) this; - } - - public Criteria andProjectDurationIn(List values) { - addCriterion("project_duration in", values, "projectDuration"); - return (Criteria) this; - } - - public Criteria andProjectDurationNotIn(List values) { - addCriterion("project_duration not in", values, "projectDuration"); - return (Criteria) this; - } - - public Criteria andProjectDurationBetween(Long value1, Long value2) { - addCriterion("project_duration between", value1, value2, "projectDuration"); - return (Criteria) this; - } - - public Criteria andProjectDurationNotBetween(Long value1, Long value2) { - addCriterion("project_duration not between", value1, value2, "projectDuration"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } +package com.ccsens.mt.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class CompeteProjectConfigExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public CompeteProjectConfigExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andProjectIdIsNull() { + addCriterion("project_id is null"); + return (Criteria) this; + } + + public Criteria andProjectIdIsNotNull() { + addCriterion("project_id is not null"); + return (Criteria) this; + } + + public Criteria andProjectIdEqualTo(Long value) { + addCriterion("project_id =", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotEqualTo(Long value) { + addCriterion("project_id <>", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdGreaterThan(Long value) { + addCriterion("project_id >", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdGreaterThanOrEqualTo(Long value) { + addCriterion("project_id >=", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdLessThan(Long value) { + addCriterion("project_id <", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdLessThanOrEqualTo(Long value) { + addCriterion("project_id <=", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdIn(List values) { + addCriterion("project_id in", values, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotIn(List values) { + addCriterion("project_id not in", values, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdBetween(Long value1, Long value2) { + addCriterion("project_id between", value1, value2, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotBetween(Long value1, Long value2) { + addCriterion("project_id not between", value1, value2, "projectId"); + return (Criteria) this; + } + + public Criteria andSiteNumIsNull() { + addCriterion("site_num is null"); + return (Criteria) this; + } + + public Criteria andSiteNumIsNotNull() { + addCriterion("site_num is not null"); + return (Criteria) this; + } + + public Criteria andSiteNumEqualTo(Integer value) { + addCriterion("site_num =", value, "siteNum"); + return (Criteria) this; + } + + public Criteria andSiteNumNotEqualTo(Integer value) { + addCriterion("site_num <>", value, "siteNum"); + return (Criteria) this; + } + + public Criteria andSiteNumGreaterThan(Integer value) { + addCriterion("site_num >", value, "siteNum"); + return (Criteria) this; + } + + public Criteria andSiteNumGreaterThanOrEqualTo(Integer value) { + addCriterion("site_num >=", value, "siteNum"); + return (Criteria) this; + } + + public Criteria andSiteNumLessThan(Integer value) { + addCriterion("site_num <", value, "siteNum"); + return (Criteria) this; + } + + public Criteria andSiteNumLessThanOrEqualTo(Integer value) { + addCriterion("site_num <=", value, "siteNum"); + return (Criteria) this; + } + + public Criteria andSiteNumIn(List values) { + addCriterion("site_num in", values, "siteNum"); + return (Criteria) this; + } + + public Criteria andSiteNumNotIn(List values) { + addCriterion("site_num not in", values, "siteNum"); + return (Criteria) this; + } + + public Criteria andSiteNumBetween(Integer value1, Integer value2) { + addCriterion("site_num between", value1, value2, "siteNum"); + return (Criteria) this; + } + + public Criteria andSiteNumNotBetween(Integer value1, Integer value2) { + addCriterion("site_num not between", value1, value2, "siteNum"); + return (Criteria) this; + } + + public Criteria andStartTimeIsNull() { + addCriterion("start_time is null"); + return (Criteria) this; + } + + public Criteria andStartTimeIsNotNull() { + addCriterion("start_time is not null"); + return (Criteria) this; + } + + public Criteria andStartTimeEqualTo(Long value) { + addCriterion("start_time =", value, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeNotEqualTo(Long value) { + addCriterion("start_time <>", value, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeGreaterThan(Long value) { + addCriterion("start_time >", value, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeGreaterThanOrEqualTo(Long value) { + addCriterion("start_time >=", value, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeLessThan(Long value) { + addCriterion("start_time <", value, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeLessThanOrEqualTo(Long value) { + addCriterion("start_time <=", value, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeIn(List values) { + addCriterion("start_time in", values, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeNotIn(List values) { + addCriterion("start_time not in", values, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeBetween(Long value1, Long value2) { + addCriterion("start_time between", value1, value2, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeNotBetween(Long value1, Long value2) { + addCriterion("start_time not between", value1, value2, "startTime"); + return (Criteria) this; + } + + public Criteria andEndTimeIsNull() { + addCriterion("end_time is null"); + return (Criteria) this; + } + + public Criteria andEndTimeIsNotNull() { + addCriterion("end_time is not null"); + return (Criteria) this; + } + + public Criteria andEndTimeEqualTo(Long value) { + addCriterion("end_time =", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeNotEqualTo(Long value) { + addCriterion("end_time <>", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeGreaterThan(Long value) { + addCriterion("end_time >", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeGreaterThanOrEqualTo(Long value) { + addCriterion("end_time >=", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeLessThan(Long value) { + addCriterion("end_time <", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeLessThanOrEqualTo(Long value) { + addCriterion("end_time <=", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeIn(List values) { + addCriterion("end_time in", values, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeNotIn(List values) { + addCriterion("end_time not in", values, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeBetween(Long value1, Long value2) { + addCriterion("end_time between", value1, value2, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeNotBetween(Long value1, Long value2) { + addCriterion("end_time not between", value1, value2, "endTime"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andProjectDurationIsNull() { + addCriterion("project_duration is null"); + return (Criteria) this; + } + + public Criteria andProjectDurationIsNotNull() { + addCriterion("project_duration is not null"); + return (Criteria) this; + } + + public Criteria andProjectDurationEqualTo(Long value) { + addCriterion("project_duration =", value, "projectDuration"); + return (Criteria) this; + } + + public Criteria andProjectDurationNotEqualTo(Long value) { + addCriterion("project_duration <>", value, "projectDuration"); + return (Criteria) this; + } + + public Criteria andProjectDurationGreaterThan(Long value) { + addCriterion("project_duration >", value, "projectDuration"); + return (Criteria) this; + } + + public Criteria andProjectDurationGreaterThanOrEqualTo(Long value) { + addCriterion("project_duration >=", value, "projectDuration"); + return (Criteria) this; + } + + public Criteria andProjectDurationLessThan(Long value) { + addCriterion("project_duration <", value, "projectDuration"); + return (Criteria) this; + } + + public Criteria andProjectDurationLessThanOrEqualTo(Long value) { + addCriterion("project_duration <=", value, "projectDuration"); + return (Criteria) this; + } + + public Criteria andProjectDurationIn(List values) { + addCriterion("project_duration in", values, "projectDuration"); + return (Criteria) this; + } + + public Criteria andProjectDurationNotIn(List values) { + addCriterion("project_duration not in", values, "projectDuration"); + return (Criteria) this; + } + + public Criteria andProjectDurationBetween(Long value1, Long value2) { + addCriterion("project_duration between", value1, value2, "projectDuration"); + return (Criteria) this; + } + + public Criteria andProjectDurationNotBetween(Long value1, Long value2) { + addCriterion("project_duration not between", value1, value2, "projectDuration"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } } \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrder.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrder.java new file mode 100644 index 00000000..9e552008 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrder.java @@ -0,0 +1,95 @@ +package com.ccsens.mt.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class CompeteStartOrder implements Serializable { + private Long id; + + private Long playerId; + + private Byte competeOrder; + + private Byte site; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getPlayerId() { + return playerId; + } + + public void setPlayerId(Long playerId) { + this.playerId = playerId; + } + + public Byte getCompeteOrder() { + return competeOrder; + } + + public void setCompeteOrder(Byte competeOrder) { + this.competeOrder = competeOrder; + } + + public Byte getSite() { + return site; + } + + public void setSite(Byte site) { + this.site = site; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", playerId=").append(playerId); + sb.append(", competeOrder=").append(competeOrder); + sb.append(", site=").append(site); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrderExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrderExample.java new file mode 100644 index 00000000..2f59cbc9 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrderExample.java @@ -0,0 +1,621 @@ +package com.ccsens.mt.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class CompeteStartOrderExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public CompeteStartOrderExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andPlayerIdIsNull() { + addCriterion("player_id is null"); + return (Criteria) this; + } + + public Criteria andPlayerIdIsNotNull() { + addCriterion("player_id is not null"); + return (Criteria) this; + } + + public Criteria andPlayerIdEqualTo(Long value) { + addCriterion("player_id =", value, "playerId"); + return (Criteria) this; + } + + public Criteria andPlayerIdNotEqualTo(Long value) { + addCriterion("player_id <>", value, "playerId"); + return (Criteria) this; + } + + public Criteria andPlayerIdGreaterThan(Long value) { + addCriterion("player_id >", value, "playerId"); + return (Criteria) this; + } + + public Criteria andPlayerIdGreaterThanOrEqualTo(Long value) { + addCriterion("player_id >=", value, "playerId"); + return (Criteria) this; + } + + public Criteria andPlayerIdLessThan(Long value) { + addCriterion("player_id <", value, "playerId"); + return (Criteria) this; + } + + public Criteria andPlayerIdLessThanOrEqualTo(Long value) { + addCriterion("player_id <=", value, "playerId"); + return (Criteria) this; + } + + public Criteria andPlayerIdIn(List values) { + addCriterion("player_id in", values, "playerId"); + return (Criteria) this; + } + + public Criteria andPlayerIdNotIn(List values) { + addCriterion("player_id not in", values, "playerId"); + return (Criteria) this; + } + + public Criteria andPlayerIdBetween(Long value1, Long value2) { + addCriterion("player_id between", value1, value2, "playerId"); + return (Criteria) this; + } + + public Criteria andPlayerIdNotBetween(Long value1, Long value2) { + addCriterion("player_id not between", value1, value2, "playerId"); + return (Criteria) this; + } + + public Criteria andCompeteOrderIsNull() { + addCriterion("compete_order is null"); + return (Criteria) this; + } + + public Criteria andCompeteOrderIsNotNull() { + addCriterion("compete_order is not null"); + return (Criteria) this; + } + + public Criteria andCompeteOrderEqualTo(Byte value) { + addCriterion("compete_order =", value, "competeOrder"); + return (Criteria) this; + } + + public Criteria andCompeteOrderNotEqualTo(Byte value) { + addCriterion("compete_order <>", value, "competeOrder"); + return (Criteria) this; + } + + public Criteria andCompeteOrderGreaterThan(Byte value) { + addCriterion("compete_order >", value, "competeOrder"); + return (Criteria) this; + } + + public Criteria andCompeteOrderGreaterThanOrEqualTo(Byte value) { + addCriterion("compete_order >=", value, "competeOrder"); + return (Criteria) this; + } + + public Criteria andCompeteOrderLessThan(Byte value) { + addCriterion("compete_order <", value, "competeOrder"); + return (Criteria) this; + } + + public Criteria andCompeteOrderLessThanOrEqualTo(Byte value) { + addCriterion("compete_order <=", value, "competeOrder"); + return (Criteria) this; + } + + public Criteria andCompeteOrderIn(List values) { + addCriterion("compete_order in", values, "competeOrder"); + return (Criteria) this; + } + + public Criteria andCompeteOrderNotIn(List values) { + addCriterion("compete_order not in", values, "competeOrder"); + return (Criteria) this; + } + + public Criteria andCompeteOrderBetween(Byte value1, Byte value2) { + addCriterion("compete_order between", value1, value2, "competeOrder"); + return (Criteria) this; + } + + public Criteria andCompeteOrderNotBetween(Byte value1, Byte value2) { + addCriterion("compete_order not between", value1, value2, "competeOrder"); + return (Criteria) this; + } + + public Criteria andSiteIsNull() { + addCriterion("site is null"); + return (Criteria) this; + } + + public Criteria andSiteIsNotNull() { + addCriterion("site is not null"); + return (Criteria) this; + } + + public Criteria andSiteEqualTo(Byte value) { + addCriterion("site =", value, "site"); + return (Criteria) this; + } + + public Criteria andSiteNotEqualTo(Byte value) { + addCriterion("site <>", value, "site"); + return (Criteria) this; + } + + public Criteria andSiteGreaterThan(Byte value) { + addCriterion("site >", value, "site"); + return (Criteria) this; + } + + public Criteria andSiteGreaterThanOrEqualTo(Byte value) { + addCriterion("site >=", value, "site"); + return (Criteria) this; + } + + public Criteria andSiteLessThan(Byte value) { + addCriterion("site <", value, "site"); + return (Criteria) this; + } + + public Criteria andSiteLessThanOrEqualTo(Byte value) { + addCriterion("site <=", value, "site"); + return (Criteria) this; + } + + public Criteria andSiteIn(List values) { + addCriterion("site in", values, "site"); + return (Criteria) this; + } + + public Criteria andSiteNotIn(List values) { + addCriterion("site not in", values, "site"); + return (Criteria) this; + } + + public Criteria andSiteBetween(Byte value1, Byte value2) { + addCriterion("site between", value1, value2, "site"); + return (Criteria) this; + } + + public Criteria andSiteNotBetween(Byte value1, Byte value2) { + addCriterion("site not between", value1, value2, "site"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVideo.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVideo.java index 3996360b..141f20a0 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVideo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVideo.java @@ -8,19 +8,17 @@ public class CompeteVideo implements Serializable { private Long competeTimeId; - private String competeCode; - - private Byte team; + private Long projectId; private Long playerId; - private Long fileId; + private Long userId; private String videoUrl; - private Long time; + private Long uploadTime; - private Long uploadUserId; + private Byte uploadStatus; private Date createdAt; @@ -46,20 +44,12 @@ public class CompeteVideo implements Serializable { this.competeTimeId = competeTimeId; } - public String getCompeteCode() { - return competeCode; - } - - public void setCompeteCode(String competeCode) { - this.competeCode = competeCode == null ? null : competeCode.trim(); - } - - public Byte getTeam() { - return team; + public Long getProjectId() { + return projectId; } - public void setTeam(Byte team) { - this.team = team; + public void setProjectId(Long projectId) { + this.projectId = projectId; } public Long getPlayerId() { @@ -70,12 +60,12 @@ public class CompeteVideo implements Serializable { this.playerId = playerId; } - public Long getFileId() { - return fileId; + public Long getUserId() { + return userId; } - public void setFileId(Long fileId) { - this.fileId = fileId; + public void setUserId(Long userId) { + this.userId = userId; } public String getVideoUrl() { @@ -86,20 +76,20 @@ public class CompeteVideo implements Serializable { this.videoUrl = videoUrl == null ? null : videoUrl.trim(); } - public Long getTime() { - return time; + public Long getUploadTime() { + return uploadTime; } - public void setTime(Long time) { - this.time = time; + public void setUploadTime(Long uploadTime) { + this.uploadTime = uploadTime; } - public Long getUploadUserId() { - return uploadUserId; + public Byte getUploadStatus() { + return uploadStatus; } - public void setUploadUserId(Long uploadUserId) { - this.uploadUserId = uploadUserId; + public void setUploadStatus(Byte uploadStatus) { + this.uploadStatus = uploadStatus; } public Date getCreatedAt() { @@ -134,13 +124,12 @@ public class CompeteVideo implements Serializable { sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); sb.append(", competeTimeId=").append(competeTimeId); - sb.append(", competeCode=").append(competeCode); - sb.append(", team=").append(team); + sb.append(", projectId=").append(projectId); sb.append(", playerId=").append(playerId); - sb.append(", fileId=").append(fileId); + sb.append(", userId=").append(userId); sb.append(", videoUrl=").append(videoUrl); - sb.append(", time=").append(time); - sb.append(", uploadUserId=").append(uploadUserId); + sb.append(", uploadTime=").append(uploadTime); + sb.append(", uploadStatus=").append(uploadStatus); sb.append(", createdAt=").append(createdAt); sb.append(", updatedAt=").append(updatedAt); sb.append(", recStatus=").append(recStatus); diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVideoExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVideoExample.java index 71b1ac9a..8764b36d 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVideoExample.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVideoExample.java @@ -225,133 +225,63 @@ public class CompeteVideoExample { return (Criteria) this; } - public Criteria andCompeteCodeIsNull() { - addCriterion("compete_code is null"); + public Criteria andProjectIdIsNull() { + addCriterion("project_id is null"); return (Criteria) this; } - public Criteria andCompeteCodeIsNotNull() { - addCriterion("compete_code is not null"); + public Criteria andProjectIdIsNotNull() { + addCriterion("project_id is not null"); return (Criteria) this; } - public Criteria andCompeteCodeEqualTo(String value) { - addCriterion("compete_code =", value, "competeCode"); + public Criteria andProjectIdEqualTo(Long value) { + addCriterion("project_id =", value, "projectId"); return (Criteria) this; } - public Criteria andCompeteCodeNotEqualTo(String value) { - addCriterion("compete_code <>", value, "competeCode"); + public Criteria andProjectIdNotEqualTo(Long value) { + addCriterion("project_id <>", value, "projectId"); return (Criteria) this; } - public Criteria andCompeteCodeGreaterThan(String value) { - addCriterion("compete_code >", value, "competeCode"); + public Criteria andProjectIdGreaterThan(Long value) { + addCriterion("project_id >", value, "projectId"); return (Criteria) this; } - public Criteria andCompeteCodeGreaterThanOrEqualTo(String value) { - addCriterion("compete_code >=", value, "competeCode"); + public Criteria andProjectIdGreaterThanOrEqualTo(Long value) { + addCriterion("project_id >=", value, "projectId"); return (Criteria) this; } - public Criteria andCompeteCodeLessThan(String value) { - addCriterion("compete_code <", value, "competeCode"); + public Criteria andProjectIdLessThan(Long value) { + addCriterion("project_id <", value, "projectId"); return (Criteria) this; } - public Criteria andCompeteCodeLessThanOrEqualTo(String value) { - addCriterion("compete_code <=", value, "competeCode"); + public Criteria andProjectIdLessThanOrEqualTo(Long value) { + addCriterion("project_id <=", value, "projectId"); return (Criteria) this; } - public Criteria andCompeteCodeLike(String value) { - addCriterion("compete_code like", value, "competeCode"); + public Criteria andProjectIdIn(List values) { + addCriterion("project_id in", values, "projectId"); return (Criteria) this; } - public Criteria andCompeteCodeNotLike(String value) { - addCriterion("compete_code not like", value, "competeCode"); + public Criteria andProjectIdNotIn(List values) { + addCriterion("project_id not in", values, "projectId"); return (Criteria) this; } - public Criteria andCompeteCodeIn(List values) { - addCriterion("compete_code in", values, "competeCode"); + public Criteria andProjectIdBetween(Long value1, Long value2) { + addCriterion("project_id between", value1, value2, "projectId"); return (Criteria) this; } - public Criteria andCompeteCodeNotIn(List values) { - addCriterion("compete_code not in", values, "competeCode"); - return (Criteria) this; - } - - public Criteria andCompeteCodeBetween(String value1, String value2) { - addCriterion("compete_code between", value1, value2, "competeCode"); - return (Criteria) this; - } - - public Criteria andCompeteCodeNotBetween(String value1, String value2) { - addCriterion("compete_code not between", value1, value2, "competeCode"); - return (Criteria) this; - } - - public Criteria andTeamIsNull() { - addCriterion("team is null"); - return (Criteria) this; - } - - public Criteria andTeamIsNotNull() { - addCriterion("team is not null"); - return (Criteria) this; - } - - public Criteria andTeamEqualTo(Byte value) { - addCriterion("team =", value, "team"); - return (Criteria) this; - } - - public Criteria andTeamNotEqualTo(Byte value) { - addCriterion("team <>", value, "team"); - return (Criteria) this; - } - - public Criteria andTeamGreaterThan(Byte value) { - addCriterion("team >", value, "team"); - return (Criteria) this; - } - - public Criteria andTeamGreaterThanOrEqualTo(Byte value) { - addCriterion("team >=", value, "team"); - return (Criteria) this; - } - - public Criteria andTeamLessThan(Byte value) { - addCriterion("team <", value, "team"); - return (Criteria) this; - } - - public Criteria andTeamLessThanOrEqualTo(Byte value) { - addCriterion("team <=", value, "team"); - return (Criteria) this; - } - - public Criteria andTeamIn(List values) { - addCriterion("team in", values, "team"); - return (Criteria) this; - } - - public Criteria andTeamNotIn(List values) { - addCriterion("team not in", values, "team"); - return (Criteria) this; - } - - public Criteria andTeamBetween(Byte value1, Byte value2) { - addCriterion("team between", value1, value2, "team"); - return (Criteria) this; - } - - public Criteria andTeamNotBetween(Byte value1, Byte value2) { - addCriterion("team not between", value1, value2, "team"); + public Criteria andProjectIdNotBetween(Long value1, Long value2) { + addCriterion("project_id not between", value1, value2, "projectId"); return (Criteria) this; } @@ -415,63 +345,63 @@ public class CompeteVideoExample { return (Criteria) this; } - public Criteria andFileIdIsNull() { - addCriterion("file_id is null"); + public Criteria andUserIdIsNull() { + addCriterion("user_id is null"); return (Criteria) this; } - public Criteria andFileIdIsNotNull() { - addCriterion("file_id is not null"); + public Criteria andUserIdIsNotNull() { + addCriterion("user_id is not null"); return (Criteria) this; } - public Criteria andFileIdEqualTo(Long value) { - addCriterion("file_id =", value, "fileId"); + public Criteria andUserIdEqualTo(Long value) { + addCriterion("user_id =", value, "userId"); return (Criteria) this; } - public Criteria andFileIdNotEqualTo(Long value) { - addCriterion("file_id <>", value, "fileId"); + public Criteria andUserIdNotEqualTo(Long value) { + addCriterion("user_id <>", value, "userId"); return (Criteria) this; } - public Criteria andFileIdGreaterThan(Long value) { - addCriterion("file_id >", value, "fileId"); + public Criteria andUserIdGreaterThan(Long value) { + addCriterion("user_id >", value, "userId"); return (Criteria) this; } - public Criteria andFileIdGreaterThanOrEqualTo(Long value) { - addCriterion("file_id >=", value, "fileId"); + public Criteria andUserIdGreaterThanOrEqualTo(Long value) { + addCriterion("user_id >=", value, "userId"); return (Criteria) this; } - public Criteria andFileIdLessThan(Long value) { - addCriterion("file_id <", value, "fileId"); + public Criteria andUserIdLessThan(Long value) { + addCriterion("user_id <", value, "userId"); return (Criteria) this; } - public Criteria andFileIdLessThanOrEqualTo(Long value) { - addCriterion("file_id <=", value, "fileId"); + public Criteria andUserIdLessThanOrEqualTo(Long value) { + addCriterion("user_id <=", value, "userId"); return (Criteria) this; } - public Criteria andFileIdIn(List values) { - addCriterion("file_id in", values, "fileId"); + public Criteria andUserIdIn(List values) { + addCriterion("user_id in", values, "userId"); return (Criteria) this; } - public Criteria andFileIdNotIn(List values) { - addCriterion("file_id not in", values, "fileId"); + public Criteria andUserIdNotIn(List values) { + addCriterion("user_id not in", values, "userId"); return (Criteria) this; } - public Criteria andFileIdBetween(Long value1, Long value2) { - addCriterion("file_id between", value1, value2, "fileId"); + public Criteria andUserIdBetween(Long value1, Long value2) { + addCriterion("user_id between", value1, value2, "userId"); return (Criteria) this; } - public Criteria andFileIdNotBetween(Long value1, Long value2) { - addCriterion("file_id not between", value1, value2, "fileId"); + public Criteria andUserIdNotBetween(Long value1, Long value2) { + addCriterion("user_id not between", value1, value2, "userId"); return (Criteria) this; } @@ -545,123 +475,123 @@ public class CompeteVideoExample { return (Criteria) this; } - public Criteria andTimeIsNull() { - addCriterion("time is null"); + public Criteria andUploadTimeIsNull() { + addCriterion("upload_time is null"); return (Criteria) this; } - public Criteria andTimeIsNotNull() { - addCriterion("time is not null"); + public Criteria andUploadTimeIsNotNull() { + addCriterion("upload_time is not null"); return (Criteria) this; } - public Criteria andTimeEqualTo(Long value) { - addCriterion("time =", value, "time"); + public Criteria andUploadTimeEqualTo(Long value) { + addCriterion("upload_time =", value, "uploadTime"); return (Criteria) this; } - public Criteria andTimeNotEqualTo(Long value) { - addCriterion("time <>", value, "time"); + public Criteria andUploadTimeNotEqualTo(Long value) { + addCriterion("upload_time <>", value, "uploadTime"); return (Criteria) this; } - public Criteria andTimeGreaterThan(Long value) { - addCriterion("time >", value, "time"); + public Criteria andUploadTimeGreaterThan(Long value) { + addCriterion("upload_time >", value, "uploadTime"); return (Criteria) this; } - public Criteria andTimeGreaterThanOrEqualTo(Long value) { - addCriterion("time >=", value, "time"); + public Criteria andUploadTimeGreaterThanOrEqualTo(Long value) { + addCriterion("upload_time >=", value, "uploadTime"); return (Criteria) this; } - public Criteria andTimeLessThan(Long value) { - addCriterion("time <", value, "time"); + public Criteria andUploadTimeLessThan(Long value) { + addCriterion("upload_time <", value, "uploadTime"); return (Criteria) this; } - public Criteria andTimeLessThanOrEqualTo(Long value) { - addCriterion("time <=", value, "time"); + public Criteria andUploadTimeLessThanOrEqualTo(Long value) { + addCriterion("upload_time <=", value, "uploadTime"); return (Criteria) this; } - public Criteria andTimeIn(List values) { - addCriterion("time in", values, "time"); + public Criteria andUploadTimeIn(List values) { + addCriterion("upload_time in", values, "uploadTime"); return (Criteria) this; } - public Criteria andTimeNotIn(List values) { - addCriterion("time not in", values, "time"); + public Criteria andUploadTimeNotIn(List values) { + addCriterion("upload_time not in", values, "uploadTime"); return (Criteria) this; } - public Criteria andTimeBetween(Long value1, Long value2) { - addCriterion("time between", value1, value2, "time"); + public Criteria andUploadTimeBetween(Long value1, Long value2) { + addCriterion("upload_time between", value1, value2, "uploadTime"); return (Criteria) this; } - public Criteria andTimeNotBetween(Long value1, Long value2) { - addCriterion("time not between", value1, value2, "time"); + public Criteria andUploadTimeNotBetween(Long value1, Long value2) { + addCriterion("upload_time not between", value1, value2, "uploadTime"); return (Criteria) this; } - public Criteria andUploadUserIdIsNull() { - addCriterion("upload_user_id is null"); + public Criteria andUploadStatusIsNull() { + addCriterion("upload_status is null"); return (Criteria) this; } - public Criteria andUploadUserIdIsNotNull() { - addCriterion("upload_user_id is not null"); + public Criteria andUploadStatusIsNotNull() { + addCriterion("upload_status is not null"); return (Criteria) this; } - public Criteria andUploadUserIdEqualTo(Long value) { - addCriterion("upload_user_id =", value, "uploadUserId"); + public Criteria andUploadStatusEqualTo(Byte value) { + addCriterion("upload_status =", value, "uploadStatus"); return (Criteria) this; } - public Criteria andUploadUserIdNotEqualTo(Long value) { - addCriterion("upload_user_id <>", value, "uploadUserId"); + public Criteria andUploadStatusNotEqualTo(Byte value) { + addCriterion("upload_status <>", value, "uploadStatus"); return (Criteria) this; } - public Criteria andUploadUserIdGreaterThan(Long value) { - addCriterion("upload_user_id >", value, "uploadUserId"); + public Criteria andUploadStatusGreaterThan(Byte value) { + addCriterion("upload_status >", value, "uploadStatus"); return (Criteria) this; } - public Criteria andUploadUserIdGreaterThanOrEqualTo(Long value) { - addCriterion("upload_user_id >=", value, "uploadUserId"); + public Criteria andUploadStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("upload_status >=", value, "uploadStatus"); return (Criteria) this; } - public Criteria andUploadUserIdLessThan(Long value) { - addCriterion("upload_user_id <", value, "uploadUserId"); + public Criteria andUploadStatusLessThan(Byte value) { + addCriterion("upload_status <", value, "uploadStatus"); return (Criteria) this; } - public Criteria andUploadUserIdLessThanOrEqualTo(Long value) { - addCriterion("upload_user_id <=", value, "uploadUserId"); + public Criteria andUploadStatusLessThanOrEqualTo(Byte value) { + addCriterion("upload_status <=", value, "uploadStatus"); return (Criteria) this; } - public Criteria andUploadUserIdIn(List values) { - addCriterion("upload_user_id in", values, "uploadUserId"); + public Criteria andUploadStatusIn(List values) { + addCriterion("upload_status in", values, "uploadStatus"); return (Criteria) this; } - public Criteria andUploadUserIdNotIn(List values) { - addCriterion("upload_user_id not in", values, "uploadUserId"); + public Criteria andUploadStatusNotIn(List values) { + addCriterion("upload_status not in", values, "uploadStatus"); return (Criteria) this; } - public Criteria andUploadUserIdBetween(Long value1, Long value2) { - addCriterion("upload_user_id between", value1, value2, "uploadUserId"); + public Criteria andUploadStatusBetween(Byte value1, Byte value2) { + addCriterion("upload_status between", value1, value2, "uploadStatus"); return (Criteria) this; } - public Criteria andUploadUserIdNotBetween(Long value1, Long value2) { - addCriterion("upload_user_id not between", value1, value2, "uploadUserId"); + public Criteria andUploadStatusNotBetween(Byte value1, Byte value2) { + addCriterion("upload_status not between", value1, value2, "uploadStatus"); return (Criteria) this; } diff --git a/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteCountScoreMapper.java b/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteCountScoreMapper.java new file mode 100644 index 00000000..faf0e354 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteCountScoreMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.mt.persist.mapper; + +import com.ccsens.mt.bean.po.CompeteCountScore; +import com.ccsens.mt.bean.po.CompeteCountScoreExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface CompeteCountScoreMapper { + long countByExample(CompeteCountScoreExample example); + + int deleteByExample(CompeteCountScoreExample example); + + int deleteByPrimaryKey(Long id); + + int insert(CompeteCountScore record); + + int insertSelective(CompeteCountScore record); + + List selectByExample(CompeteCountScoreExample example); + + CompeteCountScore selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") CompeteCountScore record, @Param("example") CompeteCountScoreExample example); + + int updateByExample(@Param("record") CompeteCountScore record, @Param("example") CompeteCountScoreExample example); + + int updateByPrimaryKeySelective(CompeteCountScore record); + + int updateByPrimaryKey(CompeteCountScore record); +} \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/persist/mapper/CompetePlayerLookMapper.java b/mt/src/main/java/com/ccsens/mt/persist/mapper/CompetePlayerLookMapper.java new file mode 100644 index 00000000..b1be5d8f --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/persist/mapper/CompetePlayerLookMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.mt.persist.mapper; + +import com.ccsens.mt.bean.po.CompetePlayerLook; +import com.ccsens.mt.bean.po.CompetePlayerLookExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface CompetePlayerLookMapper { + long countByExample(CompetePlayerLookExample example); + + int deleteByExample(CompetePlayerLookExample example); + + int deleteByPrimaryKey(Long id); + + int insert(CompetePlayerLook record); + + int insertSelective(CompetePlayerLook record); + + List selectByExample(CompetePlayerLookExample example); + + CompetePlayerLook selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") CompetePlayerLook record, @Param("example") CompetePlayerLookExample example); + + int updateByExample(@Param("record") CompetePlayerLook record, @Param("example") CompetePlayerLookExample example); + + int updateByPrimaryKeySelective(CompetePlayerLook record); + + int updateByPrimaryKey(CompetePlayerLook record); +} \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteProjectConfigMapper.java b/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteProjectConfigMapper.java index bbbbcb9d..b3c17aab 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteProjectConfigMapper.java +++ b/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteProjectConfigMapper.java @@ -1,30 +1,30 @@ -package com.ccsens.mt.persist.mapper; - -import com.ccsens.mt.bean.po.CompeteProjectConfig; -import com.ccsens.mt.bean.po.CompeteProjectConfigExample; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -public interface CompeteProjectConfigMapper { - long countByExample(CompeteProjectConfigExample example); - - int deleteByExample(CompeteProjectConfigExample example); - - int deleteByPrimaryKey(Long id); - - int insert(CompeteProjectConfig record); - - int insertSelective(CompeteProjectConfig record); - - List selectByExample(CompeteProjectConfigExample example); - - CompeteProjectConfig selectByPrimaryKey(Long id); - - int updateByExampleSelective(@Param("record") CompeteProjectConfig record, @Param("example") CompeteProjectConfigExample example); - - int updateByExample(@Param("record") CompeteProjectConfig record, @Param("example") CompeteProjectConfigExample example); - - int updateByPrimaryKeySelective(CompeteProjectConfig record); - - int updateByPrimaryKey(CompeteProjectConfig record); +package com.ccsens.mt.persist.mapper; + +import com.ccsens.mt.bean.po.CompeteProjectConfig; +import com.ccsens.mt.bean.po.CompeteProjectConfigExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface CompeteProjectConfigMapper { + long countByExample(CompeteProjectConfigExample example); + + int deleteByExample(CompeteProjectConfigExample example); + + int deleteByPrimaryKey(Long id); + + int insert(CompeteProjectConfig record); + + int insertSelective(CompeteProjectConfig record); + + List selectByExample(CompeteProjectConfigExample example); + + CompeteProjectConfig selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") CompeteProjectConfig record, @Param("example") CompeteProjectConfigExample example); + + int updateByExample(@Param("record") CompeteProjectConfig record, @Param("example") CompeteProjectConfigExample example); + + int updateByPrimaryKeySelective(CompeteProjectConfig record); + + int updateByPrimaryKey(CompeteProjectConfig record); } \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteStartOrderMapper.java b/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteStartOrderMapper.java new file mode 100644 index 00000000..7a1962d9 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteStartOrderMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.mt.persist.mapper; + +import com.ccsens.mt.bean.po.CompeteStartOrder; +import com.ccsens.mt.bean.po.CompeteStartOrderExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface CompeteStartOrderMapper { + long countByExample(CompeteStartOrderExample example); + + int deleteByExample(CompeteStartOrderExample example); + + int deleteByPrimaryKey(Long id); + + int insert(CompeteStartOrder record); + + int insertSelective(CompeteStartOrder record); + + List selectByExample(CompeteStartOrderExample example); + + CompeteStartOrder selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") CompeteStartOrder record, @Param("example") CompeteStartOrderExample example); + + int updateByExample(@Param("record") CompeteStartOrder record, @Param("example") CompeteStartOrderExample example); + + int updateByPrimaryKeySelective(CompeteStartOrder record); + + int updateByPrimaryKey(CompeteStartOrder record); +} \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java index 255bcdb5..eeaeb964 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -468,6 +468,12 @@ public class ProvinceService implements IProvinceService { if(StrUtil.isEmpty(param.getIdCard()) || !IdcardUtil.isValidCard(param.getIdCard())){ throw new BaseException(CodeEnum.ID_CARD_ERROR); } + //检查性别与身份证是否匹配 + int gender = IdcardUtil.getGenderByIdCard(param.getIdCard()); + if(gender != param.getGender()){ + throw new BaseException(CodeEnum.GENDER_ERROR); + } + //证件照判断 if (param.getIdentity() == 1 && ObjectUtil.isNull(param.getIdPhoto())){ throw new BaseException(CodeEnum.PHOTO_IS_EMPTY); @@ -844,8 +850,8 @@ public class ProvinceService implements IProvinceService { private boolean getJoinProject(Long playerId){ CompeteProjectPlayerExample projectPlayerExample = new CompeteProjectPlayerExample(); projectPlayerExample.createCriteria().andPlayerIdEqualTo(playerId); - if(projectPlayerMapper.countByExample(projectPlayerExample) == 0){ - return false; + if(projectPlayerMapper.countByExample(projectPlayerExample) != 0){ + return true; } CompeteTeamMemberExample teamMemberExample = new CompeteTeamMemberExample(); teamMemberExample.createCriteria().andPlayerIdEqualTo(playerId); diff --git a/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml b/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml new file mode 100644 index 00000000..3fba3694 --- /dev/null +++ b/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml @@ -0,0 +1,354 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, compete_time_id, project_id, site_order_id, chief_judgment_score, judgment_a_score, + judgment_b_score2, should_times, deduct_times, deduct_cause, final_score, created_at, + updated_at, rec_status + + + + + delete from t_compete_count_score + where id = #{id,jdbcType=BIGINT} + + + delete from t_compete_count_score + + + + + + insert into t_compete_count_score (id, compete_time_id, project_id, + site_order_id, chief_judgment_score, judgment_a_score, + judgment_b_score2, should_times, deduct_times, + deduct_cause, final_score, created_at, + updated_at, rec_status) + values (#{id,jdbcType=BIGINT}, #{competeTimeId,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, + #{siteOrderId,jdbcType=BIGINT}, #{chiefJudgmentScore,jdbcType=BIGINT}, #{judgmentAScore,jdbcType=INTEGER}, + #{judgmentBScore2,jdbcType=INTEGER}, #{shouldTimes,jdbcType=INTEGER}, #{deductTimes,jdbcType=INTEGER}, + #{deductCause,jdbcType=VARCHAR}, #{finalScore,jdbcType=INTEGER}, #{createdAt,jdbcType=TIMESTAMP}, + #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) + + + insert into t_compete_count_score + + + id, + + + compete_time_id, + + + project_id, + + + site_order_id, + + + chief_judgment_score, + + + judgment_a_score, + + + judgment_b_score2, + + + should_times, + + + deduct_times, + + + deduct_cause, + + + final_score, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{competeTimeId,jdbcType=BIGINT}, + + + #{projectId,jdbcType=BIGINT}, + + + #{siteOrderId,jdbcType=BIGINT}, + + + #{chiefJudgmentScore,jdbcType=BIGINT}, + + + #{judgmentAScore,jdbcType=INTEGER}, + + + #{judgmentBScore2,jdbcType=INTEGER}, + + + #{shouldTimes,jdbcType=INTEGER}, + + + #{deductTimes,jdbcType=INTEGER}, + + + #{deductCause,jdbcType=VARCHAR}, + + + #{finalScore,jdbcType=INTEGER}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_compete_count_score + + + id = #{record.id,jdbcType=BIGINT}, + + + compete_time_id = #{record.competeTimeId,jdbcType=BIGINT}, + + + project_id = #{record.projectId,jdbcType=BIGINT}, + + + site_order_id = #{record.siteOrderId,jdbcType=BIGINT}, + + + chief_judgment_score = #{record.chiefJudgmentScore,jdbcType=BIGINT}, + + + judgment_a_score = #{record.judgmentAScore,jdbcType=INTEGER}, + + + judgment_b_score2 = #{record.judgmentBScore2,jdbcType=INTEGER}, + + + should_times = #{record.shouldTimes,jdbcType=INTEGER}, + + + deduct_times = #{record.deductTimes,jdbcType=INTEGER}, + + + deduct_cause = #{record.deductCause,jdbcType=VARCHAR}, + + + final_score = #{record.finalScore,jdbcType=INTEGER}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_compete_count_score + set id = #{record.id,jdbcType=BIGINT}, + compete_time_id = #{record.competeTimeId,jdbcType=BIGINT}, + project_id = #{record.projectId,jdbcType=BIGINT}, + site_order_id = #{record.siteOrderId,jdbcType=BIGINT}, + chief_judgment_score = #{record.chiefJudgmentScore,jdbcType=BIGINT}, + judgment_a_score = #{record.judgmentAScore,jdbcType=INTEGER}, + judgment_b_score2 = #{record.judgmentBScore2,jdbcType=INTEGER}, + should_times = #{record.shouldTimes,jdbcType=INTEGER}, + deduct_times = #{record.deductTimes,jdbcType=INTEGER}, + deduct_cause = #{record.deductCause,jdbcType=VARCHAR}, + final_score = #{record.finalScore,jdbcType=INTEGER}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_compete_count_score + + + compete_time_id = #{competeTimeId,jdbcType=BIGINT}, + + + project_id = #{projectId,jdbcType=BIGINT}, + + + site_order_id = #{siteOrderId,jdbcType=BIGINT}, + + + chief_judgment_score = #{chiefJudgmentScore,jdbcType=BIGINT}, + + + judgment_a_score = #{judgmentAScore,jdbcType=INTEGER}, + + + judgment_b_score2 = #{judgmentBScore2,jdbcType=INTEGER}, + + + should_times = #{shouldTimes,jdbcType=INTEGER}, + + + deduct_times = #{deductTimes,jdbcType=INTEGER}, + + + deduct_cause = #{deductCause,jdbcType=VARCHAR}, + + + final_score = #{finalScore,jdbcType=INTEGER}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_compete_count_score + set compete_time_id = #{competeTimeId,jdbcType=BIGINT}, + project_id = #{projectId,jdbcType=BIGINT}, + site_order_id = #{siteOrderId,jdbcType=BIGINT}, + chief_judgment_score = #{chiefJudgmentScore,jdbcType=BIGINT}, + judgment_a_score = #{judgmentAScore,jdbcType=INTEGER}, + judgment_b_score2 = #{judgmentBScore2,jdbcType=INTEGER}, + should_times = #{shouldTimes,jdbcType=INTEGER}, + deduct_times = #{deductTimes,jdbcType=INTEGER}, + deduct_cause = #{deductCause,jdbcType=VARCHAR}, + final_score = #{finalScore,jdbcType=INTEGER}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/mt/src/main/resources/mapper_raw/CompetePlayerLookMapper.xml b/mt/src/main/resources/mapper_raw/CompetePlayerLookMapper.xml new file mode 100644 index 00000000..ea467614 --- /dev/null +++ b/mt/src/main/resources/mapper_raw/CompetePlayerLookMapper.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, company_id, look_status, look_time, created_at, updated_at, rec_status + + + + + delete from t_compete_player_look + where id = #{id,jdbcType=BIGINT} + + + delete from t_compete_player_look + + + + + + insert into t_compete_player_look (id, company_id, look_status, + look_time, created_at, updated_at, + rec_status) + values (#{id,jdbcType=BIGINT}, #{companyId,jdbcType=BIGINT}, #{lookStatus,jdbcType=TINYINT}, + #{lookTime,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, + #{recStatus,jdbcType=TINYINT}) + + + insert into t_compete_player_look + + + id, + + + company_id, + + + look_status, + + + look_time, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{companyId,jdbcType=BIGINT}, + + + #{lookStatus,jdbcType=TINYINT}, + + + #{lookTime,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_compete_player_look + + + id = #{record.id,jdbcType=BIGINT}, + + + company_id = #{record.companyId,jdbcType=BIGINT}, + + + look_status = #{record.lookStatus,jdbcType=TINYINT}, + + + look_time = #{record.lookTime,jdbcType=BIGINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_compete_player_look + set id = #{record.id,jdbcType=BIGINT}, + company_id = #{record.companyId,jdbcType=BIGINT}, + look_status = #{record.lookStatus,jdbcType=TINYINT}, + look_time = #{record.lookTime,jdbcType=BIGINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_compete_player_look + + + company_id = #{companyId,jdbcType=BIGINT}, + + + look_status = #{lookStatus,jdbcType=TINYINT}, + + + look_time = #{lookTime,jdbcType=BIGINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_compete_player_look + set company_id = #{companyId,jdbcType=BIGINT}, + look_status = #{lookStatus,jdbcType=TINYINT}, + look_time = #{lookTime,jdbcType=BIGINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/mt/src/main/resources/mapper_raw/CompeteProjectConfigMapper.xml b/mt/src/main/resources/mapper_raw/CompeteProjectConfigMapper.xml index 83c3bf11..a9a2a80b 100644 --- a/mt/src/main/resources/mapper_raw/CompeteProjectConfigMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompeteProjectConfigMapper.xml @@ -1,276 +1,276 @@ - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, project_id, site_num, start_time, end_time, created_at, updated_at, rec_status, - project_duration - - - - - delete from t_compete_project_config - where id = #{id,jdbcType=BIGINT} - - - delete from t_compete_project_config - - - - - - insert into t_compete_project_config (id, project_id, site_num, - start_time, end_time, created_at, - updated_at, rec_status, project_duration - ) - values (#{id,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, #{siteNum,jdbcType=INTEGER}, - #{startTime,jdbcType=BIGINT}, #{endTime,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, - #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, #{projectDuration,jdbcType=BIGINT} - ) - - - insert into t_compete_project_config - - - id, - - - project_id, - - - site_num, - - - start_time, - - - end_time, - - - created_at, - - - updated_at, - - - rec_status, - - - project_duration, - - - - - #{id,jdbcType=BIGINT}, - - - #{projectId,jdbcType=BIGINT}, - - - #{siteNum,jdbcType=INTEGER}, - - - #{startTime,jdbcType=BIGINT}, - - - #{endTime,jdbcType=BIGINT}, - - - #{createdAt,jdbcType=TIMESTAMP}, - - - #{updatedAt,jdbcType=TIMESTAMP}, - - - #{recStatus,jdbcType=TINYINT}, - - - #{projectDuration,jdbcType=BIGINT}, - - - - - - update t_compete_project_config - - - id = #{record.id,jdbcType=BIGINT}, - - - project_id = #{record.projectId,jdbcType=BIGINT}, - - - site_num = #{record.siteNum,jdbcType=INTEGER}, - - - start_time = #{record.startTime,jdbcType=BIGINT}, - - - end_time = #{record.endTime,jdbcType=BIGINT}, - - - created_at = #{record.createdAt,jdbcType=TIMESTAMP}, - - - updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, - - - rec_status = #{record.recStatus,jdbcType=TINYINT}, - - - project_duration = #{record.projectDuration,jdbcType=BIGINT}, - - - - - - - - update t_compete_project_config - set id = #{record.id,jdbcType=BIGINT}, - project_id = #{record.projectId,jdbcType=BIGINT}, - site_num = #{record.siteNum,jdbcType=INTEGER}, - start_time = #{record.startTime,jdbcType=BIGINT}, - end_time = #{record.endTime,jdbcType=BIGINT}, - created_at = #{record.createdAt,jdbcType=TIMESTAMP}, - updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, - rec_status = #{record.recStatus,jdbcType=TINYINT}, - project_duration = #{record.projectDuration,jdbcType=BIGINT} - - - - - - update t_compete_project_config - - - project_id = #{projectId,jdbcType=BIGINT}, - - - site_num = #{siteNum,jdbcType=INTEGER}, - - - start_time = #{startTime,jdbcType=BIGINT}, - - - end_time = #{endTime,jdbcType=BIGINT}, - - - created_at = #{createdAt,jdbcType=TIMESTAMP}, - - - updated_at = #{updatedAt,jdbcType=TIMESTAMP}, - - - rec_status = #{recStatus,jdbcType=TINYINT}, - - - project_duration = #{projectDuration,jdbcType=BIGINT}, - - - where id = #{id,jdbcType=BIGINT} - - - update t_compete_project_config - set project_id = #{projectId,jdbcType=BIGINT}, - site_num = #{siteNum,jdbcType=INTEGER}, - start_time = #{startTime,jdbcType=BIGINT}, - end_time = #{endTime,jdbcType=BIGINT}, - created_at = #{createdAt,jdbcType=TIMESTAMP}, - updated_at = #{updatedAt,jdbcType=TIMESTAMP}, - rec_status = #{recStatus,jdbcType=TINYINT}, - project_duration = #{projectDuration,jdbcType=BIGINT} - where id = #{id,jdbcType=BIGINT} - + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, project_id, site_num, start_time, end_time, created_at, updated_at, rec_status, + project_duration + + + + + delete from t_compete_project_config + where id = #{id,jdbcType=BIGINT} + + + delete from t_compete_project_config + + + + + + insert into t_compete_project_config (id, project_id, site_num, + start_time, end_time, created_at, + updated_at, rec_status, project_duration + ) + values (#{id,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, #{siteNum,jdbcType=INTEGER}, + #{startTime,jdbcType=BIGINT}, #{endTime,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, + #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, #{projectDuration,jdbcType=BIGINT} + ) + + + insert into t_compete_project_config + + + id, + + + project_id, + + + site_num, + + + start_time, + + + end_time, + + + created_at, + + + updated_at, + + + rec_status, + + + project_duration, + + + + + #{id,jdbcType=BIGINT}, + + + #{projectId,jdbcType=BIGINT}, + + + #{siteNum,jdbcType=INTEGER}, + + + #{startTime,jdbcType=BIGINT}, + + + #{endTime,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + #{projectDuration,jdbcType=BIGINT}, + + + + + + update t_compete_project_config + + + id = #{record.id,jdbcType=BIGINT}, + + + project_id = #{record.projectId,jdbcType=BIGINT}, + + + site_num = #{record.siteNum,jdbcType=INTEGER}, + + + start_time = #{record.startTime,jdbcType=BIGINT}, + + + end_time = #{record.endTime,jdbcType=BIGINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + project_duration = #{record.projectDuration,jdbcType=BIGINT}, + + + + + + + + update t_compete_project_config + set id = #{record.id,jdbcType=BIGINT}, + project_id = #{record.projectId,jdbcType=BIGINT}, + site_num = #{record.siteNum,jdbcType=INTEGER}, + start_time = #{record.startTime,jdbcType=BIGINT}, + end_time = #{record.endTime,jdbcType=BIGINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT}, + project_duration = #{record.projectDuration,jdbcType=BIGINT} + + + + + + update t_compete_project_config + + + project_id = #{projectId,jdbcType=BIGINT}, + + + site_num = #{siteNum,jdbcType=INTEGER}, + + + start_time = #{startTime,jdbcType=BIGINT}, + + + end_time = #{endTime,jdbcType=BIGINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + project_duration = #{projectDuration,jdbcType=BIGINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_compete_project_config + set project_id = #{projectId,jdbcType=BIGINT}, + site_num = #{siteNum,jdbcType=INTEGER}, + start_time = #{startTime,jdbcType=BIGINT}, + end_time = #{endTime,jdbcType=BIGINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT}, + project_duration = #{projectDuration,jdbcType=BIGINT} + where id = #{id,jdbcType=BIGINT} + \ No newline at end of file diff --git a/mt/src/main/resources/mapper_raw/CompeteStartOrderMapper.xml b/mt/src/main/resources/mapper_raw/CompeteStartOrderMapper.xml new file mode 100644 index 00000000..4e5cd89c --- /dev/null +++ b/mt/src/main/resources/mapper_raw/CompeteStartOrderMapper.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, player_id, compete_order, site, created_at, updated_at, rec_status + + + + + delete from t_compete_start_order + where id = #{id,jdbcType=BIGINT} + + + delete from t_compete_start_order + + + + + + insert into t_compete_start_order (id, player_id, compete_order, + site, created_at, updated_at, + rec_status) + values (#{id,jdbcType=BIGINT}, #{playerId,jdbcType=BIGINT}, #{competeOrder,jdbcType=TINYINT}, + #{site,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, + #{recStatus,jdbcType=TINYINT}) + + + insert into t_compete_start_order + + + id, + + + player_id, + + + compete_order, + + + site, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{playerId,jdbcType=BIGINT}, + + + #{competeOrder,jdbcType=TINYINT}, + + + #{site,jdbcType=TINYINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_compete_start_order + + + id = #{record.id,jdbcType=BIGINT}, + + + player_id = #{record.playerId,jdbcType=BIGINT}, + + + compete_order = #{record.competeOrder,jdbcType=TINYINT}, + + + site = #{record.site,jdbcType=TINYINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_compete_start_order + set id = #{record.id,jdbcType=BIGINT}, + player_id = #{record.playerId,jdbcType=BIGINT}, + compete_order = #{record.competeOrder,jdbcType=TINYINT}, + site = #{record.site,jdbcType=TINYINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_compete_start_order + + + player_id = #{playerId,jdbcType=BIGINT}, + + + compete_order = #{competeOrder,jdbcType=TINYINT}, + + + site = #{site,jdbcType=TINYINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_compete_start_order + set player_id = #{playerId,jdbcType=BIGINT}, + compete_order = #{competeOrder,jdbcType=TINYINT}, + site = #{site,jdbcType=TINYINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/mt/src/main/resources/mapper_raw/CompeteVideoMapper.xml b/mt/src/main/resources/mapper_raw/CompeteVideoMapper.xml index 541d081e..34642f49 100644 --- a/mt/src/main/resources/mapper_raw/CompeteVideoMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompeteVideoMapper.xml @@ -4,13 +4,12 @@ - - + - + - - + + @@ -74,7 +73,7 @@ - id, compete_time_id, compete_code, team, player_id, file_id, video_url, time, upload_user_id, + id, compete_time_id, project_id, player_id, user_id, video_url, upload_time, upload_status, created_at, updated_at, rec_status + select + + distinct + + + from t_compete_judgment + + + + + order by ${orderByClause} + + + + + delete from t_compete_judgment + where id = #{id,jdbcType=BIGINT} + + + delete from t_compete_judgment + + + + + + insert into t_compete_judgment (id, compete_time_id, site_order_id, + project_id, user_id, chief_judgment, + created_at, updated_at, rec_status + ) + values (#{id,jdbcType=BIGINT}, #{competeTimeId,jdbcType=BIGINT}, #{siteOrderId,jdbcType=BIGINT}, + #{projectId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{chiefJudgment,jdbcType=TINYINT}, + #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} + ) + + + insert into t_compete_judgment + + + id, + + + compete_time_id, + + + site_order_id, + + + project_id, + + + user_id, + + + chief_judgment, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{competeTimeId,jdbcType=BIGINT}, + + + #{siteOrderId,jdbcType=BIGINT}, + + + #{projectId,jdbcType=BIGINT}, + + + #{userId,jdbcType=BIGINT}, + + + #{chiefJudgment,jdbcType=TINYINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_compete_judgment + + + id = #{record.id,jdbcType=BIGINT}, + + + compete_time_id = #{record.competeTimeId,jdbcType=BIGINT}, + + + site_order_id = #{record.siteOrderId,jdbcType=BIGINT}, + + + project_id = #{record.projectId,jdbcType=BIGINT}, + + + user_id = #{record.userId,jdbcType=BIGINT}, + + + chief_judgment = #{record.chiefJudgment,jdbcType=TINYINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_compete_judgment + set id = #{record.id,jdbcType=BIGINT}, + compete_time_id = #{record.competeTimeId,jdbcType=BIGINT}, + site_order_id = #{record.siteOrderId,jdbcType=BIGINT}, + project_id = #{record.projectId,jdbcType=BIGINT}, + user_id = #{record.userId,jdbcType=BIGINT}, + chief_judgment = #{record.chiefJudgment,jdbcType=TINYINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_compete_judgment + + + compete_time_id = #{competeTimeId,jdbcType=BIGINT}, + + + site_order_id = #{siteOrderId,jdbcType=BIGINT}, + + + project_id = #{projectId,jdbcType=BIGINT}, + + + user_id = #{userId,jdbcType=BIGINT}, + + + chief_judgment = #{chiefJudgment,jdbcType=TINYINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_compete_judgment + set compete_time_id = #{competeTimeId,jdbcType=BIGINT}, + site_order_id = #{siteOrderId,jdbcType=BIGINT}, + project_id = #{projectId,jdbcType=BIGINT}, + user_id = #{userId,jdbcType=BIGINT}, + chief_judgment = #{chiefJudgment,jdbcType=TINYINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/mt/src/main/resources/mapper_raw/CompeteStartOrderMapper.xml b/mt/src/main/resources/mapper_raw/CompeteStartOrderMapper.xml index 4e5cd89c..8e150359 100644 --- a/mt/src/main/resources/mapper_raw/CompeteStartOrderMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompeteStartOrderMapper.xml @@ -3,7 +3,9 @@ + + @@ -69,7 +71,7 @@ - id, player_id, compete_order, site, created_at, updated_at, rec_status + id, project_id, player_id, team, compete_order, site, created_at, updated_at, rec_status + select + + distinct + + + from t_compete_variety_score + + + + + order by ${orderByClause} + + + + + delete from t_compete_variety_score + where id = #{id,jdbcType=BIGINT} + + + delete from t_compete_variety_score + + + + + + insert into t_compete_variety_score (id, compete_time_id, project_id, + site_order_id, code, score, + judgment_id, created_at, updated_at, + rec_status) + values (#{id,jdbcType=BIGINT}, #{competeTimeId,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, + #{siteOrderId,jdbcType=BIGINT}, #{code,jdbcType=VARCHAR}, #{score,jdbcType=INTEGER}, + #{judgmentId,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, + #{recStatus,jdbcType=TINYINT}) + + + insert into t_compete_variety_score + + + id, + + + compete_time_id, + + + project_id, + + + site_order_id, + + + code, + + + score, + + + judgment_id, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{competeTimeId,jdbcType=BIGINT}, + + + #{projectId,jdbcType=BIGINT}, + + + #{siteOrderId,jdbcType=BIGINT}, + + + #{code,jdbcType=VARCHAR}, + + + #{score,jdbcType=INTEGER}, + + + #{judgmentId,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_compete_variety_score + + + id = #{record.id,jdbcType=BIGINT}, + + + compete_time_id = #{record.competeTimeId,jdbcType=BIGINT}, + + + project_id = #{record.projectId,jdbcType=BIGINT}, + + + site_order_id = #{record.siteOrderId,jdbcType=BIGINT}, + + + code = #{record.code,jdbcType=VARCHAR}, + + + score = #{record.score,jdbcType=INTEGER}, + + + judgment_id = #{record.judgmentId,jdbcType=BIGINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_compete_variety_score + set id = #{record.id,jdbcType=BIGINT}, + compete_time_id = #{record.competeTimeId,jdbcType=BIGINT}, + project_id = #{record.projectId,jdbcType=BIGINT}, + site_order_id = #{record.siteOrderId,jdbcType=BIGINT}, + code = #{record.code,jdbcType=VARCHAR}, + score = #{record.score,jdbcType=INTEGER}, + judgment_id = #{record.judgmentId,jdbcType=BIGINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_compete_variety_score + + + compete_time_id = #{competeTimeId,jdbcType=BIGINT}, + + + project_id = #{projectId,jdbcType=BIGINT}, + + + site_order_id = #{siteOrderId,jdbcType=BIGINT}, + + + code = #{code,jdbcType=VARCHAR}, + + + score = #{score,jdbcType=INTEGER}, + + + judgment_id = #{judgmentId,jdbcType=BIGINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_compete_variety_score + set compete_time_id = #{competeTimeId,jdbcType=BIGINT}, + project_id = #{projectId,jdbcType=BIGINT}, + site_order_id = #{siteOrderId,jdbcType=BIGINT}, + code = #{code,jdbcType=VARCHAR}, + score = #{score,jdbcType=INTEGER}, + judgment_id = #{judgmentId,jdbcType=BIGINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file From 5129ee9fac4553e24fe13f315fc57c325c733ddc Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Thu, 12 Nov 2020 19:53:55 +0800 Subject: [PATCH 19/80] =?UTF-8?q?5=E4=B8=AA=E8=A7=86=E9=A2=91=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mt/service/CompeteVedioService.java | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java index 24d218c3..78556327 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java @@ -15,6 +15,7 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; /** @@ -72,15 +73,30 @@ public class CompeteVedioService implements ICompeteVedioService{ @Override public List selectTwoProject(QueryDto params) { CompeteProjectExample competeCompanyExample=new CompeteProjectExample(); - //competeCompanyExample.createCriteria().andCompeteTimeIdEqualTo(params.getParam().getTeamId()).andLevelEqualTo(); - - - return null; + competeCompanyExample.createCriteria().andCompeteTimeIdEqualTo(params.getParam().getTeamId()).andLevelEqualTo((byte) 2); + List list=competeProjectMapper.selectByExample(competeCompanyExample); + List list1=new ArrayList<>(); + list.forEach(mes->{ + VideoProjectVo.GetTwoProject getTwoProject=new VideoProjectVo.GetTwoProject(); + getTwoProject.setProjectId(mes.getId()); + getTwoProject.setProjectName(mes.getName()); + list1.add(getTwoProject); + }); + return list1; } @Override public List selectAllCompany(QueryDto params) { - - return null; + CompeteCompanyExample competeCompanyExample=new CompeteCompanyExample(); + competeCompanyExample.createCriteria().andCompeteTimeIdEqualTo(params.getParam().getTeamId()); + List list= competeCompanyMapper.selectByExample(competeCompanyExample); + List list1=new ArrayList<>(); + list.forEach(mes->{ + VideoProjectVo.GetAllCompany getAllCompany=new VideoProjectVo.GetAllCompany(); + getAllCompany.setCompanyId(mes.getId()); + getAllCompany.setCompanyName(mes.getName()); + list1.add(getAllCompany); + }); + return list1; } } From d5728814aa1b4ea3b53a169daedd0c9d497e7c5d Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Thu, 12 Nov 2020 20:37:14 +0800 Subject: [PATCH 20/80] =?UTF-8?q?20201112=E4=BF=AE=E6=94=B9=E9=80=9F?= =?UTF-8?q?=E5=BA=A6=E9=80=9A=E7=BA=A7=E8=B5=9B=E6=8A=A5=E5=90=8D=E7=9B=B8?= =?UTF-8?q?=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccsens/mt/api/CompeteTaskController.java | 34 +- .../mt/bean/dto/ProvinceCompeteDto.java | 16 + .../ccsens/mt/bean/po/CompeteJudgment.java | 117 +++ .../mt/bean/po/CompeteJudgmentExample.java | 741 ++++++++++++++++ .../ccsens/mt/bean/po/CompeteStartOrder.java | 22 + .../mt/bean/po/CompeteStartOrderExample.java | 120 +++ .../mt/bean/po/CompeteVarietyScore.java | 128 +++ .../bean/po/CompeteVarietyScoreExample.java | 811 ++++++++++++++++++ .../java/com/ccsens/mt/bean/vo/TableVo.java | 24 +- .../mt/persist/dao/CompeteCompanyDao.java | 8 + .../persist/mapper/CompeteJudgmentMapper.java | 30 + .../mapper/CompeteVarietyScoreMapper.java | 30 + .../ccsens/mt/service/CompeteTaskService.java | 68 ++ .../mt/service/ICompeteTaskService.java | 18 + .../ccsens/mt/service/ProvinceService.java | 67 +- .../com/ccsens/mt/service/VideoService.java | 92 +- .../java/com/ccsens/mt/util/Constant.java | 12 + mt/src/main/resources/application.yml | 4 +- .../mapper_dao/CompeteCompanyDao.xml | 12 + .../mapper_raw/CompeteJudgmentMapper.xml | 276 ++++++ .../mapper_raw/CompeteStartOrderMapper.xml | 48 +- .../mapper_raw/CompeteVarietyScoreMapper.xml | 291 +++++++ .../main/java/com/ccsens/util/CodeEnum.java | 8 + 23 files changed, 2881 insertions(+), 96 deletions(-) create mode 100644 mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgment.java create mode 100644 mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgmentExample.java create mode 100644 mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScore.java create mode 100644 mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScoreExample.java create mode 100644 mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteJudgmentMapper.java create mode 100644 mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteVarietyScoreMapper.java create mode 100644 mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java create mode 100644 mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java create mode 100644 mt/src/main/resources/mapper_raw/CompeteJudgmentMapper.xml create mode 100644 mt/src/main/resources/mapper_raw/CompeteVarietyScoreMapper.xml diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java index c89c3775..f784d310 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java @@ -1,13 +1,43 @@ package com.ccsens.mt.api; +import com.ccsens.cloudutil.annotation.MustLogin; +import com.ccsens.mt.bean.dto.ProvinceCompeteDto; +import com.ccsens.mt.bean.vo.TableVo; +import com.ccsens.mt.service.ICompeteTaskService; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.bean.dto.QueryDto; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -@Api(tags = "日程", description = "") +import javax.annotation.Resource; +import java.util.List; + +/** + * @author 逗 + */ +@Api(tags = "比赛日程相关接口", description = "裁判分配日程安排等。。。") @RestController -@RequestMapping("/task") +@RequestMapping("/compete/task") @Slf4j public class CompeteTaskController { + @Resource + private ICompeteTaskService competeTaskService; + + @MustLogin + @ApiOperation(value = "日程安排更新", notes = "") + @RequestMapping(value = "/update", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse updateCompeteConfig(@ApiParam @Validated @RequestBody QueryDto> params) { + log.info("日程安排更新：{}",params); + List dailyScheduleProcessList = competeTaskService.updateCompeteProjectConfig(params.getParam()); + log.info("日程安排更新：{}",dailyScheduleProcessList); + return JsonResponse.newInstance().ok(dailyScheduleProcessList); + } + } 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 b40721cd..3f0d6e54 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 @@ -198,4 +198,20 @@ public class ProvinceCompeteDto { @ApiModelProperty("队伍id") private Long teamId; } + + @Data + @ApiModel("修改日程安排") + public static class UpdateCompeteTask{ + @ApiModelProperty("项目id") + private Long projectId; + @ApiModelProperty("单项时间 单位：秒") + private Long duration; + @ApiModelProperty("场地数量") + private int siteNum; + @ApiModelProperty("项目开始时间") + private Long startTime; + @ApiModelProperty("项目结束时间") + private Long endTime; + } + } diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgment.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgment.java new file mode 100644 index 00000000..c2de5e32 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgment.java @@ -0,0 +1,117 @@ +package com.ccsens.mt.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class CompeteJudgment implements Serializable { + private Long id; + + private Long competeTimeId; + + private Long siteOrderId; + + private Long projectId; + + private Long userId; + + private Byte chiefJudgment; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getCompeteTimeId() { + return competeTimeId; + } + + public void setCompeteTimeId(Long competeTimeId) { + this.competeTimeId = competeTimeId; + } + + public Long getSiteOrderId() { + return siteOrderId; + } + + public void setSiteOrderId(Long siteOrderId) { + this.siteOrderId = siteOrderId; + } + + public Long getProjectId() { + return projectId; + } + + public void setProjectId(Long projectId) { + this.projectId = projectId; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public Byte getChiefJudgment() { + return chiefJudgment; + } + + public void setChiefJudgment(Byte chiefJudgment) { + this.chiefJudgment = chiefJudgment; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", competeTimeId=").append(competeTimeId); + sb.append(", siteOrderId=").append(siteOrderId); + sb.append(", projectId=").append(projectId); + sb.append(", userId=").append(userId); + sb.append(", chiefJudgment=").append(chiefJudgment); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgmentExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgmentExample.java new file mode 100644 index 00000000..4d75f9ed --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgmentExample.java @@ -0,0 +1,741 @@ +package com.ccsens.mt.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class CompeteJudgmentExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public CompeteJudgmentExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdIsNull() { + addCriterion("compete_time_id is null"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdIsNotNull() { + addCriterion("compete_time_id is not null"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdEqualTo(Long value) { + addCriterion("compete_time_id =", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdNotEqualTo(Long value) { + addCriterion("compete_time_id <>", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdGreaterThan(Long value) { + addCriterion("compete_time_id >", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdGreaterThanOrEqualTo(Long value) { + addCriterion("compete_time_id >=", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdLessThan(Long value) { + addCriterion("compete_time_id <", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdLessThanOrEqualTo(Long value) { + addCriterion("compete_time_id <=", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdIn(List values) { + addCriterion("compete_time_id in", values, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdNotIn(List values) { + addCriterion("compete_time_id not in", values, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdBetween(Long value1, Long value2) { + addCriterion("compete_time_id between", value1, value2, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdNotBetween(Long value1, Long value2) { + addCriterion("compete_time_id not between", value1, value2, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdIsNull() { + addCriterion("site_order_id is null"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdIsNotNull() { + addCriterion("site_order_id is not null"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdEqualTo(Long value) { + addCriterion("site_order_id =", value, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdNotEqualTo(Long value) { + addCriterion("site_order_id <>", value, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdGreaterThan(Long value) { + addCriterion("site_order_id >", value, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdGreaterThanOrEqualTo(Long value) { + addCriterion("site_order_id >=", value, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdLessThan(Long value) { + addCriterion("site_order_id <", value, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdLessThanOrEqualTo(Long value) { + addCriterion("site_order_id <=", value, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdIn(List values) { + addCriterion("site_order_id in", values, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdNotIn(List values) { + addCriterion("site_order_id not in", values, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdBetween(Long value1, Long value2) { + addCriterion("site_order_id between", value1, value2, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdNotBetween(Long value1, Long value2) { + addCriterion("site_order_id not between", value1, value2, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andProjectIdIsNull() { + addCriterion("project_id is null"); + return (Criteria) this; + } + + public Criteria andProjectIdIsNotNull() { + addCriterion("project_id is not null"); + return (Criteria) this; + } + + public Criteria andProjectIdEqualTo(Long value) { + addCriterion("project_id =", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotEqualTo(Long value) { + addCriterion("project_id <>", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdGreaterThan(Long value) { + addCriterion("project_id >", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdGreaterThanOrEqualTo(Long value) { + addCriterion("project_id >=", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdLessThan(Long value) { + addCriterion("project_id <", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdLessThanOrEqualTo(Long value) { + addCriterion("project_id <=", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdIn(List values) { + addCriterion("project_id in", values, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotIn(List values) { + addCriterion("project_id not in", values, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdBetween(Long value1, Long value2) { + addCriterion("project_id between", value1, value2, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotBetween(Long value1, Long value2) { + addCriterion("project_id not between", value1, value2, "projectId"); + return (Criteria) this; + } + + public Criteria andUserIdIsNull() { + addCriterion("user_id is null"); + return (Criteria) this; + } + + public Criteria andUserIdIsNotNull() { + addCriterion("user_id is not null"); + return (Criteria) this; + } + + public Criteria andUserIdEqualTo(Long value) { + addCriterion("user_id =", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotEqualTo(Long value) { + addCriterion("user_id <>", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThan(Long value) { + addCriterion("user_id >", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThanOrEqualTo(Long value) { + addCriterion("user_id >=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThan(Long value) { + addCriterion("user_id <", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThanOrEqualTo(Long value) { + addCriterion("user_id <=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdIn(List values) { + addCriterion("user_id in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotIn(List values) { + addCriterion("user_id not in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdBetween(Long value1, Long value2) { + addCriterion("user_id between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotBetween(Long value1, Long value2) { + addCriterion("user_id not between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentIsNull() { + addCriterion("chief_judgment is null"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentIsNotNull() { + addCriterion("chief_judgment is not null"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentEqualTo(Byte value) { + addCriterion("chief_judgment =", value, "chiefJudgment"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentNotEqualTo(Byte value) { + addCriterion("chief_judgment <>", value, "chiefJudgment"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentGreaterThan(Byte value) { + addCriterion("chief_judgment >", value, "chiefJudgment"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentGreaterThanOrEqualTo(Byte value) { + addCriterion("chief_judgment >=", value, "chiefJudgment"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentLessThan(Byte value) { + addCriterion("chief_judgment <", value, "chiefJudgment"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentLessThanOrEqualTo(Byte value) { + addCriterion("chief_judgment <=", value, "chiefJudgment"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentIn(List values) { + addCriterion("chief_judgment in", values, "chiefJudgment"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentNotIn(List values) { + addCriterion("chief_judgment not in", values, "chiefJudgment"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentBetween(Byte value1, Byte value2) { + addCriterion("chief_judgment between", value1, value2, "chiefJudgment"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentNotBetween(Byte value1, Byte value2) { + addCriterion("chief_judgment not between", value1, value2, "chiefJudgment"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrder.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrder.java index 9e552008..eea9504c 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrder.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrder.java @@ -6,8 +6,12 @@ import java.util.Date; public class CompeteStartOrder implements Serializable { private Long id; + private Long projectId; + private Long playerId; + private Byte team; + private Byte competeOrder; private Byte site; @@ -28,6 +32,14 @@ public class CompeteStartOrder implements Serializable { this.id = id; } + public Long getProjectId() { + return projectId; + } + + public void setProjectId(Long projectId) { + this.projectId = projectId; + } + public Long getPlayerId() { return playerId; } @@ -36,6 +48,14 @@ public class CompeteStartOrder implements Serializable { this.playerId = playerId; } + public Byte getTeam() { + return team; + } + + public void setTeam(Byte team) { + this.team = team; + } + public Byte getCompeteOrder() { return competeOrder; } @@ -83,7 +103,9 @@ public class CompeteStartOrder implements Serializable { sb.append(" ["); sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); + sb.append(", projectId=").append(projectId); sb.append(", playerId=").append(playerId); + sb.append(", team=").append(team); sb.append(", competeOrder=").append(competeOrder); sb.append(", site=").append(site); sb.append(", createdAt=").append(createdAt); diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrderExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrderExample.java index 2f59cbc9..efd0d04e 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrderExample.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrderExample.java @@ -165,6 +165,66 @@ public class CompeteStartOrderExample { return (Criteria) this; } + public Criteria andProjectIdIsNull() { + addCriterion("project_id is null"); + return (Criteria) this; + } + + public Criteria andProjectIdIsNotNull() { + addCriterion("project_id is not null"); + return (Criteria) this; + } + + public Criteria andProjectIdEqualTo(Long value) { + addCriterion("project_id =", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotEqualTo(Long value) { + addCriterion("project_id <>", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdGreaterThan(Long value) { + addCriterion("project_id >", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdGreaterThanOrEqualTo(Long value) { + addCriterion("project_id >=", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdLessThan(Long value) { + addCriterion("project_id <", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdLessThanOrEqualTo(Long value) { + addCriterion("project_id <=", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdIn(List values) { + addCriterion("project_id in", values, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotIn(List values) { + addCriterion("project_id not in", values, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdBetween(Long value1, Long value2) { + addCriterion("project_id between", value1, value2, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotBetween(Long value1, Long value2) { + addCriterion("project_id not between", value1, value2, "projectId"); + return (Criteria) this; + } + public Criteria andPlayerIdIsNull() { addCriterion("player_id is null"); return (Criteria) this; @@ -225,6 +285,66 @@ public class CompeteStartOrderExample { return (Criteria) this; } + public Criteria andTeamIsNull() { + addCriterion("team is null"); + return (Criteria) this; + } + + public Criteria andTeamIsNotNull() { + addCriterion("team is not null"); + return (Criteria) this; + } + + public Criteria andTeamEqualTo(Byte value) { + addCriterion("team =", value, "team"); + return (Criteria) this; + } + + public Criteria andTeamNotEqualTo(Byte value) { + addCriterion("team <>", value, "team"); + return (Criteria) this; + } + + public Criteria andTeamGreaterThan(Byte value) { + addCriterion("team >", value, "team"); + return (Criteria) this; + } + + public Criteria andTeamGreaterThanOrEqualTo(Byte value) { + addCriterion("team >=", value, "team"); + return (Criteria) this; + } + + public Criteria andTeamLessThan(Byte value) { + addCriterion("team <", value, "team"); + return (Criteria) this; + } + + public Criteria andTeamLessThanOrEqualTo(Byte value) { + addCriterion("team <=", value, "team"); + return (Criteria) this; + } + + public Criteria andTeamIn(List values) { + addCriterion("team in", values, "team"); + return (Criteria) this; + } + + public Criteria andTeamNotIn(List values) { + addCriterion("team not in", values, "team"); + return (Criteria) this; + } + + public Criteria andTeamBetween(Byte value1, Byte value2) { + addCriterion("team between", value1, value2, "team"); + return (Criteria) this; + } + + public Criteria andTeamNotBetween(Byte value1, Byte value2) { + addCriterion("team not between", value1, value2, "team"); + return (Criteria) this; + } + public Criteria andCompeteOrderIsNull() { addCriterion("compete_order is null"); return (Criteria) this; diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScore.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScore.java new file mode 100644 index 00000000..9fa53c5a --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScore.java @@ -0,0 +1,128 @@ +package com.ccsens.mt.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class CompeteVarietyScore implements Serializable { + private Long id; + + private Long competeTimeId; + + private Long projectId; + + private Long siteOrderId; + + private String code; + + private Integer score; + + private Long judgmentId; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getCompeteTimeId() { + return competeTimeId; + } + + public void setCompeteTimeId(Long competeTimeId) { + this.competeTimeId = competeTimeId; + } + + public Long getProjectId() { + return projectId; + } + + public void setProjectId(Long projectId) { + this.projectId = projectId; + } + + public Long getSiteOrderId() { + return siteOrderId; + } + + public void setSiteOrderId(Long siteOrderId) { + this.siteOrderId = siteOrderId; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code == null ? null : code.trim(); + } + + public Integer getScore() { + return score; + } + + public void setScore(Integer score) { + this.score = score; + } + + public Long getJudgmentId() { + return judgmentId; + } + + public void setJudgmentId(Long judgmentId) { + this.judgmentId = judgmentId; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", competeTimeId=").append(competeTimeId); + sb.append(", projectId=").append(projectId); + sb.append(", siteOrderId=").append(siteOrderId); + sb.append(", code=").append(code); + sb.append(", score=").append(score); + sb.append(", judgmentId=").append(judgmentId); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScoreExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScoreExample.java new file mode 100644 index 00000000..05ddc769 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScoreExample.java @@ -0,0 +1,811 @@ +package com.ccsens.mt.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class CompeteVarietyScoreExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public CompeteVarietyScoreExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdIsNull() { + addCriterion("compete_time_id is null"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdIsNotNull() { + addCriterion("compete_time_id is not null"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdEqualTo(Long value) { + addCriterion("compete_time_id =", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdNotEqualTo(Long value) { + addCriterion("compete_time_id <>", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdGreaterThan(Long value) { + addCriterion("compete_time_id >", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdGreaterThanOrEqualTo(Long value) { + addCriterion("compete_time_id >=", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdLessThan(Long value) { + addCriterion("compete_time_id <", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdLessThanOrEqualTo(Long value) { + addCriterion("compete_time_id <=", value, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdIn(List values) { + addCriterion("compete_time_id in", values, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdNotIn(List values) { + addCriterion("compete_time_id not in", values, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdBetween(Long value1, Long value2) { + addCriterion("compete_time_id between", value1, value2, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andCompeteTimeIdNotBetween(Long value1, Long value2) { + addCriterion("compete_time_id not between", value1, value2, "competeTimeId"); + return (Criteria) this; + } + + public Criteria andProjectIdIsNull() { + addCriterion("project_id is null"); + return (Criteria) this; + } + + public Criteria andProjectIdIsNotNull() { + addCriterion("project_id is not null"); + return (Criteria) this; + } + + public Criteria andProjectIdEqualTo(Long value) { + addCriterion("project_id =", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotEqualTo(Long value) { + addCriterion("project_id <>", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdGreaterThan(Long value) { + addCriterion("project_id >", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdGreaterThanOrEqualTo(Long value) { + addCriterion("project_id >=", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdLessThan(Long value) { + addCriterion("project_id <", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdLessThanOrEqualTo(Long value) { + addCriterion("project_id <=", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdIn(List values) { + addCriterion("project_id in", values, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotIn(List values) { + addCriterion("project_id not in", values, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdBetween(Long value1, Long value2) { + addCriterion("project_id between", value1, value2, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotBetween(Long value1, Long value2) { + addCriterion("project_id not between", value1, value2, "projectId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdIsNull() { + addCriterion("site_order_id is null"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdIsNotNull() { + addCriterion("site_order_id is not null"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdEqualTo(Long value) { + addCriterion("site_order_id =", value, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdNotEqualTo(Long value) { + addCriterion("site_order_id <>", value, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdGreaterThan(Long value) { + addCriterion("site_order_id >", value, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdGreaterThanOrEqualTo(Long value) { + addCriterion("site_order_id >=", value, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdLessThan(Long value) { + addCriterion("site_order_id <", value, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdLessThanOrEqualTo(Long value) { + addCriterion("site_order_id <=", value, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdIn(List values) { + addCriterion("site_order_id in", values, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdNotIn(List values) { + addCriterion("site_order_id not in", values, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdBetween(Long value1, Long value2) { + addCriterion("site_order_id between", value1, value2, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andSiteOrderIdNotBetween(Long value1, Long value2) { + addCriterion("site_order_id not between", value1, value2, "siteOrderId"); + return (Criteria) this; + } + + public Criteria andCodeIsNull() { + addCriterion("code is null"); + return (Criteria) this; + } + + public Criteria andCodeIsNotNull() { + addCriterion("code is not null"); + return (Criteria) this; + } + + public Criteria andCodeEqualTo(String value) { + addCriterion("code =", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotEqualTo(String value) { + addCriterion("code <>", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeGreaterThan(String value) { + addCriterion("code >", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeGreaterThanOrEqualTo(String value) { + addCriterion("code >=", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLessThan(String value) { + addCriterion("code <", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLessThanOrEqualTo(String value) { + addCriterion("code <=", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLike(String value) { + addCriterion("code like", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotLike(String value) { + addCriterion("code not like", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeIn(List values) { + addCriterion("code in", values, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotIn(List values) { + addCriterion("code not in", values, "code"); + return (Criteria) this; + } + + public Criteria andCodeBetween(String value1, String value2) { + addCriterion("code between", value1, value2, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotBetween(String value1, String value2) { + addCriterion("code not between", value1, value2, "code"); + return (Criteria) this; + } + + public Criteria andScoreIsNull() { + addCriterion("score is null"); + return (Criteria) this; + } + + public Criteria andScoreIsNotNull() { + addCriterion("score is not null"); + return (Criteria) this; + } + + public Criteria andScoreEqualTo(Integer value) { + addCriterion("score =", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreNotEqualTo(Integer value) { + addCriterion("score <>", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreGreaterThan(Integer value) { + addCriterion("score >", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreGreaterThanOrEqualTo(Integer value) { + addCriterion("score >=", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreLessThan(Integer value) { + addCriterion("score <", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreLessThanOrEqualTo(Integer value) { + addCriterion("score <=", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreIn(List values) { + addCriterion("score in", values, "score"); + return (Criteria) this; + } + + public Criteria andScoreNotIn(List values) { + addCriterion("score not in", values, "score"); + return (Criteria) this; + } + + public Criteria andScoreBetween(Integer value1, Integer value2) { + addCriterion("score between", value1, value2, "score"); + return (Criteria) this; + } + + public Criteria andScoreNotBetween(Integer value1, Integer value2) { + addCriterion("score not between", value1, value2, "score"); + return (Criteria) this; + } + + public Criteria andJudgmentIdIsNull() { + addCriterion("judgment_id is null"); + return (Criteria) this; + } + + public Criteria andJudgmentIdIsNotNull() { + addCriterion("judgment_id is not null"); + return (Criteria) this; + } + + public Criteria andJudgmentIdEqualTo(Long value) { + addCriterion("judgment_id =", value, "judgmentId"); + return (Criteria) this; + } + + public Criteria andJudgmentIdNotEqualTo(Long value) { + addCriterion("judgment_id <>", value, "judgmentId"); + return (Criteria) this; + } + + public Criteria andJudgmentIdGreaterThan(Long value) { + addCriterion("judgment_id >", value, "judgmentId"); + return (Criteria) this; + } + + public Criteria andJudgmentIdGreaterThanOrEqualTo(Long value) { + addCriterion("judgment_id >=", value, "judgmentId"); + return (Criteria) this; + } + + public Criteria andJudgmentIdLessThan(Long value) { + addCriterion("judgment_id <", value, "judgmentId"); + return (Criteria) this; + } + + public Criteria andJudgmentIdLessThanOrEqualTo(Long value) { + addCriterion("judgment_id <=", value, "judgmentId"); + return (Criteria) this; + } + + public Criteria andJudgmentIdIn(List values) { + addCriterion("judgment_id in", values, "judgmentId"); + return (Criteria) this; + } + + public Criteria andJudgmentIdNotIn(List values) { + addCriterion("judgment_id not in", values, "judgmentId"); + return (Criteria) this; + } + + public Criteria andJudgmentIdBetween(Long value1, Long value2) { + addCriterion("judgment_id between", value1, value2, "judgmentId"); + return (Criteria) this; + } + + public Criteria andJudgmentIdNotBetween(Long value1, Long value2) { + addCriterion("judgment_id not between", value1, value2, "judgmentId"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file 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 6e26d9fc..6892086a 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 @@ -122,7 +122,7 @@ public class TableVo { private String projectName; @ApiModelProperty("参赛人/队伍") private int joinNum; - @ApiModelProperty("单项时间") + @ApiModelProperty("单项时间 单位秒") private long singleTime; @ApiModelProperty("场地") private int siteNum; @@ -135,6 +135,28 @@ public class TableVo { @ApiModelProperty("项目结束时间") private Long endTime; } + @Data + @ApiModel("返回项目配置信息") + public static class CompeteProjectConfig{ + @ApiModelProperty("参赛id") + private Long projectId; + @ApiModelProperty("参赛项目") + private String projectName; + @ApiModelProperty("参赛人/队伍") + private int joinNum; + @ApiModelProperty("单项时间 单位秒") + private int duration; + @ApiModelProperty("场地") + private int siteNum; + @ApiModelProperty("场次") + private double games; + @ApiModelProperty("总时间") + private double timeSum; + @ApiModelProperty("项目开始时间") + private Long startTime; + @ApiModelProperty("项目结束时间") + private Long endTime; + } @Data diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java index edd60d82..9c27abdd 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java @@ -144,4 +144,12 @@ public interface CompeteCompanyDao extends CompeteCompanyMapper { List selectProjectByType(Long id); List queryPlayersByTeamProject(@Param("companyId")Long companyId, @Param("projectId")Long projectId); + + /** + * 查找选手参加的比赛id（不包含通级赛） + * @param playerId + * @param competeTimeId + * @return + */ + int selectJoinNumByPlayer(@Param("playerId")Long playerId, @Param("competeTimeId")Long competeTimeId); } diff --git a/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteJudgmentMapper.java b/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteJudgmentMapper.java new file mode 100644 index 00000000..303883e8 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteJudgmentMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.mt.persist.mapper; + +import com.ccsens.mt.bean.po.CompeteJudgment; +import com.ccsens.mt.bean.po.CompeteJudgmentExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface CompeteJudgmentMapper { + long countByExample(CompeteJudgmentExample example); + + int deleteByExample(CompeteJudgmentExample example); + + int deleteByPrimaryKey(Long id); + + int insert(CompeteJudgment record); + + int insertSelective(CompeteJudgment record); + + List selectByExample(CompeteJudgmentExample example); + + CompeteJudgment selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") CompeteJudgment record, @Param("example") CompeteJudgmentExample example); + + int updateByExample(@Param("record") CompeteJudgment record, @Param("example") CompeteJudgmentExample example); + + int updateByPrimaryKeySelective(CompeteJudgment record); + + int updateByPrimaryKey(CompeteJudgment record); +} \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteVarietyScoreMapper.java b/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteVarietyScoreMapper.java new file mode 100644 index 00000000..14036ed9 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteVarietyScoreMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.mt.persist.mapper; + +import com.ccsens.mt.bean.po.CompeteVarietyScore; +import com.ccsens.mt.bean.po.CompeteVarietyScoreExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface CompeteVarietyScoreMapper { + long countByExample(CompeteVarietyScoreExample example); + + int deleteByExample(CompeteVarietyScoreExample example); + + int deleteByPrimaryKey(Long id); + + int insert(CompeteVarietyScore record); + + int insertSelective(CompeteVarietyScore record); + + List selectByExample(CompeteVarietyScoreExample example); + + CompeteVarietyScore selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") CompeteVarietyScore record, @Param("example") CompeteVarietyScoreExample example); + + int updateByExample(@Param("record") CompeteVarietyScore record, @Param("example") CompeteVarietyScoreExample example); + + int updateByPrimaryKeySelective(CompeteVarietyScore record); + + int updateByPrimaryKey(CompeteVarietyScore record); +} \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java new file mode 100644 index 00000000..972b3957 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -0,0 +1,68 @@ +package com.ccsens.mt.service; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.lang.Snowflake; +import com.ccsens.mt.bean.dto.ProvinceCompeteDto; +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.dao.CompeteProjectConfigDao; +import com.ccsens.mt.persist.mapper.CompeteProjectConfigMapper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * @author 逗 + */ +@Slf4j +@Service +@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) +public class CompeteTaskService implements ICompeteTaskService{ + @Resource + private CompeteProjectConfigDao projectConfigDao; + @Resource + private Snowflake snowflake; + + @Override + public List updateCompeteProjectConfig(List param) { + List competeProjectConfigs = new ArrayList<>(); + if(CollectionUtil.isNotEmpty(param)){ + param.forEach(projectConfig -> { + CompeteProjectConfig competeProjectConfig; + CompeteProjectConfigExample projectConfigExample = new CompeteProjectConfigExample(); + projectConfigExample.createCriteria().andProjectIdEqualTo(projectConfig.getProjectId()); + List projectConfigList = projectConfigDao.selectByExample(projectConfigExample); + log.info("查找项目配置信息：{}",projectConfigList); + if(CollectionUtil.isNotEmpty(projectConfigList)){ + //有则修改 + competeProjectConfig = projectConfigList.get(0); + competeProjectConfig.setProjectDuration(projectConfig.getDuration()); + competeProjectConfig.setSiteNum(projectConfig.getSiteNum()); + competeProjectConfig.setStartTime(projectConfig.getStartTime()); + competeProjectConfig.setEndTime(projectConfig.getEndTime()); + projectConfigDao.insertSelective(competeProjectConfig); + }else { + //没有则添加 + competeProjectConfig = new CompeteProjectConfig(); + competeProjectConfig.setId(snowflake.nextId()); + competeProjectConfig.setProjectId(projectConfig.getProjectId()); + competeProjectConfig.setProjectDuration(projectConfig.getDuration()); + competeProjectConfig.setSiteNum(projectConfig.getSiteNum()); + competeProjectConfig.setStartTime(projectConfig.getStartTime()); + competeProjectConfig.setEndTime(projectConfig.getEndTime()); + projectConfigDao.insertSelective(competeProjectConfig); + } + //返回 + TableVo.CompeteProjectConfig config = new TableVo.CompeteProjectConfig(); + }); + } + + return competeProjectConfigs; + } +} diff --git a/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java new file mode 100644 index 00000000..1ba25d4d --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java @@ -0,0 +1,18 @@ +package com.ccsens.mt.service; + +import com.ccsens.mt.bean.dto.ProvinceCompeteDto; +import com.ccsens.mt.bean.vo.TableVo; + +import java.util.List; + +/** + * @author 逗 + */ +public interface ICompeteTaskService { + /** + * 修改日程安排 + * @param param + * @return + */ + List updateCompeteProjectConfig(List param); +} diff --git a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java index eeaeb964..bba62048 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -21,6 +21,7 @@ import com.ccsens.mt.util.Constant; import com.ccsens.util.CodeEnum; import com.ccsens.util.WebConstant; import com.ccsens.util.exception.BaseException; +import jdk.nashorn.internal.runtime.regexp.joni.CodeRangeBuffer; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -498,9 +499,10 @@ public class ProvinceService implements IProvinceService { CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId()); if(ObjectUtil.isNull(competeProject)){ throw new BaseException(CodeEnum.PARAM_ERROR); } - //判断项目是个人还是团队，参加 + //判断项目是个人还是团队 if(competeProject.getTeam() == 0){ for(ProvinceCompeteDto.JoinProjectPlayer joinPlayer : param.getPlayers()){ + //检查此用户之前是否参加此项目 CompeteProjectPlayerExample example = new CompeteProjectPlayerExample(); example.createCriteria().andProjectIdEqualTo(competeProject.getId()).andPlayerIdEqualTo(joinPlayer.getPlayerId()) @@ -509,6 +511,12 @@ public class ProvinceService implements IProvinceService { //用户现在不参加且之前已经参加本项目，退出 if(joinPlayer.getJoinProject() == 0 && CollectionUtil.isNotEmpty(competeProjectPlayerList)) { competeProjectPlayerList.forEach(projectPlayer -> { + if(competeProject.getId() == Constant.SINGLE_ROLL_3_M || competeProject.getId() == Constant.SINGLE_ROLL_30_S){ + CompeteProjectPlayerExample projectPlayerExample1 = new CompeteProjectPlayerExample(); + projectPlayerExample1.createCriteria().andPlayerIdEqualTo(joinPlayer.getPlayerId()) + .andProjectIdEqualTo(Constant.CERTIFICATE); + throw new BaseException(CodeEnum.mtCertificateJoin("")); + } projectPlayer.setRecStatus((byte) 2); projectPlayerMapper.updateByPrimaryKeySelective(projectPlayer); }); @@ -519,15 +527,32 @@ public class ProvinceService implements IProvinceService { if (ObjectUtil.isNull(player)) { throw new BaseException(CodeEnum.PARAM_ERROR); } + //通级赛查找用户是否参加“30秒单摇”和“3分钟单摇” + if(competeProject.getCertificate() == 1){ + CompeteProjectPlayerExample projectPlayerExample1 = new CompeteProjectPlayerExample(); + projectPlayerExample1.createCriteria().andPlayerIdEqualTo(joinPlayer.getPlayerId()) + .andProjectIdEqualTo(Constant.SINGLE_ROLL_30_S); + CompeteProjectPlayerExample projectPlayerExample2 = new CompeteProjectPlayerExample(); + projectPlayerExample2.createCriteria().andPlayerIdEqualTo(joinPlayer.getPlayerId()) + .andProjectIdEqualTo(Constant.SINGLE_ROLL_3_M); + if(projectPlayerMapper.countByExample(projectPlayerExample1) == 0 || projectPlayerMapper.countByExample(projectPlayerExample2) == 0){ + throw new BaseException(CodeEnum.mtCertificate(player.getName())); + } + } //查找此公司此组别是否参加过这个项目 int num = competeCompanyDao.getNumByCompanyAndGroup(competeProject.getId(), player.getCompanyId(), player.getCompeteGroupId(), param.getCompeteTimeId()); if (num > 0) { throw new BaseException(CodeEnum.JOIN_PROJECT_NUM_FULL.mtProjectMsg1("该项目该组别")); } //查找个人参赛数量是否符合（个人比赛3个） - CompeteProjectPlayerExample projectPlayerExample = new CompeteProjectPlayerExample(); - projectPlayerExample.createCriteria().andPlayerIdEqualTo(joinPlayer.getPlayerId()).andCompeteTimeIdEqualTo(param.getCompeteTimeId()); - if (projectPlayerMapper.countByExample(projectPlayerExample) >= 3) { + int joinNum = competeCompanyDao.selectJoinNumByPlayer(joinPlayer.getPlayerId(),param.getCompeteTimeId()); +// CompeteProjectPlayerExample projectPlayerExample = new CompeteProjectPlayerExample(); +// projectPlayerExample.createCriteria().andPlayerIdEqualTo(joinPlayer.getPlayerId()) +// .andCompeteTimeIdEqualTo(param.getCompeteTimeId()); +// if (projectPlayerMapper.countByExample(projectPlayerExample) >= 3 && competeProject.getCertificate() == 0) { +// throw new BaseException(CodeEnum.JOIN_PROJECT_NUM_FULL.mtProjectMsg(player.getName()+"个人")); +// } + if (joinNum >= 3 && competeProject.getCertificate() == 0) { throw new BaseException(CodeEnum.JOIN_PROJECT_NUM_FULL.mtProjectMsg(player.getName()+"个人")); } //参加比赛记录 @@ -560,23 +585,6 @@ public class ProvinceService implements IProvinceService { competeTeamDao.insertSelective(competeTeam); } -// //检查参赛人数是否符合 -// int joinCount = 0; -// for(ProvinceCompeteDto.JoinProjectPlayer joinProject : param.getPlayers()){ -// if(joinProject.getJoinProject() == 1){ -// joinCount++; -// }else { -// joinCount--; -// } -// } -// CompeteTeamMemberExample example = new CompeteTeamMemberExample(); -// example.createCriteria().andCompeteTeamIdEqualTo(competeTeam.getId()); -// long memberNum = teamMemberMapper.countByExample(example); -// if(joinCount + memberNum > 0) { -// if (joinCount + memberNum > competeProject.getMemberMax() || joinCount + memberNum < competeProject.getMemberMin()) { -// throw new BaseException(CodeEnum.MEMBER_NUM_ERROR); -// } -// } for (int i = 0; i < param.getPlayers().size(); i++) { ProvinceCompeteDto.JoinProjectPlayer joinProjectPlayer = param.getPlayers().get(i); CompetePlayer player = competePlayerDao.selectByPrimaryKey(joinProjectPlayer.getPlayerId()); @@ -659,23 +667,6 @@ public class ProvinceService implements IProvinceService { competeTeamDao.insertSelective(competeTeam); } -// //检查参赛人数是否符合 -// int joinCount = 0; -// for(ProvinceCompeteDto.JoinProjectPlayer joinProject : param.getPlayers()){ -// if(joinProject.getJoinProject() == 1){ -// joinCount++; -// }else { -// joinCount--; -// } -// } -// CompeteTeamMemberExample example = new CompeteTeamMemberExample(); -// example.createCriteria().andCompeteTeamIdEqualTo(competeTeam.getId()); -// long memberNum = teamMemberMapper.countByExample(example); -// if(joinCount + memberNum > 0) { -// if (joinCount + memberNum > competeProject.getMemberMax() || joinCount + memberNum < competeProject.getMemberMin()) { -// throw new BaseException(CodeEnum.MEMBER_NUM_ERROR); -// } -// } for (int i = 0; i < param.getPlayers().size(); i++) { ProvinceCompeteDto.JoinProjectPlayer joinProjectPlayer = param.getPlayers().get(i); CompetePlayer player = competePlayerDao.selectByPrimaryKey(joinProjectPlayer.getPlayerId()); diff --git a/mt/src/main/java/com/ccsens/mt/service/VideoService.java b/mt/src/main/java/com/ccsens/mt/service/VideoService.java index a7629550..c732fe98 100644 --- a/mt/src/main/java/com/ccsens/mt/service/VideoService.java +++ b/mt/src/main/java/com/ccsens/mt/service/VideoService.java @@ -37,22 +37,23 @@ public class VideoService implements IVideoService{ */ @Override public List getVideoByPlayerId(QueryDto params) { - VideoDto.GetVideo getVideo = params.getParam(); - List getVideoInfoList = new ArrayList<>(); - CompeteVideoExample videoExample = new CompeteVideoExample(); - videoExample.createCriteria().andCompeteCodeEqualTo(getVideo.getCompeteCode()).andCompeteTimeIdEqualTo(getVideo.getCompeteTimeId()) - .andPlayerIdEqualTo(getVideo.getPlayerId()); - List competeVideoList = competeVideoMapper.selectByExample(videoExample); - if(CollectionUtil.isNotEmpty(competeVideoList)){ - competeVideoList.forEach(competeVideo -> { - VideoVo.GetVideoInfo getVideoInfo = new VideoVo.GetVideoInfo(); - getVideoInfo.setFileId(competeVideo.getFileId()); - getVideoInfo.setVideoId(competeVideo.getId()); - getVideoInfo.setUploadTime(competeVideo.getTime()); - getVideoInfoList.add(getVideoInfo); - }); - } - return getVideoInfoList; +// VideoDto.GetVideo getVideo = params.getParam(); +// List getVideoInfoList = new ArrayList<>(); +// CompeteVideoExample videoExample = new CompeteVideoExample(); +// videoExample.createCriteria().andCompeteCodeEqualTo(getVideo.getCompeteCode()).andCompeteTimeIdEqualTo(getVideo.getCompeteTimeId()) +// .andPlayerIdEqualTo(getVideo.getPlayerId()); +// List competeVideoList = competeVideoMapper.selectByExample(videoExample); +// if(CollectionUtil.isNotEmpty(competeVideoList)){ +// competeVideoList.forEach(competeVideo -> { +// VideoVo.GetVideoInfo getVideoInfo = new VideoVo.GetVideoInfo(); +// getVideoInfo.setFileId(competeVideo.getFileId()); +// getVideoInfo.setVideoId(competeVideo.getId()); +// getVideoInfo.setUploadTime(competeVideo.getTime()); +// getVideoInfoList.add(getVideoInfo); +// }); +// } +// return getVideoInfoList; + return null; } /** @@ -62,34 +63,35 @@ public class VideoService implements IVideoService{ */ @Override public List uploadVideo(QueryDto params) { - VideoDto.UploadVideo uploadVideo = params.getParam(); - //将视频信息储存数据库 - CompeteVideo competeVideo = new CompeteVideo(); - competeVideo.setId(snowflake.nextId()); - competeVideo.setCompeteCode(uploadVideo.getCompeteCode()); - competeVideo.setCompeteTimeId(uploadVideo.getCompeteTimeId()); - competeVideo.setTeam(uploadVideo.getTeam()); - competeVideo.setPlayerId(uploadVideo.getPlayerId()); - competeVideo.setFileId(uploadVideo.getVideoFileId()); - competeVideo.setVideoUrl(uploadVideo.getVideoFileUrl()); - competeVideo.setUploadUserId(params.getUserId()); - competeVideo.setTime(System.currentTimeMillis()); - competeVideoMapper.insertSelective(competeVideo); - //返回 - List getVideoInfoList = new ArrayList<>(); - CompeteVideoExample videoExample = new CompeteVideoExample(); - videoExample.createCriteria().andCompeteCodeEqualTo(uploadVideo.getCompeteCode()).andCompeteTimeIdEqualTo(uploadVideo.getCompeteTimeId()) - .andPlayerIdEqualTo(uploadVideo.getPlayerId()); - List competeVideoList = competeVideoMapper.selectByExample(videoExample); - if(CollectionUtil.isNotEmpty(competeVideoList)){ - competeVideoList.forEach(video -> { - VideoVo.GetVideoInfo getVideoInfo = new VideoVo.GetVideoInfo(); - getVideoInfo.setFileId(video.getFileId()); - getVideoInfo.setVideoId(video.getId()); - getVideoInfo.setUploadTime(video.getTime()); - getVideoInfoList.add(getVideoInfo); - }); - } - return getVideoInfoList; +// VideoDto.UploadVideo uploadVideo = params.getParam(); +// //将视频信息储存数据库 +// CompeteVideo competeVideo = new CompeteVideo(); +// competeVideo.setId(snowflake.nextId()); +// competeVideo.setCompeteCode(uploadVideo.getCompeteCode()); +// competeVideo.setCompeteTimeId(uploadVideo.getCompeteTimeId()); +// competeVideo.setTeam(uploadVideo.getTeam()); +// competeVideo.setPlayerId(uploadVideo.getPlayerId()); +// competeVideo.setFileId(uploadVideo.getVideoFileId()); +// competeVideo.setVideoUrl(uploadVideo.getVideoFileUrl()); +// competeVideo.setUploadUserId(params.getUserId()); +// competeVideo.setTime(System.currentTimeMillis()); +// competeVideoMapper.insertSelective(competeVideo); +// //返回 +// List getVideoInfoList = new ArrayList<>(); +// CompeteVideoExample videoExample = new CompeteVideoExample(); +// videoExample.createCriteria().andCompeteCodeEqualTo(uploadVideo.getCompeteCode()).andCompeteTimeIdEqualTo(uploadVideo.getCompeteTimeId()) +// .andPlayerIdEqualTo(uploadVideo.getPlayerId()); +// List competeVideoList = competeVideoMapper.selectByExample(videoExample); +// if(CollectionUtil.isNotEmpty(competeVideoList)){ +// competeVideoList.forEach(video -> { +// VideoVo.GetVideoInfo getVideoInfo = new VideoVo.GetVideoInfo(); +// getVideoInfo.setFileId(video.getFileId()); +// getVideoInfo.setVideoId(video.getId()); +// getVideoInfo.setUploadTime(video.getTime()); +// getVideoInfoList.add(getVideoInfo); +// }); +// } +// return getVideoInfoList; + return null; } } diff --git a/mt/src/main/java/com/ccsens/mt/util/Constant.java b/mt/src/main/java/com/ccsens/mt/util/Constant.java index 5f3052c7..a855322f 100644 --- a/mt/src/main/java/com/ccsens/mt/util/Constant.java +++ b/mt/src/main/java/com/ccsens/mt/util/Constant.java @@ -34,6 +34,18 @@ public class Constant { } public static final int VOTE_TOTAL = 2; + /** + * 三十秒单摇跳项目id + */ + public static final long SINGLE_ROLL_30_S = 2011; + /** + * 三分钟单摇跳项目id + */ + public static final long SINGLE_ROLL_3_M = 2013; + /** + * 速度通级赛id + */ + public static final long CERTIFICATE = 2018; public final static class Compete{ public final static byte PROJECT_JOIN_RULE_GROUP_LIMIT = 0; diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index d082c0ea..5889ff7f 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: prod - include: common, util-prod \ No newline at end of file + active: test + include: common, util-test \ No newline at end of file diff --git a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml index c48a4f4c..91ab5fab 100644 --- a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml @@ -386,4 +386,16 @@ and m.rec_status = 0 and p.rec_status = 0 + \ No newline at end of file diff --git a/mt/src/main/resources/mapper_raw/CompeteJudgmentMapper.xml b/mt/src/main/resources/mapper_raw/CompeteJudgmentMapper.xml new file mode 100644 index 00000000..13d3e48c --- /dev/null +++ b/mt/src/main/resources/mapper_raw/CompeteJudgmentMapper.xml @@ -0,0 +1,276 @@ + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, compete_time_id, site_order_id, project_id, user_id, chief_judgment, created_at, + updated_at, rec_status + + + + + delete from t_compete_judgment + where id = #{id,jdbcType=BIGINT} + + + delete from t_compete_judgment + + + + + + insert into t_compete_judgment (id, compete_time_id, site_order_id, + project_id, user_id, chief_judgment, + created_at, updated_at, rec_status + ) + values (#{id,jdbcType=BIGINT}, #{competeTimeId,jdbcType=BIGINT}, #{siteOrderId,jdbcType=BIGINT}, + #{projectId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{chiefJudgment,jdbcType=TINYINT}, + #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} + ) + + + insert into t_compete_judgment + + + id, + + + compete_time_id, + + + site_order_id, + + + project_id, + + + user_id, + + + chief_judgment, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{competeTimeId,jdbcType=BIGINT}, + + + #{siteOrderId,jdbcType=BIGINT}, + + + #{projectId,jdbcType=BIGINT}, + + + #{userId,jdbcType=BIGINT}, + + + #{chiefJudgment,jdbcType=TINYINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_compete_judgment + + + id = #{record.id,jdbcType=BIGINT}, + + + compete_time_id = #{record.competeTimeId,jdbcType=BIGINT}, + + + site_order_id = #{record.siteOrderId,jdbcType=BIGINT}, + + + project_id = #{record.projectId,jdbcType=BIGINT}, + + + user_id = #{record.userId,jdbcType=BIGINT}, + + + chief_judgment = #{record.chiefJudgment,jdbcType=TINYINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_compete_judgment + set id = #{record.id,jdbcType=BIGINT}, + compete_time_id = #{record.competeTimeId,jdbcType=BIGINT}, + site_order_id = #{record.siteOrderId,jdbcType=BIGINT}, + project_id = #{record.projectId,jdbcType=BIGINT}, + user_id = #{record.userId,jdbcType=BIGINT}, + chief_judgment = #{record.chiefJudgment,jdbcType=TINYINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_compete_judgment + + + compete_time_id = #{competeTimeId,jdbcType=BIGINT}, + + + site_order_id = #{siteOrderId,jdbcType=BIGINT}, + + + project_id = #{projectId,jdbcType=BIGINT}, + + + user_id = #{userId,jdbcType=BIGINT}, + + + chief_judgment = #{chiefJudgment,jdbcType=TINYINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_compete_judgment + set compete_time_id = #{competeTimeId,jdbcType=BIGINT}, + site_order_id = #{siteOrderId,jdbcType=BIGINT}, + project_id = #{projectId,jdbcType=BIGINT}, + user_id = #{userId,jdbcType=BIGINT}, + chief_judgment = #{chiefJudgment,jdbcType=TINYINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/mt/src/main/resources/mapper_raw/CompeteStartOrderMapper.xml b/mt/src/main/resources/mapper_raw/CompeteStartOrderMapper.xml index 4e5cd89c..8e150359 100644 --- a/mt/src/main/resources/mapper_raw/CompeteStartOrderMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompeteStartOrderMapper.xml @@ -3,7 +3,9 @@ + + @@ -69,7 +71,7 @@ - id, player_id, compete_order, site, created_at, updated_at, rec_status + id, project_id, player_id, team, compete_order, site, created_at, updated_at, rec_status + select + + distinct + + + from t_compete_variety_score + + + + + order by ${orderByClause} + + + + + delete from t_compete_variety_score + where id = #{id,jdbcType=BIGINT} + + + delete from t_compete_variety_score + + + + + + insert into t_compete_variety_score (id, compete_time_id, project_id, + site_order_id, code, score, + judgment_id, created_at, updated_at, + rec_status) + values (#{id,jdbcType=BIGINT}, #{competeTimeId,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, + #{siteOrderId,jdbcType=BIGINT}, #{code,jdbcType=VARCHAR}, #{score,jdbcType=INTEGER}, + #{judgmentId,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, + #{recStatus,jdbcType=TINYINT}) + + + insert into t_compete_variety_score + + + id, + + + compete_time_id, + + + project_id, + + + site_order_id, + + + code, + + + score, + + + judgment_id, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{competeTimeId,jdbcType=BIGINT}, + + + #{projectId,jdbcType=BIGINT}, + + + #{siteOrderId,jdbcType=BIGINT}, + + + #{code,jdbcType=VARCHAR}, + + + #{score,jdbcType=INTEGER}, + + + #{judgmentId,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_compete_variety_score + + + id = #{record.id,jdbcType=BIGINT}, + + + compete_time_id = #{record.competeTimeId,jdbcType=BIGINT}, + + + project_id = #{record.projectId,jdbcType=BIGINT}, + + + site_order_id = #{record.siteOrderId,jdbcType=BIGINT}, + + + code = #{record.code,jdbcType=VARCHAR}, + + + score = #{record.score,jdbcType=INTEGER}, + + + judgment_id = #{record.judgmentId,jdbcType=BIGINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_compete_variety_score + set id = #{record.id,jdbcType=BIGINT}, + compete_time_id = #{record.competeTimeId,jdbcType=BIGINT}, + project_id = #{record.projectId,jdbcType=BIGINT}, + site_order_id = #{record.siteOrderId,jdbcType=BIGINT}, + code = #{record.code,jdbcType=VARCHAR}, + score = #{record.score,jdbcType=INTEGER}, + judgment_id = #{record.judgmentId,jdbcType=BIGINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_compete_variety_score + + + compete_time_id = #{competeTimeId,jdbcType=BIGINT}, + + + project_id = #{projectId,jdbcType=BIGINT}, + + + site_order_id = #{siteOrderId,jdbcType=BIGINT}, + + + code = #{code,jdbcType=VARCHAR}, + + + score = #{score,jdbcType=INTEGER}, + + + judgment_id = #{judgmentId,jdbcType=BIGINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_compete_variety_score + set compete_time_id = #{competeTimeId,jdbcType=BIGINT}, + project_id = #{projectId,jdbcType=BIGINT}, + site_order_id = #{siteOrderId,jdbcType=BIGINT}, + code = #{code,jdbcType=VARCHAR}, + score = #{score,jdbcType=INTEGER}, + judgment_id = #{judgmentId,jdbcType=BIGINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/util/src/main/java/com/ccsens/util/CodeEnum.java b/util/src/main/java/com/ccsens/util/CodeEnum.java index 6fcb0eb5..2921824a 100644 --- a/util/src/main/java/com/ccsens/util/CodeEnum.java +++ b/util/src/main/java/com/ccsens/util/CodeEnum.java @@ -190,6 +190,14 @@ public enum CodeEnum { msg = msg+"已参加了其他组别，无法再次报名"; return msg; } + public static String mtCertificate(String msg){ + msg = msg+"未同时报名“30秒单摇跳”和“3分钟单摇跳”"; + return msg; + } + public static String mtCertificateJoin(String msg){ + msg = msg+"已报名“速度通级赛”无法取消当前项目"; + return msg; + } public CodeEnum mtProjectMsg(String msg){ this.msg = msg+"项目参赛次数已满"; return this; From 48c32bad8590e58014d9bd97327057b16ce50c0c Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Fri, 13 Nov 2020 09:39:41 +0800 Subject: [PATCH 21/80] 20201113v1.0 --- .../main/java/com/ccsens/mt/service/ProvinceService.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java index bba62048..ea326fc3 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -143,8 +143,7 @@ public class ProvinceService implements IProvinceService { if(CollectionUtil.isNotEmpty(groupList)){ competeGroup = groupList.get(0); } -// if(ObjectUtil.isNull(param.getGroupId())){ throw new BaseException(CodeEnum.MT_NOT_GROUP); } - +// if(ObjectUtil.isNull(param.getGroupId())){ throw new BaseException(CodeEnum.MT_NOT_GROUP); // //检查性别与组别是否匹配 // CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(param.getGroupId()); // if(ObjectUtil.isNull(competeGroup) || param.getGender() != competeGroup.getSex()){ @@ -515,7 +514,9 @@ public class ProvinceService implements IProvinceService { CompeteProjectPlayerExample projectPlayerExample1 = new CompeteProjectPlayerExample(); projectPlayerExample1.createCriteria().andPlayerIdEqualTo(joinPlayer.getPlayerId()) .andProjectIdEqualTo(Constant.CERTIFICATE); - throw new BaseException(CodeEnum.mtCertificateJoin("")); + if(projectPlayerMapper.countByExample(projectPlayerExample1) != 0) { + throw new BaseException(CodeEnum.mtCertificateJoin("")); + } } projectPlayer.setRecStatus((byte) 2); projectPlayerMapper.updateByPrimaryKeySelective(projectPlayer); From dff9745f345dbb449fe81026b8ea62e0330993c2 Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Fri, 13 Nov 2020 15:29:06 +0800 Subject: [PATCH 22/80] 1 --- .../ccsens/mt/api/CompeteScoreController.java | 17 +++++ .../com/ccsens/mt/bean/dto/CompeteDto.java | 9 +++ .../java/com/ccsens/mt/bean/vo/CompeteVo.java | 26 +++++++ .../persist/dao/CompeteProjectConfigDao.java | 1 + .../com/ccsens/mt/service/CompeteService.java | 73 +++++++++++++++++-- .../ccsens/mt/service/ICompeteService.java | 16 ++++ mt/src/main/resources/application.yml | 4 +- .../mapper_dao/CompeteProjectConfigDao.xml | 6 ++ 8 files changed, 145 insertions(+), 7 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java index a1262f24..22580346 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.List; /** * @author 逗 @@ -38,7 +39,23 @@ public class CompeteScoreController { return JsonResponse.newInstance().ok(playerList); } + @MustLogin + @ApiOperation(value = "计数赛查看当前场次的分数信息（轮询）", notes = "") + @RequestMapping(value = "countScore", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse countScore(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("查询比赛项目上的参赛选手列表：{}",params); + List countScoreList = competeService.countScore(params.getParam()); + return JsonResponse.newInstance().ok(countScoreList); + } + @MustLogin + @ApiOperation(value = "计数赛查看当前场次的分数信息（轮询）", notes = "") + @RequestMapping(value = "countScoreDetail", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse countScoreDetail(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("查询比赛项目上的参赛选手列表：{}",params); + competeService.countScoreDetail(params.getParam()); + return JsonResponse.newInstance().ok(); + } } diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java index af6d9117..2127cac3 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java @@ -325,5 +325,14 @@ public class CompeteDto { private String idCard; } + @Data + @ApiModel("项目id和组别id") + public static class ProjectIdAndGroupId{ + @ApiModelProperty("项目id") + private Long projectId; + @ApiModelProperty("组别id") + private Long groupId; + } + } diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java index 2c46dd01..917ec421 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java @@ -452,4 +452,30 @@ public class CompeteVo { private String otherPlayerName; } + @Data + @ApiModel("项目，开始时间和比赛状态") + public static class CountScore{ + @ApiModelProperty("项目id") + private Long id; + @ApiModelProperty("项目名") + private String projectName; + @ApiModelProperty("项目开始时间") + private Long startTime; + @ApiModelProperty("项目状态") + private int status; + } + + @Data + @ApiModel("得分享请") + public static class CountScoreDetail{ + @ApiModelProperty("参赛队伍") + private String companyName; + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("成绩") + private Long grade; + + } + + } 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 index 9112c99a..e3c6e4db 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java @@ -18,4 +18,5 @@ public interface CompeteProjectConfigDao extends CompeteProjectConfigMapper { List selectDetail (); List selectSingle (@Param("competeTimeId") Long competeTimeId,@Param("projectId") Long projectId,@Param("groupId") Long groupId,@Param("companyId") Long companyId,@Param("name") String name,@Param("idCard") String idCard); List selectGroup (@Param("competeTimeId") Long competeTimeId,@Param("projectId") Long projectId,@Param("groupId") Long groupId,@Param("companyId") Long companyId,@Param("name") String name,@Param("idCard") String idCard); + CompeteProjectConfig selectStartTime(@Param("projectId") Long projectId); } \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java index c6f2ca97..aa5ab32d 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -14,10 +14,7 @@ import com.ccsens.mt.bean.dto.LevelDto; import com.ccsens.mt.bean.po.*; import com.ccsens.mt.bean.vo.CompeteVo; import com.ccsens.mt.bean.vo.TableVo; -import com.ccsens.mt.persist.dao.CompeteEnrollDao; -import com.ccsens.mt.persist.dao.CompetePlayerDao; -import com.ccsens.mt.persist.dao.CompeteTeamDao; -import com.ccsens.mt.persist.dao.CompeteTimeDao; +import com.ccsens.mt.persist.dao.*; import com.ccsens.mt.persist.mapper.*; import com.ccsens.mt.util.Constant; import com.ccsens.util.*; @@ -82,7 +79,8 @@ public class CompeteService implements ICompeteService { private TallFeignClient tallFeignClient; @Resource private CommonFileMapper commonFileMapper; - + @Resource + private CompeteProjectConfigDao competeProjectConfigDao; /** * 查看第几届 */ @@ -896,6 +894,8 @@ public class CompeteService implements ICompeteService { } + + /** * 验证数据的正确性，存入数据库 */ @@ -1008,8 +1008,71 @@ public class CompeteService implements ICompeteService { } + @Override + public List countScore(CompeteDto.CompeteTime params) { + List countScoreList = 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) { + long projectId = competeProject.getId(); + CompeteProjectConfig competeProjectConfig = competeProjectConfigDao.selectStartTime(projectId); + if (ObjectUtil.isNotNull(competeProjectConfig)) { + CompeteVo.CountScore countScore = new CompeteVo.CountScore(); + countScore.setId(competeProject.getId()); + countScore.setProjectName(competeProject.getName()); + countScore.setStartTime(competeProjectConfig.getStartTime()); + //状态判断 + long currentTime = System.currentTimeMillis(); + if (currentTime < competeProjectConfig.getStartTime()) { + //未开始0-未开始 + countScore.setStatus(0); + } + if (currentTime > competeProjectConfig.getStartTime() && competeProjectConfig.getEndTime() > currentTime) { + //进行中1-进行中 + countScore.setStatus(1); + } + if (competeProjectConfig.getEndTime() < currentTime) { + //已经结束-结束 + countScore.setStatus(2); + } + countScoreList.add(countScore); + } + } + return countScoreList; + } + @Override + public List countScoreDetail(CompeteDto.ProjectIdAndGroupId params) { + //判断比赛类型 + long ProjectId = params.getProjectId(); + long groupId = params.getGroupId(); + CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(ProjectId); + int team = competeProject.getTeam(); + long fatherId = competeProject.getParentId(); + //如果比赛是个人计数赛 + if (fatherId == 2001 && team == 0){ + CompeteProjectPlayerExample competeProjectPlayerExample= new CompeteProjectPlayerExample(); + + } + //如果是个人花样赛 + if (fatherId == 2002 && team == 0){ + + } + //如果是团队计数赛 + if (fatherId == 2001 && team == 1){ + } + //如果是团队花样赛 + if (fatherId == 2002 && team == 1){ + + } + return null; + } } \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java b/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java index 84cf068a..eca520a8 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java @@ -149,6 +149,22 @@ public interface ICompeteService { List signupImport(String path) throws FileNotFoundException, Exception; + + /** + * 项目，开始时间和比赛状态 + * @param params 大赛id和比赛项目id + * @return 返回项目，开始时间和比赛状态 + */ + List countScore(CompeteDto.CompeteTime params) ; + + /** + * 得分详情 + * @param params 大赛id和比赛项目id + * @return 返回项目，开始时间和比赛状态 + */ + List countScoreDetail(CompeteDto.ProjectIdAndGroupId params) ; + + } diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index f59084b0..4ecd13fd 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: common, util-test + active: dev + include: common, util-dev diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml index d8c89a2d..b56874c0 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml @@ -24,6 +24,12 @@ FROM t_compete_project_config a , t_compete_project b where a.project_id = b.id + + + \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java index 3fa11997..4ab0e8c9 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java @@ -30,6 +30,7 @@ import javax.annotation.Resource; import java.io.File; import java.io.FileInputStream; import java.io.InputStream; +import java.sql.Struct; import java.util.*; /** @@ -773,14 +774,16 @@ public class ExcelService implements IExcelService { taskDetail.setMoney(Long.parseLong(money) * 100); } //切换模式 - if (delay.equals(WebConstant.TASK_DELAY.SelfMotion.phase)) { - taskDetail.setDelay((byte) WebConstant.TASK_DELAY.SelfMotion.value); - } else if (delay.equals(WebConstant.TASK_DELAY.DelayManual.phase)) { - taskDetail.setDelay((byte) WebConstant.TASK_DELAY.DelayManual.value); - } else if (delay.equals(WebConstant.TASK_DELAY.Manual.phase)) { - taskDetail.setDelay((byte) WebConstant.TASK_DELAY.Manual.value); - } else { - throw new BaseException(CodeEnum.WBS_DELAY_ERROR.addMsg(wbsSheet.getSheetName() + i)); + if(StrUtil.isNotEmpty(delay)) { + if (delay.equals(WebConstant.TASK_DELAY.SelfMotion.phase)) { + taskDetail.setDelay((byte) WebConstant.TASK_DELAY.SelfMotion.value); + } else if (delay.equals(WebConstant.TASK_DELAY.DelayManual.phase)) { + taskDetail.setDelay((byte) WebConstant.TASK_DELAY.DelayManual.value); + } else if (delay.equals(WebConstant.TASK_DELAY.Manual.phase)) { + taskDetail.setDelay((byte) WebConstant.TASK_DELAY.Manual.value); + } else { + throw new BaseException(CodeEnum.WBS_DELAY_ERROR.addMsg(wbsSheet.getSheetName() + i)); + } } //延迟时间 if (StrUtil.isNotEmpty(delayTime)) { diff --git a/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java b/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java index 380c4091..2e21c4df 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java @@ -267,7 +267,7 @@ public class ProMemberService implements IProMemberService { proMember.setUserId(userId); //获取奖惩干系人 Long stakeholderId = null; - if(ObjectUtil.isNotNull(saveMember.getStakeholderPhone())){ + if(StrUtil.isNotEmpty(saveMember.getStakeholderPhone())){ ProMemberExample stakeholderExample = new ProMemberExample(); stakeholderExample.createCriteria().andProjectIdEqualTo(saveMember.getProjectId()).andPhoneEqualTo(saveMember.getStakeholderPhone()); List stakeholderList = proMemberDao.selectByExample(stakeholderExample); diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index b5408a3a..ebc544af 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: dev - include: util-dev,common + active: test + include: util-test,common From 180e997b977b806b72f75a51a4580c76ba6d547d Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Fri, 13 Nov 2020 18:04:04 +0800 Subject: [PATCH 24/80] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E6=95=B0?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccsens/mt/api/CompeteScoreController.java | 1 - .../ccsens/mt/api/CompeteVedioController.java | 22 +- .../java/com/ccsens/mt/bean/dto/ScoreDto.java | 32 +++ .../java/com/ccsens/mt/bean/dto/VideoDto.java | 18 ++ .../ccsens/mt/bean/po/CompeteCountScore.java | 37 +-- .../mt/bean/po/CompeteCountScoreExample.java | 121 +++++----- .../ccsens/mt/bean/po/CompeteJudgment.java | 33 +++ .../mt/bean/po/CompeteJudgmentExample.java | 210 ++++++++++++++++++ .../mt/bean/po/CompeteVarietyScore.java | 7 +- .../bean/po/CompeteVarietyScoreExample.java | 21 +- .../com/ccsens/mt/bean/vo/VideoProjectVo.java | 23 ++ .../mt/persist/dao/CompeteVideoDao.java | 18 ++ .../mt/service/CompeteVedioService.java | 26 ++- .../mt/service/ICompeteVedioService.java | 4 + mt/src/main/resources/application.yml | 4 +- .../resources/mapper_dao/CompeteVideoDao.xml | 63 ++++++ .../mapper_raw/CompeteCountScoreMapper.xml | 78 +++---- .../mapper_raw/CompeteJudgmentMapper.xml | 57 ++++- .../mapper_raw/CompeteVarietyScoreMapper.xml | 14 +- 19 files changed, 637 insertions(+), 152 deletions(-) create mode 100644 mt/src/main/java/com/ccsens/mt/persist/dao/CompeteVideoDao.java create mode 100644 mt/src/main/resources/mapper_dao/CompeteVideoDao.xml diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java index a1262f24..9345cff8 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java @@ -40,5 +40,4 @@ public class CompeteScoreController { - } diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteVedioController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteVedioController.java index 8141d9c4..b40a29b1 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteVedioController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteVedioController.java @@ -57,14 +57,24 @@ public class CompeteVedioController { } @MustLogin - @ApiOperation(value = "查看用户签到状态（签到用）（有筛选", notes = "Mr.王---------") + @ApiOperation(value = "查看单位签到状态（签到用）（有筛选", notes = "Mr.王---------查看单位的人的最近一条的签到状态") @RequestMapping(value = "/selectUserStatus", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse selectUserStatus(@ApiParam @Validated @RequestBody QueryDto params) { - //这个没写完了 + public JsonResponse> selectCompanySignStatus(@ApiParam @Validated @RequestBody QueryDto params) { - log.info("添加用户观看开幕式视频记录（签到用）",params); - return JsonResponse.newInstance().ok(); + log.info("查看单位签到状态（签到用）",params); + List peoSignStatus = iCompeteVedioService.selectCompanySignStatus(params); + return JsonResponse.newInstance().ok(peoSignStatus); + } + @MustLogin + @ApiOperation(value = "查看教练签到状态（签到用）（有筛选", notes = "Mr.王---------查看教练的人的签到状态") + @RequestMapping(value = "/selectCoachStatus", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> selectCoachSignStatus(@ApiParam @Validated @RequestBody QueryDto params) { + + + log.info("查看教练签到状态（签到用）",params); + List coachSignStatus = iCompeteVedioService.selectCoachSignStatus(params); + return JsonResponse.newInstance().ok(coachSignStatus); } @MustLogin @@ -84,8 +94,8 @@ public class CompeteVedioController { log.info("添加用户观看开幕式视频记录（签到用）",params); List list=iCompeteVedioService.selectAllCompany(params); return JsonResponse.newInstance().ok(list); - } + } diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java index 4bdcd814..a2f4abec 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java @@ -1,5 +1,6 @@ package com.ccsens.mt.bean.dto; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -83,4 +84,35 @@ public class ScoreDto { @ApiModelProperty("分数") private BigDecimal score; } + + + @Data + @ApiModel + public static class InformationSubmitted{ + @ApiModelProperty("大赛id") + private Long competeTimeId; + @ApiModelProperty("项目Id") + private Long projectId; + @ApiModelProperty("场次id") + private BigDecimal siteOrderId; + @ApiModelProperty("裁判id") + private Long judgmentId; +// @ApiModelProperty("几分") +// List + + } + @Data + @ApiModel + public static class Fraction{ + @ApiModelProperty("分数") + private int score; + @ApiModelProperty("分数类型") + private String code; + + + + + } + + } diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java index 151a6c2e..21bb3fd9 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java @@ -3,6 +3,7 @@ package com.ccsens.mt.bean.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.NonNull; /** @@ -42,6 +43,7 @@ public class VideoDto { @Data @ApiModel("添加用户观看开幕式视频记录（签到用）") public static class Vdeo{ + @NonNull @ApiModelProperty("视频文件id") private Long companyId; } @@ -72,4 +74,20 @@ public class VideoDto { @ApiModelProperty("大赛id") private Long teamId; } + @Data + @ApiModel("参赛队伍/裁判签到表") + public static class GetTeamSignStatu{ + @ApiModelProperty("大赛id") + private Long id; + @ApiModelProperty("姓名/参赛队伍") + private String name; + + @ApiModelProperty("账号") + private String phone; + + @ApiModelProperty("签到时间") + private Long signEndTime; + + } + } diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScore.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScore.java index d06a7d6b..1836bfad 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScore.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScore.java @@ -1,6 +1,7 @@ package com.ccsens.mt.bean.po; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; public class CompeteCountScore implements Serializable { @@ -12,19 +13,19 @@ public class CompeteCountScore implements Serializable { private Long siteOrderId; - private Long chiefJudgmentScore; + private BigDecimal chiefJudgmentScore; - private Integer judgmentAScore; + private BigDecimal judgmentAScore; - private Integer judgmentBScore2; + private BigDecimal judgmentBScore2; - private Integer shouldTimes; + private BigDecimal shouldTimes; - private Integer deductTimes; + private BigDecimal deductTimes; private String deductCause; - private Integer finalScore; + private BigDecimal finalScore; private Date createdAt; @@ -66,43 +67,43 @@ public class CompeteCountScore implements Serializable { this.siteOrderId = siteOrderId; } - public Long getChiefJudgmentScore() { + public BigDecimal getChiefJudgmentScore() { return chiefJudgmentScore; } - public void setChiefJudgmentScore(Long chiefJudgmentScore) { + public void setChiefJudgmentScore(BigDecimal chiefJudgmentScore) { this.chiefJudgmentScore = chiefJudgmentScore; } - public Integer getJudgmentAScore() { + public BigDecimal getJudgmentAScore() { return judgmentAScore; } - public void setJudgmentAScore(Integer judgmentAScore) { + public void setJudgmentAScore(BigDecimal judgmentAScore) { this.judgmentAScore = judgmentAScore; } - public Integer getJudgmentBScore2() { + public BigDecimal getJudgmentBScore2() { return judgmentBScore2; } - public void setJudgmentBScore2(Integer judgmentBScore2) { + public void setJudgmentBScore2(BigDecimal judgmentBScore2) { this.judgmentBScore2 = judgmentBScore2; } - public Integer getShouldTimes() { + public BigDecimal getShouldTimes() { return shouldTimes; } - public void setShouldTimes(Integer shouldTimes) { + public void setShouldTimes(BigDecimal shouldTimes) { this.shouldTimes = shouldTimes; } - public Integer getDeductTimes() { + public BigDecimal getDeductTimes() { return deductTimes; } - public void setDeductTimes(Integer deductTimes) { + public void setDeductTimes(BigDecimal deductTimes) { this.deductTimes = deductTimes; } @@ -114,11 +115,11 @@ public class CompeteCountScore implements Serializable { this.deductCause = deductCause == null ? null : deductCause.trim(); } - public Integer getFinalScore() { + public BigDecimal getFinalScore() { return finalScore; } - public void setFinalScore(Integer finalScore) { + public void setFinalScore(BigDecimal finalScore) { this.finalScore = finalScore; } diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreExample.java index d5ff54db..832f2f73 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreExample.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreExample.java @@ -1,5 +1,6 @@ package com.ccsens.mt.bean.po; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -355,52 +356,52 @@ public class CompeteCountScoreExample { return (Criteria) this; } - public Criteria andChiefJudgmentScoreEqualTo(Long value) { + public Criteria andChiefJudgmentScoreEqualTo(BigDecimal value) { addCriterion("chief_judgment_score =", value, "chiefJudgmentScore"); return (Criteria) this; } - public Criteria andChiefJudgmentScoreNotEqualTo(Long value) { + public Criteria andChiefJudgmentScoreNotEqualTo(BigDecimal value) { addCriterion("chief_judgment_score <>", value, "chiefJudgmentScore"); return (Criteria) this; } - public Criteria andChiefJudgmentScoreGreaterThan(Long value) { + public Criteria andChiefJudgmentScoreGreaterThan(BigDecimal value) { addCriterion("chief_judgment_score >", value, "chiefJudgmentScore"); return (Criteria) this; } - public Criteria andChiefJudgmentScoreGreaterThanOrEqualTo(Long value) { + public Criteria andChiefJudgmentScoreGreaterThanOrEqualTo(BigDecimal value) { addCriterion("chief_judgment_score >=", value, "chiefJudgmentScore"); return (Criteria) this; } - public Criteria andChiefJudgmentScoreLessThan(Long value) { + public Criteria andChiefJudgmentScoreLessThan(BigDecimal value) { addCriterion("chief_judgment_score <", value, "chiefJudgmentScore"); return (Criteria) this; } - public Criteria andChiefJudgmentScoreLessThanOrEqualTo(Long value) { + public Criteria andChiefJudgmentScoreLessThanOrEqualTo(BigDecimal value) { addCriterion("chief_judgment_score <=", value, "chiefJudgmentScore"); return (Criteria) this; } - public Criteria andChiefJudgmentScoreIn(List values) { + public Criteria andChiefJudgmentScoreIn(List values) { addCriterion("chief_judgment_score in", values, "chiefJudgmentScore"); return (Criteria) this; } - public Criteria andChiefJudgmentScoreNotIn(List values) { + public Criteria andChiefJudgmentScoreNotIn(List values) { addCriterion("chief_judgment_score not in", values, "chiefJudgmentScore"); return (Criteria) this; } - public Criteria andChiefJudgmentScoreBetween(Long value1, Long value2) { + public Criteria andChiefJudgmentScoreBetween(BigDecimal value1, BigDecimal value2) { addCriterion("chief_judgment_score between", value1, value2, "chiefJudgmentScore"); return (Criteria) this; } - public Criteria andChiefJudgmentScoreNotBetween(Long value1, Long value2) { + public Criteria andChiefJudgmentScoreNotBetween(BigDecimal value1, BigDecimal value2) { addCriterion("chief_judgment_score not between", value1, value2, "chiefJudgmentScore"); return (Criteria) this; } @@ -415,52 +416,52 @@ public class CompeteCountScoreExample { return (Criteria) this; } - public Criteria andJudgmentAScoreEqualTo(Integer value) { + public Criteria andJudgmentAScoreEqualTo(BigDecimal value) { addCriterion("judgment_a_score =", value, "judgmentAScore"); return (Criteria) this; } - public Criteria andJudgmentAScoreNotEqualTo(Integer value) { + public Criteria andJudgmentAScoreNotEqualTo(BigDecimal value) { addCriterion("judgment_a_score <>", value, "judgmentAScore"); return (Criteria) this; } - public Criteria andJudgmentAScoreGreaterThan(Integer value) { + public Criteria andJudgmentAScoreGreaterThan(BigDecimal value) { addCriterion("judgment_a_score >", value, "judgmentAScore"); return (Criteria) this; } - public Criteria andJudgmentAScoreGreaterThanOrEqualTo(Integer value) { + public Criteria andJudgmentAScoreGreaterThanOrEqualTo(BigDecimal value) { addCriterion("judgment_a_score >=", value, "judgmentAScore"); return (Criteria) this; } - public Criteria andJudgmentAScoreLessThan(Integer value) { + public Criteria andJudgmentAScoreLessThan(BigDecimal value) { addCriterion("judgment_a_score <", value, "judgmentAScore"); return (Criteria) this; } - public Criteria andJudgmentAScoreLessThanOrEqualTo(Integer value) { + public Criteria andJudgmentAScoreLessThanOrEqualTo(BigDecimal value) { addCriterion("judgment_a_score <=", value, "judgmentAScore"); return (Criteria) this; } - public Criteria andJudgmentAScoreIn(List values) { + public Criteria andJudgmentAScoreIn(List values) { addCriterion("judgment_a_score in", values, "judgmentAScore"); return (Criteria) this; } - public Criteria andJudgmentAScoreNotIn(List values) { + public Criteria andJudgmentAScoreNotIn(List values) { addCriterion("judgment_a_score not in", values, "judgmentAScore"); return (Criteria) this; } - public Criteria andJudgmentAScoreBetween(Integer value1, Integer value2) { + public Criteria andJudgmentAScoreBetween(BigDecimal value1, BigDecimal value2) { addCriterion("judgment_a_score between", value1, value2, "judgmentAScore"); return (Criteria) this; } - public Criteria andJudgmentAScoreNotBetween(Integer value1, Integer value2) { + public Criteria andJudgmentAScoreNotBetween(BigDecimal value1, BigDecimal value2) { addCriterion("judgment_a_score not between", value1, value2, "judgmentAScore"); return (Criteria) this; } @@ -475,52 +476,52 @@ public class CompeteCountScoreExample { return (Criteria) this; } - public Criteria andJudgmentBScore2EqualTo(Integer value) { + public Criteria andJudgmentBScore2EqualTo(BigDecimal value) { addCriterion("judgment_b_score2 =", value, "judgmentBScore2"); return (Criteria) this; } - public Criteria andJudgmentBScore2NotEqualTo(Integer value) { + public Criteria andJudgmentBScore2NotEqualTo(BigDecimal value) { addCriterion("judgment_b_score2 <>", value, "judgmentBScore2"); return (Criteria) this; } - public Criteria andJudgmentBScore2GreaterThan(Integer value) { + public Criteria andJudgmentBScore2GreaterThan(BigDecimal value) { addCriterion("judgment_b_score2 >", value, "judgmentBScore2"); return (Criteria) this; } - public Criteria andJudgmentBScore2GreaterThanOrEqualTo(Integer value) { + public Criteria andJudgmentBScore2GreaterThanOrEqualTo(BigDecimal value) { addCriterion("judgment_b_score2 >=", value, "judgmentBScore2"); return (Criteria) this; } - public Criteria andJudgmentBScore2LessThan(Integer value) { + public Criteria andJudgmentBScore2LessThan(BigDecimal value) { addCriterion("judgment_b_score2 <", value, "judgmentBScore2"); return (Criteria) this; } - public Criteria andJudgmentBScore2LessThanOrEqualTo(Integer value) { + public Criteria andJudgmentBScore2LessThanOrEqualTo(BigDecimal value) { addCriterion("judgment_b_score2 <=", value, "judgmentBScore2"); return (Criteria) this; } - public Criteria andJudgmentBScore2In(List values) { + public Criteria andJudgmentBScore2In(List values) { addCriterion("judgment_b_score2 in", values, "judgmentBScore2"); return (Criteria) this; } - public Criteria andJudgmentBScore2NotIn(List values) { + public Criteria andJudgmentBScore2NotIn(List values) { addCriterion("judgment_b_score2 not in", values, "judgmentBScore2"); return (Criteria) this; } - public Criteria andJudgmentBScore2Between(Integer value1, Integer value2) { + public Criteria andJudgmentBScore2Between(BigDecimal value1, BigDecimal value2) { addCriterion("judgment_b_score2 between", value1, value2, "judgmentBScore2"); return (Criteria) this; } - public Criteria andJudgmentBScore2NotBetween(Integer value1, Integer value2) { + public Criteria andJudgmentBScore2NotBetween(BigDecimal value1, BigDecimal value2) { addCriterion("judgment_b_score2 not between", value1, value2, "judgmentBScore2"); return (Criteria) this; } @@ -535,52 +536,52 @@ public class CompeteCountScoreExample { return (Criteria) this; } - public Criteria andShouldTimesEqualTo(Integer value) { + public Criteria andShouldTimesEqualTo(BigDecimal value) { addCriterion("should_times =", value, "shouldTimes"); return (Criteria) this; } - public Criteria andShouldTimesNotEqualTo(Integer value) { + public Criteria andShouldTimesNotEqualTo(BigDecimal value) { addCriterion("should_times <>", value, "shouldTimes"); return (Criteria) this; } - public Criteria andShouldTimesGreaterThan(Integer value) { + public Criteria andShouldTimesGreaterThan(BigDecimal value) { addCriterion("should_times >", value, "shouldTimes"); return (Criteria) this; } - public Criteria andShouldTimesGreaterThanOrEqualTo(Integer value) { + public Criteria andShouldTimesGreaterThanOrEqualTo(BigDecimal value) { addCriterion("should_times >=", value, "shouldTimes"); return (Criteria) this; } - public Criteria andShouldTimesLessThan(Integer value) { + public Criteria andShouldTimesLessThan(BigDecimal value) { addCriterion("should_times <", value, "shouldTimes"); return (Criteria) this; } - public Criteria andShouldTimesLessThanOrEqualTo(Integer value) { + public Criteria andShouldTimesLessThanOrEqualTo(BigDecimal value) { addCriterion("should_times <=", value, "shouldTimes"); return (Criteria) this; } - public Criteria andShouldTimesIn(List values) { + public Criteria andShouldTimesIn(List values) { addCriterion("should_times in", values, "shouldTimes"); return (Criteria) this; } - public Criteria andShouldTimesNotIn(List values) { + public Criteria andShouldTimesNotIn(List values) { addCriterion("should_times not in", values, "shouldTimes"); return (Criteria) this; } - public Criteria andShouldTimesBetween(Integer value1, Integer value2) { + public Criteria andShouldTimesBetween(BigDecimal value1, BigDecimal value2) { addCriterion("should_times between", value1, value2, "shouldTimes"); return (Criteria) this; } - public Criteria andShouldTimesNotBetween(Integer value1, Integer value2) { + public Criteria andShouldTimesNotBetween(BigDecimal value1, BigDecimal value2) { addCriterion("should_times not between", value1, value2, "shouldTimes"); return (Criteria) this; } @@ -595,52 +596,52 @@ public class CompeteCountScoreExample { return (Criteria) this; } - public Criteria andDeductTimesEqualTo(Integer value) { + public Criteria andDeductTimesEqualTo(BigDecimal value) { addCriterion("deduct_times =", value, "deductTimes"); return (Criteria) this; } - public Criteria andDeductTimesNotEqualTo(Integer value) { + public Criteria andDeductTimesNotEqualTo(BigDecimal value) { addCriterion("deduct_times <>", value, "deductTimes"); return (Criteria) this; } - public Criteria andDeductTimesGreaterThan(Integer value) { + public Criteria andDeductTimesGreaterThan(BigDecimal value) { addCriterion("deduct_times >", value, "deductTimes"); return (Criteria) this; } - public Criteria andDeductTimesGreaterThanOrEqualTo(Integer value) { + public Criteria andDeductTimesGreaterThanOrEqualTo(BigDecimal value) { addCriterion("deduct_times >=", value, "deductTimes"); return (Criteria) this; } - public Criteria andDeductTimesLessThan(Integer value) { + public Criteria andDeductTimesLessThan(BigDecimal value) { addCriterion("deduct_times <", value, "deductTimes"); return (Criteria) this; } - public Criteria andDeductTimesLessThanOrEqualTo(Integer value) { + public Criteria andDeductTimesLessThanOrEqualTo(BigDecimal value) { addCriterion("deduct_times <=", value, "deductTimes"); return (Criteria) this; } - public Criteria andDeductTimesIn(List values) { + public Criteria andDeductTimesIn(List values) { addCriterion("deduct_times in", values, "deductTimes"); return (Criteria) this; } - public Criteria andDeductTimesNotIn(List values) { + public Criteria andDeductTimesNotIn(List values) { addCriterion("deduct_times not in", values, "deductTimes"); return (Criteria) this; } - public Criteria andDeductTimesBetween(Integer value1, Integer value2) { + public Criteria andDeductTimesBetween(BigDecimal value1, BigDecimal value2) { addCriterion("deduct_times between", value1, value2, "deductTimes"); return (Criteria) this; } - public Criteria andDeductTimesNotBetween(Integer value1, Integer value2) { + public Criteria andDeductTimesNotBetween(BigDecimal value1, BigDecimal value2) { addCriterion("deduct_times not between", value1, value2, "deductTimes"); return (Criteria) this; } @@ -725,52 +726,52 @@ public class CompeteCountScoreExample { return (Criteria) this; } - public Criteria andFinalScoreEqualTo(Integer value) { + public Criteria andFinalScoreEqualTo(BigDecimal value) { addCriterion("final_score =", value, "finalScore"); return (Criteria) this; } - public Criteria andFinalScoreNotEqualTo(Integer value) { + public Criteria andFinalScoreNotEqualTo(BigDecimal value) { addCriterion("final_score <>", value, "finalScore"); return (Criteria) this; } - public Criteria andFinalScoreGreaterThan(Integer value) { + public Criteria andFinalScoreGreaterThan(BigDecimal value) { addCriterion("final_score >", value, "finalScore"); return (Criteria) this; } - public Criteria andFinalScoreGreaterThanOrEqualTo(Integer value) { + public Criteria andFinalScoreGreaterThanOrEqualTo(BigDecimal value) { addCriterion("final_score >=", value, "finalScore"); return (Criteria) this; } - public Criteria andFinalScoreLessThan(Integer value) { + public Criteria andFinalScoreLessThan(BigDecimal value) { addCriterion("final_score <", value, "finalScore"); return (Criteria) this; } - public Criteria andFinalScoreLessThanOrEqualTo(Integer value) { + public Criteria andFinalScoreLessThanOrEqualTo(BigDecimal value) { addCriterion("final_score <=", value, "finalScore"); return (Criteria) this; } - public Criteria andFinalScoreIn(List values) { + public Criteria andFinalScoreIn(List values) { addCriterion("final_score in", values, "finalScore"); return (Criteria) this; } - public Criteria andFinalScoreNotIn(List values) { + public Criteria andFinalScoreNotIn(List values) { addCriterion("final_score not in", values, "finalScore"); return (Criteria) this; } - public Criteria andFinalScoreBetween(Integer value1, Integer value2) { + public Criteria andFinalScoreBetween(BigDecimal value1, BigDecimal value2) { addCriterion("final_score between", value1, value2, "finalScore"); return (Criteria) this; } - public Criteria andFinalScoreNotBetween(Integer value1, Integer value2) { + public Criteria andFinalScoreNotBetween(BigDecimal value1, BigDecimal value2) { addCriterion("final_score not between", value1, value2, "finalScore"); return (Criteria) this; } diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgment.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgment.java index c2de5e32..079c5ad4 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgment.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgment.java @@ -6,6 +6,12 @@ import java.util.Date; public class CompeteJudgment implements Serializable { private Long id; + private String name; + + private String phone; + + private String remark; + private Long competeTimeId; private Long siteOrderId; @@ -32,6 +38,30 @@ public class CompeteJudgment implements Serializable { this.id = id; } + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name == null ? null : name.trim(); + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone == null ? null : phone.trim(); + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark == null ? null : remark.trim(); + } + public Long getCompeteTimeId() { return competeTimeId; } @@ -103,6 +133,9 @@ public class CompeteJudgment implements Serializable { sb.append(" ["); sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); + sb.append(", name=").append(name); + sb.append(", phone=").append(phone); + sb.append(", remark=").append(remark); sb.append(", competeTimeId=").append(competeTimeId); sb.append(", siteOrderId=").append(siteOrderId); sb.append(", projectId=").append(projectId); diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgmentExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgmentExample.java index 4d75f9ed..f88f0ccc 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgmentExample.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgmentExample.java @@ -165,6 +165,216 @@ public class CompeteJudgmentExample { return (Criteria) this; } + public Criteria andNameIsNull() { + addCriterion("name is null"); + return (Criteria) this; + } + + public Criteria andNameIsNotNull() { + addCriterion("name is not null"); + return (Criteria) this; + } + + public Criteria andNameEqualTo(String value) { + addCriterion("name =", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotEqualTo(String value) { + addCriterion("name <>", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThan(String value) { + addCriterion("name >", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThanOrEqualTo(String value) { + addCriterion("name >=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThan(String value) { + addCriterion("name <", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThanOrEqualTo(String value) { + addCriterion("name <=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLike(String value) { + addCriterion("name like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotLike(String value) { + addCriterion("name not like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameIn(List values) { + addCriterion("name in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameNotIn(List values) { + addCriterion("name not in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameBetween(String value1, String value2) { + addCriterion("name between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andNameNotBetween(String value1, String value2) { + addCriterion("name not between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andPhoneIsNull() { + addCriterion("phone is null"); + return (Criteria) this; + } + + public Criteria andPhoneIsNotNull() { + addCriterion("phone is not null"); + return (Criteria) this; + } + + public Criteria andPhoneEqualTo(String value) { + addCriterion("phone =", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneNotEqualTo(String value) { + addCriterion("phone <>", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneGreaterThan(String value) { + addCriterion("phone >", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneGreaterThanOrEqualTo(String value) { + addCriterion("phone >=", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneLessThan(String value) { + addCriterion("phone <", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneLessThanOrEqualTo(String value) { + addCriterion("phone <=", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneLike(String value) { + addCriterion("phone like", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneNotLike(String value) { + addCriterion("phone not like", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneIn(List values) { + addCriterion("phone in", values, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneNotIn(List values) { + addCriterion("phone not in", values, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneBetween(String value1, String value2) { + addCriterion("phone between", value1, value2, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneNotBetween(String value1, String value2) { + addCriterion("phone not between", value1, value2, "phone"); + return (Criteria) this; + } + + public Criteria andRemarkIsNull() { + addCriterion("remark is null"); + return (Criteria) this; + } + + public Criteria andRemarkIsNotNull() { + addCriterion("remark is not null"); + return (Criteria) this; + } + + public Criteria andRemarkEqualTo(String value) { + addCriterion("remark =", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotEqualTo(String value) { + addCriterion("remark <>", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThan(String value) { + addCriterion("remark >", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThanOrEqualTo(String value) { + addCriterion("remark >=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThan(String value) { + addCriterion("remark <", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThanOrEqualTo(String value) { + addCriterion("remark <=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLike(String value) { + addCriterion("remark like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotLike(String value) { + addCriterion("remark not like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkIn(List values) { + addCriterion("remark in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotIn(List values) { + addCriterion("remark not in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkBetween(String value1, String value2) { + addCriterion("remark between", value1, value2, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotBetween(String value1, String value2) { + addCriterion("remark not between", value1, value2, "remark"); + return (Criteria) this; + } + public Criteria andCompeteTimeIdIsNull() { addCriterion("compete_time_id is null"); return (Criteria) this; diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScore.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScore.java index 9fa53c5a..e264a762 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScore.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScore.java @@ -1,6 +1,7 @@ package com.ccsens.mt.bean.po; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; public class CompeteVarietyScore implements Serializable { @@ -14,7 +15,7 @@ public class CompeteVarietyScore implements Serializable { private String code; - private Integer score; + private BigDecimal score; private Long judgmentId; @@ -66,11 +67,11 @@ public class CompeteVarietyScore implements Serializable { this.code = code == null ? null : code.trim(); } - public Integer getScore() { + public BigDecimal getScore() { return score; } - public void setScore(Integer score) { + public void setScore(BigDecimal score) { this.score = score; } diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScoreExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScoreExample.java index 05ddc769..633c6a56 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScoreExample.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScoreExample.java @@ -1,5 +1,6 @@ package com.ccsens.mt.bean.po; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -425,52 +426,52 @@ public class CompeteVarietyScoreExample { return (Criteria) this; } - public Criteria andScoreEqualTo(Integer value) { + public Criteria andScoreEqualTo(BigDecimal value) { addCriterion("score =", value, "score"); return (Criteria) this; } - public Criteria andScoreNotEqualTo(Integer value) { + public Criteria andScoreNotEqualTo(BigDecimal value) { addCriterion("score <>", value, "score"); return (Criteria) this; } - public Criteria andScoreGreaterThan(Integer value) { + public Criteria andScoreGreaterThan(BigDecimal value) { addCriterion("score >", value, "score"); return (Criteria) this; } - public Criteria andScoreGreaterThanOrEqualTo(Integer value) { + public Criteria andScoreGreaterThanOrEqualTo(BigDecimal value) { addCriterion("score >=", value, "score"); return (Criteria) this; } - public Criteria andScoreLessThan(Integer value) { + public Criteria andScoreLessThan(BigDecimal value) { addCriterion("score <", value, "score"); return (Criteria) this; } - public Criteria andScoreLessThanOrEqualTo(Integer value) { + public Criteria andScoreLessThanOrEqualTo(BigDecimal value) { addCriterion("score <=", value, "score"); return (Criteria) this; } - public Criteria andScoreIn(List values) { + public Criteria andScoreIn(List values) { addCriterion("score in", values, "score"); return (Criteria) this; } - public Criteria andScoreNotIn(List values) { + public Criteria andScoreNotIn(List values) { addCriterion("score not in", values, "score"); return (Criteria) this; } - public Criteria andScoreBetween(Integer value1, Integer value2) { + public Criteria andScoreBetween(BigDecimal value1, BigDecimal value2) { addCriterion("score between", value1, value2, "score"); return (Criteria) this; } - public Criteria andScoreNotBetween(Integer value1, Integer value2) { + public Criteria andScoreNotBetween(BigDecimal value1, BigDecimal value2) { addCriterion("score not between", value1, value2, "score"); return (Criteria) this; } diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java index 9130201c..0dd30cbb 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java @@ -26,5 +26,28 @@ public class VideoProjectVo { private String companyName; } + @Data + @ApiModel("查找单位签到的状态") + public static class PeoSignStatu{ + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("账号") + private String phone; + @ApiModelProperty("最近签到时间") + private Long time; + } + @Data + @ApiModel("查找裁判签到的状态") + public static class CoachSignStatu{ + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("账号") + private String phone; + @ApiModelProperty("裁判类型") + private byte chiefJudgment; + @ApiModelProperty("最近签到时间") + private Long time; + } + } diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteVideoDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteVideoDao.java new file mode 100644 index 00000000..f014c8c0 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteVideoDao.java @@ -0,0 +1,18 @@ +package com.ccsens.mt.persist.dao; + +import com.ccsens.mt.bean.dto.VideoDto; +import com.ccsens.mt.bean.vo.VideoProjectVo; +import com.ccsens.mt.persist.mapper.CompeteCompanyMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author Mr.王 + */ +public interface CompeteVideoDao extends CompeteCompanyMapper { + + List selectCompanySignStatus(@Param("param") VideoDto.GetTeamSignStatu param); + + List selectCoachSignStatus(@Param("param") VideoDto.GetTeamSignStatu param); +} diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java index 78556327..0f3a36fa 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java @@ -4,6 +4,7 @@ import cn.hutool.core.lang.Snowflake; import com.ccsens.mt.bean.dto.VideoDto; import com.ccsens.mt.bean.po.*; import com.ccsens.mt.bean.vo.VideoProjectVo; +import com.ccsens.mt.persist.dao.CompeteVideoDao; import com.ccsens.mt.persist.mapper.CompeteCompanyMapper; import com.ccsens.mt.persist.mapper.CompetePlayerLookMapper; import com.ccsens.mt.persist.mapper.CompeteProjectMapper; @@ -37,7 +38,8 @@ public class CompeteVedioService implements ICompeteVedioService{ private CompeteProjectMapper competeProjectMapper; @Resource private CompeteCompanyMapper competeCompanyMapper; - + @Resource + private CompeteVideoDao competeVideoDao; @Override public void insertSignVideo(Long companyId) { @@ -99,4 +101,26 @@ public class CompeteVedioService implements ICompeteVedioService{ }); return list1; } + /** + * 查看公司的签到状态 + * @param params + * @return + */ + @Override + public List selectCompanySignStatus(QueryDto params) { + return competeVideoDao.selectCompanySignStatus(params.getParam()); + } + /** + * 查看教练的签到状态 + * @param params + * @return + */ + @Override + public List selectCoachSignStatus(QueryDto params) { + log.info(params.getParam().toString()); + return competeVideoDao.selectCoachSignStatus(params.getParam()); + } + + + } diff --git a/mt/src/main/java/com/ccsens/mt/service/ICompeteVedioService.java b/mt/src/main/java/com/ccsens/mt/service/ICompeteVedioService.java index 3cc76419..96a011e9 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ICompeteVedioService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteVedioService.java @@ -27,4 +27,8 @@ public interface ICompeteVedioService { List selectTwoProject(QueryDto params); List selectAllCompany(QueryDto params); + + List selectCompanySignStatus(QueryDto params); + + List selectCoachSignStatus(QueryDto params); } diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index f59084b0..4ecd13fd 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: common, util-test + active: dev + include: common, util-dev diff --git a/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml b/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml new file mode 100644 index 00000000..6bbbcbc4 --- /dev/null +++ b/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml @@ -0,0 +1,63 @@ + + + + + + + \ No newline at end of file diff --git a/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml b/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml index 3fba3694..bf9b3dc5 100644 --- a/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml @@ -6,13 +6,13 @@ - - - - - + + + + + - + @@ -117,9 +117,9 @@ deduct_cause, final_score, created_at, updated_at, rec_status) values (#{id,jdbcType=BIGINT}, #{competeTimeId,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, - #{siteOrderId,jdbcType=BIGINT}, #{chiefJudgmentScore,jdbcType=BIGINT}, #{judgmentAScore,jdbcType=INTEGER}, - #{judgmentBScore2,jdbcType=INTEGER}, #{shouldTimes,jdbcType=INTEGER}, #{deductTimes,jdbcType=INTEGER}, - #{deductCause,jdbcType=VARCHAR}, #{finalScore,jdbcType=INTEGER}, #{createdAt,jdbcType=TIMESTAMP}, + #{siteOrderId,jdbcType=BIGINT}, #{chiefJudgmentScore,jdbcType=DECIMAL}, #{judgmentAScore,jdbcType=DECIMAL}, + #{judgmentBScore2,jdbcType=DECIMAL}, #{shouldTimes,jdbcType=DECIMAL}, #{deductTimes,jdbcType=DECIMAL}, + #{deductCause,jdbcType=VARCHAR}, #{finalScore,jdbcType=DECIMAL}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) @@ -182,25 +182,25 @@ #{siteOrderId,jdbcType=BIGINT}, - #{chiefJudgmentScore,jdbcType=BIGINT}, + #{chiefJudgmentScore,jdbcType=DECIMAL}, - #{judgmentAScore,jdbcType=INTEGER}, + #{judgmentAScore,jdbcType=DECIMAL}, - #{judgmentBScore2,jdbcType=INTEGER}, + #{judgmentBScore2,jdbcType=DECIMAL}, - #{shouldTimes,jdbcType=INTEGER}, + #{shouldTimes,jdbcType=DECIMAL}, - #{deductTimes,jdbcType=INTEGER}, + #{deductTimes,jdbcType=DECIMAL}, #{deductCause,jdbcType=VARCHAR}, - #{finalScore,jdbcType=INTEGER}, + #{finalScore,jdbcType=DECIMAL}, #{createdAt,jdbcType=TIMESTAMP}, @@ -235,25 +235,25 @@ site_order_id = #{record.siteOrderId,jdbcType=BIGINT}, - chief_judgment_score = #{record.chiefJudgmentScore,jdbcType=BIGINT}, + chief_judgment_score = #{record.chiefJudgmentScore,jdbcType=DECIMAL}, - judgment_a_score = #{record.judgmentAScore,jdbcType=INTEGER}, + judgment_a_score = #{record.judgmentAScore,jdbcType=DECIMAL}, - judgment_b_score2 = #{record.judgmentBScore2,jdbcType=INTEGER}, + judgment_b_score2 = #{record.judgmentBScore2,jdbcType=DECIMAL}, - should_times = #{record.shouldTimes,jdbcType=INTEGER}, + should_times = #{record.shouldTimes,jdbcType=DECIMAL}, - deduct_times = #{record.deductTimes,jdbcType=INTEGER}, + deduct_times = #{record.deductTimes,jdbcType=DECIMAL}, deduct_cause = #{record.deductCause,jdbcType=VARCHAR}, - final_score = #{record.finalScore,jdbcType=INTEGER}, + final_score = #{record.finalScore,jdbcType=DECIMAL}, created_at = #{record.createdAt,jdbcType=TIMESTAMP}, @@ -275,13 +275,13 @@ compete_time_id = #{record.competeTimeId,jdbcType=BIGINT}, project_id = #{record.projectId,jdbcType=BIGINT}, site_order_id = #{record.siteOrderId,jdbcType=BIGINT}, - chief_judgment_score = #{record.chiefJudgmentScore,jdbcType=BIGINT}, - judgment_a_score = #{record.judgmentAScore,jdbcType=INTEGER}, - judgment_b_score2 = #{record.judgmentBScore2,jdbcType=INTEGER}, - should_times = #{record.shouldTimes,jdbcType=INTEGER}, - deduct_times = #{record.deductTimes,jdbcType=INTEGER}, + chief_judgment_score = #{record.chiefJudgmentScore,jdbcType=DECIMAL}, + judgment_a_score = #{record.judgmentAScore,jdbcType=DECIMAL}, + judgment_b_score2 = #{record.judgmentBScore2,jdbcType=DECIMAL}, + should_times = #{record.shouldTimes,jdbcType=DECIMAL}, + deduct_times = #{record.deductTimes,jdbcType=DECIMAL}, deduct_cause = #{record.deductCause,jdbcType=VARCHAR}, - final_score = #{record.finalScore,jdbcType=INTEGER}, + final_score = #{record.finalScore,jdbcType=DECIMAL}, created_at = #{record.createdAt,jdbcType=TIMESTAMP}, updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, rec_status = #{record.recStatus,jdbcType=TINYINT} @@ -302,25 +302,25 @@ site_order_id = #{siteOrderId,jdbcType=BIGINT}, - chief_judgment_score = #{chiefJudgmentScore,jdbcType=BIGINT}, + chief_judgment_score = #{chiefJudgmentScore,jdbcType=DECIMAL}, - judgment_a_score = #{judgmentAScore,jdbcType=INTEGER}, + judgment_a_score = #{judgmentAScore,jdbcType=DECIMAL}, - judgment_b_score2 = #{judgmentBScore2,jdbcType=INTEGER}, + judgment_b_score2 = #{judgmentBScore2,jdbcType=DECIMAL}, - should_times = #{shouldTimes,jdbcType=INTEGER}, + should_times = #{shouldTimes,jdbcType=DECIMAL}, - deduct_times = #{deductTimes,jdbcType=INTEGER}, + deduct_times = #{deductTimes,jdbcType=DECIMAL}, deduct_cause = #{deductCause,jdbcType=VARCHAR}, - final_score = #{finalScore,jdbcType=INTEGER}, + final_score = #{finalScore,jdbcType=DECIMAL}, created_at = #{createdAt,jdbcType=TIMESTAMP}, @@ -339,13 +339,13 @@ set compete_time_id = #{competeTimeId,jdbcType=BIGINT}, project_id = #{projectId,jdbcType=BIGINT}, site_order_id = #{siteOrderId,jdbcType=BIGINT}, - chief_judgment_score = #{chiefJudgmentScore,jdbcType=BIGINT}, - judgment_a_score = #{judgmentAScore,jdbcType=INTEGER}, - judgment_b_score2 = #{judgmentBScore2,jdbcType=INTEGER}, - should_times = #{shouldTimes,jdbcType=INTEGER}, - deduct_times = #{deductTimes,jdbcType=INTEGER}, + chief_judgment_score = #{chiefJudgmentScore,jdbcType=DECIMAL}, + judgment_a_score = #{judgmentAScore,jdbcType=DECIMAL}, + judgment_b_score2 = #{judgmentBScore2,jdbcType=DECIMAL}, + should_times = #{shouldTimes,jdbcType=DECIMAL}, + deduct_times = #{deductTimes,jdbcType=DECIMAL}, deduct_cause = #{deductCause,jdbcType=VARCHAR}, - final_score = #{finalScore,jdbcType=INTEGER}, + final_score = #{finalScore,jdbcType=DECIMAL}, created_at = #{createdAt,jdbcType=TIMESTAMP}, updated_at = #{updatedAt,jdbcType=TIMESTAMP}, rec_status = #{recStatus,jdbcType=TINYINT} diff --git a/mt/src/main/resources/mapper_raw/CompeteJudgmentMapper.xml b/mt/src/main/resources/mapper_raw/CompeteJudgmentMapper.xml index 13d3e48c..443a9a91 100644 --- a/mt/src/main/resources/mapper_raw/CompeteJudgmentMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompeteJudgmentMapper.xml @@ -3,6 +3,9 @@ + + + @@ -71,8 +74,8 @@ - id, compete_time_id, site_order_id, project_id, user_id, chief_judgment, created_at, - updated_at, rec_status + id, name, phone, remark, compete_time_id, site_order_id, project_id, user_id, chief_judgment, + created_at, updated_at, rec_status + \ No newline at end of file diff --git a/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml b/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml index 3fba3694..6f586d68 100644 --- a/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml @@ -3,16 +3,16 @@ + - - - - + + + - + @@ -76,8 +76,8 @@ - id, compete_time_id, project_id, site_order_id, chief_judgment_score, judgment_a_score, - judgment_b_score2, should_times, deduct_times, deduct_cause, final_score, created_at, + id, should_times, compete_time_id, project_id, site_order_id, chief_judgment_score, + judgment_a_score, judgment_b_score2, deduct_times, deduct_cause, final_score, created_at, updated_at, rec_status - select from t_compete_count_score where id = #{id,jdbcType=BIGINT} + and should_times = #{shouldTimes,jdbcType=INTEGER} - + delete from t_compete_count_score where id = #{id,jdbcType=BIGINT} + and should_times = #{shouldTimes,jdbcType=INTEGER} delete from t_compete_count_score @@ -111,15 +113,15 @@ - insert into t_compete_count_score (id, compete_time_id, project_id, - site_order_id, chief_judgment_score, judgment_a_score, - judgment_b_score2, should_times, deduct_times, + insert into t_compete_count_score (id, should_times, compete_time_id, + project_id, site_order_id, chief_judgment_score, + judgment_a_score, judgment_b_score2, deduct_times, deduct_cause, final_score, created_at, updated_at, rec_status) - values (#{id,jdbcType=BIGINT}, #{competeTimeId,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, - #{siteOrderId,jdbcType=BIGINT}, #{chiefJudgmentScore,jdbcType=BIGINT}, #{judgmentAScore,jdbcType=INTEGER}, - #{judgmentBScore2,jdbcType=INTEGER}, #{shouldTimes,jdbcType=INTEGER}, #{deductTimes,jdbcType=INTEGER}, - #{deductCause,jdbcType=VARCHAR}, #{finalScore,jdbcType=INTEGER}, #{createdAt,jdbcType=TIMESTAMP}, + values (#{id,jdbcType=BIGINT}, #{shouldTimes,jdbcType=INTEGER}, #{competeTimeId,jdbcType=BIGINT}, + #{projectId,jdbcType=BIGINT}, #{siteOrderId,jdbcType=BIGINT}, #{chiefJudgmentScore,jdbcType=DECIMAL}, + #{judgmentAScore,jdbcType=DECIMAL}, #{judgmentBScore2,jdbcType=DECIMAL}, #{deductTimes,jdbcType=INTEGER}, + #{deductCause,jdbcType=VARCHAR}, #{finalScore,jdbcType=DECIMAL}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) @@ -128,6 +130,9 @@ id, + + should_times, + compete_time_id, @@ -146,9 +151,6 @@ judgment_b_score2, - - should_times, - deduct_times, @@ -172,6 +174,9 @@ #{id,jdbcType=BIGINT}, + + #{shouldTimes,jdbcType=INTEGER}, + #{competeTimeId,jdbcType=BIGINT}, @@ -182,16 +187,13 @@ #{siteOrderId,jdbcType=BIGINT}, - #{chiefJudgmentScore,jdbcType=BIGINT}, + #{chiefJudgmentScore,jdbcType=DECIMAL}, - #{judgmentAScore,jdbcType=INTEGER}, + #{judgmentAScore,jdbcType=DECIMAL}, - #{judgmentBScore2,jdbcType=INTEGER}, - - - #{shouldTimes,jdbcType=INTEGER}, + #{judgmentBScore2,jdbcType=DECIMAL}, #{deductTimes,jdbcType=INTEGER}, @@ -200,7 +202,7 @@ #{deductCause,jdbcType=VARCHAR}, - #{finalScore,jdbcType=INTEGER}, + #{finalScore,jdbcType=DECIMAL}, #{createdAt,jdbcType=TIMESTAMP}, @@ -225,6 +227,9 @@ id = #{record.id,jdbcType=BIGINT}, + + should_times = #{record.shouldTimes,jdbcType=INTEGER}, + compete_time_id = #{record.competeTimeId,jdbcType=BIGINT}, @@ -235,16 +240,13 @@ site_order_id = #{record.siteOrderId,jdbcType=BIGINT}, - chief_judgment_score = #{record.chiefJudgmentScore,jdbcType=BIGINT}, + chief_judgment_score = #{record.chiefJudgmentScore,jdbcType=DECIMAL}, - judgment_a_score = #{record.judgmentAScore,jdbcType=INTEGER}, + judgment_a_score = #{record.judgmentAScore,jdbcType=DECIMAL}, - judgment_b_score2 = #{record.judgmentBScore2,jdbcType=INTEGER}, - - - should_times = #{record.shouldTimes,jdbcType=INTEGER}, + judgment_b_score2 = #{record.judgmentBScore2,jdbcType=DECIMAL}, deduct_times = #{record.deductTimes,jdbcType=INTEGER}, @@ -253,7 +255,7 @@ deduct_cause = #{record.deductCause,jdbcType=VARCHAR}, - final_score = #{record.finalScore,jdbcType=INTEGER}, + final_score = #{record.finalScore,jdbcType=DECIMAL}, created_at = #{record.createdAt,jdbcType=TIMESTAMP}, @@ -272,16 +274,16 @@ update t_compete_count_score set id = #{record.id,jdbcType=BIGINT}, + should_times = #{record.shouldTimes,jdbcType=INTEGER}, compete_time_id = #{record.competeTimeId,jdbcType=BIGINT}, project_id = #{record.projectId,jdbcType=BIGINT}, site_order_id = #{record.siteOrderId,jdbcType=BIGINT}, - chief_judgment_score = #{record.chiefJudgmentScore,jdbcType=BIGINT}, - judgment_a_score = #{record.judgmentAScore,jdbcType=INTEGER}, - judgment_b_score2 = #{record.judgmentBScore2,jdbcType=INTEGER}, - should_times = #{record.shouldTimes,jdbcType=INTEGER}, + chief_judgment_score = #{record.chiefJudgmentScore,jdbcType=DECIMAL}, + judgment_a_score = #{record.judgmentAScore,jdbcType=DECIMAL}, + judgment_b_score2 = #{record.judgmentBScore2,jdbcType=DECIMAL}, deduct_times = #{record.deductTimes,jdbcType=INTEGER}, deduct_cause = #{record.deductCause,jdbcType=VARCHAR}, - final_score = #{record.finalScore,jdbcType=INTEGER}, + final_score = #{record.finalScore,jdbcType=DECIMAL}, created_at = #{record.createdAt,jdbcType=TIMESTAMP}, updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, rec_status = #{record.recStatus,jdbcType=TINYINT} @@ -302,16 +304,13 @@ site_order_id = #{siteOrderId,jdbcType=BIGINT}, - chief_judgment_score = #{chiefJudgmentScore,jdbcType=BIGINT}, + chief_judgment_score = #{chiefJudgmentScore,jdbcType=DECIMAL}, - judgment_a_score = #{judgmentAScore,jdbcType=INTEGER}, + judgment_a_score = #{judgmentAScore,jdbcType=DECIMAL}, - judgment_b_score2 = #{judgmentBScore2,jdbcType=INTEGER}, - - - should_times = #{shouldTimes,jdbcType=INTEGER}, + judgment_b_score2 = #{judgmentBScore2,jdbcType=DECIMAL}, deduct_times = #{deductTimes,jdbcType=INTEGER}, @@ -320,7 +319,7 @@ deduct_cause = #{deductCause,jdbcType=VARCHAR}, - final_score = #{finalScore,jdbcType=INTEGER}, + final_score = #{finalScore,jdbcType=DECIMAL}, created_at = #{createdAt,jdbcType=TIMESTAMP}, @@ -333,22 +332,23 @@ where id = #{id,jdbcType=BIGINT} + and should_times = #{shouldTimes,jdbcType=INTEGER} update t_compete_count_score set compete_time_id = #{competeTimeId,jdbcType=BIGINT}, project_id = #{projectId,jdbcType=BIGINT}, site_order_id = #{siteOrderId,jdbcType=BIGINT}, - chief_judgment_score = #{chiefJudgmentScore,jdbcType=BIGINT}, - judgment_a_score = #{judgmentAScore,jdbcType=INTEGER}, - judgment_b_score2 = #{judgmentBScore2,jdbcType=INTEGER}, - should_times = #{shouldTimes,jdbcType=INTEGER}, + chief_judgment_score = #{chiefJudgmentScore,jdbcType=DECIMAL}, + judgment_a_score = #{judgmentAScore,jdbcType=DECIMAL}, + judgment_b_score2 = #{judgmentBScore2,jdbcType=DECIMAL}, deduct_times = #{deductTimes,jdbcType=INTEGER}, deduct_cause = #{deductCause,jdbcType=VARCHAR}, - final_score = #{finalScore,jdbcType=INTEGER}, + final_score = #{finalScore,jdbcType=DECIMAL}, created_at = #{createdAt,jdbcType=TIMESTAMP}, updated_at = #{updatedAt,jdbcType=TIMESTAMP}, rec_status = #{recStatus,jdbcType=TINYINT} where id = #{id,jdbcType=BIGINT} + and should_times = #{shouldTimes,jdbcType=INTEGER} \ No newline at end of file diff --git a/mt/src/main/resources/mapper_raw/CompeteVarietyScoreMapper.xml b/mt/src/main/resources/mapper_raw/CompeteVarietyScoreMapper.xml index 12ac81e2..f4b26c7c 100644 --- a/mt/src/main/resources/mapper_raw/CompeteVarietyScoreMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompeteVarietyScoreMapper.xml @@ -7,7 +7,7 @@ - + @@ -111,7 +111,7 @@ judgment_id, created_at, updated_at, rec_status) values (#{id,jdbcType=BIGINT}, #{competeTimeId,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, - #{siteOrderId,jdbcType=BIGINT}, #{code,jdbcType=VARCHAR}, #{score,jdbcType=INTEGER}, + #{siteOrderId,jdbcType=BIGINT}, #{code,jdbcType=VARCHAR}, #{score,jdbcType=DECIMAL}, #{judgmentId,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) @@ -166,7 +166,7 @@ #{code,jdbcType=VARCHAR}, - #{score,jdbcType=INTEGER}, + #{score,jdbcType=DECIMAL}, #{judgmentId,jdbcType=BIGINT}, @@ -207,7 +207,7 @@ code = #{record.code,jdbcType=VARCHAR}, - score = #{record.score,jdbcType=INTEGER}, + score = #{record.score,jdbcType=DECIMAL}, judgment_id = #{record.judgmentId,jdbcType=BIGINT}, @@ -233,7 +233,7 @@ project_id = #{record.projectId,jdbcType=BIGINT}, site_order_id = #{record.siteOrderId,jdbcType=BIGINT}, code = #{record.code,jdbcType=VARCHAR}, - score = #{record.score,jdbcType=INTEGER}, + score = #{record.score,jdbcType=DECIMAL}, judgment_id = #{record.judgmentId,jdbcType=BIGINT}, created_at = #{record.createdAt,jdbcType=TIMESTAMP}, updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, @@ -258,7 +258,7 @@ code = #{code,jdbcType=VARCHAR}, - score = #{score,jdbcType=INTEGER}, + score = #{score,jdbcType=DECIMAL}, judgment_id = #{judgmentId,jdbcType=BIGINT}, @@ -281,7 +281,7 @@ project_id = #{projectId,jdbcType=BIGINT}, site_order_id = #{siteOrderId,jdbcType=BIGINT}, code = #{code,jdbcType=VARCHAR}, - score = #{score,jdbcType=INTEGER}, + score = #{score,jdbcType=DECIMAL}, judgment_id = #{judgmentId,jdbcType=BIGINT}, created_at = #{createdAt,jdbcType=TIMESTAMP}, updated_at = #{updatedAt,jdbcType=TIMESTAMP}, From 7f7131c3461c59b0c654ca87038cfa50a5c73a4d Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Fri, 13 Nov 2020 19:32:13 +0800 Subject: [PATCH 26/80] 11-13-2 --- .../ccsens/mt/api/CompeteScoreController.java | 32 ++- .../com/ccsens/mt/bean/dto/CompeteDto.java | 36 +++- .../ccsens/mt/bean/po/CompeteCountScore.java | 49 ++--- .../mt/bean/po/CompeteCountScoreExample.java | 201 +++++++++--------- .../mt/bean/po/CompeteCountScoreKey.java | 39 ++++ .../mt/bean/po/CompeteVarietyScore.java | 7 +- .../bean/po/CompeteVarietyScoreExample.java | 21 +- .../com/ccsens/mt/bean/vo/CompeteExcelVo.java | 2 + .../java/com/ccsens/mt/bean/vo/ScoreVo.java | 46 ++++ .../mt/persist/dao/CompeteScoreDao.java | 27 +++ .../mapper/CompeteCountScoreMapper.java | 5 +- .../com/ccsens/mt/service/CompeteService.java | 68 +++++- .../ccsens/mt/service/ICompeteService.java | 19 +- .../resources/mapper_dao/CompeteScoreDao.xml | 109 ++++++++++ .../mapper_raw/CompeteCountScoreMapper.xml | 100 ++++----- .../mapper_raw/CompeteVarietyScoreMapper.xml | 14 +- 16 files changed, 551 insertions(+), 224 deletions(-) create mode 100644 mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreKey.java create mode 100644 mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java create mode 100644 mt/src/main/resources/mapper_dao/CompeteScoreDao.xml diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java index 22580346..638a6180 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java @@ -3,6 +3,7 @@ package com.ccsens.mt.api; import com.ccsens.cloudutil.annotation.MustLogin; import com.ccsens.mt.bean.dto.CompeteDto; import com.ccsens.mt.bean.vo.CompeteVo; +import com.ccsens.mt.bean.vo.ScoreVo; import com.ccsens.mt.service.ICompeteService; import com.ccsens.util.JsonResponse; import com.ccsens.util.bean.dto.QueryDto; @@ -40,8 +41,8 @@ public class CompeteScoreController { } @MustLogin - @ApiOperation(value = "计数赛查看当前场次的分数信息（轮询）", notes = "") - @RequestMapping(value = "countScore", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + @ApiOperation(value = "项目状态", notes = "") + @RequestMapping(value = "/countScore", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse countScore(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查询比赛项目上的参赛选手列表：{}",params); List countScoreList = competeService.countScore(params.getParam()); @@ -49,13 +50,30 @@ public class CompeteScoreController { } @MustLogin - @ApiOperation(value = "计数赛查看当前场次的分数信息（轮询）", notes = "") - @RequestMapping(value = "countScoreDetail", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse countScoreDetail(@ApiParam @Validated @RequestBody QueryDto params) { + @ApiOperation(value = "选手排名", notes = "") + @RequestMapping(value = "/countScoreDetail", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse countScoreDetail(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查询比赛项目上的参赛选手列表：{}",params); - competeService.countScoreDetail(params.getParam()); - return JsonResponse.newInstance().ok(); + List competeScores = competeService.countScoreDetail(params.getParam()); + return JsonResponse.newInstance().ok(competeScores); + } + + @MustLogin + @ApiOperation(value = "计数赛查看当前场次的分数信息", notes = "") + @RequestMapping(value = "/countScoreCurrentSite", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse countScoreCurrentSite(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("查询比赛项目上的参赛选手列表：{}",params); + List countScoreCurrentSites = competeService.countScoreCurrentSite(params.getParam()); + return JsonResponse.newInstance().ok(countScoreCurrentSites); } + @MustLogin + @ApiOperation(value = "技术赛提交分数", notes = "") + @RequestMapping(value = "/submitScore", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse submitScore(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("查询比赛项目上的参赛选手列表：{}",params); + competeService.submitScore(params.getParam()); + return JsonResponse.newInstance().ok(); + } } diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java index 2127cac3..74adc31b 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java @@ -6,6 +6,7 @@ import lombok.Data; import lombok.NonNull; import javax.validation.constraints.*; +import java.math.BigDecimal; import java.util.List; /** @@ -21,6 +22,14 @@ public class CompeteDto { private int type; } + @Data + @ApiModel + public static class CompeteSite{ + @NotNull + @ApiModelProperty("场次id") + private int siteId; + } + @Data @ApiModel public static class CompeteTime{ @@ -331,7 +340,32 @@ public class CompeteDto { @ApiModelProperty("项目id") private Long projectId; @ApiModelProperty("组别id") - private Long groupId; + private Long competeGroupId; + } + + @Data + @ApiModel("提交分数") + public static class SubmitScore{ + @ApiModelProperty("项目id") + private Long projectId; + @ApiModelProperty("大赛id") + private Long competeTimeId; + @ApiModelProperty("场次id") + private Long siteOrderId; + @ApiModelProperty("主裁打分") + private BigDecimal mainScore; + @ApiModelProperty("主裁1打分") + private BigDecimal mainOneScore; + @ApiModelProperty("主裁2打分") + private BigDecimal mainTwoScore; + @ApiModelProperty("应得分") + private int shouldScore; + @ApiModelProperty("扣除次数") + private int deductTime; + @ApiModelProperty("扣除原因") + private String deductReason; + @ApiModelProperty("最终成绩") + private BigDecimal finalScore; } diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScore.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScore.java index d06a7d6b..d89e1feb 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScore.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScore.java @@ -1,30 +1,27 @@ package com.ccsens.mt.bean.po; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; -public class CompeteCountScore implements Serializable { - private Long id; - +public class CompeteCountScore extends CompeteCountScoreKey implements Serializable { private Long competeTimeId; private Long projectId; private Long siteOrderId; - private Long chiefJudgmentScore; - - private Integer judgmentAScore; + private BigDecimal chiefJudgmentScore; - private Integer judgmentBScore2; + private BigDecimal judgmentAScore; - private Integer shouldTimes; + private BigDecimal judgmentBScore2; private Integer deductTimes; private String deductCause; - private Integer finalScore; + private BigDecimal finalScore; private Date createdAt; @@ -34,14 +31,6 @@ public class CompeteCountScore implements Serializable { private static final long serialVersionUID = 1L; - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - public Long getCompeteTimeId() { return competeTimeId; } @@ -66,38 +55,30 @@ public class CompeteCountScore implements Serializable { this.siteOrderId = siteOrderId; } - public Long getChiefJudgmentScore() { + public BigDecimal getChiefJudgmentScore() { return chiefJudgmentScore; } - public void setChiefJudgmentScore(Long chiefJudgmentScore) { + public void setChiefJudgmentScore(BigDecimal chiefJudgmentScore) { this.chiefJudgmentScore = chiefJudgmentScore; } - public Integer getJudgmentAScore() { + public BigDecimal getJudgmentAScore() { return judgmentAScore; } - public void setJudgmentAScore(Integer judgmentAScore) { + public void setJudgmentAScore(BigDecimal judgmentAScore) { this.judgmentAScore = judgmentAScore; } - public Integer getJudgmentBScore2() { + public BigDecimal getJudgmentBScore2() { return judgmentBScore2; } - public void setJudgmentBScore2(Integer judgmentBScore2) { + public void setJudgmentBScore2(BigDecimal judgmentBScore2) { this.judgmentBScore2 = judgmentBScore2; } - public Integer getShouldTimes() { - return shouldTimes; - } - - public void setShouldTimes(Integer shouldTimes) { - this.shouldTimes = shouldTimes; - } - public Integer getDeductTimes() { return deductTimes; } @@ -114,11 +95,11 @@ public class CompeteCountScore implements Serializable { this.deductCause = deductCause == null ? null : deductCause.trim(); } - public Integer getFinalScore() { + public BigDecimal getFinalScore() { return finalScore; } - public void setFinalScore(Integer finalScore) { + public void setFinalScore(BigDecimal finalScore) { this.finalScore = finalScore; } @@ -152,14 +133,12 @@ public class CompeteCountScore implements Serializable { sb.append(getClass().getSimpleName()); sb.append(" ["); sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); sb.append(", competeTimeId=").append(competeTimeId); sb.append(", projectId=").append(projectId); sb.append(", siteOrderId=").append(siteOrderId); sb.append(", chiefJudgmentScore=").append(chiefJudgmentScore); sb.append(", judgmentAScore=").append(judgmentAScore); sb.append(", judgmentBScore2=").append(judgmentBScore2); - sb.append(", shouldTimes=").append(shouldTimes); sb.append(", deductTimes=").append(deductTimes); sb.append(", deductCause=").append(deductCause); sb.append(", finalScore=").append(finalScore); diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreExample.java index d5ff54db..c72f3961 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreExample.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreExample.java @@ -1,5 +1,6 @@ package com.ccsens.mt.bean.po; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -165,6 +166,66 @@ public class CompeteCountScoreExample { return (Criteria) this; } + public Criteria andShouldTimesIsNull() { + addCriterion("should_times is null"); + return (Criteria) this; + } + + public Criteria andShouldTimesIsNotNull() { + addCriterion("should_times is not null"); + return (Criteria) this; + } + + public Criteria andShouldTimesEqualTo(Integer value) { + addCriterion("should_times =", value, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesNotEqualTo(Integer value) { + addCriterion("should_times <>", value, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesGreaterThan(Integer value) { + addCriterion("should_times >", value, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesGreaterThanOrEqualTo(Integer value) { + addCriterion("should_times >=", value, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesLessThan(Integer value) { + addCriterion("should_times <", value, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesLessThanOrEqualTo(Integer value) { + addCriterion("should_times <=", value, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesIn(List values) { + addCriterion("should_times in", values, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesNotIn(List values) { + addCriterion("should_times not in", values, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesBetween(Integer value1, Integer value2) { + addCriterion("should_times between", value1, value2, "shouldTimes"); + return (Criteria) this; + } + + public Criteria andShouldTimesNotBetween(Integer value1, Integer value2) { + addCriterion("should_times not between", value1, value2, "shouldTimes"); + return (Criteria) this; + } + public Criteria andCompeteTimeIdIsNull() { addCriterion("compete_time_id is null"); return (Criteria) this; @@ -355,52 +416,52 @@ public class CompeteCountScoreExample { return (Criteria) this; } - public Criteria andChiefJudgmentScoreEqualTo(Long value) { + public Criteria andChiefJudgmentScoreEqualTo(BigDecimal value) { addCriterion("chief_judgment_score =", value, "chiefJudgmentScore"); return (Criteria) this; } - public Criteria andChiefJudgmentScoreNotEqualTo(Long value) { + public Criteria andChiefJudgmentScoreNotEqualTo(BigDecimal value) { addCriterion("chief_judgment_score <>", value, "chiefJudgmentScore"); return (Criteria) this; } - public Criteria andChiefJudgmentScoreGreaterThan(Long value) { + public Criteria andChiefJudgmentScoreGreaterThan(BigDecimal value) { addCriterion("chief_judgment_score >", value, "chiefJudgmentScore"); return (Criteria) this; } - public Criteria andChiefJudgmentScoreGreaterThanOrEqualTo(Long value) { + public Criteria andChiefJudgmentScoreGreaterThanOrEqualTo(BigDecimal value) { addCriterion("chief_judgment_score >=", value, "chiefJudgmentScore"); return (Criteria) this; } - public Criteria andChiefJudgmentScoreLessThan(Long value) { + public Criteria andChiefJudgmentScoreLessThan(BigDecimal value) { addCriterion("chief_judgment_score <", value, "chiefJudgmentScore"); return (Criteria) this; } - public Criteria andChiefJudgmentScoreLessThanOrEqualTo(Long value) { + public Criteria andChiefJudgmentScoreLessThanOrEqualTo(BigDecimal value) { addCriterion("chief_judgment_score <=", value, "chiefJudgmentScore"); return (Criteria) this; } - public Criteria andChiefJudgmentScoreIn(List values) { + public Criteria andChiefJudgmentScoreIn(List values) { addCriterion("chief_judgment_score in", values, "chiefJudgmentScore"); return (Criteria) this; } - public Criteria andChiefJudgmentScoreNotIn(List values) { + public Criteria andChiefJudgmentScoreNotIn(List values) { addCriterion("chief_judgment_score not in", values, "chiefJudgmentScore"); return (Criteria) this; } - public Criteria andChiefJudgmentScoreBetween(Long value1, Long value2) { + public Criteria andChiefJudgmentScoreBetween(BigDecimal value1, BigDecimal value2) { addCriterion("chief_judgment_score between", value1, value2, "chiefJudgmentScore"); return (Criteria) this; } - public Criteria andChiefJudgmentScoreNotBetween(Long value1, Long value2) { + public Criteria andChiefJudgmentScoreNotBetween(BigDecimal value1, BigDecimal value2) { addCriterion("chief_judgment_score not between", value1, value2, "chiefJudgmentScore"); return (Criteria) this; } @@ -415,52 +476,52 @@ public class CompeteCountScoreExample { return (Criteria) this; } - public Criteria andJudgmentAScoreEqualTo(Integer value) { + public Criteria andJudgmentAScoreEqualTo(BigDecimal value) { addCriterion("judgment_a_score =", value, "judgmentAScore"); return (Criteria) this; } - public Criteria andJudgmentAScoreNotEqualTo(Integer value) { + public Criteria andJudgmentAScoreNotEqualTo(BigDecimal value) { addCriterion("judgment_a_score <>", value, "judgmentAScore"); return (Criteria) this; } - public Criteria andJudgmentAScoreGreaterThan(Integer value) { + public Criteria andJudgmentAScoreGreaterThan(BigDecimal value) { addCriterion("judgment_a_score >", value, "judgmentAScore"); return (Criteria) this; } - public Criteria andJudgmentAScoreGreaterThanOrEqualTo(Integer value) { + public Criteria andJudgmentAScoreGreaterThanOrEqualTo(BigDecimal value) { addCriterion("judgment_a_score >=", value, "judgmentAScore"); return (Criteria) this; } - public Criteria andJudgmentAScoreLessThan(Integer value) { + public Criteria andJudgmentAScoreLessThan(BigDecimal value) { addCriterion("judgment_a_score <", value, "judgmentAScore"); return (Criteria) this; } - public Criteria andJudgmentAScoreLessThanOrEqualTo(Integer value) { + public Criteria andJudgmentAScoreLessThanOrEqualTo(BigDecimal value) { addCriterion("judgment_a_score <=", value, "judgmentAScore"); return (Criteria) this; } - public Criteria andJudgmentAScoreIn(List values) { + public Criteria andJudgmentAScoreIn(List values) { addCriterion("judgment_a_score in", values, "judgmentAScore"); return (Criteria) this; } - public Criteria andJudgmentAScoreNotIn(List values) { + public Criteria andJudgmentAScoreNotIn(List values) { addCriterion("judgment_a_score not in", values, "judgmentAScore"); return (Criteria) this; } - public Criteria andJudgmentAScoreBetween(Integer value1, Integer value2) { + public Criteria andJudgmentAScoreBetween(BigDecimal value1, BigDecimal value2) { addCriterion("judgment_a_score between", value1, value2, "judgmentAScore"); return (Criteria) this; } - public Criteria andJudgmentAScoreNotBetween(Integer value1, Integer value2) { + public Criteria andJudgmentAScoreNotBetween(BigDecimal value1, BigDecimal value2) { addCriterion("judgment_a_score not between", value1, value2, "judgmentAScore"); return (Criteria) this; } @@ -475,116 +536,56 @@ public class CompeteCountScoreExample { return (Criteria) this; } - public Criteria andJudgmentBScore2EqualTo(Integer value) { + public Criteria andJudgmentBScore2EqualTo(BigDecimal value) { addCriterion("judgment_b_score2 =", value, "judgmentBScore2"); return (Criteria) this; } - public Criteria andJudgmentBScore2NotEqualTo(Integer value) { + public Criteria andJudgmentBScore2NotEqualTo(BigDecimal value) { addCriterion("judgment_b_score2 <>", value, "judgmentBScore2"); return (Criteria) this; } - public Criteria andJudgmentBScore2GreaterThan(Integer value) { + public Criteria andJudgmentBScore2GreaterThan(BigDecimal value) { addCriterion("judgment_b_score2 >", value, "judgmentBScore2"); return (Criteria) this; } - public Criteria andJudgmentBScore2GreaterThanOrEqualTo(Integer value) { + public Criteria andJudgmentBScore2GreaterThanOrEqualTo(BigDecimal value) { addCriterion("judgment_b_score2 >=", value, "judgmentBScore2"); return (Criteria) this; } - public Criteria andJudgmentBScore2LessThan(Integer value) { + public Criteria andJudgmentBScore2LessThan(BigDecimal value) { addCriterion("judgment_b_score2 <", value, "judgmentBScore2"); return (Criteria) this; } - public Criteria andJudgmentBScore2LessThanOrEqualTo(Integer value) { + public Criteria andJudgmentBScore2LessThanOrEqualTo(BigDecimal value) { addCriterion("judgment_b_score2 <=", value, "judgmentBScore2"); return (Criteria) this; } - public Criteria andJudgmentBScore2In(List values) { + public Criteria andJudgmentBScore2In(List values) { addCriterion("judgment_b_score2 in", values, "judgmentBScore2"); return (Criteria) this; } - public Criteria andJudgmentBScore2NotIn(List values) { + public Criteria andJudgmentBScore2NotIn(List values) { addCriterion("judgment_b_score2 not in", values, "judgmentBScore2"); return (Criteria) this; } - public Criteria andJudgmentBScore2Between(Integer value1, Integer value2) { + public Criteria andJudgmentBScore2Between(BigDecimal value1, BigDecimal value2) { addCriterion("judgment_b_score2 between", value1, value2, "judgmentBScore2"); return (Criteria) this; } - public Criteria andJudgmentBScore2NotBetween(Integer value1, Integer value2) { + public Criteria andJudgmentBScore2NotBetween(BigDecimal value1, BigDecimal value2) { addCriterion("judgment_b_score2 not between", value1, value2, "judgmentBScore2"); return (Criteria) this; } - public Criteria andShouldTimesIsNull() { - addCriterion("should_times is null"); - return (Criteria) this; - } - - public Criteria andShouldTimesIsNotNull() { - addCriterion("should_times is not null"); - return (Criteria) this; - } - - public Criteria andShouldTimesEqualTo(Integer value) { - addCriterion("should_times =", value, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesNotEqualTo(Integer value) { - addCriterion("should_times <>", value, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesGreaterThan(Integer value) { - addCriterion("should_times >", value, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesGreaterThanOrEqualTo(Integer value) { - addCriterion("should_times >=", value, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesLessThan(Integer value) { - addCriterion("should_times <", value, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesLessThanOrEqualTo(Integer value) { - addCriterion("should_times <=", value, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesIn(List values) { - addCriterion("should_times in", values, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesNotIn(List values) { - addCriterion("should_times not in", values, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesBetween(Integer value1, Integer value2) { - addCriterion("should_times between", value1, value2, "shouldTimes"); - return (Criteria) this; - } - - public Criteria andShouldTimesNotBetween(Integer value1, Integer value2) { - addCriterion("should_times not between", value1, value2, "shouldTimes"); - return (Criteria) this; - } - public Criteria andDeductTimesIsNull() { addCriterion("deduct_times is null"); return (Criteria) this; @@ -725,52 +726,52 @@ public class CompeteCountScoreExample { return (Criteria) this; } - public Criteria andFinalScoreEqualTo(Integer value) { + public Criteria andFinalScoreEqualTo(BigDecimal value) { addCriterion("final_score =", value, "finalScore"); return (Criteria) this; } - public Criteria andFinalScoreNotEqualTo(Integer value) { + public Criteria andFinalScoreNotEqualTo(BigDecimal value) { addCriterion("final_score <>", value, "finalScore"); return (Criteria) this; } - public Criteria andFinalScoreGreaterThan(Integer value) { + public Criteria andFinalScoreGreaterThan(BigDecimal value) { addCriterion("final_score >", value, "finalScore"); return (Criteria) this; } - public Criteria andFinalScoreGreaterThanOrEqualTo(Integer value) { + public Criteria andFinalScoreGreaterThanOrEqualTo(BigDecimal value) { addCriterion("final_score >=", value, "finalScore"); return (Criteria) this; } - public Criteria andFinalScoreLessThan(Integer value) { + public Criteria andFinalScoreLessThan(BigDecimal value) { addCriterion("final_score <", value, "finalScore"); return (Criteria) this; } - public Criteria andFinalScoreLessThanOrEqualTo(Integer value) { + public Criteria andFinalScoreLessThanOrEqualTo(BigDecimal value) { addCriterion("final_score <=", value, "finalScore"); return (Criteria) this; } - public Criteria andFinalScoreIn(List values) { + public Criteria andFinalScoreIn(List values) { addCriterion("final_score in", values, "finalScore"); return (Criteria) this; } - public Criteria andFinalScoreNotIn(List values) { + public Criteria andFinalScoreNotIn(List values) { addCriterion("final_score not in", values, "finalScore"); return (Criteria) this; } - public Criteria andFinalScoreBetween(Integer value1, Integer value2) { + public Criteria andFinalScoreBetween(BigDecimal value1, BigDecimal value2) { addCriterion("final_score between", value1, value2, "finalScore"); return (Criteria) this; } - public Criteria andFinalScoreNotBetween(Integer value1, Integer value2) { + public Criteria andFinalScoreNotBetween(BigDecimal value1, BigDecimal value2) { addCriterion("final_score not between", value1, value2, "finalScore"); return (Criteria) this; } diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreKey.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreKey.java new file mode 100644 index 00000000..b1b31911 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreKey.java @@ -0,0 +1,39 @@ +package com.ccsens.mt.bean.po; + +import java.io.Serializable; + +public class CompeteCountScoreKey implements Serializable { + private Long id; + + private Integer shouldTimes; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Integer getShouldTimes() { + return shouldTimes; + } + + public void setShouldTimes(Integer shouldTimes) { + this.shouldTimes = shouldTimes; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", shouldTimes=").append(shouldTimes); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScore.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScore.java index 9fa53c5a..e264a762 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScore.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScore.java @@ -1,6 +1,7 @@ package com.ccsens.mt.bean.po; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; public class CompeteVarietyScore implements Serializable { @@ -14,7 +15,7 @@ public class CompeteVarietyScore implements Serializable { private String code; - private Integer score; + private BigDecimal score; private Long judgmentId; @@ -66,11 +67,11 @@ public class CompeteVarietyScore implements Serializable { this.code = code == null ? null : code.trim(); } - public Integer getScore() { + public BigDecimal getScore() { return score; } - public void setScore(Integer score) { + public void setScore(BigDecimal score) { this.score = score; } diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScoreExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScoreExample.java index 05ddc769..633c6a56 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScoreExample.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScoreExample.java @@ -1,5 +1,6 @@ package com.ccsens.mt.bean.po; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -425,52 +426,52 @@ public class CompeteVarietyScoreExample { return (Criteria) this; } - public Criteria andScoreEqualTo(Integer value) { + public Criteria andScoreEqualTo(BigDecimal value) { addCriterion("score =", value, "score"); return (Criteria) this; } - public Criteria andScoreNotEqualTo(Integer value) { + public Criteria andScoreNotEqualTo(BigDecimal value) { addCriterion("score <>", value, "score"); return (Criteria) this; } - public Criteria andScoreGreaterThan(Integer value) { + public Criteria andScoreGreaterThan(BigDecimal value) { addCriterion("score >", value, "score"); return (Criteria) this; } - public Criteria andScoreGreaterThanOrEqualTo(Integer value) { + public Criteria andScoreGreaterThanOrEqualTo(BigDecimal value) { addCriterion("score >=", value, "score"); return (Criteria) this; } - public Criteria andScoreLessThan(Integer value) { + public Criteria andScoreLessThan(BigDecimal value) { addCriterion("score <", value, "score"); return (Criteria) this; } - public Criteria andScoreLessThanOrEqualTo(Integer value) { + public Criteria andScoreLessThanOrEqualTo(BigDecimal value) { addCriterion("score <=", value, "score"); return (Criteria) this; } - public Criteria andScoreIn(List values) { + public Criteria andScoreIn(List values) { addCriterion("score in", values, "score"); return (Criteria) this; } - public Criteria andScoreNotIn(List values) { + public Criteria andScoreNotIn(List values) { addCriterion("score not in", values, "score"); return (Criteria) this; } - public Criteria andScoreBetween(Integer value1, Integer value2) { + public Criteria andScoreBetween(BigDecimal value1, BigDecimal value2) { addCriterion("score between", value1, value2, "score"); return (Criteria) this; } - public Criteria andScoreNotBetween(Integer value1, Integer value2) { + public Criteria andScoreNotBetween(BigDecimal value1, BigDecimal value2) { addCriterion("score not between", value1, value2, "score"); return (Criteria) this; } diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteExcelVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteExcelVo.java index 84e8bb67..cacad4d0 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteExcelVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteExcelVo.java @@ -59,4 +59,6 @@ public class CompeteExcelVo { @ApiModelProperty("月/日 上/下午") private String year; } + + } diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/ScoreVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/ScoreVo.java index a2a9404d..6372cc6a 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/ScoreVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/ScoreVo.java @@ -179,4 +179,50 @@ public class ScoreVo { // @ApiModelProperty("平均分") // private BigDecimal aveScore; // } + + @Data + @ApiModel("返回项目配置信息") + public static class CompeteScore{ + @ApiModelProperty("参赛id") + private Long projectId; + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("参赛队伍") + private String companyName; + @ApiModelProperty("得分") + private String score; + } + + + @Data + @ApiModel("返回项目配置信息") + public static class CountScoreCurrentSite{ + @ApiModelProperty("项目名") + private String projectName; + @ApiModelProperty("组别") + private String groupName; + @ApiModelProperty("团队名") + private String companyName; + @ApiModelProperty("场次") + private int competeOrder; + @ApiModelProperty("场地") + private int site; + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("主裁打分") + private BigDecimal mainScore; + @ApiModelProperty("主裁1打分") + private BigDecimal mainOneScore; + @ApiModelProperty("主裁2打分") + private BigDecimal mainTwoScore; + @ApiModelProperty("应得分") + private BigDecimal shouldScore; + @ApiModelProperty("扣除次数") + private BigDecimal deductTime; + @ApiModelProperty("扣除原因") + private String deductReason; + @ApiModelProperty("最终成绩") + private BigDecimal finalScore; + } + } diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java new file mode 100644 index 00000000..828dae59 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java @@ -0,0 +1,27 @@ +package com.ccsens.mt.persist.dao; + +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.bean.vo.ScoreVo; +import com.ccsens.mt.persist.mapper.CompeteCompanyMapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * @author 逗 + */ +@Repository +public interface CompeteScoreDao { + List selectSingleCount (@Param("projectId") long projectId,@Param("competeGroupId") long competeGroupId); + List selectGroupCount (@Param("projectId") long projectId,@Param("competeGroupId") long competeGroupId); + List selectSingleVarity(@Param("projectId") long projectId,@Param("competeGroupId") long competeGroupId); + List selectGroupVarity (@Param("projectId") long projectId,@Param("competeGroupId") long competeGroupId); + List selectCountScoreCurrentSite (@Param("siteId") long siteId); + + +} diff --git a/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteCountScoreMapper.java b/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteCountScoreMapper.java index faf0e354..5592b7ec 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteCountScoreMapper.java +++ b/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteCountScoreMapper.java @@ -2,6 +2,7 @@ package com.ccsens.mt.persist.mapper; import com.ccsens.mt.bean.po.CompeteCountScore; import com.ccsens.mt.bean.po.CompeteCountScoreExample; +import com.ccsens.mt.bean.po.CompeteCountScoreKey; import java.util.List; import org.apache.ibatis.annotations.Param; @@ -10,7 +11,7 @@ public interface CompeteCountScoreMapper { int deleteByExample(CompeteCountScoreExample example); - int deleteByPrimaryKey(Long id); + int deleteByPrimaryKey(CompeteCountScoreKey key); int insert(CompeteCountScore record); @@ -18,7 +19,7 @@ public interface CompeteCountScoreMapper { List selectByExample(CompeteCountScoreExample example); - CompeteCountScore selectByPrimaryKey(Long id); + CompeteCountScore selectByPrimaryKey(CompeteCountScoreKey key); int updateByExampleSelective(@Param("record") CompeteCountScore record, @Param("example") CompeteCountScoreExample example); diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java index aa5ab32d..5f14e370 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -13,6 +13,7 @@ import com.ccsens.mt.bean.dto.CompeteDto; import com.ccsens.mt.bean.dto.LevelDto; import com.ccsens.mt.bean.po.*; import com.ccsens.mt.bean.vo.CompeteVo; +import com.ccsens.mt.bean.vo.ScoreVo; import com.ccsens.mt.bean.vo.TableVo; import com.ccsens.mt.persist.dao.*; import com.ccsens.mt.persist.mapper.*; @@ -35,6 +36,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.io.*; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -81,6 +83,10 @@ public class CompeteService implements ICompeteService { private CommonFileMapper commonFileMapper; @Resource private CompeteProjectConfigDao competeProjectConfigDao; + @Resource + private CompeteScoreDao competeScoreDao; + @Resource + private CompeteCountScoreMapper competeCountScoreMapper; /** * 查看第几届 */ @@ -1047,31 +1053,77 @@ public class CompeteService implements ICompeteService { } @Override - public List countScoreDetail(CompeteDto.ProjectIdAndGroupId params) { + public List countScoreDetail(CompeteDto.ProjectIdAndGroupId params) { + List competeScoreList = new ArrayList<>(); //判断比赛类型 long ProjectId = params.getProjectId(); - long groupId = params.getGroupId(); + long competeGroupId = params.getCompeteGroupId(); CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(ProjectId); + if (ObjectUtil.isNotNull(competeProject)){ int team = competeProject.getTeam(); long fatherId = competeProject.getParentId(); //如果比赛是个人计数赛 if (fatherId == 2001 && team == 0){ - CompeteProjectPlayerExample competeProjectPlayerExample= new CompeteProjectPlayerExample(); - + List competeScores = competeScoreDao.selectSingleCount(ProjectId, competeGroupId); + competeScoreList.addAll(competeScores); } //如果是个人花样赛 if (fatherId == 2002 && team == 0){ - + List competeScores = competeScoreDao.selectSingleVarity(ProjectId, competeGroupId); + competeScoreList.addAll(competeScores); } //如果是团队计数赛 if (fatherId == 2001 && team == 1){ - + List competeScores = competeScoreDao.selectGroupCount(ProjectId, competeGroupId); + competeScoreList.addAll(competeScores); } //如果是团队花样赛 if (fatherId == 2002 && team == 1){ - + List competeScores = competeScoreDao.selectGroupVarity(ProjectId, competeGroupId); + competeScoreList.addAll(competeScores); + } } - return null; + return competeScoreList; + } + + @Override + public List countScoreCurrentSite(CompeteDto.CompeteSite params) { + int siteId = params.getSiteId(); + List countScoreCurrentSites = competeScoreDao.selectCountScoreCurrentSite(siteId); + return countScoreCurrentSites; + } + + @Override + public void submitScore(CompeteDto.SubmitScore params) { + long competeTimeId = params.getCompeteTimeId(); + long projectId = params.getProjectId(); + long siteOrderId = params.getSiteOrderId(); + CompeteCountScoreExample competeCountScoreExample = new CompeteCountScoreExample(); + competeCountScoreExample.createCriteria(). + andCompeteTimeIdEqualTo(competeTimeId). + andProjectIdEqualTo(projectId).andSiteOrderIdEqualTo(siteOrderId). + andSiteOrderIdEqualTo(params.getSiteOrderId()). + andChiefJudgmentScoreEqualTo(params.getMainScore()). + andJudgmentAScoreEqualTo(params.getMainOneScore()). + andJudgmentBScore2EqualTo(params.getMainTwoScore()). + andShouldTimesEqualTo(params.getShouldScore()). + andDeductTimesEqualTo(params.getDeductTime()). + andDeductCauseEqualTo(params.getDeductReason()). + andFinalScoreEqualTo(params.getFinalScore()). + andIdEqualTo(snowflake.nextId()); + CompeteCountScore competeCountScore = new CompeteCountScore(); + competeCountScore.setCompeteTimeId(competeTimeId); + competeCountScore.setProjectId(projectId); + competeCountScore.setSiteOrderId(siteOrderId); + competeCountScore.setChiefJudgmentScore(params.getMainScore()); + competeCountScore.setJudgmentAScore(params.getMainOneScore()); + competeCountScore.setJudgmentBScore2(params.getMainTwoScore()); + competeCountScore.setShouldTimes(params.getShouldScore()); + competeCountScore.setDeductTimes(params.getDeductTime()); + competeCountScore.setDeductCause(params.getDeductReason()); + competeCountScore.setFinalScore(params.getFinalScore()); + competeCountScore.setId(snowflake.nextId()); + competeCountScoreMapper.insert(competeCountScore); } diff --git a/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java b/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java index eca520a8..c022b0d8 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java @@ -2,6 +2,7 @@ package com.ccsens.mt.service; import com.ccsens.mt.bean.dto.CompeteDto; import com.ccsens.mt.bean.vo.CompeteVo; +import com.ccsens.mt.bean.vo.ScoreVo; import com.ccsens.util.bean.dto.QueryDto; import java.io.FileNotFoundException; @@ -162,7 +163,23 @@ public interface ICompeteService { * @param params 大赛id和比赛项目id * @return 返回项目，开始时间和比赛状态 */ - List countScoreDetail(CompeteDto.ProjectIdAndGroupId params) ; + List countScoreDetail(CompeteDto.ProjectIdAndGroupId params) ; + + /** + * 得分详情 + * @param params 场次id + * @return 返回项目，开始时间和比赛状态 + */ + List countScoreCurrentSite(CompeteDto.CompeteSite params) ; + + /** + * 提交得分 + * @param params 场次id + * @return 返回项目，开始时间和比赛状态 + */ + void submitScore(CompeteDto.SubmitScore params) ; + + } diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml new file mode 100644 index 00000000..a03505c0 --- /dev/null +++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml b/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml index 3fba3694..6f586d68 100644 --- a/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml @@ -3,16 +3,16 @@ + - - - - + + + - + @@ -76,8 +76,8 @@ - id, compete_time_id, project_id, site_order_id, chief_judgment_score, judgment_a_score, - judgment_b_score2, should_times, deduct_times, deduct_cause, final_score, created_at, + id, should_times, compete_time_id, project_id, site_order_id, chief_judgment_score, + judgment_a_score, judgment_b_score2, deduct_times, deduct_cause, final_score, created_at, updated_at, rec_status - select from t_compete_count_score where id = #{id,jdbcType=BIGINT} + and should_times = #{shouldTimes,jdbcType=INTEGER} - + delete from t_compete_count_score where id = #{id,jdbcType=BIGINT} + and should_times = #{shouldTimes,jdbcType=INTEGER} delete from t_compete_count_score @@ -111,15 +113,15 @@ - insert into t_compete_count_score (id, compete_time_id, project_id, - site_order_id, chief_judgment_score, judgment_a_score, - judgment_b_score2, should_times, deduct_times, + insert into t_compete_count_score (id, should_times, compete_time_id, + project_id, site_order_id, chief_judgment_score, + judgment_a_score, judgment_b_score2, deduct_times, deduct_cause, final_score, created_at, updated_at, rec_status) - values (#{id,jdbcType=BIGINT}, #{competeTimeId,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, - #{siteOrderId,jdbcType=BIGINT}, #{chiefJudgmentScore,jdbcType=BIGINT}, #{judgmentAScore,jdbcType=INTEGER}, - #{judgmentBScore2,jdbcType=INTEGER}, #{shouldTimes,jdbcType=INTEGER}, #{deductTimes,jdbcType=INTEGER}, - #{deductCause,jdbcType=VARCHAR}, #{finalScore,jdbcType=INTEGER}, #{createdAt,jdbcType=TIMESTAMP}, + values (#{id,jdbcType=BIGINT}, #{shouldTimes,jdbcType=INTEGER}, #{competeTimeId,jdbcType=BIGINT}, + #{projectId,jdbcType=BIGINT}, #{siteOrderId,jdbcType=BIGINT}, #{chiefJudgmentScore,jdbcType=DECIMAL}, + #{judgmentAScore,jdbcType=DECIMAL}, #{judgmentBScore2,jdbcType=DECIMAL}, #{deductTimes,jdbcType=INTEGER}, + #{deductCause,jdbcType=VARCHAR}, #{finalScore,jdbcType=DECIMAL}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) @@ -128,6 +130,9 @@ id, + + should_times, + compete_time_id, @@ -146,9 +151,6 @@ judgment_b_score2, - - should_times, - deduct_times, @@ -172,6 +174,9 @@ #{id,jdbcType=BIGINT}, + + #{shouldTimes,jdbcType=INTEGER}, + #{competeTimeId,jdbcType=BIGINT}, @@ -182,16 +187,13 @@ #{siteOrderId,jdbcType=BIGINT}, - #{chiefJudgmentScore,jdbcType=BIGINT}, + #{chiefJudgmentScore,jdbcType=DECIMAL}, - #{judgmentAScore,jdbcType=INTEGER}, + #{judgmentAScore,jdbcType=DECIMAL}, - #{judgmentBScore2,jdbcType=INTEGER}, - - - #{shouldTimes,jdbcType=INTEGER}, + #{judgmentBScore2,jdbcType=DECIMAL}, #{deductTimes,jdbcType=INTEGER}, @@ -200,7 +202,7 @@ #{deductCause,jdbcType=VARCHAR}, - #{finalScore,jdbcType=INTEGER}, + #{finalScore,jdbcType=DECIMAL}, #{createdAt,jdbcType=TIMESTAMP}, @@ -225,6 +227,9 @@ id = #{record.id,jdbcType=BIGINT}, + + should_times = #{record.shouldTimes,jdbcType=INTEGER}, + compete_time_id = #{record.competeTimeId,jdbcType=BIGINT}, @@ -235,16 +240,13 @@ site_order_id = #{record.siteOrderId,jdbcType=BIGINT}, - chief_judgment_score = #{record.chiefJudgmentScore,jdbcType=BIGINT}, + chief_judgment_score = #{record.chiefJudgmentScore,jdbcType=DECIMAL}, - judgment_a_score = #{record.judgmentAScore,jdbcType=INTEGER}, + judgment_a_score = #{record.judgmentAScore,jdbcType=DECIMAL}, - judgment_b_score2 = #{record.judgmentBScore2,jdbcType=INTEGER}, - - - should_times = #{record.shouldTimes,jdbcType=INTEGER}, + judgment_b_score2 = #{record.judgmentBScore2,jdbcType=DECIMAL}, deduct_times = #{record.deductTimes,jdbcType=INTEGER}, @@ -253,7 +255,7 @@ deduct_cause = #{record.deductCause,jdbcType=VARCHAR}, - final_score = #{record.finalScore,jdbcType=INTEGER}, + final_score = #{record.finalScore,jdbcType=DECIMAL}, created_at = #{record.createdAt,jdbcType=TIMESTAMP}, @@ -272,16 +274,16 @@ update t_compete_count_score set id = #{record.id,jdbcType=BIGINT}, + should_times = #{record.shouldTimes,jdbcType=INTEGER}, compete_time_id = #{record.competeTimeId,jdbcType=BIGINT}, project_id = #{record.projectId,jdbcType=BIGINT}, site_order_id = #{record.siteOrderId,jdbcType=BIGINT}, - chief_judgment_score = #{record.chiefJudgmentScore,jdbcType=BIGINT}, - judgment_a_score = #{record.judgmentAScore,jdbcType=INTEGER}, - judgment_b_score2 = #{record.judgmentBScore2,jdbcType=INTEGER}, - should_times = #{record.shouldTimes,jdbcType=INTEGER}, + chief_judgment_score = #{record.chiefJudgmentScore,jdbcType=DECIMAL}, + judgment_a_score = #{record.judgmentAScore,jdbcType=DECIMAL}, + judgment_b_score2 = #{record.judgmentBScore2,jdbcType=DECIMAL}, deduct_times = #{record.deductTimes,jdbcType=INTEGER}, deduct_cause = #{record.deductCause,jdbcType=VARCHAR}, - final_score = #{record.finalScore,jdbcType=INTEGER}, + final_score = #{record.finalScore,jdbcType=DECIMAL}, created_at = #{record.createdAt,jdbcType=TIMESTAMP}, updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, rec_status = #{record.recStatus,jdbcType=TINYINT} @@ -302,16 +304,13 @@ site_order_id = #{siteOrderId,jdbcType=BIGINT}, - chief_judgment_score = #{chiefJudgmentScore,jdbcType=BIGINT}, + chief_judgment_score = #{chiefJudgmentScore,jdbcType=DECIMAL}, - judgment_a_score = #{judgmentAScore,jdbcType=INTEGER}, + judgment_a_score = #{judgmentAScore,jdbcType=DECIMAL}, - judgment_b_score2 = #{judgmentBScore2,jdbcType=INTEGER}, - - - should_times = #{shouldTimes,jdbcType=INTEGER}, + judgment_b_score2 = #{judgmentBScore2,jdbcType=DECIMAL}, deduct_times = #{deductTimes,jdbcType=INTEGER}, @@ -320,7 +319,7 @@ deduct_cause = #{deductCause,jdbcType=VARCHAR}, - final_score = #{finalScore,jdbcType=INTEGER}, + final_score = #{finalScore,jdbcType=DECIMAL}, created_at = #{createdAt,jdbcType=TIMESTAMP}, @@ -333,22 +332,23 @@ where id = #{id,jdbcType=BIGINT} + and should_times = #{shouldTimes,jdbcType=INTEGER} update t_compete_count_score set compete_time_id = #{competeTimeId,jdbcType=BIGINT}, project_id = #{projectId,jdbcType=BIGINT}, site_order_id = #{siteOrderId,jdbcType=BIGINT}, - chief_judgment_score = #{chiefJudgmentScore,jdbcType=BIGINT}, - judgment_a_score = #{judgmentAScore,jdbcType=INTEGER}, - judgment_b_score2 = #{judgmentBScore2,jdbcType=INTEGER}, - should_times = #{shouldTimes,jdbcType=INTEGER}, + chief_judgment_score = #{chiefJudgmentScore,jdbcType=DECIMAL}, + judgment_a_score = #{judgmentAScore,jdbcType=DECIMAL}, + judgment_b_score2 = #{judgmentBScore2,jdbcType=DECIMAL}, deduct_times = #{deductTimes,jdbcType=INTEGER}, deduct_cause = #{deductCause,jdbcType=VARCHAR}, - final_score = #{finalScore,jdbcType=INTEGER}, + final_score = #{finalScore,jdbcType=DECIMAL}, created_at = #{createdAt,jdbcType=TIMESTAMP}, updated_at = #{updatedAt,jdbcType=TIMESTAMP}, rec_status = #{recStatus,jdbcType=TINYINT} where id = #{id,jdbcType=BIGINT} + and should_times = #{shouldTimes,jdbcType=INTEGER} \ No newline at end of file diff --git a/mt/src/main/resources/mapper_raw/CompeteVarietyScoreMapper.xml b/mt/src/main/resources/mapper_raw/CompeteVarietyScoreMapper.xml index 12ac81e2..f4b26c7c 100644 --- a/mt/src/main/resources/mapper_raw/CompeteVarietyScoreMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompeteVarietyScoreMapper.xml @@ -7,7 +7,7 @@ - + @@ -111,7 +111,7 @@ judgment_id, created_at, updated_at, rec_status) values (#{id,jdbcType=BIGINT}, #{competeTimeId,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, - #{siteOrderId,jdbcType=BIGINT}, #{code,jdbcType=VARCHAR}, #{score,jdbcType=INTEGER}, + #{siteOrderId,jdbcType=BIGINT}, #{code,jdbcType=VARCHAR}, #{score,jdbcType=DECIMAL}, #{judgmentId,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) @@ -166,7 +166,7 @@ #{code,jdbcType=VARCHAR}, - #{score,jdbcType=INTEGER}, + #{score,jdbcType=DECIMAL}, #{judgmentId,jdbcType=BIGINT}, @@ -207,7 +207,7 @@ code = #{record.code,jdbcType=VARCHAR}, - score = #{record.score,jdbcType=INTEGER}, + score = #{record.score,jdbcType=DECIMAL}, judgment_id = #{record.judgmentId,jdbcType=BIGINT}, @@ -233,7 +233,7 @@ project_id = #{record.projectId,jdbcType=BIGINT}, site_order_id = #{record.siteOrderId,jdbcType=BIGINT}, code = #{record.code,jdbcType=VARCHAR}, - score = #{record.score,jdbcType=INTEGER}, + score = #{record.score,jdbcType=DECIMAL}, judgment_id = #{record.judgmentId,jdbcType=BIGINT}, created_at = #{record.createdAt,jdbcType=TIMESTAMP}, updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, @@ -258,7 +258,7 @@ code = #{code,jdbcType=VARCHAR}, - score = #{score,jdbcType=INTEGER}, + score = #{score,jdbcType=DECIMAL}, judgment_id = #{judgmentId,jdbcType=BIGINT}, @@ -281,7 +281,7 @@ project_id = #{projectId,jdbcType=BIGINT}, site_order_id = #{siteOrderId,jdbcType=BIGINT}, code = #{code,jdbcType=VARCHAR}, - score = #{score,jdbcType=INTEGER}, + score = #{score,jdbcType=DECIMAL}, judgment_id = #{judgmentId,jdbcType=BIGINT}, created_at = #{createdAt,jdbcType=TIMESTAMP}, updated_at = #{updatedAt,jdbcType=TIMESTAMP}, From acb605c61c5109881ac260505450d733ec2c77ed Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Fri, 13 Nov 2020 19:37:21 +0800 Subject: [PATCH 27/80] 11-13-2 --- mt/src/main/resources/application.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index 4ecd13fd..f59084b0 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: dev - include: common, util-dev + active: test + include: common, util-test From eb0613044ac0ddb92ca786932f96479b10cacf11 Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Fri, 13 Nov 2020 19:40:26 +0800 Subject: [PATCH 28/80] 11-13-2 --- .../main/java/com/ccsens/mt/api/CompeteScoreController.java | 5 ++--- .../com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java index 4c19f8df..f5715c4b 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java @@ -58,7 +58,7 @@ public class CompeteScoreController { return JsonResponse.newInstance().ok(competeScores); } -<<<<<<< HEAD + @MustLogin @ApiOperation(value = "计数赛查看当前场次的分数信息", notes = "") @RequestMapping(value = "/countScoreCurrentSite", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) @@ -77,6 +77,5 @@ public class CompeteScoreController { return JsonResponse.newInstance().ok(); } -======= ->>>>>>> 95af62e9754cf6c4f4ed67cfb3e66d7e64bc1041 + } 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 index 5281dc9c..6f31e47b 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java @@ -18,9 +18,8 @@ public interface CompeteProjectConfigDao extends CompeteProjectConfigMapper { List selectDetail (); List selectSingle (@Param("competeTimeId") Long competeTimeId,@Param("projectId") Long projectId,@Param("groupId") Long groupId,@Param("companyId") Long companyId,@Param("name") String name,@Param("idCard") String idCard); List selectGroup (@Param("competeTimeId") Long competeTimeId,@Param("projectId") Long projectId,@Param("groupId") Long groupId,@Param("companyId") Long companyId,@Param("name") String name,@Param("idCard") String idCard); -<<<<<<< HEAD CompeteProjectConfig selectStartTime(@Param("projectId") Long projectId); -======= + /** * 查询所有项目配置信息 @@ -28,5 +27,5 @@ public interface CompeteProjectConfigDao extends CompeteProjectConfigMapper { * @return 返回所有比赛日程配置信息 */ List queryProjectConfig(@Param("type")int type); ->>>>>>> 95af62e9754cf6c4f4ed67cfb3e66d7e64bc1041 + } \ No newline at end of file From 8b56583d497a6ecaec46a4a45a3e5af23e590ce5 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Fri, 13 Nov 2020 21:37:03 +0800 Subject: [PATCH 29/80] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=AF=94=E8=B5=9B?= =?UTF-8?q?=E6=97=A5=E7=A8=8B=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E9=A1=B9?= =?UTF-8?q?=E7=9B=AEid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccsens/mt/api/CompeteTaskController.java | 4 +- .../mt/bean/dto/ProvinceCompeteDto.java | 15 +++++++- .../ccsens/mt/service/CompeteTaskService.java | 38 ++++++++++--------- 3 files changed, 35 insertions(+), 22 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java index 773aecbf..eae789aa 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java @@ -45,9 +45,9 @@ public class CompeteTaskController { @ApiOperation(value = "日程安排更新", notes = "zy:1、循环查找项目对应的配置信息。2、有则修改，没有则添加配置信息。" + "3、根据配置的时间和场地生成出场顺序表。4存入出场顺序表。5、调用tall接口添加任务") @RequestMapping(value = "/update", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse updateCompeteConfig(@ApiParam @Validated @RequestBody QueryDto> params) { + public JsonResponse updateCompeteConfig(@ApiParam @Validated @RequestBody QueryDto params) { log.info("日程安排更新：{}",params); - List dailyScheduleProcessList = competeTaskService.updateCompeteProjectConfig(params.getParam()); + List dailyScheduleProcessList = competeTaskService.updateCompeteProjectConfig(params.getParam().getUpdateCompeteTaskList()); log.info("日程安排更新：{}",dailyScheduleProcessList); return JsonResponse.newInstance().ok(dailyScheduleProcessList); } 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 5e498d83..29ea012c 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 @@ -136,7 +136,7 @@ public class ProvinceCompeteDto { } @Data - @ApiModel("修改日程安排") + @ApiModel("修改日程安排111") public static class UpdateAndSearch{ @ApiModelProperty("项目id") private Long projectId; @@ -199,11 +199,22 @@ public class ProvinceCompeteDto { private Long teamId; } + @Data @ApiModel("修改日程安排") + public static class UpdateCompeteProjectConfig{ + @NotNull + @ApiModelProperty("Tall当前项目id") + private Long projectId; + @ApiModelProperty("单项时间 单位：秒") + private List updateCompeteTaskList; + } + + @Data + @ApiModel("需要修改的日程安排") public static class UpdateCompeteTask{ @NotNull - @ApiModelProperty("项目id") + @ApiModelProperty("比赛项目项目id") private Long projectId; @ApiModelProperty("单项时间 单位：秒") private long duration; diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java index 5bdd5bf5..ca60c16b 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -121,20 +121,17 @@ public class CompeteTaskService implements ICompeteTaskService{ projectPlayerExample.createCriteria().andProjectIdEqualTo(project.getId()); List projectPlayerList = projectPlayerMapper.selectByExample(projectPlayerExample); if (CollectionUtil.isNotEmpty(projectPlayerList)) { + //计算场次 + int order = (int) Math.ceil(competeProjectConfig.getSiteNum() / projectPlayerList.size()); + + //场次 int competeOrder = 1; //场地 int site = 1; for (CompeteProjectPlayer projectPlayer : projectPlayerList) { - //添加出场顺序 - CompeteStartOrder competeStartOrder = new CompeteStartOrder(); - competeStartOrder.setId(snowflake.nextId()); - competeStartOrder.setProjectId(project.getId()); - competeStartOrder.setPlayerId(projectPlayer.getId()); - competeStartOrder.setTeam((byte) 0); - competeStartOrder.setSite((byte) site); - competeStartOrder.setCompeteOrder((byte) competeOrder); - startOrderMapper.insertSelective(competeStartOrder); + //添加出场顺序和tall的任务 + addStartOrderAndTask(project.getId(), competeOrder, site, projectPlayer.getId(),0); site++; if(site > competeProjectConfig.getSiteNum()){ site = 1; @@ -153,15 +150,8 @@ public class CompeteTaskService implements ICompeteTaskService{ //场地 int site = 1; for (CompeteTeam competeTeam : teamList) { - //添加出场顺序 - CompeteStartOrder competeStartOrder = new CompeteStartOrder(); - competeStartOrder.setId(snowflake.nextId()); - competeStartOrder.setProjectId(project.getId()); - competeStartOrder.setPlayerId(competeTeam.getId()); - competeStartOrder.setSite((byte) site); - competeStartOrder.setTeam((byte) 1); - competeStartOrder.setCompeteOrder((byte) competeOrder); - startOrderMapper.insertSelective(competeStartOrder); + //添加出场顺序和tall的任务 + addStartOrderAndTask(project.getId(), competeOrder, site, competeTeam.getId(),1); site++; if(site > competeProjectConfig.getSiteNum()){ site = 1; @@ -174,4 +164,16 @@ public class CompeteTaskService implements ICompeteTaskService{ } } + private void addStartOrderAndTask(Long projectId, int competeOrder, int site, Long playerOrTeamId,int isTeam) { + //添加出场顺序 + CompeteStartOrder competeStartOrder = new CompeteStartOrder(); + competeStartOrder.setId(snowflake.nextId()); + competeStartOrder.setProjectId(projectId); + competeStartOrder.setPlayerId(playerOrTeamId); + competeStartOrder.setSite((byte) site); + competeStartOrder.setTeam((byte) isTeam); + competeStartOrder.setCompeteOrder((byte) competeOrder); + startOrderMapper.insertSelective(competeStartOrder); + } + } From 52a105155f87037623c7c9cd7e4b21f046df84dd Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Mon, 16 Nov 2020 09:21:20 +0800 Subject: [PATCH 30/80] 20201116v1.0 --- .../cloudutil/bean/tall/dto/TallTaskDto.java | 131 ++++++++++++ .../ccsens/cloudutil/bean/tall/vo/TaskVo.java | 110 +++++++++++ .../cloudutil/feign/TallFeignClient.java | 55 +++++- .../ccsens/mt/api/CompeteTaskController.java | 23 ++- .../mt/bean/dto/ProvinceCompeteDto.java | 17 +- .../ccsens/mt/bean/po/CompeteStartOrder.java | 33 ++++ .../mt/bean/po/CompeteStartOrderExample.java | 180 +++++++++++++++++ .../ccsens/mt/bean/vo/ProvinceCompeteVo.java | 79 ++++++++ .../mt/persist/dao/CompeteJudgmentDao.java | 18 ++ .../persist/dao/CompeteProjectConfigDao.java | 8 + .../ccsens/mt/service/CompeteTaskService.java | 187 ++++++++++++++---- .../mt/service/ICompeteTaskService.java | 17 +- .../java/com/ccsens/mt/util/Constant.java | 5 + .../mapper_dao/CompeteJudgmentDao.xml | 44 +++++ .../mapper_dao/CompeteProjectConfigDao.xml | 57 ++++++ .../mapper_raw/CompeteStartOrderMapper.xml | 58 +++++- .../com/ccsens/tall/web/TaskController.java | 4 +- 17 files changed, 966 insertions(+), 60 deletions(-) create mode 100644 cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/TallTaskDto.java create mode 100644 mt/src/main/java/com/ccsens/mt/persist/dao/CompeteJudgmentDao.java create mode 100644 mt/src/main/resources/mapper_dao/CompeteJudgmentDao.xml diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/TallTaskDto.java b/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/TallTaskDto.java new file mode 100644 index 00000000..e9f3592f --- /dev/null +++ b/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/TallTaskDto.java @@ -0,0 +1,131 @@ +package com.ccsens.cloudutil.bean.tall.dto; + +import cn.hutool.core.util.ObjectUtil; +import com.ccsens.util.exception.BaseException; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NonNull; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.List; + +@Data +@ApiModel +public class TallTaskDto { + + @ApiModel + @Data + public static class AddTask { + @ApiModelProperty("关联项目Id") + private Long projectId; + @ApiModelProperty("关联的任务id(detailId)") + private Long parentTaskId; + @ApiModelProperty("任务名称") + @NotEmpty(message = "任务名不能为空") + private String taskName; + @ApiModelProperty("任务描述") + private String description; + @ApiModelProperty("负责人id") + @NotNull(message = "请选择负责人") + private Long executorId; + @ApiModelProperty("开始时间") + private Long beginTime; + @ApiModelProperty("结束时间") + private Long endTime; + @ApiModelProperty("重复周期") + private String cycle; + @ApiModelProperty("交付物") + private String taskDeliver; + @ApiModelProperty("插件") + private List pluginList; + @ApiModelProperty("优先级 3,紧急重要 2,紧急不重要 1,重要不紧急 0,不重要不紧急 默认0") + private Byte priority; + @ApiModelProperty("任务提醒消息") + private TaskRemindByAdd taskRemind; + } + + @Data + @ApiModel("添加时设置任务提醒") + public static class TaskRemindByAdd{ + @ApiModelProperty("提醒时机 0不提醒 1开始前，2开始时，3开始后，4结束前，5结束时，6结束后，7自定义时间") + private Byte remindTiming; + @ApiModelProperty("时长 提醒时机是“开始时”或“结束时”可以为空") + private Long duration = 0L; + @ApiModelProperty("时间单位 0分钟 1小时 2天") + private Byte unit; + + public Long getDuration(){ + if(ObjectUtil.isNull(unit)) { + throw new BaseException("时间单位不能为空"); + } + if(remindTiming == 7){ + return duration; + } + switch (unit) { + case 0: + return duration * 60 * 1000L; + case 1: + return duration * 60 * 60 * 1000L; + case 2: + return duration * 24 * 60 * 60 * 1000L; + default: + return duration; + } + } + } + + @Data + @ApiModel("修改任务详细信息") + public static class UpdateTaskInfo{ + @ApiModelProperty("任务id") + private Long id; + @ApiModelProperty("任务名") + private String name; + @ApiModelProperty("任务详情") + private String description; + @ApiModelProperty("负责人") + private Long executorRole; + @ApiModelProperty("任务开始时间") + private Long beginTime; + @ApiModelProperty("任务结束时间") + private Long endTime; + @ApiModelProperty("重复频率") + private String cycle; + @ApiModelProperty("任务奖惩") + private Long money; + @ApiModelProperty("任务切换模式，0时间到立刻切换 1延迟delay_time切换 2手动切换") + private int delay; + @ApiModelProperty("延迟切换时间") + private Long delayTime; + @ApiModelProperty("优先级 3,紧急重要 2,紧急不重要 1,重要不紧急 0,不重要不紧急 默认0") + private Byte priority; + @ApiModelProperty("是否是里程碑 0否 1是") + private Byte milestone; + @ApiModelProperty("需要修改的插件Id") + private List plugins; + } + + @Data + @ApiModel("修改插件配置") + public static class UpdatePluginConfig { + @NonNull + @ApiModelProperty("任务id") + private Long taskId; + @ApiModelProperty("任务插件id") + private Long taskPluginId; + @ApiModelProperty("页面接口路径") + private String webPath; + @ApiModelProperty("入参") + private String importParam; + @ApiModelProperty("放置位置 默认0 ，0任务名 1详情页 2任务下") + private Byte placeLocation; + @ApiModelProperty("程序位置 0:tall内部，1外部") + private Byte routineLocation; + + public UpdatePluginConfig() { + } + } + +} diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/TaskVo.java b/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/TaskVo.java index bc5f3205..b90bc85e 100644 --- a/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/TaskVo.java +++ b/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/TaskVo.java @@ -1,7 +1,14 @@ package com.ccsens.cloudutil.bean.tall.vo; +import cn.hutool.core.util.ObjectUtil; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; +import java.util.List; + @Data public class TaskVo { @Data @@ -11,4 +18,107 @@ public class TaskVo { private Long projectId; private String projectName; } + + @ApiModel + @Data + public static class NormalTask{ + @ApiModelProperty("任务详细信息id") + private Long detailId; + @ApiModelProperty("当前任务的时间段id") + private Long id; + @ApiModelProperty("名称") + private String name; + @ApiModelProperty("详细描述") + private String description; + @ApiModelProperty("父任务名称") + private String parentName; + @ApiModelProperty("所属项目id") + private Long projectId; + @ApiModelProperty("所属项目名称") + private String projectName; + @ApiModelProperty("负责人Id") + private Long executorRole; + @ApiModelProperty("负责人名称") + private String executorRoleName; + @ApiModelProperty("开始时间") + private Long beginTime; + @ApiModelProperty("结束时间") + private Long endTime; + @ApiModelProperty("时长") + private Long duration; + @ApiModelProperty("循环周期") + private String cycle; + @ApiModelProperty("跳转模式 0自动，1延迟,2手动") + private int delay; + @ApiModelProperty("实际开始时间") + private Long realBeginTime; + @ApiModelProperty("实际结束时间") + private Long realEndTime; + @ApiModelProperty("跳转结束时间") + private Long loopEndTime; + @ApiModelProperty("跳转的任务id") + private Long loopTo; + @ApiModelProperty("执行时间") + private Long execTimes; + @ApiModelProperty("奖惩") + private BigDecimal money; + @ApiModelProperty("状态：0-未开始，1-进行中，2-已完成") + private int process; + @ApiModelProperty("子项目id") + private Long subProjectId; + @ApiModelProperty("子项目名字") + private String subProjectName; + @ApiModelProperty("服务器时间") + private Long serverTime; + @ApiModelProperty("任务类型 0普通任务 1虚拟任务") + private int virtual; + @ApiModelProperty("有无分组") + private int hasGroup; + @ApiModelProperty("分数") + private BigDecimal score; + @ApiModelProperty("插件") + private List plugins; + @ApiModelProperty("二级任务") + private List secondTasks; + @ApiModelProperty("时间状态 0：正常 1：任务开始 2：任务结束") + private Byte timeStatus = 0; + @ApiModelProperty("当前周期内任务的序号") + private int sequence; + @ApiModelProperty("页面/接口路径") + private String webPath; + @ApiModelProperty("程序位置 0:tall内部，1外部") + private Byte routineLocation; + @ApiModelProperty("入参") + private String importParam; + public Long getDuration(){ + if(ObjectUtil.isNotNull(beginTime) && ObjectUtil.isNotNull(endTime)) { + return endTime - beginTime; + } + return null; + } + + public Long getServerTime(){ + return System.currentTimeMillis(); + } + + } + + @ApiModel + @Data + public static class PluginVo{ + @ApiModelProperty("插件id") + private String id; + @ApiModelProperty("插件名") + private String name; + @ApiModelProperty("插件描述") + private String description; + @ApiModelProperty("显示分类") + private String showType; + @ApiModelProperty("页面/接口路径") + private String webPath; + @ApiModelProperty("程序位置 0:tall内部，1外部") + private Byte routineLocation; + @ApiModelProperty("入参") + private String importParam; + } } diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java b/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java index 66711006..c0e96b64 100644 --- a/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java +++ b/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java @@ -1,10 +1,7 @@ package com.ccsens.cloudutil.feign; import com.ccsens.cloudutil.bean.QueryParam; -import com.ccsens.cloudutil.bean.tall.dto.LogDto; -import com.ccsens.cloudutil.bean.tall.dto.MemberRoleDto; -import com.ccsens.cloudutil.bean.tall.dto.UserDto; -import com.ccsens.cloudutil.bean.tall.dto.WpsDto; +import com.ccsens.cloudutil.bean.tall.dto.*; import com.ccsens.cloudutil.bean.tall.vo.*; import com.ccsens.util.JsonResponse; import feign.hystrix.FallbackFactory; @@ -12,10 +9,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -177,12 +171,35 @@ public interface TallFeignClient { @GetMapping("/v1/3rd/getFilePath") String getWpsFilePath(@RequestParam(name = "businessId") Long businessId,@RequestParam(name = "businessType") byte businessType); - /** + /** * 通过userId呵taskId查找用户信息 */ @GetMapping("/users/memberByTask") JsonResponse getMemberInfoByUserIdAndTaskId(@RequestParam(name = "userId") Long userId,@RequestParam(name = "taskId") Long taskId); + + /** + * 添加任务 + */ + @RequestMapping("/tasks") + JsonResponse saveTask(TallTaskDto.AddTask addTask); + + /** + * 修改任务 + */ + @RequestMapping("/tasks/change") + JsonResponse updataTask(TallTaskDto.UpdateTaskInfo updateTaskInfo); + /** + * 删除任务 + */ + @DeleteMapping("/tasks") + JsonResponse deleteTask(@RequestParam(name = "taskId") Long taskId); + + /** + * 修改任务插件配置 + */ + @DeleteMapping("/plugins/config") + JsonResponse updatePluginConfig(TallTaskDto.UpdatePluginConfig updatePluginConfig); } @Slf4j @@ -295,6 +312,26 @@ class TallFeignClientFallBack implements FallbackFactory { public JsonResponse getMemberInfoByUserIdAndTaskId(Long userId, Long taskId) { return JsonResponse.newInstance().fail(); } + + @Override + public JsonResponse saveTask(TallTaskDto.AddTask addTask) { + return JsonResponse.newInstance().fail(); + } + + @Override + public JsonResponse updataTask(TallTaskDto.UpdateTaskInfo updateTaskInfo) { + return JsonResponse.newInstance().fail(); + } + + @Override + public JsonResponse deleteTask(Long taskId) { + return JsonResponse.newInstance().fail(); + } + + @Override + public JsonResponse updatePluginConfig(TallTaskDto.UpdatePluginConfig updatePluginConfig) { + return JsonResponse.newInstance().fail(); + } }; } diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java index eae789aa..20bbd7bc 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java @@ -3,6 +3,7 @@ package com.ccsens.mt.api; import com.ccsens.cloudutil.annotation.MustLogin; import com.ccsens.mt.bean.dto.CompeteDto; import com.ccsens.mt.bean.dto.ProvinceCompeteDto; +import com.ccsens.mt.bean.vo.ProvinceCompeteVo; import com.ccsens.mt.bean.vo.TableVo; import com.ccsens.mt.service.ICompeteTaskService; import com.ccsens.util.JsonResponse; @@ -47,9 +48,29 @@ public class CompeteTaskController { @RequestMapping(value = "/update", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse updateCompeteConfig(@ApiParam @Validated @RequestBody QueryDto params) { log.info("日程安排更新：{}",params); - List dailyScheduleProcessList = competeTaskService.updateCompeteProjectConfig(params.getParam().getUpdateCompeteTaskList()); + List dailyScheduleProcessList = competeTaskService.updateCompeteProjectConfig(params.getParam()); log.info("日程安排更新：{}",dailyScheduleProcessList); return JsonResponse.newInstance().ok(dailyScheduleProcessList); } + @MustLogin + @ApiOperation(value = "查看该学校选手列表，按出场顺序(手机上上传视频用)", notes = "zy:按顺序查找出场顺序表，筛选出该学校在此项目中的所有选手或团队的出场顺序和时间") + @RequestMapping(value = "/query/players", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> queryStartOrderByCompany(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("日程安排更新：{}",params); + List startOrderByCompanyList = competeTaskService.queryStartOrderByCompany(params.getParam()); + log.info("日程安排更新：{}",startOrderByCompanyList); + return JsonResponse.newInstance().ok(startOrderByCompanyList); + } + + @MustLogin + @ApiOperation(value = "查看裁判分配信息", notes = "zy:查看每个项目下的每个场地的裁判信息") + @RequestMapping(value = "/query/judgment", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> queryJudgment(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("日程安排更新：{}",params); + List queryJudgmentList = competeTaskService.queryJudgment(params.getParam()); + log.info("日程安排更新：{}",queryJudgmentList); + return JsonResponse.newInstance().ok(queryJudgmentList); + } + } 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 29ea012c..82ba72da 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 @@ -202,7 +202,7 @@ public class ProvinceCompeteDto { @Data @ApiModel("修改日程安排") - public static class UpdateCompeteProjectConfig{ + public static class UpdateCompeteProjectConfig{ @NotNull @ApiModelProperty("Tall当前项目id") private Long projectId; @@ -212,7 +212,7 @@ public class ProvinceCompeteDto { @Data @ApiModel("需要修改的日程安排") - public static class UpdateCompeteTask{ + public static class UpdateCompeteTask{ @NotNull @ApiModelProperty("比赛项目项目id") private Long projectId; @@ -226,4 +226,17 @@ public class ProvinceCompeteDto { private Long endTime; } + @Data + @ApiModel("手机上查找当前单位的选手出场顺序") + public static class QueryStartOrderByCompany{ + @ApiModelProperty("比赛项目id,为空则查询全部项目") + private Long projectId; + @NotNull + @ApiModelProperty("大赛id") + private Long competeTimeId; + @NotNull + @ApiModelProperty("单位id") + private Long companyId; + } + } diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrder.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrder.java index eea9504c..9b6b8246 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrder.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrder.java @@ -22,6 +22,12 @@ public class CompeteStartOrder implements Serializable { private Byte recStatus; + private Long taskId; + + private Long startTime; + + private Long endTime; + private static final long serialVersionUID = 1L; public Long getId() { @@ -96,6 +102,30 @@ public class CompeteStartOrder implements Serializable { this.recStatus = recStatus; } + public Long getTaskId() { + return taskId; + } + + public void setTaskId(Long taskId) { + this.taskId = taskId; + } + + public Long getStartTime() { + return startTime; + } + + public void setStartTime(Long startTime) { + this.startTime = startTime; + } + + public Long getEndTime() { + return endTime; + } + + public void setEndTime(Long endTime) { + this.endTime = endTime; + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -111,6 +141,9 @@ public class CompeteStartOrder implements Serializable { sb.append(", createdAt=").append(createdAt); sb.append(", updatedAt=").append(updatedAt); sb.append(", recStatus=").append(recStatus); + sb.append(", taskId=").append(taskId); + sb.append(", startTime=").append(startTime); + sb.append(", endTime=").append(endTime); sb.append("]"); return sb.toString(); } diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrderExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrderExample.java index efd0d04e..7df6cbdc 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrderExample.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrderExample.java @@ -644,6 +644,186 @@ public class CompeteStartOrderExample { addCriterion("rec_status not between", value1, value2, "recStatus"); return (Criteria) this; } + + public Criteria andTaskIdIsNull() { + addCriterion("task_id is null"); + return (Criteria) this; + } + + public Criteria andTaskIdIsNotNull() { + addCriterion("task_id is not null"); + return (Criteria) this; + } + + public Criteria andTaskIdEqualTo(Long value) { + addCriterion("task_id =", value, "taskId"); + return (Criteria) this; + } + + public Criteria andTaskIdNotEqualTo(Long value) { + addCriterion("task_id <>", value, "taskId"); + return (Criteria) this; + } + + public Criteria andTaskIdGreaterThan(Long value) { + addCriterion("task_id >", value, "taskId"); + return (Criteria) this; + } + + public Criteria andTaskIdGreaterThanOrEqualTo(Long value) { + addCriterion("task_id >=", value, "taskId"); + return (Criteria) this; + } + + public Criteria andTaskIdLessThan(Long value) { + addCriterion("task_id <", value, "taskId"); + return (Criteria) this; + } + + public Criteria andTaskIdLessThanOrEqualTo(Long value) { + addCriterion("task_id <=", value, "taskId"); + return (Criteria) this; + } + + public Criteria andTaskIdIn(List values) { + addCriterion("task_id in", values, "taskId"); + return (Criteria) this; + } + + public Criteria andTaskIdNotIn(List values) { + addCriterion("task_id not in", values, "taskId"); + return (Criteria) this; + } + + public Criteria andTaskIdBetween(Long value1, Long value2) { + addCriterion("task_id between", value1, value2, "taskId"); + return (Criteria) this; + } + + public Criteria andTaskIdNotBetween(Long value1, Long value2) { + addCriterion("task_id not between", value1, value2, "taskId"); + return (Criteria) this; + } + + public Criteria andStartTimeIsNull() { + addCriterion("start_time is null"); + return (Criteria) this; + } + + public Criteria andStartTimeIsNotNull() { + addCriterion("start_time is not null"); + return (Criteria) this; + } + + public Criteria andStartTimeEqualTo(Long value) { + addCriterion("start_time =", value, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeNotEqualTo(Long value) { + addCriterion("start_time <>", value, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeGreaterThan(Long value) { + addCriterion("start_time >", value, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeGreaterThanOrEqualTo(Long value) { + addCriterion("start_time >=", value, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeLessThan(Long value) { + addCriterion("start_time <", value, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeLessThanOrEqualTo(Long value) { + addCriterion("start_time <=", value, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeIn(List values) { + addCriterion("start_time in", values, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeNotIn(List values) { + addCriterion("start_time not in", values, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeBetween(Long value1, Long value2) { + addCriterion("start_time between", value1, value2, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeNotBetween(Long value1, Long value2) { + addCriterion("start_time not between", value1, value2, "startTime"); + return (Criteria) this; + } + + public Criteria andEndTimeIsNull() { + addCriterion("end_time is null"); + return (Criteria) this; + } + + public Criteria andEndTimeIsNotNull() { + addCriterion("end_time is not null"); + return (Criteria) this; + } + + public Criteria andEndTimeEqualTo(Long value) { + addCriterion("end_time =", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeNotEqualTo(Long value) { + addCriterion("end_time <>", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeGreaterThan(Long value) { + addCriterion("end_time >", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeGreaterThanOrEqualTo(Long value) { + addCriterion("end_time >=", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeLessThan(Long value) { + addCriterion("end_time <", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeLessThanOrEqualTo(Long value) { + addCriterion("end_time <=", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeIn(List values) { + addCriterion("end_time in", values, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeNotIn(List values) { + addCriterion("end_time not in", values, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeBetween(Long value1, Long value2) { + addCriterion("end_time between", value1, value2, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeNotBetween(Long value1, Long value2) { + addCriterion("end_time not between", value1, value2, "endTime"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java index 3fb471a7..6f1a9738 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java @@ -1,5 +1,7 @@ package com.ccsens.mt.bean.vo; +import cn.hutool.core.util.ObjectUtil; +import com.ccsens.mt.util.Constant; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -230,4 +232,81 @@ public class ProvinceCompeteVo { private int sexGroup; private String groupRemark = "123"; } + + @Data + @ApiModel("查看单位下当前项目所有参赛人员或队伍信息") + public static class StartOrderByCompany { + @ApiModelProperty("项目id") + private Long projectId; + @ApiModelProperty("项目名") + private String projectName; + @ApiModelProperty("场次id") + private Long startOrderId; + @ApiModelProperty("场次") + private int competeOrder; + @ApiModelProperty("场地") + private int site; + @ApiModelProperty("选手名") + private String playerName; + @ApiModelProperty("组别名") + private String groupName; + @ApiModelProperty("开始时间") + private Long startTime; + @ApiModelProperty("结束时间") + private Long endTime; + + public Long getStartTime(){ + if(ObjectUtil.isNotNull(startTime) && startTime != 0){ + return startTime + Constant.UPLOAD_VIDEO_TIME; + } + return null; + } + + public Long getEndTime(){ + if(ObjectUtil.isNotNull(endTime) && endTime != 0){ + return endTime + Constant.UPLOAD_VIDEO_TIME; + } + return null; + } + + } + + + @Data + @ApiModel("查看裁判分配信息") + public static class QueryJudgment { + @ApiModelProperty("项目id") + private Long projectId; + @ApiModelProperty("项目名") + private String projectName; + @ApiModelProperty("项目开始时间") + private Long startTime; + @ApiModelProperty("项目结束时间") + private Long endTime; + @ApiModelProperty("项目下的场地") + private List siteList; + } + @Data + @ApiModel("项目下的场地信息") + public static class ProjectSite { + @ApiModelProperty("场地编号") + private int siteNum; + @ApiModelProperty("场地下的裁判") + private List judgmentList; + } + + @Data + @ApiModel("场地下的裁判信息") + public static class SiteJudgment { + @ApiModelProperty("裁判编号") + private int judgmentNum; + @ApiModelProperty("裁判名字") + private String judgmentName; + @ApiModelProperty("裁判手机号") + private String judgmentPhone; + @ApiModelProperty("备注") + private String remark; + + } + } diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteJudgmentDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteJudgmentDao.java new file mode 100644 index 00000000..4361db75 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteJudgmentDao.java @@ -0,0 +1,18 @@ +package com.ccsens.mt.persist.dao; + +import com.ccsens.mt.bean.vo.ProvinceCompeteVo; +import com.ccsens.mt.persist.mapper.CompeteJudgmentMapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface CompeteJudgmentDao extends CompeteJudgmentMapper { + /** + * 查找裁判分配信息 + * @param competeTimeId 大赛id + * @return + */ + List queryJudgment(@Param("competeTimeId") Long competeTimeId); +} 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 index 6f31e47b..39a3bb49 100644 --- 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.ProvinceCompeteVo; import com.ccsens.mt.bean.vo.TableVo; import com.ccsens.mt.persist.mapper.CompeteProjectConfigMapper; import org.apache.ibatis.annotations.Param; @@ -28,4 +29,11 @@ public interface CompeteProjectConfigDao extends CompeteProjectConfigMapper { */ List queryProjectConfig(@Param("type")int type); + /** + * 查看该学校选手列表，按出场顺序(手机上上传视频用) + * @param companyId 单位id + * @param projectId 项目di + * @return 返回选手列表 + */ + List queryStartOrderByCompany(@Param("companyId")Long companyId, @Param("projectId")Long projectId, @Param("competeTimeId")Long competeTimeId); } \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java index ca60c16b..a59ef5c4 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -3,16 +3,19 @@ package com.ccsens.mt.service; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Snowflake; import cn.hutool.core.util.ObjectUtil; +import com.ccsens.cloudutil.bean.tall.dto.TallTaskDto; +import com.ccsens.cloudutil.bean.tall.vo.TaskVo; +import com.ccsens.cloudutil.feign.TallFeignClient; 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.ProvinceCompeteVo; import com.ccsens.mt.bean.vo.TableVo; -import com.ccsens.mt.persist.dao.CompeteProjectConfigDao; -import com.ccsens.mt.persist.dao.CompeteProjectDao; -import com.ccsens.mt.persist.dao.CompeteTeamDao; -import com.ccsens.mt.persist.dao.CompeteTimeDao; +import com.ccsens.mt.persist.dao.*; import com.ccsens.mt.persist.mapper.CompeteProjectPlayerMapper; import com.ccsens.mt.persist.mapper.CompeteStartOrderMapper; +import com.ccsens.mt.util.Constant; +import com.ccsens.util.JsonResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -44,7 +47,14 @@ public class CompeteTaskService implements ICompeteTaskService{ private CompeteStartOrderMapper startOrderMapper; @Resource private CompeteTeamDao competeTeamDao; + @Resource + private TallFeignClient tallFeignClient; + @Resource + private CompeteJudgmentDao competeJudgmentDao; + /** + * 查看项目的日程配置信息 + */ @Override public List queryCompeteConfig(CompeteDto.CompeteTime param) { CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(param.getCompeteTimeId()); @@ -55,12 +65,15 @@ public class CompeteTaskService implements ICompeteTaskService{ return competeProjectConfigList; } + /** + * 修改项目的日程配置 + */ @Override - public List updateCompeteProjectConfig(List param) { + public List updateCompeteProjectConfig(ProvinceCompeteDto.UpdateCompeteProjectConfig param) { //获取比赛类型 AtomicInteger type = new AtomicInteger(); - if(CollectionUtil.isNotEmpty(param)){ - param.forEach(projectConfig -> { + if(CollectionUtil.isNotEmpty(param.getUpdateCompeteTaskList())){ + param.getUpdateCompeteTaskList().forEach(projectConfig -> { //获取项目 CompeteProject project = competeProjectDao.selectByPrimaryKey(projectConfig.getProjectId()); if(ObjectUtil.isNotNull(project)){ @@ -91,7 +104,7 @@ public class CompeteTaskService implements ICompeteTaskService{ projectConfigDao.insertSelective(competeProjectConfig); } // TODO 生成出场顺序表，存入数据库。在tall内添加对应的任务 - setStartOrder(competeProjectConfig); + setStartOrder(competeProjectConfig,param.getProjectId()); }); } return projectConfigDao.queryProjectConfig(type.get()); @@ -99,21 +112,11 @@ public class CompeteTaskService implements ICompeteTaskService{ /** * 修改配置时生成出场顺序(先删除之前的数据) */ - public void setStartOrder(CompeteProjectConfig competeProjectConfig) { - if (ObjectUtil.isNotNull(competeProjectConfig)) { + public void setStartOrder(CompeteProjectConfig projectConfig, Long tallProjectId) { + if (ObjectUtil.isNotNull(projectConfig)) { //查找项目 - CompeteProject project = competeProjectDao.selectByPrimaryKey(competeProjectConfig.getProjectId()); + CompeteProject project = competeProjectDao.selectByPrimaryKey(projectConfig.getProjectId()); if (ObjectUtil.isNotNull(project)) { - //首先删除此项目以前的出场顺序 - CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample(); - startOrderExample.createCriteria().andProjectIdEqualTo(project.getId()); - List startOrderList = startOrderMapper.selectByExample(startOrderExample); - if(ObjectUtil.isNotNull(startOrderExample)){ - startOrderList.forEach(startOrder -> { - startOrder.setRecStatus((byte) 2); - startOrderMapper.updateByPrimaryKeySelective(startOrder); - }); - } //判断是团队还是个人项目 if (project.getTeam() == 0) { //个人项目查找所有参赛信息 @@ -122,20 +125,68 @@ public class CompeteTaskService implements ICompeteTaskService{ List projectPlayerList = projectPlayerMapper.selectByExample(projectPlayerExample); if (CollectionUtil.isNotEmpty(projectPlayerList)) { //计算场次 - int order = (int) Math.ceil(competeProjectConfig.getSiteNum() / projectPlayerList.size()); - - + int order = (int) Math.ceil(projectConfig.getSiteNum() / projectPlayerList.size()); + //计算每个场次时间 + long projectStartTime = projectConfig.getStartTime() + Constant.UPLOAD_VIDEO_TIME; + long orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order); //场次 int competeOrder = 1; //场地 int site = 1; for (CompeteProjectPlayer projectPlayer : projectPlayerList) { - //添加出场顺序和tall的任务 - addStartOrderAndTask(project.getId(), competeOrder, site, projectPlayer.getId(),0); + CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample(); + startOrderExample.createCriteria().andPlayerIdEqualTo(projectPlayer.getId()).andProjectIdEqualTo(project.getId()); + List startOrderList = startOrderMapper.selectByExample(startOrderExample); + if(CollectionUtil.isNotEmpty(startOrderList)){ + CompeteStartOrder competeStartOrder = startOrderList.get(0); + competeStartOrder.setSite((byte) site); + competeStartOrder.setCompeteOrder((byte) competeOrder); + if(orderTime > 0 && (competeStartOrder.getStartTime() == projectStartTime || competeStartOrder.getEndTime() == projectStartTime + orderTime)){ + competeStartOrder.setStartTime(projectStartTime); + competeStartOrder.setEndTime(projectStartTime + orderTime); + // TODO 修改tall的任务 + TallTaskDto.UpdateTaskInfo updateTaskInfo = new TallTaskDto.UpdateTaskInfo(); + updateTaskInfo.setId(competeStartOrder.getId()); + updateTaskInfo.setBeginTime(competeStartOrder.getId()); + updateTaskInfo.setBeginTime(competeStartOrder.getEndTime()); + tallFeignClient.updataTask(updateTaskInfo); + } + startOrderMapper.updateByPrimaryKeySelective(competeStartOrder); + + }else{ + //添加tall的任务 + Long taskId = null; + TallTaskDto.AddTask addTask = new TallTaskDto.AddTask(); + addTask.setProjectId(tallProjectId); + addTask.setTaskName(project.getName() + competeOrder +"-" + site); + addTask.setBeginTime(projectStartTime); + addTask.setEndTime(projectStartTime + orderTime); + addTask.setExecutorId(1L); + JsonResponse normalTaskJsonResponse = tallFeignClient.saveTask(addTask); + if (ObjectUtil.isNotNull(normalTaskJsonResponse)) { + TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); + if (ObjectUtil.isNotNull(normalTask)) { + taskId = normalTask.getDetailId(); + } + } + //添加出场顺序信息 + CompeteStartOrder competeStartOrder = new CompeteStartOrder(); + competeStartOrder.setId(snowflake.nextId()); + competeStartOrder.setProjectId(project.getId()); + competeStartOrder.setPlayerId(projectPlayer.getId()); + competeStartOrder.setSite((byte) site); + competeStartOrder.setTeam((byte) 0); + competeStartOrder.setCompeteOrder((byte) competeOrder); + competeStartOrder.setTaskId(taskId); + competeStartOrder.setStartTime(projectStartTime); + competeStartOrder.setEndTime(projectStartTime + orderTime); + startOrderMapper.insertSelective(competeStartOrder); + } site++; - if(site > competeProjectConfig.getSiteNum()){ + if(site > projectConfig.getSiteNum()){ site = 1; competeOrder++; + projectStartTime += orderTime; } } } @@ -145,17 +196,69 @@ public class CompeteTaskService implements ICompeteTaskService{ teamExample.createCriteria().andProjectIdEqualTo(project.getId()); List teamList = competeTeamDao.selectByExample(teamExample); if(CollectionUtil.isNotEmpty(teamList)){ + //计算场次 + int order = (int) Math.ceil(projectConfig.getSiteNum() / teamList.size()); + //计算每个场次时间 + long projectStartTime = projectConfig.getStartTime() + Constant.UPLOAD_VIDEO_TIME; + long orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order); //场次 int competeOrder = 1; //场地 int site = 1; for (CompeteTeam competeTeam : teamList) { - //添加出场顺序和tall的任务 - addStartOrderAndTask(project.getId(), competeOrder, site, competeTeam.getId(),1); + CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample(); + startOrderExample.createCriteria().andPlayerIdEqualTo(competeTeam.getId()).andProjectIdEqualTo(project.getId()); + List startOrderList = startOrderMapper.selectByExample(startOrderExample); + if(CollectionUtil.isNotEmpty(startOrderList)){ + CompeteStartOrder competeStartOrder = startOrderList.get(0); + competeStartOrder.setSite((byte) site); + competeStartOrder.setCompeteOrder((byte) competeOrder); + if(orderTime > 0 && (competeStartOrder.getStartTime() == projectStartTime || competeStartOrder.getEndTime() == projectStartTime + orderTime)){ + competeStartOrder.setStartTime(projectStartTime); + competeStartOrder.setEndTime(projectStartTime + orderTime); + // TODO 修改tall的任务 + TallTaskDto.UpdateTaskInfo updateTaskInfo = new TallTaskDto.UpdateTaskInfo(); + updateTaskInfo.setId(competeStartOrder.getId()); + updateTaskInfo.setBeginTime(competeStartOrder.getId()); + updateTaskInfo.setBeginTime(competeStartOrder.getEndTime()); + tallFeignClient.updataTask(updateTaskInfo); + } + startOrderMapper.updateByPrimaryKeySelective(competeStartOrder); + + }else{ + //添加tall的任务 + Long taskId = null; + TallTaskDto.AddTask addTask = new TallTaskDto.AddTask(); + addTask.setProjectId(tallProjectId); + addTask.setTaskName(project.getName() + competeOrder +"-" + site); + addTask.setBeginTime(projectStartTime); + addTask.setEndTime(projectStartTime + orderTime); + addTask.setExecutorId(1L); + JsonResponse normalTaskJsonResponse = tallFeignClient.saveTask(addTask); + if (ObjectUtil.isNotNull(normalTaskJsonResponse)) { + TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); + if (ObjectUtil.isNotNull(normalTask)) { + taskId = normalTask.getDetailId(); + } + } + //添加出场顺序信息 + CompeteStartOrder competeStartOrder = new CompeteStartOrder(); + competeStartOrder.setId(snowflake.nextId()); + competeStartOrder.setProjectId(project.getId()); + competeStartOrder.setPlayerId(competeTeam.getId()); + competeStartOrder.setSite((byte) site); + competeStartOrder.setTeam((byte) 0); + competeStartOrder.setCompeteOrder((byte) competeOrder); + competeStartOrder.setTaskId(taskId); + competeStartOrder.setStartTime(projectStartTime); + competeStartOrder.setEndTime(projectStartTime + orderTime); + startOrderMapper.insertSelective(competeStartOrder); + } site++; - if(site > competeProjectConfig.getSiteNum()){ + if(site > projectConfig.getSiteNum()){ site = 1; competeOrder++; + projectStartTime += orderTime; } } } @@ -164,16 +267,20 @@ public class CompeteTaskService implements ICompeteTaskService{ } } - private void addStartOrderAndTask(Long projectId, int competeOrder, int site, Long playerOrTeamId,int isTeam) { - //添加出场顺序 - CompeteStartOrder competeStartOrder = new CompeteStartOrder(); - competeStartOrder.setId(snowflake.nextId()); - competeStartOrder.setProjectId(projectId); - competeStartOrder.setPlayerId(playerOrTeamId); - competeStartOrder.setSite((byte) site); - competeStartOrder.setTeam((byte) isTeam); - competeStartOrder.setCompeteOrder((byte) competeOrder); - startOrderMapper.insertSelective(competeStartOrder); + + /** + * 手机上查看选手出场顺序 + */ + @Override + public List queryStartOrderByCompany(ProvinceCompeteDto.QueryStartOrderByCompany param) { + return projectConfigDao.queryStartOrderByCompany(param.getCompanyId(),param.getProjectId(),param.getCompeteTimeId()); } + /** + * 查看裁判分配信息 + */ + @Override + public List queryJudgment(CompeteDto.CompeteTime param) { + return competeJudgmentDao.queryJudgment(param.getCompeteTimeId()); + } } diff --git a/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java index 02e716af..4f604088 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java @@ -2,6 +2,7 @@ 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.ProvinceCompeteVo; import com.ccsens.mt.bean.vo.TableVo; import java.util.List; @@ -15,7 +16,7 @@ public interface ICompeteTaskService { * @param param * @return */ - List updateCompeteProjectConfig(List param); + List updateCompeteProjectConfig(ProvinceCompeteDto.UpdateCompeteProjectConfig param); /** * 查找所有项目的日程配置 @@ -23,4 +24,18 @@ public interface ICompeteTaskService { * @return */ List queryCompeteConfig(CompeteDto.CompeteTime param); + + /** + * 查找该单位下参加该项目的选手的出场顺序信息 + * @param param + * @return + */ + List queryStartOrderByCompany(ProvinceCompeteDto.QueryStartOrderByCompany param); + + /** + * 查看所有项目下的裁判分配信息 + * @param param + * @return + */ + List queryJudgment(CompeteDto.CompeteTime param); } diff --git a/mt/src/main/java/com/ccsens/mt/util/Constant.java b/mt/src/main/java/com/ccsens/mt/util/Constant.java index a855322f..b43f305a 100644 --- a/mt/src/main/java/com/ccsens/mt/util/Constant.java +++ b/mt/src/main/java/com/ccsens/mt/util/Constant.java @@ -46,6 +46,11 @@ public class Constant { * 速度通级赛id */ public static final long CERTIFICATE = 2018; + /** + * 每个比赛项目留给选手上传视频的时间(暂定半个小时，可以修改) + */ + public static final long UPLOAD_VIDEO_TIME = 30 * 60 * 1000; + public final static class Compete{ public final static byte PROJECT_JOIN_RULE_GROUP_LIMIT = 0; diff --git a/mt/src/main/resources/mapper_dao/CompeteJudgmentDao.xml b/mt/src/main/resources/mapper_dao/CompeteJudgmentDao.xml new file mode 100644 index 00000000..04b81bf9 --- /dev/null +++ b/mt/src/main/resources/mapper_dao/CompeteJudgmentDao.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml index 13b5f64f..5edd2613 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml @@ -166,6 +166,63 @@ and p.rec_status = 0 GROUP BY p.id + \ No newline at end of file diff --git a/mt/src/main/resources/mapper_raw/CompeteStartOrderMapper.xml b/mt/src/main/resources/mapper_raw/CompeteStartOrderMapper.xml index 8e150359..87ab15d4 100644 --- a/mt/src/main/resources/mapper_raw/CompeteStartOrderMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompeteStartOrderMapper.xml @@ -11,6 +11,9 @@ + + + @@ -71,7 +74,8 @@ - id, project_id, player_id, team, compete_order, site, created_at, updated_at, rec_status + id, project_id, player_id, team, compete_order, site, created_at, updated_at, rec_status, + task_id, start_time, end_time @@ -210,6 +234,15 @@ rec_status = #{record.recStatus,jdbcType=TINYINT}, + + task_id = #{record.taskId,jdbcType=BIGINT}, + + + start_time = #{record.startTime,jdbcType=BIGINT}, + + + end_time = #{record.endTime,jdbcType=BIGINT}, + @@ -225,7 +258,10 @@ site = #{record.site,jdbcType=TINYINT}, created_at = #{record.createdAt,jdbcType=TIMESTAMP}, updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, - rec_status = #{record.recStatus,jdbcType=TINYINT} + rec_status = #{record.recStatus,jdbcType=TINYINT}, + task_id = #{record.taskId,jdbcType=BIGINT}, + start_time = #{record.startTime,jdbcType=BIGINT}, + end_time = #{record.endTime,jdbcType=BIGINT} @@ -257,6 +293,15 @@ rec_status = #{recStatus,jdbcType=TINYINT}, + + task_id = #{taskId,jdbcType=BIGINT}, + + + start_time = #{startTime,jdbcType=BIGINT}, + + + end_time = #{endTime,jdbcType=BIGINT}, + where id = #{id,jdbcType=BIGINT} @@ -269,7 +314,10 @@ site = #{site,jdbcType=TINYINT}, created_at = #{createdAt,jdbcType=TIMESTAMP}, updated_at = #{updatedAt,jdbcType=TIMESTAMP}, - rec_status = #{recStatus,jdbcType=TINYINT} + rec_status = #{recStatus,jdbcType=TINYINT}, + task_id = #{taskId,jdbcType=BIGINT}, + start_time = #{startTime,jdbcType=BIGINT}, + end_time = #{endTime,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/web/TaskController.java b/tall/src/main/java/com/ccsens/tall/web/TaskController.java index f6b90a93..16c0de60 100644 --- a/tall/src/main/java/com/ccsens/tall/web/TaskController.java +++ b/tall/src/main/java/com/ccsens/tall/web/TaskController.java @@ -247,8 +247,8 @@ public class TaskController { @ApiImplicitParams({ @ApiImplicitParam(name = "taskId", value = "任务id", required = true, paramType = "query") }) - @RequestMapping(value = "change", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse updateTask(HttpServletRequest request, + @RequestMapping(value = "/change", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse updateTask(HttpServletRequest request, @Validated @RequestBody TaskDto.UpdateTaskInfo updateTaskInfo) throws Exception { Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); TaskVo.NormalTask taskInfo = taskDetailService.updateTaskInfo(currentUserId,updateTaskInfo); From b5503616787c75864261d0f8c1c21d6ca12493ec Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Mon, 16 Nov 2020 10:01:37 +0800 Subject: [PATCH 31/80] 11-16-1 --- .../java/com/ccsens/mt/api/CompeteScoreController.java | 8 ++++---- mt/src/main/resources/application.yml | 4 ++-- mt/src/main/resources/mapper_dao/CompeteScoreDao.xml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java index f5715c4b..983dd98f 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java @@ -41,7 +41,7 @@ public class CompeteScoreController { } @MustLogin - @ApiOperation(value = "项目状态", notes = "") + @ApiOperation(value = "项目状态", notes = "lihong，查询项目集合，再根据时间判断项目得状态") @RequestMapping(value = "/countScore", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse countScore(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查询比赛项目上的参赛选手列表：{}",params); @@ -50,7 +50,7 @@ public class CompeteScoreController { } @MustLogin - @ApiOperation(value = "选手排名", notes = "") + @ApiOperation(value = "选手排名", notes = "多个信息表关联之后，利用分数排序") @RequestMapping(value = "/countScoreDetail", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse countScoreDetail(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查询比赛项目上的参赛选手列表：{}",params); @@ -60,7 +60,7 @@ public class CompeteScoreController { @MustLogin - @ApiOperation(value = "计数赛查看当前场次的分数信息", notes = "") + @ApiOperation(value = "计数赛查看当前场次的分数信息", notes = "多表关联之后，查询当前你场次得分数信息") @RequestMapping(value = "/countScoreCurrentSite", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse countScoreCurrentSite(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查询比赛项目上的参赛选手列表：{}",params); @@ -69,7 +69,7 @@ public class CompeteScoreController { } @MustLogin - @ApiOperation(value = "技术赛提交分数", notes = "") + @ApiOperation(value = "技术赛提交分数", notes = "接受前端得请求参数，插入相关得表中") @RequestMapping(value = "/submitScore", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse submitScore(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查询比赛项目上的参赛选手列表：{}",params); diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index f59084b0..4ecd13fd 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: common, util-test + active: dev + include: common, util-dev diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml index a03505c0..1a789b7b 100644 --- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml @@ -42,7 +42,6 @@ tcp.`name` as name, tcc.`name` as companyName, tcvs.score as score - from t_compete_project_player tcpp LEFT JOIN t_compete_player tcp ON tcpp.player_id = tcp.id LEFT JOIN t_compete_start_order tcso on tcso.player_id = tcpp.player_id @@ -57,6 +56,7 @@ and tcpp.compete_group_id = #{competeGroupId} GROUP BY tcvs.score + + \ No newline at end of file diff --git a/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml b/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml index bf9b3dc5..6f586d68 100644 --- a/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompeteCountScoreMapper.xml @@ -3,14 +3,14 @@ + - - + @@ -76,8 +76,8 @@ - id, compete_time_id, project_id, site_order_id, chief_judgment_score, judgment_a_score, - judgment_b_score2, should_times, deduct_times, deduct_cause, final_score, created_at, + id, should_times, compete_time_id, project_id, site_order_id, chief_judgment_score, + judgment_a_score, judgment_b_score2, deduct_times, deduct_cause, final_score, created_at, updated_at, rec_status - select from t_compete_count_score where id = #{id,jdbcType=BIGINT} + and should_times = #{shouldTimes,jdbcType=INTEGER} - + delete from t_compete_count_score where id = #{id,jdbcType=BIGINT} + and should_times = #{shouldTimes,jdbcType=INTEGER} delete from t_compete_count_score @@ -111,14 +113,14 @@ - insert into t_compete_count_score (id, compete_time_id, project_id, - site_order_id, chief_judgment_score, judgment_a_score, - judgment_b_score2, should_times, deduct_times, + insert into t_compete_count_score (id, should_times, compete_time_id, + project_id, site_order_id, chief_judgment_score, + judgment_a_score, judgment_b_score2, deduct_times, deduct_cause, final_score, created_at, updated_at, rec_status) - values (#{id,jdbcType=BIGINT}, #{competeTimeId,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, - #{siteOrderId,jdbcType=BIGINT}, #{chiefJudgmentScore,jdbcType=DECIMAL}, #{judgmentAScore,jdbcType=DECIMAL}, - #{judgmentBScore2,jdbcType=DECIMAL}, #{shouldTimes,jdbcType=DECIMAL}, #{deductTimes,jdbcType=DECIMAL}, + values (#{id,jdbcType=BIGINT}, #{shouldTimes,jdbcType=INTEGER}, #{competeTimeId,jdbcType=BIGINT}, + #{projectId,jdbcType=BIGINT}, #{siteOrderId,jdbcType=BIGINT}, #{chiefJudgmentScore,jdbcType=DECIMAL}, + #{judgmentAScore,jdbcType=DECIMAL}, #{judgmentBScore2,jdbcType=DECIMAL}, #{deductTimes,jdbcType=INTEGER}, #{deductCause,jdbcType=VARCHAR}, #{finalScore,jdbcType=DECIMAL}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) @@ -128,6 +130,9 @@ id, + + should_times, + compete_time_id, @@ -146,9 +151,6 @@ judgment_b_score2, - - should_times, - deduct_times, @@ -172,6 +174,9 @@ #{id,jdbcType=BIGINT}, + + #{shouldTimes,jdbcType=INTEGER}, + #{competeTimeId,jdbcType=BIGINT}, @@ -190,11 +195,8 @@ #{judgmentBScore2,jdbcType=DECIMAL}, - - #{shouldTimes,jdbcType=DECIMAL}, - - #{deductTimes,jdbcType=DECIMAL}, + #{deductTimes,jdbcType=INTEGER}, #{deductCause,jdbcType=VARCHAR}, @@ -225,6 +227,9 @@ id = #{record.id,jdbcType=BIGINT}, + + should_times = #{record.shouldTimes,jdbcType=INTEGER}, + compete_time_id = #{record.competeTimeId,jdbcType=BIGINT}, @@ -243,11 +248,8 @@ judgment_b_score2 = #{record.judgmentBScore2,jdbcType=DECIMAL}, - - should_times = #{record.shouldTimes,jdbcType=DECIMAL}, - - deduct_times = #{record.deductTimes,jdbcType=DECIMAL}, + deduct_times = #{record.deductTimes,jdbcType=INTEGER}, deduct_cause = #{record.deductCause,jdbcType=VARCHAR}, @@ -272,14 +274,14 @@ update t_compete_count_score set id = #{record.id,jdbcType=BIGINT}, + should_times = #{record.shouldTimes,jdbcType=INTEGER}, compete_time_id = #{record.competeTimeId,jdbcType=BIGINT}, project_id = #{record.projectId,jdbcType=BIGINT}, site_order_id = #{record.siteOrderId,jdbcType=BIGINT}, chief_judgment_score = #{record.chiefJudgmentScore,jdbcType=DECIMAL}, judgment_a_score = #{record.judgmentAScore,jdbcType=DECIMAL}, judgment_b_score2 = #{record.judgmentBScore2,jdbcType=DECIMAL}, - should_times = #{record.shouldTimes,jdbcType=DECIMAL}, - deduct_times = #{record.deductTimes,jdbcType=DECIMAL}, + deduct_times = #{record.deductTimes,jdbcType=INTEGER}, deduct_cause = #{record.deductCause,jdbcType=VARCHAR}, final_score = #{record.finalScore,jdbcType=DECIMAL}, created_at = #{record.createdAt,jdbcType=TIMESTAMP}, @@ -310,11 +312,8 @@ judgment_b_score2 = #{judgmentBScore2,jdbcType=DECIMAL}, - - should_times = #{shouldTimes,jdbcType=DECIMAL}, - - deduct_times = #{deductTimes,jdbcType=DECIMAL}, + deduct_times = #{deductTimes,jdbcType=INTEGER}, deduct_cause = #{deductCause,jdbcType=VARCHAR}, @@ -333,6 +332,7 @@ where id = #{id,jdbcType=BIGINT} + and should_times = #{shouldTimes,jdbcType=INTEGER} update t_compete_count_score @@ -342,13 +342,13 @@ chief_judgment_score = #{chiefJudgmentScore,jdbcType=DECIMAL}, judgment_a_score = #{judgmentAScore,jdbcType=DECIMAL}, judgment_b_score2 = #{judgmentBScore2,jdbcType=DECIMAL}, - should_times = #{shouldTimes,jdbcType=DECIMAL}, - deduct_times = #{deductTimes,jdbcType=DECIMAL}, + deduct_times = #{deductTimes,jdbcType=INTEGER}, deduct_cause = #{deductCause,jdbcType=VARCHAR}, final_score = #{finalScore,jdbcType=DECIMAL}, created_at = #{createdAt,jdbcType=TIMESTAMP}, updated_at = #{updatedAt,jdbcType=TIMESTAMP}, rec_status = #{recStatus,jdbcType=TINYINT} where id = #{id,jdbcType=BIGINT} + and should_times = #{shouldTimes,jdbcType=INTEGER} \ No newline at end of file diff --git a/util/src/test/java/com/ccsens/util/ListSort.java b/util/src/test/java/com/ccsens/util/ListSort.java new file mode 100644 index 00000000..fc18c4fc --- /dev/null +++ b/util/src/test/java/com/ccsens/util/ListSort.java @@ -0,0 +1,33 @@ +package com.ccsens.util; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; + +public class ListSort { + public static void main(String[] args) { + List list = new ArrayList<>(); + list.add(new StuVO("AAA",90)); + list.add(new StuVO("BBB",150)); + list.add(new StuVO("CCC",12)); + list.add(new StuVO("DDD",64)); + list.add(new StuVO("EEE",5)); + for(int i = 0;i < list.size();i++){ + System.out.println(list.get(i).getName()+" "+list.get(i).getScore()); + } + System.out.println("--------"); + + Collections.sort(list, new Comparator() { + @Override + public int compare(StuVO o1, StuVO o2) { + int i = o1.getScore() - o2.getScore(); + return i; + } + }); + + for(int i = 0;i < list.size();i++){ + System.out.println(list.get(i).getName()+" "+list.get(i).getScore()); + } + } +} diff --git a/util/src/test/java/com/ccsens/util/StuVO.java b/util/src/test/java/com/ccsens/util/StuVO.java new file mode 100644 index 00000000..e59e7f36 --- /dev/null +++ b/util/src/test/java/com/ccsens/util/StuVO.java @@ -0,0 +1,27 @@ +package com.ccsens.util; + +public class StuVO { + private String name; + private int score; + + public StuVO(String name, int srore) { + this.name = name; + this.score = srore; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getScore() { + return score; + } + + public void setScore(int srore) { + this.score = srore; + } +} From 934ae56fe1ca8bf619f11920c4d03a22b319bf46 Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Mon, 16 Nov 2020 14:13:55 +0800 Subject: [PATCH 33/80] 11-16-2 --- .../com/ccsens/mt/api/CompeteScoreController.java | 2 +- .../main/java/com/ccsens/mt/bean/dto/VideoDto.java | 2 -- .../java/com/ccsens/mt/service/CompeteService.java | 3 ++- .../resources/mapper_dao/CompeteProjectConfigDao.xml | 2 +- mt/src/main/resources/mapper_dao/CompeteScoreDao.xml | 12 ++++++------ tall/src/main/resources/application-dev.yml | 2 +- tall/src/main/resources/application.yml | 4 ++-- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java index 983dd98f..c1bc93e4 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java @@ -40,7 +40,7 @@ public class CompeteScoreController { return JsonResponse.newInstance().ok(playerList); } - @MustLogin +// @MustLogin @ApiOperation(value = "项目状态", notes = "lihong，查询项目集合，再根据时间判断项目得状态") @RequestMapping(value = "/countScore", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse countScore(@ApiParam @Validated @RequestBody QueryDto params) { diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java index 21bb3fd9..2105d806 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java @@ -81,10 +81,8 @@ public class VideoDto { private Long id; @ApiModelProperty("姓名/参赛队伍") private String name; - @ApiModelProperty("账号") private String phone; - @ApiModelProperty("签到时间") private Long signEndTime; diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java index 5f14e370..0ed4dbaa 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -1123,7 +1123,8 @@ public class CompeteService implements ICompeteService { competeCountScore.setDeductCause(params.getDeductReason()); competeCountScore.setFinalScore(params.getFinalScore()); competeCountScore.setId(snowflake.nextId()); - competeCountScoreMapper.insert(competeCountScore); + competeCountScore.setRecStatus((byte) 0); + competeCountScoreMapper.insert(competeCountScore); } diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml index 5edd2613..64c4c54a 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml @@ -65,7 +65,7 @@ and tcc.id = #{companyId} - and tcp.name = #{name} + and tcp.name like #{name} and tcp.id_card = #{idCard} diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml index 1a789b7b..43ea9e8f 100644 --- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml @@ -18,7 +18,7 @@ and tcc.rec_status = 0 and tcpp.project_id= #{projectId} and tcpp.compete_group_id =#{competeGroupId} - GROUP BY tccs.final_score + GROUP BY tccs.final_score DESC diff --git a/tall/src/main/resources/application-dev.yml b/tall/src/main/resources/application-dev.yml index ee29058b..ee0a41b5 100644 --- a/tall/src/main/resources/application-dev.yml +++ b/tall/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 7070 + port: 7030 servlet: context-path: /v1.0 spring: diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index ebc544af..b5408a3a 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: util-test,common + active: dev + include: util-dev,common From 8e2b8298e0565aea8d8b07b2d734fa22bd0bda36 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Mon, 16 Nov 2020 14:41:36 +0800 Subject: [PATCH 34/80] 20201116v1.1 --- .../ccsens/mt/api/CompeteTaskController.java | 27 ++++++++---- .../ccsens/mt/api/CompeteVideoController.java | 32 +++++++------- .../com/ccsens/mt/bean/dto/CompeteDto.java | 2 +- .../mt/bean/dto/ProvinceCompeteDto.java | 35 ++++++++++++++++ .../java/com/ccsens/mt/bean/dto/VideoDto.java | 18 ++++++-- .../ccsens/mt/bean/vo/ProvinceCompeteVo.java | 42 ++++++++++--------- .../persist/dao/CompeteProjectConfigDao.java | 2 +- .../mt/persist/dao/CompeteVideoDao.java | 4 +- .../ccsens/mt/service/CompeteTaskService.java | 13 +++++- .../mt/service/CompeteVedioService.java | 4 +- .../mt/service/ICompeteTaskService.java | 9 +++- .../mt/service/ICompeteVedioService.java | 4 +- .../resources/mapper_dao/CompetePlayerDao.xml | 8 ++-- .../mapper_dao/CompeteProjectConfigDao.xml | 39 +++++++++++++---- .../resources/mapper_dao/CompeteVideoDao.xml | 4 +- tall/src/main/resources/application-dev.yml | 2 +- tall/src/main/resources/application.yml | 4 +- 17 files changed, 172 insertions(+), 77 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java index 20bbd7bc..91b0b444 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java @@ -36,9 +36,9 @@ public class CompeteTaskController { @ApiOperation(value = "查找日期配置", notes = "zy:查找项目对应的配置信息") @RequestMapping(value = "/query", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse queryCompeteConfig(@ApiParam @Validated @RequestBody QueryDto params) { - log.info("日程安排更新：{}",params); + log.info("查找日期配置：{}",params); List dailyScheduleProcessList = competeTaskService.queryCompeteConfig(params.getParam()); - log.info("日程安排更新：{}",dailyScheduleProcessList); + log.info("查找日期配置：{}",dailyScheduleProcessList); return JsonResponse.newInstance().ok(dailyScheduleProcessList); } @@ -56,10 +56,11 @@ public class CompeteTaskController { @MustLogin @ApiOperation(value = "查看该学校选手列表，按出场顺序(手机上上传视频用)", notes = "zy:按顺序查找出场顺序表，筛选出该学校在此项目中的所有选手或团队的出场顺序和时间") @RequestMapping(value = "/query/players", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse> queryStartOrderByCompany(@ApiParam @Validated @RequestBody QueryDto params) { - log.info("日程安排更新：{}",params); - List startOrderByCompanyList = competeTaskService.queryStartOrderByCompany(params.getParam()); - log.info("日程安排更新：{}",startOrderByCompanyList); + public JsonResponse> queryStartOrderByCompany( + @ApiParam @Validated @RequestBody QueryDto params) { + log.info("查看该学校选手列表：{}",params); + List startOrderByCompanyList = competeTaskService.queryStartOrderByCompany(params.getParam()); + log.info("查看该学校选手列表：{}",startOrderByCompanyList); return JsonResponse.newInstance().ok(startOrderByCompanyList); } @@ -67,9 +68,19 @@ public class CompeteTaskController { @ApiOperation(value = "查看裁判分配信息", notes = "zy:查看每个项目下的每个场地的裁判信息") @RequestMapping(value = "/query/judgment", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse> queryJudgment(@ApiParam @Validated @RequestBody QueryDto params) { - log.info("日程安排更新：{}",params); + log.info("查看裁判分配信息：{}",params); List queryJudgmentList = competeTaskService.queryJudgment(params.getParam()); - log.info("日程安排更新：{}",queryJudgmentList); + log.info("查看裁判分配信息：{}",queryJudgmentList); + return JsonResponse.newInstance().ok(queryJudgmentList); + } + + @MustLogin + @ApiOperation(value = "分配裁判信息", notes = "zy:传入裁判分配信息表，根据内容给每个的项目的每个场次添加裁判信息") + @RequestMapping(value = "/allocation/judgment", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> allocationJudgment(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("分配裁判信息：{}",params); + List queryJudgmentList = competeTaskService.allocationJudgment(params.getParam()); + log.info("分配裁判信息：{}",queryJudgmentList); return JsonResponse.newInstance().ok(queryJudgmentList); } diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java index 9b765c08..ab32b664 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java @@ -33,16 +33,16 @@ public class CompeteVideoController { @MustLogin @ApiOperation(value = "添加用户观看开幕式视频记录（签到用）", notes = "Mr.王---------根据公司的id在t_compete_player_look表中插入一条数据，单表操作，") @RequestMapping(value = "/addUserSign", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse addCompeteCompany(@ApiParam @Validated @RequestBody QueryDto params) { - log.info("添加用户观看开幕式视频记录（签到用）",params); + public JsonResponse addCompeteCompany(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("添加用户观看开幕式视频记录（签到用）:{}",params); iCompeteVedioService.insertSignVideo(params.getParam().getCompanyId()); return JsonResponse.newInstance().ok(); } @MustLogin @ApiOperation(value = "查看用户观看视频记录（签到用）", notes = "Mr.王---------根据公司的id在t_compete_player_look表中查询数据，单表操作，如果是看了，返回true，没看返回false") @RequestMapping(value = "/selectUserSign", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse selCompeteCompany(@ApiParam @Validated @RequestBody QueryDto params) { - log.info("添加用户观看开幕式视频记录（签到用）",params); + public JsonResponse selCompeteCompany(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("添加用户观看开幕式视频记录（签到用）:{}",params); boolean code= iCompeteVedioService.selectSignVideo(params.getParam().getCompanyId()); return JsonResponse.newInstance().ok(code); } @@ -51,28 +51,24 @@ public class CompeteVideoController { @ApiOperation(value = "上传视频保存上传记录 (比赛视频)", notes = "Mr.王---------增加一条数据到competevideo") @RequestMapping(value = "/insertVideoRecord", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse uploadVideo(@ApiParam @Validated @RequestBody QueryDto params) { - log.info("添加用户观看开幕式视频记录（签到用）",params); + log.info("添加用户观看开幕式视频记录（签到用）:{}",params); String path= iCompeteVedioService.uploadVideoPath(params.getParam()); return JsonResponse.newInstance().ok(path); } @MustLogin - @ApiOperation(value = "查看单位签到状态（签到用）（有筛选", notes = "Mr.王---------查看单位的人的最近一条的签到状态") + @ApiOperation(value = "查看单位签到状态（签到用）（有筛选)", notes = "Mr.王---------查看单位的人的最近一条的签到状态") @RequestMapping(value = "/selectUserStatus", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse> selectCompanySignStatus(@ApiParam @Validated @RequestBody QueryDto params) { - - - log.info("查看单位签到状态（签到用）",params); + public JsonResponse> selectCompanySignStatus(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("查看单位签到状态（签到用）:{}",params); List peoSignStatus = iCompeteVedioService.selectCompanySignStatus(params); return JsonResponse.newInstance().ok(peoSignStatus); } @MustLogin - @ApiOperation(value = "查看教练签到状态（签到用）（有筛选", notes = "Mr.王---------查看教练的人的签到状态") + @ApiOperation(value = "查看教练签到状态（签到用）", notes = "Mr.王---------查看教练的人的签到状态") @RequestMapping(value = "/selectCoachStatus", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse> selectCoachSignStatus(@ApiParam @Validated @RequestBody QueryDto params) { - - - log.info("查看教练签到状态（签到用）",params); + public JsonResponse> selectCoachSignStatus(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("查看教练签到状态（签到用）:{}",params); List coachSignStatus = iCompeteVedioService.selectCoachSignStatus(params); return JsonResponse.newInstance().ok(coachSignStatus); } @@ -82,7 +78,7 @@ public class CompeteVideoController { @RequestMapping(value = "/selectTwoProject", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse> selectTwoProject(@ApiParam @Validated @RequestBody QueryDto params) { - log.info("添加用户观看开幕式视频记录（签到用）",params); + log.info("添加用户观看开幕式视频记录（签到用）:{}",params); List list=iCompeteVedioService.selectTwoProject(params); return JsonResponse.newInstance().ok(list); @@ -90,8 +86,8 @@ public class CompeteVideoController { @MustLogin @ApiOperation(value = "查找所有参赛单位", notes = "Mr.王---------去那个competeProject表下面查") @RequestMapping(value = "/selectAllCompany", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse> selectAllCompany(@ApiParam @Validated @RequestBody QueryDto params) { - log.info("添加用户观看开幕式视频记录（签到用）",params); + public JsonResponse> selectAllCompany(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("添加用户观看开幕式视频记录（签到用）:{}",params); List list=iCompeteVedioService.selectAllCompany(params); return JsonResponse.newInstance().ok(list); } diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java index 74adc31b..c1eb0f75 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java @@ -335,7 +335,7 @@ public class CompeteDto { } @Data - @ApiModel("项目id和组别id") + @ApiModel("查看选手列表（手机用）") public static class ProjectIdAndGroupId{ @ApiModelProperty("项目id") private Long projectId; 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 82ba72da..16e8ba05 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 @@ -239,4 +239,39 @@ public class ProvinceCompeteDto { private Long companyId; } + + @Data + @ApiModel("分配裁判信息") + public static class AllocationJudgment{ + @NotNull + @ApiModelProperty("比赛项目id") + private Long projectId; + @ApiModelProperty("开始时间") + private Long startTime; + @ApiModelProperty("结束时间") + private Long endTime; + @ApiModelProperty("不同场地的裁判") + private List siteJudgmentList; + } + @Data + @ApiModel("场地上的裁判信息") + public static class SiteJudgment{ + @ApiModelProperty("场地信息（场地序号）") + private int site; + @ApiModelProperty("裁判基本信息") + private List judgmentInfoList; + } + @Data + @ApiModel("裁判的角色基本信息") + public static class JudgmentInfo{ + @ApiModelProperty("第几号裁判 0主裁判 1一号裁判 2二号裁判 。。。。。") + private int judgmentNum; + @ApiModelProperty("姓名") + private String judgmentName; + @ApiModelProperty("手机号") + private String judgmentPhone; + @ApiModelProperty("备注") + private String remark; + } + } diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java index 21bb3fd9..5dc4780e 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java @@ -42,7 +42,7 @@ public class VideoDto { } @Data @ApiModel("添加用户观看开幕式视频记录（签到用）") - public static class Vdeo{ + public static class Video{ @NonNull @ApiModelProperty("视频文件id") private Long companyId; @@ -76,18 +76,28 @@ public class VideoDto { } @Data @ApiModel("参赛队伍/裁判签到表") - public static class GetTeamSignStatu{ + public static class GetTeamSignStatus{ @ApiModelProperty("大赛id") private Long id; @ApiModelProperty("姓名/参赛队伍") private String name; - @ApiModelProperty("账号") private String phone; - @ApiModelProperty("签到时间") private Long signEndTime; + } + @Data + @ApiModel("查看教练签到信息") + public static class GetSignStatus{ + @ApiModelProperty("大赛id") + private Long id; + @ApiModelProperty("姓名/参赛队伍") + private String name; + @ApiModelProperty("账号") + private String phone; + @ApiModelProperty("签到时间") + private Long signEndTime; } } diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java index 6f1a9738..d999e62e 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java @@ -234,41 +234,45 @@ public class ProvinceCompeteVo { } @Data - @ApiModel("查看单位下当前项目所有参赛人员或队伍信息") - public static class StartOrderByCompany { + @ApiModel("查看单位下当前项目所有参赛人员或队伍信息（上传视频用）") + public static class StartOrderByCompanyAndProject { @ApiModelProperty("项目id") private Long projectId; @ApiModelProperty("项目名") private String projectName; - @ApiModelProperty("场次id") - private Long startOrderId; - @ApiModelProperty("场次") - private int competeOrder; - @ApiModelProperty("场地") - private int site; - @ApiModelProperty("选手名") - private String playerName; - @ApiModelProperty("组别名") - private String groupName; + @ApiModelProperty("项目下的每个场次的选手") + private List startOrderList; @ApiModelProperty("开始时间") private Long startTime; @ApiModelProperty("结束时间") private Long endTime; - public Long getStartTime(){ + public Long getEndTime(){ if(ObjectUtil.isNotNull(startTime) && startTime != 0){ return startTime + Constant.UPLOAD_VIDEO_TIME; } return null; } - public Long getEndTime(){ - if(ObjectUtil.isNotNull(endTime) && endTime != 0){ - return endTime + Constant.UPLOAD_VIDEO_TIME; - } - return null; - } + } + @Data + @ApiModel("查看单位下当前项目所有参赛人员或队伍信息（上传视频用）") + public static class StartOrder { + @ApiModelProperty("场次id") + private Long startOrderId; + @ApiModelProperty("场次") + private int competeOrder; + @ApiModelProperty("场地") + private int site; + @ApiModelProperty("选手名") + private List playerNameList; + @ApiModelProperty("是否是团队项目 0否 1是") + private int team; + @ApiModelProperty("组别名") + private String groupName; + @ApiModelProperty("视频连接（云点播）（为null则代表未传视频）") + private Long videoUrl; } 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 index 39a3bb49..795bf50e 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java @@ -35,5 +35,5 @@ public interface CompeteProjectConfigDao extends CompeteProjectConfigMapper { * @param projectId 项目di * @return 返回选手列表 */ - List queryStartOrderByCompany(@Param("companyId")Long companyId, @Param("projectId")Long projectId, @Param("competeTimeId")Long competeTimeId); + List queryStartOrderByCompany(@Param("companyId")Long companyId, @Param("projectId")Long projectId, @Param("competeTimeId")Long competeTimeId); } \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteVideoDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteVideoDao.java index f014c8c0..67293e9e 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteVideoDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteVideoDao.java @@ -12,7 +12,7 @@ import java.util.List; */ public interface CompeteVideoDao extends CompeteCompanyMapper { - List selectCompanySignStatus(@Param("param") VideoDto.GetTeamSignStatu param); + List selectCompanySignStatus(@Param("param") VideoDto.GetSignStatus param); - List selectCoachSignStatus(@Param("param") VideoDto.GetTeamSignStatu param); + List selectCoachSignStatus(@Param("param") VideoDto.GetSignStatus param); } diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java index a59ef5c4..1f7d4f66 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -110,7 +110,7 @@ public class CompeteTaskService implements ICompeteTaskService{ return projectConfigDao.queryProjectConfig(type.get()); } /** - * 修改配置时生成出场顺序(先删除之前的数据) + * 修改配置时生成出场顺序 */ public void setStartOrder(CompeteProjectConfig projectConfig, Long tallProjectId) { if (ObjectUtil.isNotNull(projectConfig)) { @@ -272,7 +272,7 @@ public class CompeteTaskService implements ICompeteTaskService{ * 手机上查看选手出场顺序 */ @Override - public List queryStartOrderByCompany(ProvinceCompeteDto.QueryStartOrderByCompany param) { + public List queryStartOrderByCompany(ProvinceCompeteDto.QueryStartOrderByCompany param) { return projectConfigDao.queryStartOrderByCompany(param.getCompanyId(),param.getProjectId(),param.getCompeteTimeId()); } @@ -283,4 +283,13 @@ public class CompeteTaskService implements ICompeteTaskService{ public List queryJudgment(CompeteDto.CompeteTime param) { return competeJudgmentDao.queryJudgment(param.getCompeteTimeId()); } + + /** + * 分配裁判 + */ + @Override + public List allocationJudgment(ProvinceCompeteDto.AllocationJudgment param) { + + return null; + } } diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java index 0f3a36fa..16bdebe9 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java @@ -107,7 +107,7 @@ public class CompeteVedioService implements ICompeteVedioService{ * @return */ @Override - public List selectCompanySignStatus(QueryDto params) { + public List selectCompanySignStatus(QueryDto params) { return competeVideoDao.selectCompanySignStatus(params.getParam()); } /** @@ -116,7 +116,7 @@ public class CompeteVedioService implements ICompeteVedioService{ * @return */ @Override - public List selectCoachSignStatus(QueryDto params) { + public List selectCoachSignStatus(QueryDto params) { log.info(params.getParam().toString()); return competeVideoDao.selectCoachSignStatus(params.getParam()); } diff --git a/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java index 4f604088..a6cfebcb 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java @@ -30,7 +30,7 @@ public interface ICompeteTaskService { * @param param * @return */ - List queryStartOrderByCompany(ProvinceCompeteDto.QueryStartOrderByCompany param); + List queryStartOrderByCompany(ProvinceCompeteDto.QueryStartOrderByCompany param); /** * 查看所有项目下的裁判分配信息 @@ -38,4 +38,11 @@ public interface ICompeteTaskService { * @return */ List queryJudgment(CompeteDto.CompeteTime param); + + /** + * 为项目分配裁判 + * @param param + * @return + */ + List allocationJudgment(ProvinceCompeteDto.AllocationJudgment param); } diff --git a/mt/src/main/java/com/ccsens/mt/service/ICompeteVedioService.java b/mt/src/main/java/com/ccsens/mt/service/ICompeteVedioService.java index 96a011e9..44028a80 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ICompeteVedioService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteVedioService.java @@ -28,7 +28,7 @@ public interface ICompeteVedioService { List selectAllCompany(QueryDto params); - List selectCompanySignStatus(QueryDto params); + List selectCompanySignStatus(QueryDto params); - List selectCoachSignStatus(QueryDto params); + List selectCoachSignStatus(QueryDto params); } diff --git a/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml b/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml index 49ae599c..fc82a267 100644 --- a/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml +++ b/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml @@ -18,10 +18,10 @@ - - - - + + + + diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml index 5edd2613..3477069a 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml @@ -12,6 +12,24 @@ + + + + + + + + + + + + + + + + + + - SELECT so.id as startOrderId, so.compete_order as competeOrder, so.site as site, - so.start_time as startTime, - so.end_time as endTime, + pc.start_time as startTime, pr.id as projectId, pr.`name` as projectName, + pr.`team` as team, if(pr.team = 0,a.plName,b.plName) as playerName, - if(pr.team = 0,a.groupName,b.groupName) as groupName + if(pr.team = 0,a.groupName,b.groupName) as groupName, + if(pr.team = 0,a.videoUrl,b.videoUrl) as videoUrl from t_compete_start_order so LEFT JOIN t_compete_project pr on so.project_id = pr.id LEFT JOIN t_compete_time ti on pr.type = ti.type + LEFT JOIN t_compete_project_config pc on pc.project_id = pr.id LEFT JOIN ( SELECT pp.id as ppId, pl.`name` as plName, - g.group_name as groupName + g.group_name as groupName, + v.video_url as videoUrl FROM t_compete_project_player pp LEFT JOIN t_compete_player pl on pp.player_id = pl.id LEFT JOIN t_compete_group g on g.id = pl.compete_group_id + LEFT JOIN t_compete_video v on pp.id = v.player_id WHERE pl.company_id = #{companyId} and pp.rec_status = 0 @@ -199,18 +221,19 @@ ( SELECT t.id as teamId, - GROUP_CONCAT(pl.`name` separator '、') as plName, - g.group_name as groupName + pl.`name` as plName, + g.group_name as groupName, + v.video_url as videoUrl FROM t_compete_team t LEFT JOIN t_compete_team_member m on t.id = m.compete_team_id LEFT JOIN t_compete_player pl on m.player_id = pl.id LEFT JOIN t_compete_group g on t.group_remark = g.group_remark and t.gender_group = g.sex + LEFT JOIN t_compete_video v on t.id = v.player_id WHERE t.company_id = #{companyId} and t.rec_status = 0 and m.rec_status = 0 and pl.rec_status = 0 - GROUP BY t.id )b on b.teamId = so.player_id WHERE diff --git a/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml b/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml index 6bbbcbc4..88fcaf07 100644 --- a/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml @@ -2,7 +2,7 @@ - select tcc.name as name, tcc.`contacts_phone` as phone, @@ -29,7 +29,7 @@ and tcc.`rec_status`=0 and tct.`rec_status`=0 - select tcj.`name` as `name`, tcj.`phone` as `phone`, diff --git a/tall/src/main/resources/application-dev.yml b/tall/src/main/resources/application-dev.yml index ee29058b..ee0a41b5 100644 --- a/tall/src/main/resources/application-dev.yml +++ b/tall/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 7070 + port: 7030 servlet: context-path: /v1.0 spring: diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index ebc544af..b5408a3a 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: util-test,common + active: dev + include: util-dev,common From 45630478d2dca47ac8365344db141c8f704ecd54 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Mon, 16 Nov 2020 15:02:10 +0800 Subject: [PATCH 35/80] 20201116v1.2 --- .../com/ccsens/mt/service/CompeteService.java | 22 ++++++++++++------- mt/src/main/resources/application.yml | 4 ++-- .../mapper_dao/CompeteProjectConfigDao.xml | 3 ++- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java index aad60092..21ead7c0 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -84,11 +84,15 @@ public class CompeteService implements ICompeteService { @Resource private TallFeignClient tallFeignClient; @Resource - private CommonFileMapper commonFileMapper; - @Resource private CompeteStartOrderMapper competeStartOrderMapper; @Resource private CompeteVarietyScoreMapper competeVarietyScoreMapper; + @Resource + private CompeteProjectConfigDao competeProjectConfigDao; + @Resource + private CompeteScoreDao competeScoreDao; + @Resource + private CompeteCountScoreMapper competeCountScoreMapper; /** * 花样赛总成绩展示 @@ -183,11 +187,6 @@ public class CompeteService implements ICompeteService { return null; } - private CompeteProjectConfigDao competeProjectConfigDao; - @Resource - private CompeteScoreDao competeScoreDao; - @Resource - private CompeteCountScoreMapper competeCountScoreMapper; /** * 查看第几届 @@ -1143,7 +1142,14 @@ public class CompeteService implements ICompeteService { List competeProjectList = competeProjectMapper.selectByExample(competeProjectExample); for(CompeteProject competeProject : competeProjectList) { long projectId = competeProject.getId(); - CompeteProjectConfig competeProjectConfig = competeProjectConfigDao.selectStartTime(projectId); +// CompeteProjectConfig competeProjectConfig = competeProjectConfigDao.selectStartTime(projectId); + CompeteProjectConfig competeProjectConfig = null; + CompeteProjectConfigExample projectConfigExample = new CompeteProjectConfigExample(); + projectConfigExample.createCriteria().andProjectIdEqualTo(projectId); + List projectConfigList = competeProjectConfigDao.selectByExample(projectConfigExample); + if(CollectionUtil.isNotEmpty(projectConfigList)){ + competeProjectConfig = projectConfigList.get(0); + } if (ObjectUtil.isNotNull(competeProjectConfig)) { CompeteVo.CountScore countScore = new CompeteVo.CountScore(); countScore.setId(competeProject.getId()); diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index f59084b0..4ecd13fd 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: common, util-test + active: dev + include: common, util-dev diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml index d7147743..2591e528 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml @@ -43,7 +43,8 @@ where a.project_id = b.id From edca449b5fe9805b0465651c89a5adde1fc07e2e Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Mon, 16 Nov 2020 17:39:47 +0800 Subject: [PATCH 36/80] 11-13-3 --- .../ccsens/mt/api/CompeteScoreController.java | 2 +- .../java/com/ccsens/mt/bean/vo/CompeteVo.java | 2 +- .../com/ccsens/mt/service/CompeteService.java | 16 +++++++++------- mt/src/main/resources/application.yml | 4 ++-- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java index 99fa955a..6bff8f81 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java @@ -52,7 +52,7 @@ public class CompeteScoreController { competeService.submitOrderList(params.getParam()); return JsonResponse.newInstance().ok(); } - @MustLogin + @ApiOperation(value = "花样赛成绩查看", notes = "Mr.王 -----从花样赛成绩表里面查看出这个人得成绩") @RequestMapping(value = "/showResult", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse> showResult (@ApiParam @Validated @RequestBody QueryDto params){ diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java index a84b0426..23b9a1dd 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java @@ -503,7 +503,7 @@ public class CompeteVo { private String projectName; @ApiModelProperty("项目开始时间") private Long startTime; - @ApiModelProperty("项目状态") + @ApiModelProperty("项目状态0-未开始,1-进行中,2-结束") private int status; } diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java index aad60092..c31526e6 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -89,6 +89,12 @@ public class CompeteService implements ICompeteService { private CompeteStartOrderMapper competeStartOrderMapper; @Resource private CompeteVarietyScoreMapper competeVarietyScoreMapper; + @Resource + private CompeteProjectConfigDao competeProjectConfigDao; + @Resource + private CompeteScoreDao competeScoreDao; + @Resource + private CompeteCountScoreMapper competeCountScoreMapper; /** * 花样赛总成绩展示 @@ -183,11 +189,7 @@ public class CompeteService implements ICompeteService { return null; } - private CompeteProjectConfigDao competeProjectConfigDao; - @Resource - private CompeteScoreDao competeScoreDao; - @Resource - private CompeteCountScoreMapper competeCountScoreMapper; + /** * 查看第几届 @@ -1155,12 +1157,12 @@ public class CompeteService implements ICompeteService { //未开始0-未开始 countScore.setStatus(0); } - if (currentTime > competeProjectConfig.getStartTime() && competeProjectConfig.getEndTime() > currentTime) { + if (currentTime >= competeProjectConfig.getStartTime() && competeProjectConfig.getEndTime() >= currentTime) { //进行中1-进行中 countScore.setStatus(1); } if (competeProjectConfig.getEndTime() < currentTime) { - //已经结束-结束 + //已经结束2-结束 countScore.setStatus(2); } countScoreList.add(countScore); diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index f59084b0..4ecd13fd 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: common, util-test + active: dev + include: common, util-dev From 5a92b65f36ab302b74daaaaa3b242cff1a05d848 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Mon, 16 Nov 2020 18:38:03 +0800 Subject: [PATCH 37/80] 123 --- mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java index 9b765c08..53e01e8f 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java @@ -42,7 +42,7 @@ public class CompeteVideoController { @ApiOperation(value = "查看用户观看视频记录（签到用）", notes = "Mr.王---------根据公司的id在t_compete_player_look表中查询数据，单表操作，如果是看了，返回true，没看返回false") @RequestMapping(value = "/selectUserSign", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse selCompeteCompany(@ApiParam @Validated @RequestBody QueryDto params) { - log.info("添加用户观看开幕式视频记录（签到用）",params); + log.info("添加用户观看开幕式视频记录（签到用）{}",params); boolean code= iCompeteVedioService.selectSignVideo(params.getParam().getCompanyId()); return JsonResponse.newInstance().ok(code); } From 6ba73068a4a0ba13fd20e68db83ed1324ad52edd Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Mon, 16 Nov 2020 18:40:55 +0800 Subject: [PATCH 38/80] 20201116v1.6 --- .../bean/tall/dto/MemberRoleDto.java | 32 ++++++ .../cloudutil/bean/tall/vo/MemberVo.java | 24 ++++ .../cloudutil/feign/TallFeignClient.java | 24 +++- .../ccsens/mt/api/CompeteTaskController.java | 3 +- .../mt/bean/dto/ProvinceCompeteDto.java | 13 ++- .../java/com/ccsens/mt/bean/dto/VideoDto.java | 2 +- .../ccsens/mt/bean/po/CompeteJudgment.java | 23 +++- .../mt/bean/po/CompeteJudgmentExample.java | 108 ++++++++++++++---- .../ccsens/mt/bean/vo/ProvinceCompeteVo.java | 2 + .../mt/persist/dao/CompetePlayerDao.java | 2 +- .../ccsens/mt/service/CompeteTaskService.java | 61 +++++++++- .../mt/service/ICompeteTaskService.java | 2 +- .../ccsens/mt/service/ProvinceService.java | 5 +- mt/src/main/resources/application.yml | 4 +- .../resources/mapper_dao/CompetePlayerDao.xml | 6 + .../mapper_dao/CompeteProjectConfigDao.xml | 4 +- .../mapper_raw/CompeteJudgmentMapper.xml | 57 +++++---- .../java/com/ccsens/tall/bean/vo/RoleVo.java | 13 +++ .../tall/service/IProMemberService.java | 3 +- .../ccsens/tall/service/IProRoleService.java | 2 +- .../ccsens/tall/service/ProMemberService.java | 10 +- .../ccsens/tall/service/ProRoleService.java | 6 +- .../com/ccsens/tall/web/MemberController.java | 9 +- .../com/ccsens/tall/web/RoleController.java | 6 +- 24 files changed, 345 insertions(+), 76 deletions(-) diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/MemberRoleDto.java b/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/MemberRoleDto.java index 4318a95b..bac2a095 100644 --- a/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/MemberRoleDto.java +++ b/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/MemberRoleDto.java @@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.beans.BeanUtils; +import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.util.List; @@ -76,4 +77,35 @@ public class MemberRoleDto { return assign; } } + + @Data + @ApiModel("添加成员") + public static class SaveMember{ + @NotNull + @ApiModelProperty("项目id") + private Long projectId; + @ApiModelProperty("成员名") + private String memberName; + @NotEmpty + @ApiModelProperty("成员手机号") + private String phone; + @ApiModelProperty("所属角色的id") + private List roleId; + @ApiModelProperty("奖惩干系人手机号") + private String stakeholderPhone; + @ApiModelProperty("奖惩干系人姓名") + private String stakeholderName; + } + + @Data + @ApiModel("添加角色") + public static class SaveRole{ + @NotNull(message = "项目不能为空") + @ApiModelProperty("项目id") + private Long projectId; + @NotEmpty(message = "角色名不能为空") + @ApiModelProperty("角色名") + private String roleName; + } + } diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/MemberVo.java b/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/MemberVo.java index 3abf2bda..5050a6f9 100644 --- a/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/MemberVo.java +++ b/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/MemberVo.java @@ -1,5 +1,7 @@ package com.ccsens.cloudutil.bean.tall.vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @@ -18,4 +20,26 @@ public class MemberVo { private Long joinTime; private Long stakeholderId; } + + @Data + @ApiModel("角色信息") + public static class RoleInfo{ + @ApiModelProperty("角色id") + private Long roleId; + @ApiModelProperty("角色名") + private String roleName; + } + + @Data + @ApiModel("添加时返回成员信息") + public static class Member{ + @ApiModelProperty("成员id") + private Long memberId; + @ApiModelProperty("成员名") + private String memberName; + @ApiModelProperty("手机号") + private String phone; + @ApiModelProperty("userId") + private Long userId; + } } diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java b/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java index c0e96b64..7a711c4e 100644 --- a/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java +++ b/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java @@ -198,8 +198,20 @@ public interface TallFeignClient { /** * 修改任务插件配置 */ - @DeleteMapping("/plugins/config") + @RequestMapping("/plugins/config") JsonResponse updatePluginConfig(TallTaskDto.UpdatePluginConfig updatePluginConfig); + + /** + * 添加角色 + */ + @RequestMapping("/roles/save") + JsonResponse saveRole(MemberRoleDto.SaveRole saveRole); + + /** + * 添加成员 + */ + @RequestMapping("/members/save") + JsonResponse saveMember(MemberRoleDto.SaveMember saveMember); } @Slf4j @@ -332,6 +344,16 @@ class TallFeignClientFallBack implements FallbackFactory { public JsonResponse updatePluginConfig(TallTaskDto.UpdatePluginConfig updatePluginConfig) { return JsonResponse.newInstance().fail(); } + + @Override + public JsonResponse saveRole(MemberRoleDto.SaveRole saveRole) { + return JsonResponse.newInstance().fail(); + } + + @Override + public JsonResponse saveMember(MemberRoleDto.SaveMember saveMember) { + return JsonResponse.newInstance().fail(); + } }; } diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java index 91b0b444..820f2f70 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java @@ -77,7 +77,8 @@ public class CompeteTaskController { @MustLogin @ApiOperation(value = "分配裁判信息", notes = "zy:传入裁判分配信息表，根据内容给每个的项目的每个场次添加裁判信息") @RequestMapping(value = "/allocation/judgment", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse> allocationJudgment(@ApiParam @Validated @RequestBody QueryDto params) { + public JsonResponse> allocationJudgment( + @ApiParam @Validated @RequestBody QueryDto params) { log.info("分配裁判信息：{}",params); List queryJudgmentList = competeTaskService.allocationJudgment(params.getParam()); log.info("分配裁判信息：{}",queryJudgmentList); 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 16e8ba05..28ce4650 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 @@ -239,7 +239,18 @@ public class ProvinceCompeteDto { private Long companyId; } - + @Data + @ApiModel("分配裁判信息包括tall的项目id") + public static class AllocationJudgmentAndTall{ + @NotNull + @ApiModelProperty("大赛id") + private Long competeTimeId; + @NotNull + @ApiModelProperty("tall的项目id") + private Long tallProjectId; + @ApiModelProperty("每个项目下的裁判信息") + private List allocationJudgmentList; + } @Data @ApiModel("分配裁判信息") public static class AllocationJudgment{ diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java index 5dc4780e..b5920c5b 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java @@ -50,7 +50,7 @@ public class VideoDto { @Data @ApiModel("上传视频保存上传记录 (比赛视频)") public static class UploadVdeo{ - @ApiModelProperty("视频文件id") + @ApiModelProperty("单位id") private Long companyId; @ApiModelProperty("大赛id") private Long competeTimeId; diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgment.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgment.java index 079c5ad4..b0fec397 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgment.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgment.java @@ -14,7 +14,7 @@ public class CompeteJudgment implements Serializable { private Long competeTimeId; - private Long siteOrderId; + private Integer site; private Long projectId; @@ -28,6 +28,8 @@ public class CompeteJudgment implements Serializable { private Byte recStatus; + private Long memberId; + private static final long serialVersionUID = 1L; public Long getId() { @@ -70,12 +72,12 @@ public class CompeteJudgment implements Serializable { this.competeTimeId = competeTimeId; } - public Long getSiteOrderId() { - return siteOrderId; + public Integer getSite() { + return site; } - public void setSiteOrderId(Long siteOrderId) { - this.siteOrderId = siteOrderId; + public void setSite(Integer site) { + this.site = site; } public Long getProjectId() { @@ -126,6 +128,14 @@ public class CompeteJudgment implements Serializable { this.recStatus = recStatus; } + public Long getMemberId() { + return memberId; + } + + public void setMemberId(Long memberId) { + this.memberId = memberId; + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -137,13 +147,14 @@ public class CompeteJudgment implements Serializable { sb.append(", phone=").append(phone); sb.append(", remark=").append(remark); sb.append(", competeTimeId=").append(competeTimeId); - sb.append(", siteOrderId=").append(siteOrderId); + sb.append(", site=").append(site); sb.append(", projectId=").append(projectId); sb.append(", userId=").append(userId); sb.append(", chiefJudgment=").append(chiefJudgment); sb.append(", createdAt=").append(createdAt); sb.append(", updatedAt=").append(updatedAt); sb.append(", recStatus=").append(recStatus); + sb.append(", memberId=").append(memberId); sb.append("]"); return sb.toString(); } diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgmentExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgmentExample.java index f88f0ccc..db725b61 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgmentExample.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgmentExample.java @@ -435,63 +435,63 @@ public class CompeteJudgmentExample { return (Criteria) this; } - public Criteria andSiteOrderIdIsNull() { - addCriterion("site_order_id is null"); + public Criteria andSiteIsNull() { + addCriterion("site is null"); return (Criteria) this; } - public Criteria andSiteOrderIdIsNotNull() { - addCriterion("site_order_id is not null"); + public Criteria andSiteIsNotNull() { + addCriterion("site is not null"); return (Criteria) this; } - public Criteria andSiteOrderIdEqualTo(Long value) { - addCriterion("site_order_id =", value, "siteOrderId"); + public Criteria andSiteEqualTo(Integer value) { + addCriterion("site =", value, "site"); return (Criteria) this; } - public Criteria andSiteOrderIdNotEqualTo(Long value) { - addCriterion("site_order_id <>", value, "siteOrderId"); + public Criteria andSiteNotEqualTo(Integer value) { + addCriterion("site <>", value, "site"); return (Criteria) this; } - public Criteria andSiteOrderIdGreaterThan(Long value) { - addCriterion("site_order_id >", value, "siteOrderId"); + public Criteria andSiteGreaterThan(Integer value) { + addCriterion("site >", value, "site"); return (Criteria) this; } - public Criteria andSiteOrderIdGreaterThanOrEqualTo(Long value) { - addCriterion("site_order_id >=", value, "siteOrderId"); + public Criteria andSiteGreaterThanOrEqualTo(Integer value) { + addCriterion("site >=", value, "site"); return (Criteria) this; } - public Criteria andSiteOrderIdLessThan(Long value) { - addCriterion("site_order_id <", value, "siteOrderId"); + public Criteria andSiteLessThan(Integer value) { + addCriterion("site <", value, "site"); return (Criteria) this; } - public Criteria andSiteOrderIdLessThanOrEqualTo(Long value) { - addCriterion("site_order_id <=", value, "siteOrderId"); + public Criteria andSiteLessThanOrEqualTo(Integer value) { + addCriterion("site <=", value, "site"); return (Criteria) this; } - public Criteria andSiteOrderIdIn(List values) { - addCriterion("site_order_id in", values, "siteOrderId"); + public Criteria andSiteIn(List values) { + addCriterion("site in", values, "site"); return (Criteria) this; } - public Criteria andSiteOrderIdNotIn(List values) { - addCriterion("site_order_id not in", values, "siteOrderId"); + public Criteria andSiteNotIn(List values) { + addCriterion("site not in", values, "site"); return (Criteria) this; } - public Criteria andSiteOrderIdBetween(Long value1, Long value2) { - addCriterion("site_order_id between", value1, value2, "siteOrderId"); + public Criteria andSiteBetween(Integer value1, Integer value2) { + addCriterion("site between", value1, value2, "site"); return (Criteria) this; } - public Criteria andSiteOrderIdNotBetween(Long value1, Long value2) { - addCriterion("site_order_id not between", value1, value2, "siteOrderId"); + public Criteria andSiteNotBetween(Integer value1, Integer value2) { + addCriterion("site not between", value1, value2, "site"); return (Criteria) this; } @@ -854,6 +854,66 @@ public class CompeteJudgmentExample { addCriterion("rec_status not between", value1, value2, "recStatus"); return (Criteria) this; } + + public Criteria andMemberIdIsNull() { + addCriterion("member_id is null"); + return (Criteria) this; + } + + public Criteria andMemberIdIsNotNull() { + addCriterion("member_id is not null"); + return (Criteria) this; + } + + public Criteria andMemberIdEqualTo(Long value) { + addCriterion("member_id =", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdNotEqualTo(Long value) { + addCriterion("member_id <>", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdGreaterThan(Long value) { + addCriterion("member_id >", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdGreaterThanOrEqualTo(Long value) { + addCriterion("member_id >=", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdLessThan(Long value) { + addCriterion("member_id <", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdLessThanOrEqualTo(Long value) { + addCriterion("member_id <=", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdIn(List values) { + addCriterion("member_id in", values, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdNotIn(List values) { + addCriterion("member_id not in", values, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdBetween(Long value1, Long value2) { + addCriterion("member_id between", value1, value2, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdNotBetween(Long value1, Long value2) { + addCriterion("member_id not between", value1, value2, "memberId"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java index d999e62e..4ff70a2c 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java @@ -263,6 +263,8 @@ public class ProvinceCompeteVo { private Long startOrderId; @ApiModelProperty("场次") private int competeOrder; + @ApiModelProperty("选手关联项目id/团队id") + private Long playerOrTeamId; @ApiModelProperty("场地") private int site; @ApiModelProperty("选手名") diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompetePlayerDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompetePlayerDao.java index 37f54b43..8ae1a28d 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompetePlayerDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompetePlayerDao.java @@ -85,5 +85,5 @@ public interface CompetePlayerDao extends CompetePlayerMapper { * @param idCard 身份证 * @return */ - int selectJoinNumByIdCard(@Param("type")int type, @Param("idCard")String idCard); + int selectJoinNumByIdCard(@Param("type")int type, @Param("idCard")String idCard,@Param("playerId")Long playerId); } diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java index 1f7d4f66..87f1e4fc 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -3,7 +3,9 @@ package com.ccsens.mt.service; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Snowflake; import cn.hutool.core.util.ObjectUtil; +import com.ccsens.cloudutil.bean.tall.dto.MemberRoleDto; import com.ccsens.cloudutil.bean.tall.dto.TallTaskDto; +import com.ccsens.cloudutil.bean.tall.vo.MemberVo; import com.ccsens.cloudutil.bean.tall.vo.TaskVo; import com.ccsens.cloudutil.feign.TallFeignClient; import com.ccsens.mt.bean.dto.CompeteDto; @@ -25,6 +27,7 @@ import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicReference; /** * @author 逗 @@ -288,8 +291,62 @@ public class CompeteTaskService implements ICompeteTaskService{ * 分配裁判 */ @Override - public List allocationJudgment(ProvinceCompeteDto.AllocationJudgment param) { + public List allocationJudgment(ProvinceCompeteDto.AllocationJudgmentAndTall param) { + //查找项目 + if(CollectionUtil.isNotEmpty(param.getAllocationJudgmentList())){ + for(ProvinceCompeteDto.AllocationJudgment allocationJudgment : param.getAllocationJudgmentList()) { + CompeteProject project = competeProjectDao.selectByPrimaryKey(allocationJudgment.getProjectId()); + if (ObjectUtil.isNotNull(project)) { - return null; + if (CollectionUtil.isNotEmpty(allocationJudgment.getSiteJudgmentList())) { + allocationJudgment.getSiteJudgmentList().forEach(siteJudgment -> { + if (ObjectUtil.isNotNull(siteJudgment)) { + siteJudgment.getJudgmentInfoList().forEach(judgmentInfo -> { + // TODO 查找该手机号在此项目之前的裁判信息，修改，同时修改tall内的成员角色信息 + //添加裁判信息 + CompeteJudgment competeJudgment = new CompeteJudgment(); + competeJudgment.setId(snowflake.nextId()); + competeJudgment.setName(judgmentInfo.getJudgmentName()); + competeJudgment.setPhone(judgmentInfo.getJudgmentPhone()); + competeJudgment.setRemark(judgmentInfo.getRemark()); + competeJudgment.setCompeteTimeId(param.getCompeteTimeId()); + competeJudgment.setProjectId(allocationJudgment.getProjectId()); + competeJudgment.setSite(siteJudgment.getSite()); + competeJudgment.setChiefJudgment((byte) judgmentInfo.getJudgmentNum()); + competeJudgmentDao.insertSelective(competeJudgment); + //添加角色 + MemberRoleDto.SaveRole saveRole = new MemberRoleDto.SaveRole(); + saveRole.setProjectId(param.getTallProjectId()); + String jdgmentNum = ""; + if(judgmentInfo.getJudgmentNum() == 0){ + jdgmentNum = "主裁判"; + }else { + jdgmentNum = "裁判"+judgmentInfo.getJudgmentNum(); + } + saveRole.setRoleName(project.getName()+"-场地"+siteJudgment.getSite()+"-"+jdgmentNum); + Long roleId = null; + JsonResponse memberJsonResponse = tallFeignClient.saveRole(saveRole); + if (ObjectUtil.isNotNull(memberJsonResponse)) { + MemberVo.RoleInfo roleInfo = memberJsonResponse.getData(); + if (ObjectUtil.isNotNull(roleInfo)) { + roleId = roleInfo.getRoleId(); + } + } + //添加成员 + + + //添加任务 + }); + } + }); + } + } + } + } + + //在tall内添加裁判角色 + //在tall内添加裁判成员 + //添加每个裁判的任务 + return competeJudgmentDao.queryJudgment(param.getCompeteTimeId()); } } diff --git a/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java index a6cfebcb..e1f6586c 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java @@ -44,5 +44,5 @@ public interface ICompeteTaskService { * @param param * @return */ - List allocationJudgment(ProvinceCompeteDto.AllocationJudgment param); + List allocationJudgment(ProvinceCompeteDto.AllocationJudgmentAndTall param); } diff --git a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java index 39521b3b..e29afc35 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -135,7 +135,7 @@ public class ProvinceService implements IProvinceService { //身份证不能为空，且正确 if(StrUtil.isEmpty(param.getIdCard()) || !IdcardUtil.isValidCard(param.getIdCard())){throw new BaseException(CodeEnum.ID_CARD_ERROR);} //是否已注册 - int idCardNum = competePlayerDao.selectJoinNumByIdCard(type,param.getIdCard()); + int idCardNum = competePlayerDao.selectJoinNumByIdCard(type,param.getIdCard(),param.getPlayerId()); // CompetePlayerExample competePlayerExample = new CompetePlayerExample(); // competePlayerExample.createCriteria().andIdCardEqualTo(param.getIdCard()); // if(competePlayerDao.countByExample(competePlayerExample) != 0){ @@ -200,8 +200,7 @@ public class ProvinceService implements IProvinceService { //身份证正确 if(!IdcardUtil.isValidCard(param.getIdCard())){throw new BaseException(CodeEnum.ID_CARD_ERROR);} //是否已注册 - //是否已注册 - int idCardNum = competePlayerDao.selectJoinNumByIdCard(type,param.getIdCard()); + int idCardNum = competePlayerDao.selectJoinNumByIdCard(type,param.getIdCard(),param.getPlayerId()); if(idCardNum > 0){ throw new BaseException(CodeEnum.ID_CARD_ALREADY); } diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index 4ecd13fd..f59084b0 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: dev - include: common, util-dev + active: test + include: common, util-test diff --git a/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml b/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml index fc82a267..3cea0ca7 100644 --- a/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml +++ b/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml @@ -307,7 +307,13 @@ t_compete_player p left join t_compete_company c on p.company_id = c.id where p.id_card = #{idCard} + + and + p.id != #{playerId} + and c.type = #{type} + and p.rec_status = 0 + and c.rec_status = 0 \ No newline at end of file diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml index 2591e528..98313489 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml @@ -24,6 +24,7 @@ + @@ -196,7 +197,8 @@ pr.`team` as team, if(pr.team = 0,a.plName,b.plName) as playerName, if(pr.team = 0,a.groupName,b.groupName) as groupName, - if(pr.team = 0,a.videoUrl,b.videoUrl) as videoUrl + if(pr.team = 0,a.videoUrl,b.videoUrl) as videoUrl, + if(pr.team = 0,a.ppId,b.teamId) as playerOrTeamId from t_compete_start_order so LEFT JOIN t_compete_project pr on so.project_id = pr.id diff --git a/mt/src/main/resources/mapper_raw/CompeteJudgmentMapper.xml b/mt/src/main/resources/mapper_raw/CompeteJudgmentMapper.xml index 443a9a91..04e31129 100644 --- a/mt/src/main/resources/mapper_raw/CompeteJudgmentMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompeteJudgmentMapper.xml @@ -7,13 +7,14 @@ - + + @@ -74,8 +75,8 @@ - id, name, phone, remark, compete_time_id, site_order_id, project_id, user_id, chief_judgment, - created_at, updated_at, rec_status + id, name, phone, remark, compete_time_id, site, project_id, user_id, chief_judgment, + created_at, updated_at, rec_status, member_id @@ -222,8 +229,8 @@ compete_time_id = #{record.competeTimeId,jdbcType=BIGINT}, - - site_order_id = #{record.siteOrderId,jdbcType=BIGINT}, + + site = #{record.site,jdbcType=INTEGER}, project_id = #{record.projectId,jdbcType=BIGINT}, @@ -243,6 +250,9 @@ rec_status = #{record.recStatus,jdbcType=TINYINT}, + + member_id = #{record.memberId,jdbcType=BIGINT}, + @@ -255,13 +265,14 @@ phone = #{record.phone,jdbcType=VARCHAR}, remark = #{record.remark,jdbcType=VARCHAR}, compete_time_id = #{record.competeTimeId,jdbcType=BIGINT}, - site_order_id = #{record.siteOrderId,jdbcType=BIGINT}, + site = #{record.site,jdbcType=INTEGER}, project_id = #{record.projectId,jdbcType=BIGINT}, user_id = #{record.userId,jdbcType=BIGINT}, chief_judgment = #{record.chiefJudgment,jdbcType=TINYINT}, created_at = #{record.createdAt,jdbcType=TIMESTAMP}, updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, - rec_status = #{record.recStatus,jdbcType=TINYINT} + rec_status = #{record.recStatus,jdbcType=TINYINT}, + member_id = #{record.memberId,jdbcType=BIGINT} @@ -281,8 +292,8 @@ compete_time_id = #{competeTimeId,jdbcType=BIGINT}, - - site_order_id = #{siteOrderId,jdbcType=BIGINT}, + + site = #{site,jdbcType=INTEGER}, project_id = #{projectId,jdbcType=BIGINT}, @@ -302,6 +313,9 @@ rec_status = #{recStatus,jdbcType=TINYINT}, + + member_id = #{memberId,jdbcType=BIGINT}, + where id = #{id,jdbcType=BIGINT} @@ -311,13 +325,14 @@ phone = #{phone,jdbcType=VARCHAR}, remark = #{remark,jdbcType=VARCHAR}, compete_time_id = #{competeTimeId,jdbcType=BIGINT}, - site_order_id = #{siteOrderId,jdbcType=BIGINT}, + site = #{site,jdbcType=INTEGER}, project_id = #{projectId,jdbcType=BIGINT}, user_id = #{userId,jdbcType=BIGINT}, chief_judgment = #{chiefJudgment,jdbcType=TINYINT}, created_at = #{createdAt,jdbcType=TIMESTAMP}, updated_at = #{updatedAt,jdbcType=TIMESTAMP}, - rec_status = #{recStatus,jdbcType=TINYINT} + rec_status = #{recStatus,jdbcType=TINYINT}, + member_id = #{memberId,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/RoleVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/RoleVo.java index 11298007..7e85e912 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/RoleVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/RoleVo.java @@ -17,4 +17,17 @@ public class RoleVo { @ApiModelProperty("角色名") private String roleName; } + + @Data + @ApiModel("添加时返回成员信息") + public static class MemberInfo{ + @ApiModelProperty("成员id") + private Long memberId; + @ApiModelProperty("成员名") + private String memberName; + @ApiModelProperty("手机号") + private String phone; + @ApiModelProperty("userId") + private Long userId; + } } diff --git a/tall/src/main/java/com/ccsens/tall/service/IProMemberService.java b/tall/src/main/java/com/ccsens/tall/service/IProMemberService.java index 4a31f126..62f5ff00 100644 --- a/tall/src/main/java/com/ccsens/tall/service/IProMemberService.java +++ b/tall/src/main/java/com/ccsens/tall/service/IProMemberService.java @@ -6,6 +6,7 @@ import com.ccsens.tall.bean.po.ProMember; import com.ccsens.tall.bean.po.ProRole; import com.ccsens.tall.bean.vo.MemberVo; import com.ccsens.tall.bean.vo.ProjectVo; +import com.ccsens.tall.bean.vo.RoleVo; import java.util.List; @@ -38,7 +39,7 @@ public interface IProMemberService { * @param saveMember 项目id，角色id，成员姓名和手机号等 * @throws Exception 权限不足异常 */ - void saveProMember(Long currentUserId, MemberDto.SaveMember saveMember) throws Exception; + RoleVo.MemberInfo saveProMember(Long currentUserId, MemberDto.SaveMember saveMember) throws Exception; /** * 删除成员 diff --git a/tall/src/main/java/com/ccsens/tall/service/IProRoleService.java b/tall/src/main/java/com/ccsens/tall/service/IProRoleService.java index 61395f0d..44f43b0e 100644 --- a/tall/src/main/java/com/ccsens/tall/service/IProRoleService.java +++ b/tall/src/main/java/com/ccsens/tall/service/IProRoleService.java @@ -28,7 +28,7 @@ public interface IProRoleService { void deleteRoleByProjectId(Long projectId) throws Exception; - void saveRole(Long currentUserId, RoleDto.SaveRole saveRole); + RoleVo.RoleByProjectId saveRole(Long currentUserId, RoleDto.SaveRole saveRole); ProjectVo.RoleInfo updateRole(Long currentUserId, RoleDto.UpdateRole updateRole); diff --git a/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java b/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java index 2e21c4df..e0515b4a 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java @@ -11,6 +11,7 @@ import com.ccsens.tall.bean.dto.ProjectDto; import com.ccsens.tall.bean.po.*; import com.ccsens.tall.bean.vo.MemberVo; import com.ccsens.tall.bean.vo.ProjectVo; +import com.ccsens.tall.bean.vo.RoleVo; import com.ccsens.tall.persist.dao.*; import com.ccsens.tall.persist.mapper.SysImitationMapper; import com.ccsens.util.CodeEnum; @@ -246,7 +247,8 @@ public class ProMemberService implements IProMemberService { } @Override - public void saveProMember(Long currentUserId, MemberDto.SaveMember saveMember) throws Exception { + public RoleVo.MemberInfo saveProMember(Long currentUserId, MemberDto.SaveMember saveMember) throws Exception { + RoleVo.MemberInfo memberInfo = new RoleVo.MemberInfo(); int power = proRoleService.selectPowerByRoleName(currentUserId, saveMember.getProjectId()); if (power > 1) { //用项目id和手机号判断用户是否存在 @@ -265,6 +267,7 @@ public class ProMemberService implements IProMemberService { proMember.setNickname(saveMember.getMemberName()); proMember.setPhone(saveMember.getPhone()); proMember.setUserId(userId); + //获取奖惩干系人 Long stakeholderId = null; if(StrUtil.isNotEmpty(saveMember.getStakeholderPhone())){ @@ -302,6 +305,10 @@ public class ProMemberService implements IProMemberService { } proMember.setStakeholderId(stakeholderId); proMemberDao.insertSelective(proMember); + memberInfo.setMemberId(proMember.getId()); + memberInfo.setMemberName(proMember.getNickname()); + memberInfo.setPhone(proMember.getPhone()); + memberInfo.setUserId(proMember.getUserId()); //添加成员与角色的关联 if(CollectionUtil.isNotEmpty(saveMember.getRoleId())){ saveMember.getRoleId().forEach(roleId -> { @@ -323,6 +330,7 @@ public class ProMemberService implements IProMemberService { } else { throw new BaseException(CodeEnum.NOT_POWER); } + return memberInfo; } @Override diff --git a/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java b/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java index c198cd3e..3feac8a7 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java @@ -362,7 +362,7 @@ public class ProRoleService implements IProRoleService { @Override - public void saveRole(Long currentUserId, RoleDto.SaveRole saveRole) { + public RoleVo.RoleByProjectId saveRole(Long currentUserId, RoleDto.SaveRole saveRole) { //检查操作者的权限 int power = selectPowerByRoleName(currentUserId, saveRole.getProjectId()); if (power < 2) { @@ -383,6 +383,10 @@ public class ProRoleService implements IProRoleService { role.setName(saveRole.getRoleName()); role.setParentId(parentId); proRoleDao.insertSelective(role); + RoleVo.RoleByProjectId roleInfo = new RoleVo.RoleByProjectId(); + roleInfo.setRoleId(role.getId()); + roleInfo.setRoleName(role.getName()); + return roleInfo; } @Override diff --git a/tall/src/main/java/com/ccsens/tall/web/MemberController.java b/tall/src/main/java/com/ccsens/tall/web/MemberController.java index 0c2890c6..482f43b7 100644 --- a/tall/src/main/java/com/ccsens/tall/web/MemberController.java +++ b/tall/src/main/java/com/ccsens/tall/web/MemberController.java @@ -3,6 +3,7 @@ package com.ccsens.tall.web; import com.ccsens.tall.bean.dto.MemberDto; import com.ccsens.tall.bean.dto.ProjectDto; import com.ccsens.tall.bean.vo.ProjectVo; +import com.ccsens.tall.bean.vo.RoleVo; import com.ccsens.tall.service.IProMemberService; import com.ccsens.util.JsonResponse; import com.ccsens.util.WebConstant; @@ -38,12 +39,12 @@ public class MemberController { @ApiImplicitParams({ }) @RequestMapping(value = "/save", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse saveMember(HttpServletRequest request, - @ApiParam @Validated @RequestBody MemberDto.SaveMember saveMember) throws Exception { + public JsonResponse saveMember(HttpServletRequest request, + @ApiParam @Validated @RequestBody MemberDto.SaveMember saveMember) throws Exception { Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); log.info("添加成员：{}",saveMember.toString()); - proMemberService.saveProMember(currentUserId,saveMember); - return JsonResponse.newInstance().ok(); + RoleVo.MemberInfo memberInfo = proMemberService.saveProMember(currentUserId,saveMember); + return JsonResponse.newInstance().ok(memberInfo); } @ApiOperation(value = "删除成员",notes = "") diff --git a/tall/src/main/java/com/ccsens/tall/web/RoleController.java b/tall/src/main/java/com/ccsens/tall/web/RoleController.java index 9fd4b27c..41f21f80 100644 --- a/tall/src/main/java/com/ccsens/tall/web/RoleController.java +++ b/tall/src/main/java/com/ccsens/tall/web/RoleController.java @@ -43,11 +43,11 @@ public class RoleController { @ApiImplicitParams({ }) @RequestMapping(value = "/save", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse saveRole(HttpServletRequest request, + public JsonResponse saveRole(HttpServletRequest request, @ApiParam @Validated @RequestBody RoleDto.SaveRole saveRole) throws Exception { Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); - proRoleService.saveRole(currentUserId,saveRole); - return JsonResponse.newInstance().ok(); + RoleVo.RoleByProjectId roleInfo = proRoleService.saveRole(currentUserId,saveRole); + return JsonResponse.newInstance().ok(roleInfo); } @ApiOperation(value = "修改角色信息",notes = "") From 64fd1cbc5f20a717e7c7fb11c4bd2184ffa7fdac Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Tue, 17 Nov 2020 11:19:48 +0800 Subject: [PATCH 39/80] 20201117v1.0 --- .../cloudutil/config/FeignTokenConfig.java | 24 ++++ .../cloudutil/feign/TallFeignClient.java | 4 +- .../java/com/ccsens/mt/bean/dto/VideoDto.java | 4 +- .../ccsens/mt/bean/vo/ProvinceCompeteVo.java | 2 +- .../ccsens/mt/service/CompeteTaskService.java | 105 +++++++++++------- pom.xml | 2 +- 6 files changed, 97 insertions(+), 44 deletions(-) create mode 100644 cloudutil/src/main/java/com/ccsens/cloudutil/config/FeignTokenConfig.java diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/config/FeignTokenConfig.java b/cloudutil/src/main/java/com/ccsens/cloudutil/config/FeignTokenConfig.java new file mode 100644 index 00000000..41d05117 --- /dev/null +++ b/cloudutil/src/main/java/com/ccsens/cloudutil/config/FeignTokenConfig.java @@ -0,0 +1,24 @@ +package com.ccsens.cloudutil.config; + +import feign.RequestInterceptor; +import feign.RequestTemplate; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; + +/** + * @author 逗 + */ +public class FeignTokenConfig implements RequestInterceptor { + @Override + public void apply(RequestTemplate template) { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if(attributes == null){ + return; + } + HttpServletRequest request = attributes.getRequest(); + //添加token + template.header("Authorization", request.getHeader("Authorization")); + } +} diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java b/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java index 7a711c4e..28e2b13f 100644 --- a/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java +++ b/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java @@ -3,7 +3,9 @@ package com.ccsens.cloudutil.feign; import com.ccsens.cloudutil.bean.QueryParam; import com.ccsens.cloudutil.bean.tall.dto.*; import com.ccsens.cloudutil.bean.tall.vo.*; +import com.ccsens.cloudutil.config.FeignTokenConfig; import com.ccsens.util.JsonResponse; +import feign.RequestInterceptor; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.cloud.openfeign.FeignClient; @@ -19,7 +21,7 @@ import java.util.List; * @create: 2019/11/27 10:03 */ -@FeignClient(name = "tall", path = "v1.0", fallbackFactory = TallFeignClientFallBack.class) +@FeignClient(name = "tall", path = "v1.0",fallbackFactory = TallFeignClientFallBack.class,configuration = FeignTokenConfig.class) public interface TallFeignClient { /** diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java index b5920c5b..e1d9008b 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java @@ -44,8 +44,10 @@ public class VideoDto { @ApiModel("添加用户观看开幕式视频记录（签到用）") public static class Video{ @NonNull - @ApiModelProperty("视频文件id") + @ApiModelProperty("单位文件id") private Long companyId; + public Video() { + } } @Data @ApiModel("上传视频保存上传记录 (比赛视频)") diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java index 4ff70a2c..fefef39e 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java @@ -274,7 +274,7 @@ public class ProvinceCompeteVo { @ApiModelProperty("组别名") private String groupName; @ApiModelProperty("视频连接（云点播）（为null则代表未传视频）") - private Long videoUrl; + private String videoUrl; } diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java index 87f1e4fc..e4d7298b 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -25,9 +25,9 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicReference; /** * @author 逗 @@ -297,45 +297,11 @@ public class CompeteTaskService implements ICompeteTaskService{ for(ProvinceCompeteDto.AllocationJudgment allocationJudgment : param.getAllocationJudgmentList()) { CompeteProject project = competeProjectDao.selectByPrimaryKey(allocationJudgment.getProjectId()); if (ObjectUtil.isNotNull(project)) { - if (CollectionUtil.isNotEmpty(allocationJudgment.getSiteJudgmentList())) { allocationJudgment.getSiteJudgmentList().forEach(siteJudgment -> { if (ObjectUtil.isNotNull(siteJudgment)) { siteJudgment.getJudgmentInfoList().forEach(judgmentInfo -> { - // TODO 查找该手机号在此项目之前的裁判信息，修改，同时修改tall内的成员角色信息 - //添加裁判信息 - CompeteJudgment competeJudgment = new CompeteJudgment(); - competeJudgment.setId(snowflake.nextId()); - competeJudgment.setName(judgmentInfo.getJudgmentName()); - competeJudgment.setPhone(judgmentInfo.getJudgmentPhone()); - competeJudgment.setRemark(judgmentInfo.getRemark()); - competeJudgment.setCompeteTimeId(param.getCompeteTimeId()); - competeJudgment.setProjectId(allocationJudgment.getProjectId()); - competeJudgment.setSite(siteJudgment.getSite()); - competeJudgment.setChiefJudgment((byte) judgmentInfo.getJudgmentNum()); - competeJudgmentDao.insertSelective(competeJudgment); - //添加角色 - MemberRoleDto.SaveRole saveRole = new MemberRoleDto.SaveRole(); - saveRole.setProjectId(param.getTallProjectId()); - String jdgmentNum = ""; - if(judgmentInfo.getJudgmentNum() == 0){ - jdgmentNum = "主裁判"; - }else { - jdgmentNum = "裁判"+judgmentInfo.getJudgmentNum(); - } - saveRole.setRoleName(project.getName()+"-场地"+siteJudgment.getSite()+"-"+jdgmentNum); - Long roleId = null; - JsonResponse memberJsonResponse = tallFeignClient.saveRole(saveRole); - if (ObjectUtil.isNotNull(memberJsonResponse)) { - MemberVo.RoleInfo roleInfo = memberJsonResponse.getData(); - if (ObjectUtil.isNotNull(roleInfo)) { - roleId = roleInfo.getRoleId(); - } - } - //添加成员 - - - //添加任务 + saveJudgmentAndTask(param.getCompeteTimeId(),param.getTallProjectId(), project, siteJudgment, judgmentInfo); }); } }); @@ -343,10 +309,69 @@ public class CompeteTaskService implements ICompeteTaskService{ } } } - - //在tall内添加裁判角色 - //在tall内添加裁判成员 - //添加每个裁判的任务 return competeJudgmentDao.queryJudgment(param.getCompeteTimeId()); } + + /** + * 添加裁判信息和tall内的角色成员任务 + */ + private void saveJudgmentAndTask(Long competeTimeId,Long tallProjectId,CompeteProject project + , ProvinceCompeteDto.SiteJudgment siteJudgment, ProvinceCompeteDto.JudgmentInfo judgmentInfo) { + // TODO 查找该手机号在此项目之前的裁判信息，修改，同时修改tall内的成员角色信息 + //添加裁判信息 + CompeteJudgment competeJudgment = new CompeteJudgment(); + competeJudgment.setId(snowflake.nextId()); + competeJudgment.setName(judgmentInfo.getJudgmentName()); + competeJudgment.setPhone(judgmentInfo.getJudgmentPhone()); + competeJudgment.setRemark(judgmentInfo.getRemark()); + competeJudgment.setCompeteTimeId(competeTimeId); + competeJudgment.setProjectId(project.getId()); + competeJudgment.setSite(siteJudgment.getSite()); + competeJudgment.setChiefJudgment((byte) judgmentInfo.getJudgmentNum()); + competeJudgmentDao.insertSelective(competeJudgment); + //添加角色 + MemberRoleDto.SaveRole saveRole = new MemberRoleDto.SaveRole(); + saveRole.setProjectId(tallProjectId); + String jdgmentNum = ""; + if(judgmentInfo.getJudgmentNum() == 0){ + jdgmentNum = "主裁判"; + }else { + jdgmentNum = "裁判"+judgmentInfo.getJudgmentNum(); + } + saveRole.setRoleName(project.getName()+"-场地"+siteJudgment.getSite()+"-"+jdgmentNum); + Long roleId = null; + JsonResponse memberJsonResponse = tallFeignClient.saveRole(saveRole); + if (ObjectUtil.isNotNull(memberJsonResponse)) { + MemberVo.RoleInfo roleInfo = memberJsonResponse.getData(); + if (ObjectUtil.isNotNull(roleInfo)) { + roleId = roleInfo.getRoleId(); + } + } + //添加成员 + MemberRoleDto.SaveMember saveMember = new MemberRoleDto.SaveMember(); + saveMember.setMemberName(judgmentInfo.getJudgmentName()); + saveMember.setProjectId(tallProjectId); + saveMember.setPhone(judgmentInfo.getJudgmentPhone()); + saveMember.setRoleId(Arrays.asList(roleId)); + tallFeignClient.saveMember(saveMember); + //添加任务 + //查找场次信息表 + CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample(); + startOrderExample.createCriteria().andProjectIdEqualTo(project.getId()) + .andSiteEqualTo((byte) siteJudgment.getSite()); + List startOrderList = startOrderMapper.selectByExample(startOrderExample); + if(CollectionUtil.isNotEmpty(startOrderList)){ + for(CompeteStartOrder startOrder : startOrderList) { + TallTaskDto.AddTask addTask = new TallTaskDto.AddTask(); + addTask.setProjectId(tallProjectId); + addTask.setTaskName(project.getName() + startOrder.getCompeteOrder() + "-" + + startOrder.getSite() + "-" + jdgmentNum); + addTask.setBeginTime(startOrder.getStartTime()); + addTask.setEndTime(startOrder.getEndTime()); + addTask.setExecutorId(roleId); + addTask.setParentTaskId(startOrder.getTaskId()); + tallFeignClient.saveTask(addTask); + } + } + } } diff --git a/pom.xml b/pom.xml index c938369f..7c684266 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ util tall - game + mt From 9d4ba71d213c364cb38ff774c78d11addb19b2ca Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Tue, 17 Nov 2020 15:42:43 +0800 Subject: [PATCH 40/80] 11-17-3 --- mt/src/main/resources/druid-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mt/src/main/resources/druid-dev.yml b/mt/src/main/resources/druid-dev.yml index 5676a291..8b496426 100644 --- a/mt/src/main/resources/druid-dev.yml +++ b/mt/src/main/resources/druid-dev.yml @@ -32,4 +32,4 @@ spring: username: root validationQuery: SELECT 1 FROM DUAL # env: CCSENS_GAME - env: CCSENS_TALL + env: CCSENS_TALL \ No newline at end of file From 91de2dfadf05ad9bb53f33257a0bcd7254c9201d Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Tue, 17 Nov 2020 16:16:07 +0800 Subject: [PATCH 41/80] 20201117v1.1 --- .../bean/tall/dto/MemberRoleDto.java | 4 ++ .../cloudutil/bean/tall/dto/TallTaskDto.java | 6 +++ .../cloudutil/config/FeignTokenConfig.java | 17 ++++---- .../ccsens/mt/api/CompeteTaskController.java | 13 ++++-- .../ccsens/mt/api/CompeteVideoController.java | 2 +- .../mt/bean/dto/ProvinceCompeteDto.java | 5 ++- .../ccsens/mt/service/CompeteTaskService.java | 40 ++++++++++++++----- .../mt/service/CompeteVedioService.java | 7 +++- .../mt/service/ICompeteTaskService.java | 4 +- .../ccsens/tall/bean/vo/ProjectMessageVo.java | 2 +- tall/src/main/resources/application.yml | 4 +- 11 files changed, 74 insertions(+), 30 deletions(-) diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/MemberRoleDto.java b/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/MemberRoleDto.java index bac2a095..d2ec8f6d 100644 --- a/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/MemberRoleDto.java +++ b/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/MemberRoleDto.java @@ -95,6 +95,8 @@ public class MemberRoleDto { private String stakeholderPhone; @ApiModelProperty("奖惩干系人姓名") private String stakeholderName; + @ApiModelProperty("token") + private String token; } @Data @@ -106,6 +108,8 @@ public class MemberRoleDto { @NotEmpty(message = "角色名不能为空") @ApiModelProperty("角色名") private String roleName; + @ApiModelProperty("token") + private String token; } } diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/TallTaskDto.java b/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/TallTaskDto.java index e9f3592f..392673ba 100644 --- a/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/TallTaskDto.java +++ b/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/TallTaskDto.java @@ -44,6 +44,8 @@ public class TallTaskDto { private Byte priority; @ApiModelProperty("任务提醒消息") private TaskRemindByAdd taskRemind; + @ApiModelProperty("token") + private String token; } @Data @@ -105,6 +107,8 @@ public class TallTaskDto { private Byte milestone; @ApiModelProperty("需要修改的插件Id") private List plugins; + @ApiModelProperty("token") + private String token; } @Data @@ -123,6 +127,8 @@ public class TallTaskDto { private Byte placeLocation; @ApiModelProperty("程序位置 0:tall内部，1外部") private Byte routineLocation; + @ApiModelProperty("token") + private String token; public UpdatePluginConfig() { } diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/config/FeignTokenConfig.java b/cloudutil/src/main/java/com/ccsens/cloudutil/config/FeignTokenConfig.java index 41d05117..532ba6e7 100644 --- a/cloudutil/src/main/java/com/ccsens/cloudutil/config/FeignTokenConfig.java +++ b/cloudutil/src/main/java/com/ccsens/cloudutil/config/FeignTokenConfig.java @@ -1,24 +1,27 @@ package com.ccsens.cloudutil.config; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; import feign.RequestInterceptor; import feign.RequestTemplate; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; +import org.springframework.stereotype.Component; -import javax.servlet.http.HttpServletRequest; /** * @author 逗 */ +@Component public class FeignTokenConfig implements RequestInterceptor { @Override public void apply(RequestTemplate template) { - ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); - if(attributes == null){ + byte[] body = template.body(); + if (body == null) { return; } - HttpServletRequest request = attributes.getRequest(); + String json = new String(body); + JSONObject jsonObject = JSONUtil.parseObj(json); + //添加token - template.header("Authorization", request.getHeader("Authorization")); + template.header("Authorization", jsonObject.get("token").toString()); } } diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java index 820f2f70..7ab4efcb 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java @@ -7,6 +7,7 @@ import com.ccsens.mt.bean.vo.ProvinceCompeteVo; import com.ccsens.mt.bean.vo.TableVo; import com.ccsens.mt.service.ICompeteTaskService; import com.ccsens.util.JsonResponse; +import com.ccsens.util.WebConstant; import com.ccsens.util.bean.dto.QueryDto; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -46,9 +48,11 @@ public class CompeteTaskController { @ApiOperation(value = "日程安排更新", notes = "zy:1、循环查找项目对应的配置信息。2、有则修改，没有则添加配置信息。" + "3、根据配置的时间和场地生成出场顺序表。4存入出场顺序表。5、调用tall接口添加任务") @RequestMapping(value = "/update", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse updateCompeteConfig(@ApiParam @Validated @RequestBody QueryDto params) { + public JsonResponse updateCompeteConfig( + @ApiParam @Validated @RequestBody QueryDto params, HttpServletRequest request) { log.info("日程安排更新：{}",params); - List dailyScheduleProcessList = competeTaskService.updateCompeteProjectConfig(params.getParam()); + String authHeader = request.getHeader(WebConstant.HEADER_KEY_TOKEN); + List dailyScheduleProcessList = competeTaskService.updateCompeteProjectConfig(params.getParam(),authHeader); log.info("日程安排更新：{}",dailyScheduleProcessList); return JsonResponse.newInstance().ok(dailyScheduleProcessList); } @@ -78,9 +82,10 @@ public class CompeteTaskController { @ApiOperation(value = "分配裁判信息", notes = "zy:传入裁判分配信息表，根据内容给每个的项目的每个场次添加裁判信息") @RequestMapping(value = "/allocation/judgment", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse> allocationJudgment( - @ApiParam @Validated @RequestBody QueryDto params) { + @ApiParam @Validated @RequestBody QueryDto params, HttpServletRequest request) { log.info("分配裁判信息：{}",params); - List queryJudgmentList = competeTaskService.allocationJudgment(params.getParam()); + String authHeader = request.getHeader(WebConstant.HEADER_KEY_TOKEN); + List queryJudgmentList = competeTaskService.allocationJudgment(params.getParam(),authHeader); log.info("分配裁判信息：{}",queryJudgmentList); return JsonResponse.newInstance().ok(queryJudgmentList); } diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java index ab32b664..771ac9fe 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java @@ -76,7 +76,7 @@ public class CompeteVideoController { @MustLogin @ApiOperation(value = "查看所有二级比赛项目", notes = "Mr.王---------去那个competeProject表下面查") @RequestMapping(value = "/selectTwoProject", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse> selectTwoProject(@ApiParam @Validated @RequestBody QueryDto params) { + public JsonResponse> selectTwoProject(@ApiParam @Validated @RequestBody QueryDto params) { log.info("添加用户观看开幕式视频记录（签到用）:{}",params); List list=iCompeteVedioService.selectTwoProject(params); 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 28ce4650..16314894 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 @@ -206,6 +206,9 @@ public class ProvinceCompeteDto { @NotNull @ApiModelProperty("Tall当前项目id") private Long projectId; + @NotNull + @ApiModelProperty("Tall内当前角色id") + private Long tallRoleId; @ApiModelProperty("单项时间 单位：秒") private List updateCompeteTaskList; } @@ -219,7 +222,7 @@ public class ProvinceCompeteDto { @ApiModelProperty("单项时间 单位：秒") private long duration; @ApiModelProperty("场地数量") - private int siteNum; + private int siteNum = 1; @ApiModelProperty("项目开始时间") private Long startTime; @ApiModelProperty("项目结束时间") diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java index e4d7298b..47861d36 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -72,7 +72,7 @@ public class CompeteTaskService implements ICompeteTaskService{ * 修改项目的日程配置 */ @Override - public List updateCompeteProjectConfig(ProvinceCompeteDto.UpdateCompeteProjectConfig param) { + public List updateCompeteProjectConfig(ProvinceCompeteDto.UpdateCompeteProjectConfig param,String token) { //获取比赛类型 AtomicInteger type = new AtomicInteger(); if(CollectionUtil.isNotEmpty(param.getUpdateCompeteTaskList())){ @@ -106,8 +106,8 @@ public class CompeteTaskService implements ICompeteTaskService{ competeProjectConfig.setEndTime(projectConfig.getEndTime()); projectConfigDao.insertSelective(competeProjectConfig); } - // TODO 生成出场顺序表，存入数据库。在tall内添加对应的任务 - setStartOrder(competeProjectConfig,param.getProjectId()); + // 生成出场顺序表，存入数据库。在tall内添加对应的任务 + setStartOrder(competeProjectConfig,param.getProjectId(),param.getTallRoleId(),token); }); } return projectConfigDao.queryProjectConfig(type.get()); @@ -115,7 +115,7 @@ public class CompeteTaskService implements ICompeteTaskService{ /** * 修改配置时生成出场顺序 */ - public void setStartOrder(CompeteProjectConfig projectConfig, Long tallProjectId) { + public void setStartOrder(CompeteProjectConfig projectConfig, Long tallProjectId,Long tallRoleId,String token) { if (ObjectUtil.isNotNull(projectConfig)) { //查找项目 CompeteProject project = competeProjectDao.selectByPrimaryKey(projectConfig.getProjectId()); @@ -147,11 +147,12 @@ public class CompeteTaskService implements ICompeteTaskService{ if(orderTime > 0 && (competeStartOrder.getStartTime() == projectStartTime || competeStartOrder.getEndTime() == projectStartTime + orderTime)){ competeStartOrder.setStartTime(projectStartTime); competeStartOrder.setEndTime(projectStartTime + orderTime); - // TODO 修改tall的任务 + // 修改tall的任务 TallTaskDto.UpdateTaskInfo updateTaskInfo = new TallTaskDto.UpdateTaskInfo(); updateTaskInfo.setId(competeStartOrder.getId()); updateTaskInfo.setBeginTime(competeStartOrder.getId()); updateTaskInfo.setBeginTime(competeStartOrder.getEndTime()); + updateTaskInfo.setToken(token); tallFeignClient.updataTask(updateTaskInfo); } startOrderMapper.updateByPrimaryKeySelective(competeStartOrder); @@ -164,7 +165,8 @@ public class CompeteTaskService implements ICompeteTaskService{ addTask.setTaskName(project.getName() + competeOrder +"-" + site); addTask.setBeginTime(projectStartTime); addTask.setEndTime(projectStartTime + orderTime); - addTask.setExecutorId(1L); + addTask.setExecutorId(tallRoleId); + addTask.setToken(token); JsonResponse normalTaskJsonResponse = tallFeignClient.saveTask(addTask); if (ObjectUtil.isNotNull(normalTaskJsonResponse)) { TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); @@ -219,11 +221,12 @@ public class CompeteTaskService implements ICompeteTaskService{ if(orderTime > 0 && (competeStartOrder.getStartTime() == projectStartTime || competeStartOrder.getEndTime() == projectStartTime + orderTime)){ competeStartOrder.setStartTime(projectStartTime); competeStartOrder.setEndTime(projectStartTime + orderTime); - // TODO 修改tall的任务 + //修改tall的任务 TallTaskDto.UpdateTaskInfo updateTaskInfo = new TallTaskDto.UpdateTaskInfo(); updateTaskInfo.setId(competeStartOrder.getId()); updateTaskInfo.setBeginTime(competeStartOrder.getId()); updateTaskInfo.setBeginTime(competeStartOrder.getEndTime()); + updateTaskInfo.setToken(token); tallFeignClient.updataTask(updateTaskInfo); } startOrderMapper.updateByPrimaryKeySelective(competeStartOrder); @@ -237,6 +240,7 @@ public class CompeteTaskService implements ICompeteTaskService{ addTask.setBeginTime(projectStartTime); addTask.setEndTime(projectStartTime + orderTime); addTask.setExecutorId(1L); + addTask.setToken(token); JsonResponse normalTaskJsonResponse = tallFeignClient.saveTask(addTask); if (ObjectUtil.isNotNull(normalTaskJsonResponse)) { TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); @@ -291,7 +295,7 @@ public class CompeteTaskService implements ICompeteTaskService{ * 分配裁判 */ @Override - public List allocationJudgment(ProvinceCompeteDto.AllocationJudgmentAndTall param) { + public List allocationJudgment(ProvinceCompeteDto.AllocationJudgmentAndTall param,String token) { //查找项目 if(CollectionUtil.isNotEmpty(param.getAllocationJudgmentList())){ for(ProvinceCompeteDto.AllocationJudgment allocationJudgment : param.getAllocationJudgmentList()) { @@ -301,7 +305,7 @@ public class CompeteTaskService implements ICompeteTaskService{ allocationJudgment.getSiteJudgmentList().forEach(siteJudgment -> { if (ObjectUtil.isNotNull(siteJudgment)) { siteJudgment.getJudgmentInfoList().forEach(judgmentInfo -> { - saveJudgmentAndTask(param.getCompeteTimeId(),param.getTallProjectId(), project, siteJudgment, judgmentInfo); + saveJudgmentAndTask(param.getCompeteTimeId(),param.getTallProjectId(), project, siteJudgment, judgmentInfo,token); }); } }); @@ -316,7 +320,7 @@ public class CompeteTaskService implements ICompeteTaskService{ * 添加裁判信息和tall内的角色成员任务 */ private void saveJudgmentAndTask(Long competeTimeId,Long tallProjectId,CompeteProject project - , ProvinceCompeteDto.SiteJudgment siteJudgment, ProvinceCompeteDto.JudgmentInfo judgmentInfo) { + , ProvinceCompeteDto.SiteJudgment siteJudgment, ProvinceCompeteDto.JudgmentInfo judgmentInfo,String token) { // TODO 查找该手机号在此项目之前的裁判信息，修改，同时修改tall内的成员角色信息 //添加裁判信息 CompeteJudgment competeJudgment = new CompeteJudgment(); @@ -340,6 +344,7 @@ public class CompeteTaskService implements ICompeteTaskService{ } saveRole.setRoleName(project.getName()+"-场地"+siteJudgment.getSite()+"-"+jdgmentNum); Long roleId = null; + saveRole.setToken(token); JsonResponse memberJsonResponse = tallFeignClient.saveRole(saveRole); if (ObjectUtil.isNotNull(memberJsonResponse)) { MemberVo.RoleInfo roleInfo = memberJsonResponse.getData(); @@ -353,6 +358,7 @@ public class CompeteTaskService implements ICompeteTaskService{ saveMember.setProjectId(tallProjectId); saveMember.setPhone(judgmentInfo.getJudgmentPhone()); saveMember.setRoleId(Arrays.asList(roleId)); + saveMember.setToken(token); tallFeignClient.saveMember(saveMember); //添加任务 //查找场次信息表 @@ -370,7 +376,19 @@ public class CompeteTaskService implements ICompeteTaskService{ addTask.setEndTime(startOrder.getEndTime()); addTask.setExecutorId(roleId); addTask.setParentTaskId(startOrder.getTaskId()); - tallFeignClient.saveTask(addTask); + addTask.setToken(token); + JsonResponse normalTaskJsonResponse = tallFeignClient.saveTask(addTask); + if (ObjectUtil.isNotNull(normalTaskJsonResponse)) { + TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); + if (ObjectUtil.isNotNull(normalTask)) { + //修改任务插件配置信息 + TallTaskDto.UpdatePluginConfig updatePluginConfig = new TallTaskDto.UpdatePluginConfig(); + updatePluginConfig.setWebPath("/home/osct/video-score"); + updatePluginConfig.setTaskId(normalTask.getDetailId()); + updatePluginConfig.setToken(token); + tallFeignClient.updatePluginConfig(updatePluginConfig); + } + } } } } diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java index ef88acdb..55e9c715 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java @@ -4,6 +4,8 @@ import cn.hutool.core.lang.Snowflake; import com.ccsens.mt.bean.dto.VideoDto; import com.ccsens.mt.bean.po.*; import com.ccsens.mt.bean.vo.VideoProjectVo; +import com.ccsens.mt.persist.dao.CompeteTeamDao; +import com.ccsens.mt.persist.dao.CompeteTimeDao; import com.ccsens.mt.persist.dao.CompeteVideoDao; import com.ccsens.mt.persist.mapper.CompeteCompanyMapper; import com.ccsens.mt.persist.mapper.CompetePlayerLookMapper; @@ -40,6 +42,8 @@ public class CompeteVedioService implements ICompeteVedioService{ private CompeteCompanyMapper competeCompanyMapper; @Resource private CompeteVideoDao competeVideoDao; + @Resource + private CompeteTimeDao competeTimeDao; @Override public void insertSignVideo(Long companyId) { @@ -77,8 +81,9 @@ public class CompeteVedioService implements ICompeteVedioService{ @Override public List selectTwoProject(QueryDto params) { + CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(params.getParam().getTeamId()); CompeteProjectExample competeCompanyExample=new CompeteProjectExample(); - competeCompanyExample.createCriteria().andCompeteTimeIdEqualTo(params.getParam().getTeamId()).andLevelEqualTo((byte) 2); + competeCompanyExample.createCriteria().andTypeEqualTo(competeTime.getType()).andLevelEqualTo((byte) 2); List list=competeProjectMapper.selectByExample(competeCompanyExample); List list1=new ArrayList<>(); list.forEach(mes->{ diff --git a/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java index e1f6586c..eac02350 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java @@ -16,7 +16,7 @@ public interface ICompeteTaskService { * @param param * @return */ - List updateCompeteProjectConfig(ProvinceCompeteDto.UpdateCompeteProjectConfig param); + List updateCompeteProjectConfig(ProvinceCompeteDto.UpdateCompeteProjectConfig param,String token); /** * 查找所有项目的日程配置 @@ -44,5 +44,5 @@ public interface ICompeteTaskService { * @param param * @return */ - List allocationJudgment(ProvinceCompeteDto.AllocationJudgmentAndTall param); + List allocationJudgment(ProvinceCompeteDto.AllocationJudgmentAndTall param,String token); } diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/ProjectMessageVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/ProjectMessageVo.java index 03b464cd..dfccc08e 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/ProjectMessageVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/ProjectMessageVo.java @@ -39,7 +39,7 @@ public class ProjectMessageVo { private Byte readStatus; @ApiModelProperty("消息内容") List messages; - @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone = "GMT-5") + @JsonFormat(pattern="yyyy-MM-dd HH:mm") @ApiModelProperty("发送时间") private Date createTime; } diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index b5408a3a..ebc544af 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: dev - include: util-dev,common + active: test + include: util-test,common From 872523ec5acd9f68da77e38c1e9db6ae8ec52ead Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Tue, 17 Nov 2020 16:42:04 +0800 Subject: [PATCH 42/80] 20201117v1.3 --- .../ccsens/mt/service/CompeteTaskService.java | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java index 47861d36..f320bf6a 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -153,7 +153,9 @@ public class CompeteTaskService implements ICompeteTaskService{ updateTaskInfo.setBeginTime(competeStartOrder.getId()); updateTaskInfo.setBeginTime(competeStartOrder.getEndTime()); updateTaskInfo.setToken(token); + log.info("修改tall的任务信息：{}",updateTaskInfo); tallFeignClient.updataTask(updateTaskInfo); + log.info("修改tall的任务信息后返回：{}",updateTaskInfo); } startOrderMapper.updateByPrimaryKeySelective(competeStartOrder); @@ -167,7 +169,9 @@ public class CompeteTaskService implements ICompeteTaskService{ addTask.setEndTime(projectStartTime + orderTime); addTask.setExecutorId(tallRoleId); addTask.setToken(token); + log.info("在tall内添加任务：{}",addTask); JsonResponse normalTaskJsonResponse = tallFeignClient.saveTask(addTask); + log.info("添加任务后返回：{}",normalTaskJsonResponse); if (ObjectUtil.isNotNull(normalTaskJsonResponse)) { TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); if (ObjectUtil.isNotNull(normalTask)) { @@ -227,7 +231,9 @@ public class CompeteTaskService implements ICompeteTaskService{ updateTaskInfo.setBeginTime(competeStartOrder.getId()); updateTaskInfo.setBeginTime(competeStartOrder.getEndTime()); updateTaskInfo.setToken(token); + log.info("修改tall的任务信息：{}",updateTaskInfo); tallFeignClient.updataTask(updateTaskInfo); + log.info("修改tall的任务信息后返回：{}",updateTaskInfo); } startOrderMapper.updateByPrimaryKeySelective(competeStartOrder); @@ -241,7 +247,9 @@ public class CompeteTaskService implements ICompeteTaskService{ addTask.setEndTime(projectStartTime + orderTime); addTask.setExecutorId(1L); addTask.setToken(token); + log.info("在tall内添加任务：{}",addTask); JsonResponse normalTaskJsonResponse = tallFeignClient.saveTask(addTask); + log.info("添加任务后返回：{}",normalTaskJsonResponse); if (ObjectUtil.isNotNull(normalTaskJsonResponse)) { TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); if (ObjectUtil.isNotNull(normalTask)) { @@ -345,9 +353,11 @@ public class CompeteTaskService implements ICompeteTaskService{ saveRole.setRoleName(project.getName()+"-场地"+siteJudgment.getSite()+"-"+jdgmentNum); Long roleId = null; saveRole.setToken(token); - JsonResponse memberJsonResponse = tallFeignClient.saveRole(saveRole); - if (ObjectUtil.isNotNull(memberJsonResponse)) { - MemberVo.RoleInfo roleInfo = memberJsonResponse.getData(); + log.info("在tall内添加角色：{}",saveRole); + JsonResponse roleJsonResponse = tallFeignClient.saveRole(saveRole); + log.info("添加角色后返回：{}",roleJsonResponse); + if (ObjectUtil.isNotNull(roleJsonResponse)) { + MemberVo.RoleInfo roleInfo = roleJsonResponse.getData(); if (ObjectUtil.isNotNull(roleInfo)) { roleId = roleInfo.getRoleId(); } @@ -359,7 +369,9 @@ public class CompeteTaskService implements ICompeteTaskService{ saveMember.setPhone(judgmentInfo.getJudgmentPhone()); saveMember.setRoleId(Arrays.asList(roleId)); saveMember.setToken(token); - tallFeignClient.saveMember(saveMember); + log.info("在tall内添加成员：{}",saveMember); + JsonResponse memberJsonResponse = tallFeignClient.saveMember(saveMember); + log.info("添加成员后返回：{}",memberJsonResponse); //添加任务 //查找场次信息表 CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample(); @@ -377,7 +389,9 @@ public class CompeteTaskService implements ICompeteTaskService{ addTask.setExecutorId(roleId); addTask.setParentTaskId(startOrder.getTaskId()); addTask.setToken(token); + log.info("在tall内添加任务：{}",addTask); JsonResponse normalTaskJsonResponse = tallFeignClient.saveTask(addTask); + log.info("添加任务后返回：{}",normalTaskJsonResponse); if (ObjectUtil.isNotNull(normalTaskJsonResponse)) { TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); if (ObjectUtil.isNotNull(normalTask)) { @@ -386,7 +400,9 @@ public class CompeteTaskService implements ICompeteTaskService{ updatePluginConfig.setWebPath("/home/osct/video-score"); updatePluginConfig.setTaskId(normalTask.getDetailId()); updatePluginConfig.setToken(token); - tallFeignClient.updatePluginConfig(updatePluginConfig); + log.info("修改tall内任务插件配置：{}",updatePluginConfig); + JsonResponse pluginVoJsonResponse = tallFeignClient.updatePluginConfig(updatePluginConfig); + log.info("修改任务插件配置后返回：{}",pluginVoJsonResponse); } } } From 41589c4f0c64ad9687c94ef5dbe70b713e6f9546 Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Tue, 17 Nov 2020 16:54:59 +0800 Subject: [PATCH 43/80] 11-17-4 --- mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml index 98313489..bb4152df 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml @@ -84,8 +84,8 @@ and tcc.id = #{companyId} - - and tcp.name like #{name} + concat('%',#{name, jdbcType=VARCHAR},'%') + and tcp.name like concat('%',#{name, jdbcType=VARCHAR},'%') and tcp.id_card = #{idCard} From 5ea572d786a07e7ea52b7383c69ad9d51fba57b2 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Tue, 17 Nov 2020 16:56:38 +0800 Subject: [PATCH 44/80] =?UTF-8?q?20201117v1.4=E6=B7=BB=E5=8A=A0=E4=BA=86?= =?UTF-8?q?=E4=B8=80=E7=82=B9=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/mt/service/CompeteTaskService.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java index f320bf6a..ad5b8548 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -131,7 +131,12 @@ public class CompeteTaskService implements ICompeteTaskService{ int order = (int) Math.ceil(projectConfig.getSiteNum() / projectPlayerList.size()); //计算每个场次时间 long projectStartTime = projectConfig.getStartTime() + Constant.UPLOAD_VIDEO_TIME; - long orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order); + long orderTime = 0; + if(order == 0) { + orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order); + }else { + log.info("场次为0的比赛：{}",project); + } //场次 int competeOrder = 1; //场地 @@ -209,7 +214,13 @@ public class CompeteTaskService implements ICompeteTaskService{ int order = (int) Math.ceil(projectConfig.getSiteNum() / teamList.size()); //计算每个场次时间 long projectStartTime = projectConfig.getStartTime() + Constant.UPLOAD_VIDEO_TIME; - long orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order); + long orderTime = 0; + if(order == 0) { + orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order); + }else { + log.info("场次为0的比赛：{}",project); + } +// long orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order); //场次 int competeOrder = 1; //场地 From e32effc1c139691fb64e1eb9a457dfb04c1478bb Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Tue, 17 Nov 2020 17:23:44 +0800 Subject: [PATCH 45/80] 20201117v1.5 --- .../mt/bean/dto/ProvinceCompeteDto.java | 4 ++-- .../ccsens/mt/service/CompeteTaskService.java | 21 ++++++++++--------- tall/src/main/resources/application.yml | 4 ++-- 3 files changed, 15 insertions(+), 14 deletions(-) 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 16314894..7ae7749b 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 @@ -224,9 +224,9 @@ public class ProvinceCompeteDto { @ApiModelProperty("场地数量") private int siteNum = 1; @ApiModelProperty("项目开始时间") - private Long startTime; + private Long startTime = 0L; @ApiModelProperty("项目结束时间") - private Long endTime; + private Long endTime = 0L; } @Data diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java index ad5b8548..7ad3e855 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -92,8 +92,8 @@ public class CompeteTaskService implements ICompeteTaskService{ competeProjectConfig = projectConfigList.get(0); competeProjectConfig.setProjectDuration(projectConfig.getDuration()); competeProjectConfig.setSiteNum(projectConfig.getSiteNum()); - competeProjectConfig.setStartTime(projectConfig.getStartTime()); - competeProjectConfig.setEndTime(projectConfig.getEndTime()); + competeProjectConfig.setStartTime(projectConfig.getStartTime() == null ? 0 : projectConfig.getStartTime()); + competeProjectConfig.setEndTime(projectConfig.getEndTime() == null ? 0 : projectConfig.getEndTime()); projectConfigDao.updateByPrimaryKeySelective(competeProjectConfig); }else { //没有则添加 @@ -102,8 +102,8 @@ public class CompeteTaskService implements ICompeteTaskService{ competeProjectConfig.setProjectId(projectConfig.getProjectId()); competeProjectConfig.setProjectDuration(projectConfig.getDuration()); competeProjectConfig.setSiteNum(projectConfig.getSiteNum()); - competeProjectConfig.setStartTime(projectConfig.getStartTime()); - competeProjectConfig.setEndTime(projectConfig.getEndTime()); + competeProjectConfig.setStartTime(projectConfig.getStartTime() == null ? 0 : projectConfig.getStartTime()); + competeProjectConfig.setEndTime(projectConfig.getEndTime() == null ? 0 : projectConfig.getEndTime()); projectConfigDao.insertSelective(competeProjectConfig); } // 生成出场顺序表，存入数据库。在tall内添加对应的任务 @@ -116,6 +116,7 @@ public class CompeteTaskService implements ICompeteTaskService{ * 修改配置时生成出场顺序 */ public void setStartOrder(CompeteProjectConfig projectConfig, Long tallProjectId,Long tallRoleId,String token) { + if (ObjectUtil.isNotNull(projectConfig)) { //查找项目 CompeteProject project = competeProjectDao.selectByPrimaryKey(projectConfig.getProjectId()); @@ -128,14 +129,14 @@ public class CompeteTaskService implements ICompeteTaskService{ List projectPlayerList = projectPlayerMapper.selectByExample(projectPlayerExample); if (CollectionUtil.isNotEmpty(projectPlayerList)) { //计算场次 - int order = (int) Math.ceil(projectConfig.getSiteNum() / projectPlayerList.size()); + int order = (int) Math.ceil(projectPlayerList.size() / projectConfig.getSiteNum()); //计算每个场次时间 long projectStartTime = projectConfig.getStartTime() + Constant.UPLOAD_VIDEO_TIME; long orderTime = 0; - if(order == 0) { + if(order != 0) { orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order); }else { - log.info("场次为0的比赛：{}",project); + log.info("场次为0的比赛：{}------{}",project,projectConfig); } //场次 int competeOrder = 1; @@ -211,14 +212,14 @@ public class CompeteTaskService implements ICompeteTaskService{ List teamList = competeTeamDao.selectByExample(teamExample); if(CollectionUtil.isNotEmpty(teamList)){ //计算场次 - int order = (int) Math.ceil(projectConfig.getSiteNum() / teamList.size()); + int order = (int) Math.ceil(teamList.size() / projectConfig.getSiteNum()); //计算每个场次时间 long projectStartTime = projectConfig.getStartTime() + Constant.UPLOAD_VIDEO_TIME; long orderTime = 0; - if(order == 0) { + if(order != 0) { orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order); }else { - log.info("场次为0的比赛：{}",project); + log.info("场次为0的比赛：{}------{}",project,projectConfig); } // long orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order); //场次 diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index ebc544af..b5408a3a 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: util-test,common + active: dev + include: util-dev,common From 2debd348d3e5f6730d4f00927daf9baa9ac5d725 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Tue, 17 Nov 2020 18:12:11 +0800 Subject: [PATCH 46/80] 20201117v1.6 --- mt/src/main/resources/application.yml | 4 ++-- tall/src/main/java/com/ccsens/tall/web/TaskController.java | 4 +++- tall/src/main/resources/application.yml | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index f59084b0..4ecd13fd 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: common, util-test + active: dev + include: common, util-dev diff --git a/tall/src/main/java/com/ccsens/tall/web/TaskController.java b/tall/src/main/java/com/ccsens/tall/web/TaskController.java index 16c0de60..ab981f86 100644 --- a/tall/src/main/java/com/ccsens/tall/web/TaskController.java +++ b/tall/src/main/java/com/ccsens/tall/web/TaskController.java @@ -10,6 +10,7 @@ import com.ccsens.util.WebConstant; import com.ccsens.util.annotation.OperateType; import io.jsonwebtoken.Claims; import io.swagger.annotations.*; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.util.List; +@Slf4j @Api(tags = "任务相关API" , description = "") @RestController @RequestMapping("/tasks") @@ -224,7 +226,7 @@ public class TaskController { public JsonResponse addTask(HttpServletRequest request, @ApiParam @Validated @RequestBody TaskDto.AddTask addTask) throws Exception { Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); - + log.info("新加任务，userId：{}、任务信息：{}",currentUserId,addTask); TaskVo.NormalTask normalTask = subTimeService.addTask(currentUserId,addTask); return JsonResponse.newInstance().ok(normalTask); } diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index b5408a3a..ebc544af 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: dev - include: util-dev,common + active: test + include: util-test,common From cc5ed3f831195be0a3a3a6b79894ecd7b785e71f Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Wed, 18 Nov 2020 11:01:16 +0800 Subject: [PATCH 47/80] 11-18-1 --- .../com/ccsens/mt/api/ExcelController.java | 6 +- .../java/com/ccsens/mt/bean/vo/TableVo.java | 30 ++++--- .../com/ccsens/mt/service/ExcelService.java | 87 ++++++++++--------- .../com/ccsens/mt/service/IExcelService.java | 2 +- mt/src/main/resources/application.yml | 4 +- .../mapper_dao/CompeteProjectConfigDao.xml | 46 ++++++++-- tall/src/main/resources/application.yml | 1 - 7 files changed, 107 insertions(+), 69 deletions(-) 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/application.yml b/mt/src/main/resources/application.yml index f59084b0..4ecd13fd 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: common, util-test + active: dev + include: common, util-dev 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 diff --git a/tall/src/main/java/com/ccsens/tall/web/TaskController.java b/tall/src/main/java/com/ccsens/tall/web/TaskController.java index ab981f86..e7850019 100644 --- a/tall/src/main/java/com/ccsens/tall/web/TaskController.java +++ b/tall/src/main/java/com/ccsens/tall/web/TaskController.java @@ -228,6 +228,7 @@ public class TaskController { Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); log.info("新加任务，userId：{}、任务信息：{}",currentUserId,addTask); TaskVo.NormalTask normalTask = subTimeService.addTask(currentUserId,addTask); + log.info("添加的任务的信息：{}",normalTask); return JsonResponse.newInstance().ok(normalTask); } diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index ebc544af..b5408a3a 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: util-test,common + active: dev + include: util-dev,common From 54b0d54cf7efcd9d8294532380bea8d370c4009b Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Wed, 18 Nov 2020 14:05:27 +0800 Subject: [PATCH 49/80] 20201118v1.2 --- .../ccsens/mt/api/CompeteTaskController.java | 10 ++++ .../mt/bean/dto/ProvinceCompeteDto.java | 9 ++- .../ccsens/mt/bean/po/CompeteJudgment.java | 11 ++++ .../mt/bean/po/CompeteJudgmentExample.java | 60 +++++++++++++++++++ .../ccsens/mt/bean/vo/ProvinceCompeteVo.java | 16 +++++ .../persist/dao/CompeteProjectConfigDao.java | 7 +++ .../ccsens/mt/service/CompeteTaskService.java | 23 +++++++ .../mt/service/ICompeteTaskService.java | 7 +++ .../mapper_dao/CompeteProjectConfigDao.xml | 13 ++++ .../mapper_raw/CompeteJudgmentMapper.xml | 25 ++++++-- 10 files changed, 175 insertions(+), 6 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java index 7ab4efcb..952debdd 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java @@ -90,4 +90,14 @@ public class CompeteTaskController { return JsonResponse.newInstance().ok(queryJudgmentList); } + @MustLogin + @ApiOperation(value = "查看裁判身份，场次id和比赛项目id等信息", notes = "zy:通过tall内的roleId和detailId，获取裁判的身份，比赛项目相关的信息") + @RequestMapping(value = "/query/projectByTall", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse queryProjectByTall( + @ApiParam @Validated @RequestBody QueryDto params) { + log.info("查看裁判身份场次id：{}",params); + ProvinceCompeteVo.QueryProjectByTall queryProjectByTall = competeTaskService.queryProjectByTall(params.getParam()); + log.info("查看裁判身份场次id：{}",queryProjectByTall); + return JsonResponse.newInstance().ok(queryProjectByTall); + } } 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 48a552ca..ce78afce 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 @@ -289,5 +289,12 @@ public class ProvinceCompeteDto { @ApiModelProperty("备注") private String remark; } - + @Data + @ApiModel("通过tall查看裁判和项目的信息") + public static class ProjectByTall{ + @ApiModelProperty("tall内的任务详情id") + private Long taskDetailId; + @ApiModelProperty("tall内的角色id") + private Long roleId; + } } diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgment.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgment.java index b0fec397..15401e81 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgment.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgment.java @@ -30,6 +30,8 @@ public class CompeteJudgment implements Serializable { private Long memberId; + private Long roleId; + private static final long serialVersionUID = 1L; public Long getId() { @@ -136,6 +138,14 @@ public class CompeteJudgment implements Serializable { this.memberId = memberId; } + public Long getRoleId() { + return roleId; + } + + public void setRoleId(Long roleId) { + this.roleId = roleId; + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -155,6 +165,7 @@ public class CompeteJudgment implements Serializable { sb.append(", updatedAt=").append(updatedAt); sb.append(", recStatus=").append(recStatus); sb.append(", memberId=").append(memberId); + sb.append(", roleId=").append(roleId); sb.append("]"); return sb.toString(); } diff --git a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgmentExample.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgmentExample.java index db725b61..695a1b2c 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgmentExample.java +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgmentExample.java @@ -914,6 +914,66 @@ public class CompeteJudgmentExample { addCriterion("member_id not between", value1, value2, "memberId"); return (Criteria) this; } + + public Criteria andRoleIdIsNull() { + addCriterion("role_id is null"); + return (Criteria) this; + } + + public Criteria andRoleIdIsNotNull() { + addCriterion("role_id is not null"); + return (Criteria) this; + } + + public Criteria andRoleIdEqualTo(Long value) { + addCriterion("role_id =", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdNotEqualTo(Long value) { + addCriterion("role_id <>", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdGreaterThan(Long value) { + addCriterion("role_id >", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdGreaterThanOrEqualTo(Long value) { + addCriterion("role_id >=", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdLessThan(Long value) { + addCriterion("role_id <", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdLessThanOrEqualTo(Long value) { + addCriterion("role_id <=", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdIn(List values) { + addCriterion("role_id in", values, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdNotIn(List values) { + addCriterion("role_id not in", values, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdBetween(Long value1, Long value2) { + addCriterion("role_id between", value1, value2, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdNotBetween(Long value1, Long value2) { + addCriterion("role_id not between", value1, value2, "roleId"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java index 528f1cee..d8796b19 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java @@ -317,4 +317,20 @@ public class ProvinceCompeteVo { } + @Data + @ApiModel("通过tall获取裁判和项目信息") + public static class QueryProjectByTall { + @ApiModelProperty("裁判身份") + private int judgmentNum; + @ApiModelProperty("裁判id") + private Long judgmentId; + @ApiModelProperty("场次id（出场顺序表的id）") + private Long startOrderId; + @ApiModelProperty("比赛项目id") + private Long projectId; + @ApiModelProperty("比赛项目的类型 0计数赛 1花样赛") + private int projectType; + } + + } 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 index 795bf50e..8d50f6ef 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java @@ -36,4 +36,11 @@ public interface CompeteProjectConfigDao extends CompeteProjectConfigMapper { * @return 返回选手列表 */ List queryStartOrderByCompany(@Param("companyId")Long companyId, @Param("projectId")Long projectId, @Param("competeTimeId")Long competeTimeId); + + /** + * 通过taskDetailId查询比赛场次和项目信息 + * @param taskDetailId 任务详情id + * @return 返回比赛项目信息 + */ + ProvinceCompeteVo.QueryProjectByTall queryProjectByTaskDetailId(@Param("taskDetailId")Long taskDetailId); } \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java index 491f6aec..09622578 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -410,6 +410,7 @@ public class CompeteTaskService implements ICompeteTaskService{ log.info("在tall内添加成员：{}",saveMember); JsonResponse memberJsonResponse = tallFeignClient.saveMember(saveMember); log.info("添加成员后返回：{}",memberJsonResponse); + //如果成员已存在， //添加任务 //查找场次信息表 CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample(); @@ -446,4 +447,26 @@ public class CompeteTaskService implements ICompeteTaskService{ } } } + + /** + * 通过tall查看裁判和比赛项目的信息 + */ + @Override + public ProvinceCompeteVo.QueryProjectByTall queryProjectByTall(ProvinceCompeteDto.ProjectByTall param) { + //查询比赛项目信息 + ProvinceCompeteVo.QueryProjectByTall queryProjectByTall = projectConfigDao.queryProjectByTaskDetailId(param.getTaskDetailId()); + log.info("根据taskDetailId查询到的场次和项目信息：{}",queryProjectByTall); + //查询裁判信息 + CompeteJudgment judgment = new CompeteJudgment(); + CompeteJudgmentExample judgmentExample = new CompeteJudgmentExample(); + judgmentExample.createCriteria().andRoleIdEqualTo(param.getRoleId()); + List judgmentList = competeJudgmentDao.selectByExample(judgmentExample); + if(CollectionUtil.isNotEmpty(judgmentList)){ + judgment = judgmentList.get(0); + } + log.info("根据roleId查询到的裁判信息：{}",judgment); + queryProjectByTall.setJudgmentId(judgment.getId()); + queryProjectByTall.setJudgmentNum(judgment.getChiefJudgment()); + return queryProjectByTall; + } } diff --git a/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java index eac02350..e818f955 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java @@ -45,4 +45,11 @@ public interface ICompeteTaskService { * @return */ List allocationJudgment(ProvinceCompeteDto.AllocationJudgmentAndTall param,String token); + + /** + * 通过tall的任务id和角色id查询裁判和比赛项目的信息 + * @param param + * @return + */ + ProvinceCompeteVo.QueryProjectByTall queryProjectByTall(ProvinceCompeteDto.ProjectByTall param); } diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml index 86c4dd88..5b4155f4 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml @@ -279,6 +279,19 @@ and pr.rec_status = 0 ORDER BY so.start_time + \ No newline at end of file diff --git a/mt/src/main/resources/mapper_raw/CompeteJudgmentMapper.xml b/mt/src/main/resources/mapper_raw/CompeteJudgmentMapper.xml index 04e31129..f20b6367 100644 --- a/mt/src/main/resources/mapper_raw/CompeteJudgmentMapper.xml +++ b/mt/src/main/resources/mapper_raw/CompeteJudgmentMapper.xml @@ -15,6 +15,7 @@ + @@ -76,7 +77,7 @@ id, name, phone, remark, compete_time_id, site, project_id, user_id, chief_judgment, - created_at, updated_at, rec_status, member_id + created_at, updated_at, rec_status, member_id, role_id @@ -253,6 +260,9 @@ member_id = #{record.memberId,jdbcType=BIGINT}, + + role_id = #{record.roleId,jdbcType=BIGINT}, + @@ -272,7 +282,8 @@ created_at = #{record.createdAt,jdbcType=TIMESTAMP}, updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, rec_status = #{record.recStatus,jdbcType=TINYINT}, - member_id = #{record.memberId,jdbcType=BIGINT} + member_id = #{record.memberId,jdbcType=BIGINT}, + role_id = #{record.roleId,jdbcType=BIGINT} @@ -316,6 +327,9 @@ member_id = #{memberId,jdbcType=BIGINT}, + + role_id = #{roleId,jdbcType=BIGINT}, + where id = #{id,jdbcType=BIGINT} @@ -332,7 +346,8 @@ created_at = #{createdAt,jdbcType=TIMESTAMP}, updated_at = #{updatedAt,jdbcType=TIMESTAMP}, rec_status = #{recStatus,jdbcType=TINYINT}, - member_id = #{memberId,jdbcType=BIGINT} + member_id = #{memberId,jdbcType=BIGINT}, + role_id = #{roleId,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT} \ No newline at end of file From da0a44a27122a0365198371201a831e904a57588 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Wed, 18 Nov 2020 19:58:15 +0800 Subject: [PATCH 50/80] 20201118v1.5 --- .../bean/tall/dto/MemberRoleDto.java | 23 ++ .../cloudutil/bean/tall/vo/MemberVo.java | 10 + .../cloudutil/feign/TallFeignClient.java | 23 ++ .../ccsens/mt/api/CompeteScoreController.java | 13 +- .../ccsens/mt/api/CompeteTaskController.java | 2 +- .../mt/bean/dto/ProvinceCompeteDto.java | 9 + .../java/com/ccsens/mt/bean/dto/VideoDto.java | 2 +- .../java/com/ccsens/mt/bean/vo/CompeteVo.java | 20 +- .../java/com/ccsens/mt/bean/vo/ScoreVo.java | 6 +- .../com/ccsens/mt/bean/vo/VideoProjectVo.java | 4 +- .../mt/persist/dao/CompeteJudgmentDao.java | 2 +- .../mt/persist/dao/CompeteScoreDao.java | 12 + .../ccsens/mt/persist/dao/CompeteTimeDao.java | 7 + .../com/ccsens/mt/service/CompeteService.java | 30 ++- .../ccsens/mt/service/CompeteTaskService.java | 205 +++++++++++------- .../mt/service/CompeteVedioService.java | 25 ++- .../ccsens/mt/service/ICompeteService.java | 6 + .../mt/service/ICompeteTaskService.java | 2 +- .../ccsens/mt/service/ProvinceService.java | 9 + .../mapper_dao/CompeteJudgmentDao.xml | 3 + .../resources/mapper_dao/CompeteScoreDao.xml | 50 +++++ .../resources/mapper_dao/CompeteTimeDao.xml | 13 ++ .../com/ccsens/tall/bean/dto/MemberDto.java | 9 + .../java/com/ccsens/tall/bean/vo/TaskVo.java | 1 - .../tall/service/IProMemberService.java | 7 + .../ccsens/tall/service/ProMemberService.java | 15 ++ .../com/ccsens/tall/web/MemberController.java | 11 +- 27 files changed, 401 insertions(+), 118 deletions(-) diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/MemberRoleDto.java b/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/MemberRoleDto.java index d2ec8f6d..25f734d0 100644 --- a/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/MemberRoleDto.java +++ b/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/MemberRoleDto.java @@ -112,4 +112,27 @@ public class MemberRoleDto { private String token; } + @Data + @ApiModel + public static class GetMemberByPhone{ + @ApiModelProperty("项目id") + private Long projectId; + @ApiModelProperty("手机号") + private String phone; + @ApiModelProperty("token") + private String token; + } + + + @Data + @ApiModel("给角色添加成员") + public static class SaveMemberInRole{ + @NotNull(message = "角色Id不能为空") + @ApiModelProperty("角色id") + private Long roleId; + @ApiModelProperty("成员Id") + private Long memberId; + @ApiModelProperty("token") + private String token; + } } diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/MemberVo.java b/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/MemberVo.java index 5050a6f9..a8849305 100644 --- a/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/MemberVo.java +++ b/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/MemberVo.java @@ -42,4 +42,14 @@ public class MemberVo { @ApiModelProperty("userId") private Long userId; } + + + @Data + @ApiModel("查找项目内所有的成员") + public static class MemberList{ + @ApiModelProperty("成员id") + private Long memberId; + @ApiModelProperty("成员名") + private String memberName; + } } diff --git a/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java b/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java index 28e2b13f..86337fd7 100644 --- a/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java +++ b/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java @@ -214,6 +214,19 @@ public interface TallFeignClient { */ @RequestMapping("/members/save") JsonResponse saveMember(MemberRoleDto.SaveMember saveMember); + + /** + * 将成员添加至角色内 + */ + @RequestMapping("/roles/saveMember") + JsonResponse saveMemberInRole(MemberRoleDto.SaveMemberInRole saveMember); + + + /** + * 通过手机号和项目id查询成员信息 + */ + @RequestMapping("/members/query/memberByPhone") + JsonResponse queryMemberByPhone(MemberRoleDto.GetMemberByPhone getMemberByPhone); } @Slf4j @@ -356,6 +369,16 @@ class TallFeignClientFallBack implements FallbackFactory { public JsonResponse saveMember(MemberRoleDto.SaveMember saveMember) { return JsonResponse.newInstance().fail(); } + + @Override + public JsonResponse saveMemberInRole(MemberRoleDto.SaveMemberInRole saveMember) { + return JsonResponse.newInstance().fail(); + } + + @Override + public JsonResponse queryMemberByPhone(MemberRoleDto.GetMemberByPhone getMemberByPhone) { + return JsonResponse.newInstance().fail(); + } }; } diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java index 6bff8f81..17421f36 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java @@ -42,8 +42,6 @@ public class CompeteScoreController { return JsonResponse.newInstance().ok(playerList); } - - @MustLogin @ApiOperation(value = "花样赛提交分数", notes = "Mr.王----提交成绩到那个花样赛得表里面就行了，单表操作") @RequestMapping(value = "/submitOrderList", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) @@ -89,6 +87,17 @@ public class CompeteScoreController { return JsonResponse.newInstance().ok(countScoreCurrentSites); } + + @MustLogin + @ApiOperation(value = "查看计数赛成绩公示表", notes = "多表关联之后，查询当前你场次得分数信息") + @RequestMapping(value = "/query/countScoreAll", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse queryCountScoreAll(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("查看计数赛成绩公示表：{}",params); + List countScoreCurrentSites = competeService.queryCountScoreAll(params.getParam()); + log.info("查看计数赛成绩公示表：{}",params); + return JsonResponse.newInstance().ok(countScoreCurrentSites); + } + @MustLogin @ApiOperation(value = "技术赛提交分数", notes = "接受前端得请求参数，插入相关得表中") @RequestMapping(value = "/submitScore", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java index 952debdd..ac30c925 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java @@ -71,7 +71,7 @@ public class CompeteTaskController { @MustLogin @ApiOperation(value = "查看裁判分配信息", notes = "zy:查看每个项目下的每个场地的裁判信息") @RequestMapping(value = "/query/judgment", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse> queryJudgment(@ApiParam @Validated @RequestBody QueryDto params) { + public JsonResponse> queryJudgment(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查看裁判分配信息：{}",params); List queryJudgmentList = competeTaskService.queryJudgment(params.getParam()); log.info("查看裁判分配信息：{}",queryJudgmentList); 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 ce78afce..f19fc4cd 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 @@ -23,6 +23,15 @@ public class ProvinceCompeteDto { private Long companyId; } + @Data + @ApiModel("查看裁判分配表信息") + public static class QueryJudgment{ + @NotNull + @ApiModelProperty("大赛id") + private Long competeTimeId; + @ApiModelProperty("比赛项目id，不传则查询全部") + private Long projectId; + } @Data @ApiModel("一级项目id") diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java index e1d9008b..e1425f72 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java @@ -64,7 +64,7 @@ public class VideoDto { private String videoPath; } @Data - @ApiModel("查看所有二级比赛项目") + @ApiModel("查看所有二级比赛项目()") public static class GetTwoProject{ @ApiModelProperty("大赛id") private Long teamId; diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java index 23b9a1dd..89d542c3 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java @@ -472,25 +472,25 @@ public class CompeteVo { @ApiModelProperty("参赛队员名") public String peopleName; @ApiModelProperty("裁判1") - public BigDecimal referee1; + public BigDecimal referee1 = new BigDecimal(0); @ApiModelProperty("裁判2") - public BigDecimal referee2; + public BigDecimal referee2 = new BigDecimal(0); @ApiModelProperty("裁判3") - public BigDecimal referee3; + public BigDecimal referee3 = new BigDecimal(0); @ApiModelProperty("1-3裁判得平均值") - public BigDecimal avg1To3; + public BigDecimal avg1To3 = new BigDecimal(0); @ApiModelProperty("裁判4") - public BigDecimal referee4; + public BigDecimal referee4 = new BigDecimal(0); @ApiModelProperty("裁判5") - public BigDecimal referee5; + public BigDecimal referee5 = new BigDecimal(0); @ApiModelProperty("裁判6") - public BigDecimal referee6; + public BigDecimal referee6 = new BigDecimal(0); @ApiModelProperty("4-6裁判得平均值") - public BigDecimal avg4To6; + public BigDecimal avg4To6 = new BigDecimal(0); @ApiModelProperty("主裁判") - public BigDecimal referee0; + public BigDecimal referee0 = new BigDecimal(0); @ApiModelProperty("最后得分") - public BigDecimal result; + public BigDecimal result = new BigDecimal(0); // @ApiModelProperty("排名") // public int order; } diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/ScoreVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/ScoreVo.java index 6372cc6a..c2ce6cbe 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/ScoreVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/ScoreVo.java @@ -216,13 +216,15 @@ public class ScoreVo { @ApiModelProperty("主裁2打分") private BigDecimal mainTwoScore; @ApiModelProperty("应得分") - private BigDecimal shouldScore; + private Integer shouldScore; @ApiModelProperty("扣除次数") - private BigDecimal deductTime; + private Integer deductTime; @ApiModelProperty("扣除原因") private String deductReason; @ApiModelProperty("最终成绩") private BigDecimal finalScore; + @ApiModelProperty("备注") + private String remark; } } diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java index 0dd30cbb..644838c1 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java @@ -10,12 +10,14 @@ import lombok.Setter; public class VideoProjectVo { @Data - @ApiModel("查看所有二级比赛项目") + @ApiModel("返回所有二级比赛项目（包括项目类型）") public static class GetTwoProject{ @ApiModelProperty("项目id") private Long projectId; @ApiModelProperty("项目名") private String projectName; + @ApiModelProperty("项目类型") + private int projectType; } @Data @ApiModel("查找所有参赛单位") diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteJudgmentDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteJudgmentDao.java index 4361db75..bae23bd2 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteJudgmentDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteJudgmentDao.java @@ -14,5 +14,5 @@ public interface CompeteJudgmentDao extends CompeteJudgmentMapper { * @param competeTimeId 大赛id * @return */ - List queryJudgment(@Param("competeTimeId") Long competeTimeId); + List queryJudgment(@Param("competeTimeId") Long competeTimeId,@Param("projectId") Long projectId); } diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java index 828dae59..aa06f8a0 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java @@ -24,4 +24,16 @@ public interface CompeteScoreDao { List selectCountScoreCurrentSite (@Param("siteId") long siteId); + /** + * 查找计数赛成绩公示（个人比赛） + * @param projectId + * @return + */ + List queryCountScoreAll(@Param("projectId")Long projectId); + /** + * 查找计数赛成绩公示(团队比赛) + * @param projectId + * @return + */ + List queryCountScoreAllByTeam(Long projectId); } diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteTimeDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteTimeDao.java index 5f820582..5532d2b3 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteTimeDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteTimeDao.java @@ -1,6 +1,7 @@ package com.ccsens.mt.persist.dao; import com.ccsens.mt.bean.vo.CompeteVo; +import com.ccsens.mt.bean.vo.VideoProjectVo; import com.ccsens.mt.persist.mapper.CompeteTimeMapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -56,4 +57,10 @@ public interface CompeteTimeDao extends CompeteTimeMapper { */ List queryGroupByProject(@Param("type") int type, @Param("projectId") Long projectId); + /** + * 查看所有二级比赛项目（不包括通级赛） + * @param teamId + * @return + */ + List selectTwoProject(@Param("teamId")Long teamId); } diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java index 026b5502..f459c556 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -15,7 +15,6 @@ import com.ccsens.mt.bean.dto.ScoreDto; import com.ccsens.mt.bean.po.*; import com.ccsens.mt.bean.vo.CompeteVo; import com.ccsens.mt.bean.vo.ScoreVo; -import com.ccsens.mt.bean.vo.TableVo; import com.ccsens.mt.persist.dao.*; import com.ccsens.mt.persist.mapper.*; import com.ccsens.mt.util.Constant; @@ -23,8 +22,6 @@ import com.ccsens.util.*; import com.ccsens.util.bean.dto.QueryDto; import com.ccsens.util.exception.BaseException; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFRow; import org.apache.poi.xssf.usermodel.XSSFSheet; @@ -39,7 +36,6 @@ import javax.annotation.Resource; import java.io.*; import java.math.BigDecimal; -import java.util.*; import java.util.ArrayList; import java.util.HashMap; @@ -106,14 +102,19 @@ public class CompeteService implements ICompeteService { List competeStartOrdersList = competeStartOrderMapper.selectByExample(competeStartOrderExample); competeStartOrdersList.forEach(competeStartOrder -> { //一个人或者一个团队得数据 - CompeteVo.TotalScoreDisplay totalScoreDisplay=new CompeteVo.TotalScoreDisplay(); + CompeteVo.TotalScoreDisplay totalScoreDisplay = new CompeteVo.TotalScoreDisplay(); //项目名 - totalScoreDisplay.setCompanyName(competeProjectMapper.selectByPrimaryKey(competeStartOrder.getProjectId()).getName()); - + CompeteProject project = competeProjectMapper.selectByPrimaryKey(competeStartOrder.getProjectId()); + if(ObjectUtil.isNotNull(project)) { + totalScoreDisplay.setCompanyName(project.getName()); + } //名字 if(competeStartOrder.getTeam().equals((byte) 0)){ //个人 - totalScoreDisplay.setPeopleName( competePlayerDao.selectByPrimaryKey(competeStartOrder.getPlayerId()).getName()); + CompetePlayer player = competePlayerDao.selectByPrimaryKey(competeStartOrder.getPlayerId()); + if(ObjectUtil.isNotNull(player)) { + totalScoreDisplay.setPeopleName(player.getName()); + } }else { //团体 CompeteTeamMemberExample competeTeamMemberExample =new CompeteTeamMemberExample(); @@ -1250,4 +1251,17 @@ public class CompeteService implements ICompeteService { competeCountScoreMapper.insert(competeCountScore); } + @Override + public List queryCountScoreAll(ScoreDto.ShowResult param) { + List countScoreCurrentSiteList = new ArrayList<>(); + CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId()); + if(ObjectUtil.isNotNull(competeProject)) { + if(competeProject.getTeam() == 0) { + countScoreCurrentSiteList = competeScoreDao.queryCountScoreAll(param.getProjectId()); + }else { + countScoreCurrentSiteList = competeScoreDao.queryCountScoreAllByTeam(param.getProjectId()); + } + } + return countScoreCurrentSiteList; + } } \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java index 09622578..e0d9abb8 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -307,8 +307,8 @@ public class CompeteTaskService implements ICompeteTaskService{ * 查看裁判分配信息 */ @Override - public List queryJudgment(CompeteDto.CompeteTime param) { - List queryJudgmentList = competeJudgmentDao.queryJudgment(param.getCompeteTimeId()); + public List queryJudgment(ProvinceCompeteDto.QueryJudgment param) { + List queryJudgmentList = competeJudgmentDao.queryJudgment(param.getCompeteTimeId(),param.getProjectId()); if(CollectionUtil.isNotEmpty(queryJudgmentList)){ queryJudgmentList.forEach(projectJudgment -> { //裁判数量 @@ -359,7 +359,7 @@ public class CompeteTaskService implements ICompeteTaskService{ } } } - return competeJudgmentDao.queryJudgment(param.getCompeteTimeId()); + return competeJudgmentDao.queryJudgment(param.getCompeteTimeId(),null); } /** @@ -369,79 +369,126 @@ public class CompeteTaskService implements ICompeteTaskService{ , ProvinceCompeteDto.SiteJudgment siteJudgment, ProvinceCompeteDto.JudgmentInfo judgmentInfo,String token) { // TODO 查找该手机号在此项目之前的裁判信息，修改，同时修改tall内的成员角色信息 //添加裁判信息 - CompeteJudgment competeJudgment = new CompeteJudgment(); - competeJudgment.setId(snowflake.nextId()); - competeJudgment.setName(judgmentInfo.getJudgmentName()); - competeJudgment.setPhone(judgmentInfo.getJudgmentPhone()); - competeJudgment.setRemark(judgmentInfo.getRemark()); - competeJudgment.setCompeteTimeId(competeTimeId); - competeJudgment.setProjectId(project.getId()); - competeJudgment.setSite(siteJudgment.getSite()); - competeJudgment.setChiefJudgment((byte) judgmentInfo.getJudgmentNum()); - competeJudgmentDao.insertSelective(competeJudgment); - //添加角色 - MemberRoleDto.SaveRole saveRole = new MemberRoleDto.SaveRole(); - saveRole.setProjectId(tallProjectId); - String jdgmentNum = ""; - if(judgmentInfo.getJudgmentNum() == 0){ - jdgmentNum = "主裁判"; + //查找该项目下的该场地的裁判信息 + CompeteJudgment competeJudgment; + CompeteJudgmentExample competeJudgmentExample = new CompeteJudgmentExample(); + competeJudgmentExample.createCriteria().andProjectIdEqualTo(project.getId()).andCompeteTimeIdEqualTo(competeTimeId) + .andSiteEqualTo(siteJudgment.getSite()).andChiefJudgmentEqualTo((byte) judgmentInfo.getJudgmentNum()); + List competeJudgmentList = competeJudgmentDao.selectByExample(competeJudgmentExample); + if(CollectionUtil.isNotEmpty(competeJudgmentList)){ + competeJudgment = competeJudgmentList.get(0); + competeJudgment.setName(judgmentInfo.getJudgmentName()); + competeJudgment.setPhone(judgmentInfo.getJudgmentPhone()); + competeJudgment.setRemark(judgmentInfo.getRemark()); + competeJudgment.setCompeteTimeId(competeTimeId); + competeJudgment.setProjectId(project.getId()); + competeJudgment.setSite(siteJudgment.getSite()); + competeJudgment.setChiefJudgment((byte) judgmentInfo.getJudgmentNum()); + competeJudgmentDao.updateByPrimaryKeySelective(competeJudgment); + //修改角色 + //修改成员 + //修改任务 }else { - jdgmentNum = "裁判"+judgmentInfo.getJudgmentNum(); - } - saveRole.setRoleName(project.getName()+"-场地"+siteJudgment.getSite()+"-"+jdgmentNum); - Long roleId = null; - saveRole.setToken(token); - log.info("在tall内添加角色：{}",saveRole); - JsonResponse roleJsonResponse = tallFeignClient.saveRole(saveRole); - log.info("添加角色后返回：{}",roleJsonResponse); - if (ObjectUtil.isNotNull(roleJsonResponse)) { - MemberVo.RoleInfo roleInfo = roleJsonResponse.getData(); - if (ObjectUtil.isNotNull(roleInfo)) { - roleId = roleInfo.getRoleId(); + competeJudgment = new CompeteJudgment(); + competeJudgment.setId(snowflake.nextId()); + competeJudgment.setName(judgmentInfo.getJudgmentName()); + competeJudgment.setPhone(judgmentInfo.getJudgmentPhone()); + competeJudgment.setRemark(judgmentInfo.getRemark()); + competeJudgment.setCompeteTimeId(competeTimeId); + competeJudgment.setProjectId(project.getId()); + competeJudgment.setSite(siteJudgment.getSite()); + competeJudgment.setChiefJudgment((byte) judgmentInfo.getJudgmentNum()); + competeJudgmentDao.insertSelective(competeJudgment); + //添加角色 + MemberRoleDto.SaveRole saveRole = new MemberRoleDto.SaveRole(); + saveRole.setProjectId(tallProjectId); + String jdgmentNum = ""; + if (judgmentInfo.getJudgmentNum() == 0) { + jdgmentNum = "主裁判"; + } else { + jdgmentNum = "裁判" + judgmentInfo.getJudgmentNum(); } - } - //添加成员 - MemberRoleDto.SaveMember saveMember = new MemberRoleDto.SaveMember(); - saveMember.setMemberName(judgmentInfo.getJudgmentName()); - saveMember.setProjectId(tallProjectId); - saveMember.setPhone(judgmentInfo.getJudgmentPhone()); - saveMember.setRoleId(Arrays.asList(roleId)); - saveMember.setToken(token); - log.info("在tall内添加成员：{}",saveMember); - JsonResponse memberJsonResponse = tallFeignClient.saveMember(saveMember); - log.info("添加成员后返回：{}",memberJsonResponse); - //如果成员已存在， - //添加任务 - //查找场次信息表 - CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample(); - startOrderExample.createCriteria().andProjectIdEqualTo(project.getId()) - .andSiteEqualTo((byte) siteJudgment.getSite()); - List startOrderList = startOrderMapper.selectByExample(startOrderExample); - if(CollectionUtil.isNotEmpty(startOrderList)){ - for(CompeteStartOrder startOrder : startOrderList) { - TallTaskDto.AddTask addTask = new TallTaskDto.AddTask(); - addTask.setProjectId(tallProjectId); - addTask.setTaskName(project.getName() + startOrder.getCompeteOrder() + "-" - + startOrder.getSite() + "-" + jdgmentNum); - addTask.setBeginTime(startOrder.getStartTime()); - addTask.setEndTime(startOrder.getEndTime()); - addTask.setExecutorId(roleId); - addTask.setParentTaskId(startOrder.getTaskId()); - addTask.setToken(token); - log.info("在tall内添加任务：{}",addTask); - JsonResponse normalTaskJsonResponse = tallFeignClient.saveTask(addTask); - log.info("添加任务后返回：{}",normalTaskJsonResponse); - if (ObjectUtil.isNotNull(normalTaskJsonResponse)) { - TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); - if (ObjectUtil.isNotNull(normalTask)) { - //修改任务插件配置信息 - TallTaskDto.UpdatePluginConfig updatePluginConfig = new TallTaskDto.UpdatePluginConfig(); - updatePluginConfig.setWebPath("/home/osct/video-score"); - updatePluginConfig.setTaskId(normalTask.getDetailId()); - updatePluginConfig.setToken(token); - log.info("修改tall内任务插件配置：{}",updatePluginConfig); - JsonResponse pluginVoJsonResponse = tallFeignClient.updatePluginConfig(updatePluginConfig); - log.info("修改任务插件配置后返回：{}",pluginVoJsonResponse); + saveRole.setRoleName(project.getName() + "-场地" + siteJudgment.getSite() + "-" + jdgmentNum); + Long roleId = null; + saveRole.setToken(token); + log.info("在tall内添加角色：{}", saveRole); + JsonResponse roleJsonResponse = tallFeignClient.saveRole(saveRole); + log.info("添加角色后返回：{}", roleJsonResponse); + if (ObjectUtil.isNotNull(roleJsonResponse)) { + MemberVo.RoleInfo roleInfo = roleJsonResponse.getData(); + if (ObjectUtil.isNotNull(roleInfo)) { + roleId = roleInfo.getRoleId(); + } + } + //添加成员 + MemberRoleDto.SaveMember saveMember = new MemberRoleDto.SaveMember(); + saveMember.setMemberName(judgmentInfo.getJudgmentName()); + saveMember.setProjectId(tallProjectId); + saveMember.setPhone(judgmentInfo.getJudgmentPhone()); + saveMember.setRoleId(Arrays.asList(roleId)); + saveMember.setToken(token); + log.info("在tall内添加成员：{}", saveMember); + JsonResponse memberJsonResponse = tallFeignClient.saveMember(saveMember); + log.info("添加成员后返回：{}", memberJsonResponse); + //如果成员已存在，查询成员信息然后添加至角色内 + Long memberId = null; + if (ObjectUtil.isNotNull(memberJsonResponse)) { + //code等于21代表成员已存在 + if(memberJsonResponse.getCode() == 21){ + //查询该手机号在项目内的成员的id + MemberRoleDto.GetMemberByPhone getMemberByPhone = new MemberRoleDto.GetMemberByPhone(); + getMemberByPhone.setProjectId(tallProjectId); + getMemberByPhone.setPhone(judgmentInfo.getJudgmentPhone()); + getMemberByPhone.setToken(token); + JsonResponse memberListJsonResponse = tallFeignClient.queryMemberByPhone(getMemberByPhone); + if (ObjectUtil.isNotNull(memberListJsonResponse)) { + MemberVo.MemberList memberList = memberListJsonResponse.getData(); + if (ObjectUtil.isNotNull(memberList)) { + memberId = memberList.getMemberId(); + } + } + //将该成员添加至角色下 + if(ObjectUtil.isNotNull(roleId) && ObjectUtil.isNotNull(memberId)){ + MemberRoleDto.SaveMemberInRole saveMemberInRole = new MemberRoleDto.SaveMemberInRole(); + saveMemberInRole.setRoleId(roleId); + saveMemberInRole.setMemberId(memberId); + saveMemberInRole.setToken(token); + tallFeignClient.saveMemberInRole(saveMemberInRole); + } + } + } + //添加任务 + //查找场次信息表 + CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample(); + startOrderExample.createCriteria().andProjectIdEqualTo(project.getId()) + .andSiteEqualTo((byte) siteJudgment.getSite()); + List startOrderList = startOrderMapper.selectByExample(startOrderExample); + if (CollectionUtil.isNotEmpty(startOrderList)) { + for (CompeteStartOrder startOrder : startOrderList) { + TallTaskDto.AddTask addTask = new TallTaskDto.AddTask(); + addTask.setProjectId(tallProjectId); + addTask.setTaskName(project.getName() + startOrder.getCompeteOrder() + "-" + + startOrder.getSite() + "-" + jdgmentNum); + addTask.setBeginTime(startOrder.getStartTime()); + addTask.setEndTime(startOrder.getEndTime()); + addTask.setExecutorId(roleId); + addTask.setParentTaskId(startOrder.getTaskId()); + addTask.setToken(token); + log.info("在tall内添加任务：{}", addTask); + JsonResponse normalTaskJsonResponse = tallFeignClient.saveTask(addTask); + log.info("添加任务后返回：{}", normalTaskJsonResponse); + if (ObjectUtil.isNotNull(normalTaskJsonResponse)) { + TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); + if (ObjectUtil.isNotNull(normalTask)) { + //修改任务插件配置信息 + TallTaskDto.UpdatePluginConfig updatePluginConfig = new TallTaskDto.UpdatePluginConfig(); + updatePluginConfig.setWebPath("/home/osct/video-score"); + updatePluginConfig.setTaskId(normalTask.getDetailId()); + updatePluginConfig.setToken(token); + log.info("修改tall内任务插件配置：{}", updatePluginConfig); + JsonResponse pluginVoJsonResponse = tallFeignClient.updatePluginConfig(updatePluginConfig); + log.info("修改任务插件配置后返回：{}", pluginVoJsonResponse); + } } } } @@ -456,6 +503,9 @@ public class CompeteTaskService implements ICompeteTaskService{ //查询比赛项目信息 ProvinceCompeteVo.QueryProjectByTall queryProjectByTall = projectConfigDao.queryProjectByTaskDetailId(param.getTaskDetailId()); log.info("根据taskDetailId查询到的场次和项目信息：{}",queryProjectByTall); + if(ObjectUtil.isNull(queryProjectByTall)){ + queryProjectByTall = new ProvinceCompeteVo.QueryProjectByTall(); + } //查询裁判信息 CompeteJudgment judgment = new CompeteJudgment(); CompeteJudgmentExample judgmentExample = new CompeteJudgmentExample(); @@ -463,10 +513,11 @@ public class CompeteTaskService implements ICompeteTaskService{ List judgmentList = competeJudgmentDao.selectByExample(judgmentExample); if(CollectionUtil.isNotEmpty(judgmentList)){ judgment = judgmentList.get(0); + log.info("根据roleId查询到的裁判信息：{}",judgment); + queryProjectByTall.setJudgmentId(judgment.getId()); + queryProjectByTall.setJudgmentNum(judgment.getChiefJudgment()); } - log.info("根据roleId查询到的裁判信息：{}",judgment); - queryProjectByTall.setJudgmentId(judgment.getId()); - queryProjectByTall.setJudgmentNum(judgment.getChiefJudgment()); + return queryProjectByTall; } } diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java index 55e9c715..78dbb874 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java @@ -81,18 +81,19 @@ public class CompeteVedioService implements ICompeteVedioService{ @Override public List selectTwoProject(QueryDto params) { - CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(params.getParam().getTeamId()); - CompeteProjectExample competeCompanyExample=new CompeteProjectExample(); - competeCompanyExample.createCriteria().andTypeEqualTo(competeTime.getType()).andLevelEqualTo((byte) 2); - List list=competeProjectMapper.selectByExample(competeCompanyExample); - List list1=new ArrayList<>(); - list.forEach(mes->{ - VideoProjectVo.GetTwoProject getTwoProject=new VideoProjectVo.GetTwoProject(); - getTwoProject.setProjectId(mes.getId()); - getTwoProject.setProjectName(mes.getName()); - list1.add(getTwoProject); - }); - return list1; + List getTwoProjects = competeTimeDao.selectTwoProject(params.getParam().getTeamId()); +// CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(params.getParam().getTeamId()); +// CompeteProjectExample competeCompanyExample=new CompeteProjectExample(); +// competeCompanyExample.createCriteria().andTypeEqualTo(competeTime.getType()).andLevelEqualTo((byte) 2); +// List list=competeProjectMapper.selectByExample(competeCompanyExample); +// List list1=new ArrayList<>(); +// list.forEach(mes->{ +// VideoProjectVo.GetTwoProject getTwoProject=new VideoProjectVo.GetTwoProject(); +// getTwoProject.setProjectId(mes.getId()); +// getTwoProject.setProjectName(mes.getName()); +// list1.add(getTwoProject); +// }); + return getTwoProjects; } @Override diff --git a/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java b/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java index bdc7be69..a10a63aa 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java @@ -187,6 +187,12 @@ public interface ICompeteService { void submitScore(CompeteDto.SubmitScore params) ; + /** + * 查看技术赛成绩公示表 + * @param param + * @return + */ + List queryCountScoreAll(ScoreDto.ShowResult param); } diff --git a/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java index e818f955..abc75755 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java @@ -37,7 +37,7 @@ public interface ICompeteTaskService { * @param param * @return */ - List queryJudgment(CompeteDto.CompeteTime param); + List queryJudgment(ProvinceCompeteDto.QueryJudgment param); /** * 为项目分配裁判 diff --git a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java index e29afc35..85049a30 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -9,6 +9,7 @@ import cn.hutool.core.util.StrUtil; 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.CompeteVo; import com.ccsens.mt.bean.vo.ProvinceCompeteVo; import com.ccsens.mt.persist.dao.CompeteCompanyDao; import com.ccsens.mt.persist.dao.CompetePlayerDao; @@ -512,6 +513,14 @@ public class ProvinceService implements IProvinceService { */ @Override public void playerJoinProject(ProvinceCompeteDto.JoinProject param) { + //判断是否在报名时间内 + CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(param.getCompeteTimeId()); + log.info("检查报名时间是否符合：{}",competeTime); + if(ObjectUtil.isNotNull(competeTime)) { + if (competeTime.getSignUpEndTime() < System.currentTimeMillis()) { + throw new BaseException(CodeEnum.SIGN_UP_TIME_FINISHED); + } + } //查找项目信息 CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId()); if(ObjectUtil.isNull(competeProject)){ throw new BaseException(CodeEnum.PARAM_ERROR); } diff --git a/mt/src/main/resources/mapper_dao/CompeteJudgmentDao.xml b/mt/src/main/resources/mapper_dao/CompeteJudgmentDao.xml index 548c3235..5424e8a1 100644 --- a/mt/src/main/resources/mapper_dao/CompeteJudgmentDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteJudgmentDao.xml @@ -37,6 +37,9 @@ LEFT JOIN t_compete_judgment j on j.project_id = p.id WHERE ct.id = #{competeTimeId} + + and p.id = #{projectId} + and p.`level` = 2 and p.certificate = 0 and p.rec_status = 0 diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml index 43ea9e8f..d920ffd4 100644 --- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml @@ -104,6 +104,56 @@ and tccs.rec_status =0 and tcso.id =#{siteId} + + \ No newline at end of file diff --git a/mt/src/main/resources/mapper_dao/CompeteTimeDao.xml b/mt/src/main/resources/mapper_dao/CompeteTimeDao.xml index 9f3d834e..0d59e547 100644 --- a/mt/src/main/resources/mapper_dao/CompeteTimeDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteTimeDao.xml @@ -130,4 +130,17 @@ GROUP BY tcvs.`judgment_id` + \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/dto/MemberDto.java b/tall/src/main/java/com/ccsens/tall/bean/dto/MemberDto.java index 7e2e5e27..a5c7c4de 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/dto/MemberDto.java +++ b/tall/src/main/java/com/ccsens/tall/bean/dto/MemberDto.java @@ -40,6 +40,15 @@ public class MemberDto { private Long memberId; } + @Data + @ApiModel + public static class GetMemberByPhone{ + @ApiModelProperty("项目id") + private Long projectId; + @ApiModelProperty("手机号") + private String phone; + } + @Data @ApiModel("修改成员信息") public static class UpdateMemberInfo{ diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java index 4a009742..10cb5edb 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java @@ -164,7 +164,6 @@ public class TaskVo { public Long getServerTime(){ return System.currentTimeMillis(); } - } @ApiModel diff --git a/tall/src/main/java/com/ccsens/tall/service/IProMemberService.java b/tall/src/main/java/com/ccsens/tall/service/IProMemberService.java index 62f5ff00..22917a3c 100644 --- a/tall/src/main/java/com/ccsens/tall/service/IProMemberService.java +++ b/tall/src/main/java/com/ccsens/tall/service/IProMemberService.java @@ -77,4 +77,11 @@ public interface IProMemberService { * @return 返回所有成员信息 */ List queryMembersByProjectId(Long projectId); + + /** + * 通过手机号查找项目内的 + * @param memberByPhone + * @return + */ + ProjectVo.MemberList getMemberByPhone(MemberDto.GetMemberByPhone memberByPhone); } diff --git a/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java b/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java index e0515b4a..d3060c65 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java @@ -15,6 +15,7 @@ import com.ccsens.tall.bean.vo.RoleVo; import com.ccsens.tall.persist.dao.*; import com.ccsens.tall.persist.mapper.SysImitationMapper; import com.ccsens.util.CodeEnum; +import com.ccsens.util.PropUtil; import com.ccsens.util.WebConstant; import com.ccsens.util.exception.BaseException; import lombok.extern.slf4j.Slf4j; @@ -445,4 +446,18 @@ public class ProMemberService implements IProMemberService { public List queryMembersByProjectId(Long projectId) { return proMemberDao.queryMembersByProjectId(projectId); } + + @Override + public ProjectVo.MemberList getMemberByPhone(MemberDto.GetMemberByPhone memberByPhone) { + ProjectVo.MemberList member = null; + ProMemberExample proMemberExample = new ProMemberExample(); + proMemberExample.createCriteria().andProjectIdEqualTo(memberByPhone.getProjectId()).andPhoneEqualTo(memberByPhone.getPhone()); + List memberList = proMemberDao.selectByExample(proMemberExample); + if(CollectionUtil.isNotEmpty(memberList)){ + member = new ProjectVo.MemberList(); + member.setMemberId(memberList.get(0).getId()); + member.setMemberName(memberList.get(0).getNickname()); + } + return member; + } } diff --git a/tall/src/main/java/com/ccsens/tall/web/MemberController.java b/tall/src/main/java/com/ccsens/tall/web/MemberController.java index 482f43b7..2f6fd750 100644 --- a/tall/src/main/java/com/ccsens/tall/web/MemberController.java +++ b/tall/src/main/java/com/ccsens/tall/web/MemberController.java @@ -91,5 +91,14 @@ public class MemberController { return JsonResponse.newInstance().ok(membersInfo); } - + @ApiOperation(value = "根据手机号和项目id查询成员信息",notes = "") + @ApiImplicitParams({ + }) + @RequestMapping(value = "/query/memberByPhone", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse queryMemberByPhone(HttpServletRequest request, + @ApiParam @Validated @RequestBody MemberDto.GetMemberByPhone memberByPhone) { + Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); + ProjectVo.MemberList membersInfo = proMemberService.getMemberByPhone(memberByPhone); + return JsonResponse.newInstance().ok(membersInfo); + } } From dcab17f8504a99df8b59d9d899bacf49f63890c4 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Thu, 19 Nov 2020 11:22:28 +0800 Subject: [PATCH 51/80] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ccsens/mt/service/ExcelService.java | 14 ++++++++++---- mt/src/main/resources/application.yml | 4 ++-- util/src/main/java/com/ccsens/util/PoiUtil.java | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) 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 24fc463a..a810070f 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -346,6 +346,8 @@ public class ExcelService implements IExcelService { for (CompeteProjectPlayer competeProjectPlayer : competeProjectPlayerList) { //查询每个报名人的详细信息下 CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(competeProjectPlayer.getPlayerId()); + if(ObjectUtil.isNotNull(competePlayer)){ + TableVo.CompeteJoin competeJoin = new TableVo.CompeteJoin(); //姓名 competeJoin.setName(competePlayer.getName()); @@ -401,6 +403,7 @@ public class ExcelService implements IExcelService { //项目id competeJoin.setProjectId(competeProject.getId()); competeJoinList.add(competeJoin); + } } } else { //团队项目 @@ -416,6 +419,8 @@ public class ExcelService implements IExcelService { for (CompeteTeamMember competeTeamMember : competeTeamMemberList) { //查询成员详细信息 CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(competeTeamMember.getPlayerId()); + if(ObjectUtil.isNotNull(competePlayer)){ + TableVo.CompeteJoin competeJoin = new TableVo.CompeteJoin(); //姓名 competeJoin.setName(competePlayer.getName()); @@ -474,6 +479,7 @@ public class ExcelService implements IExcelService { competeJoin.setProjectId(competeProject.getId()); competeJoinList.add(competeJoin); } + } } } } @@ -552,7 +558,7 @@ public class ExcelService implements IExcelService { OutputStream stream = new FileOutputStream(file); wbs.write(stream); stream.close(); - return path; + return PropUtil.imgDomain+filepath; } @@ -650,7 +656,7 @@ public class ExcelService implements IExcelService { OutputStream stream = new FileOutputStream(file); wbs.write(stream); stream.close(); - return path; + return PropUtil.imgDomain+filepath; } @Override @@ -948,7 +954,7 @@ public class ExcelService implements IExcelService { i++; } //生成excel表格对象，并将数据放入 - Workbook wbs = PoiUtil.exportWB("XXX比赛报名汇总表", list, workbook); + Workbook wbs = PoiUtil.exportWB("比赛报名汇总表", list, workbook); //8：关联金山在线文档 String name = "参赛人数统计表" + ".xlsx"; String filepath = "mt/" + DateUtil.today() + "/" + System.currentTimeMillis() + ".xlsx"; @@ -963,7 +969,7 @@ public class ExcelService implements IExcelService { OutputStream stream = new FileOutputStream(file); wbs.write(stream); stream.close(); - return path; + return PropUtil.imgDomain+filepath; } diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index f59084b0..4ecd13fd 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: common, util-test + active: dev + include: common, util-dev diff --git a/util/src/main/java/com/ccsens/util/PoiUtil.java b/util/src/main/java/com/ccsens/util/PoiUtil.java index 3bbcb1c2..af0f96ad 100644 --- a/util/src/main/java/com/ccsens/util/PoiUtil.java +++ b/util/src/main/java/com/ccsens/util/PoiUtil.java @@ -177,7 +177,7 @@ public class PoiUtil { // } CellStyle style = wb.createCellStyle(); //设置内容 - if (!cell.value.equals(WebConstant.CELL_NULL)){ + if (!WebConstant.CELL_NULL.equals(cell.value)){ if(cell.num == 1){ newCell.setCellValue(Integer.parseInt(cell.value)); }else { From ca5cc9577394c2f96f0770501fefcf479a168a74 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Thu, 19 Nov 2020 11:47:58 +0800 Subject: [PATCH 52/80] 20201119v1.1 --- .../resources/mapper_dao/CompeteScoreDao.xml | 17 +++++++++-------- .../tall/service/ProTaskDetailService.java | 4 ++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml index d920ffd4..36f57298 100644 --- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml @@ -106,15 +106,16 @@ + + \ No newline at end of file From 6707874cdf1565f28dea50c4c73f7a126b412552 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Thu, 19 Nov 2020 14:33:58 +0800 Subject: [PATCH 54/80] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E5=90=8D?= =?UTF-8?q?=E8=A1=A8=E7=BC=BA=E5=B0=91=E7=BB=84=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mt/src/main/java/com/ccsens/mt/service/ExcelService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a810070f..47b8a266 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -371,7 +371,7 @@ public class ExcelService implements IExcelService { //查询组别，并赋值 CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(competePlayer.getCompeteGroupId()); if (ObjectUtil.isNotNull(competeGroup)) { - competeJoin.setCompeteGroup(competePlayer.getName()); + competeJoin.setCompeteGroup(competeGroup.getGroupName()); } // //身份证明查询，并赋值 // CommonFile commonFile = commonFileMapper.selectByPrimaryKey(competePlayer.getIdCardFrontFile()); From c8568cf2bba89f82c9b6dee4521a9e0cdeeccd15 Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Thu, 19 Nov 2020 14:56:28 +0800 Subject: [PATCH 55/80] 11-19-2 --- mt/src/main/java/com/ccsens/mt/service/ExcelService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a810070f..47b8a266 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -371,7 +371,7 @@ public class ExcelService implements IExcelService { //查询组别，并赋值 CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(competePlayer.getCompeteGroupId()); if (ObjectUtil.isNotNull(competeGroup)) { - competeJoin.setCompeteGroup(competePlayer.getName()); + competeJoin.setCompeteGroup(competeGroup.getGroupName()); } // //身份证明查询，并赋值 // CommonFile commonFile = commonFileMapper.selectByPrimaryKey(competePlayer.getIdCardFrontFile()); From 1c4efab75620520005762c114a0aa95c40e48933 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Thu, 19 Nov 2020 15:17:48 +0800 Subject: [PATCH 56/80] =?UTF-8?q?=E5=A7=93=E5=90=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mt/src/main/java/com/ccsens/mt/service/ExcelService.java | 1 + 1 file changed, 1 insertion(+) 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 47b8a266..b01ab21a 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -582,6 +582,7 @@ public class ExcelService implements IExcelService { int coach = 0; CompeteCoachExample competeCoachExample = new CompeteCoachExample(); competeCoachExample.createCriteria().andCompanyIdEqualTo(competeCompany.getId()).andIdentityEqualTo((byte) coach); + List competeCoachList = competeCoachMapper.selectByExample(competeCoachExample); long count = competeCoachMapper.countByExample(competeCoachExample); //每个公司的领队数量 CompeteCoachExample competeCoachExample1 = new CompeteCoachExample(); From 29b1de74fe2b885909063c52ebd022417010efb8 Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Thu, 19 Nov 2020 17:58:59 +0800 Subject: [PATCH 57/80] 11-19-2 --- mt/src/main/java/com/ccsens/mt/bean/vo/ScoreVo.java | 2 ++ mt/src/main/java/com/ccsens/mt/service/ExcelService.java | 1 - mt/src/main/resources/mapper_dao/CompeteScoreDao.xml | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/ScoreVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/ScoreVo.java index c2ce6cbe..cb516aa6 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/ScoreVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/ScoreVo.java @@ -225,6 +225,8 @@ public class ScoreVo { private BigDecimal finalScore; @ApiModelProperty("备注") private String remark; + @ApiModelProperty("名词") + private int rangee; } } 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 b01ab21a..5a7e1ff7 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -266,7 +266,6 @@ public class ExcelService implements IExcelService { jiaolianHang.setValue(String.valueOf(jiaolianName)); jiaolianList.add(jiaolianHang); biao.add(jiaolianList); - //再放运动员 StringBuffer yDYLN=new StringBuffer(""); competePlayerList.forEach(cpL->{ diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml index 3e762612..02bfbd9c 100644 --- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml @@ -105,6 +105,7 @@ and tcso.id =#{siteId} select @@ -111,13 +113,13 @@ insert into t_compete_start_order (id, project_id, player_id, team, compete_order, site, created_at, updated_at, rec_status, - task_id, start_time, end_time - ) + task_id, start_time, end_time, + remark, waiver) values (#{id,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, #{playerId,jdbcType=BIGINT}, #{team,jdbcType=TINYINT}, #{competeOrder,jdbcType=TINYINT}, #{site,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, - #{taskId,jdbcType=BIGINT}, #{startTime,jdbcType=BIGINT}, #{endTime,jdbcType=BIGINT} - ) + #{taskId,jdbcType=BIGINT}, #{startTime,jdbcType=BIGINT}, #{endTime,jdbcType=BIGINT}, + #{remark,jdbcType=VARCHAR}, #{waiver,jdbcType=TINYINT}) insert into t_compete_start_order @@ -158,6 +160,12 @@ end_time, + + remark, + + + waiver, + @@ -196,6 +204,12 @@ #{endTime,jdbcType=BIGINT}, + + #{remark,jdbcType=VARCHAR}, + + + #{waiver,jdbcType=TINYINT}, + diff --git a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java index f0c819e2..75eeab2a 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java @@ -26,6 +26,8 @@ import com.ccsens.util.WebConstant; import com.ccsens.util.cron.CronConstant; import com.ccsens.util.cron.NatureToDate; import com.ccsens.util.exception.BaseException; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -73,8 +75,6 @@ public class ProTaskDetailService implements IProTaskDetailService { @Resource private Snowflake snowflake; @Resource - private MtFeignClient mtFeignClient; - @Resource private ProPluginConfigDao pluginConfigDao; @Resource private IRobotService robotService; @@ -86,6 +86,8 @@ public class ProTaskDetailService implements IProTaskDetailService { private ProMemberRoleDao proMemberRoleDao; @Resource private TaskPluginService taskPluginService; + @Resource + private ProShowDao proShowDao; @Override public void saveTaskDetail(ProTaskDetail taskDetail) { @@ -160,11 +162,27 @@ public class ProTaskDetailService implements IProTaskDetailService { List normalTaskList = new ArrayList<>(); TaskVo.GlobalTask globalTask; TaskVo.NormalTask normalTask; - //1、查找一级任务 + SysProject project = sysProjectDao.selectByPrimaryKey(projectId); + if (ObjectUtil.isNull(project)){ + throw new BaseException(CodeEnum.PARAM_ERROR); + } if (endTime < project.getBeginTime() || startTime > project.getEndTime()) { return proTaskInfo; } + //查找项目配置 + ProShowExample proShowExample = new ProShowExample(); + proShowExample.createCriteria().andProjectIdEqualTo(projectId); + List proShowList = proShowDao.selectByExample(proShowExample); + if(CollectionUtil.isNotEmpty(proShowList)){ + ProShow proShow = proShowList.get(0); + if(proShow.getSelectTaskType() == 4){ + return getTaskAndType4ByPM(currentUserId,projectId,startTime,endTime,page,pageSize,roleId); + } + } + + + //1、查找一级任务 ProTaskDetailExample proTaskDetailExample = new ProTaskDetailExample(); proTaskDetailExample.createCriteria().andProjectIdEqualTo(projectId).andLevelEqualTo((byte) 1) .andLevelEqualTo((byte) 1).andBeginTimeLessThanOrEqualTo(endTime).andEndTimeGreaterThanOrEqualTo(startTime); @@ -253,6 +271,105 @@ public class ProTaskDetailService implements IProTaskDetailService { return proTaskInfo; } + //特殊任务分页查找项目经理下的任务（不处理时间） + private TaskVo.ProTaskInfo getTaskAndType4ByPM(Long currentUserId,Long projectId,Long startTime,Long endTime,int page,int pageSize,Long roleId) throws Exception { + List normalTasks = new ArrayList<>(); + //1、查找一级任务 + PageHelper.startPage(page, pageSize); + ProTaskDetailExample proTaskDetailExample = new ProTaskDetailExample(); + proTaskDetailExample.createCriteria().andProjectIdEqualTo(projectId).andLevelEqualTo((byte) 1) + .andLevelEqualTo((byte) 1).andBeginTimeLessThanOrEqualTo(endTime).andEndTimeGreaterThanOrEqualTo(startTime); + proTaskDetailExample.setOrderByClause("begin_time"); + List firstTaskDetailList = taskDetailDao.selectByExample(proTaskDetailExample); + PageInfo pageInfo = new PageInfo<>(firstTaskDetailList); + if (CollectionUtil.isNotEmpty(firstTaskDetailList)) { + int sequence = 1; + for (ProTaskDetail firstTaskDetail : firstTaskDetailList) { + TaskVo.NormalTask normalTask = new TaskVo.NormalTask(); + BeanUtil.copyProperties(firstTaskDetail, normalTask); + normalTask.setDetailId(firstTaskDetail.getId()); + normalTask.setId(taskDeliverService.isTaskOrSubTime(firstTaskDetail.getId())); + normalTask.setSequence(sequence); + // 查询任务名对应的配置 + ProPluginConfigExample configExample = new ProPluginConfigExample(); + configExample.createCriteria().andTaskIdEqualTo(firstTaskDetail.getId()).andPlaceLocationEqualTo((byte) 0); + List proPluginConfigs = pluginConfigDao.selectByExample(configExample); + if (CollectionUtil.isNotEmpty(proPluginConfigs)) { + ProPluginConfig config = proPluginConfigs.get(0); + normalTask.setImportParam(config.getImportParam()); + normalTask.setRoutineLocation(config.getRoutineLocation()); + normalTask.setWebPath(config.getWebPath()); + } + //一级任务配置 + normalTask.setProTaskConfig(getProTaskShow(normalTask.getDetailId())); + + //一级任务完成状态 + ProSubTimeMember firstSubTimeMember = getProcessByUserIdAndTask(currentUserId, normalTask.getId()); + if (ObjectUtil.isNotNull(firstSubTimeMember)) { + normalTask.setRealEndTime(firstSubTimeMember.getRealFinishTime()); + normalTask.setProcess(firstSubTimeMember.getComplatedStatus()); + } + //查找一级任务下的二级任务 + List secondNormalTaskList = taskDetailDao.selectNormalTaskListByPM(projectId, firstTaskDetail.getId(), startTime, endTime, roleId); + if (CollectionUtil.isNotEmpty(secondNormalTaskList)) { + normalTask.setSecondTasks(secondNormalTaskList); + } + sequence++; + normalTasks.add(normalTask); + } + } + //页码 + TaskVo.PageInfo p = new TaskVo.PageInfo(); + p.setCurrentPage(pageInfo.getPageNum()); + p.setTotalPage(pageInfo.getPages()); + + TaskVo.ProTaskInfo proTaskInfo = new TaskVo.ProTaskInfo(); + proTaskInfo.setPageInfo(p); + proTaskInfo.setNormalTaskList(normalTasks); + return proTaskInfo; + } + + private TaskVo.ProTaskInfo getTaskAndType4ByMember(Long currentUserId,Long projectId,Long startTime,Integer imitation, + Long endTime,int page,int pageSize,Long roleId,Long allMemberId,Integer priority) throws Exception { + + //查找该角色的所有任务(全体成员的任务也是这个角色的任务） + PageHelper.startPage(page, pageSize); + List secondTaskVoList = taskDetailDao.selectTaskByRoleAndAllMembers(projectId, roleId, + allMemberId, startTime, endTime, priority); + PageInfo pageInfo = new PageInfo<>(secondTaskVoList); + + if (CollectionUtil.isNotEmpty(secondTaskVoList)) { + for (TaskVo.NormalTask normalTask : secondTaskVoList) { + //处理插件 + managePlugin(currentUserId, roleId, normalTask, imitation); + //任务完成状态 + if (normalTask.getProcess() != 2) { + ProSubTimeMember subTimeMember = getProcessByUserIdAndTask(currentUserId, normalTask.getId()); + if (ObjectUtil.isNotNull(subTimeMember)) { + normalTask.setProcess(subTimeMember.getComplatedStatus()); + normalTask.setRealEndTime(subTimeMember.getRealFinishTime()); + } else if (normalTask.getProcess() > 2) { + normalTask.setRealEndTime((long) 0); + normalTask.setProcess(0); + } + } + //任务配置 + normalTask.setProTaskConfig(getProTaskShow(normalTask.getDetailId())); + //提醒信息 + normalTask.setRemindInfoList(proRemindDao.queryRemindByTask(normalTask.getId())); + } + } + //页码 + TaskVo.PageInfo p = new TaskVo.PageInfo(); + p.setCurrentPage(pageInfo.getPageNum()); + p.setTotalPage(pageInfo.getPages()); + + TaskVo.ProTaskInfo proTaskInfo = new TaskVo.ProTaskInfo(); + proTaskInfo.setPageInfo(p); + proTaskInfo.setNormalTaskList(secondTaskVoList); + return proTaskInfo; + } + /** * 查看任务 项目成员 */ @@ -269,6 +386,16 @@ public class ProTaskDetailService implements IProTaskDetailService { if (ObjectUtil.isNotNull(allMember)) { allMemberId = allMember.getId(); } + //查找项目配置 + ProShowExample proShowExample = new ProShowExample(); + proShowExample.createCriteria().andProjectIdEqualTo(projectId); + List proShowList = proShowDao.selectByExample(proShowExample); + if(CollectionUtil.isNotEmpty(proShowList)){ + ProShow proShow = proShowList.get(0); + if(proShow.getSelectTaskType() == 4){ + return getTaskAndType4ByMember(currentUserId,projectId,startTime,imitation,endTime,page,pageSize,roleId,allMemberId,priority); + } + } //查找该角色的所有任务(全体成员的任务也是这个角色的任务） List secondTaskVoList = taskDetailDao.selectTaskByRoleAndAllMembers(projectId, roleId, allMemberId, startTime, endTime, priority); From a41b60aef00714d244d204ab2df02d1636e6ec0b Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Fri, 20 Nov 2020 17:18:12 +0800 Subject: [PATCH 67/80] 11-20-1 --- .../mt/persist/dao/CompeteProjectDao.java | 5 + .../com/ccsens/mt/service/ExcelService.java | 316 ++++++++++-------- .../mapper_dao/CompeteProjectDao.xml | 54 +++ 3 files changed, 227 insertions(+), 148 deletions(-) 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 index 2955fd3d..de817184 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectDao.java @@ -2,10 +2,13 @@ package com.ccsens.mt.persist.dao; import com.ccsens.mt.bean.po.CompeteProject; import com.ccsens.mt.bean.po.CompeteProjectConfig; +import com.ccsens.mt.bean.vo.TableVo; import com.ccsens.mt.persist.mapper.CompeteProjectConfigMapper; import com.ccsens.mt.persist.mapper.CompeteProjectMapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * * @author: li @@ -13,5 +16,7 @@ import org.apache.ibatis.annotations.Param; */ public interface CompeteProjectDao extends CompeteProjectMapper { CompeteProject getProjectByProjectName(@Param("projectName") String projectId); + List getPlayerForSingle (@Param("level") Byte level, @Param("type") Byte type); + List getPlayerForTeam (@Param("level") Byte level, @Param("type") Byte type); } \ 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 1a9ced92..84855e86 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -323,167 +323,187 @@ public class ExcelService implements IExcelService { } - - private List getCompeteJoin(CompeteDto.CompeteTime params) { List competeJoinList = new ArrayList<>(); Long competeTimeId = params.getCompeteTimeId(); CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(competeTimeId); - int type = competeTime.getType(); + Byte 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()); - if(ObjectUtil.isNotNull(competePlayer)){ + //个人项目名报名 + List playerForSingleList = competeProjectDao.getPlayerForSingle(level, type); + playerForSingleList.forEach(mes->{ + competeJoinList.add(mes); + }); + //团队项目报名 + List playerForTeamList = competeProjectDao.getPlayerForTeam(level, type); + playerForTeamList.forEach(mes->{ + competeJoinList.add(mes); + }); + return competeJoinList; + } - 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(competeGroup.getGroupName()); - } -// //身份证明查询，并赋值 -// 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()); + + +// private List getCompeteJoin(CompeteDto.CompeteTime params) { +// List competeJoinList = new ArrayList<>(); +// Long competeTimeId = params.getCompeteTimeId(); +// CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(competeTimeId); +// int type = competeTime.getType(); +// Byte level = 2; +// Byte recStatus = 0; +// CompeteProjectExample competeProjectExample = new CompeteProjectExample(); +// competeProjectExample.createCriteria().andTypeEqualTo((byte) type).andLevelEqualTo(level).andRecStatusEqualTo(recStatus); +// //获取参赛项目集合 +// 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()).andRecStatusEqualTo(recStatus); +// List competeProjectPlayerList = competeProjectPlayerMapper.selectByExample(competeProjectPlayerExample); +// for (CompeteProjectPlayer competeProjectPlayer : competeProjectPlayerList) { +// //查询每个报名人的详细信息下 +// CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(competeProjectPlayer.getPlayerId()); +// if(ObjectUtil.isNotNull(competePlayer)){ +// +// 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("男"); // } -// //学籍证明/俱乐部证明 -// CommonFile commonFile2 = commonFileMapper.selectByPrimaryKey(competePlayer.getStudentRecordFile()); -// if (ObjectUtil.isNotNull(commonFile2)) { -// competeJoin.setStudentPromise(commonFile2.getVisitLocation()); +// //查询单位,并赋值 +// CompeteCompany competeCompany = competeCompanyMapper.selectByPrimaryKey(competePlayer.getCompanyId()); +// if (ObjectUtil.isNotNull(competeCompany)) { +// competeJoin.setJoinTeam(competeCompany.getName()); // } -// //体检证明 -// CommonFile commonFile3 = commonFileMapper.selectByPrimaryKey(competePlayer.getHealthRecordFile()); -// if (ObjectUtil.isNotNull(commonFile3)) { -// competeJoin.setBodyTest(commonFile3.getVisitLocation()); +// //查询组别，并赋值 +// CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(competePlayer.getCompeteGroupId()); +// if (ObjectUtil.isNotNull(competeGroup)) { +// competeJoin.setCompeteGroup(competeGroup.getGroupName()); // } -// //人身意外伤害保险证明 -// CommonFile commonFile4 = commonFileMapper.selectByPrimaryKey(competePlayer.getInsuranceRecordFile()); -// if (ObjectUtil.isNotNull(commonFile4)) { -// competeJoin.setBodyProtect(commonFile4.getVisitLocation()); +//// //身份证明查询，并赋值 +//// 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); +// //项目id +// competeJoin.setProjectId(competeProject.getId()); +// competeJoinList.add(competeJoin); // } - //参赛项目名赋值 - competeJoin.setCompeteProject(projectName); - //项目id - competeJoin.setProjectId(competeProject.getId()); - 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()); - if(ObjectUtil.isNotNull(competePlayer)){ - - 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()); +// } +// +// } else { //团队项目 +// //获取参赛队伍集合 +// CompeteTeamExample competeTeamExample = new CompeteTeamExample(); +// competeTeamExample.createCriteria().andProjectIdEqualTo(competeProject.getId()).andRecStatusEqualTo(recStatus); +// 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()); +// if(ObjectUtil.isNotNull(competePlayer)){ +// +// 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("男"); // } -// //体检证明 -// CommonFile commonFile3 = commonFileMapper.selectByPrimaryKey(competePlayer.getHealthRecordFile()); -// if (ObjectUtil.isNotNull(commonFile3)){ -// competeJoin.setBodyTest(commonFile3.getVisitLocation()); +// +// //查询单位,并赋值 +// CompeteCompany competeCompany = competeCompanyMapper.selectByPrimaryKey(competePlayer.getCompanyId()); +// if (ObjectUtil.isNotNull(competeCompany)) { +// competeJoin.setJoinTeam(competeCompany.getName()); // } -// //人身意外伤害保险证明 -// CommonFile commonFile4 = commonFileMapper.selectByPrimaryKey(competePlayer.getInsuranceRecordFile()); -// if (ObjectUtil.isNotNull(commonFile4)){ -// competeJoin.setBodyProtect(commonFile4.getVisitLocation()); +// //查询组别，并赋值 +// CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(competePlayer.getCompeteGroupId()); +// if (ObjectUtil.isNotNull(competeGroup)) { +// competeJoin.setCompeteGroup(competePlayer.getName()); // } - //参赛项目名赋值 - competeJoin.setCompeteProject(projectName); - //项目id - competeJoin.setProjectId(competeProject.getId()); - competeJoinList.add(competeJoin); - } - } - } - } - } - return competeJoinList; - } +//// //身份证明查询，并赋值 +//// 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); +// //项目id +// competeJoin.setProjectId(competeProject.getId()); +// competeJoinList.add(competeJoin); +// } +// } +// } +// } +// } +// return competeJoinList; +// } private String getExcelFilePathForCompeteJoin(List arrayList) throws IOException { //创建excle表格对象 diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectDao.xml index 233fac8c..b42730ed 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectDao.xml @@ -7,4 +7,58 @@ where name = #{projectName} and rec_status = 0 + + + + + \ No newline at end of file From 16fd011369474af3f8d417880dc8157206c10b1c Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Fri, 20 Nov 2020 17:19:07 +0800 Subject: [PATCH 68/80] 20201120v1.6 --- .../ccsens/mt/service/CompeteTaskService.java | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java index e5f51fef..668272fe 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -313,7 +313,6 @@ public class CompeteTaskService implements ICompeteTaskService{ queryJudgmentList.forEach(projectJudgment -> { //裁判数量 int count = projectJudgment.getProjectType() == 0 ? 3 : 7; -// if(CollectionUtil.isNotEmpty(projectJudgment.getSiteList())){ for (int i = 0; i < projectJudgment.getSiteNums(); i++) { if(i < projectJudgment.getSiteList().size()){ ProvinceCompeteVo.ProjectSite siteJudgment = projectJudgment.getSiteList().get(i); @@ -341,26 +340,6 @@ public class CompeteTaskService implements ICompeteTaskService{ } } } - - - -// for(ProvinceCompeteVo.ProjectSite siteJudgment : projectJudgment.getSiteList()) { -// if(projectJudgment.getProjectType() == 0){ -// count = 3; -// }else { -// count = 7; -// } -// if (CollectionUtil.isEmpty(siteJudgment.getJudgmentList())) { -// siteJudgment.setJudgmentList(new ArrayList<>()); -// } -// int a = siteJudgment.getJudgmentList().size(); -// for (int i = 0; i < count - a; i++) { -// ProvinceCompeteVo.SiteJudgment siteJudgment1 = new ProvinceCompeteVo.SiteJudgment(); -// siteJudgment1.setJudgmentNum(a + i); -// siteJudgment.getJudgmentList().add(siteJudgment1); -// } -// } -// } }); } return queryJudgmentList; From 082b01b63937ee6ce0fc8f97410f812c1ea7eb0c Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Fri, 20 Nov 2020 17:56:28 +0800 Subject: [PATCH 69/80] 11-19-3 --- .../com/ccsens/mt/bean/dto/CompeteDto.java | 3 - .../persist/dao/CompeteProjectConfigDao.java | 4 +- .../com/ccsens/mt/service/ExcelService.java | 14 +- mt/src/main/resources/application.yml | 4 +- .../mapper_dao/CompeteProjectConfigDao.xml | 154 +++++++++--------- 5 files changed, 83 insertions(+), 96 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java index 5e577495..fb9955ed 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java @@ -320,9 +320,6 @@ public class CompeteDto { @Data @ApiModel public static class EnterInfo{ - @NotNull - @ApiModelProperty("第几届信息的id") - private Long competeTimeId; @ApiModelProperty("项目id") private Long projectId; @ApiModelProperty("组别id") 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 index 8d50f6ef..7edf2578 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java @@ -17,8 +17,8 @@ import java.util.List; public interface CompeteProjectConfigDao extends CompeteProjectConfigMapper { CompeteProjectConfig selectByProjectId(@Param("projectId") Long projectId); List selectDetail (); - List selectSingle (@Param("competeTimeId") Long competeTimeId,@Param("projectId") Long projectId,@Param("groupId") Long groupId,@Param("companyId") Long companyId,@Param("name") String name,@Param("idCard") String idCard); - List selectGroup (@Param("competeTimeId") Long competeTimeId,@Param("projectId") Long projectId,@Param("groupId") Long groupId,@Param("companyId") Long companyId,@Param("name") String name,@Param("idCard") String idCard); + List selectSingle (@Param("projectId") Long projectId,@Param("groupId") Long groupId,@Param("companyId") Long companyId,@Param("name") String name,@Param("idCard") String idCard); + List selectGroup (@Param("projectId") Long projectId,@Param("groupId") Long groupId,@Param("companyId") Long companyId,@Param("name") String name,@Param("idCard") String idCard); CompeteProjectConfig selectStartTime(@Param("projectId") Long projectId); 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 84855e86..9807c02e 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -1145,23 +1145,13 @@ public class ExcelService implements IExcelService { public List getCompeteJoinDetail(CompeteDto.EnterInfo params) { List competeJoinList = new ArrayList<>(); //个人项目查询 - List competeJoinList1 = competeProjectConfigDao.selectSingle(params.getCompeteTimeId(),params.getProjectId(),params.getGroupId(),params.getCompanyId(),params.getName(),params.getIdCard()); + List competeJoinList1 = competeProjectConfigDao.selectSingle(params.getProjectId(),params.getGroupId(),params.getCompanyId(),params.getName(),params.getIdCard()); for (TableVo.CompeteJoin competeJoin : competeJoinList1){ - //获取身份证 - String idCard = competeJoin.getIdCard(); - //根据身份证获取选手年龄并赋值 - int ageByIdCard = IdcardUtil.getAgeByIdCard(idCard); - competeJoin.setAge(ageByIdCard); competeJoinList.add(competeJoin); } //团队项目查询 - List competeJoinList2 = competeProjectConfigDao.selectGroup(params.getCompeteTimeId(),params.getProjectId(),params.getGroupId(),params.getCompanyId(),params.getName(),params.getIdCard()); + List competeJoinList2 = competeProjectConfigDao.selectGroup(params.getProjectId(),params.getGroupId(),params.getCompanyId(),params.getName(),params.getIdCard()); for (TableVo.CompeteJoin competeJoin : competeJoinList2){ - //获取身份证 - String idCard = competeJoin.getIdCard(); - //根据身份证获取选手年龄并赋值 - int ageByIdCard = IdcardUtil.getAgeByIdCard(idCard); - competeJoin.setAge(ageByIdCard); competeJoinList.add(competeJoin); } // Long competeTimeId = params.getCompeteTimeId(); diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index f59084b0..4ecd13fd 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: common, util-test + active: dev + include: common, util-dev diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml index f91a50a9..f097e789 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml @@ -81,79 +81,76 @@ From a791156bb40458cfab1bd209c0a9ba37b13e68a2 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Sat, 21 Nov 2020 12:16:06 +0800 Subject: [PATCH 77/80] 20201121v1.5 --- .../health/service/AbnormalService.java | 1 + .../ht/service/PatientReportService.java | 1 + .../ccsens/mt/service/CompeteTaskService.java | 188 +++++++++--------- .../mapper_dao/CompeteProjectConfigDao.xml | 5 +- 4 files changed, 100 insertions(+), 95 deletions(-) diff --git a/health/src/main/java/com/ccsens/health/service/AbnormalService.java b/health/src/main/java/com/ccsens/health/service/AbnormalService.java index ac57273e..38435f47 100644 --- a/health/src/main/java/com/ccsens/health/service/AbnormalService.java +++ b/health/src/main/java/com/ccsens/health/service/AbnormalService.java @@ -171,6 +171,7 @@ public class AbnormalService implements IAbnormalService { AbnormalDto.AbnormalStatisticsDto abnormalDto = params.getParam(); PageHelper.startPage(abnormalDto.getPage(), abnormalDto.getPageSize()); + List abnormalList = healthAbnormalDao.getAbnormalList(abnormalDto.getPost(), abnormalDto.getDepartment(), abnormalDto.getHealthType()); return new PageInfo<>(abnormalList); diff --git a/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java b/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java index d4d6005c..d8dc38b0 100644 --- a/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java +++ b/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java @@ -163,6 +163,7 @@ public class PatientReportService implements IPatientReportService { List reportVos = new ArrayList<>(); //分页查询报告单列表 PageHelper.startPage(query.getPageNum(), query.getPageSize()); + HtPatientReportExample reportExample = new HtPatientReportExample(); //查询医生信息 HtDoctorExample doctorExample = new HtDoctorExample(); diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java index f250a203..be6beb10 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -109,7 +109,7 @@ public class CompeteTaskService implements ICompeteTaskService{ projectConfigDao.insertSelective(competeProjectConfig); } // 生成出场顺序表，存入数据库。在tall内添加对应的任务 - setStartOrder(competeProjectConfig,param.getProjectId(),param.getTallRoleId(),token); +// setStartOrder(competeProjectConfig,param.getProjectId(),param.getTallRoleId(),token); }); return projectConfigDao.queryProjectConfig(type.get()); @@ -418,99 +418,99 @@ public class CompeteTaskService implements ICompeteTaskService{ competeJudgment.setSite(siteJudgment.getSite()); competeJudgment.setChiefJudgment((byte) judgmentInfo.getJudgmentNum()); competeJudgmentDao.insertSelective(competeJudgment); - //添加角色 - MemberRoleDto.SaveRole saveRole = new MemberRoleDto.SaveRole(); - saveRole.setProjectId(tallProjectId); - String jdgmentNum = ""; - if (judgmentInfo.getJudgmentNum() == 0) { - jdgmentNum = "主裁判"; - } else { - jdgmentNum = "裁判" + judgmentInfo.getJudgmentNum(); - } - saveRole.setRoleName(project.getName() + "-场地" + siteJudgment.getSite() + "-" + jdgmentNum); - Long roleId = null; - saveRole.setToken(token); - log.info("在tall内添加角色：{}", saveRole); - JsonResponse roleJsonResponse = tallFeignClient.saveRole(saveRole); - log.info("添加角色后返回：{}", roleJsonResponse); - if (ObjectUtil.isNotNull(roleJsonResponse)) { - MemberVo.RoleInfo roleInfo = roleJsonResponse.getData(); - if (ObjectUtil.isNotNull(roleInfo)) { - roleId = roleInfo.getRoleId(); - } - } - //添加成员 - MemberRoleDto.SaveMember saveMember = new MemberRoleDto.SaveMember(); - saveMember.setMemberName(judgmentInfo.getJudgmentName()); - saveMember.setProjectId(tallProjectId); - saveMember.setPhone(judgmentInfo.getJudgmentPhone()); - saveMember.setRoleId(Arrays.asList(roleId)); - saveMember.setToken(token); - log.info("在tall内添加成员：{}", saveMember); - JsonResponse memberJsonResponse = tallFeignClient.saveMember(saveMember); - log.info("添加成员后返回：{}", memberJsonResponse); - //如果成员已存在，查询成员信息然后添加至角色内 - Long memberId = null; - if (ObjectUtil.isNotNull(memberJsonResponse)) { - //code等于21代表成员已存在 - if(memberJsonResponse.getCode() == 21){ - //查询该手机号在项目内的成员的id - MemberRoleDto.GetMemberByPhone getMemberByPhone = new MemberRoleDto.GetMemberByPhone(); - getMemberByPhone.setProjectId(tallProjectId); - getMemberByPhone.setPhone(judgmentInfo.getJudgmentPhone()); - getMemberByPhone.setToken(token); - JsonResponse memberListJsonResponse = tallFeignClient.queryMemberByPhone(getMemberByPhone); - if (ObjectUtil.isNotNull(memberListJsonResponse)) { - MemberVo.MemberList memberList = memberListJsonResponse.getData(); - if (ObjectUtil.isNotNull(memberList)) { - memberId = memberList.getMemberId(); - } - } - //将该成员添加至角色下 - if(ObjectUtil.isNotNull(roleId) && ObjectUtil.isNotNull(memberId)){ - MemberRoleDto.SaveMemberInRole saveMemberInRole = new MemberRoleDto.SaveMemberInRole(); - saveMemberInRole.setRoleId(roleId); - saveMemberInRole.setMemberId(memberId); - saveMemberInRole.setToken(token); - tallFeignClient.saveMemberInRole(saveMemberInRole); - } - } - } - //添加任务 - //查找场次信息表 - CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample(); - startOrderExample.createCriteria().andProjectIdEqualTo(project.getId()) - .andSiteEqualTo((byte) siteJudgment.getSite()); - List startOrderList = startOrderMapper.selectByExample(startOrderExample); - if (CollectionUtil.isNotEmpty(startOrderList)) { - for (CompeteStartOrder startOrder : startOrderList) { - TallTaskDto.AddTask addTask = new TallTaskDto.AddTask(); - addTask.setProjectId(tallProjectId); - addTask.setTaskName(project.getName() + startOrder.getCompeteOrder() + "-" - + startOrder.getSite() + "-" + jdgmentNum); - addTask.setBeginTime(startOrder.getStartTime()); - addTask.setEndTime(startOrder.getEndTime()); - addTask.setExecutorId(roleId); - addTask.setParentTaskId(startOrder.getTaskId()); - addTask.setToken(token); - log.info("在tall内添加任务：{}", addTask); - JsonResponse normalTaskJsonResponse = tallFeignClient.saveTask(addTask); - log.info("添加任务后返回：{}", normalTaskJsonResponse); - if (ObjectUtil.isNotNull(normalTaskJsonResponse)) { - TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); - if (ObjectUtil.isNotNull(normalTask)) { - //修改任务插件配置信息 - TallTaskDto.UpdatePluginConfig updatePluginConfig = new TallTaskDto.UpdatePluginConfig(); - updatePluginConfig.setWebPath("/home/osct/video-score"); - updatePluginConfig.setTaskId(normalTask.getDetailId()); - updatePluginConfig.setToken(token); - log.info("修改tall内任务插件配置：{}", updatePluginConfig); - JsonResponse pluginVoJsonResponse = tallFeignClient.updatePluginConfig(updatePluginConfig); - log.info("修改任务插件配置后返回：{}", pluginVoJsonResponse); - } - } - } - } +// //添加角色 +// MemberRoleDto.SaveRole saveRole = new MemberRoleDto.SaveRole(); +// saveRole.setProjectId(tallProjectId); +// String jdgmentNum = ""; +// if (judgmentInfo.getJudgmentNum() == 0) { +// jdgmentNum = "主裁判"; +// } else { +// jdgmentNum = "裁判" + judgmentInfo.getJudgmentNum(); +// } +// saveRole.setRoleName(project.getName() + "-场地" + siteJudgment.getSite() + "-" + jdgmentNum); +// Long roleId = null; +// saveRole.setToken(token); +// log.info("在tall内添加角色：{}", saveRole); +// JsonResponse roleJsonResponse = tallFeignClient.saveRole(saveRole); +// log.info("添加角色后返回：{}", roleJsonResponse); +// if (ObjectUtil.isNotNull(roleJsonResponse)) { +// MemberVo.RoleInfo roleInfo = roleJsonResponse.getData(); +// if (ObjectUtil.isNotNull(roleInfo)) { +// roleId = roleInfo.getRoleId(); +// } +// } +// //添加成员 +// MemberRoleDto.SaveMember saveMember = new MemberRoleDto.SaveMember(); +// saveMember.setMemberName(judgmentInfo.getJudgmentName()); +// saveMember.setProjectId(tallProjectId); +// saveMember.setPhone(judgmentInfo.getJudgmentPhone()); +// saveMember.setRoleId(Arrays.asList(roleId)); +// saveMember.setToken(token); +// log.info("在tall内添加成员：{}", saveMember); +// JsonResponse memberJsonResponse = tallFeignClient.saveMember(saveMember); +// log.info("添加成员后返回：{}", memberJsonResponse); +// //如果成员已存在，查询成员信息然后添加至角色内 +// Long memberId = null; +// if (ObjectUtil.isNotNull(memberJsonResponse)) { +// //code等于21代表成员已存在 +// if(memberJsonResponse.getCode() == 21){ +// //查询该手机号在项目内的成员的id +// MemberRoleDto.GetMemberByPhone getMemberByPhone = new MemberRoleDto.GetMemberByPhone(); +// getMemberByPhone.setProjectId(tallProjectId); +// getMemberByPhone.setPhone(judgmentInfo.getJudgmentPhone()); +// getMemberByPhone.setToken(token); +// JsonResponse memberListJsonResponse = tallFeignClient.queryMemberByPhone(getMemberByPhone); +// if (ObjectUtil.isNotNull(memberListJsonResponse)) { +// MemberVo.MemberList memberList = memberListJsonResponse.getData(); +// if (ObjectUtil.isNotNull(memberList)) { +// memberId = memberList.getMemberId(); +// } +// } +// //将该成员添加至角色下 +// if(ObjectUtil.isNotNull(roleId) && ObjectUtil.isNotNull(memberId)){ +// MemberRoleDto.SaveMemberInRole saveMemberInRole = new MemberRoleDto.SaveMemberInRole(); +// saveMemberInRole.setRoleId(roleId); +// saveMemberInRole.setMemberId(memberId); +// saveMemberInRole.setToken(token); +// tallFeignClient.saveMemberInRole(saveMemberInRole); +// } +// } +// } +// //添加任务 +// //查找场次信息表 +// CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample(); +// startOrderExample.createCriteria().andProjectIdEqualTo(project.getId()) +// .andSiteEqualTo((byte) siteJudgment.getSite()); +// List startOrderList = startOrderMapper.selectByExample(startOrderExample); +// if (CollectionUtil.isNotEmpty(startOrderList)) { +// for (CompeteStartOrder startOrder : startOrderList) { +// TallTaskDto.AddTask addTask = new TallTaskDto.AddTask(); +// addTask.setProjectId(tallProjectId); +// addTask.setTaskName(project.getName() + startOrder.getCompeteOrder() + "-" +// + startOrder.getSite() + "-" + jdgmentNum); +// addTask.setBeginTime(startOrder.getStartTime()); +// addTask.setEndTime(startOrder.getEndTime()); +// addTask.setExecutorId(roleId); +// addTask.setParentTaskId(startOrder.getTaskId()); +// addTask.setToken(token); +// log.info("在tall内添加任务：{}", addTask); +// JsonResponse normalTaskJsonResponse = tallFeignClient.saveTask(addTask); +// log.info("添加任务后返回：{}", normalTaskJsonResponse); +// if (ObjectUtil.isNotNull(normalTaskJsonResponse)) { +// TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); +// if (ObjectUtil.isNotNull(normalTask)) { +// //修改任务插件配置信息 +// TallTaskDto.UpdatePluginConfig updatePluginConfig = new TallTaskDto.UpdatePluginConfig(); +// updatePluginConfig.setWebPath("/home/osct/video-score"); +// updatePluginConfig.setTaskId(normalTask.getDetailId()); +// updatePluginConfig.setToken(token); +// log.info("修改tall内任务插件配置：{}", updatePluginConfig); +// JsonResponse pluginVoJsonResponse = tallFeignClient.updatePluginConfig(updatePluginConfig); +// log.info("修改任务插件配置后返回：{}", pluginVoJsonResponse); +// } +// } +// } +// } } } diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml index f91a50a9..8f4b9247 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml @@ -192,10 +192,11 @@ pp.project_id as projectId FROM t_compete_project_player pp LEFT JOIN t_compete_player pl on pp.player_id = pl.id + LEFT JOIN t_compete_company c on pl.company_id = c.id WHERE pp.rec_status = 0 and pl .rec_status = 0 - + and c.rec_status = 0 )a on a.projectId = p.id LEFT JOIN ( @@ -204,10 +205,12 @@ FROM t_compete_team t LEFT JOIN t_compete_team_member m on t.id = m.compete_team_id LEFT JOIN t_compete_player pl on m.player_id = pl.id + LEFT JOIN t_compete_company c on t.company_id = c.id WHERE t.rec_status = 0 and m .rec_status = 0 and pl .rec_status = 0 + and c.rec_status = 0 GROUP BY t.id )b on b.projectId = p.id WHERE From 1058f98ce0b46f399f4abcc29f48db2ca77ea208 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Sat, 21 Nov 2020 12:37:04 +0800 Subject: [PATCH 78/80] 20201121v1.6 --- .../ccsens/mt/service/CompeteTaskService.java | 190 +++++++++--------- .../mapper_dao/CompeteProjectConfigDao.xml | 3 +- 2 files changed, 97 insertions(+), 96 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java index be6beb10..cb741a6a 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -108,8 +108,8 @@ public class CompeteTaskService implements ICompeteTaskService{ competeProjectConfig.setEndTime(projectConfig.getEndTime() == null ? 0 : projectConfig.getEndTime()); projectConfigDao.insertSelective(competeProjectConfig); } - // 生成出场顺序表，存入数据库。在tall内添加对应的任务 -// setStartOrder(competeProjectConfig,param.getProjectId(),param.getTallRoleId(),token); + //生成出场顺序表，存入数据库。在tall内添加对应的任务 + setStartOrder(competeProjectConfig,param.getProjectId(),param.getTallRoleId(),token); }); return projectConfigDao.queryProjectConfig(type.get()); @@ -418,99 +418,99 @@ public class CompeteTaskService implements ICompeteTaskService{ competeJudgment.setSite(siteJudgment.getSite()); competeJudgment.setChiefJudgment((byte) judgmentInfo.getJudgmentNum()); competeJudgmentDao.insertSelective(competeJudgment); -// //添加角色 -// MemberRoleDto.SaveRole saveRole = new MemberRoleDto.SaveRole(); -// saveRole.setProjectId(tallProjectId); -// String jdgmentNum = ""; -// if (judgmentInfo.getJudgmentNum() == 0) { -// jdgmentNum = "主裁判"; -// } else { -// jdgmentNum = "裁判" + judgmentInfo.getJudgmentNum(); -// } -// saveRole.setRoleName(project.getName() + "-场地" + siteJudgment.getSite() + "-" + jdgmentNum); -// Long roleId = null; -// saveRole.setToken(token); -// log.info("在tall内添加角色：{}", saveRole); -// JsonResponse roleJsonResponse = tallFeignClient.saveRole(saveRole); -// log.info("添加角色后返回：{}", roleJsonResponse); -// if (ObjectUtil.isNotNull(roleJsonResponse)) { -// MemberVo.RoleInfo roleInfo = roleJsonResponse.getData(); -// if (ObjectUtil.isNotNull(roleInfo)) { -// roleId = roleInfo.getRoleId(); -// } -// } -// //添加成员 -// MemberRoleDto.SaveMember saveMember = new MemberRoleDto.SaveMember(); -// saveMember.setMemberName(judgmentInfo.getJudgmentName()); -// saveMember.setProjectId(tallProjectId); -// saveMember.setPhone(judgmentInfo.getJudgmentPhone()); -// saveMember.setRoleId(Arrays.asList(roleId)); -// saveMember.setToken(token); -// log.info("在tall内添加成员：{}", saveMember); -// JsonResponse memberJsonResponse = tallFeignClient.saveMember(saveMember); -// log.info("添加成员后返回：{}", memberJsonResponse); -// //如果成员已存在，查询成员信息然后添加至角色内 -// Long memberId = null; -// if (ObjectUtil.isNotNull(memberJsonResponse)) { -// //code等于21代表成员已存在 -// if(memberJsonResponse.getCode() == 21){ -// //查询该手机号在项目内的成员的id -// MemberRoleDto.GetMemberByPhone getMemberByPhone = new MemberRoleDto.GetMemberByPhone(); -// getMemberByPhone.setProjectId(tallProjectId); -// getMemberByPhone.setPhone(judgmentInfo.getJudgmentPhone()); -// getMemberByPhone.setToken(token); -// JsonResponse memberListJsonResponse = tallFeignClient.queryMemberByPhone(getMemberByPhone); -// if (ObjectUtil.isNotNull(memberListJsonResponse)) { -// MemberVo.MemberList memberList = memberListJsonResponse.getData(); -// if (ObjectUtil.isNotNull(memberList)) { -// memberId = memberList.getMemberId(); -// } -// } -// //将该成员添加至角色下 -// if(ObjectUtil.isNotNull(roleId) && ObjectUtil.isNotNull(memberId)){ -// MemberRoleDto.SaveMemberInRole saveMemberInRole = new MemberRoleDto.SaveMemberInRole(); -// saveMemberInRole.setRoleId(roleId); -// saveMemberInRole.setMemberId(memberId); -// saveMemberInRole.setToken(token); -// tallFeignClient.saveMemberInRole(saveMemberInRole); -// } -// } -// } -// //添加任务 -// //查找场次信息表 -// CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample(); -// startOrderExample.createCriteria().andProjectIdEqualTo(project.getId()) -// .andSiteEqualTo((byte) siteJudgment.getSite()); -// List startOrderList = startOrderMapper.selectByExample(startOrderExample); -// if (CollectionUtil.isNotEmpty(startOrderList)) { -// for (CompeteStartOrder startOrder : startOrderList) { -// TallTaskDto.AddTask addTask = new TallTaskDto.AddTask(); -// addTask.setProjectId(tallProjectId); -// addTask.setTaskName(project.getName() + startOrder.getCompeteOrder() + "-" -// + startOrder.getSite() + "-" + jdgmentNum); -// addTask.setBeginTime(startOrder.getStartTime()); -// addTask.setEndTime(startOrder.getEndTime()); -// addTask.setExecutorId(roleId); -// addTask.setParentTaskId(startOrder.getTaskId()); -// addTask.setToken(token); -// log.info("在tall内添加任务：{}", addTask); -// JsonResponse normalTaskJsonResponse = tallFeignClient.saveTask(addTask); -// log.info("添加任务后返回：{}", normalTaskJsonResponse); -// if (ObjectUtil.isNotNull(normalTaskJsonResponse)) { -// TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); -// if (ObjectUtil.isNotNull(normalTask)) { -// //修改任务插件配置信息 -// TallTaskDto.UpdatePluginConfig updatePluginConfig = new TallTaskDto.UpdatePluginConfig(); -// updatePluginConfig.setWebPath("/home/osct/video-score"); -// updatePluginConfig.setTaskId(normalTask.getDetailId()); -// updatePluginConfig.setToken(token); -// log.info("修改tall内任务插件配置：{}", updatePluginConfig); -// JsonResponse pluginVoJsonResponse = tallFeignClient.updatePluginConfig(updatePluginConfig); -// log.info("修改任务插件配置后返回：{}", pluginVoJsonResponse); -// } -// } -// } -// } + //添加角色 + MemberRoleDto.SaveRole saveRole = new MemberRoleDto.SaveRole(); + saveRole.setProjectId(tallProjectId); + String jdgmentNum = ""; + if (judgmentInfo.getJudgmentNum() == 0) { + jdgmentNum = "主裁判"; + } else { + jdgmentNum = "裁判" + judgmentInfo.getJudgmentNum(); + } + saveRole.setRoleName(project.getName() + "-场地" + siteJudgment.getSite() + "-" + jdgmentNum); + Long roleId = null; + saveRole.setToken(token); + log.info("在tall内添加角色：{}", saveRole); + JsonResponse roleJsonResponse = tallFeignClient.saveRole(saveRole); + log.info("添加角色后返回：{}", roleJsonResponse); + if (ObjectUtil.isNotNull(roleJsonResponse)) { + MemberVo.RoleInfo roleInfo = roleJsonResponse.getData(); + if (ObjectUtil.isNotNull(roleInfo)) { + roleId = roleInfo.getRoleId(); + } + } + //添加成员 + MemberRoleDto.SaveMember saveMember = new MemberRoleDto.SaveMember(); + saveMember.setMemberName(judgmentInfo.getJudgmentName()); + saveMember.setProjectId(tallProjectId); + saveMember.setPhone(judgmentInfo.getJudgmentPhone()); + saveMember.setRoleId(Arrays.asList(roleId)); + saveMember.setToken(token); + log.info("在tall内添加成员：{}", saveMember); + JsonResponse memberJsonResponse = tallFeignClient.saveMember(saveMember); + log.info("添加成员后返回：{}", memberJsonResponse); + //如果成员已存在，查询成员信息然后添加至角色内 + Long memberId = null; + if (ObjectUtil.isNotNull(memberJsonResponse)) { + //code等于21代表成员已存在 + if(memberJsonResponse.getCode() == 21){ + //查询该手机号在项目内的成员的id + MemberRoleDto.GetMemberByPhone getMemberByPhone = new MemberRoleDto.GetMemberByPhone(); + getMemberByPhone.setProjectId(tallProjectId); + getMemberByPhone.setPhone(judgmentInfo.getJudgmentPhone()); + getMemberByPhone.setToken(token); + JsonResponse memberListJsonResponse = tallFeignClient.queryMemberByPhone(getMemberByPhone); + if (ObjectUtil.isNotNull(memberListJsonResponse)) { + MemberVo.MemberList memberList = memberListJsonResponse.getData(); + if (ObjectUtil.isNotNull(memberList)) { + memberId = memberList.getMemberId(); + } + } + //将该成员添加至角色下 + if(ObjectUtil.isNotNull(roleId) && ObjectUtil.isNotNull(memberId)){ + MemberRoleDto.SaveMemberInRole saveMemberInRole = new MemberRoleDto.SaveMemberInRole(); + saveMemberInRole.setRoleId(roleId); + saveMemberInRole.setMemberId(memberId); + saveMemberInRole.setToken(token); + tallFeignClient.saveMemberInRole(saveMemberInRole); + } + } + } + //添加任务 + //查找场次信息表 + CompeteStartOrderExample startOrderExample = new CompeteStartOrderExample(); + startOrderExample.createCriteria().andProjectIdEqualTo(project.getId()) + .andSiteEqualTo((byte) siteJudgment.getSite()); + List startOrderList = startOrderMapper.selectByExample(startOrderExample); + if (CollectionUtil.isNotEmpty(startOrderList)) { + for (CompeteStartOrder startOrder : startOrderList) { + TallTaskDto.AddTask addTask = new TallTaskDto.AddTask(); + addTask.setProjectId(tallProjectId); + addTask.setTaskName(project.getName() + startOrder.getCompeteOrder() + "-" + + startOrder.getSite() + "-" + jdgmentNum); + addTask.setBeginTime(startOrder.getStartTime()); + addTask.setEndTime(startOrder.getEndTime()); + addTask.setExecutorId(roleId); + addTask.setParentTaskId(startOrder.getTaskId()); + addTask.setToken(token); + log.info("在tall内添加任务：{}", addTask); + JsonResponse normalTaskJsonResponse = tallFeignClient.saveTask(addTask); + log.info("添加任务后返回：{}", normalTaskJsonResponse); + if (ObjectUtil.isNotNull(normalTaskJsonResponse)) { + TaskVo.NormalTask normalTask = normalTaskJsonResponse.getData(); + if (ObjectUtil.isNotNull(normalTask)) { + //修改任务插件配置信息 + TallTaskDto.UpdatePluginConfig updatePluginConfig = new TallTaskDto.UpdatePluginConfig(); + updatePluginConfig.setWebPath("/home/osct/video-score"); + updatePluginConfig.setTaskId(normalTask.getDetailId()); + updatePluginConfig.setToken(token); + log.info("修改tall内任务插件配置：{}", updatePluginConfig); + JsonResponse pluginVoJsonResponse = tallFeignClient.updatePluginConfig(updatePluginConfig); + log.info("修改任务插件配置后返回：{}", pluginVoJsonResponse); + } + } + } + } } } diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml index 8f4b9247..aafce982 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml @@ -185,7 +185,8 @@ pc.start_time as startTime, pc.end_time as endTime FROM - t_compete_project p LEFT JOIN t_compete_project_config pc on pc.project_id = p.id + t_compete_project p + LEFT JOIN (SELECT * FROM t_compete_project_config WHERE rec_status = 0 and rec_status is null) pc on pc.project_id = p.id LEFT JOIN ( SELECT From 6ab637c8f1e1963faff8d5d97a1f6c8a4b08ea8d Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Sat, 21 Nov 2020 14:00:34 +0800 Subject: [PATCH 79/80] 20201121v1.7 --- .../com/ccsens/mt/api/CompeteTaskController.java | 2 +- .../com/ccsens/mt/service/CompeteTaskService.java | 12 +++++++++--- .../resources/mapper_dao/CompeteProjectConfigDao.xml | 1 + .../ccsens/tall/service/ProTaskDetailService.java | 4 ++++ 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java index b7d74a75..ac30c925 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java @@ -47,7 +47,7 @@ public class CompeteTaskController { @MustLogin @ApiOperation(value = "日程安排更新", notes = "zy:1、循环查找项目对应的配置信息。2、有则修改，没有则添加配置信息。" + "3、根据配置的时间和场地生成出场顺序表。4存入出场顺序表。5、调用tall接口添加任务") - @RequestMapping(value = "/", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + @RequestMapping(value = "/update", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse updateCompeteConfig( @ApiParam @Validated @RequestBody QueryDto params, HttpServletRequest request) { log.info("日程安排更新：{}",params); diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java index cb741a6a..9c8bee58 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -79,6 +79,10 @@ public class CompeteTaskService implements ICompeteTaskService{ return new ArrayList<>(); } param.getUpdateCompeteTaskList().forEach(projectConfig -> { + //判断时间和时长是否正确 + if(projectConfig.getStartTime() == 0 || projectConfig.getEndTime() == 0 || projectConfig.getDuration() == 0){ + return; + } //获取项目 CompeteProject project = competeProjectDao.selectByPrimaryKey(projectConfig.getProjectId()); if(ObjectUtil.isNotNull(project)){ @@ -132,7 +136,7 @@ public class CompeteTaskService implements ICompeteTaskService{ //计算场次 int order = (int) Math.ceil(projectPlayerList.size() / projectConfig.getSiteNum()); //计算每个场次时间 - long projectStartTime = projectConfig.getStartTime() + Constant.UPLOAD_VIDEO_TIME; + long projectStartTime = projectConfig.getStartTime(); long orderTime = 0; if(order != 0) { orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order); @@ -199,7 +203,7 @@ public class CompeteTaskService implements ICompeteTaskService{ competeStartOrder.setSite((byte) site); competeStartOrder.setTeam((byte) 0); competeStartOrder.setCompeteOrder((byte) competeOrder); - competeStartOrder.setTaskId(taskId); +// competeStartOrder.setTaskId(taskId); competeStartOrder.setStartTime(projectStartTime); competeStartOrder.setEndTime(projectStartTime + orderTime); startOrderMapper.insertSelective(competeStartOrder); @@ -287,7 +291,7 @@ public class CompeteTaskService implements ICompeteTaskService{ competeStartOrder.setSite((byte) site); competeStartOrder.setTeam((byte) 0); competeStartOrder.setCompeteOrder((byte) competeOrder); - competeStartOrder.setTaskId(taskId); +// competeStartOrder.setTaskId(taskId); competeStartOrder.setStartTime(projectStartTime); competeStartOrder.setEndTime(projectStartTime + orderTime); startOrderMapper.insertSelective(competeStartOrder); @@ -418,6 +422,8 @@ public class CompeteTaskService implements ICompeteTaskService{ competeJudgment.setSite(siteJudgment.getSite()); competeJudgment.setChiefJudgment((byte) judgmentInfo.getJudgmentNum()); competeJudgmentDao.insertSelective(competeJudgment); + + //添加角色 MemberRoleDto.SaveRole saveRole = new MemberRoleDto.SaveRole(); saveRole.setProjectId(tallProjectId); diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml index aafce982..5350a63a 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml @@ -217,6 +217,7 @@ WHERE p.type = #{type} and p.`level` = 2 + and p.certificate = 0 and p.rec_status = 0 GROUP BY p.id diff --git a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java index 75eeab2a..077a72ae 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java @@ -26,6 +26,7 @@ import com.ccsens.util.WebConstant; import com.ccsens.util.cron.CronConstant; import com.ccsens.util.cron.NatureToDate; import com.ccsens.util.exception.BaseException; +import com.fasterxml.jackson.annotation.JsonFormat; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; @@ -282,6 +283,9 @@ public class ProTaskDetailService implements IProTaskDetailService { proTaskDetailExample.setOrderByClause("begin_time"); List firstTaskDetailList = taskDetailDao.selectByExample(proTaskDetailExample); PageInfo pageInfo = new PageInfo<>(firstTaskDetailList); + + + if (CollectionUtil.isNotEmpty(firstTaskDetailList)) { int sequence = 1; for (ProTaskDetail firstTaskDetail : firstTaskDetailList) { From acf1aa0e14fe91a4f899f4947a15a6dc717fd335 Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Sat, 21 Nov 2020 14:10:58 +0800 Subject: [PATCH 80/80] 11-21-1 --- .../ccsens/mt/api/CompeteScoreController.java | 10 + .../com/ccsens/mt/api/ExcelController.java | 15 +- .../com/ccsens/mt/bean/dto/CompeteDto.java | 4 + .../java/com/ccsens/mt/bean/vo/CompeteVo.java | 2 +- .../persist/dao/CompeteProjectConfigDao.java | 6 +- .../com/ccsens/mt/service/CompeteService.java | 77 +++++ .../com/ccsens/mt/service/ExcelService.java | 299 ++++++++---------- .../ccsens/mt/service/ICompeteService.java | 11 + .../com/ccsens/mt/service/IExcelService.java | 15 +- .../mapper_dao/CompeteProjectConfigDao.xml | 105 ++++++ .../resources/mapper_dao/CompeteScoreDao.xml | 2 +- 11 files changed, 371 insertions(+), 175 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java index 81bb0ffa..cae59d9a 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java @@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.io.IOException; import java.util.List; /** @@ -126,5 +127,14 @@ public class CompeteScoreController { return JsonResponse.newInstance().ok(speedPassList); } + @MustLogin + @ApiOperation(value = "速度通级赛(导出)", notes = "") + @RequestMapping(value = "/speedPassOut", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse speedPassOut(@ApiParam @Validated @RequestBody QueryDto params) throws IOException { + log.info("速度通级赛(导出)：{}",params); + String path = competeService.speedPassOut(params.getParam()); + return JsonResponse.newInstance().ok(path); + } + } 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 80ea10e5..b2e2786e 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ExcelController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ExcelController.java @@ -115,11 +115,20 @@ public class ExcelController { } @MustLogin - @ApiOperation(value = "日程安排（导出）", notes = "") + @ApiOperation(value = "日程安排（查询）", notes = "") @RequestMapping(value = "/schedulePlanning", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse schedulePlanning(@ApiParam @Validated @RequestBody QueryDto params) { log.info("日程安排更新：{}",params); - List schedulePlanDetailList = excelService.schedulePlanning(params.getParam()); - return JsonResponse.newInstance().ok(schedulePlanDetailList); + List schedulePlanlList = excelService.schedulePlanning(params.getParam()); + return JsonResponse.newInstance().ok(schedulePlanlList); + } + + @MustLogin + @ApiOperation(value = "日程安排（导出）", notes = "") + @RequestMapping(value = "/schedulePlanningOut", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse schedulePlanningOut(@ApiParam @Validated @RequestBody QueryDto params) throws IOException { + log.info("日程安排更新：{}",params); + String path = excelService.schedulePlanningOut(params.getParam()); + return JsonResponse.newInstance().ok(path); } } diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java index fb9955ed..6773268c 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java @@ -330,6 +330,10 @@ public class CompeteDto { private String name; @ApiModelProperty("身份证号") private String idCard; + @ApiModelProperty("当前页") + private int page=1; + @ApiModelProperty("每页数量") + private int size=10; } @Data diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java index 73f4b577..ac288f17 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java @@ -575,7 +575,7 @@ public class CompeteVo { private int secondGrade; @ApiModelProperty("3分钟单摇跳等级") private int minuteGrade; - @ApiModelProperty("3分钟单摇跳等级") + @ApiModelProperty("等级") private int grade; @ApiModelProperty("玩家id") private Long playerId; 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 index 7edf2578..2ab673a4 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java @@ -16,11 +16,15 @@ import java.util.List; */ public interface CompeteProjectConfigDao extends CompeteProjectConfigMapper { CompeteProjectConfig selectByProjectId(@Param("projectId") Long projectId); - List selectDetail (); + List selectDetail (); List selectSingle (@Param("projectId") Long projectId,@Param("groupId") Long groupId,@Param("companyId") Long companyId,@Param("name") String name,@Param("idCard") String idCard); List selectGroup (@Param("projectId") Long projectId,@Param("groupId") Long groupId,@Param("companyId") Long companyId,@Param("name") String name,@Param("idCard") String idCard); CompeteProjectConfig selectStartTime(@Param("projectId") Long projectId); + List selectPeople (@Param("projectId") Long projectId,@Param("groupId") Long groupId,@Param("companyId") Long companyId,@Param("name") String name,@Param("idCard") String idCard); + + + /** * 查询所有项目配置信息 diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java index 41f609c3..27a96117 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -15,6 +15,7 @@ import com.ccsens.mt.bean.dto.ScoreDto; import com.ccsens.mt.bean.po.*; import com.ccsens.mt.bean.vo.CompeteVo; import com.ccsens.mt.bean.vo.ScoreVo; +import com.ccsens.mt.bean.vo.TableVo; import com.ccsens.mt.persist.dao.*; import com.ccsens.mt.persist.mapper.*; import com.ccsens.mt.util.Constant; @@ -1452,6 +1453,8 @@ public class CompeteService implements ICompeteService { return speedPassList; } + + @Override public List queryCountScoreAll(ScoreDto.ShowResult param) { List countScoreCurrentSiteList = new ArrayList<>(); @@ -1589,4 +1592,78 @@ public class CompeteService implements ICompeteService { return null; } + + @Override + public String speedPassOut(CompeteDto.CompeteTimeAndProjectId params) throws IOException { + List speedPasses = speedPass(params); + String path = getExcelFilePathForspeedPassOut(speedPasses); + return path; + } + + private String getExcelFilePathForspeedPassOut(List arrayList) throws IOException { + //创建excle表格对象 + List> list = new ArrayList<>(); + //创建行对象 + List title = new ArrayList<>(); + //给首行单元格赋值 + title.add(new PoiUtil.PoiUtilCell("组别")); + title.add(new PoiUtil.PoiUtilCell("参赛单位")); + title.add(new PoiUtil.PoiUtilCell("姓名")); + title.add(new PoiUtil.PoiUtilCell("30秒单摇跳（次）")); + title.add(new PoiUtil.PoiUtilCell("3分钟单摇跳（次）")); + title.add(new PoiUtil.PoiUtilCell("等级")); + title.add(new PoiUtil.PoiUtilCell("备注")); + list.add(title); + //创建整个excel表格对象 + Workbook workbook = new XSSFWorkbook(); + int i = 1; + for (CompeteVo.SpeedPass speedPass : arrayList) { + //行对象 + List cells = new ArrayList<>(); + cells.add(new PoiUtil.PoiUtilCell(i + "", 1, 1, 300, 18)); + //单元格对象 + PoiUtil.PoiUtilCell poiUtilCel = new PoiUtil.PoiUtilCell(speedPass.getGroupName()); + cells.add(poiUtilCel); + PoiUtil.PoiUtilCell poiUtilCell = new PoiUtil.PoiUtilCell(speedPass.getCompanyName()); + cells.add(poiUtilCell); + PoiUtil.PoiUtilCell poiUtilCel2 = new PoiUtil.PoiUtilCell(speedPass.getPlayerName()); + cells.add(poiUtilCel2); + PoiUtil.PoiUtilCell poiUtilCel3 = new PoiUtil.PoiUtilCell(); + if (ObjectUtil.isNull(speedPass.getSecondTime())){ + poiUtilCel3.setValue(""); + }else { + poiUtilCel3.setValue(speedPass.getSecondTime()+""); + } + cells.add(poiUtilCel3); + PoiUtil.PoiUtilCell poiUtilCel4 = new PoiUtil.PoiUtilCell(); + if (ObjectUtil.isNull(speedPass.getMinuteTime())){ + poiUtilCel4.setValue(""); + }else { + poiUtilCel4.setValue(speedPass.getMinuteTime()+""); + } + cells.add(poiUtilCel4); + PoiUtil.PoiUtilCell poiUtilCel5 = new PoiUtil.PoiUtilCell(String.valueOf(speedPass.getGrade())+""); + cells.add(poiUtilCel5); + list.add(cells); + i++; + } + //生成excel表格对象，并将数据放入 + Workbook wbs = PoiUtil.exportWB("速度通级赛", list, workbook); + //8：关联金山在线文档 + String name = "速度通级赛" + ".xlsx"; + String filepath = "mt/" + DateUtil.today() + "/" + System.currentTimeMillis() + ".xlsx"; + String path = PropUtil.path + filepath; +// String path = filepath; + File tmpFile = new File(path); + if (!tmpFile.getParentFile().exists()) { + tmpFile.getParentFile().mkdirs(); + } + //PropUtil.path获取配置文件中的path属性，拼接生成写入信息的文件名， + File file = new File(path); + OutputStream stream = new FileOutputStream(file); + wbs.write(stream); + stream.close(); + return PropUtil.imgDomain+filepath; + } + } \ 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 9807c02e..d2290698 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -19,10 +19,13 @@ import com.ccsens.util.WebConstant; import com.ccsens.util.bean.dto.QueryDto; import com.ccsens.util.exception.BaseException; import com.ctc.wstx.util.DataUtil; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; 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.Table; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.stereotype.Service; @@ -1143,179 +1146,34 @@ public class ExcelService implements IExcelService { @Override public List getCompeteJoinDetail(CompeteDto.EnterInfo params) { - List competeJoinList = new ArrayList<>(); - //个人项目查询 - List competeJoinList1 = competeProjectConfigDao.selectSingle(params.getProjectId(),params.getGroupId(),params.getCompanyId(),params.getName(),params.getIdCard()); - for (TableVo.CompeteJoin competeJoin : competeJoinList1){ - competeJoinList.add(competeJoin); - } - //团队项目查询 - List competeJoinList2 = competeProjectConfigDao.selectGroup(params.getProjectId(),params.getGroupId(),params.getCompanyId(),params.getName(),params.getIdCard()); - for (TableVo.CompeteJoin competeJoin : competeJoinList2){ - competeJoinList.add(competeJoin); - } -// 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(); -// //项目id -// competeJoin.setProjectId(competeProject.getId()); -// //姓名 -// 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(); -// //项目id -// competeJoin.setProjectId(competeProject.getId()); -// //姓名 -// 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; - +// List competeJoinList = new ArrayList<>(); +// 个人项目查询 +// PageHelper.startPage(params.getPage(),params.getSize()); +// List competeJoinList1 = competeProjectConfigDao.selectSingle(params.getProjectId(),params.getGroupId(),params.getCompanyId(),params.getName(),params.getIdCard()); +// PageInfo pageInfo = new PageInfo<>(competeJoinList1); +// for (TableVo.CompeteJoin competeJoin : competeJoinList1){ +// competeJoinList.add(competeJoin); +// } +// //团队项目查询 +// List competeJoinList2 = competeProjectConfigDao.selectGroup(params.getProjectId(),params.getGroupId(),params.getCompanyId(),params.getName(),params.getIdCard()); +// for (TableVo.CompeteJoin competeJoin : competeJoinList2){ +// competeJoinList.add(competeJoin); +// } + PageHelper.startPage(params.getPage(),params.getSize()); + List competeJoinList = competeProjectConfigDao.selectPeople(params.getProjectId(), params.getGroupId(), params.getCompanyId(), params.getName(), params.getIdCard()); + PageInfo pageInfo = new PageInfo<>(competeJoinList); return competeJoinList; } @Override - public List schedulePlanning(CompeteDto.CompeteTime params) { - List schedulePlanDetailListMorning = new ArrayList<>(); - List schedulePlanDetailListAfternoon = new ArrayList<>(); - List schedulePlanDetailListNight = 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(); - + List schedulePlanList = competeProjectConfigDao.selectDetail(); +// List schedulePlans.selectDetail(); // TableVo.SchedulePlanAll schedulePlanAll = new TableVo.SchedulePlanAll(); // Set set = new HashSet(); // if (CollectionUtil.isNotEmpty(schedulePlanDetailList)) { @@ -1356,7 +1214,112 @@ public class ExcelService implements IExcelService { // // // } - return schedulePlanDetailList; + return schedulePlanList; } + + @Override + public String schedulePlanningOut(CompeteDto.CompeteTime params) throws IOException { + List schedulePlanList = schedulePlanning(params); + String path = getExcelFilePathForSchedulePlanning(schedulePlanList); + return path; + } + + + + + private String getExcelFilePathForSchedulePlanning(List arrayList) throws IOException { + //创建excle表格对象 + List> list = new ArrayList<>(); + //创建行对象 + List title = new ArrayList<>(); + //给首行单元格赋值 + title.add(new PoiUtil.PoiUtilCell("序号")); + title.add(new PoiUtil.PoiUtilCell("日期")); + title.add(new PoiUtil.PoiUtilCell("上午")); + title.add(new PoiUtil.PoiUtilCell("下午")); + title.add(new PoiUtil.PoiUtilCell("晚上")); + list.add(title); + //创建整个excel表格对象 + Workbook workbook = new XSSFWorkbook(); + int i = 1; + for (TableVo.SchedulePlan schedulePlan : arrayList) { + //行对象 + List cells = new ArrayList<>(); + cells.add(new PoiUtil.PoiUtilCell(i + "", 1, 1, 3000, 18)); + //单元格对象 + PoiUtil.PoiUtilCell poiUtilCel3 = new PoiUtil.PoiUtilCell(schedulePlan.getDate()); + cells.add(poiUtilCel3); + StringBuilder stringBuilder = new StringBuilder(); + if (CollectionUtil.isNotEmpty(schedulePlan.getSchedulePlanDetailListMorning())) { + for (TableVo.SchedulePlanDetail schedulePlanDetail : schedulePlan.getSchedulePlanDetailListMorning()) { + Date date = new Date(schedulePlanDetail.getStartTime()); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm"); + String year = simpleDateFormat.format(date); + Date date1 = new Date(schedulePlanDetail.getEndTime()); + SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("HH:mm"); + String year1 = simpleDateFormat.format(date); + String string = schedulePlanDetail.getProjectName() + "(" + year +"-"+ year1 + ")"; + stringBuilder.append(string+" \n"); + + } + } + PoiUtil.PoiUtilCell poiUtilCel = new PoiUtil.PoiUtilCell(stringBuilder.toString()); + cells.add(poiUtilCel); + StringBuilder stringBuilder1 = new StringBuilder(); + if (CollectionUtil.isNotEmpty(schedulePlan.getSchedulePlanDetailListAfternoon())) { + for (TableVo.SchedulePlanDetail schedulePlanDetail : schedulePlan.getSchedulePlanDetailListAfternoon()) { + Date date = new Date(schedulePlanDetail.getStartTime()); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm"); + String year = simpleDateFormat.format(date); + Date date1 = new Date(schedulePlanDetail.getEndTime()); + SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("HH:mm"); + String year1 = simpleDateFormat.format(date); + String string = schedulePlanDetail.getProjectName() + "(" + year +"-"+ year1 + ")"; + stringBuilder.append(string+" "); + } + } + PoiUtil.PoiUtilCell poiUtilCell = new PoiUtil.PoiUtilCell(stringBuilder1.toString()); + cells.add(poiUtilCell); + StringBuilder stringBuilder2 = new StringBuilder(); + if (CollectionUtil.isNotEmpty(schedulePlan.getSchedulePlanDetailListNight())){ + for (TableVo.SchedulePlanDetail schedulePlanDetail: schedulePlan.getSchedulePlanDetailListNight()){ + Date date = new Date(schedulePlanDetail.getStartTime()); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm"); + String year = simpleDateFormat.format(date); + Date date1 = new Date(schedulePlanDetail.getEndTime()); + SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("HH:mm"); + String year1 = simpleDateFormat.format(date); + String string = schedulePlanDetail.getProjectName() + "(" + year +"-"+ year1 + ")"; + stringBuilder.append(string+" "); + } + } + PoiUtil.PoiUtilCell poiUtilCel2 = new PoiUtil.PoiUtilCell(stringBuilder2.toString()); + cells.add(poiUtilCel2); + list.add(cells); + i++; + } + //生成excel表格对象，并将数据放入 + Workbook wbs = PoiUtil.exportWB("日程安排", list, workbook); + //8：关联金山在线文档 + String name = "日程安排" + ".xlsx"; + String filepath = "mt/" + DateUtil.today() + "/" + System.currentTimeMillis() + ".xlsx"; + String path = PropUtil.path + filepath; +// String path = filepath; + File tmpFile = new File(path); + if (!tmpFile.getParentFile().exists()) { + tmpFile.getParentFile().mkdirs(); + } + //PropUtil.path获取配置文件中的path属性，拼接生成写入信息的文件名， + File file = new File(path); + OutputStream stream = new FileOutputStream(file); + wbs.write(stream); + stream.close(); + return PropUtil.imgDomain+filepath; + } + + + + + } diff --git a/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java b/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java index 8cf36d5c..8ca886bc 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java @@ -196,6 +196,14 @@ public interface ICompeteService { List speedPass(CompeteDto.CompeteTimeAndProjectId params); + /** + <<<<<<< HEAD + * 速度通级赛(导出) + * @param params 项目id和场次id + * @return 返回项目，开始时间和比赛状态 + */ + String speedPassOut(CompeteDto.CompeteTimeAndProjectId params) throws IOException; + /** 查看技术赛成绩公示表 @param param @@ -206,6 +214,9 @@ public interface ICompeteService { CompeteVo.SelScropeVo selSubmitOrderList(ScoreDto.SelScrop param); Long getUserCompanyId(Long userId, Byte type); + + + } 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 29fb90a6..fe6707b7 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,19 @@ public interface IExcelService { * @param params 大赛id * @return 返回失败的信息 */ - List schedulePlanning(CompeteDto.CompeteTime params); + List schedulePlanning(CompeteDto.CompeteTime params); + + /** + * 查询导出 + * @param params 大赛id + * @return 返回失败的信息 + */ + String schedulePlanningOut(CompeteDto.CompeteTime params) throws IOException; + + + + + + } diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml index f097e789..ae109515 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml @@ -80,6 +80,109 @@ where project_id = #{projectId} + + + + + + + + + + + select tcg.group_name AS groupName, - tcp.`name` as playName, + tcp.`name` as playerName, tcc.`name` as companyName, tccp.player_id as playerId, tccp.project_id as projectId