Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

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<CompeteVo.CompanyId> getUserCompanyId(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.GetUserCompany> 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);
+    }
+}

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

@@ -33,6 +33,8 @@ public class CompeteScoreController {
     @Resource
     private ICompeteService competeService;
 
+
+
     @MustLogin
     @ApiOperation(value = "查询比赛项目上的参赛选手列表", notes = "")
     @RequestMapping(value = "/get/playerList", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
@@ -50,6 +52,14 @@ public class CompeteScoreController {
         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<CompeteVo.SelScropeVo>  selSubmitOrderList(@ApiParam @Validated @RequestBody QueryDto<ScoreDto.SelScrop > 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"})
@@ -115,4 +125,6 @@ public class CompeteScoreController {
         List<CompeteVo.SpeedPass> speedPassList = competeService.speedPass(params.getParam());
         return JsonResponse.newInstance().ok(speedPassList);
     }
+
+
 }

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

@@ -14,6 +14,7 @@ import java.util.List;
  */
 @Data
 public class CompeteDto {
+
     @Data
     @ApiModel
     public static class CompeteType{
@@ -379,5 +380,21 @@ public class CompeteDto {
         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;
+    }
 }

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

@@ -104,6 +104,12 @@ public class ScoreDto {
         @ApiModelProperty("裁判id")
         private Long judgmentId;
         @NotNull
+        @ApiModelProperty("备注")
+        private String remark;
+        @NotNull
+        @ApiModelProperty("裁判是否选择了弃权还是啥的")
+        private Byte waiver;
+        @NotNull
         @ApiModelProperty("计分项目")
         private List<Fraction> fractionsList;
 
@@ -124,7 +130,22 @@ public class ScoreDto {
         @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;
+    }
 
 
 }

mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrder.java

@@ -28,6 +28,10 @@ public class CompeteStartOrder implements Serializable {
 
     private Long endTime;
 
+    private String remark;
+
+    private Byte waiver;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -126,6 +130,22 @@ public class CompeteStartOrder implements Serializable {
         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();
@@ -144,6 +164,8 @@ public class CompeteStartOrder implements Serializable {
         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();
     }

mt/src/main/java/com/ccsens/mt/bean/po/CompeteStartOrderExample.java

@@ -824,6 +824,136 @@ public class CompeteStartOrderExample {
             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<String> values) {
+            addCriterion("remark in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotIn(List<String> 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<Byte> values) {
+            addCriterion("waiver in", values, "waiver");
+            return (Criteria) this;
+        }
+
+        public Criteria andWaiverNotIn(List<Byte> 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 {

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;
@@ -491,9 +492,48 @@ public class CompeteVo {
         public BigDecimal referee0 = new BigDecimal(0);
         @ApiModelProperty("最后得分")
         public BigDecimal result = new BigDecimal(0);
-//        @ApiModelProperty("排名")
-//        public int order;
+        @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<ScropList> scoreList;
     }
+    @Data
+    @ApiModel
+    public static class ScropList{
+        @ApiModelProperty("code")
+        private String code;
+        @ApiModelProperty("分数")
+        private BigDecimal  score;
+
+    }
+
     @Data
     @ApiModel("项目，开始时间和比赛状态")
     public static class CountScore{
@@ -542,4 +582,10 @@ public class CompeteVo {
         @ApiModelProperty("项目id")
         private Long projectId;
     }
+    @Data
+    @ApiModel("公司id")
+    public static class CompanyId {
+        @ApiModelProperty("公司")
+        private Long companyId;
+    }
 }

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

@@ -23,9 +23,7 @@ import com.ccsens.util.bean.dto.QueryDto;
 import com.ccsens.util.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.poi.ss.usermodel.BuiltinFormats;
-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;
@@ -46,6 +44,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * @author 逗
@@ -54,6 +53,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
@@ -94,7 +95,10 @@ public class CompeteService implements ICompeteService {
     private  CompeteScoreDao competeScoreDao;
     @Resource
     private  CompeteCountScoreMapper competeCountScoreMapper;
-
+    @Resource
+    private CompetePlayerMapper competePlayerMapper;
+    @Resource
+    private CompeteJudgmentMapper competeJudgmentMapper;
     /**
      * 花样赛总成绩展示
      * @param param
@@ -109,26 +113,44 @@ public class CompeteService implements ICompeteService {
             //一个人或者一个团队得数据
             CompeteVo.TotalScoreDisplay totalScoreDisplay = new CompeteVo.TotalScoreDisplay();
             //项目名
-            CompeteProject project = competeProjectMapper.selectByPrimaryKey(competeStartOrder.getProjectId());
-            if(ObjectUtil.isNotNull(project)) {
-                totalScoreDisplay.setCompanyName(project.getName());
-            }
+//            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 {
-                //团体
-                CompeteTeamMemberExample competeTeamMemberExample =new CompeteTeamMemberExample();
-                competeTeamMemberExample.createCriteria().andCompeteTeamIdEqualTo(competeStartOrder.getPlayerId());
-                List<CompeteTeamMember> competeTeamMembersList = competeTeamMemberMapper.selectByExample(competeTeamMemberExample);
+                //团体名
+                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<CompeteTeamMember> competeTeamMemberList = competeTeamMemberMapper.selectByExample(competeTeamMemberExample);
                 StringBuilder stringBuilder=new StringBuilder("");
-                competeTeamMembersList.forEach(competeTeamMember -> {
-                    stringBuilder.append(competePlayerDao.selectByPrimaryKey(competeTeamMember.getPlayerId()).getName()+'、');
+                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<CompeteTeamMember> 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<CompeteVo.Result> results = competeTimeDao.selectJudgmentS(competeStartOrder.getId());
@@ -150,7 +172,6 @@ public class CompeteService implements ICompeteService {
                     totalScoreDisplay.setReferee6(r.getScore());
                 }
             }
-
             BigDecimal bigDecimal1to3=new BigDecimal(0);
             bigDecimal1to3.add(totalScoreDisplay.getReferee1()).add(totalScoreDisplay.getReferee2()).add(totalScoreDisplay.getReferee3());
             BigDecimal bigDecimalavg1to3=new BigDecimal(0);
@@ -190,7 +211,12 @@ public class CompeteService implements ICompeteService {
             }
         }
 
-        return null;
+        for (int i=0; i<totalScoreDisplaysList.size();i++){
+            CompeteVo.TotalScoreDisplay totalScoreDisplay = totalScoreDisplaysList.get(i);
+                    totalScoreDisplay.setOrder(i+1);
+        }
+
+        return totalScoreDisplaysList;
     }
 
 
@@ -1007,7 +1033,67 @@ public class CompeteService implements ICompeteService {
     }
     @Override
     public void submitOrderList(ScoreDto.InformationSubmitted param) {
+        CompeteJudgment competeJudgment = competeJudgmentMapper.selectByPrimaryKey(param.getJudgmentId());
+        CompeteStartOrder competeStartOrder1 = competeStartOrderMapper.selectByPrimaryKey(param.getSiteOrderId());
+        if(competeJudgment.getChiefJudgment()!=(byte)0){
+        //不是主裁判
+            //先判断主裁判提交了没
+//            Integer ti= new Integer(0);//0代表没提交 1代表提交了
+//             CompeteVarietyScoreExample competeVarietyScoreExample=new CompeteVarietyScoreExample();
+//             competeVarietyScoreExample.createCriteria().andSiteOrderIdEqualTo(param.getSiteOrderId()).andRecStatusEqualTo((byte) 0);
+//            List<CompeteVarietyScore> 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<param.getFractionsList().size();j++){
+//                        param.getFractionsList().get(j).setScore(new BigDecimal(0));
+//                    }
+//                }
+//            }
+            if(competeStartOrder1.getWaiver()!=(byte)0){
+                for(int j=0;j<param.getFractionsList().size();j++){
+                    param.getFractionsList().get(j).setScore(new BigDecimal(0));
+                }
+            }
+        }else {
+            //现在开始写主裁判提交的情况
+            if(param.getWaiver()!=(byte)0){
+                //主裁判宣布个人弃权啥的
+                CompeteVarietyScoreExample competeVarietyScoreExample=new CompeteVarietyScoreExample();
+                competeVarietyScoreExample.createCriteria().andRecStatusEqualTo((byte)0).andSiteOrderIdEqualTo(param.getSiteOrderId());
+                List<CompeteVarietyScore> 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());
@@ -1380,4 +1466,127 @@ public class CompeteService implements ICompeteService {
         return countScoreCurrentSiteList;
     }
 
+    @Override
+    public CompeteVo.SelScropeVo selSubmitOrderList(ScoreDto.SelScrop param) {
+        CompeteVo.SelScropeVo selScropeVo=new CompeteVo.SelScropeVo();
+
+        //场次表里面的东西
+        CompeteStartOrder competeStartOrder1 = competeStartOrderMapper.selectByPrimaryKey(param.getSiteOrderId());
+        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<CompeteGroup> 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<CompeteTeamMember> 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<CompeteVarietyScore> competeVarietyScores = competeVarietyScoreMapper.selectByExample(competeVarietyScoreExample);
+        List<CompeteVo.ScropList> 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<CompeteCompany> competeCompanies = competeCompanyMapper.selectByExample(competeCompanyExample);
+        if(competeCompanies.size()>0){
+            return competeCompanies.get(0).getId();
+        }
+        return null;
+    }
+
 }

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

@@ -237,7 +237,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->{
@@ -286,7 +286,7 @@ public class ExcelService implements IExcelService {
             yuandongyuanName.setValue(String.valueOf(yDYLN));
             yundongyuanList.add(yuandongyuanName);
             biao.add(yundongyuanList);
-            biao.add(yundongyuanList);
+
             List<PoiUtil.PoiUtilCell> entryList=new ArrayList<>();
             PoiUtil.PoiUtilCell enter= new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 2, 1);
             entryList.add(enter);
@@ -581,7 +581,7 @@ public class ExcelService implements IExcelService {
             int coach = 0;
             CompeteCoachExample competeCoachExample = new CompeteCoachExample();
             competeCoachExample.createCriteria().andCompanyIdEqualTo(competeCompany.getId()).andIdentityEqualTo((byte) coach);
-            List<CompeteCoach> competeCoachList = competeCoachMapper.selectByExample(competeCoachExample);
+            competeCoachMapper.selectByExample(competeCoachExample);
             long count = competeCoachMapper.countByExample(competeCoachExample);
             //每个公司的领队数量
             CompeteCoachExample competeCoachExample1 = new CompeteCoachExample();

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

@@ -203,6 +203,9 @@ public interface ICompeteService {
     */
     List<ScoreVo.CountScoreCurrentSite> queryCountScoreAll(ScoreDto.ShowResult param);
 
+    CompeteVo.SelScropeVo selSubmitOrderList(ScoreDto.SelScrop param);
+
+    Long getUserCompanyId(Long userId, Byte type);
 }
 
 

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

@@ -128,7 +128,6 @@
         LEFT JOIN t_compete_judgment tcj on tcvs.judgment_id=tcj.id
         WHERE site_order_id=#{siteId}
         GROUP BY tcvs.`judgment_id`
-
     </select>
     <select id="selectTwoProject" resultType="com.ccsens.mt.bean.vo.VideoProjectVo$GetTwoProject">
         SELECT

mt/src/main/resources/mapper_raw/CompeteStartOrderMapper.xml

@@ -14,6 +14,8 @@
     <result column="task_id" jdbcType="BIGINT" property="taskId" />
     <result column="start_time" jdbcType="BIGINT" property="startTime" />
     <result column="end_time" jdbcType="BIGINT" property="endTime" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="waiver" jdbcType="TINYINT" property="waiver" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -75,7 +77,7 @@
   </sql>
   <sql id="Base_Column_List">
     id, project_id, player_id, team, compete_order, site, created_at, updated_at, rec_status, 
-    task_id, start_time, end_time
+    task_id, start_time, end_time, remark, waiver
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.mt.bean.po.CompeteStartOrderExample" resultMap="BaseResultMap">
     select
@@ -111,13 +113,13 @@
     insert into t_compete_start_order (id, project_id, player_id, 
       team, compete_order, site, 
       created_at, updated_at, rec_status, 
-      task_id, start_time, end_time
-      )
+      task_id, start_time, end_time, 
+      remark, waiver)
     values (#{id,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, #{playerId,jdbcType=BIGINT}, 
       #{team,jdbcType=TINYINT}, #{competeOrder,jdbcType=TINYINT}, #{site,jdbcType=TINYINT}, 
       #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, 
-      #{taskId,jdbcType=BIGINT}, #{startTime,jdbcType=BIGINT}, #{endTime,jdbcType=BIGINT}
-      )
+      #{taskId,jdbcType=BIGINT}, #{startTime,jdbcType=BIGINT}, #{endTime,jdbcType=BIGINT}, 
+      #{remark,jdbcType=VARCHAR}, #{waiver,jdbcType=TINYINT})
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.mt.bean.po.CompeteStartOrder">
     insert into t_compete_start_order
@@ -158,6 +160,12 @@
       <if test="endTime != null">
         end_time,
       </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="waiver != null">
+        waiver,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -196,6 +204,12 @@
       <if test="endTime != null">
         #{endTime,jdbcType=BIGINT},
       </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="waiver != null">
+        #{waiver,jdbcType=TINYINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.ccsens.mt.bean.po.CompeteStartOrderExample" resultType="java.lang.Long">
@@ -243,6 +257,12 @@
       <if test="record.endTime != null">
         end_time = #{record.endTime,jdbcType=BIGINT},
       </if>
+      <if test="record.remark != null">
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.waiver != null">
+        waiver = #{record.waiver,jdbcType=TINYINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -261,7 +281,9 @@
       rec_status = #{record.recStatus,jdbcType=TINYINT},
       task_id = #{record.taskId,jdbcType=BIGINT},
       start_time = #{record.startTime,jdbcType=BIGINT},
-      end_time = #{record.endTime,jdbcType=BIGINT}
+      end_time = #{record.endTime,jdbcType=BIGINT},
+      remark = #{record.remark,jdbcType=VARCHAR},
+      waiver = #{record.waiver,jdbcType=TINYINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -302,6 +324,12 @@
       <if test="endTime != null">
         end_time = #{endTime,jdbcType=BIGINT},
       </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="waiver != null">
+        waiver = #{waiver,jdbcType=TINYINT},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -317,7 +345,9 @@
       rec_status = #{recStatus,jdbcType=TINYINT},
       task_id = #{taskId,jdbcType=BIGINT},
       start_time = #{startTime,jdbcType=BIGINT},
-      end_time = #{endTime,jdbcType=BIGINT}
+      end_time = #{endTime,jdbcType=BIGINT},
+      remark = #{remark,jdbcType=VARCHAR},
+      waiver = #{waiver,jdbcType=TINYINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>