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..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 @@ -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,62 @@ 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; + @ApiModelProperty("token") + private String token; + } + + @Data + @ApiModel("添加角色") + public static class SaveRole{ + @NotNull(message = "项目不能为空") + @ApiModelProperty("项目id") + private Long projectId; + @NotEmpty(message = "角色名不能为空") + @ApiModelProperty("角色名") + private String roleName; + @ApiModelProperty("token") + 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/dto/TallTaskDto.java b/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/TallTaskDto.java new file mode 100644 index 00000000..392673ba --- /dev/null +++ b/cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/TallTaskDto.java @@ -0,0 +1,137 @@ +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; + @ApiModelProperty("token") + private String token; + } + + @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; + @ApiModelProperty("token") + private String token; + } + + @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; + @ApiModelProperty("token") + private String token; + + public UpdatePluginConfig() { + } + } + +} 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..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 @@ -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,36 @@ 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; + } + + + @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/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/config/FeignTokenConfig.java b/cloudutil/src/main/java/com/ccsens/cloudutil/config/FeignTokenConfig.java new file mode 100644 index 00000000..532ba6e7 --- /dev/null +++ b/cloudutil/src/main/java/com/ccsens/cloudutil/config/FeignTokenConfig.java @@ -0,0 +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.stereotype.Component; + + +/** + * @author 逗 + */ +@Component +public class FeignTokenConfig implements RequestInterceptor { + @Override + public void apply(RequestTemplate template) { + byte[] body = template.body(); + if (body == null) { + return; + } + String json = new String(body); + JSONObject jsonObject = JSONUtil.parseObj(json); + + //添加token + template.header("Authorization", jsonObject.get("token").toString()); + } +} 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..86337fd7 100644 --- a/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java +++ b/cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java @@ -1,21 +1,17 @@ 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.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; 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; @@ -25,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 { /** @@ -177,12 +173,60 @@ 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); + + /** + * 修改任务插件配置 + */ + @RequestMapping("/plugins/config") + JsonResponse updatePluginConfig(TallTaskDto.UpdatePluginConfig updatePluginConfig); + + /** + * 添加角色 + */ + @RequestMapping("/roles/save") + JsonResponse saveRole(MemberRoleDto.SaveRole saveRole); + + /** + * 添加成员 + */ + @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 @@ -295,6 +339,46 @@ 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(); + } + + @Override + public JsonResponse saveRole(MemberRoleDto.SaveRole saveRole) { + return JsonResponse.newInstance().fail(); + } + + @Override + 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/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/api/CompeteCompanyController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteCompanyController.java new file mode 100644 index 00000000..ea6506d0 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteCompanyController.java @@ -0,0 +1,39 @@ +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.service.CompeteService; +import com.ccsens.mt.service.ICompeteService; +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; + +import javax.annotation.Resource; + +@Slf4j +@Api(tags = "用户信息", description = "") +@RestController +@RequestMapping("/compete/userMes") +public class CompeteCompanyController { + @Resource + private ICompeteService competeService; + @MustLogin + @ApiOperation(value = "用户的参赛单位id", notes = "") + @RequestMapping(value = "/getUserCompanyId", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse getUserCompanyId(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("查看当前用户的参赛单位id：{}",params); + CompeteVo.CompanyId companyId1=new CompeteVo.CompanyId(); + Long companyId = competeService.getUserCompanyId(params.getUserId(),params.getParam().getType()); + companyId1.setCompanyId(companyId); + return JsonResponse.newInstance().ok(companyId1); + } +} 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..86c916d2 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java @@ -2,11 +2,14 @@ package com.ccsens.mt.api; import com.ccsens.cloudutil.annotation.MustLogin; import com.ccsens.mt.bean.dto.CompeteDto; +import com.ccsens.mt.bean.dto.ScoreDto; 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; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; @@ -15,20 +18,25 @@ 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; +import springfox.documentation.spring.web.json.Json; import javax.annotation.Resource; +import java.io.IOException; +import java.util.List; /** * @author 逗 */ @Slf4j -@Api(tags = "线上体育竞技比赛", description = "") +@Api(tags = "比赛评分相关接口", description = "") @RestController -@RequestMapping("/compete") +@RequestMapping("/compete/score") public class CompeteScoreController { @Resource private ICompeteService competeService; + + @MustLogin @ApiOperation(value = "查询比赛项目上的参赛选手列表", notes = "") @RequestMapping(value = "/get/playerList", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) @@ -38,14 +46,96 @@ 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); -// } + @MustLogin + @ApiOperation(value = "花样赛提交分数", notes = "Mr.王----提交成绩到那个花样赛得表里面就行了，单表操作") + @RequestMapping(value = "/submitOrderList", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse submitOrder(@ApiParam @Validated @RequestBody QueryDto params){ + log.info("花样赛提交分数：{}",params); + competeService.submitOrderList(params.getParam()); + return JsonResponse.newInstance().ok(); + } + @MustLogin + @ApiOperation(value = "花样赛提交分数查询", notes = "Mr.王----裁判判分前和后都可以查询") + @RequestMapping(value = "/selSubmitOrderList", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse selSubmitOrderList(@ApiParam @Validated @RequestBody QueryDto params){ + log.info("花样赛分数查询：{}",params); + CompeteVo.SelScropeVo selScropeVo= competeService.selSubmitOrderList(params.getParam()); + return JsonResponse.newInstance().ok(selScropeVo); + } + + @ApiOperation(value = "花样赛成绩查看", notes = "Mr.王 -----从花样赛成绩表里面查看出这个人得成绩") + @RequestMapping(value = "/showResult", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> showResult (@ApiParam @Validated @RequestBody QueryDto params){ + log.info("花样赛详细分数查看：{}",params); + List totalScoreDisplaysList= competeService.showResult(params.getParam()); + return JsonResponse.newInstance().ok(totalScoreDisplaysList); + } + + + @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); + } + + + @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); + 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 = "/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"}) + public JsonResponse submitScore(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("查询比赛项目上的参赛选手列表：{}",params); + competeService.submitScore(params.getParam()); + return JsonResponse.newInstance().ok(); + } + + @MustLogin + @ApiOperation(value = "速度通级赛", notes = "") + @RequestMapping(value = "/speedPass", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse speedPass(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("速度通级赛：{}",params); + List speedPassList = competeService.speedPass(params.getParam()); + 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/CompeteTaskController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java new file mode 100644 index 00000000..ac30c925 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java @@ -0,0 +1,103 @@ +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; +import com.ccsens.util.WebConstant; +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; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.List; + +/** + * @author 逗 + */ +@Api(tags = "比赛日程相关接口", description = "裁判分配日程安排等。。。") +@RestController +@RequestMapping("/compete/task") +@Slf4j +public class CompeteTaskController { + @Resource + private ICompeteTaskService competeTaskService; + + @MustLogin + @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); + List dailyScheduleProcessList = competeTaskService.queryCompeteConfig(params.getParam()); + log.info("查找日期配置：{}",dailyScheduleProcessList); + return JsonResponse.newInstance().ok(dailyScheduleProcessList); + } + + @MustLogin + @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, HttpServletRequest request) { + log.info("日程安排更新：{}",params); + String authHeader = request.getHeader(WebConstant.HEADER_KEY_TOKEN); + List dailyScheduleProcessList = competeTaskService.updateCompeteProjectConfig(params.getParam(),authHeader); + 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); + } + + @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, HttpServletRequest request) { + log.info("分配裁判信息：{}",params); + String authHeader = request.getHeader(WebConstant.HEADER_KEY_TOKEN); + List queryJudgmentList = competeTaskService.allocationJudgment(params.getParam(),authHeader); + log.info("分配裁判信息：{}",queryJudgmentList); + 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/api/CompeteVideoController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java new file mode 100644 index 00000000..3fe725a0 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java @@ -0,0 +1,98 @@ +package com.ccsens.mt.api; + +import com.ccsens.cloudutil.annotation.MustLogin; +import com.ccsens.mt.bean.dto.CompeteDto; +import com.ccsens.mt.bean.dto.VideoDto; +import com.ccsens.mt.bean.vo.VideoProjectVo; +import com.ccsens.mt.service.ICompeteVedioService; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.bean.dto.QueryDto; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModelProperty; +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; + +import javax.annotation.Resource; +import java.util.List; + +@Api(tags = "比赛视频相关接口", description = "") +@RestController +@RequestMapping("/compete/video") +@Slf4j +public class CompeteVideoController { + + @Resource + private ICompeteVedioService iCompeteVedioService; + + @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); + 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); + boolean code= iCompeteVedioService.selectSignVideo(params.getParam().getCompanyId()); + return JsonResponse.newInstance().ok(code); + } + + @MustLogin + @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); + String path= iCompeteVedioService.uploadVideoPath(params.getParam()); + return JsonResponse.newInstance().ok(path); + } + + @MustLogin + @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); + 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 + @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) { + + log.info("添加用户观看开幕式视频记录（签到用）:{}",params); + List list=iCompeteVedioService.selectTwoProject(params); + return JsonResponse.newInstance().ok(list); + + } + @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); + List list=iCompeteVedioService.selectAllCompany(params); + return JsonResponse.newInstance().ok(list); + } + + + +} 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..2e8eb55b 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,9 @@ 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.dto.ScoreDto; +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 +21,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.io.IOException; +import java.util.List; /** * @author li @@ -32,7 +35,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); @@ -42,7 +45,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); @@ -52,7 +55,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); @@ -78,7 +81,64 @@ 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); + } + @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); + 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 QueryDto params) { + log.info("日程安排更新：{}",params); + 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 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); + 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); + } + @MustLogin + @ApiOperation(value = "花样赛成绩导出（导出）", notes = "") + @RequestMapping(value = "/patternExpTable", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse patternExpTable(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("参赛人数统计表：{}",params); + String path = excelService.patternExpTable(params.getParam()); + return JsonResponse.newInstance().ok(path); + } } diff --git a/mt/src/main/java/com/ccsens/mt/api/KCPlayerController.java b/mt/src/main/java/com/ccsens/mt/api/KCPlayerController.java new file mode 100644 index 00000000..3d07b837 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/api/KCPlayerController.java @@ -0,0 +1,48 @@ +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.service.IKCPlayerService; +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; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + +@Slf4j +@Api(tags = "云点播", description = "") +@RestController +@RequestMapping("/kcPlayer") +public class KCPlayerController { + @Resource + private IKCPlayerService kcPlayerService; + + @ApiOperation(value = "查看云点播签名", notes = "从redis获取云点播签名，有则返回，没有则调用工具类查询，存入redis并返回") + @RequestMapping(value = "/get", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse getSignature(Long id) { + log.info("查看云点播签名"); + String signature = kcPlayerService.getSignature(id); + log.info("查看云点播签名：{}",signature); + return JsonResponse.newInstance().ok(signature); + } + + @ApiOperation(value = "查看云点播签名", notes = "从redis获取云点播签名，有则返回，没有则调用工具类查询，存入redis并返回") + @RequestMapping(value = "/receive", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse receive(@RequestBody Map map) { + log.info("接受文件上传通知：{}",map); + + return JsonResponse.newInstance().ok(); + } + +} 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..1b8daeb3 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,29 @@ 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); } + + @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/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); } + + + + } 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 3e9d1ab7..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 @@ -6,6 +6,7 @@ import lombok.Data; import lombok.NonNull; import javax.validation.constraints.*; +import java.math.BigDecimal; import java.util.List; /** @@ -13,6 +14,7 @@ import java.util.List; */ @Data public class CompeteDto { + @Data @ApiModel public static class CompeteType{ @@ -21,6 +23,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{ @@ -305,4 +315,87 @@ public class CompeteDto { @ApiModelProperty("") private String fileBase64; } + + + @Data + @ApiModel + public static class EnterInfo{ + @ApiModelProperty("项目id") + private Long projectId; + @ApiModelProperty("组别id") + private Long groupId; + @ApiModelProperty("团队id") + private Long companyId; + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("身份证号") + private String idCard; + @ApiModelProperty("当前页") + private int page=1; + @ApiModelProperty("每页数量") + private int size=10; + } + + @Data + @ApiModel("查看选手列表（手机用）") + public static class ProjectIdAndGroupId{ + @ApiModelProperty("项目id") + private Long projectId; + @ApiModelProperty("组别id") + 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; + } + + @Data + @ApiModel + public static class CompeteTimeAndProjectId{ + @NotNull + @ApiModelProperty("第几届信息的id") + private Long competeTimeId; + @NotNull + @ApiModelProperty("项目id") + private Long projectId; + } + + @Data + @ApiModel + public static class SelScore{ + @NotNull + @ApiModelProperty("第几届信息的id") + private Long competeTimeId; + @NotNull + @ApiModelProperty("项目id") + private Long projectId; + } + @Data + @ApiModel + public static class GetUserCompany { + @NotNull + @ApiModelProperty("比赛的类型，0跳绳省赛 1跳绳校内比赛") + private Byte type; + } } 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..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 @@ -4,7 +4,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; +import java.util.Date; import java.util.List; /** @@ -21,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") @@ -94,6 +105,10 @@ public class ProvinceCompeteDto { private Long projectId; @ApiModelProperty("单位id") private Long companyId; + @ApiModelProperty("性别组") + private int gender; + @ApiModelProperty("组别信息") + private int groupRemark; @ApiModelProperty("选手id") private List players; } @@ -119,7 +134,7 @@ public class ProvinceCompeteDto { @ApiModelProperty("姓名") private String name; //姓名 @ApiModelProperty("性别") - private String gender; //性别 + private int gender; //性别 @ApiModelProperty("联系方式") private String phone; //联系方式 @ApiModelProperty("身份证号") @@ -130,6 +145,35 @@ public class ProvinceCompeteDto { private Long coachCertificate; //教练证（只有教练需要，文件类型） } + @Data + @ApiModel("修改日程安排111") + public static class UpdateAndSearch{ + @ApiModelProperty("项目id") + private Long projectId; + @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; + } + @Data @ApiModel("查找团队项目下已参加的选手信息") public static class GetPlayerByTeamProject{ @@ -139,5 +183,127 @@ public class ProvinceCompeteDto { @NotNull(message = "请选择项目") @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; + } + + @Data + @ApiModel("删除参赛队伍") + public static class DelTeam{ + @NotNull(message = "队伍id") + @ApiModelProperty("队伍id") + private Long teamId; + } + + + @Data + @ApiModel("修改日程安排") + public static class UpdateCompeteProjectConfig{ + @NotNull + @ApiModelProperty("Tall当前项目id") + private Long projectId; + @NotNull + @ApiModelProperty("Tall内当前角色id") + private Long tallRoleId; + @ApiModelProperty("单项时间 单位：秒") + private List updateCompeteTaskList; + } + + @Data + @ApiModel("需要修改的日程安排") + public static class UpdateCompeteTask{ + @NotNull + @ApiModelProperty("比赛项目项目id") + private Long projectId; + @ApiModelProperty("单项时间 单位：秒") + private long duration; + @ApiModelProperty("场地数量") + private int siteNum = 1; + @ApiModelProperty("项目开始时间") + private Long startTime = 0L; + @ApiModelProperty("项目结束时间") + private Long endTime = 0L; + } + + @Data + @ApiModel("手机上查找当前单位的选手出场顺序") + public static class QueryStartOrderByCompany{ + @ApiModelProperty("比赛项目id,为空则查询全部项目") + private Long projectId; + @NotNull + @ApiModelProperty("大赛id") + private Long competeTimeId; + @NotNull + @ApiModelProperty("单位id") + 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{ + @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; + @NotEmpty + @ApiModelProperty("手机号") + private String judgmentPhone; + @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/dto/ScoreDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java index 4bdcd814..792354bd 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,9 +1,12 @@ package com.ccsens.mt.bean.dto; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.NonNull; +import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.List; @@ -83,4 +86,66 @@ public class ScoreDto { @ApiModelProperty("分数") private BigDecimal score; } + + + @Data + @ApiModel + public static class InformationSubmitted{ + @NotNull + @ApiModelProperty("大赛id") + private Long competeTimeId; + @NotNull + @ApiModelProperty("项目Id") + private Long projectId; + @NotNull + @ApiModelProperty("场次id") + private Long siteOrderId; + @NotNull + @ApiModelProperty("裁判id") + private Long judgmentId; + @NotNull + @ApiModelProperty("备注") + private String remark; + @NotNull + @ApiModelProperty("裁判是否选择了弃权还是啥的") + private Byte waiver; + @NotNull + @ApiModelProperty("计分项目") + private List fractionsList; + + } + @Data + @ApiModel + public static class Fraction{ + @ApiModelProperty("分数") + private BigDecimal score; + @ApiModelProperty("分数类型") + private String code; + } + + @Data + @ApiModel + public static class ShowResult{ + @NotNull + @ApiModelProperty("项目id") + private Long projectId; + } + @Data + @ApiModel + public static class SelScrop{ + @NotNull + @ApiModelProperty("大赛id") + private Long competeTimeId; + @NotNull + @ApiModelProperty("项目Id") + private Long projectId; + @NotNull + @ApiModelProperty("场次id") + private Long siteOrderId; + @NotNull + @ApiModelProperty("裁判id") + private Long judgmentId; + } + + } 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 12c90dbc..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 @@ -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; /** @@ -39,4 +40,66 @@ public class VideoDto { @ApiModelProperty("视频文件浏览路径") private String videoFileUrl; } + @Data + @ApiModel("添加用户观看开幕式视频记录（签到用）") + public static class Video{ + @NonNull + @ApiModelProperty("单位文件id") + private Long companyId; + public Video() { + } + } + @Data + @ApiModel("上传视频保存上传记录 (比赛视频)") + public static class UploadVdeo{ + @ApiModelProperty("单位id") + private Long companyId; + @ApiModelProperty("大赛id") + private Long competeTimeId; + @ApiModelProperty("项目id") + private Long competeProjectId; + @ApiModelProperty("选手参赛表Id/团队id") + private Long playerOrTeamId; + @ApiModelProperty("视频路径（云点播）") + private String videoPath; + } + @Data + @ApiModel("查看所有二级比赛项目()") + public static class GetTwoProject{ + @ApiModelProperty("大赛id") + private Long teamId; + + } + @Data + @ApiModel("查找所有参赛单位") + public static class GetAllCompany{ + @ApiModelProperty("大赛id") + private Long teamId; + } + @Data + @ApiModel("参赛队伍/裁判签到表") + 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/po/CompeteCountScore.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScore.java new file mode 100644 index 00000000..d89e1feb --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScore.java @@ -0,0 +1,151 @@ +package com.ccsens.mt.bean.po; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +public class CompeteCountScore extends CompeteCountScoreKey implements Serializable { + private Long competeTimeId; + + private Long projectId; + + private Long siteOrderId; + + private BigDecimal chiefJudgmentScore; + + private BigDecimal judgmentAScore; + + private BigDecimal judgmentBScore2; + + private Integer deductTimes; + + private String deductCause; + + private BigDecimal finalScore; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private static final long serialVersionUID = 1L; + + 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 BigDecimal getChiefJudgmentScore() { + return chiefJudgmentScore; + } + + public void setChiefJudgmentScore(BigDecimal chiefJudgmentScore) { + this.chiefJudgmentScore = chiefJudgmentScore; + } + + public BigDecimal getJudgmentAScore() { + return judgmentAScore; + } + + public void setJudgmentAScore(BigDecimal judgmentAScore) { + this.judgmentAScore = judgmentAScore; + } + + public BigDecimal getJudgmentBScore2() { + return judgmentBScore2; + } + + public void setJudgmentBScore2(BigDecimal judgmentBScore2) { + this.judgmentBScore2 = judgmentBScore2; + } + + 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 BigDecimal getFinalScore() { + return finalScore; + } + + public void setFinalScore(BigDecimal 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(", 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(", 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..c72f3961 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreExample.java @@ -0,0 +1,1052 @@ +package com.ccsens.mt.bean.po; + +import java.math.BigDecimal; +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 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; + } + + 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(BigDecimal value) { + addCriterion("chief_judgment_score =", value, "chiefJudgmentScore"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentScoreNotEqualTo(BigDecimal value) { + addCriterion("chief_judgment_score <>", value, "chiefJudgmentScore"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentScoreGreaterThan(BigDecimal value) { + addCriterion("chief_judgment_score >", value, "chiefJudgmentScore"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentScoreGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("chief_judgment_score >=", value, "chiefJudgmentScore"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentScoreLessThan(BigDecimal value) { + addCriterion("chief_judgment_score <", value, "chiefJudgmentScore"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentScoreLessThanOrEqualTo(BigDecimal 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(BigDecimal value1, BigDecimal value2) { + addCriterion("chief_judgment_score between", value1, value2, "chiefJudgmentScore"); + return (Criteria) this; + } + + public Criteria andChiefJudgmentScoreNotBetween(BigDecimal value1, BigDecimal 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(BigDecimal value) { + addCriterion("judgment_a_score =", value, "judgmentAScore"); + return (Criteria) this; + } + + public Criteria andJudgmentAScoreNotEqualTo(BigDecimal value) { + addCriterion("judgment_a_score <>", value, "judgmentAScore"); + return (Criteria) this; + } + + public Criteria andJudgmentAScoreGreaterThan(BigDecimal value) { + addCriterion("judgment_a_score >", value, "judgmentAScore"); + return (Criteria) this; + } + + public Criteria andJudgmentAScoreGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("judgment_a_score >=", value, "judgmentAScore"); + return (Criteria) this; + } + + public Criteria andJudgmentAScoreLessThan(BigDecimal value) { + addCriterion("judgment_a_score <", value, "judgmentAScore"); + return (Criteria) this; + } + + public Criteria andJudgmentAScoreLessThanOrEqualTo(BigDecimal 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(BigDecimal value1, BigDecimal value2) { + addCriterion("judgment_a_score between", value1, value2, "judgmentAScore"); + return (Criteria) this; + } + + public Criteria andJudgmentAScoreNotBetween(BigDecimal value1, BigDecimal 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(BigDecimal value) { + addCriterion("judgment_b_score2 =", value, "judgmentBScore2"); + return (Criteria) this; + } + + public Criteria andJudgmentBScore2NotEqualTo(BigDecimal value) { + addCriterion("judgment_b_score2 <>", value, "judgmentBScore2"); + return (Criteria) this; + } + + public Criteria andJudgmentBScore2GreaterThan(BigDecimal value) { + addCriterion("judgment_b_score2 >", value, "judgmentBScore2"); + return (Criteria) this; + } + + public Criteria andJudgmentBScore2GreaterThanOrEqualTo(BigDecimal value) { + addCriterion("judgment_b_score2 >=", value, "judgmentBScore2"); + return (Criteria) this; + } + + public Criteria andJudgmentBScore2LessThan(BigDecimal value) { + addCriterion("judgment_b_score2 <", value, "judgmentBScore2"); + return (Criteria) this; + } + + public Criteria andJudgmentBScore2LessThanOrEqualTo(BigDecimal 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(BigDecimal value1, BigDecimal value2) { + addCriterion("judgment_b_score2 between", value1, value2, "judgmentBScore2"); + return (Criteria) this; + } + + public Criteria andJudgmentBScore2NotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("judgment_b_score2 not between", value1, value2, "judgmentBScore2"); + 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(BigDecimal value) { + addCriterion("final_score =", value, "finalScore"); + return (Criteria) this; + } + + public Criteria andFinalScoreNotEqualTo(BigDecimal value) { + addCriterion("final_score <>", value, "finalScore"); + return (Criteria) this; + } + + public Criteria andFinalScoreGreaterThan(BigDecimal value) { + addCriterion("final_score >", value, "finalScore"); + return (Criteria) this; + } + + public Criteria andFinalScoreGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("final_score >=", value, "finalScore"); + return (Criteria) this; + } + + public Criteria andFinalScoreLessThan(BigDecimal value) { + addCriterion("final_score <", value, "finalScore"); + return (Criteria) this; + } + + public Criteria andFinalScoreLessThanOrEqualTo(BigDecimal 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(BigDecimal value1, BigDecimal value2) { + addCriterion("final_score between", value1, value2, "finalScore"); + return (Criteria) this; + } + + public Criteria andFinalScoreNotBetween(BigDecimal value1, BigDecimal 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/CompeteCountScoreKey.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreKey.java new file mode 100644 index 00000000..407e838d --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteCountScoreKey.java @@ -0,0 +1,77 @@ + +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(); + } +} + + +//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/CompeteJudgment.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgment.java new file mode 100644 index 00000000..15401e81 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgment.java @@ -0,0 +1,172 @@ +package com.ccsens.mt.bean.po; + +import java.io.Serializable; +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 Integer site; + + private Long projectId; + + private Long userId; + + private Byte chiefJudgment; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private Long memberId; + + private Long roleId; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + 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; + } + + public void setCompeteTimeId(Long competeTimeId) { + this.competeTimeId = competeTimeId; + } + + public Integer getSite() { + return site; + } + + public void setSite(Integer site) { + this.site = site; + } + + 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; + } + + public Long getMemberId() { + return memberId; + } + + public void setMemberId(Long memberId) { + this.memberId = memberId; + } + + public Long getRoleId() { + return roleId; + } + + public void setRoleId(Long roleId) { + this.roleId = roleId; + } + + @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(", name=").append(name); + sb.append(", phone=").append(phone); + sb.append(", remark=").append(remark); + sb.append(", competeTimeId=").append(competeTimeId); + 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(", roleId=").append(roleId); + 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..695a1b2c --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteJudgmentExample.java @@ -0,0 +1,1071 @@ +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 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; + } + + 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 andSiteIsNull() { + addCriterion("site is null"); + return (Criteria) this; + } + + public Criteria andSiteIsNotNull() { + addCriterion("site is not null"); + return (Criteria) this; + } + + public Criteria andSiteEqualTo(Integer value) { + addCriterion("site =", value, "site"); + return (Criteria) this; + } + + public Criteria andSiteNotEqualTo(Integer value) { + addCriterion("site <>", value, "site"); + return (Criteria) this; + } + + public Criteria andSiteGreaterThan(Integer value) { + addCriterion("site >", value, "site"); + return (Criteria) this; + } + + public Criteria andSiteGreaterThanOrEqualTo(Integer value) { + addCriterion("site >=", value, "site"); + return (Criteria) this; + } + + public Criteria andSiteLessThan(Integer value) { + addCriterion("site <", value, "site"); + return (Criteria) this; + } + + public Criteria andSiteLessThanOrEqualTo(Integer 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(Integer value1, Integer value2) { + addCriterion("site between", value1, value2, "site"); + return (Criteria) this; + } + + public Criteria andSiteNotBetween(Integer value1, Integer value2) { + addCriterion("site not between", value1, value2, "site"); + 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 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 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 { + + 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..a6facb50 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrder.java @@ -0,0 +1,172 @@ +package com.ccsens.mt.bean.po; + +import java.io.Serializable; +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; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private Long taskId; + + private Long startTime; + + private Long endTime; + + private String remark; + + private Byte waiver; + + 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 Long getPlayerId() { + return playerId; + } + + public void setPlayerId(Long playerId) { + this.playerId = playerId; + } + + public Byte getTeam() { + return team; + } + + public void setTeam(Byte team) { + this.team = team; + } + + 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; + } + + 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; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark == null ? null : remark.trim(); + } + + public Byte getWaiver() { + return waiver; + } + + public void setWaiver(Byte waiver) { + this.waiver = waiver; + } + + @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(", playerId=").append(playerId); + sb.append(", team=").append(team); + 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(", taskId=").append(taskId); + sb.append(", startTime=").append(startTime); + sb.append(", endTime=").append(endTime); + sb.append(", remark=").append(remark); + sb.append(", waiver=").append(waiver); + 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..a0ba3036 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrderExample.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 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 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; + } + + 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 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; + } + + 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 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 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 andWaiverIsNull() { + addCriterion("waiver is null"); + return (Criteria) this; + } + + public Criteria andWaiverIsNotNull() { + addCriterion("waiver is not null"); + return (Criteria) this; + } + + public Criteria andWaiverEqualTo(Byte value) { + addCriterion("waiver =", value, "waiver"); + return (Criteria) this; + } + + public Criteria andWaiverNotEqualTo(Byte value) { + addCriterion("waiver <>", value, "waiver"); + return (Criteria) this; + } + + public Criteria andWaiverGreaterThan(Byte value) { + addCriterion("waiver >", value, "waiver"); + return (Criteria) this; + } + + public Criteria andWaiverGreaterThanOrEqualTo(Byte value) { + addCriterion("waiver >=", value, "waiver"); + return (Criteria) this; + } + + public Criteria andWaiverLessThan(Byte value) { + addCriterion("waiver <", value, "waiver"); + return (Criteria) this; + } + + public Criteria andWaiverLessThanOrEqualTo(Byte value) { + addCriterion("waiver <=", value, "waiver"); + return (Criteria) this; + } + + public Criteria andWaiverIn(List values) { + addCriterion("waiver in", values, "waiver"); + return (Criteria) this; + } + + public Criteria andWaiverNotIn(List values) { + addCriterion("waiver not in", values, "waiver"); + return (Criteria) this; + } + + public Criteria andWaiverBetween(Byte value1, Byte value2) { + addCriterion("waiver between", value1, value2, "waiver"); + return (Criteria) this; + } + + public Criteria andWaiverNotBetween(Byte value1, Byte value2) { + addCriterion("waiver not between", value1, value2, "waiver"); + 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/CompeteVarietyScore.java b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScore.java new file mode 100644 index 00000000..e264a762 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScore.java @@ -0,0 +1,129 @@ +package com.ccsens.mt.bean.po; + +import java.io.Serializable; +import java.math.BigDecimal; +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 BigDecimal 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 BigDecimal getScore() { + return score; + } + + public void setScore(BigDecimal 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..633c6a56 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/bean/po/CompeteVarietyScoreExample.java @@ -0,0 +1,812 @@ +package com.ccsens.mt.bean.po; + +import java.math.BigDecimal; +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(BigDecimal value) { + addCriterion("score =", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreNotEqualTo(BigDecimal value) { + addCriterion("score <>", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreGreaterThan(BigDecimal value) { + addCriterion("score >", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("score >=", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreLessThan(BigDecimal value) { + addCriterion("score <", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreLessThanOrEqualTo(BigDecimal 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(BigDecimal value1, BigDecimal value2) { + addCriterion("score between", value1, value2, "score"); + return (Criteria) this; + } + + public Criteria andScoreNotBetween(BigDecimal value1, BigDecimal 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/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/bean/vo/CompeteExcelVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteExcelVo.java new file mode 100644 index 00000000..cacad4d0 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteExcelVo.java @@ -0,0 +1,64 @@ +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/bean/vo/CompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java index 2c46dd01..68c669b8 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 @@ -2,6 +2,7 @@ package com.ccsens.mt.bean.vo; import com.ccsens.mt.bean.po.CompetePlayer; import com.ccsens.mt.bean.po.CompeteTeam; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,6 +15,17 @@ import java.util.List; */ @Data public class CompeteVo { + + @Data + @ApiModel("教练和成绩") + public static class Result{ + @ApiModelProperty("教练号") + private byte chief; + @ApiModelProperty("分数") + private BigDecimal score; + } + + @Data @ApiModel("查找第几届") public static class CompeteTime{ @@ -452,4 +464,128 @@ public class CompeteVo { private String otherPlayerName; } + @Data + + @ApiModel("花样赛总成绩") + public static class TotalScoreDisplay{ + @ApiModelProperty("单位名") + public String companyName; + @ApiModelProperty("参赛队员名") + public String peopleName; + @ApiModelProperty("裁判1") + public BigDecimal referee1 = new BigDecimal(0); + @ApiModelProperty("裁判2") + public BigDecimal referee2 = new BigDecimal(0); + @ApiModelProperty("裁判3") + public BigDecimal referee3 = new BigDecimal(0); + @ApiModelProperty("1-3裁判得平均值") + public BigDecimal avg1To3 = new BigDecimal(0); + @ApiModelProperty("裁判4") + public BigDecimal referee4 = new BigDecimal(0); + @ApiModelProperty("裁判5") + public BigDecimal referee5 = new BigDecimal(0); + @ApiModelProperty("裁判6") + public BigDecimal referee6 = new BigDecimal(0); + @ApiModelProperty("4-6裁判得平均值") + public BigDecimal avg4To6 = new BigDecimal(0); + @ApiModelProperty("主裁判") + public BigDecimal referee0 = new BigDecimal(0); + @ApiModelProperty("最后得分") + public BigDecimal result = new BigDecimal(0); + @ApiModelProperty("排名") + public int order; + } + + @Data + @ApiModel("裁判评分查询") + public static class SelScropeVo{ + @ApiModelProperty("项目id") + private Long id; + @ApiModelProperty("项目名") + private String projectName; + @ApiModelProperty("单位") + private Long companyId; + @ApiModelProperty("单位名") + private String companyName; + @ApiModelProperty("组别id") + private Long groupId; + + @ApiModelProperty("组别名称") + private String groupName; + + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("场地信息") + private Byte site; + @ApiModelProperty("备注") + private String remark; + @ApiModelProperty("是否弃权") + private Byte waiver; + @ApiModelProperty("分数合集") + private List scoreList; + } + @Data + @ApiModel + public static class ScropList{ + @ApiModelProperty("code") + private String code; + @ApiModelProperty("分数") + private BigDecimal score; + + } + + @Data + @ApiModel("项目，开始时间和比赛状态") + public static class CountScore{ + @ApiModelProperty("项目id") + private Long id; + @ApiModelProperty("项目名") + private String projectName; + @ApiModelProperty("项目开始时间") + private Long startTime; + @ApiModelProperty("项目状态0-未开始,1-进行中,2-结束") + private int status; + } + + @Data + @ApiModel("得分享请") + public static class CountScoreDetail{ + @ApiModelProperty("参赛队伍") + private String companyName; + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("成绩") + private Long grade; + } + + @Data + @ApiModel("速度通级赛") + public static class SpeedPass{ + @ApiModelProperty("参赛队伍") + private String companyName; + @ApiModelProperty("组别") + private String groupName; + @ApiModelProperty("姓名") + private String playerName; + @ApiModelProperty("30秒单摇跳（次）") + private BigDecimal secondTime; + @ApiModelProperty("3分钟单摇跳（次）") + private BigDecimal minuteTime; + @ApiModelProperty("30秒单摇跳等级") + private int secondGrade; + @ApiModelProperty("3分钟单摇跳等级") + private int minuteGrade; + @ApiModelProperty("等级") + private int grade; + @ApiModelProperty("玩家id") + private Long playerId; + @ApiModelProperty("项目id") + private Long projectId; + } + @Data + @ApiModel("公司id") + public static class CompanyId { + @ApiModelProperty("公司") + private Long companyId; + } } 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..40f7bc5d 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,9 +1,12 @@ 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; +import java.util.ArrayList; import java.util.List; @@ -48,6 +51,12 @@ public class ProvinceCompeteVo { private Long groupId; @ApiModelProperty("组别名字") private String groupName; + @ApiModelProperty("性别组") + private int gender; + @ApiModelProperty("组别信息") + private int groupRemark; + @ApiModelProperty("团队id") + private Long teamId; @ApiModelProperty("选手信息") private List playerList; } @@ -81,6 +90,8 @@ public class ProvinceCompeteVo { private String name; @ApiModelProperty("是否是团队项目 0否 1是") private byte team; + @ApiModelProperty("参赛规则 0限制组别 1不限组别") + private byte joinRule; @ApiModelProperty("最少人数") private int memberMin; @ApiModelProperty("最多人数") @@ -222,4 +233,107 @@ public class ProvinceCompeteVo { private int sexGroup; private String groupRemark = "123"; } + + @Data + @ApiModel("查看单位下当前项目所有参赛人员或队伍信息（上传视频用）") + public static class StartOrderByCompanyAndProject { + @ApiModelProperty("项目id") + private Long projectId; + @ApiModelProperty("项目名") + private String projectName; + @ApiModelProperty("项目下的每个场次的选手") + private List startOrderList; + @ApiModelProperty("开始时间") + private Long startTime; + @ApiModelProperty("结束时间") + private Long endTime; + + public Long getEndTime(){ + if(ObjectUtil.isNotNull(startTime) && startTime != 0){ + return startTime + Constant.UPLOAD_VIDEO_TIME; + } + return null; + } + + } + + @Data + @ApiModel("查看单位下当前项目所有参赛人员或队伍信息（上传视频用）") + public static class StartOrder { + @ApiModelProperty("场次id") + private Long startOrderId; + @ApiModelProperty("场次") + private int competeOrder; + @ApiModelProperty("选手关联项目id/团队id") + private Long playerOrTeamId; + @ApiModelProperty("场地") + private int site; + @ApiModelProperty("选手名") + private List playerNameList; + @ApiModelProperty("是否是团队项目 0否 1是") + private int team; + @ApiModelProperty("组别名") + private String groupName; + @ApiModelProperty("视频连接（云点播）（为null则代表未传视频）") + private String videoUrl; + } + + + @Data + @ApiModel("查看裁判分配信息") + public static class QueryJudgment { + @ApiModelProperty("项目id") + private Long projectId; + @ApiModelProperty("项目名") + private String projectName; + @ApiModelProperty("比赛类型 0计数赛 1花样赛") + private int projectType; + @ApiModelProperty("项目开始时间") + private Long startTime; + @ApiModelProperty("项目结束时间") + private Long endTime; + @ApiModelProperty("场地数量") + private int siteNums; + @ApiModelProperty("项目下的场地") + private List siteList = new ArrayList<>(); + } + @Data + @ApiModel("项目下的场地信息") + public static class ProjectSite { + @ApiModelProperty("场地编号") + private int siteNum; + @ApiModelProperty("场地下的裁判") + private List judgmentList = new ArrayList<>(); + } + + @Data + @ApiModel("场地下的裁判信息") + public static class SiteJudgment { + @ApiModelProperty("裁判编号") + private int judgmentNum; + @ApiModelProperty("裁判名字") + private String judgmentName; + @ApiModelProperty("裁判手机号") + private String judgmentPhone; + @ApiModelProperty("备注") + private String remark; + + } + + @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/bean/vo/ScoreVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/ScoreVo.java index a2a9404d..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 @@ -179,4 +179,54 @@ 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 Integer shouldScore; + @ApiModelProperty("扣除次数") + private Integer deductTime; + @ApiModelProperty("扣除原因") + private String deductReason; + @ApiModelProperty("最终成绩") + private BigDecimal finalScore; + @ApiModelProperty("备注") + private String remark; + @ApiModelProperty("名词") + private int rangee; + } + } 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..28cabbca 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 @@ -17,6 +17,8 @@ public class TableVo { @Data @ApiModel("XXXX大赛报名表") public static class CompeteJoin{ + @ApiModelProperty("参赛id") + private Long projectId; @ApiModelProperty("参赛项目") private String competeProject; @ApiModelProperty("组别") @@ -29,8 +31,10 @@ public class TableVo { private int age; @ApiModelProperty("身份证号") private String idCard; - @ApiModelProperty("身份证明") - private String idCardPromise; + @ApiModelProperty("身份证明正面") + private String idCardPromiseFront; + @ApiModelProperty("身份证明背面") + private String idCardPromiseBack; @ApiModelProperty("一寸证件照") private String picture; @ApiModelProperty("学籍证明/俱乐部证明") @@ -110,4 +114,112 @@ public class TableVo { private List nums = new ArrayList<>(); } + @Data + @ApiModel("日程安排") + public static class DailyScheduleProcess{ + @ApiModelProperty("参赛id") + private Long projectId; + @ApiModelProperty("参赛项目") + private String projectName; + @ApiModelProperty("参赛人/队伍") + private int joinNum; + @ApiModelProperty("单项时间 单位秒") + private long singleTime; + @ApiModelProperty("场地") + private int siteNum; + @ApiModelProperty("场次") + private double games; + @ApiModelProperty("总时间") + private double timeSum; + @ApiModelProperty("项目开始时间") + private Long startTime; + @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 = 1; + @ApiModelProperty("场次") + private int games; + @ApiModelProperty("总时间") + private int timeSum; + @ApiModelProperty("比赛项目开始时间") + private Long startTime; + @ApiModelProperty("比赛项目结束时间") + private Long endTime; + + public int getGames(){ + if(joinNum != 0 && siteNum != 0) { + return (int) Math.ceil(joinNum / siteNum); + } + return 0; + } + + public Long getStartTime(){ + if (startTime != null) { + return startTime == 0 ? null : startTime; + } + return null; + } + public Long getEndTime(){ + if (endTime != null) { + return endTime == 0 ? null : endTime; + } + return null; + + } + public int getTimeSum(){ + if(duration != 0 && games != 0) { + return duration * games; + } + return 0; + } + } + + + @Data + @ApiModel("日程安排上下午") + public static class SchedulePlanAll{ + @ApiModelProperty("项目所属日期") + private List schedulePlanList; + + } + + @Data + @ApiModel("日程安排上下午") + public static class SchedulePlan{ + @ApiModelProperty("项目所属日期") + private String date; + @ApiModelProperty("安排详情上午") + private List schedulePlanDetailListMorning; + @ApiModelProperty("安排详情下午") + private List schedulePlanDetailListAfternoon; + @ApiModelProperty("安排详情晚上") + private List schedulePlanDetailListNight; + } + + @Data + @ApiModel("日程安排") + public static class SchedulePlanDetail{ + @ApiModelProperty("参赛项目") + private String projectName; + @ApiModelProperty("上午项目开始时间") + private Long startTime; + @ApiModelProperty("项目结束时间") + private Long endTime; + } + + + + } 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 new file mode 100644 index 00000000..e185a41c --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java @@ -0,0 +1,57 @@ +package com.ccsens.mt.bean.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; + +import java.util.Date; + +@Data +public class VideoProjectVo { + + @Data + @ApiModel("返回所有二级比赛项目（包括项目类型）") + public static class GetTwoProject{ + @ApiModelProperty("项目id") + private Long projectId; + @ApiModelProperty("项目名") + private String projectName; + @ApiModelProperty("项目类型") + private int projectType; + } + @Data + @ApiModel("查找所有参赛单位") + public static class GetAllCompany{ + @ApiModelProperty("参赛单位id") + private Long companyId; + @ApiModelProperty("返回参赛单位名称") + 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 Date time; + } + + +} 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..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 @@ -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; @@ -102,7 +103,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 @@ -116,4 +117,39 @@ 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); + + /** + * 查找该选手是否参加了该项目的其他组别 + * @param competeTimeId 大赛id + * @param playerId 选手id + * @param projectId 项目id + * @param companyId 单位id + * @param gender 性别组 + * @param groupRemark 组别备注信息 + * @return 返回参加的数量 + */ + 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); + 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/dao/CompeteJudgmentDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteJudgmentDao.java new file mode 100644 index 00000000..bae23bd2 --- /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,@Param("projectId") Long projectId); +} 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..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 @@ -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,15 @@ 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); + + /** + * 在这个比赛中是否注册查找此身份证是否被注册 + * @param type 比赛类型 + * @param idCard 身份证 + * @return + */ + int selectJoinNumByIdCard(@Param("type")int type, @Param("idCard")String idCard,@Param("playerId")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 new file mode 100644 index 00000000..2ab673a4 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java @@ -0,0 +1,50 @@ +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; + +import java.util.List; + +/** + * + * @author: li + * + */ +public interface CompeteProjectConfigDao extends CompeteProjectConfigMapper { + CompeteProjectConfig selectByProjectId(@Param("projectId") Long projectId); + 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); + + + + + /** + * 查询所有项目配置信息 + * @param type 比赛类型 + * @return 返回所有比赛日程配置信息 + */ + 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); + + /** + * 通过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/persist/dao/CompeteProjectDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectDao.java new file mode 100644 index 00000000..de817184 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectDao.java @@ -0,0 +1,22 @@ +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 + * + */ +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/persist/dao/CompeteScoreDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java new file mode 100644 index 00000000..372d2f10 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java @@ -0,0 +1,42 @@ +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); + List selectByProjectIdAndPid(@Param("projectId") long projectId,@Param("competeTimeId") long competeTimeId); + + + + + /** + * 查找计数赛成绩公示（个人比赛） + * @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/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/persist/dao/CompeteTimeDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteTimeDao.java index fac2476c..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; @@ -12,6 +13,12 @@ import java.util.List; */ @Repository public interface CompeteTimeDao extends CompeteTimeMapper { + /** + * 查各个教练得成绩 + * @param siteId + * @return + */ + List selectJudgmentS(@Param("siteId") Long siteId ); /** * 通过类型查找第几届和时间 * @param type 类型 @@ -50,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/persist/dao/CompeteVideoDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteVideoDao.java new file mode 100644 index 00000000..67293e9e --- /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.GetSignStatus param); + + List selectCoachSignStatus(@Param("param") VideoDto.GetSignStatus param); +} 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..5592b7ec --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/persist/mapper/CompeteCountScoreMapper.java @@ -0,0 +1,31 @@ +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; + +public interface CompeteCountScoreMapper { + long countByExample(CompeteCountScoreExample example); + + int deleteByExample(CompeteCountScoreExample example); + + int deleteByPrimaryKey(CompeteCountScoreKey key); + + int insert(CompeteCountScore record); + + int insertSelective(CompeteCountScore record); + + List selectByExample(CompeteCountScoreExample example); + + CompeteCountScore selectByPrimaryKey(CompeteCountScoreKey key); + + 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/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/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/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/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/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/CompeteService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java index c6f2ca97..bb13ed4a 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -11,21 +11,21 @@ import com.ccsens.cloudutil.bean.tall.dto.WpsDto; import com.ccsens.cloudutil.feign.TallFeignClient; import com.ccsens.mt.bean.dto.CompeteDto; import com.ccsens.mt.bean.dto.LevelDto; +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.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.*; 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.commons.lang.StringUtils; + import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFRow; import org.apache.poi.xssf.usermodel.XSSFSheet; @@ -38,10 +38,14 @@ 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; import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; /** * @author 逗 @@ -50,6 +54,8 @@ import java.util.Map; @Service @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) public class CompeteService implements ICompeteService { + @Resource + private CompeteTeamMapper competeTeamMapper; @Resource private CompeteTimeDao competeTimeDao; @Resource @@ -81,7 +87,139 @@ public class CompeteService implements ICompeteService { @Resource private TallFeignClient tallFeignClient; @Resource - private CommonFileMapper commonFileMapper; + private CompeteStartOrderMapper competeStartOrderMapper; + @Resource + private CompeteVarietyScoreMapper competeVarietyScoreMapper; + @Resource + private CompeteProjectConfigDao competeProjectConfigDao; + @Resource + private CompeteScoreDao competeScoreDao; + @Resource + private CompeteCountScoreMapper competeCountScoreMapper; + @Resource + private CompetePlayerMapper competePlayerMapper; + @Resource + private CompeteJudgmentMapper competeJudgmentMapper; + /** + * 花样赛总成绩展示 + * @param param + */ + @Override + public List showResult(ScoreDto.ShowResult param) { + List totalScoreDisplaysList=new ArrayList<>(); + CompeteStartOrderExample competeStartOrderExample =new CompeteStartOrderExample(); + competeStartOrderExample.createCriteria().andProjectIdEqualTo(param.getProjectId()); + List competeStartOrdersList = competeStartOrderMapper.selectByExample(competeStartOrderExample); + competeStartOrdersList.forEach(competeStartOrder -> { + //一个人或者一个团队得数据 + CompeteVo.TotalScoreDisplay totalScoreDisplay = new CompeteVo.TotalScoreDisplay(); + //项目名 +// CompeteProject project = competeProjectMapper.selectByPrimaryKey(competeStartOrder.getProjectId()); +// if(ObjectUtil.isNotNull(project)) { +// totalScoreDisplay.setCompanyName(project.getName()); +// } + //名字 + if(competeStartOrder.getTeam().equals((byte) 0)){ + //个人人名 + CompetePlayer player = competePlayerDao.selectByPrimaryKey(competeStartOrder.getPlayerId()); + if(ObjectUtil.isNotNull(player)) { + totalScoreDisplay.setPeopleName(player.getName()); + //个人所属团队名 + CompeteCompany competeCompany = competeCompanyMapper.selectByPrimaryKey(player.getCompanyId()); + if (ObjectUtil.isNotNull(competeCompany)){ + totalScoreDisplay.setCompanyName(competeCompany.getName()); + } + } + }else { + //团体名 + CompeteTeam competeTeam = competeTeamDao.selectByPrimaryKey(competeStartOrder.getPlayerId()); + CompeteCompany competeCompany =competeCompanyMapper.selectByPrimaryKey(competeTeam.getCompanyId()); + totalScoreDisplay.setCompanyName(competeCompany.getName()); + //团队人名 + CompeteTeamMemberExample competeTeamMemberExample = new CompeteTeamMemberExample(); + competeTeamMemberExample.createCriteria().andCompeteTeamIdEqualTo(competeTeam.getId()); + List competeTeamMemberList = competeTeamMemberMapper.selectByExample(competeTeamMemberExample); + StringBuilder stringBuilder=new StringBuilder(""); + competeTeamMemberList.forEach(mes->{ + CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(mes.getPlayerId()); + stringBuilder.append(competePlayer.getName()); + }); + totalScoreDisplay.setPeopleName(stringBuilder.toString()); +// CompeteTeamMemberExample competeTeamMemberExample =new CompeteTeamMemberExample(); +// competeTeamMemberExample.createCriteria().andCompeteTeamIdEqualTo(competeStartOrder.getPlayerId()); +// List competeTeamMembersList = competeTeamMemberMapper.selectByExample(competeTeamMemberExample); +// StringBuilder stringBuilder=new StringBuilder(""); +// competeTeamMembersList.forEach(competeTeamMember -> { +// stringBuilder.append(competePlayerDao.selectByPrimaryKey(competeTeamMember.getPlayerId()).getName()+'、'); +// }); + totalScoreDisplay.setPeopleName(stringBuilder.toString().substring(0,stringBuilder.length())); + } + List results = competeTimeDao.selectJudgmentS(competeStartOrder.getId()); + //7个教练成绩也上去了 + for (CompeteVo.Result r :results){ + if(r.getChief()==0){ + totalScoreDisplay.setReferee0(r.getScore()); + }else if(r.getChief()==1){ + totalScoreDisplay.setReferee1(r.getScore()); + }else if(r.getChief()==2){ + totalScoreDisplay.setReferee2(r.getScore()); + }else if(r.getChief()==3){ + totalScoreDisplay.setReferee3(r.getScore()); + }else if(r.getChief()==4){ + totalScoreDisplay.setReferee4(r.getScore()); + }else if(r.getChief()==5){ + totalScoreDisplay.setReferee5(r.getScore()); + }else if(r.getChief()==6){ + totalScoreDisplay.setReferee6(r.getScore()); + } + } + BigDecimal bigDecimal1to3=new BigDecimal(0); + bigDecimal1to3.add(totalScoreDisplay.getReferee1()).add(totalScoreDisplay.getReferee2()).add(totalScoreDisplay.getReferee3()); + BigDecimal bigDecimalavg1to3=new BigDecimal(0); + BigDecimal bignum=new BigDecimal(3); + totalScoreDisplay.setAvg1To3(bigDecimalavg1to3.divide(bignum,2,BigDecimal.ROUND_HALF_UP)); + + BigDecimal bigDecimal4to6=new BigDecimal(0); + bigDecimal4to6.add(totalScoreDisplay.getReferee4()).add(totalScoreDisplay.getReferee5()).add(totalScoreDisplay.getReferee6()); + BigDecimal bigDecimalavg4to6=new BigDecimal(0); + BigDecimal bignum1=new BigDecimal(3); + totalScoreDisplay.setAvg4To6(bigDecimalavg4to6.divide(bignum1,2,BigDecimal.ROUND_HALF_UP)); + //总成绩也出来了 + BigDecimal re=new BigDecimal(0); + re.add(totalScoreDisplay.getAvg1To3()).add(totalScoreDisplay.getAvg4To6()).subtract(totalScoreDisplay.getReferee0()); + totalScoreDisplay.setResult(re); + totalScoreDisplaysList.add(totalScoreDisplay); + }); +// Collections.sort(totalScoreDisplaysList, new Comparator() { +// @Override +// public BigDecimal compare(CompeteVo.TotalScoreDisplay o1, CompeteVo.TotalScoreDisplay o2) { +// o1.getResult().subtract(o2.getResult()); +// return o1.getResult(); +// } +// }); + + for (int i = 0; i < totalScoreDisplaysList.size() - 1; i++) { + for (int j = 1; j < totalScoreDisplaysList.size() - i; j++) { + BigDecimal b1 = totalScoreDisplaysList.get(j - 1).getResult(); + BigDecimal b2 = totalScoreDisplaysList.get(j).getResult(); + + CompeteVo.TotalScoreDisplay a; + if (b1.compareTo(b2) < 0) { + a = totalScoreDisplaysList.get(j - 1); + totalScoreDisplaysList.set((j - 1), totalScoreDisplaysList.get(j)); + totalScoreDisplaysList.set(j, a); + } + } + } + + for (int i=0; i competeVarietyScoresList = competeVarietyScoreMapper.selectByExample(competeVarietyScoreExample); +// //下面就是想看看主裁判提交了没 +// if(competeVarietyScoresList.size()>0){ +// for (CompeteVarietyScore competeVarietyScore:competeVarietyScoresList){ +// CompeteJudgment competeJudgment1 = competeJudgmentMapper.selectByPrimaryKey(competeVarietyScore.getJudgmentId()); +// if(competeJudgment1.getChiefJudgment()==(byte)0){ +// ti=1; +// break; +// } +// } +// } +// if(ti>0){ +// //主裁判提交了，则看一下他里面是否选择了弃权 +// if(competeStartOrder1.getWaiver()!=(byte)0){ +// for(int j=0;j competeVarietyScoresList = competeVarietyScoreMapper.selectByExample(competeVarietyScoreExample); + for (int i = 0; i < competeVarietyScoresList.size(); i++) { + competeVarietyScoresList.get(i).setScore(new BigDecimal(0)); + competeVarietyScoreMapper.updateByPrimaryKeySelective(competeVarietyScoresList.get(i)); + } + } + } + param.getFractionsList().forEach(mes->{ + if(StringUtils.isNotBlank(param.getRemark())){ + CompeteStartOrder competeStartOrder=new CompeteStartOrder(); + competeStartOrder.setId(param.getSiteOrderId()); + competeStartOrder.setRemark(param.getRemark()); + competeStartOrderMapper.updateByPrimaryKeySelective(competeStartOrder); + } + if(param.getWaiver()!=((byte)0)){ + CompeteStartOrder competeStartOrder=new CompeteStartOrder(); + competeStartOrder.setId(param.getSiteOrderId()); + competeStartOrder.setWaiver(param.getWaiver()); + competeStartOrderMapper.updateByPrimaryKeySelective(competeStartOrder); + for (int i = 0; i < param.getFractionsList().size(); i++) { + param.getFractionsList().get(i).setScore(new BigDecimal(0)); + } + } + CompeteVarietyScore competeVarietyScore=new CompeteVarietyScore(); + competeVarietyScore.setId(snowflake.nextId()); + competeVarietyScore.setCompeteTimeId(param.getCompeteTimeId()); + competeVarietyScore.setProjectId(param.getProjectId()); + competeVarietyScore.setSiteOrderId(param.getSiteOrderId()); + competeVarietyScore.setCode(mes.getCode()); + competeVarietyScore.setScore(mes.getScore()); + competeVarietyScore.setJudgmentId(param.getJudgmentId()); + competeVarietyScoreMapper.insertSelective(competeVarietyScore); + }); + + } + + /** @@ -1008,8 +1223,450 @@ 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); + 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()); + 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) { + //已经结束2-结束 + countScore.setStatus(2); + } + countScoreList.add(countScore); + } + } + return countScoreList; + } + @Override + public List countScoreDetail(CompeteDto.ProjectIdAndGroupId params) { + List competeScoreList = new ArrayList<>(); + //判断比赛类型 + long ProjectId = params.getProjectId(); + 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){ + 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 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()); + competeCountScore.setRecStatus((byte) 0); + competeCountScoreMapper.insert(competeCountScore); + } + + @Override + public List speedPass(CompeteDto.CompeteTimeAndProjectId params) { + long projectId = params.getProjectId(); + long competeTimeId = params.getCompeteTimeId(); + List speedPassList = competeScoreDao.selectByProjectIdAndPid(projectId, competeTimeId); + if (CollectionUtil.isNotEmpty(speedPassList)) { + for (CompeteVo.SpeedPass mes : speedPassList) { + //查30s单摇跳得分 + CompeteStartOrderExample competeStartOrderExample = new CompeteStartOrderExample(); + competeStartOrderExample.createCriteria().andPlayerIdEqualTo(Constant.SINGLE_ROLL_30_S).andPlayerIdEqualTo(mes.getPlayerId()); + List competeStartOrders = competeStartOrderMapper.selectByExample(competeStartOrderExample); + if (competeStartOrders.size() > 0) { + CompeteStartOrder competeStartOrder = competeStartOrders.get(0); + long id = competeStartOrder.getId(); + CompeteCountScoreExample competeCountScoreExample = new CompeteCountScoreExample(); + competeCountScoreExample.createCriteria().andSiteOrderIdEqualTo(id); + List competeCountScoreList = competeCountScoreMapper.selectByExample(competeCountScoreExample); + CompeteCountScore competeCountScore = competeCountScoreList.get(0); + BigDecimal score = competeCountScore.getFinalScore(); + BigDecimal bigDecimal = new BigDecimal(2); + BigDecimal secondTimeScore = score.multiply(bigDecimal); + //查30s单摇跳得分 * 2 =次数 + mes.setSecondTime(secondTimeScore); + } + //3分钟单摇跳得分 + CompeteStartOrderExample competeStartOrderExample1 = new CompeteStartOrderExample(); + competeStartOrderExample.createCriteria().andPlayerIdEqualTo(Constant.SINGLE_ROLL_3_M).andPlayerIdEqualTo(mes.getPlayerId()); + List competeStartOrders1 = competeStartOrderMapper.selectByExample(competeStartOrderExample); + if (competeStartOrders1.size() > 0) { + CompeteStartOrder competeStartOrder1 = competeStartOrders.get(0); + long id1 = competeStartOrder1.getId(); + CompeteCountScoreExample competeCountScoreExample1 = new CompeteCountScoreExample(); + competeCountScoreExample1.createCriteria().andSiteOrderIdEqualTo(id1); + List competeCountScoreList1 = competeCountScoreMapper.selectByExample(competeCountScoreExample1); + CompeteCountScore competeCountScore1 = competeCountScoreList1.get(0); + BigDecimal score1 = competeCountScore1.getFinalScore(); + BigDecimal bigDecimal1 = new BigDecimal(2); + BigDecimal minuteTimeScore = score1.multiply(bigDecimal1); + //3分钟单摇跳得分 * 2 =次数 + mes.setMinuteTime(minuteTimeScore); + } + BigDecimal bigDecimal0 = new BigDecimal(70); + BigDecimal bigDecimal2 = new BigDecimal(90); + BigDecimal bigDecimal3 = new BigDecimal(105); + BigDecimal bigDecimal4 = new BigDecimal(120); + BigDecimal bigDecimal5 = new BigDecimal(130); + BigDecimal bigDecimal6 = new BigDecimal(140); + BigDecimal bigDecimal7 = new BigDecimal(300); + BigDecimal bigDecimal8 = new BigDecimal(380); + BigDecimal bigDecimal9 = new BigDecimal(460); + BigDecimal bigDecimal10 = new BigDecimal(540); + BigDecimal bigDecimal11 = new BigDecimal(620); + BigDecimal bigDecimal12 = new BigDecimal(700); + BigDecimal s =mes.getSecondTime(); + if (mes.getSecondTime()!= null && mes.getMinuteTime()!= null) { + //判断30s单摇跳等级 + if (mes.getSecondTime().compareTo(bigDecimal0) < 1) { + mes.setSecondGrade(1); + } + if (mes.getSecondTime().compareTo(bigDecimal2) < 1) { + mes.setSecondGrade(2); + } + if (mes.getSecondTime().compareTo(bigDecimal3) < 1) { + mes.setSecondGrade(3); + } + if (mes.getSecondTime().compareTo(bigDecimal4) < 1) { + mes.setSecondGrade(4); + } + if (mes.getSecondTime().compareTo(bigDecimal5) < 1) { + mes.setSecondGrade(5); + } + if (mes.getSecondTime().compareTo(bigDecimal6) < 1) { + mes.setSecondGrade(6); + } + //判断3分钟单摇跳等级 + if (mes.getMinuteTime().compareTo(bigDecimal7) < 1) { + mes.setMinuteGrade(1); + } + if (mes.getMinuteTime().compareTo(bigDecimal8) < 1) { + mes.setMinuteGrade(2); + } + if (mes.getMinuteTime().compareTo(bigDecimal9) < 1) { + mes.setMinuteGrade(3); + } + + if (mes.getMinuteTime().compareTo(bigDecimal10) < 1) { + mes.setMinuteGrade(4); + } + + if (mes.getMinuteTime().compareTo(bigDecimal11) < 1) { + mes.setMinuteGrade(5); + } + + if (mes.getMinuteTime().compareTo(bigDecimal12) < 1) { + mes.setMinuteGrade(6); + } + //如果30s得等级小于等于3分钟得等级 + if (mes.getSecondGrade() <= mes.getMinuteGrade()) { + mes.setGrade(mes.getSecondGrade()); + } else { + mes.setGrade(mes.getMinuteGrade()); + } + } + } + } + return speedPassList; + } + + + + @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; + } + + @Override + public CompeteVo.SelScropeVo selSubmitOrderList(ScoreDto.SelScrop param) { + CompeteVo.SelScropeVo selScropeVo=new CompeteVo.SelScropeVo(); + + //场次表里面的东西 + CompeteStartOrder competeStartOrder1 = competeStartOrderMapper.selectByPrimaryKey(param.getSiteOrderId()); + if(competeStartOrder1==null){ + throw new BaseException(CodeEnum.PARAM_ERROR); + } + selScropeVo.setWaiver(competeStartOrder1.getWaiver()); + //项目表里面的东西 + CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(competeStartOrder1.getProjectId()); + //项目名称 + if(StringUtils.isNotBlank(competeProject.getName())){ + selScropeVo.setProjectName(competeProject.getName()); + } + //备注 + if(StringUtils.isNotBlank(competeStartOrder1.getRemark())){ + selScropeVo.setRemark(competeStartOrder1.getRemark()); + } + //场地信息 + selScropeVo.setSite(competeStartOrder1.getSite()); + + if(competeProject.getTeam()==((byte) 0)){ + //个人 + selScropeVo.setId(competeProject.getId()); + //个人信息 + CompetePlayer competePlayer = competePlayerMapper.selectByPrimaryKey(competeStartOrder1.getPlayerId()); + CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(competePlayer.getCompeteGroupId()); + //组别信息 + selScropeVo.setGroupId(competeGroup.getId()); + selScropeVo.setGroupName(competeGroup.getGroupName()); + //单位信息 + CompeteCompany competeCompany = competeCompanyMapper.selectByPrimaryKey(competePlayer.getCompanyId()); + if(StringUtils.isNotBlank(competePlayer.getName())){ + //人名 + selScropeVo.setName(competePlayer.getName()); + } + if(StringUtils.isNotBlank(competeCompany.getName())){ + //单位名称 + selScropeVo.setCompanyName(competeCompany.getName()); + selScropeVo.setCompanyId(competeCompany.getId()); + } + + /* + * { + "param": + { + "competeTimeId":1, + "judgmentId":1, + "projectId":2011, + "siteOrderId":1329256152512466944 + } +} + * */ + }else { + CompeteTeam competeTeam = competeTeamMapper.selectByPrimaryKey(competeStartOrder1.getPlayerId()); + if(competeProject.getJoinRule()==(byte)1){ + selScropeVo.setGroupName("不限组别"); + + }else { + + CompeteGroupExample competeGroupExample=new CompeteGroupExample(); + competeGroupExample.createCriteria().andSexEqualTo(competeTeam.getGenderGroup()).andGroupRemarkEqualTo(competeTeam.getGroupRemark()); + List competeGroups = competeGroupMapper.selectByExample(competeGroupExample); + if(competeGroups.size()>0){ + //设置完组别了 + selScropeVo.setGroupName(competeGroups.get(0).getGroupName()); + selScropeVo.setGroupId(competeGroups.get(0).getId()); + } + } + //设置公司名称 + selScropeVo.setCompanyName(competeCompanyMapper.selectByPrimaryKey(competeTeam.getCompanyId()).getName()); + selScropeVo.setCompanyId(competeTeam.getCompanyId()); + + CompeteTeamMemberExample competeTeamMemberExample=new CompeteTeamMemberExample(); + competeTeamMemberExample.createCriteria().andCompeteTeamIdEqualTo( competeStartOrder1.getPlayerId()).andRecStatusEqualTo((byte) 0); + List competeTeamMembers = competeTeamMemberMapper.selectByExample(competeTeamMemberExample); + StringBuilder names=new StringBuilder(""); + //姓名也完成了 + competeTeamMembers.forEach(mes->{ + names.append(competePlayerMapper.selectByPrimaryKey(mes.getPlayerId()).getName()+"、"); + }); + String name= String.valueOf(names.substring(0,names.length()-2)); + selScropeVo.setName(name); + } + + + CompeteVarietyScoreExample competeVarietyScoreExample=new CompeteVarietyScoreExample(); + competeVarietyScoreExample.createCriteria().andSiteOrderIdEqualTo(param.getSiteOrderId()).andJudgmentIdEqualTo(param.getJudgmentId()).andProjectIdEqualTo(param.getProjectId()).andRecStatusEqualTo((byte) 0); + + List competeVarietyScores = competeVarietyScoreMapper.selectByExample(competeVarietyScoreExample); + List scropLists=new ArrayList<>(); + competeVarietyScores.forEach(mes->{ + CompeteVo.ScropList scropList=new CompeteVo.ScropList(); + scropList.setCode(mes.getCode()); + scropList.setScore(mes.getScore()); + scropLists.add(scropList); + }); + /* + { + "param": + { + "competeTimeId":1, + "judgmentId":2, + "projectId":2012, + "siteOrderId":1329256313087201280 + } +} + + */ + selScropeVo.setScoreList(scropLists); + return selScropeVo; + } + + @Override + public Long getUserCompanyId(Long userId, Byte type) { + CompeteCompanyExample competeCompanyExample=new CompeteCompanyExample(); + competeCompanyExample.createCriteria().andUserIdEqualTo(userId).andTypeEqualTo(type).andRecStatusEqualTo((byte) 0); + List competeCompanies = competeCompanyMapper.selectByExample(competeCompanyExample); + if(competeCompanies.size()>0){ + return competeCompanies.get(0).getId(); + } + 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/CompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java new file mode 100644 index 00000000..9c8bee58 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -0,0 +1,548 @@ +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; +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.*; +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; +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; + +/** + * @author 逗 + */ +@Slf4j +@Service +@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) +public class CompeteTaskService implements ICompeteTaskService{ + @Resource + private CompeteProjectConfigDao projectConfigDao; + @Resource + private CompeteProjectDao competeProjectDao; + @Resource + private CompeteTimeDao competeTimeDao; + @Resource + private CompeteProjectPlayerMapper projectPlayerMapper; + @Resource + private Snowflake snowflake; + @Resource + 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()); + List competeProjectConfigList = new ArrayList<>(); + if(ObjectUtil.isNotNull(competeTime)) { + competeProjectConfigList = projectConfigDao.queryProjectConfig(competeTime.getType()); + } + return competeProjectConfigList; + } + + /** + * 修改项目的日程配置 + */ + @Override + public List updateCompeteProjectConfig(ProvinceCompeteDto.UpdateCompeteProjectConfig param,String token) { + //获取比赛类型 + AtomicInteger type = new AtomicInteger(); + if(CollectionUtil.isEmpty(param.getUpdateCompeteTaskList())) { + 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)){ + type.set(project.getType()); + } + 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() == null ? 0 : projectConfig.getStartTime()); + competeProjectConfig.setEndTime(projectConfig.getEndTime() == null ? 0 : projectConfig.getEndTime()); + projectConfigDao.updateByPrimaryKeySelective(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() == null ? 0 : projectConfig.getStartTime()); + competeProjectConfig.setEndTime(projectConfig.getEndTime() == null ? 0 : projectConfig.getEndTime()); + projectConfigDao.insertSelective(competeProjectConfig); + } + //生成出场顺序表，存入数据库。在tall内添加对应的任务 + setStartOrder(competeProjectConfig,param.getProjectId(),param.getTallRoleId(),token); + }); + + return projectConfigDao.queryProjectConfig(type.get()); + } + /** + * 修改配置时生成出场顺序 + */ + public void setStartOrder(CompeteProjectConfig projectConfig, Long tallProjectId,Long tallRoleId,String token) { + if (ObjectUtil.isNotNull(projectConfig)) { + //查找项目 + CompeteProject project = competeProjectDao.selectByPrimaryKey(projectConfig.getProjectId()); + if (ObjectUtil.isNotNull(project)) { + //判断是团队还是个人项目 + if (project.getTeam() == 0) { + //个人项目查找所有参赛信息 + CompeteProjectPlayerExample projectPlayerExample = new CompeteProjectPlayerExample(); + projectPlayerExample.createCriteria().andProjectIdEqualTo(project.getId()); + List projectPlayerList = projectPlayerMapper.selectByExample(projectPlayerExample); + if (CollectionUtil.isNotEmpty(projectPlayerList)) { + //计算场次 + int order = (int) Math.ceil(projectPlayerList.size() / projectConfig.getSiteNum()); + //计算每个场次时间 + long projectStartTime = projectConfig.getStartTime(); + long orderTime = 0; + if(order != 0) { + orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order); + }else { + log.info("场次为0的比赛：{}------{}",project,projectConfig); + } + //场次 + int competeOrder = 1; + //场地 + int site = 1; + for (CompeteProjectPlayer projectPlayer : projectPlayerList) { + 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); + // 修改tall的任务 + TallTaskDto.UpdateTaskInfo updateTaskInfo = new TallTaskDto.UpdateTaskInfo(); + updateTaskInfo.setId(competeStartOrder.getId()); + updateTaskInfo.setBeginTime(competeStartOrder.getStartTime()); + updateTaskInfo.setEndTime(competeStartOrder.getEndTime()); + updateTaskInfo.setToken(token); + log.info("修改tall的任务信息：{}",updateTaskInfo); + JsonResponse normalTaskJsonResponse = tallFeignClient.updataTask(updateTaskInfo); + log.info("修改tall的任务信息后返回：{}",normalTaskJsonResponse); + //失败return + if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200){ + return; + } + } + 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(tallRoleId); + addTask.setToken(token); + log.info("在tall内添加任务：{}",addTask); + JsonResponse normalTaskJsonResponse = tallFeignClient.saveTask(addTask); + //异常return + log.info("添加任务后返回：{}",normalTaskJsonResponse); + if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200) { + return; + } + 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 > projectConfig.getSiteNum()){ + site = 1; + competeOrder++; + projectStartTime += orderTime; + } + } + } + } else { + //团体项目查找所有参赛队伍 + CompeteTeamExample teamExample = new CompeteTeamExample(); + teamExample.createCriteria().andProjectIdEqualTo(project.getId()); + List teamList = competeTeamDao.selectByExample(teamExample); + if(CollectionUtil.isNotEmpty(teamList)){ + //计算场次 + int order = (int) Math.ceil(teamList.size() / projectConfig.getSiteNum()); + //计算每个场次时间 + long projectStartTime = projectConfig.getStartTime() + Constant.UPLOAD_VIDEO_TIME; + long orderTime = 0; + if(order != 0) { + orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order); + } + //场次 + int competeOrder = 1; + //场地 + int site = 1; + for (CompeteTeam competeTeam : teamList) { + 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); + //修改tall的任务 + TallTaskDto.UpdateTaskInfo updateTaskInfo = new TallTaskDto.UpdateTaskInfo(); + updateTaskInfo.setId(competeStartOrder.getId()); + updateTaskInfo.setBeginTime(competeStartOrder.getId()); + updateTaskInfo.setBeginTime(competeStartOrder.getEndTime()); + updateTaskInfo.setToken(token); + log.info("修改tall的任务信息：{}",updateTaskInfo); + JsonResponse normalTaskJsonResponse = tallFeignClient.updataTask(updateTaskInfo); + log.info("修改tall的任务信息后返回：{}",normalTaskJsonResponse); + //失败return + if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200){ + return; + } + } + 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(tallRoleId); + addTask.setToken(token); + log.info("在tall内添加任务：{}",addTask); + JsonResponse normalTaskJsonResponse = tallFeignClient.saveTask(addTask); + log.info("添加任务后返回：{}",normalTaskJsonResponse); + //异常return + log.info("添加任务后返回：{}",normalTaskJsonResponse); + if (ObjectUtil.isNull(normalTaskJsonResponse) || normalTaskJsonResponse.getCode() != 200) { + return; + } + 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 > projectConfig.getSiteNum()){ + site = 1; + competeOrder++; + projectStartTime += orderTime; + } + } + } + } + } + } + } + + + /** + * 手机上查看选手出场顺序 + */ + @Override + public List queryStartOrderByCompany(ProvinceCompeteDto.QueryStartOrderByCompany param) { + return projectConfigDao.queryStartOrderByCompany(param.getCompanyId(),param.getProjectId(),param.getCompeteTimeId()); + } + + /** + * 查看裁判分配信息 + */ + @Override + public List queryJudgment(ProvinceCompeteDto.QueryJudgment param) { + List queryJudgmentList = competeJudgmentDao.queryJudgment(param.getCompeteTimeId(),param.getProjectId()); + if(CollectionUtil.isNotEmpty(queryJudgmentList)){ + queryJudgmentList.forEach(projectJudgment -> { + //裁判数量 + int count = projectJudgment.getProjectType() == 0 ? 3 : 7; + for (int i = 0; i < projectJudgment.getSiteNums(); i++) { + if(i < projectJudgment.getSiteList().size()){ + ProvinceCompeteVo.ProjectSite siteJudgment = projectJudgment.getSiteList().get(i); + if (CollectionUtil.isEmpty(siteJudgment.getJudgmentList())) { + siteJudgment.setJudgmentList(new ArrayList<>()); + } + int a = siteJudgment.getJudgmentList().size(); + for (int j = 0; j < count - a; j++) { + ProvinceCompeteVo.SiteJudgment siteJudgment1 = new ProvinceCompeteVo.SiteJudgment(); + siteJudgment1.setJudgmentNum(a + j); + siteJudgment.getJudgmentList().add(siteJudgment1); + } + }else { + int a = projectJudgment.getSiteList().size(); + for (int j = 0; j < count - a; j++) { + ProvinceCompeteVo.ProjectSite siteJudgment = new ProvinceCompeteVo.ProjectSite(); + siteJudgment.setSiteNum(a + j + 1); + projectJudgment.getSiteList().add(siteJudgment); + int b = siteJudgment.getJudgmentList().size(); + for (int x = 0; x < count - b; x++) { + ProvinceCompeteVo.SiteJudgment siteJudgment1 = new ProvinceCompeteVo.SiteJudgment(); + siteJudgment1.setJudgmentNum(b + x); + siteJudgment.getJudgmentList().add(siteJudgment1); + } + } + } + } + }); + } + return queryJudgmentList; + } + + /** + * 分配裁判 + */ + @Override + public List allocationJudgment(ProvinceCompeteDto.AllocationJudgmentAndTall param,String token) { + //查找项目 + if(CollectionUtil.isNotEmpty(param.getAllocationJudgmentList())){ + 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 -> { + saveJudgmentAndTask(param.getCompeteTimeId(),param.getTallProjectId(), project, siteJudgment, judgmentInfo,token); + }); + } + }); + } + } + } + } + return competeJudgmentDao.queryJudgment(param.getCompeteTimeId(),null); + } + + /** + * 添加裁判信息和tall内的角色成员任务 + */ + private void saveJudgmentAndTask(Long competeTimeId,Long tallProjectId,CompeteProject project + , ProvinceCompeteDto.SiteJudgment siteJudgment, ProvinceCompeteDto.JudgmentInfo judgmentInfo,String token) { + // TODO 查找该手机号在此项目之前的裁判信息，修改，同时修改tall内的成员角色信息 + //添加裁判信息 + //查找该项目下的该场地的裁判信息 + 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 { + 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; + 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); + } + } + } + } + } + } + + /** + * 通过tall查看裁判和比赛项目的信息 + */ + @Override + public ProvinceCompeteVo.QueryProjectByTall queryProjectByTall(ProvinceCompeteDto.ProjectByTall param) { + //查询比赛项目信息 + 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(); + 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/CompeteVedioService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java new file mode 100644 index 00000000..78dbb874 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java @@ -0,0 +1,135 @@ +package com.ccsens.mt.service; + +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; +import com.ccsens.mt.persist.mapper.CompeteProjectMapper; +import com.ccsens.mt.persist.mapper.CompeteVideoMapper; +import com.ccsens.util.bean.dto.QueryDto; +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 10071 + */ +@Slf4j +@Service +@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) +public class CompeteVedioService implements ICompeteVedioService{ + + @Resource + private Snowflake snowflake; + @Resource + private CompetePlayerLookMapper competePlayerLookMapper; + @Resource + private CompeteVideoMapper competeVideoMapper; + + @Resource + private CompeteProjectMapper competeProjectMapper; + @Resource + private CompeteCompanyMapper competeCompanyMapper; + @Resource + private CompeteVideoDao competeVideoDao; + @Resource + private CompeteTimeDao competeTimeDao; + + @Override + public void insertSignVideo(Long companyId) { + CompetePlayerLook competePlayerLook=new CompetePlayerLook(); + competePlayerLook.setCompanyId(companyId); + competePlayerLook.setId(snowflake.nextId()); + competePlayerLook.setLookStatus((byte) 1); + competePlayerLook.setLookTime(System.currentTimeMillis()); + competePlayerLookMapper.insertSelective(competePlayerLook); + + } + + @Override + public boolean selectSignVideo(Long companyId) { + CompetePlayerLookExample competePlayerLookExample=new CompetePlayerLookExample(); + competePlayerLookExample.createCriteria().andCompanyIdEqualTo(companyId); + List competePlayerLooks = competePlayerLookMapper.selectByExample(competePlayerLookExample); + return competePlayerLooks.size()==0? false:true; + } + + @Override + public String uploadVideoPath(VideoDto.UploadVdeo param) { + CompeteVideo competeVideo=new CompeteVideo(); + competeVideo.setId(snowflake.nextId()); + competeVideo.setCompeteTimeId(param.getCompeteTimeId()); + competeVideo.setProjectId(param.getCompeteProjectId()); + competeVideo.setPlayerId(param.getPlayerOrTeamId()); + competeVideo.setVideoUrl(param.getVideoPath()); + competeVideo.setRecStatus((byte) 0); + long startTime = System.currentTimeMillis(); + competeVideo.setUploadTime(startTime); + competeVideoMapper.insert(competeVideo); + return param.getVideoPath(); + } + + @Override + public List selectTwoProject(QueryDto params) { + 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 + public List selectAllCompany(QueryDto params) { + 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; + } + /** + * 查看公司的签到状态 + * @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/ExcelService.java b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java index 0e8aef44..ebc39bdf 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -1,9 +1,14 @@ package com.ccsens.mt.service; +import cn.hutool.core.collection.CollectionUtil; 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.dto.ScoreDto; import com.ccsens.mt.bean.po.*; +import com.ccsens.mt.bean.vo.CompeteExcelVo; +import com.ccsens.mt.bean.vo.CompeteVo; import com.ccsens.mt.bean.vo.TableVo; import com.ccsens.mt.persist.dao.*; import com.ccsens.mt.persist.mapper.*; @@ -15,18 +20,32 @@ 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; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.unit.DataUnit; + import javax.annotation.Resource; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; +import java.text.SimpleDateFormat; +import java.util.*; + import java.util.ArrayList; +import java.util.Date; +import java.util.GregorianCalendar; import java.util.List; @Slf4j @@ -52,6 +71,8 @@ public class ExcelService implements IExcelService { @Resource private CompeteGroupMapper competeGroupMapper; @Resource + private CompeteProjectConfigMapper competeProjectConfigMapper; + @Resource private CommonFileMapper commonFileMapper; @Resource private IProvinceService provinceService; @@ -60,7 +81,14 @@ public class ExcelService implements IExcelService { @Resource private CompetePlayerMapper competePlayerMapper; + @Resource + private CompeteProjectConfigDao competeProjectConfigDao; + @Resource + private CompeteProjectDao competeProjectDao; + @Resource + private ICompeteService competeService; + @Override public String dasaiduiwuxinxiWPS(QueryDto params) { //这个里面包含联系人得信息 @@ -203,7 +231,7 @@ public class ExcelService implements IExcelService { //查出教练和领队的list List jLandLD=competeCompanyDao.selectByCompanyId(com.getId()); CompetePlayerExample competePlayerExample=new CompetePlayerExample(); - competePlayerExample.createCriteria().andCompanyIdEqualTo(com.getId()); + competePlayerExample.createCriteria().andCompanyIdEqualTo(com.getId()).andRecStatusEqualTo((byte) 0); //运动员list List competePlayerList = competePlayerMapper.selectByExample(competePlayerExample); @@ -217,7 +245,7 @@ public class ExcelService implements IExcelService { PoiUtil.PoiUtilCell lingdui=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 1, 1); lingdui.setValue("领 队:"); lingduiList.add(lingdui); - biao.add(lingduiList); + StringBuffer lingduiName=new StringBuffer(""); StringBuffer jiaolianName=new StringBuffer(""); jLandLD.forEach(jLD->{ @@ -246,7 +274,6 @@ public class ExcelService implements IExcelService { jiaolianHang.setValue(String.valueOf(jiaolianName)); jiaolianList.add(jiaolianHang); biao.add(jiaolianList); - //再放运动员 StringBuffer yDYLN=new StringBuffer(""); competePlayerList.forEach(cpL->{ @@ -267,7 +294,7 @@ public class ExcelService implements IExcelService { yuandongyuanName.setValue(String.valueOf(yDYLN)); yundongyuanList.add(yuandongyuanName); biao.add(yundongyuanList); - biao.add(yundongyuanList); + List entryList=new ArrayList<>(); PoiUtil.PoiUtilCell enter= new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 2, 1); entryList.add(enter); @@ -303,155 +330,188 @@ public class ExcelService implements IExcelService { return path; } + 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()); - 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()); + //个人项目名报名 + 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; + } + + + +// 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); - 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()); +// } +// +// } 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); - 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表格对象 @@ -525,12 +585,13 @@ public class ExcelService implements IExcelService { OutputStream stream = new FileOutputStream(file); wbs.write(stream); stream.close(); - return path; + return PropUtil.imgDomain+filepath; } @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; @@ -548,6 +609,7 @@ public class ExcelService implements IExcelService { int coach = 0; CompeteCoachExample competeCoachExample = new CompeteCoachExample(); competeCoachExample.createCriteria().andCompanyIdEqualTo(competeCompany.getId()).andIdentityEqualTo((byte) coach); + competeCoachMapper.selectByExample(competeCoachExample); long count = competeCoachMapper.countByExample(competeCoachExample); //每个公司的领队数量 CompeteCoachExample competeCoachExample1 = new CompeteCoachExample(); @@ -622,7 +684,7 @@ public class ExcelService implements IExcelService { OutputStream stream = new FileOutputStream(file); wbs.write(stream); stream.close(); - return path; + return PropUtil.imgDomain+filepath; } @Override @@ -632,6 +694,185 @@ 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(); @@ -741,7 +982,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"; @@ -756,8 +997,377 @@ public class ExcelService implements IExcelService { OutputStream stream = new FileOutputStream(file); wbs.write(stream); stream.close(); + return PropUtil.imgDomain+filepath; + } + + + + + @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()); + //项目id + dailyScheduleProcess.setProjectId(competeProject.getId()); + CompeteProjectConfig competeProjectConfig = competeProjectConfigDao.selectByProjectId(competeProject.getId()); + if (ObjectUtil.isNotNull(competeProjectConfig)) { + //单项时间 + dailyScheduleProcess.setSingleTime(competeProjectConfig.getProjectDuration()); + //场地 + int siteNum = competeProjectConfig.getSiteNum(); + if(siteNum == 0){ + dailyScheduleProcess.setSiteNum(1); + }else{ + dailyScheduleProcess.setSiteNum(siteNum); + } + //场次 + double a = (double)count / (double)competeProjectConfig.getSiteNum(); + double times = Math.ceil(a); + dailyScheduleProcess.setGames(times); + //总时间 + double 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()); + 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)) { + //单项时间 + dailyScheduleProcess.setSingleTime(competeProjectConfig.getProjectDuration()); + //场地 + int siteNum = competeProjectConfig.getSiteNum(); + if(siteNum == 0){ + dailyScheduleProcess.setSiteNum(1); + }else{ + dailyScheduleProcess.setSiteNum(siteNum); + } + //场次 + double a = (double)count / (double)competeProjectConfig.getSiteNum(); + double times = Math.ceil(a); + dailyScheduleProcess.setGames(times); + //总时间 + double second = competeProjectConfig.getProjectDuration() * times; + dailyScheduleProcess.setTimeSum(second); + 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){ + //查询数据库中现有数据对象 + 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()); + 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(updateAndSearch.getProjectId()); + if (ObjectUtil.isNotNull(competeProjectConfig1)) { + dailyScheduleProcess.setSingleTime(competeProjectConfig1.getProjectDuration()); + //场地 + int siteNum = competeProjectConfig1.getSiteNum(); + if (siteNum == 0){ + dailyScheduleProcess.setSiteNum(1); + }else { + dailyScheduleProcess.setSiteNum(siteNum); + } + //场次 + 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; + } + + + @Override + public List getCompeteJoinDetail(CompeteDto.EnterInfo params) { +// 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<>(); +// List schedulePlanList = new ArrayList<>(); + //关联查询项目名，该项目在config和project中都存在 + List schedulePlanList = competeProjectConfigDao.selectDetail(); +// List schedulePlans.selectDetail(); +// 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 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; + } + + + + + + + public String patternExpTable(ScoreDto.ShowResult param) { + List totalScoreDisplays = competeService.showResult(param); + List> list = new ArrayList<>(); + List one=new ArrayList<>(); + PoiUtil.PoiUtilCell oneOne=new PoiUtil.PoiUtilCell("参赛单位", 1, 1); + PoiUtil.PoiUtilCell oneTwo=new PoiUtil.PoiUtilCell("参赛队员", 1, 1); + PoiUtil.PoiUtilCell oneThree=new PoiUtil.PoiUtilCell("创意编排分", 3, 1); + PoiUtil.PoiUtilCell oneFour=new PoiUtil.PoiUtilCell("创意最后得分", 1, 1); + PoiUtil.PoiUtilCell oneFive=new PoiUtil.PoiUtilCell("完成质量分", 3, 1); + PoiUtil.PoiUtilCell oneSix=new PoiUtil.PoiUtilCell("完成最后得分", 1, 1); + PoiUtil.PoiUtilCell oneSeven=new PoiUtil.PoiUtilCell("主裁判扣分", 1, 1); + PoiUtil.PoiUtilCell oneEight=new PoiUtil.PoiUtilCell("最后得分", 1, 1); + PoiUtil.PoiUtilCell oneNine=new PoiUtil.PoiUtilCell("名次", 1, 1); + PoiUtil.PoiUtilCell oneTen=new PoiUtil.PoiUtilCell("备注", 1, 1); + one.add(oneOne); + one.add(oneTwo); + one.add(oneThree); + one.add(oneFour); + one.add(oneFive); + one.add(oneSix); + one.add(oneSeven); + one.add(oneEight); + one.add(oneNine); + one.add(oneTen); + list.add(one); + List two=new ArrayList<>(); + PoiUtil.PoiUtilCell twoOne=new PoiUtil.PoiUtilCell(); + PoiUtil.PoiUtilCell twoTwo=new PoiUtil.PoiUtilCell(); + PoiUtil.PoiUtilCell twoThree=new PoiUtil.PoiUtilCell("1", 1, 1); + PoiUtil.PoiUtilCell twoFour=new PoiUtil.PoiUtilCell("2", 1, 1); + PoiUtil.PoiUtilCell twoFive=new PoiUtil.PoiUtilCell("3", 1, 1); + PoiUtil.PoiUtilCell twoSix=new PoiUtil.PoiUtilCell(); + PoiUtil.PoiUtilCell twoSeven=new PoiUtil.PoiUtilCell("1", 1, 1); + PoiUtil.PoiUtilCell twoEight=new PoiUtil.PoiUtilCell("2", 1, 1); + PoiUtil.PoiUtilCell twoNight=new PoiUtil.PoiUtilCell("3", 1, 1); + two.add(twoOne); + two.add(twoTwo); + two.add(twoThree); + two.add(twoFour); + return null; + } + } 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..8ca886bc 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java @@ -1,7 +1,9 @@ package com.ccsens.mt.service; import com.ccsens.mt.bean.dto.CompeteDto; +import com.ccsens.mt.bean.dto.ScoreDto; 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; @@ -149,6 +151,72 @@ public interface ICompeteService { List signupImport(String path) throws FileNotFoundException, Exception; + + void submitOrderList(ScoreDto.InformationSubmitted param); + + + List showResult(ScoreDto.ShowResult param); + + + /** + * 项目，开始时间和比赛状态 + * @param params 大赛id和比赛项目id + * @return 返回项目，开始时间和比赛状态 + */ + List countScore(CompeteDto.CompeteTime params) ; + + /** + * 得分详情 + * @param params 大赛id和比赛项目id + * @return 返回项目，开始时间和比赛状态 + */ + List countScoreDetail(CompeteDto.ProjectIdAndGroupId params) ; + + /** + * 得分详情 + * @param params 场次id + * @return 返回项目，开始时间和比赛状态 + */ + List countScoreCurrentSite(CompeteDto.CompeteSite params) ; + + /** + * 提交得分 + * @param params 场次id + * @return 返回项目，开始时间和比赛状态 + */ + void submitScore(CompeteDto.SubmitScore params) ; + + + /** +<<<<<<< HEAD + * 速度通级赛 + * @param params 项目id和场次id + * @return 返回项目，开始时间和比赛状态 + */ + List speedPass(CompeteDto.CompeteTimeAndProjectId params); + + + /** + <<<<<<< HEAD + * 速度通级赛(导出) + * @param params 项目id和场次id + * @return 返回项目，开始时间和比赛状态 + */ + String speedPassOut(CompeteDto.CompeteTimeAndProjectId params) throws IOException; + +/** + 查看技术赛成绩公示表 + @param param + @return + */ + List queryCountScoreAll(ScoreDto.ShowResult param); + + CompeteVo.SelScropeVo selSubmitOrderList(ScoreDto.SelScrop param); + + Long getUserCompanyId(Long userId, Byte type); + + + } 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..abc75755 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java @@ -0,0 +1,55 @@ +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; + +/** + * @author 逗 + */ +public interface ICompeteTaskService { + /** + * 修改日程安排 + * @param param + * @return + */ + List updateCompeteProjectConfig(ProvinceCompeteDto.UpdateCompeteProjectConfig param,String token); + + /** + * 查找所有项目的日程配置 + * @param param + * @return + */ + List queryCompeteConfig(CompeteDto.CompeteTime param); + + /** + * 查找该单位下参加该项目的选手的出场顺序信息 + * @param param + * @return + */ + List queryStartOrderByCompany(ProvinceCompeteDto.QueryStartOrderByCompany param); + + /** + * 查看所有项目下的裁判分配信息 + * @param param + * @return + */ + List queryJudgment(ProvinceCompeteDto.QueryJudgment param); + + /** + * 为项目分配裁判 + * @param param + * @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/java/com/ccsens/mt/service/ICompeteVedioService.java b/mt/src/main/java/com/ccsens/mt/service/ICompeteVedioService.java new file mode 100644 index 00000000..44028a80 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteVedioService.java @@ -0,0 +1,34 @@ +package com.ccsens.mt.service; + +import com.ccsens.mt.bean.dto.VideoDto; +import com.ccsens.mt.bean.po.CompetePlayerLook; +import com.ccsens.mt.bean.vo.VideoProjectVo; +import com.ccsens.util.bean.dto.QueryDto; + +import java.util.List; + +public interface ICompeteVedioService { + /** + * + * 添加用户观看开幕式视频记录（签到用） + * @param companyId 单位id + */ + void insertSignVideo(Long companyId); + + /** + * 查看用户观看视频记录（签到用） + * @param companyId + * + */ + boolean selectSignVideo(Long companyId); + + String uploadVideoPath(VideoDto.UploadVdeo param); + + List selectTwoProject(QueryDto params); + + List selectAllCompany(QueryDto params); + + List selectCompanySignStatus(QueryDto params); + + List selectCoachSignStatus(QueryDto params); +} 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..fe8b8316 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,20 @@ package com.ccsens.mt.service; import com.ccsens.mt.bean.dto.CompeteDto; +import com.ccsens.mt.bean.dto.ProvinceCompeteDto; +import com.ccsens.mt.bean.dto.ScoreDto; +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 +38,12 @@ public interface IExcelService { */ String competeJoin(QueryDto params) throws IOException; + /** + * XXXX大赛报名表 + * @param params 大赛id + * @return 返回失败的信息 + */ + List getCompeteJoinDetail(CompeteDto.EnterInfo params); /** @@ -46,4 +60,43 @@ public interface IExcelService { * @return 返回失败的信息 */ String competeAllCount(CompeteDto.CompeteTime params) throws IOException; + + + String iCompetitionOrderService(QueryDto params); + + /** + * 日程安排中间表 + * @param params 大赛id + * @return 返回失败的信息 + */ + List dailyScheduleProcess(CompeteDto.CompeteTime params); + + /** + * 更新并查询 + * @param params 大赛id + * @return 返回失败的信息 + */ + List updateAndSearch(ProvinceCompeteDto.UpdateAndSearchList params); + + /** + * 更新并查询 + * @param params 大赛id + * @return 返回失败的信息 + */ + List schedulePlanning(CompeteDto.CompeteTime params); + + /** + * 查询导出 + * @param params 大赛id + * @return 返回失败的信息 + */ + String schedulePlanningOut(CompeteDto.CompeteTime params) throws IOException; + + + + + + + + String patternExpTable(ScoreDto.ShowResult param); } diff --git a/mt/src/main/java/com/ccsens/mt/service/IKCPlayerService.java b/mt/src/main/java/com/ccsens/mt/service/IKCPlayerService.java new file mode 100644 index 00000000..b6531324 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/service/IKCPlayerService.java @@ -0,0 +1,5 @@ +package com.ccsens.mt.service; + +public interface IKCPlayerService { + String getSignature(Long id); +} 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..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); /** * 删除领队和教练信息 @@ -138,4 +131,17 @@ public interface IProvinceService { * @return 返回参加的选手的详细信息，按组别分类 */ List getPlayerByTeamProject(ProvinceCompeteDto.GetPlayerByTeamProject param); + + /** + * 查找团队下符合规则的选手信息 + * @param param 单位id 项目id 组别和性别信息 + * @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/KCPlayerService.java b/mt/src/main/java/com/ccsens/mt/service/KCPlayerService.java new file mode 100644 index 00000000..d626a569 --- /dev/null +++ b/mt/src/main/java/com/ccsens/mt/service/KCPlayerService.java @@ -0,0 +1,54 @@ +package com.ccsens.mt.service; + +import cn.hutool.core.util.ObjectUtil; +import com.ccsens.mt.util.Constant; +import com.ccsens.util.CodeEnum; +import com.ccsens.util.KCPlayerSignature; +import com.ccsens.util.RedisUtil; +import com.ccsens.util.exception.BaseException; +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.Random; +@Slf4j +@Service +@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) +public class KCPlayerService implements IKCPlayerService{ + @Resource + private RedisUtil redisUtil; + + /** + * 获取云点播签名 + * @return 返回签名 + * @param id + */ + @Override + public String getSignature(Long id) { + String signature; + //查询redis + Object o = redisUtil.get(Constant.Redis.KC_PLAYER_SIGNATURE + id); + if(ObjectUtil.isNotNull(o)){ + return (String) o; + } + + KCPlayerSignature sign = new KCPlayerSignature(); + sign.setCurrentTime(System.currentTimeMillis() / 1000); + sign.setRandom(new Random().nextInt(java.lang.Integer.MAX_VALUE)); + // 签名有效期：2天 + sign.setSignValidDuration(3600 * 24 * 2); + try { + signature = sign.getUploadSignature(id); + log.info("获取云点播签名成功：{}",signature); + //存入redis + redisUtil.set(Constant.Redis.KC_PLAYER_SIGNATURE + id,signature,3600 * 24); + } catch (Exception e) { + log.error("获取云点播签名失败",e); + throw new BaseException(CodeEnum.SYS_ERROR); + + } + return signature; + } +} 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..e06a4a8d 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; @@ -21,6 +22,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; @@ -113,6 +115,16 @@ public class ProvinceService implements IProvinceService { */ @Override public void saveOrUpdatePlayer(ProvinceCompeteDto.PlayerInfo param, Long userId) { + int type = 0; + if(ObjectUtil.isNotNull(param.getCompeteId())){ + CompeteCompany company = competeCompanyDao.selectByPrimaryKey(param.getCompeteId()); + if(ObjectUtil.isNull(company)) { + throw new BaseException(CodeEnum.NOT_COMPANY); + } + type = company.getType(); + }else { + throw new BaseException(CodeEnum.NOT_COMPANY); + } //判断选手id是否为空 if(ObjectUtil.isNull(param.getPlayerId())){ //id为空，新加一个选手 @@ -121,13 +133,16 @@ public class ProvinceService implements IProvinceService { 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);} //是否已注册 - CompetePlayerExample competePlayerExample = new CompetePlayerExample(); - competePlayerExample.createCriteria().andIdCardEqualTo(param.getIdCard()); - if(competePlayerDao.countByExample(competePlayerExample) != 0){ + int idCardNum = competePlayerDao.selectJoinNumByIdCard(type,param.getIdCard(),param.getPlayerId()); +// CompetePlayerExample competePlayerExample = new CompetePlayerExample(); +// competePlayerExample.createCriteria().andIdCardEqualTo(param.getIdCard()); +// if(competePlayerDao.countByExample(competePlayerExample) != 0){ +// throw new BaseException(CodeEnum.ID_CARD_ALREADY); +// } + if(idCardNum > 0){ throw new BaseException(CodeEnum.ID_CARD_ALREADY); } //验证性别是否正确 @@ -143,8 +158,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()){ @@ -159,7 +173,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,12 +198,16 @@ 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(); - competePlayerExample.createCriteria().andIdCardEqualTo(param.getIdCard()).andIdNotEqualTo(param.getPlayerId()); - if(competePlayerDao.countByExample(competePlayerExample) != 0){throw new BaseException(CodeEnum.ID_CARD_ALREADY);} + int idCardNum = competePlayerDao.selectJoinNumByIdCard(type,param.getIdCard(),param.getPlayerId()); + if(idCardNum > 0){ + throw new BaseException(CodeEnum.ID_CARD_ALREADY); + } +// CompetePlayerExample competePlayerExample = new CompetePlayerExample(); +// competePlayerExample.createCriteria().andIdCardEqualTo(param.getIdCard()).andIdNotEqualTo(param.getPlayerId()); +// if(competePlayerDao.countByExample(competePlayerExample) != 0){throw new BaseException(CodeEnum.ID_CARD_ALREADY);} //验证性别是否正确 int gender = IdcardUtil.getGenderByIdCard(param.getIdCard()); if(gender != param.getGender()){ @@ -211,13 +229,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(param.getGroupId())){player.setCompeteGroupId(param.getGroupId());} + + 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());} @@ -398,28 +427,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); @@ -455,6 +487,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); @@ -475,13 +513,22 @@ 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); } - //判断项目是个人还是团队，参加 + //判断项目是个人还是团队 if(competeProject.getTeam() == 0){ for(ProvinceCompeteDto.JoinProjectPlayer joinPlayer : param.getPlayers()){ + //检查此用户之前是否参加此项目 CompeteProjectPlayerExample example = new CompeteProjectPlayerExample(); example.createCriteria().andProjectIdEqualTo(competeProject.getId()).andPlayerIdEqualTo(joinPlayer.getPlayerId()) @@ -490,6 +537,14 @@ 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); + if(projectPlayerMapper.countByExample(projectPlayerExample1) != 0) { + throw new BaseException(CodeEnum.mtCertificateJoin("")); + } + } projectPlayer.setRecStatus((byte) 2); projectPlayerMapper.updateByPrimaryKeySelective(projectPlayer); }); @@ -500,15 +555,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()+"个人")); } //参加比赛记录 @@ -523,102 +595,185 @@ public class ProvinceService implements IProvinceService { } } }else { - //查找当前公司是否已经报名此项目 - CompeteTeam competeTeam; - CompeteTeamExample teamExample = new CompeteTeamExample(); - teamExample.createCriteria().andProjectIdEqualTo(competeProject.getId()).andCompanyIdEqualTo(param.getCompanyId()).andCompeteTimeIdEqualTo(param.getCompeteTimeId()); - List competeTeamList = competeTeamDao.selectByExample(teamExample); - if(CollectionUtil.isNotEmpty(competeTeamList)){ - competeTeam = competeTeamList.get(0); - }else { - competeTeam = new CompeteTeam(); - competeTeam.setId(snowflake.nextId()); - competeTeam.setCompeteTimeId(param.getCompeteTimeId()); - competeTeam.setProjectId(param.getProjectId()); - competeTeam.setCompanyId(param.getCompanyId()); - //添加团队表 - competeTeamDao.insertSelective(competeTeam); - } - - //检查参赛人数是否符合 - int joinCount = 0; - for(ProvinceCompeteDto.JoinProjectPlayer joinProject : param.getPlayers()){ - if(joinProject.getJoinProject() == 1){ - joinCount++; - }else { - joinCount--; + if(competeProject.getJoinRule() == 1) { + //查找当前公司是否已经报名此项目 + CompeteTeam competeTeam; + CompeteTeamExample teamExample = new CompeteTeamExample(); + teamExample.createCriteria().andProjectIdEqualTo(competeProject.getId()).andCompanyIdEqualTo(param.getCompanyId()).andCompeteTimeIdEqualTo(param.getCompeteTimeId()); + List competeTeamList = competeTeamDao.selectByExample(teamExample); + if (CollectionUtil.isNotEmpty(competeTeamList)) { + competeTeam = competeTeamList.get(0); + } else { + competeTeam = new CompeteTeam(); + competeTeam.setId(snowflake.nextId()); + competeTeam.setCompeteTimeId(param.getCompeteTimeId()); + competeTeam.setProjectId(param.getProjectId()); + competeTeam.setCompanyId(param.getCompanyId()); + //添加团队表 + competeTeamDao.insertSelective(competeTeam); } - } - 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()); + if (ObjectUtil.isNull(player)) { + throw new BaseException(CodeEnum.PARAM_ERROR); + } + //查找改选手是否在本团队内 + CompeteTeamMemberExample memberExample = new CompeteTeamMemberExample(); + memberExample.createCriteria().andPlayerIdEqualTo(player.getId()) + .andCompeteTeamIdEqualTo(competeTeam.getId()); + List teamMemberList = teamMemberMapper.selectByExample(memberExample); + //选手现在不参加，但以前参加了。删除以前的数据 + if (joinProjectPlayer.getJoinProject() == 0 && CollectionUtil.isNotEmpty(teamMemberList)) { + teamMemberList.forEach(member -> { + member.setRecStatus((byte) 2); + teamMemberMapper.updateByPrimaryKeySelective(member); + }); + } + //选手这次参加，以前未参加，添加数据 + if (joinProjectPlayer.getJoinProject() == 1 && CollectionUtil.isEmpty(teamMemberList)) { + //检查该选手报名项目数量（团队6个） + int a = competeCompanyDao.getTeamNumByPlayerId(param.getCompeteTimeId(), player.getId()); + if (a >= 6) { + throw new BaseException(CodeEnum.JOIN_PROJECT_NUM_FULL.mtProjectMsg(player.getName() + "团队")); + //XXX团队项目参赛次数已满 + } + //添加成员表 + CompeteTeamMember teamMember = new CompeteTeamMember(); + teamMember.setId(snowflake.nextId()); + teamMember.setCompeteTeamId(competeTeam.getId()); + teamMember.setPlayerId(player.getId()); + teamMemberMapper.insertSelective(teamMember); + } } - } - for (int i = 0; i < param.getPlayers().size(); i++) { - ProvinceCompeteDto.JoinProjectPlayer joinProjectPlayer = param.getPlayers().get(i); - CompetePlayer player = competePlayerDao.selectByPrimaryKey(joinProjectPlayer.getPlayerId()); - if(ObjectUtil.isNull(player)){ throw new BaseException(CodeEnum.PARAM_ERROR); } - //查找改选手是否在本团队内 + //查询团队内的成员，如果没有则删除团队 CompeteTeamMemberExample memberExample = new CompeteTeamMemberExample(); - memberExample.createCriteria().andPlayerIdEqualTo(player.getId()) - .andCompeteTeamIdEqualTo(competeTeam.getId()); - List teamMemberList = teamMemberMapper.selectByExample(memberExample); - //选手现在不参加，但以前参加了。删除以前的数据 - if(joinProjectPlayer.getJoinProject() == 0 && CollectionUtil.isNotEmpty(teamMemberList)){ - teamMemberList.forEach(member -> { - member.setRecStatus((byte) 2); - teamMemberMapper.updateByPrimaryKeySelective(member); - }); - } - //选手这次参加，以前未参加，添加数据 - if(joinProjectPlayer.getJoinProject() == 1 && CollectionUtil.isEmpty(teamMemberList)){ - //检查该选手报名项目数量（团队6个） - int a = competeCompanyDao.getTeamNumByPlayerId(param.getCompeteTimeId(),player.getId()); - if(a >= 6){ - throw new BaseException(CodeEnum.JOIN_PROJECT_NUM_FULL.mtProjectMsg(player.getName()+"团队")); - //XXX团队项目参赛次数已满 + memberExample.createCriteria().andCompeteTeamIdEqualTo(competeTeam.getId()); + if (teamMemberMapper.countByExample(memberExample) == 0) { + competeTeam.setRecStatus((byte) 2); + competeTeamDao.updateByPrimaryKeySelective(competeTeam); + } else { + //当前参赛人数不符提示错误信息 + if (teamMemberMapper.countByExample(memberExample) > competeProject.getMemberMax() || teamMemberMapper.countByExample(memberExample) < competeProject.getMemberMin()) { + throw new BaseException(CodeEnum.MEMBER_NUM_ERROR); + } + //修改团队的性别组和组别备注信息 + ProvinceCompeteVo.TeamGroupRemark teamGroupRemark = competePlayerDao.getTeamGroupRemark(competeTeam.getId()); + if (StrUtil.isNotEmpty(teamGroupRemark.getGroupRemark())) { + competeTeam.setGenderGroup((byte) teamGroupRemark.getSexGroup()); + if (ObjectUtil.isNull(competeTeam.getGroupRemark()) || competeTeam.getGroupRemark() == 0) { + String groupRemark = teamGroupRemark.getGroupRemark().substring(0, teamGroupRemark.getGroupRemark().length() - 3); + Constant.COMPETE_TEAM_GROUP_REMARK remark = Constant.COMPETE_TEAM_GROUP_REMARK.phaseOf(groupRemark); + if (ObjectUtil.isNotNull(remark)) { + competeTeam.setGroupRemark((byte) remark.value); + } else { + competeTeam.setGroupRemark((byte) 0); + } + } + competeTeamDao.updateByPrimaryKeySelective(competeTeam); } - //添加成员表 - CompeteTeamMember teamMember = new CompeteTeamMember(); - teamMember.setId(snowflake.nextId()); - teamMember.setCompeteTeamId(competeTeam.getId()); - teamMember.setPlayerId(player.getId()); - teamMemberMapper.insertSelective(teamMember); } - } - //查询团队内的成员，如果没有则删除团队 - CompeteTeamMemberExample memberExample = new CompeteTeamMemberExample(); - memberExample.createCriteria().andCompeteTeamIdEqualTo(competeTeam.getId()); - if(teamMemberMapper.countByExample(memberExample) == 0){ - competeTeam.setRecStatus((byte) 2); - competeTeamDao.updateByPrimaryKeySelective(competeTeam); }else { - //当前参赛人数不符提示错误信息 - if(teamMemberMapper.countByExample(memberExample) > competeProject.getMemberMax() || teamMemberMapper.countByExample(memberExample) < competeProject.getMemberMin()){ - throw new BaseException(CodeEnum.MEMBER_NUM_ERROR); + //查找当前单位是否已经报名此项目内的gai组别 + CompeteTeam competeTeam; + CompeteTeamExample teamExample = new CompeteTeamExample(); + teamExample.createCriteria().andProjectIdEqualTo(competeProject.getId()).andCompanyIdEqualTo(param.getCompanyId()) + .andCompeteTimeIdEqualTo(param.getCompeteTimeId()).andGenderGroupEqualTo((byte) param.getGender()).andGroupRemarkEqualTo((byte) param.getGroupRemark()); + List competeTeamList = competeTeamDao.selectByExample(teamExample); + if (CollectionUtil.isNotEmpty(competeTeamList)) { + competeTeam = competeTeamList.get(0); + } else { + competeTeam = new CompeteTeam(); + competeTeam.setId(snowflake.nextId()); + competeTeam.setCompeteTimeId(param.getCompeteTimeId()); + competeTeam.setProjectId(param.getProjectId()); + competeTeam.setCompanyId(param.getCompanyId()); + competeTeam.setGenderGroup((byte) param.getGender()); + competeTeam.setGroupRemark((byte) param.getGroupRemark()); + //添加团队表 + competeTeamDao.insertSelective(competeTeam); } - //修改团队的性别组和组别备注信息 - ProvinceCompeteVo.TeamGroupRemark teamGroupRemark = competePlayerDao.getTeamGroupRemark(competeTeam.getId()); - if (StrUtil.isNotEmpty(teamGroupRemark.getGroupRemark())) { - competeTeam.setGenderGroup((byte) teamGroupRemark.getSexGroup()); - if (ObjectUtil.isNull(competeTeam.getGroupRemark()) || competeTeam.getGroupRemark() == 0) { - String groupRemark = teamGroupRemark.getGroupRemark().substring(0, teamGroupRemark.getGroupRemark().length() - 3); - Constant.COMPETE_TEAM_GROUP_REMARK remark = Constant.COMPETE_TEAM_GROUP_REMARK.phaseOf(groupRemark); - if (ObjectUtil.isNotNull(remark)) { - competeTeam.setGroupRemark((byte) remark.value); - } else { - competeTeam.setGroupRemark((byte) 0); + + for (int i = 0; i < param.getPlayers().size(); i++) { + ProvinceCompeteDto.JoinProjectPlayer joinProjectPlayer = param.getPlayers().get(i); + CompetePlayer player = competePlayerDao.selectByPrimaryKey(joinProjectPlayer.getPlayerId()); + if (ObjectUtil.isNull(player)) { + throw new BaseException(CodeEnum.PARAM_ERROR); + } + //查找改选手是否在本团队内 + CompeteTeamMemberExample memberExample = new CompeteTeamMemberExample(); + memberExample.createCriteria().andPlayerIdEqualTo(player.getId()) + .andCompeteTeamIdEqualTo(competeTeam.getId()); + List teamMemberList = teamMemberMapper.selectByExample(memberExample); + //选手现在不参加，但以前参加了。删除以前的数据 + if (joinProjectPlayer.getJoinProject() == 0 && CollectionUtil.isNotEmpty(teamMemberList)) { + teamMemberList.forEach(member -> { + member.setRecStatus((byte) 2); + teamMemberMapper.updateByPrimaryKeySelective(member); + }); + } + //选手这次参加，以前未参加，添加数据 + if (joinProjectPlayer.getJoinProject() == 1 && CollectionUtil.isEmpty(teamMemberList)) { + //检查该选手报名项目数量（团队6个） + int a = competeCompanyDao.getTeamNumByPlayerId(param.getCompeteTimeId(), player.getId()); + if (a >= 6) { + throw new BaseException(CodeEnum.JOIN_PROJECT_NUM_FULL.mtProjectMsg(player.getName() + "团队")); + //XXX团队项目参赛次数已满 + } + //查找该选手是否参加了该项目的其他组别 + int b = competeCompanyDao.getTeamNumByPlayerIdAndGroup(param.getCompeteTimeId(), player.getId(),param.getProjectId() + ,param.getCompanyId(),param.getGender(),param.getGroupRemark()); + if (b > 0) { + throw new BaseException(CodeEnum.mtJoinAuthGroup(player.getName())); } + + //添加成员表 + CompeteTeamMember teamMember = new CompeteTeamMember(); + teamMember.setId(snowflake.nextId()); + teamMember.setCompeteTeamId(competeTeam.getId()); + teamMember.setPlayerId(player.getId()); + teamMemberMapper.insertSelective(teamMember); } + } + //查询团队内的成员，如果没有则删除团队 + CompeteTeamMemberExample memberExample = new CompeteTeamMemberExample(); + memberExample.createCriteria().andCompeteTeamIdEqualTo(competeTeam.getId()); + if (teamMemberMapper.countByExample(memberExample) == 0) { + competeTeam.setRecStatus((byte) 2); competeTeamDao.updateByPrimaryKeySelective(competeTeam); + } else { + //当前参赛人数不符提示错误信息 + if (teamMemberMapper.countByExample(memberExample) > competeProject.getMemberMax() || teamMemberMapper.countByExample(memberExample) < competeProject.getMemberMin()) { + throw new BaseException(CodeEnum.MEMBER_NUM_ERROR); + } + //修改团队的性别组和组别备注信息 + ProvinceCompeteVo.TeamGroupRemark teamGroupRemark = competePlayerDao.getTeamGroupRemark(competeTeam.getId()); + if (StrUtil.isNotEmpty(teamGroupRemark.getGroupRemark())) { + competeTeam.setGenderGroup((byte) teamGroupRemark.getSexGroup()); + if (ObjectUtil.isNull(competeTeam.getGroupRemark()) || competeTeam.getGroupRemark() == 0) { + String groupRemark = teamGroupRemark.getGroupRemark().substring(0, teamGroupRemark.getGroupRemark().length() - 3); + Constant.COMPETE_TEAM_GROUP_REMARK remark = Constant.COMPETE_TEAM_GROUP_REMARK.phaseOf(groupRemark); + if (ObjectUtil.isNotNull(remark)) { + competeTeam.setGroupRemark((byte) remark.value); + } else { + competeTeam.setGroupRemark((byte) 0); + } + } + competeTeamDao.updateByPrimaryKeySelective(competeTeam); + } } } } } +// /** +// * 参加个人比赛 +// */ +// private void joinTiwnProject(){ +// +// } + /** * 查找教练详细信息 */ @@ -632,12 +787,94 @@ public class ProvinceService implements IProvinceService { */ @Override public List getPlayerByTeamProject(ProvinceCompeteDto.GetPlayerByTeamProject param) { + List groupAndPlayerList = new ArrayList<>(); //查找项目 CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId()); if(ObjectUtil.isNotNull(competeProject)){ - List groupAndPlayerList = competeCompanyDao.getPlayerByTeamProject(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; + } + + + /** + * 查找符合参赛规则的选手信息 + */ + @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()); +// List playerInfoByGroupList = competeCompanyDao.queryPlayersByTeamProject(param.getCompanyId(),param.getProjectId()); +// ProvinceCompeteVo.GroupAndPlayer groupAndPlayer = new ProvinceCompeteVo.GroupAndPlayer(); +// groupAndPlayer.setGroupName("不限制组别"); +// groupAndPlayer.setPlayerList(playerInfoByGroupList); + } + //如果同单位限制组别 + 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; + } + + @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); + }); + } + } + } + + + /** + * 查询运动员是否参加了比赛 + */ + private boolean getJoinProject(Long playerId){ + CompeteProjectPlayerExample projectPlayerExample = new CompeteProjectPlayerExample(); + projectPlayerExample.createCriteria().andPlayerIdEqualTo(playerId); + if(projectPlayerMapper.countByExample(projectPlayerExample) != 0){ + return true; } - return null; + CompeteTeamMemberExample teamMemberExample = new CompeteTeamMemberExample(); + teamMemberExample.createCriteria().andPlayerIdEqualTo(playerId); + return teamMemberMapper.countByExample(teamMemberExample) != 0; } } 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..fe8afc77 100644 --- a/mt/src/main/java/com/ccsens/mt/service/VideoService.java +++ b/mt/src/main/java/com/ccsens/mt/service/VideoService.java @@ -30,6 +30,7 @@ public class VideoService implements IVideoService{ @Resource private CompeteVideoMapper competeVideoMapper; + /** * 查看某个用户上传的比赛视频信息 * @param params 比赛id和选手id @@ -37,22 +38,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 +64,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..ef0667ca 100644 --- a/mt/src/main/java/com/ccsens/mt/util/Constant.java +++ b/mt/src/main/java/com/ccsens/mt/util/Constant.java @@ -31,9 +31,36 @@ public class Constant { public final static long COMPETE_COMPANY_TIME = 10 * 24 * 60 * 60; // 远程比赛参赛单位 public final static String COMPETE_LEVEL = "compete_"; + //云点播签名 + public final static String KC_PLAYER_SIGNATURE = "kc_player_signature_"; } 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; + /** + * 计数赛id + */ + public static final long COMPETE_COUNT = 2001; + /** + * 花样赛 + */ + public static final long COMPETE_VARIETY = 2002; + /** + * 每个比赛项目留给选手上传视频的时间(暂定半个小时，可以修改) + */ + 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/application.yml b/mt/src/main/resources/application.yml index 5889ff7f..4ecd13fd 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,4 +1,5 @@ spring: profiles: - active: test - include: common, util-test \ No newline at end of file + active: dev + include: common, util-dev + 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 diff --git a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml index 33da3934..91ab5fab 100644 --- a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml @@ -15,10 +15,20 @@ - + + + + + + + + + + + @@ -50,7 +60,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 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 @@ -127,6 +137,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 +244,13 @@ - + + + + + \ No newline at end of file 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..44e60370 --- /dev/null +++ b/mt/src/main/resources/mapper_dao/CompeteJudgmentDao.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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..3cea0ca7 100644 --- a/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml +++ b/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml @@ -18,10 +18,10 @@ - - - - + + + + @@ -30,7 +30,15 @@ - + + + + + + + + + + + + \ 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 new file mode 100644 index 00000000..d9006c30 --- /dev/null +++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml @@ -0,0 +1,407 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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..b42730ed --- /dev/null +++ b/mt/src/main/resources/mapper_dao/CompeteProjectDao.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + \ No newline at end of file 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..88dcc793 --- /dev/null +++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml @@ -0,0 +1,182 @@ + + + + + + + + + + + + + + + + + + + + \ 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/mt/src/main/resources/mapper_dao/CompeteTimeDao.xml b/mt/src/main/resources/mapper_dao/CompeteTimeDao.xml index 3bbe88b0..8c902a7f 100644 --- a/mt/src/main/resources/mapper_dao/CompeteTimeDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteTimeDao.xml @@ -49,6 +49,7 @@ rec_status = 0 and type = #{type} + and sex < 2 ORDER BY sequence @@ -120,4 +121,26 @@ and p.rec_status = 0 GROUP BY g.id + + \ No newline at end of file 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..fb61539f --- /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 new file mode 100644 index 00000000..6f586d68 --- /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, 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 + + + + + delete from t_compete_count_score + where id = #{id,jdbcType=BIGINT} + and should_times = #{shouldTimes,jdbcType=INTEGER} + + + delete from t_compete_count_score + + + + + + 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}, #{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}) + + + 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, + + + + + #{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}, + + + + + + update t_compete_count_score + + + 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}, + + + deduct_times = #{record.deductTimes,jdbcType=INTEGER}, + + + deduct_cause = #{record.deductCause,jdbcType=VARCHAR}, + + + final_score = #{record.finalScore,jdbcType=DECIMAL}, + + + 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}, + 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}, + deduct_times = #{record.deductTimes,jdbcType=INTEGER}, + deduct_cause = #{record.deductCause,jdbcType=VARCHAR}, + final_score = #{record.finalScore,jdbcType=DECIMAL}, + 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=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=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} + + + 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=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=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/CompeteJudgmentMapper.xml b/mt/src/main/resources/mapper_raw/CompeteJudgmentMapper.xml new file mode 100644 index 00000000..f20b6367 --- /dev/null +++ b/mt/src/main/resources/mapper_raw/CompeteJudgmentMapper.xml @@ -0,0 +1,353 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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, name, phone, remark, compete_time_id, site, project_id, user_id, chief_judgment, + created_at, updated_at, rec_status, member_id, role_id + + + + + delete from t_compete_judgment + where id = #{id,jdbcType=BIGINT} + + + delete from t_compete_judgment + + + + + + insert into t_compete_judgment (id, name, phone, + remark, compete_time_id, site, + project_id, user_id, chief_judgment, + created_at, updated_at, rec_status, + member_id, role_id) + values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, + #{remark,jdbcType=VARCHAR}, #{competeTimeId,jdbcType=BIGINT}, #{site,jdbcType=INTEGER}, + #{projectId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{chiefJudgment,jdbcType=TINYINT}, + #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, + #{memberId,jdbcType=BIGINT}, #{roleId,jdbcType=BIGINT}) + + + insert into t_compete_judgment + + + id, + + + name, + + + phone, + + + remark, + + + compete_time_id, + + + site, + + + project_id, + + + user_id, + + + chief_judgment, + + + created_at, + + + updated_at, + + + rec_status, + + + member_id, + + + role_id, + + + + + #{id,jdbcType=BIGINT}, + + + #{name,jdbcType=VARCHAR}, + + + #{phone,jdbcType=VARCHAR}, + + + #{remark,jdbcType=VARCHAR}, + + + #{competeTimeId,jdbcType=BIGINT}, + + + #{site,jdbcType=INTEGER}, + + + #{projectId,jdbcType=BIGINT}, + + + #{userId,jdbcType=BIGINT}, + + + #{chiefJudgment,jdbcType=TINYINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + #{memberId,jdbcType=BIGINT}, + + + #{roleId,jdbcType=BIGINT}, + + + + + + update t_compete_judgment + + + id = #{record.id,jdbcType=BIGINT}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + phone = #{record.phone,jdbcType=VARCHAR}, + + + remark = #{record.remark,jdbcType=VARCHAR}, + + + compete_time_id = #{record.competeTimeId,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}, + + + member_id = #{record.memberId,jdbcType=BIGINT}, + + + role_id = #{record.roleId,jdbcType=BIGINT}, + + + + + + + + update t_compete_judgment + set id = #{record.id,jdbcType=BIGINT}, + name = #{record.name,jdbcType=VARCHAR}, + phone = #{record.phone,jdbcType=VARCHAR}, + remark = #{record.remark,jdbcType=VARCHAR}, + compete_time_id = #{record.competeTimeId,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}, + member_id = #{record.memberId,jdbcType=BIGINT}, + role_id = #{record.roleId,jdbcType=BIGINT} + + + + + + update t_compete_judgment + + + name = #{name,jdbcType=VARCHAR}, + + + phone = #{phone,jdbcType=VARCHAR}, + + + remark = #{remark,jdbcType=VARCHAR}, + + + compete_time_id = #{competeTimeId,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}, + + + member_id = #{memberId,jdbcType=BIGINT}, + + + role_id = #{roleId,jdbcType=BIGINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_compete_judgment + set name = #{name,jdbcType=VARCHAR}, + phone = #{phone,jdbcType=VARCHAR}, + remark = #{remark,jdbcType=VARCHAR}, + compete_time_id = #{competeTimeId,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}, + member_id = #{memberId,jdbcType=BIGINT}, + role_id = #{roleId,jdbcType=BIGINT} + 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..7effd398 --- /dev/null +++ b/mt/src/main/resources/mapper_raw/CompeteStartOrderMapper.xml @@ -0,0 +1,353 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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, player_id, team, compete_order, site, created_at, updated_at, rec_status, + task_id, start_time, end_time, remark, waiver + + + + + delete from t_compete_start_order + where id = #{id,jdbcType=BIGINT} + + + delete from t_compete_start_order + + + + + + 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, + 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}, + #{remark,jdbcType=VARCHAR}, #{waiver,jdbcType=TINYINT}) + + + 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, + + + remark, + + + waiver, + + + + + #{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}, + + + #{remark,jdbcType=VARCHAR}, + + + #{waiver,jdbcType=TINYINT}, + + + + + + update t_compete_start_order + + + id = #{record.id,jdbcType=BIGINT}, + + + project_id = #{record.projectId,jdbcType=BIGINT}, + + + player_id = #{record.playerId,jdbcType=BIGINT}, + + + team = #{record.team,jdbcType=TINYINT}, + + + 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}, + + + task_id = #{record.taskId,jdbcType=BIGINT}, + + + start_time = #{record.startTime,jdbcType=BIGINT}, + + + end_time = #{record.endTime,jdbcType=BIGINT}, + + + remark = #{record.remark,jdbcType=VARCHAR}, + + + waiver = #{record.waiver,jdbcType=TINYINT}, + + + + + + + + update t_compete_start_order + set id = #{record.id,jdbcType=BIGINT}, + project_id = #{record.projectId,jdbcType=BIGINT}, + player_id = #{record.playerId,jdbcType=BIGINT}, + team = #{record.team,jdbcType=TINYINT}, + 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}, + task_id = #{record.taskId,jdbcType=BIGINT}, + start_time = #{record.startTime,jdbcType=BIGINT}, + end_time = #{record.endTime,jdbcType=BIGINT}, + remark = #{record.remark,jdbcType=VARCHAR}, + waiver = #{record.waiver,jdbcType=TINYINT} + + + + + + update t_compete_start_order + + + project_id = #{projectId,jdbcType=BIGINT}, + + + player_id = #{playerId,jdbcType=BIGINT}, + + + team = #{team,jdbcType=TINYINT}, + + + compete_order = #{competeOrder,jdbcType=TINYINT}, + + + site = #{site,jdbcType=TINYINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + task_id = #{taskId,jdbcType=BIGINT}, + + + start_time = #{startTime,jdbcType=BIGINT}, + + + end_time = #{endTime,jdbcType=BIGINT}, + + + remark = #{remark,jdbcType=VARCHAR}, + + + waiver = #{waiver,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_compete_start_order + set project_id = #{projectId,jdbcType=BIGINT}, + player_id = #{playerId,jdbcType=BIGINT}, + team = #{team,jdbcType=TINYINT}, + compete_order = #{competeOrder,jdbcType=TINYINT}, + site = #{site,jdbcType=TINYINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT}, + task_id = #{taskId,jdbcType=BIGINT}, + start_time = #{startTime,jdbcType=BIGINT}, + end_time = #{endTime,jdbcType=BIGINT}, + remark = #{remark,jdbcType=VARCHAR}, + waiver = #{waiver,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ 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 new file mode 100644 index 00000000..f4b26c7c --- /dev/null +++ b/mt/src/main/resources/mapper_raw/CompeteVarietyScoreMapper.xml @@ -0,0 +1,291 @@ + + + + + + + + + + + + + + + + + + + + + + + + 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, code, score, judgment_id, created_at, + updated_at, rec_status + + + + + 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=DECIMAL}, + #{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=DECIMAL}, + + + #{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=DECIMAL}, + + + 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=DECIMAL}, + 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=DECIMAL}, + + + 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=DECIMAL}, + 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/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