Browse Source

1

tiaosheng
Lihong@123456 5 years ago
parent
commit
f845fe263a
  1. 27
      mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java
  2. 32
      mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java
  3. 2
      mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java
  4. 35
      mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java
  5. 16
      mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java
  6. 42
      mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java
  7. 2
      mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java
  8. 4
      mt/src/main/java/com/ccsens/mt/persist/dao/CompeteVideoDao.java
  9. 12
      mt/src/main/java/com/ccsens/mt/service/CompeteService.java
  10. 13
      mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java
  11. 7
      mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java
  12. 9
      mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java
  13. 4
      mt/src/main/java/com/ccsens/mt/service/ICompeteVedioService.java
  14. 8
      mt/src/main/resources/mapper_dao/CompetePlayerDao.xml
  15. 42
      mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml
  16. 4
      mt/src/main/resources/mapper_dao/CompeteVideoDao.xml

27
mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java

@ -36,9 +36,9 @@ public class CompeteTaskController {
@ApiOperation(value = "查找日期配置", notes = "zy:查找项目对应的配置信息")
@RequestMapping(value = "/query", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<TableVo.DailyScheduleProcess> queryCompeteConfig(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteTime> params) {
log.info("日程安排更新:{}",params);
log.info("查找日期配置:{}",params);
List<TableVo.CompeteProjectConfig> dailyScheduleProcessList = competeTaskService.queryCompeteConfig(params.getParam());
log.info("日程安排更新:{}",dailyScheduleProcessList);
log.info("查找日期配置:{}",dailyScheduleProcessList);
return JsonResponse.newInstance().ok(dailyScheduleProcessList);
}
@ -56,10 +56,11 @@ public class CompeteTaskController {
@MustLogin
@ApiOperation(value = "查看该学校选手列表,按出场顺序(手机上上传视频用)", notes = "zy:按顺序查找出场顺序表,筛选出该学校在此项目中的所有选手或团队的出场顺序和时间")
@RequestMapping(value = "/query/players", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<List<ProvinceCompeteVo.StartOrderByCompany>> queryStartOrderByCompany(@ApiParam @Validated @RequestBody QueryDto<ProvinceCompeteDto.QueryStartOrderByCompany> params) {
log.info("日程安排更新:{}",params);
List<ProvinceCompeteVo.StartOrderByCompany> startOrderByCompanyList = competeTaskService.queryStartOrderByCompany(params.getParam());
log.info("日程安排更新:{}",startOrderByCompanyList);
public JsonResponse<List<ProvinceCompeteVo.StartOrderByCompanyAndProject>> queryStartOrderByCompany(
@ApiParam @Validated @RequestBody QueryDto<ProvinceCompeteDto.QueryStartOrderByCompany> params) {
log.info("查看该学校选手列表:{}",params);
List<ProvinceCompeteVo.StartOrderByCompanyAndProject> startOrderByCompanyList = competeTaskService.queryStartOrderByCompany(params.getParam());
log.info("查看该学校选手列表:{}",startOrderByCompanyList);
return JsonResponse.newInstance().ok(startOrderByCompanyList);
}
@ -67,9 +68,19 @@ public class CompeteTaskController {
@ApiOperation(value = "查看裁判分配信息", notes = "zy:查看每个项目下的每个场地的裁判信息")
@RequestMapping(value = "/query/judgment", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<List<ProvinceCompeteVo.QueryJudgment>> queryJudgment(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteTime> params) {
log.info("日程安排更新:{}",params);
log.info("查看裁判分配信息:{}",params);
List<ProvinceCompeteVo.QueryJudgment> queryJudgmentList = competeTaskService.queryJudgment(params.getParam());
log.info("日程安排更新:{}",queryJudgmentList);
log.info("查看裁判分配信息:{}",queryJudgmentList);
return JsonResponse.newInstance().ok(queryJudgmentList);
}
@MustLogin
@ApiOperation(value = "分配裁判信息", notes = "zy:传入裁判分配信息表,根据内容给每个的项目的每个场次添加裁判信息")
@RequestMapping(value = "/allocation/judgment", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<List<ProvinceCompeteVo.QueryJudgment>> allocationJudgment(@ApiParam @Validated @RequestBody QueryDto<ProvinceCompeteDto.AllocationJudgment> params) {
log.info("分配裁判信息:{}",params);
List<ProvinceCompeteVo.QueryJudgment> queryJudgmentList = competeTaskService.allocationJudgment(params.getParam());
log.info("分配裁判信息:{}",queryJudgmentList);
return JsonResponse.newInstance().ok(queryJudgmentList);
}

32
mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java

@ -33,16 +33,16 @@ public class CompeteVideoController {
@MustLogin
@ApiOperation(value = "添加用户观看开幕式视频记录(签到用)", notes = "Mr.王---------根据公司的id在t_compete_player_look表中插入一条数据,单表操作,")
@RequestMapping(value = "/addUserSign", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse addCompeteCompany(@ApiParam @Validated @RequestBody QueryDto<VideoDto.Vdeo> params) {
log.info("添加用户观看开幕式视频记录(签到用)",params);
public JsonResponse addCompeteCompany(@ApiParam @Validated @RequestBody QueryDto<VideoDto.Video> 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<VideoDto.Vdeo> params) {
log.info("添加用户观看开幕式视频记录(签到用)",params);
public JsonResponse selCompeteCompany(@ApiParam @Validated @RequestBody QueryDto<VideoDto.Video> params) {
log.info("添加用户观看开幕式视频记录(签到用):{}",params);
boolean code= iCompeteVedioService.selectSignVideo(params.getParam().getCompanyId());
return JsonResponse.newInstance().ok(code);
}
@ -51,28 +51,24 @@ public class CompeteVideoController {
@ApiOperation(value = "上传视频保存上传记录 (比赛视频)", notes = "Mr.王---------增加一条数据到competevideo")
@RequestMapping(value = "/insertVideoRecord", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse uploadVideo(@ApiParam @Validated @RequestBody QueryDto<VideoDto.UploadVdeo> params) {
log.info("添加用户观看开幕式视频记录(签到用)",params);
log.info("添加用户观看开幕式视频记录(签到用):{}",params);
String path= iCompeteVedioService.uploadVideoPath(params.getParam());
return JsonResponse.newInstance().ok(path);
}
@MustLogin
@ApiOperation(value = "查看单位签到状态(签到用)(有筛选", notes = "Mr.王---------查看单位的人的最近一条的签到状态")
@ApiOperation(value = "查看单位签到状态(签到用)(有筛选)", notes = "Mr.王---------查看单位的人的最近一条的签到状态")
@RequestMapping(value = "/selectUserStatus", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<List<VideoProjectVo.PeoSignStatu>> selectCompanySignStatus(@ApiParam @Validated @RequestBody QueryDto<VideoDto.GetTeamSignStatu> params) {
log.info("查看单位签到状态(签到用)",params);
public JsonResponse<List<VideoProjectVo.PeoSignStatu>> selectCompanySignStatus(@ApiParam @Validated @RequestBody QueryDto<VideoDto.GetSignStatus> params) {
log.info("查看单位签到状态(签到用):{}",params);
List<VideoProjectVo.PeoSignStatu> peoSignStatus = iCompeteVedioService.selectCompanySignStatus(params);
return JsonResponse.newInstance().ok(peoSignStatus);
}
@MustLogin
@ApiOperation(value = "查看教练签到状态(签到用)(有筛选", notes = "Mr.王---------查看教练的人的签到状态")
@ApiOperation(value = "查看教练签到状态(签到用)", notes = "Mr.王---------查看教练的人的签到状态")
@RequestMapping(value = "/selectCoachStatus", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<List<VideoProjectVo.CoachSignStatu>> selectCoachSignStatus(@ApiParam @Validated @RequestBody QueryDto<VideoDto.GetTeamSignStatu> params) {
log.info("查看教练签到状态(签到用)",params);
public JsonResponse<List<VideoProjectVo.CoachSignStatu>> selectCoachSignStatus(@ApiParam @Validated @RequestBody QueryDto<VideoDto.GetSignStatus> params) {
log.info("查看教练签到状态(签到用):{}",params);
List<VideoProjectVo.CoachSignStatu> coachSignStatus = iCompeteVedioService.selectCoachSignStatus(params);
return JsonResponse.newInstance().ok(coachSignStatus);
}
@ -82,7 +78,7 @@ public class CompeteVideoController {
@RequestMapping(value = "/selectTwoProject", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<List<VideoProjectVo.GetTwoProject>> selectTwoProject(@ApiParam @Validated @RequestBody QueryDto<VideoDto.GetTwoProject > params) {
log.info("添加用户观看开幕式视频记录(签到用)",params);
log.info("添加用户观看开幕式视频记录(签到用):{}",params);
List<VideoProjectVo.GetTwoProject> list=iCompeteVedioService.selectTwoProject(params);
return JsonResponse.newInstance().ok(list);
@ -90,8 +86,8 @@ public class CompeteVideoController {
@MustLogin
@ApiOperation(value = "查找所有参赛单位", notes = "Mr.王---------去那个competeProject表下面查")
@RequestMapping(value = "/selectAllCompany", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<List<VideoProjectVo.GetAllCompany>> selectAllCompany(@ApiParam @Validated @RequestBody QueryDto<VideoDto.GetAllCompany > params) {
log.info("添加用户观看开幕式视频记录(签到用)",params);
public JsonResponse<List<VideoProjectVo.GetAllCompany>> selectAllCompany(@ApiParam @Validated @RequestBody QueryDto<VideoDto.GetAllCompany> params) {
log.info("添加用户观看开幕式视频记录(签到用):{}",params);
List<VideoProjectVo.GetAllCompany> list=iCompeteVedioService.selectAllCompany(params);
return JsonResponse.newInstance().ok(list);
}

2
mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java

@ -335,7 +335,7 @@ public class CompeteDto {
}
@Data
@ApiModel("项目id和组别id")
@ApiModel("查看选手列表(手机用)")
public static class ProjectIdAndGroupId{
@ApiModelProperty("项目id")
private Long projectId;

35
mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java

@ -239,4 +239,39 @@ public class ProvinceCompeteDto {
private Long companyId;
}
@Data
@ApiModel("分配裁判信息")
public static class AllocationJudgment{
@NotNull
@ApiModelProperty("比赛项目id")
private Long projectId;
@ApiModelProperty("开始时间")
private Long startTime;
@ApiModelProperty("结束时间")
private Long endTime;
@ApiModelProperty("不同场地的裁判")
private List<SiteJudgment> siteJudgmentList;
}
@Data
@ApiModel("场地上的裁判信息")
public static class SiteJudgment{
@ApiModelProperty("场地信息(场地序号)")
private int site;
@ApiModelProperty("裁判基本信息")
private List<JudgmentInfo> judgmentInfoList;
}
@Data
@ApiModel("裁判的角色基本信息")
public static class JudgmentInfo{
@ApiModelProperty("第几号裁判 0主裁判 1一号裁判 2二号裁判 。。。。。")
private int judgmentNum;
@ApiModelProperty("姓名")
private String judgmentName;
@ApiModelProperty("手机号")
private String judgmentPhone;
@ApiModelProperty("备注")
private String remark;
}
}

16
mt/src/main/java/com/ccsens/mt/bean/dto/VideoDto.java

@ -42,7 +42,7 @@ public class VideoDto {
}
@Data
@ApiModel("添加用户观看开幕式视频记录(签到用)")
public static class Vdeo{
public static class Video{
@NonNull
@ApiModelProperty("视频文件id")
private Long companyId;
@ -76,7 +76,7 @@ public class VideoDto {
}
@Data
@ApiModel("参赛队伍/裁判签到表")
public static class GetTeamSignStatu{
public static class GetTeamSignStatus{
@ApiModelProperty("大赛id")
private Long id;
@ApiModelProperty("姓名/参赛队伍")
@ -85,7 +85,19 @@ public class VideoDto {
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;
}
}

42
mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java

@ -234,41 +234,45 @@ public class ProvinceCompeteVo {
}
@Data
@ApiModel("查看单位下当前项目所有参赛人员或队伍信息")
public static class StartOrderByCompany {
@ApiModel("查看单位下当前项目所有参赛人员或队伍信息(上传视频用)")
public static class StartOrderByCompanyAndProject {
@ApiModelProperty("项目id")
private Long projectId;
@ApiModelProperty("项目名")
private String projectName;
@ApiModelProperty("场次id")
private Long startOrderId;
@ApiModelProperty("场次")
private int competeOrder;
@ApiModelProperty("场地")
private int site;
@ApiModelProperty("选手名")
private String playerName;
@ApiModelProperty("组别名")
private String groupName;
@ApiModelProperty("项目下的每个场次的选手")
private List<StartOrder> startOrderList;
@ApiModelProperty("开始时间")
private Long startTime;
@ApiModelProperty("结束时间")
private Long endTime;
public Long getStartTime(){
public Long getEndTime(){
if(ObjectUtil.isNotNull(startTime) && startTime != 0){
return startTime + Constant.UPLOAD_VIDEO_TIME;
}
return null;
}
public Long getEndTime(){
if(ObjectUtil.isNotNull(endTime) && endTime != 0){
return endTime + Constant.UPLOAD_VIDEO_TIME;
}
return null;
}
}
@Data
@ApiModel("查看单位下当前项目所有参赛人员或队伍信息(上传视频用)")
public static class StartOrder {
@ApiModelProperty("场次id")
private Long startOrderId;
@ApiModelProperty("场次")
private int competeOrder;
@ApiModelProperty("场地")
private int site;
@ApiModelProperty("选手名")
private List<String> playerNameList;
@ApiModelProperty("是否是团队项目 0否 1是")
private int team;
@ApiModelProperty("组别名")
private String groupName;
@ApiModelProperty("视频连接(云点播)(为null则代表未传视频)")
private Long videoUrl;
}

2
mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java

@ -35,5 +35,5 @@ public interface CompeteProjectConfigDao extends CompeteProjectConfigMapper {
* @param projectId 项目di
* @return 返回选手列表
*/
List<ProvinceCompeteVo.StartOrderByCompany> queryStartOrderByCompany(@Param("companyId")Long companyId, @Param("projectId")Long projectId, @Param("competeTimeId")Long competeTimeId);
List<ProvinceCompeteVo.StartOrderByCompanyAndProject> queryStartOrderByCompany(@Param("companyId")Long companyId, @Param("projectId")Long projectId, @Param("competeTimeId")Long competeTimeId);
}

4
mt/src/main/java/com/ccsens/mt/persist/dao/CompeteVideoDao.java

@ -12,7 +12,7 @@ import java.util.List;
*/
public interface CompeteVideoDao extends CompeteCompanyMapper {
List<VideoProjectVo.PeoSignStatu> selectCompanySignStatus(@Param("param") VideoDto.GetTeamSignStatu param);
List<VideoProjectVo.PeoSignStatu> selectCompanySignStatus(@Param("param") VideoDto.GetSignStatus param);
List<VideoProjectVo.CoachSignStatu> selectCoachSignStatus(@Param("param") VideoDto.GetTeamSignStatu param);
List<VideoProjectVo.CoachSignStatu> selectCoachSignStatus(@Param("param") VideoDto.GetSignStatus param);
}

12
mt/src/main/java/com/ccsens/mt/service/CompeteService.java

@ -84,8 +84,6 @@ public class CompeteService implements ICompeteService {
@Resource
private TallFeignClient tallFeignClient;
@Resource
private CommonFileMapper commonFileMapper;
@Resource
private CompeteStartOrderMapper competeStartOrderMapper;
@Resource
private CompeteVarietyScoreMapper competeVarietyScoreMapper;
@ -190,7 +188,6 @@ public class CompeteService implements ICompeteService {
}
/**
* 查看第几届
*/
@ -1145,7 +1142,14 @@ public class CompeteService implements ICompeteService {
List<CompeteProject> competeProjectList = competeProjectMapper.selectByExample(competeProjectExample);
for(CompeteProject competeProject : competeProjectList) {
long projectId = competeProject.getId();
CompeteProjectConfig competeProjectConfig = competeProjectConfigDao.selectStartTime(projectId);
// CompeteProjectConfig competeProjectConfig = competeProjectConfigDao.selectStartTime(projectId);
CompeteProjectConfig competeProjectConfig = null;
CompeteProjectConfigExample projectConfigExample = new CompeteProjectConfigExample();
projectConfigExample.createCriteria().andProjectIdEqualTo(projectId);
List<CompeteProjectConfig> 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());

13
mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java

@ -110,7 +110,7 @@ public class CompeteTaskService implements ICompeteTaskService{
return projectConfigDao.queryProjectConfig(type.get());
}
/**
* 修改配置时生成出场顺序(先删除之前的数据)
* 修改配置时生成出场顺序
*/
public void setStartOrder(CompeteProjectConfig projectConfig, Long tallProjectId) {
if (ObjectUtil.isNotNull(projectConfig)) {
@ -272,7 +272,7 @@ public class CompeteTaskService implements ICompeteTaskService{
* 手机上查看选手出场顺序
*/
@Override
public List<ProvinceCompeteVo.StartOrderByCompany> queryStartOrderByCompany(ProvinceCompeteDto.QueryStartOrderByCompany param) {
public List<ProvinceCompeteVo.StartOrderByCompanyAndProject> queryStartOrderByCompany(ProvinceCompeteDto.QueryStartOrderByCompany param) {
return projectConfigDao.queryStartOrderByCompany(param.getCompanyId(),param.getProjectId(),param.getCompeteTimeId());
}
@ -283,4 +283,13 @@ public class CompeteTaskService implements ICompeteTaskService{
public List<ProvinceCompeteVo.QueryJudgment> queryJudgment(CompeteDto.CompeteTime param) {
return competeJudgmentDao.queryJudgment(param.getCompeteTimeId());
}
/**
* 分配裁判
*/
@Override
public List<ProvinceCompeteVo.QueryJudgment> allocationJudgment(ProvinceCompeteDto.AllocationJudgment param) {
return null;
}
}

7
mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java

@ -68,6 +68,9 @@ public class CompeteVedioService implements ICompeteVedioService{
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();
}
@ -107,7 +110,7 @@ public class CompeteVedioService implements ICompeteVedioService{
* @return
*/
@Override
public List<VideoProjectVo.PeoSignStatu> selectCompanySignStatus(QueryDto<VideoDto.GetTeamSignStatu> params) {
public List<VideoProjectVo.PeoSignStatu> selectCompanySignStatus(QueryDto<VideoDto.GetSignStatus> params) {
return competeVideoDao.selectCompanySignStatus(params.getParam());
}
/**
@ -116,7 +119,7 @@ public class CompeteVedioService implements ICompeteVedioService{
* @return
*/
@Override
public List<VideoProjectVo.CoachSignStatu> selectCoachSignStatus(QueryDto<VideoDto.GetTeamSignStatu> params) {
public List<VideoProjectVo.CoachSignStatu> selectCoachSignStatus(QueryDto<VideoDto.GetSignStatus> params) {
log.info(params.getParam().toString());
return competeVideoDao.selectCoachSignStatus(params.getParam());
}

9
mt/src/main/java/com/ccsens/mt/service/ICompeteTaskService.java

@ -30,7 +30,7 @@ public interface ICompeteTaskService {
* @param param
* @return
*/
List<ProvinceCompeteVo.StartOrderByCompany> queryStartOrderByCompany(ProvinceCompeteDto.QueryStartOrderByCompany param);
List<ProvinceCompeteVo.StartOrderByCompanyAndProject> queryStartOrderByCompany(ProvinceCompeteDto.QueryStartOrderByCompany param);
/**
* 查看所有项目下的裁判分配信息
@ -38,4 +38,11 @@ public interface ICompeteTaskService {
* @return
*/
List<ProvinceCompeteVo.QueryJudgment> queryJudgment(CompeteDto.CompeteTime param);
/**
* 为项目分配裁判
* @param param
* @return
*/
List<ProvinceCompeteVo.QueryJudgment> allocationJudgment(ProvinceCompeteDto.AllocationJudgment param);
}

4
mt/src/main/java/com/ccsens/mt/service/ICompeteVedioService.java

@ -28,7 +28,7 @@ public interface ICompeteVedioService {
List<VideoProjectVo.GetAllCompany> selectAllCompany(QueryDto<VideoDto.GetAllCompany> params);
List<VideoProjectVo.PeoSignStatu> selectCompanySignStatus(QueryDto<VideoDto.GetTeamSignStatu> params);
List<VideoProjectVo.PeoSignStatu> selectCompanySignStatus(QueryDto<VideoDto.GetSignStatus> params);
List<VideoProjectVo.CoachSignStatu> selectCoachSignStatus(QueryDto<VideoDto.GetTeamSignStatu> params);
List<VideoProjectVo.CoachSignStatu> selectCoachSignStatus(QueryDto<VideoDto.GetSignStatus> params);
}

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

@ -18,10 +18,10 @@
<result column="parentProjectName" property="parentProjectName"/>
<result column="type" property="type"/>
<collection property="secondProjects" ofType="com.ccsens.mt.bean.vo.CompeteVo$DepartmentSecondProject">
<id column="id" property="competeProjectId"/>
<result column="name" property="competeProjectName"/>
<result column="team" property="team"/>
</collection>
<id column="id" property="competeProjectId"/>
<result column="name" property="competeProjectName"/>
<result column="team" property="team"/>
</collection>
</resultMap>
<resultMap id="teamNum" type="com.ccsens.mt.bean.vo.TableVo$CompeteAllCount">

42
mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml

@ -12,6 +12,24 @@
<result column="rec_status" jdbcType="TINYINT" property="recStatus" />
<result column="project_duration" jdbcType="BIGINT" property="projectDuration" />
</resultMap>
<resultMap id="startOrderByCompany" type="com.ccsens.mt.bean.vo.ProvinceCompeteVo$StartOrderByCompanyAndProject">
<id column="projectId" property="projectId" />
<result column="projectName" property="projectName" />
<result column="startTime" property="startTime" />
<collection property="startOrderList" ofType="com.ccsens.mt.bean.vo.ProvinceCompeteVo$StartOrder">
<id column="startOrderId" property="startOrderId" />
<result column="competeOrder" property="competeOrder" />
<result column="site" property="site" />
<result column="team" property="team" />
<result column="groupName" property="groupName" />
<result column="videoUrl" property="videoUrl" />
<collection property="playerNameList" ofType="String">
<result column="playerName"/>
</collection>
</collection>
</resultMap>
<select id="selectByProjectId" resultMap="BaseResultMap" parameterType="java.util.Map">
select * from t_compete_project_config
where project_id = #{projectId}
@ -25,7 +43,8 @@
where a.project_id = b.id
</select>
<select id="selectStartTime" resultType="com.ccsens.mt.bean.po.CompeteProjectConfig" parameterType="java.util.Map">
SELECT *
SELECT
project_id
FROM t_compete_project_config
where project_id = #{projectId}
</select>
@ -166,30 +185,34 @@
and p.rec_status = 0
GROUP BY p.id
</select>
<select id="queryStartOrderByCompany" resultType="com.ccsens.mt.bean.vo.ProvinceCompeteVo$StartOrderByCompany">
<select id="queryStartOrderByCompany" resultMap="startOrderByCompany">
SELECT
so.id as startOrderId,
so.compete_order as competeOrder,
so.site as site,
so.start_time as startTime,
so.end_time as endTime,
pc.start_time as startTime,
pr.id as projectId,
pr.`name` as projectName,
pr.`team` as team,
if(pr.team = 0,a.plName,b.plName) as playerName,
if(pr.team = 0,a.groupName,b.groupName) as groupName
if(pr.team = 0,a.groupName,b.groupName) as groupName,
if(pr.team = 0,a.videoUrl,b.videoUrl) as videoUrl
from
t_compete_start_order so
LEFT JOIN t_compete_project pr on so.project_id = pr.id
LEFT JOIN t_compete_time ti on pr.type = ti.type
LEFT JOIN t_compete_project_config pc on pc.project_id = pr.id
LEFT JOIN
(
SELECT
pp.id as ppId,
pl.`name` as plName,
g.group_name as groupName
g.group_name as groupName,
v.video_url as videoUrl
FROM
t_compete_project_player pp LEFT JOIN t_compete_player pl on pp.player_id = pl.id
LEFT JOIN t_compete_group g on g.id = pl.compete_group_id
LEFT JOIN t_compete_video v on pp.id = v.player_id
WHERE
pl.company_id = #{companyId}
and pp.rec_status = 0
@ -199,18 +222,19 @@
(
SELECT
t.id as teamId,
GROUP_CONCAT(pl.`name` separator '、') as plName,
g.group_name as groupName
pl.`name` as plName,
g.group_name as groupName,
v.video_url as videoUrl
FROM
t_compete_team t LEFT JOIN t_compete_team_member m on t.id = m.compete_team_id
LEFT JOIN t_compete_player pl on m.player_id = pl.id
LEFT JOIN t_compete_group g on t.group_remark = g.group_remark and t.gender_group = g.sex
LEFT JOIN t_compete_video v on t.id = v.player_id
WHERE
t.company_id = #{companyId}
and t.rec_status = 0
and m.rec_status = 0
and pl.rec_status = 0
GROUP BY t.id
)b on b.teamId = so.player_id
WHERE
<if test="projectId != null">

4
mt/src/main/resources/mapper_dao/CompeteVideoDao.xml

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ccsens.mt.persist.dao.CompeteVideoDao">
<select id="selectCompanySignStatus" parameterType="com.ccsens.mt.bean.dto.VideoDto$GetTeamSignStatu" resultType="com.ccsens.mt.bean.vo.VideoProjectVo$PeoSignStatu">
<select id="selectCompanySignStatus" parameterType="com.ccsens.mt.bean.dto.VideoDto$GetSignStatus" resultType="com.ccsens.mt.bean.vo.VideoProjectVo$PeoSignStatu">
select
tcc.name as name,
tcc.`contacts_phone` as phone,
@ -29,7 +29,7 @@
and tcc.`rec_status`=0
and tct.`rec_status`=0
</select>
<select id="selectCoachSignStatus" parameterType="com.ccsens.mt.bean.dto.VideoDto$GetTeamSignStatu" resultType="com.ccsens.mt.bean.vo.VideoProjectVo$CoachSignStatu" >
<select id="selectCoachSignStatus" parameterType="com.ccsens.mt.bean.dto.VideoDto$GetSignStatus" resultType="com.ccsens.mt.bean.vo.VideoProjectVo$CoachSignStatu" >
select
tcj.`name` as `name`,
tcj.`phone` as `phone`,

Loading…
Cancel
Save