20201112合并冲突

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

@@ -1,14 +1,91 @@
 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("/vedio")
 @Slf4j
 public class CompeteVedioController {
 
+    @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<VideoDto.Vdeo> 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);
+        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<VideoDto.UploadVdeo> 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 selectUserStatus(@ApiParam @Validated @RequestBody QueryDto<VideoDto.UploadVdeo> params) {
+        //这个没写完了
+
+        log.info("添加用户观看开幕式视频记录（签到用）",params);
+
+        return JsonResponse.newInstance().ok();
+    }
+
+    @MustLogin
+    @ApiOperation(value = "查看所有二级比赛项目", notes = "Mr.王---------去那个competeProject表下面查")
+    @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);
+        List<VideoProjectVo.GetTwoProject> 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<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);
+
+    }
+
+
 }

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

@@ -108,7 +108,7 @@ public class ExcelController {
     @MustLogin
     @ApiOperation(value = "xxx大赛报名表（查询）", notes = "")
     @RequestMapping(value = "/enterInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<TableVo.CompeteJoin> getEnterInfo(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteTime> params) {
+    public JsonResponse<TableVo.CompeteJoin> getEnterInfo(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.EnterInfo> params) {
         log.info("日程安排更新：{}",params);
         List<TableVo.CompeteJoin> competeJoinList = excelService.getCompeteJoinDetail(params.getParam());
         return JsonResponse.newInstance().ok(competeJoinList);

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

@@ -305,4 +305,25 @@ public class CompeteDto {
         @ApiModelProperty("")
         private String fileBase64;
     }
+
+
+    @Data
+    @ApiModel
+    public static class EnterInfo{
+        @NotNull
+        @ApiModelProperty("第几届信息的id")
+        private Long competeTimeId;
+        @ApiModelProperty("项目id")
+        private Long projectId;
+        @ApiModelProperty("组别id")
+        private Long groupId;
+        @ApiModelProperty("团队id")
+        private Long companyId;
+        @ApiModelProperty("姓名")
+        private String name;
+        @ApiModelProperty("身份证号")
+        private String idCard;
+    }
+
+
 }

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

@@ -39,4 +39,37 @@ public class VideoDto {
         @ApiModelProperty("视频文件浏览路径")
         private String videoFileUrl;
     }
+    @Data
+    @ApiModel("添加用户观看开幕式视频记录（签到用）")
+    public static class Vdeo{
+        @ApiModelProperty("视频文件id")
+        private Long companyId;
+    }
+    @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;
+    }
 }

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

@@ -32,8 +32,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("学籍证明/俱乐部证明")

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

@@ -0,0 +1,30 @@
+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;
+
+@Data
+public class VideoProjectVo {
+
+    @Data
+    @ApiModel("查看所有二级比赛项目")
+    public static class GetTwoProject{
+        @ApiModelProperty("项目id")
+        private Long projectId;
+        @ApiModelProperty("项目名")
+        private String projectName;
+    }
+    @Data
+    @ApiModel("查找所有参赛单位")
+    public static class GetAllCompany{
+        @ApiModelProperty("参赛单位id")
+        private Long companyId;
+        @ApiModelProperty("返回参赛单位名称")
+        private String companyName;
+    }
+
+
+}

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

@@ -16,4 +16,6 @@ import java.util.List;
 public interface CompeteProjectConfigDao extends CompeteProjectConfigMapper {
     CompeteProjectConfig selectByProjectId(@Param("projectId") Long projectId);
     List<TableVo.SchedulePlanDetail> selectDetail ();
+    List<TableVo.CompeteJoin> selectSingle (@Param("competeTimeId") Long competeTimeId,@Param("projectId") Long projectId,@Param("groupId") Long groupId,@Param("companyId") Long companyId,@Param("name") String name,@Param("idCard") String idCard);
+    List<TableVo.CompeteJoin> selectGroup (@Param("competeTimeId") Long competeTimeId,@Param("projectId") Long projectId,@Param("groupId") Long groupId,@Param("companyId") Long companyId,@Param("name") String name,@Param("idCard") String idCard);
 }

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

