ccsens_wiki
/
ccsenscloud
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

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

tiaosheng
Lihong@123456 5 years ago
parent
823dcb129a 1997e1f5aa
commit
80f57f9327
4 changed files with 65 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      mt/src/main/java/com/ccsens/mt/api/ExcelController.java
  2. 7
      mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java
  3. 58
      mt/src/main/java/com/ccsens/mt/service/ExcelService.java
  4. 4
      mt/src/main/java/com/ccsens/mt/service/IExcelService.java

4
mt/src/main/java/com/ccsens/mt/api/ExcelController.java
View File

@ -146,7 +146,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);
@ -154,7 +154,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);

7
mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java
View File

@ -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;
}
}

58
mt/src/main/java/com/ccsens/mt/service/ExcelService.java
View File

@ -63,6 +63,8 @@ public class ExcelService implements IExcelService {
private CompeteProjectPlayerMapper competeProjectPlayerMapper;
@Resource
private CompeteCoachMapper competeCoachMapper;
@Resource
private CompeteTeamMemberMapper competeTeamMemberMapper;
@Resource
private CompetePlayerMapper competePlayerMapper;
@ -77,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集合
@ -221,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());
@ -262,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)?"女":"男");
@ -284,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();
@ -1333,7 +1383,7 @@ 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 = competeScoreDao.queryVarietyScore(param.getProjectId());
List<List<PoiUtil.PoiUtilCell>> list = new ArrayList<>();
@ -1496,7 +1546,7 @@ public class ExcelService implements IExcelService {
}
@Override
public String countExpTable(ScoreDto.ShowResult param) {
public String countExpTable(ScoreDto.ShowResultNoPage param) {
log.info("计数赛成绩公示：{}", param);

4
mt/src/main/java/com/ccsens/mt/service/IExcelService.java
View File

@ -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);
}

Write Preview
Loading…
Cancel
Save