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

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

@@ -147,7 +147,7 @@ public class ExcelController {
     @MustLogin
     @ApiOperation(value = "花样赛成绩导出（导出）", notes = "100715")
     @RequestMapping(value = "/patternExpTable", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse patternExpTable(@ApiParam @Validated @RequestBody QueryDto<ScoreDto.ShowResultW> params) {
+    public JsonResponse patternExpTable(@ApiParam @Validated @RequestBody QueryDto<ScoreDto.ShowResultNoPage> params) {
         log.info("参赛人数统计表：{}",params);
         String path = excelService.patternExpTable(params.getParam());
         return JsonResponse.newInstance().ok(path);
@@ -155,7 +155,7 @@ public class ExcelController {
     @MustLogin
     @ApiOperation(value = "计数赛成绩导出（导出）", notes = "100715")
     @RequestMapping(value = "/countExpTable", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse countExpTable(@ApiParam @Validated @RequestBody QueryDto<ScoreDto.ShowResult> params) {
+    public JsonResponse countExpTable(@ApiParam @Validated @RequestBody QueryDto<ScoreDto.ShowResultNoPage> params) {
         log.info("参赛人数统计表：{}",params);
         String path = excelService.countExpTable(params.getParam());
         return JsonResponse.newInstance().ok(path);

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

@@ -168,4 +168,11 @@ public class ScoreDto {
         @Max(value=100)
         private int pageSize = 10;
     }
+    @Data
+    @ApiModel
+    public static class ShowResultNoPage {
+        @NotNull
+        @ApiModelProperty("项目id")
+        private Long projectId;
+    }
 }

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

@@ -77,7 +77,7 @@ public class CompeteVedioService implements ICompeteVedioService{
         CompeteVideo competeVideo=new CompeteVideo();
         competeVideo.setId(snowflake.nextId());
         competeVideo.setCompeteTimeId(param.getCompeteTimeId());
-        //competeVideo.setProjectId(param.getCompeteProjectId());
+        competeVideo.setProjectId(param.getCompeteProjectId());
         competeVideo.setPlayerId(param.getPlayerOrTeamId());
         competeVideo.setVideoUrl(param.getVideoPath());
         competeVideo.setRecStatus((byte) 0);

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

@@ -14,11 +14,13 @@ import com.ccsens.mt.bean.vo.TableVo;
 import com.ccsens.mt.persist.dao.*;
 import com.ccsens.mt.persist.mapper.*;
 import com.ccsens.mt.util.Constant;
+import com.ccsens.util.CodeEnum;
 import com.ccsens.util.PoiUtil;
 import com.ccsens.util.PropUtil;
 import com.ccsens.util.WebConstant;
 
 import com.ccsens.util.bean.dto.QueryDto;
+import com.ccsens.util.exception.BaseException;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
@@ -61,6 +63,8 @@ public class ExcelService implements IExcelService {
     private CompeteProjectPlayerMapper competeProjectPlayerMapper;
     @Resource
     private CompeteCoachMapper competeCoachMapper;
+    @Resource
+    private CompeteTeamMemberMapper competeTeamMemberMapper;
 
     @Resource
     private CompetePlayerMapper competePlayerMapper;
@@ -75,8 +79,36 @@ public class ExcelService implements IExcelService {
 
     @Override
     public String dasaiduiwuxinxiWPS(QueryDto<CompeteDto.CompeteTime> params) {
+
+
+
+
+
         //这个里面包含联系人得信息
-        List<CompeteCompany> competeCompanyList= competeCompanyDao.selectByCompeteTimeId(params.getParam().getCompeteTimeId());
+        List<CompeteCompany> competeCompanyListSel= competeCompanyDao.selectByCompeteTimeId(params.getParam().getCompeteTimeId());
+        List<CompeteCompany> competeCompanyList= new ArrayList<>();
+        for (CompeteCompany com:competeCompanyListSel) {
+            CompetePlayerExample competePlayerExample = new CompetePlayerExample();
+            competePlayerExample.createCriteria().andCompanyIdEqualTo(com.getId()).andRecStatusEqualTo((byte) 0);
+            //运动员list
+            List<CompetePlayer> competePlayerList = competePlayerMapper.selectByExample(competePlayerExample);
+            List<CompetePlayer> competePlayerList1=new ArrayList<>();
+            for (int i = 0; i < competePlayerList.size(); i++) {
+                CompeteProjectPlayerExample competeProjectPlayerExample = new CompeteProjectPlayerExample();
+                CompeteTeamMemberExample competeTeamMemberExample = new CompeteTeamMemberExample();
+                competeProjectPlayerExample.createCriteria().andPlayerIdEqualTo(competePlayerList.get(i).getId()).andRecStatusEqualTo((byte) 0);
+                competeTeamMemberExample.createCriteria().andPlayerIdEqualTo(competePlayerList.get(i).getId()).andRecStatusEqualTo((byte) 0);
+                List<CompeteProjectPlayer> competeProjectPlayers = competeProjectPlayerMapper.selectByExample(competeProjectPlayerExample);
+                List<CompeteTeamMember> competeTeamMembers = competeTeamMemberMapper.selectByExample(competeTeamMemberExample);
+                if (competeProjectPlayers.size() > 0 || competeTeamMembers.size() > 0) {
+                    competeCompanyList.add(com);
+                    break;
+                }
+            }
+
+        }
+
+
         List<CompeteCoach> competeCoachList =new ArrayList<CompeteCoach>();
         for (CompeteCompany com:competeCompanyList) {
             //再根据单位id查询，领队和教练信息,返回list集合
@@ -219,6 +251,20 @@ public class ExcelService implements IExcelService {
             //运动员list
             List<CompetePlayer> competePlayerList = competePlayerMapper.selectByExample(competePlayerExample);
 
+            List<CompetePlayer> competePlayerList1=new ArrayList<>();
+            for(int i=0;i<competePlayerList.size();i++){
+                 CompeteProjectPlayerExample competeProjectPlayerExample=new CompeteProjectPlayerExample();
+                 CompeteTeamMemberExample competeTeamMemberExample=new CompeteTeamMemberExample();
+                 competeProjectPlayerExample.createCriteria().andPlayerIdEqualTo(competePlayerList.get(i).getId()).andRecStatusEqualTo((byte)0);
+                 competeTeamMemberExample.createCriteria().andPlayerIdEqualTo(competePlayerList.get(i).getId()).andRecStatusEqualTo((byte)0);
+                 List<CompeteProjectPlayer> competeProjectPlayers = competeProjectPlayerMapper.selectByExample(competeProjectPlayerExample);
+                 List<CompeteTeamMember> competeTeamMembers = competeTeamMemberMapper.selectByExample(competeTeamMemberExample);
+                 if(competeProjectPlayers.size()>0||competeTeamMembers.size()>0){
+                    competePlayerList1.add(competePlayerList.get(i));
+                 }
+            }
+
+
             List<PoiUtil.PoiUtilCell> daibiaodui=new ArrayList<>();
             PoiUtil.PoiUtilCell daibiaoduiName=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 2, 1, null, null);
             daibiaoduiName.setValue(com.getName());
@@ -260,7 +306,7 @@ public class ExcelService implements IExcelService {
            biao.add(jiaolianList);
            //再放运动员
            StringBuffer  yDYLN=new StringBuffer("");
-           competePlayerList.forEach(cpL->{
+           competePlayerList1.forEach(cpL->{
                 yDYLN.append(cpL.getName());
                 yDYLN.append("(");
                 yDYLN.append(cpL.getGender().equals((byte) 0)?"女":"男");
@@ -282,7 +328,13 @@ public class ExcelService implements IExcelService {
             List<PoiUtil.PoiUtilCell> entryList=new ArrayList<>();
             PoiUtil.PoiUtilCell enter= new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL, 2, 1);
             entryList.add(enter);
+
             biao.add(entryList);
+            if(competePlayerList1.size()<=0){
+                for (int i = 0; i < 5; i++) {
+                    biao.remove(biao.size()-1);
+                }
+            }
           }
         biao.remove(biaoti.size()-1);
         Workbook workbook = new XSSFWorkbook();
@@ -1331,18 +1383,19 @@ public class ExcelService implements IExcelService {
 
 
     @Override
-    public String patternExpTable(ScoreDto.ShowResultW param) {
+    public String patternExpTable(ScoreDto.ShowResultNoPage param) {
-        List<CompeteVo.TotalScoreDisplay> totalScoreDisplays = competeService.showResultPage(param);
+        //List<CompeteVo.TotalScoreDisplay> totalScoreDisplays = competeService.showResultPage(param);
+        List<CompeteVo.TotalScoreDisplay> totalScoreDisplays =  competeScoreDao.queryVarietyScore(param.getProjectId());
         List<List<PoiUtil.PoiUtilCell>> list = new ArrayList<>();
         List<PoiUtil.PoiUtilCell> zero=new ArrayList<>();
         PoiUtil.PoiUtilCell zeroOne=new PoiUtil.PoiUtilCell("比赛成绩公示(花样赛)", 14, 1);
         zero.add(zeroOne);
         list.add(zero);
         List<PoiUtil.PoiUtilCell> one=new ArrayList<>();
-        PoiUtil.PoiUtilCell oneOne=new PoiUtil.PoiUtilCell("参赛单位", 1, 1);
+        PoiUtil.PoiUtilCell oneOne=new PoiUtil.PoiUtilCell("参赛单位", 1, 2);
-        PoiUtil.PoiUtilCell oneTwo=new PoiUtil.PoiUtilCell("参赛队员", 1, 1);
+        PoiUtil.PoiUtilCell oneTwo=new PoiUtil.PoiUtilCell("参赛队员", 1, 2);
         PoiUtil.PoiUtilCell oneThree=new PoiUtil.PoiUtilCell("创意编排分", 3, 1);
-        PoiUtil.PoiUtilCell oneFour=new PoiUtil.PoiUtilCell("创意最后得分", 1, 1);
+        PoiUtil.PoiUtilCell oneFour=new PoiUtil.PoiUtilCell("创意最后得分", 1, 2);
         PoiUtil.PoiUtilCell oneFive=new PoiUtil.PoiUtilCell("完成质量分", 3, 1);
         PoiUtil.PoiUtilCell oneSix=new PoiUtil.PoiUtilCell("完成最后得分", 1, 2);
         PoiUtil.PoiUtilCell oneSeven=new PoiUtil.PoiUtilCell("主裁判扣分", 1, 2);
@@ -1352,8 +1405,13 @@ public class ExcelService implements IExcelService {
         one.add(oneOne);
         one.add(oneTwo);
         one.add(oneThree);
+        one.add(new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL) );
+        one.add(new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL) );
         one.add(oneFour);
+
         one.add(oneFive);
+        one.add(new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL) );
+        one.add(new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL) );
         one.add(oneSix);
         one.add(oneSeven);
         one.add(oneEight);
@@ -1361,8 +1419,8 @@ public class ExcelService implements IExcelService {
         one.add(oneTen);
         list.add(one);
         List<PoiUtil.PoiUtilCell> two = new ArrayList<>();
-        PoiUtil.PoiUtilCell twoOne = new PoiUtil.PoiUtilCell();
+        PoiUtil.PoiUtilCell twoOne = new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL);
-        PoiUtil.PoiUtilCell twoTwo = new PoiUtil.PoiUtilCell();
+        PoiUtil.PoiUtilCell twoTwo = new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL);
         PoiUtil.PoiUtilCell twoThree = new PoiUtil.PoiUtilCell("1", 1, 1);
         PoiUtil.PoiUtilCell twoFour = new PoiUtil.PoiUtilCell("2", 1, 1);
         PoiUtil.PoiUtilCell twoFive = new PoiUtil.PoiUtilCell("3", 1, 1);
@@ -1386,7 +1444,7 @@ public class ExcelService implements IExcelService {
             PoiUtil.PoiUtilCell threeTwo = new PoiUtil.PoiUtilCell(mes.getPeopleName(), 1, 1);
             three.add(threeOne);
             three.add(threeTwo);
-            if(mes.getRemark()==(byte)0){
+            if(true){
                 PoiUtil.PoiUtilCell threeThree=new PoiUtil.PoiUtilCell(StringUtil.valueOf(mes.getReferee1()),1,1);
                 PoiUtil.PoiUtilCell threeFive=new PoiUtil.PoiUtilCell(StringUtil.valueOf(mes.getReferee2()),1,1);
                 PoiUtil.PoiUtilCell threeSix=new PoiUtil.PoiUtilCell(StringUtil.valueOf(mes.getReferee3()),1,1);
@@ -1488,19 +1546,26 @@ public class ExcelService implements IExcelService {
     }
 
     @Override
-    public String countExpTable(ScoreDto.ShowResult param) {
+    public String countExpTable(ScoreDto.ShowResultNoPage param) {
 
 
-        List<ScoreVo.CountScoreCurrentSite> countScoreCurrentSiteList = new ArrayList<>();
+        log.info("计数赛成绩公示：{}", param);
-        CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId());
+        CompeteProject project = competeProjectMapper.selectByPrimaryKey(param.getProjectId());
-        if(ObjectUtil.isNotNull(competeProject)) {
+        log.info("查询{}项目的成绩：", project);
-            if(competeProject.getTeam() == 0) {
+        if (project == null) {
-                countScoreCurrentSiteList = competeScoreDao.queryCountScoreAll(param.getProjectId());
+            throw new BaseException(CodeEnum.PARAM_ERROR);
-            }else {
+        }
-                countScoreCurrentSiteList = competeScoreDao.queryCountScoreAllByTeam(param.getProjectId());
+
-            }
+       // PageHelper.startPage(param.getPage(), param.getSize());
+        List<ScoreVo.CountScorePublicity> countScoreCurrentSiteList;
+        if (project.getTeam() == Constant.Compete.TEAM_YES) {
+            // 团体赛
+            countScoreCurrentSiteList = competeScoreDao.queryCountScoreTeam(param.getProjectId());
+        } else {
+            // 个人赛
+            countScoreCurrentSiteList = competeScoreDao.queryCountScorePerson(param.getProjectId());
         }
-        List<ScoreVo.CountScoreCurrentSite> countScoreCurrentSites = countScoreCurrentSiteList;
+        List<ScoreVo.CountScorePublicity> countScoreCurrentSites = countScoreCurrentSiteList;
 
 
         List<List<PoiUtil.PoiUtilCell>> list = new ArrayList<>();
@@ -1519,9 +1584,13 @@ public class ExcelService implements IExcelService {
         PoiUtil.PoiUtilCell oneEight=new PoiUtil.PoiUtilCell("名词", 1, 2);
         PoiUtil.PoiUtilCell oneNine=new PoiUtil.PoiUtilCell("备注", 1, 2);
         one.add(oneOne);
+
         one.add(oneTwo);
+
         one.add(oneThree);
+
         one.add(oneFour);
+        one.add(new PoiUtil.PoiUtilCell());
         one.add(oneFive);
         one.add(oneSix);
         one.add(oneSeven);

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

@@ -102,8 +102,8 @@ public interface IExcelService {
      */
     String beforeEight(QueryDto<CompeteDto.CompeteTime> params);
 
-    String patternExpTable(ScoreDto.ShowResultW param);
+    String patternExpTable(ScoreDto.ShowResultNoPage param);
 
-    String countExpTable(ScoreDto.ShowResult param);
+    String countExpTable(ScoreDto.ShowResultNoPage param);
 
 }