@@ -0,0 +1,102 @@
+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.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;
+
+
+    @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<CompetePlayerLook> 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());
+        competeVideoMapper.insert(competeVideo);
+        return param.getVideoPath();
+    }
+
+    @Override
+    public List<VideoProjectVo.GetTwoProject> selectTwoProject(QueryDto<VideoDto.GetTwoProject> params) {
+        CompeteProjectExample competeCompanyExample=new CompeteProjectExample();
+        competeCompanyExample.createCriteria().andCompeteTimeIdEqualTo(params.getParam().getTeamId()).andLevelEqualTo((byte) 2);
+        List<CompeteProject> list=competeProjectMapper.selectByExample(competeCompanyExample);
+        List<VideoProjectVo.GetTwoProject> list1=new ArrayList<>();
+        list.forEach(mes->{
+            VideoProjectVo.GetTwoProject getTwoProject=new VideoProjectVo.GetTwoProject();
+            getTwoProject.setProjectId(mes.getId());
+            getTwoProject.setProjectName(mes.getName());
+            list1.add(getTwoProject);
+        });
+        return list1;
+    }
+
+    @Override
+    public List<VideoProjectVo.GetAllCompany> selectAllCompany(QueryDto<VideoDto.GetAllCompany> params) {
+        CompeteCompanyExample competeCompanyExample=new CompeteCompanyExample();
+        competeCompanyExample.createCriteria().andCompeteTimeIdEqualTo(params.getParam().getTeamId());
+        List<CompeteCompany> list= competeCompanyMapper.selectByExample(competeCompanyExample);
+        List<VideoProjectVo.GetAllCompany> 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;
+    }
+}

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

@@ -1,4 +1,5 @@
 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;
@@ -997,7 +998,12 @@ public class ExcelService implements IExcelService {
                     //单项时间
                     dailyScheduleProcess.setSingleTime(competeProjectConfig.getProjectDuration());
                     //场地
-                    dailyScheduleProcess.setSiteNum(competeProjectConfig.getSiteNum());
+                    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);
@@ -1028,7 +1034,12 @@ public class ExcelService implements IExcelService {
                     //单项时间
                     dailyScheduleProcess.setSingleTime(competeProjectConfig.getProjectDuration());
                     //场地
-                    dailyScheduleProcess.setSiteNum(competeProjectConfig.getSiteNum());
+                    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);
@@ -1080,7 +1091,12 @@ public class ExcelService implements IExcelService {
             if (ObjectUtil.isNotNull(competeProjectConfig1)) {
                 dailyScheduleProcess.setSingleTime(competeProjectConfig1.getProjectDuration());
                 //场地
-                dailyScheduleProcess.setSiteNum(competeProjectConfig1.getSiteNum());
+                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);
@@ -1100,156 +1116,178 @@ public class ExcelService implements IExcelService {
 
 
     @Override
-    public List<TableVo.CompeteJoin> getCompeteJoinDetail(CompeteDto.CompeteTime params) {
+    public List<TableVo.CompeteJoin> getCompeteJoinDetail(CompeteDto.EnterInfo params) {
           List<TableVo.CompeteJoin> competeJoinList = new ArrayList<>();
-        Long competeTimeId = params.getCompeteTimeId();
-        CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(competeTimeId);
-        int type = competeTime.getType();
-        Byte level = 2;
-        CompeteProjectExample competeProjectExample = new CompeteProjectExample();
-        competeProjectExample.createCriteria().andTypeEqualTo((byte) type).andLevelEqualTo(level);
-        //获取参赛项目集合
-        List<CompeteProject> 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<CompeteProjectPlayer> competeProjectPlayerList = competeProjectPlayerMapper.selectByExample(competeProjectPlayerExample);
-                for (CompeteProjectPlayer competeProjectPlayer : competeProjectPlayerList) {
-                    //查询每个报名人的详细信息下
-                    CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(competeProjectPlayer.getPlayerId());
-                    TableVo.CompeteJoin competeJoin = new TableVo.CompeteJoin();
-                    //项目id
-                    competeJoin.setProjectId(competeProject.getId());
-                    //姓名
-                    competeJoin.setName(competePlayer.getName());
-                    //身份证号
-                    competeJoin.setIdCard(competePlayer.getIdCard());
-                    //根据身份证获取选手年龄并赋值
+          //个人项目查询
+          List<TableVo.CompeteJoin> competeJoinList1 = competeProjectConfigDao.selectSingle(params.getCompeteTimeId(),params.getProjectId(),params.getGroupId(),params.getCompanyId(),params.getName(),params.getIdCard());
+          for (TableVo.CompeteJoin competeJoin : competeJoinList1){
+              //获取身份证
               String idCard = competeJoin.getIdCard();
+              //根据身份证获取选手年龄并赋值
               int ageByIdCard = IdcardUtil.getAgeByIdCard(idCard);
               competeJoin.setAge(ageByIdCard);
-                    Byte gender = competePlayer.getGender();
-                    if (gender == 0) {
-                        competeJoin.setGender("女");
-                    } else {
-                        competeJoin.setGender("男");
-                    }
-                    //查询单位,并赋值
-                    CompeteCompany competeCompany = competeCompanyMapper.selectByPrimaryKey(competePlayer.getCompanyId());
-                    if (ObjectUtil.isNotNull(competeCompany)) {
-                        competeJoin.setJoinTeam(competeCompany.getName());
-                    }
-                    //查询组别，并赋值
-                    CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(competePlayer.getCompeteGroupId());
-                    if (ObjectUtil.isNotNull(competeGroup)) {
-                        competeJoin.setCompeteGroup(competePlayer.getName());
-                    }
-                    //身份证明查询，并赋值
-                    CommonFile commonFile = commonFileMapper.selectByPrimaryKey(competePlayer.getIdCardFrontFile());
-                    if (ObjectUtil.isNotNull(commonFile)) {
-                        competeJoin.setIdCardPromise(commonFile.getVisitLocation());
-                    }
-                    //一寸证件照查询赋值
-                    CommonFile commonFile1 = commonFileMapper.selectByPrimaryKey(competePlayer.getIdPhotoFile());
-                    if (ObjectUtil.isNotNull(commonFile1)) {
-                        competeJoin.setPicture(commonFile1.getVisitLocation());
-                    }
-                    //学籍证明/俱乐部证明
-                    CommonFile commonFile2 = commonFileMapper.selectByPrimaryKey(competePlayer.getStudentRecordFile());
-                    if (ObjectUtil.isNotNull(commonFile2)) {
-                        competeJoin.setStudentPromise(commonFile2.getVisitLocation());
-                    }
-                    //体检证明
-                    CommonFile commonFile3 = commonFileMapper.selectByPrimaryKey(competePlayer.getHealthRecordFile());
-                    if (ObjectUtil.isNotNull(commonFile3)) {
-                        competeJoin.setBodyTest(commonFile3.getVisitLocation());
-                    }
-                    //人身意外伤害保险证明
-                    CommonFile commonFile4 = commonFileMapper.selectByPrimaryKey(competePlayer.getInsuranceRecordFile());
-                    if (ObjectUtil.isNotNull(commonFile4)) {
-                        competeJoin.setBodyProtect(commonFile4.getVisitLocation());
-                    }
-                    //参赛项目名赋值
-                    competeJoin.setCompeteProject(projectName);
               competeJoinList.add(competeJoin);
           }
-
-            } else { //团队项目
-                //获取参赛队伍集合
-                CompeteTeamExample competeTeamExample = new CompeteTeamExample();
-                competeTeamExample.createCriteria().andProjectIdEqualTo(competeProject.getId());
-                List<CompeteTeam> competeTeamList = competeTeamDao.selectByExample(competeTeamExample);
-                for (CompeteTeam competeTeam : competeTeamList) {
-                    //获取队伍下的成员集合
-                    CompeteTeamMemberExample competeTeamMemberExample = new CompeteTeamMemberExample();
-                    competeTeamMemberExample.createCriteria().andCompeteTeamIdEqualTo(competeTeam.getId());
-                    List<CompeteTeamMember> competeTeamMemberList = competeTeamMemberMapper.selectByExample(competeTeamMemberExample);
-                    for (CompeteTeamMember competeTeamMember : competeTeamMemberList) {
-                        //查询成员详细信息
-                        CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(competeTeamMember.getPlayerId());
-                        TableVo.CompeteJoin competeJoin = new TableVo.CompeteJoin();
-                        //项目id
-                        competeJoin.setProjectId(competeProject.getId());
-                        //姓名
-                        competeJoin.setName(competePlayer.getName());
-                        //身份证号
-                        competeJoin.setIdCard(competePlayer.getIdCard());
-                        //根据身份证获取选手年龄并赋值
+          //团队项目查询
+          List<TableVo.CompeteJoin> competeJoinList2 = competeProjectConfigDao.selectGroup(params.getCompeteTimeId(),params.getProjectId(),params.getGroupId(),params.getCompanyId(),params.getName(),params.getIdCard());
+          for (TableVo.CompeteJoin competeJoin : competeJoinList2){
+              //获取身份证
               String idCard = competeJoin.getIdCard();
+              //根据身份证获取选手年龄并赋值
               int ageByIdCard = IdcardUtil.getAgeByIdCard(idCard);
               competeJoin.setAge(ageByIdCard);
-                        //性别
-                        Byte gender = competePlayer.getGender();
-                        if (gender == 0) {
-                            competeJoin.setGender("女");
-                        } else {
-                            competeJoin.setGender("男");
-                        }
-                        //查询单位,并赋值
-                        CompeteCompany competeCompany = competeCompanyMapper.selectByPrimaryKey(competePlayer.getCompanyId());
-                        if (ObjectUtil.isNotNull(competeCompany)) {
-                            competeJoin.setJoinTeam(competeCompany.getName());
-                        }
-                        //查询组别，并赋值
-                        CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(competePlayer.getCompeteGroupId());
-                        if (ObjectUtil.isNotNull(competeGroup)) {
-                            competeJoin.setCompeteGroup(competePlayer.getName());
-                        }
-                        //身份证明查询，并赋值
-                        CommonFile commonFile = commonFileMapper.selectByPrimaryKey(competePlayer.getIdCardFrontFile());
-                        if (ObjectUtil.isNotNull(commonFile)){
-                            competeJoin.setIdCardPromise(commonFile.getVisitLocation());
-                        }
-                        //一寸证件照查询赋值
-                        CommonFile commonFile1 = commonFileMapper.selectByPrimaryKey(competePlayer.getIdPhotoFile());
-                        if (ObjectUtil.isNotNull(commonFile1)){
-                            competeJoin.setPicture(commonFile1.getVisitLocation());
-                        }
-                        //学籍证明/俱乐部证明
-                        CommonFile commonFile2 = commonFileMapper.selectByPrimaryKey(competePlayer.getStudentRecordFile());
-                        if (ObjectUtil.isNotNull(commonFile2)){
-                            competeJoin.setStudentPromise(commonFile2.getVisitLocation());
-                        }
-                        //体检证明
-                        CommonFile commonFile3 = commonFileMapper.selectByPrimaryKey(competePlayer.getHealthRecordFile());
-                        if (ObjectUtil.isNotNull(commonFile3)){
-                            competeJoin.setBodyTest(commonFile3.getVisitLocation());
-                        }
-                        //人身意外伤害保险证明
-                        CommonFile commonFile4 = commonFileMapper.selectByPrimaryKey(competePlayer.getInsuranceRecordFile());
-                        if (ObjectUtil.isNotNull(commonFile4)){
-                            competeJoin.setBodyProtect(commonFile4.getVisitLocation());
-                        }
-                        //参赛项目名赋值
-                        competeJoin.setCompeteProject(projectName);
               competeJoinList.add(competeJoin);
           }
-                }
-            }
-        }
+//        Long competeTimeId = params.getCompeteTimeId();
+//        CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(competeTimeId);
+//        int type = competeTime.getType();
+//        Byte level = 2;
+//        CompeteProjectExample competeProjectExample = new CompeteProjectExample();
+//        competeProjectExample.createCriteria().andTypeEqualTo((byte) type).andLevelEqualTo(level);
+//        //获取参赛项目集合
+//        List<CompeteProject> 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<CompeteProjectPlayer> competeProjectPlayerList = competeProjectPlayerMapper.selectByExample(competeProjectPlayerExample);
+//                for (CompeteProjectPlayer competeProjectPlayer : competeProjectPlayerList) {
+//                    //查询每个报名人的详细信息下
+//                    CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(competeProjectPlayer.getPlayerId());
+//                    TableVo.CompeteJoin competeJoin = new TableVo.CompeteJoin();
+//                    //项目id
+//                    competeJoin.setProjectId(competeProject.getId());
+//                    //姓名
+//                    competeJoin.setName(competePlayer.getName());
+//                    //身份证号
+//                    competeJoin.setIdCard(competePlayer.getIdCard());
+//                    //根据身份证获取选手年龄并赋值
+//                    String idCard = competeJoin.getIdCard();
+//                    int ageByIdCard = IdcardUtil.getAgeByIdCard(idCard);
+//                    competeJoin.setAge(ageByIdCard);
+//                    Byte gender = competePlayer.getGender();
+//                    if (gender == 0) {
+//                        competeJoin.setGender("女");
+//                    } else {
+//                        competeJoin.setGender("男");
+//                    }
+//                    //查询单位,并赋值
+//                    CompeteCompany competeCompany = competeCompanyMapper.selectByPrimaryKey(competePlayer.getCompanyId());
+//                    if (ObjectUtil.isNotNull(competeCompany)) {
+//                        competeJoin.setJoinTeam(competeCompany.getName());
+//                    }
+//                    //查询组别，并赋值
+//                    CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(competePlayer.getCompeteGroupId());
+//                    if (ObjectUtil.isNotNull(competeGroup)) {
+//                        competeJoin.setCompeteGroup(competePlayer.getName());
+//                    }
+//                    //身份证明查询，并赋值
+//                    CommonFile commonFile = commonFileMapper.selectByPrimaryKey(competePlayer.getIdCardFrontFile());
+//                    if (ObjectUtil.isNotNull(commonFile)) {
+//                        competeJoin.setIdCardPromise(commonFile.getVisitLocation());
+//                    }
+//                    //一寸证件照查询赋值
+//                    CommonFile commonFile1 = commonFileMapper.selectByPrimaryKey(competePlayer.getIdPhotoFile());
+//                    if (ObjectUtil.isNotNull(commonFile1)) {
+//                        competeJoin.setPicture(commonFile1.getVisitLocation());
+//                    }
+//                    //学籍证明/俱乐部证明
+//                    CommonFile commonFile2 = commonFileMapper.selectByPrimaryKey(competePlayer.getStudentRecordFile());
+//                    if (ObjectUtil.isNotNull(commonFile2)) {
+//                        competeJoin.setStudentPromise(commonFile2.getVisitLocation());
+//                    }
+//                    //体检证明
+//                    CommonFile commonFile3 = commonFileMapper.selectByPrimaryKey(competePlayer.getHealthRecordFile());
+//                    if (ObjectUtil.isNotNull(commonFile3)) {
+//                        competeJoin.setBodyTest(commonFile3.getVisitLocation());
+//                    }
+//                    //人身意外伤害保险证明
+//                    CommonFile commonFile4 = commonFileMapper.selectByPrimaryKey(competePlayer.getInsuranceRecordFile());
+//                    if (ObjectUtil.isNotNull(commonFile4)) {
+//                        competeJoin.setBodyProtect(commonFile4.getVisitLocation());
+//                    }
+//                    //参赛项目名赋值
+//                    competeJoin.setCompeteProject(projectName);
+//                    competeJoinList.add(competeJoin);
+//                }
+//
+//            } else { //团队项目
+//                //获取参赛队伍集合
+//                CompeteTeamExample competeTeamExample = new CompeteTeamExample();
+//                competeTeamExample.createCriteria().andProjectIdEqualTo(competeProject.getId());
+//                List<CompeteTeam> competeTeamList = competeTeamDao.selectByExample(competeTeamExample);
+//                for (CompeteTeam competeTeam : competeTeamList) {
+//                    //获取队伍下的成员集合
+//                    CompeteTeamMemberExample competeTeamMemberExample = new CompeteTeamMemberExample();
+//                    competeTeamMemberExample.createCriteria().andCompeteTeamIdEqualTo(competeTeam.getId());
+//                    List<CompeteTeamMember> competeTeamMemberList = competeTeamMemberMapper.selectByExample(competeTeamMemberExample);
+//                    for (CompeteTeamMember competeTeamMember : competeTeamMemberList) {
+//                        //查询成员详细信息
+//                        CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(competeTeamMember.getPlayerId());
+//                        TableVo.CompeteJoin competeJoin = new TableVo.CompeteJoin();
+//                        //项目id
+//                        competeJoin.setProjectId(competeProject.getId());
+//                        //姓名
+//                        competeJoin.setName(competePlayer.getName());
+//                        //身份证号
+//                        competeJoin.setIdCard(competePlayer.getIdCard());
+//                        //根据身份证获取选手年龄并赋值
+//                        String idCard = competeJoin.getIdCard();
+//                        int ageByIdCard = IdcardUtil.getAgeByIdCard(idCard);
+//                        competeJoin.setAge(ageByIdCard);
+//                        //性别
+//                        Byte gender = competePlayer.getGender();
+//                        if (gender == 0) {
+//                            competeJoin.setGender("女");
+//                        } else {
+//                            competeJoin.setGender("男");
+//                        }
+//                        //查询单位,并赋值
+//                        CompeteCompany competeCompany = competeCompanyMapper.selectByPrimaryKey(competePlayer.getCompanyId());
+//                        if (ObjectUtil.isNotNull(competeCompany)) {
+//                            competeJoin.setJoinTeam(competeCompany.getName());
+//                        }
+//                        //查询组别，并赋值
+//                        CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(competePlayer.getCompeteGroupId());
+//                        if (ObjectUtil.isNotNull(competeGroup)) {
+//                            competeJoin.setCompeteGroup(competePlayer.getName());
+//                        }
+//                        //身份证明查询，并赋值
+//                        CommonFile commonFile = commonFileMapper.selectByPrimaryKey(competePlayer.getIdCardFrontFile());
+//                        if (ObjectUtil.isNotNull(commonFile)){
+//                            competeJoin.setIdCardPromise(commonFile.getVisitLocation());
+//                        }
+//                        //一寸证件照查询赋值
+//                        CommonFile commonFile1 = commonFileMapper.selectByPrimaryKey(competePlayer.getIdPhotoFile());
+//                        if (ObjectUtil.isNotNull(commonFile1)){
+//                            competeJoin.setPicture(commonFile1.getVisitLocation());
+//                        }
+//                        //学籍证明/俱乐部证明
+//                        CommonFile commonFile2 = commonFileMapper.selectByPrimaryKey(competePlayer.getStudentRecordFile());
+//                        if (ObjectUtil.isNotNull(commonFile2)){
+//                            competeJoin.setStudentPromise(commonFile2.getVisitLocation());
+//                        }
+//                        //体检证明
+//                        CommonFile commonFile3 = commonFileMapper.selectByPrimaryKey(competePlayer.getHealthRecordFile());
+//                        if (ObjectUtil.isNotNull(commonFile3)){
+//                            competeJoin.setBodyTest(commonFile3.getVisitLocation());
+//                        }
+//                        //人身意外伤害保险证明
+//                        CommonFile commonFile4 = commonFileMapper.selectByPrimaryKey(competePlayer.getInsuranceRecordFile());
+//                        if (ObjectUtil.isNotNull(commonFile4)){
+//                            competeJoin.setBodyProtect(commonFile4.getVisitLocation());
+//                        }
+//                        //参赛项目名赋值
+//                        competeJoin.setCompeteProject(projectName);
+//                        competeJoinList.add(competeJoin);
+//                    }
+//                }
+//            }
+//        }
+//        return competeJoinList;
+
         return  competeJoinList;
     }
 
@@ -1258,8 +1296,10 @@ public class ExcelService implements IExcelService {
         List<TableVo.SchedulePlanDetailAllIn> schedulePlanDetailListUp = new ArrayList<>();
         List<TableVo.SchedulePlanDetailAllIn> schedulePlanDetailListDown = new ArrayList<>();
         //关联查询项目名，该项目在config和project中都存在
-        List <TableVo.SchedulePlanDetail> schedulePlanDetailList  = competeProjectConfigDao.selectDetail();
-        for (TableVo.SchedulePlanDetail schedulePlanDetail : schedulePlanDetailList){
+        List<TableVo.SchedulePlanDetail> schedulePlanDetailList = competeProjectConfigDao.selectDetail();
+        TableVo.SchedulePlan schedulePlan = new TableVo.SchedulePlan();
+        if (CollectionUtil.isNotEmpty(schedulePlanDetailList)) {
+            for (TableVo.SchedulePlanDetail schedulePlanDetail : schedulePlanDetailList) {
                 //项目名
                 String projectName = schedulePlanDetail.getProjectName();
                 //开始时间yyyy-MM-dd HH:mm:ss
@@ -1273,30 +1313,29 @@ public class ExcelService implements IExcelService {
                 SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("HH:mm");
                 String em = simpleDateFormat1.format(date1);
                 //拼接
-            String string =  projectName + "("+ sm +"-"+ em + ")";
+                String string = projectName + "(" + sm + "-" + em + ")";
                 //项目开始日期
                 SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("MM-dd");
                 String md = simpleDateFormat2.format(date);
                 //上午项目
-            if (Integer.parseInt(sm.substring(0,2)) >= 6 && Integer.parseInt(sm.substring(0,2)) <= 12){
+                if (Integer.parseInt(sm.substring(0, 2)) >= 6 && Integer.parseInt(sm.substring(0, 2)) <= 12) {
                     TableVo.SchedulePlanDetailAllIn schedulePlanDetailAllIn = new TableVo.SchedulePlanDetailAllIn();
                     schedulePlanDetailAllIn.setData(md);
                     schedulePlanDetailAllIn.setString(string);
                     schedulePlanDetailListUp.add(schedulePlanDetailAllIn);
                 }//下午项目
-            else if (Integer.parseInt(sm.substring(0,2)) > 12 && Integer.parseInt(sm.substring(0,2)) <= 18){
+                else if (Integer.parseInt(sm.substring(0, 2)) > 12 && Integer.parseInt(sm.substring(0, 2)) <= 18) {
                     TableVo.SchedulePlanDetailAllIn schedulePlanDetailAllIn1 = new TableVo.SchedulePlanDetailAllIn();
                     schedulePlanDetailAllIn1.setData(md);
                     schedulePlanDetailAllIn1.setString(string);
                     schedulePlanDetailListDown.add(schedulePlanDetailAllIn1);
                 }
             }
-        TableVo.SchedulePlan schedulePlan = new TableVo.SchedulePlan();
+
             schedulePlan.setSchedulePlanDetailListDown(schedulePlanDetailListDown);
             schedulePlan.setSchedulePlanDetailListUp(schedulePlanDetailListUp);
+        }
         return schedulePlan;
     }
-
-
 }
 

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

@@ -0,0 +1,30 @@
+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<VideoProjectVo.GetTwoProject> selectTwoProject(QueryDto<VideoDto.GetTwoProject> params);
+
+    List<VideoProjectVo.GetAllCompany> selectAllCompany(QueryDto<VideoDto.GetAllCompany> params);
+}

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

@@ -42,7 +42,7 @@ public interface IExcelService {
      * @param  params 大赛id
      * @return 返回失败的信息
      */
-    List<TableVo.CompeteJoin> getCompeteJoinDetail(CompeteDto.CompeteTime params);
+    List<TableVo.CompeteJoin> getCompeteJoinDetail(CompeteDto.EnterInfo params);
 
 
     /**

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

mt/src/main/resources/application.yml

@@ -2,3 +2,4 @@ spring:
   profiles:
     active: test
     include: common, util-test
+

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

@@ -24,4 +24,101 @@
     FROM  t_compete_project_config a , t_compete_project b
     where a.project_id = b.id
   </select>
+  <select id="selectSingle" resultType="com.ccsens.mt.bean.vo.TableVo$CompeteJoin" parameterType="java.util.Map">
+    SELECT
+    tcpro.id as projectId,
+    tcpro.name as competeProject,
+    tcg.group_name as competeGroup,
+    tcc.`name` as joinTeam,
+    tcp.`name` as name,
+    tcp.gender as gender,
+    tcp.id_card as idCard,
+    (SELECT visit_location from t_common_file where tcp.id_card_front_file = id ) as idCardPromiseFront,
+    (SELECT visit_location from t_common_file where tcp.id_card_back_file = id ) as idCardPromiseBack,
+    (SELECT visit_location from t_common_file where tcp.id_photo_file = id ) as picture,
+    (SELECT visit_location from t_common_file where tcp.student_record_file = id ) as studentPromise,
+    (SELECT visit_location from t_common_file where tcp.health_record_file = id ) as bodyTest,
+    (SELECT visit_location from t_common_file where tcp.insurance_record_file = id ) as bodyProtect
+    from
+    t_compete_project tcpro LEFT JOIN t_compete_project_player tcpp on tcpro.id = tcpp.project_id
+    LEFT JOIN t_compete_player tcp on tcpp.player_id = tcp.id
+    LEFT JOIN t_compete_group tcg on tcg.id = tcp.compete_group_id
+    LEFT JOIN t_compete_company tcc on tcc.id = tcp.company_id
+    LEFT JOIN t_compete_time tct on tct.type = tcpro.type
+    where
+    <if test="competeTimeId != null">
+       tct.id = #{competeTimeId}
+    </if>
+    <if test="projectId != null">
+      and tcpro.id = #{projectId}
+    </if>
+    <if test="groupId != null">
+      and tcg.id = #{groupId}
+    </if>
+    <if test="companyId != null">
+      and tcc.id = #{companyId}
+    </if>
+    <if test="name != null and name != ''">
+      and tcp.name = #{name}
+    </if>
+    <if test="idCard != null and idCard != ''">
+      and tcp.id_card = #{idCard}
+    </if>
+    and tcp.rec_status = 0
+    and tcc.rec_status = 0
+    and tcpp.rec_status = 0
+    and tcpro.rec_status = 0
+    and tct.rec_status = 0
+  </select>
+  <select id="selectGroup" resultType="com.ccsens.mt.bean.vo.TableVo$CompeteJoin" parameterType="java.util.Map">
+    SELECT
+    tcpro.id as projectId,
+    tcpro.name as competeProject,
+    tcg.group_name as competeGroup,
+    tcc.`name` as joinTeam,
+    tcp.`name` as name,
+    tcp.gender as gender,
+    tcp.id_card as idCard,
+    (SELECT visit_location from t_common_file where tcp.id_card_front_file = id ) as idCardPromiseFront,
+    (SELECT visit_location from t_common_file where tcp.id_card_back_file = id ) as idCardPromiseBack,
+    (SELECT visit_location from t_common_file where tcp.id_photo_file = id ) as picture,
+    (SELECT visit_location from t_common_file where tcp.student_record_file = id ) as studentPromise,
+    (SELECT visit_location from t_common_file where tcp.health_record_file = id ) as bodyTest,
+    (SELECT visit_location from t_common_file where tcp.insurance_record_file = id ) as bodyProtect
+    from
+    t_compete_project tcpro LEFT JOIN t_compete_team tct on tcpro.id = tct.project_id
+    LEFT JOIN t_compete_team_member tctm on tct.id = tctm.compete_team_id
+    LEFT JOIN t_compete_player tcp on tcp.id = tctm.player_id
+    LEFT JOIN t_compete_company tcc on tcc.id = tcp.company_id
+    LEFT JOIN t_compete_group tcg on tcg.id = tcp.compete_group_id
+    LEFT JOIN t_compete_time tctt on tctt.type = tcpro.type
+    WHERE
+    <if test="competeTimeId != null">
+      tctt.id = #{competeTimeId}
+    </if>
+    <if test="projectId != null">
+      and tcpro.id = #{projectId}
+    </if>
+    <if test="groupId != null">
+      and tcg.id = #{groupId}
+    </if>
+    <if test="companyId != null">
+      and tcc.id = #{companyId}
+    </if>
+    <if test="name != null and name != ''">
+      and tcp.name = #{name}
+    </if>
+    <if test="idCard != null and idCard != ''">
+      and tcp.id_card = #{idCard}
+    </if>
+    and tcpro.rec_status = 0
+    and tctm.rec_status = 0
+    and tcp.rec_status = 0
+    and tcc.rec_status = 0
+    and tcg.rec_status = 0
+    and tct.rec_status = 0
+    and tctt.rec_status = 0
+  </select>
+
+
 </mapper>

tall/src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 7030
+  port: 7070
   servlet:
     context-path: /v1.0
 spring: