diff --git a/health/src/main/java/com/ccsens/health/service/AbnormalService.java b/health/src/main/java/com/ccsens/health/service/AbnormalService.java index ac57273e..38435f47 100644 --- a/health/src/main/java/com/ccsens/health/service/AbnormalService.java +++ b/health/src/main/java/com/ccsens/health/service/AbnormalService.java @@ -171,6 +171,7 @@ public class AbnormalService implements IAbnormalService { AbnormalDto.AbnormalStatisticsDto abnormalDto = params.getParam(); PageHelper.startPage(abnormalDto.getPage(), abnormalDto.getPageSize()); + List abnormalList = healthAbnormalDao.getAbnormalList(abnormalDto.getPost(), abnormalDto.getDepartment(), abnormalDto.getHealthType()); return new PageInfo<>(abnormalList); diff --git a/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java b/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java index d4d6005c..d8dc38b0 100644 --- a/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java +++ b/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java @@ -163,6 +163,7 @@ public class PatientReportService implements IPatientReportService { List reportVos = new ArrayList<>(); //分页查询报告单列表 PageHelper.startPage(query.getPageNum(), query.getPageSize()); + HtPatientReportExample reportExample = new HtPatientReportExample(); //查询医生信息 HtDoctorExample doctorExample = new HtDoctorExample(); diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java index 1be57baa..dea568c2 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java @@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController; import springfox.documentation.spring.web.json.Json; import javax.annotation.Resource; +import java.io.IOException; import java.util.List; /** @@ -65,7 +66,7 @@ public class CompeteScoreController { @ApiOperation(value = "花样赛成绩查看", notes = "Mr.王 -----从花样赛成绩表里面查看出这个人得成绩") @RequestMapping(value = "/showResult", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse> showResult (@ApiParam @Validated @RequestBody QueryDto params){ + public JsonResponse> showResult (@ApiParam @Validated @RequestBody QueryDto params){ log.info("花样赛详细分数查看：{}",params); PageInfo totalScoreDisplaysList= competeService.showResultPage(params.getParam()); return JsonResponse.newInstance().ok(totalScoreDisplaysList); @@ -105,7 +106,7 @@ public class CompeteScoreController { @RequestMapping(value = "/query/countScoreAll", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse queryCountScoreAll(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查看计数赛成绩公示表：{}",params); - List countScoreCurrentSites = competeService.queryCountScoreAll(params.getParam()); + PageInfo countScoreCurrentSites = competeService.queryCountScoreAll(params.getParam()); log.info("查看计数赛成绩公示表：{}",params); return JsonResponse.newInstance().ok(countScoreCurrentSites); } @@ -124,9 +125,18 @@ public class CompeteScoreController { @RequestMapping(value = "/speedPass", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse speedPass(@ApiParam @Validated @RequestBody QueryDto params) { log.info("速度通级赛：{}",params); - List speedPassList = competeService.speedPass(params.getParam()); + PageInfo speedPassList = competeService.speedPass(params.getParam()); return JsonResponse.newInstance().ok(speedPassList); } + @MustLogin + @ApiOperation(value = "速度通级赛(导出)", notes = "") + @RequestMapping(value = "/speedPassOut", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse speedPassOut(@ApiParam @Validated @RequestBody QueryDto params) throws IOException { + log.info("速度通级赛(导出)：{}",params); + String path = competeService.speedPassOut(params.getParam()); + return JsonResponse.newInstance().ok(path); + } + } diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java index b7d74a75..ac30c925 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java @@ -47,7 +47,7 @@ public class CompeteTaskController { @MustLogin @ApiOperation(value = "日程安排更新", notes = "zy:1、循环查找项目对应的配置信息。2、有则修改，没有则添加配置信息。" + "3、根据配置的时间和场地生成出场顺序表。4存入出场顺序表。5、调用tall接口添加任务") - @RequestMapping(value = "/", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + @RequestMapping(value = "/update", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse updateCompeteConfig( @ApiParam @Validated @RequestBody QueryDto params, HttpServletRequest request) { log.info("日程安排更新：{}",params); diff --git a/mt/src/main/java/com/ccsens/mt/api/ExcelController.java b/mt/src/main/java/com/ccsens/mt/api/ExcelController.java index 94c945b8..d3b10afe 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ExcelController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ExcelController.java @@ -9,6 +9,7 @@ import com.ccsens.mt.bean.vo.TableVo; import com.ccsens.mt.service.IExcelService; import com.ccsens.util.JsonResponse; import com.ccsens.util.bean.dto.QueryDto; +import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -111,28 +112,37 @@ public class ExcelController { @RequestMapping(value = "/enterInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse getEnterInfo(@ApiParam @Validated @RequestBody QueryDto params) { log.info("日程安排更新：{}",params); - List competeJoinList = excelService.getCompeteJoinDetail(params.getParam()); + PageInfo competeJoinList = excelService.getCompeteJoinDetail(params.getParam()); return JsonResponse.newInstance().ok(competeJoinList); } @MustLogin - @ApiOperation(value = "日程安排（导出）", notes = "") + @ApiOperation(value = "日程安排（查询）", notes = "") @RequestMapping(value = "/schedulePlanning", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse schedulePlanning(@ApiParam @Validated @RequestBody QueryDto params) { log.info("日程安排更新：{}",params); - List schedulePlanDetailList = excelService.schedulePlanning(params.getParam()); - return JsonResponse.newInstance().ok(schedulePlanDetailList); + List schedulePlanlList = excelService.schedulePlanning(params.getParam()); + return JsonResponse.newInstance().ok(schedulePlanlList); + } + + @MustLogin + @ApiOperation(value = "日程安排（导出）", notes = "") + @RequestMapping(value = "/schedulePlanningOut", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse schedulePlanningOut(@ApiParam @Validated @RequestBody QueryDto params) throws IOException { + log.info("日程安排更新：{}",params); + String path = excelService.schedulePlanningOut(params.getParam()); + return JsonResponse.newInstance().ok(path); } @MustLogin @ApiOperation(value = "花样赛成绩导出（导出）", notes = "100715") @RequestMapping(value = "/patternExpTable", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse patternExpTable(@ApiParam @Validated @RequestBody QueryDto params) { + public JsonResponse patternExpTable(@ApiParam @Validated @RequestBody QueryDto params) { log.info("参赛人数统计表：{}",params); String path = excelService.patternExpTable(params.getParam()); return JsonResponse.newInstance().ok(path); } @MustLogin - @ApiOperation(value = "花样赛成绩导出（导出）", notes = "100715") + @ApiOperation(value = "计数赛成绩导出（导出）", notes = "100715") @RequestMapping(value = "/countExpTable", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse countExpTable(@ApiParam @Validated @RequestBody QueryDto params) { log.info("参赛人数统计表：{}",params); diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java index 5e577495..b00bc7ee 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java @@ -320,9 +320,6 @@ public class CompeteDto { @Data @ApiModel public static class EnterInfo{ - @NotNull - @ApiModelProperty("第几届信息的id") - private Long competeTimeId; @ApiModelProperty("项目id") private Long projectId; @ApiModelProperty("组别id") @@ -333,6 +330,10 @@ public class CompeteDto { private String name; @ApiModelProperty("身份证号") private String idCard; + @ApiModelProperty("当前页") + private int page=1; + @ApiModelProperty("每页数量") + private int size=10; } @Data @@ -378,6 +379,10 @@ public class CompeteDto { @NotNull @ApiModelProperty("项目id") private Long projectId; + @ApiModelProperty("当前页") + private int page=1; + @ApiModelProperty("每页数量") + private int size=10; } @Data diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java index d0c3a7bb..f42b7873 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java @@ -131,13 +131,11 @@ public class ScoreDto { @NotNull @ApiModelProperty("项目id") private Long projectId; - @ApiModelProperty("第几页") - @Min(value = 1) - private int pageNum = 1; - @ApiModelProperty("每页多少条") - @Min(value = 1) - @Max(value=100) - private int pageSize = 10; + + @ApiModelProperty("当前页") + private int page=1; + @ApiModelProperty("每页数量") + private int size=10; } @Data @ApiModel @@ -156,5 +154,18 @@ public class ScoreDto { private Long judgmentId; } - + @Data + @ApiModel + public static class ShowResultW { + @NotNull + @ApiModelProperty("项目id") + private Long projectId; + @ApiModelProperty("第几页") + @Min(value = 1) + private int pageNum = 1; + @ApiModelProperty("每页多少条") + @Min(value = 1) + @Max(value=100) + private int pageSize = 10; + } } diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java index 9a7cd29b..7408638b 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java @@ -577,7 +577,7 @@ public class CompeteVo { private int secondGrade; @ApiModelProperty("3分钟单摇跳等级") private int minuteGrade; - @ApiModelProperty("3分钟单摇跳等级") + @ApiModelProperty("等级") private int grade; @ApiModelProperty("玩家id") private Long playerId; diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java index 8d50f6ef..2ab673a4 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteProjectConfigDao.java @@ -16,11 +16,15 @@ import java.util.List; */ public interface CompeteProjectConfigDao extends CompeteProjectConfigMapper { CompeteProjectConfig selectByProjectId(@Param("projectId") Long projectId); - List selectDetail (); - List 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 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); + List selectDetail (); + List selectSingle (@Param("projectId") Long projectId,@Param("groupId") Long groupId,@Param("companyId") Long companyId,@Param("name") String name,@Param("idCard") String idCard); + List selectGroup (@Param("projectId") Long projectId,@Param("groupId") Long groupId,@Param("companyId") Long companyId,@Param("name") String name,@Param("idCard") String idCard); CompeteProjectConfig selectStartTime(@Param("projectId") Long projectId); + List selectPeople (@Param("projectId") Long projectId,@Param("groupId") Long groupId,@Param("companyId") Long companyId,@Param("name") String name,@Param("idCard") String idCard); + + + /** * 查询所有项目配置信息 diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java index 372d2f10..74d3ac81 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java @@ -24,6 +24,9 @@ public interface CompeteScoreDao { List selectCountScoreCurrentSite (@Param("siteId") long siteId); List selectByProjectIdAndPid(@Param("projectId") long projectId,@Param("competeTimeId") long competeTimeId); + List selectQueryCountScore(@Param("projectId")Long projectId); + + diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java index c54629b0..c1ce0ad6 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -15,6 +15,7 @@ import com.ccsens.mt.bean.dto.ScoreDto; import com.ccsens.mt.bean.po.*; import com.ccsens.mt.bean.vo.CompeteVo; import com.ccsens.mt.bean.vo.ScoreVo; +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; @@ -104,7 +105,7 @@ public class CompeteService implements ICompeteService { @Override - public PageInfo showResultPage(ScoreDto.ShowResult param) { + public PageInfo showResultPage(ScoreDto.ShowResultW param) { PageHelper.startPage(param.getPageNum(),param.getPageSize()); List totalScoreDisplaysList=new ArrayList<>(); CompeteStartOrderExample competeStartOrderExample =new CompeteStartOrderExample(); @@ -205,7 +206,7 @@ public class CompeteService implements ICompeteService { * @param param */ @Override - public List showResult(ScoreDto.ShowResult param) { + public List showResult(ScoreDto.ShowResultW param) { List totalScoreDisplaysList=new ArrayList<>(); CompeteStartOrderExample competeStartOrderExample =new CompeteStartOrderExample(); competeStartOrderExample.createCriteria().andProjectIdEqualTo(param.getProjectId()); @@ -1446,10 +1447,12 @@ public class CompeteService implements ICompeteService { @Override - public List speedPass(CompeteDto.CompeteTimeAndProjectId params) { + public PageInfo speedPass(CompeteDto.CompeteTimeAndProjectId params) { long projectId = params.getProjectId(); long competeTimeId = params.getCompeteTimeId(); + PageHelper.startPage(params.getPage(),params.getSize()); List speedPassList = competeScoreDao.selectByProjectIdAndPid(projectId, competeTimeId); + PageInfo pageInfo = new PageInfo<>(speedPassList); if (CollectionUtil.isNotEmpty(speedPassList)) { for (CompeteVo.SpeedPass mes : speedPassList) { //查30s单摇跳得分 @@ -1551,21 +1554,135 @@ public class CompeteService implements ICompeteService { } } } - return speedPassList; + return pageInfo; } - @Override - public List queryCountScoreAll(ScoreDto.ShowResult param) { - List countScoreCurrentSiteList = new ArrayList<>(); - CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId()); - if(ObjectUtil.isNotNull(competeProject)) { - if(competeProject.getTeam() == 0) { - countScoreCurrentSiteList = competeScoreDao.queryCountScoreAll(param.getProjectId()); - }else { - countScoreCurrentSiteList = competeScoreDao.queryCountScoreAllByTeam(param.getProjectId()); + public List speedPassCha(CompeteDto.CompeteTimeAndProjectId params) { + long projectId = params.getProjectId(); + long competeTimeId = params.getCompeteTimeId(); + PageHelper.startPage(params.getPage(),params.getSize()); + List speedPassList = competeScoreDao.selectByProjectIdAndPid(projectId, competeTimeId); + PageInfo pageInfo = new PageInfo<>(speedPassList); + if (CollectionUtil.isNotEmpty(speedPassList)) { + for (CompeteVo.SpeedPass mes : speedPassList) { + //查30s单摇跳得分 + CompeteStartOrderExample competeStartOrderExample = new CompeteStartOrderExample(); + competeStartOrderExample.createCriteria().andPlayerIdEqualTo(Constant.SINGLE_ROLL_30_S).andPlayerIdEqualTo(mes.getPlayerId()); + List competeStartOrders = competeStartOrderMapper.selectByExample(competeStartOrderExample); + if (competeStartOrders.size() > 0) { + CompeteStartOrder competeStartOrder = competeStartOrders.get(0); + long id = competeStartOrder.getId(); + CompeteCountScoreExample competeCountScoreExample = new CompeteCountScoreExample(); + competeCountScoreExample.createCriteria().andSiteOrderIdEqualTo(id); + List competeCountScoreList = competeCountScoreMapper.selectByExample(competeCountScoreExample); + CompeteCountScore competeCountScore = competeCountScoreList.get(0); + BigDecimal score = competeCountScore.getFinalScore(); + BigDecimal bigDecimal = new BigDecimal(2); + BigDecimal secondTimeScore = score.multiply(bigDecimal); + //查30s单摇跳得分 * 2 =次数 + mes.setSecondTime(secondTimeScore); + } + //3分钟单摇跳得分 + CompeteStartOrderExample competeStartOrderExample1 = new CompeteStartOrderExample(); + competeStartOrderExample.createCriteria().andPlayerIdEqualTo(Constant.SINGLE_ROLL_3_M).andPlayerIdEqualTo(mes.getPlayerId()); + List competeStartOrders1 = competeStartOrderMapper.selectByExample(competeStartOrderExample); + if (competeStartOrders1.size() > 0) { + CompeteStartOrder competeStartOrder1 = competeStartOrders.get(0); + long id1 = competeStartOrder1.getId(); + CompeteCountScoreExample competeCountScoreExample1 = new CompeteCountScoreExample(); + competeCountScoreExample1.createCriteria().andSiteOrderIdEqualTo(id1); + List competeCountScoreList1 = competeCountScoreMapper.selectByExample(competeCountScoreExample1); + CompeteCountScore competeCountScore1 = competeCountScoreList1.get(0); + BigDecimal score1 = competeCountScore1.getFinalScore(); + BigDecimal bigDecimal1 = new BigDecimal(2); + BigDecimal minuteTimeScore = score1.multiply(bigDecimal1); + //3分钟单摇跳得分 * 2 =次数 + mes.setMinuteTime(minuteTimeScore); + } + BigDecimal bigDecimal0 = new BigDecimal(70); + BigDecimal bigDecimal2 = new BigDecimal(90); + BigDecimal bigDecimal3 = new BigDecimal(105); + BigDecimal bigDecimal4 = new BigDecimal(120); + BigDecimal bigDecimal5 = new BigDecimal(130); + BigDecimal bigDecimal6 = new BigDecimal(140); + BigDecimal bigDecimal7 = new BigDecimal(300); + BigDecimal bigDecimal8 = new BigDecimal(380); + BigDecimal bigDecimal9 = new BigDecimal(460); + BigDecimal bigDecimal10 = new BigDecimal(540); + BigDecimal bigDecimal11 = new BigDecimal(620); + BigDecimal bigDecimal12 = new BigDecimal(700); + BigDecimal s =mes.getSecondTime(); + if (mes.getSecondTime()!= null && mes.getMinuteTime()!= null) { + //判断30s单摇跳等级 + if (mes.getSecondTime().compareTo(bigDecimal0) < 1) { + mes.setSecondGrade(1); + } + if (mes.getSecondTime().compareTo(bigDecimal2) < 1) { + mes.setSecondGrade(2); + } + if (mes.getSecondTime().compareTo(bigDecimal3) < 1) { + mes.setSecondGrade(3); + } + if (mes.getSecondTime().compareTo(bigDecimal4) < 1) { + mes.setSecondGrade(4); + } + if (mes.getSecondTime().compareTo(bigDecimal5) < 1) { + mes.setSecondGrade(5); + } + if (mes.getSecondTime().compareTo(bigDecimal6) < 1) { + mes.setSecondGrade(6); + } + //判断3分钟单摇跳等级 + if (mes.getMinuteTime().compareTo(bigDecimal7) < 1) { + mes.setMinuteGrade(1); + } + if (mes.getMinuteTime().compareTo(bigDecimal8) < 1) { + mes.setMinuteGrade(2); + } + + if (mes.getMinuteTime().compareTo(bigDecimal9) < 1) { + mes.setMinuteGrade(3); + } + + if (mes.getMinuteTime().compareTo(bigDecimal10) < 1) { + mes.setMinuteGrade(4); + } + + if (mes.getMinuteTime().compareTo(bigDecimal11) < 1) { + mes.setMinuteGrade(5); + } + + if (mes.getMinuteTime().compareTo(bigDecimal12) < 1) { + mes.setMinuteGrade(6); + } + //如果30s得等级小于等于3分钟得等级 + if (mes.getSecondGrade() <= mes.getMinuteGrade()) { + mes.setGrade(mes.getSecondGrade()); + } else { + mes.setGrade(mes.getMinuteGrade()); + } + } } } - return countScoreCurrentSiteList; + return speedPassList; + } + + @Override + public PageInfo queryCountScoreAll(ScoreDto.ShowResult params) { + PageHelper.startPage(params.getPage(),params.getSize()); + List countScoreCurrentSites = competeScoreDao.selectQueryCountScore(params.getProjectId()); + PageInfo pageInfo = new PageInfo<>(countScoreCurrentSites); +// List countScoreCurrentSiteList = new ArrayList<>(); +// CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId()); + +// if(ObjectUtil.isNotNull(competeProject)) { +// if(competeProject.getTeam() == 0) { +// countScoreCurrentSiteList = competeScoreDao.queryCountScoreAll(param.getProjectId()); +// }else { +// countScoreCurrentSiteList = competeScoreDao.queryCountScoreAllByTeam(param.getProjectId()); +// } +// } + return pageInfo; } @Override @@ -1694,4 +1811,78 @@ public class CompeteService implements ICompeteService { return null; } + + @Override + public String speedPassOut(CompeteDto.CompeteTimeAndProjectId params) throws IOException { + List speedPasses = speedPassCha(params); + String path = getExcelFilePathForspeedPassOut(speedPasses); + return path; + } + + private String getExcelFilePathForspeedPassOut(List arrayList) throws IOException { + //创建excle表格对象 + List> list = new ArrayList<>(); + //创建行对象 + List title = new ArrayList<>(); + //给首行单元格赋值 + title.add(new PoiUtil.PoiUtilCell("组别")); + title.add(new PoiUtil.PoiUtilCell("参赛单位")); + title.add(new PoiUtil.PoiUtilCell("姓名")); + title.add(new PoiUtil.PoiUtilCell("30秒单摇跳（次）")); + title.add(new PoiUtil.PoiUtilCell("3分钟单摇跳（次）")); + title.add(new PoiUtil.PoiUtilCell("等级")); + title.add(new PoiUtil.PoiUtilCell("备注")); + list.add(title); + //创建整个excel表格对象 + Workbook workbook = new XSSFWorkbook(); + int i = 1; + for (CompeteVo.SpeedPass speedPass : arrayList) { + //行对象 + List cells = new ArrayList<>(); + cells.add(new PoiUtil.PoiUtilCell(i + "", 1, 1, 300, 18)); + //单元格对象 + PoiUtil.PoiUtilCell poiUtilCel = new PoiUtil.PoiUtilCell(speedPass.getGroupName()); + cells.add(poiUtilCel); + PoiUtil.PoiUtilCell poiUtilCell = new PoiUtil.PoiUtilCell(speedPass.getCompanyName()); + cells.add(poiUtilCell); + PoiUtil.PoiUtilCell poiUtilCel2 = new PoiUtil.PoiUtilCell(speedPass.getPlayerName()); + cells.add(poiUtilCel2); + PoiUtil.PoiUtilCell poiUtilCel3 = new PoiUtil.PoiUtilCell(); + if (ObjectUtil.isNull(speedPass.getSecondTime())){ + poiUtilCel3.setValue(""); + }else { + poiUtilCel3.setValue(speedPass.getSecondTime()+""); + } + cells.add(poiUtilCel3); + PoiUtil.PoiUtilCell poiUtilCel4 = new PoiUtil.PoiUtilCell(); + if (ObjectUtil.isNull(speedPass.getMinuteTime())){ + poiUtilCel4.setValue(""); + }else { + poiUtilCel4.setValue(speedPass.getMinuteTime()+""); + } + cells.add(poiUtilCel4); + PoiUtil.PoiUtilCell poiUtilCel5 = new PoiUtil.PoiUtilCell(String.valueOf(speedPass.getGrade())+""); + cells.add(poiUtilCel5); + list.add(cells); + i++; + } + //生成excel表格对象，并将数据放入 + Workbook wbs = PoiUtil.exportWB("速度通级赛", list, workbook); + //8：关联金山在线文档 + String name = "速度通级赛" + ".xlsx"; + String filepath = "mt/" + DateUtil.today() + "/" + System.currentTimeMillis() + ".xlsx"; + String path = PropUtil.path + filepath; +// String path = filepath; + File tmpFile = new File(path); + if (!tmpFile.getParentFile().exists()) { + tmpFile.getParentFile().mkdirs(); + } + //PropUtil.path获取配置文件中的path属性，拼接生成写入信息的文件名， + File file = new File(path); + OutputStream stream = new FileOutputStream(file); + wbs.write(stream); + stream.close(); + return PropUtil.imgDomain+filepath; + } + } \ No newline at end of file diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java index f250a203..9c8bee58 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteTaskService.java @@ -79,6 +79,10 @@ public class CompeteTaskService implements ICompeteTaskService{ return new ArrayList<>(); } param.getUpdateCompeteTaskList().forEach(projectConfig -> { + //判断时间和时长是否正确 + if(projectConfig.getStartTime() == 0 || projectConfig.getEndTime() == 0 || projectConfig.getDuration() == 0){ + return; + } //获取项目 CompeteProject project = competeProjectDao.selectByPrimaryKey(projectConfig.getProjectId()); if(ObjectUtil.isNotNull(project)){ @@ -108,7 +112,7 @@ public class CompeteTaskService implements ICompeteTaskService{ competeProjectConfig.setEndTime(projectConfig.getEndTime() == null ? 0 : projectConfig.getEndTime()); projectConfigDao.insertSelective(competeProjectConfig); } - // 生成出场顺序表，存入数据库。在tall内添加对应的任务 + //生成出场顺序表，存入数据库。在tall内添加对应的任务 setStartOrder(competeProjectConfig,param.getProjectId(),param.getTallRoleId(),token); }); @@ -132,7 +136,7 @@ public class CompeteTaskService implements ICompeteTaskService{ //计算场次 int order = (int) Math.ceil(projectPlayerList.size() / projectConfig.getSiteNum()); //计算每个场次时间 - long projectStartTime = projectConfig.getStartTime() + Constant.UPLOAD_VIDEO_TIME; + long projectStartTime = projectConfig.getStartTime(); long orderTime = 0; if(order != 0) { orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order); @@ -199,7 +203,7 @@ public class CompeteTaskService implements ICompeteTaskService{ competeStartOrder.setSite((byte) site); competeStartOrder.setTeam((byte) 0); competeStartOrder.setCompeteOrder((byte) competeOrder); - competeStartOrder.setTaskId(taskId); +// competeStartOrder.setTaskId(taskId); competeStartOrder.setStartTime(projectStartTime); competeStartOrder.setEndTime(projectStartTime + orderTime); startOrderMapper.insertSelective(competeStartOrder); @@ -287,7 +291,7 @@ public class CompeteTaskService implements ICompeteTaskService{ competeStartOrder.setSite((byte) site); competeStartOrder.setTeam((byte) 0); competeStartOrder.setCompeteOrder((byte) competeOrder); - competeStartOrder.setTaskId(taskId); +// competeStartOrder.setTaskId(taskId); competeStartOrder.setStartTime(projectStartTime); competeStartOrder.setEndTime(projectStartTime + orderTime); startOrderMapper.insertSelective(competeStartOrder); @@ -418,6 +422,8 @@ public class CompeteTaskService implements ICompeteTaskService{ competeJudgment.setSite(siteJudgment.getSite()); competeJudgment.setChiefJudgment((byte) judgmentInfo.getJudgmentNum()); competeJudgmentDao.insertSelective(competeJudgment); + + //添加角色 MemberRoleDto.SaveRole saveRole = new MemberRoleDto.SaveRole(); saveRole.setProjectId(tallProjectId); diff --git a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java index f3aff429..a826f925 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -22,12 +22,16 @@ import com.ccsens.util.WebConstant; import com.ccsens.util.bean.dto.QueryDto; import com.ccsens.util.exception.BaseException; import com.ctc.wstx.util.DataUtil; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.time.DateUtils; import org.apache.poi.POIDocument; +import org.apache.poi.ss.usermodel.Table; + import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.eclipse.jetty.util.StringUtil; @@ -1152,190 +1156,35 @@ public class ExcelService implements IExcelService { @Override - public List getCompeteJoinDetail(CompeteDto.EnterInfo params) { - List competeJoinList = new ArrayList<>(); - //个人项目查询 - List 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); - competeJoinList.add(competeJoin); - } - //团队项目查询 - List 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); - 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 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 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 competeTeamList = competeTeamDao.selectByExample(competeTeamExample); -// for (CompeteTeam competeTeam : competeTeamList) { -// //获取队伍下的成员集合 -// CompeteTeamMemberExample competeTeamMemberExample = new CompeteTeamMemberExample(); -// competeTeamMemberExample.createCriteria().andCompeteTeamIdEqualTo(competeTeam.getId()); -// List 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; + public PageInfo getCompeteJoinDetail(CompeteDto.EnterInfo params) { +// List competeJoinList = new ArrayList<>(); +// 个人项目查询 +// PageHelper.startPage(params.getPage(),params.getSize()); +// List competeJoinList1 = competeProjectConfigDao.selectSingle(params.getProjectId(),params.getGroupId(),params.getCompanyId(),params.getName(),params.getIdCard()); +// PageInfo pageInfo = new PageInfo<>(competeJoinList1); +// for (TableVo.CompeteJoin competeJoin : competeJoinList1){ +// competeJoinList.add(competeJoin); +// } +// //团队项目查询 +// List competeJoinList2 = competeProjectConfigDao.selectGroup(params.getProjectId(),params.getGroupId(),params.getCompanyId(),params.getName(),params.getIdCard()); +// for (TableVo.CompeteJoin competeJoin : competeJoinList2){ +// competeJoinList.add(competeJoin); +// } + PageHelper.startPage(params.getPage(),params.getSize()); + List competeJoinList = competeProjectConfigDao.selectPeople(params.getProjectId(), params.getGroupId(), params.getCompanyId(), params.getName(), params.getIdCard()); + PageInfo pageInfo = new PageInfo<>(competeJoinList); + return pageInfo; } @Override - public List schedulePlanning(CompeteDto.CompeteTime params) { - List schedulePlanDetailListMorning = new ArrayList<>(); - List schedulePlanDetailListAfternoon = new ArrayList<>(); - List schedulePlanDetailListNight = new ArrayList<>(); + public List schedulePlanning(CompeteDto.CompeteTime params) { +// List schedulePlanDetailListMorning = new ArrayList<>(); +// List schedulePlanDetailListAfternoon = new ArrayList<>(); +// List schedulePlanDetailListNight = new ArrayList<>(); // List schedulePlanList = new ArrayList<>(); //关联查询项目名，该项目在config和project中都存在 - List schedulePlanDetailList = competeProjectConfigDao.selectDetail(); - + List schedulePlanList = competeProjectConfigDao.selectDetail(); +// List schedulePlans.selectDetail(); // TableVo.SchedulePlanAll schedulePlanAll = new TableVo.SchedulePlanAll(); // Set set = new HashSet(); // if (CollectionUtil.isNotEmpty(schedulePlanDetailList)) { @@ -1376,11 +1225,116 @@ public class ExcelService implements IExcelService { // // // } - return schedulePlanDetailList; + return schedulePlanList; + } + + @Override + public String schedulePlanningOut(CompeteDto.CompeteTime params) throws IOException { + List schedulePlanList = schedulePlanning(params); + String path = getExcelFilePathForSchedulePlanning(schedulePlanList); + return path; + } + + + + + private String getExcelFilePathForSchedulePlanning(List arrayList) throws IOException { + //创建excle表格对象 + List> list = new ArrayList<>(); + //创建行对象 + List title = new ArrayList<>(); + //给首行单元格赋值 + title.add(new PoiUtil.PoiUtilCell("序号")); + title.add(new PoiUtil.PoiUtilCell("日期")); + title.add(new PoiUtil.PoiUtilCell("上午")); + title.add(new PoiUtil.PoiUtilCell("下午")); + title.add(new PoiUtil.PoiUtilCell("晚上")); + list.add(title); + //创建整个excel表格对象 + Workbook workbook = new XSSFWorkbook(); + int i = 1; + for (TableVo.SchedulePlan schedulePlan : arrayList) { + //行对象 + List cells = new ArrayList<>(); + cells.add(new PoiUtil.PoiUtilCell(i + "", 1, 1, 3000, 18)); + //单元格对象 + PoiUtil.PoiUtilCell poiUtilCel3 = new PoiUtil.PoiUtilCell(schedulePlan.getDate()); + cells.add(poiUtilCel3); + StringBuilder stringBuilder = new StringBuilder(); + if (CollectionUtil.isNotEmpty(schedulePlan.getSchedulePlanDetailListMorning())) { + for (TableVo.SchedulePlanDetail schedulePlanDetail : schedulePlan.getSchedulePlanDetailListMorning()) { + Date date = new Date(schedulePlanDetail.getStartTime()); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm"); + String year = simpleDateFormat.format(date); + Date date1 = new Date(schedulePlanDetail.getEndTime()); + SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("HH:mm"); + String year1 = simpleDateFormat.format(date); + String string = schedulePlanDetail.getProjectName() + "(" + year +"-"+ year1 + ")"; + stringBuilder.append(string+" \n"); + + } + } + PoiUtil.PoiUtilCell poiUtilCel = new PoiUtil.PoiUtilCell(stringBuilder.toString()); + cells.add(poiUtilCel); + StringBuilder stringBuilder1 = new StringBuilder(); + if (CollectionUtil.isNotEmpty(schedulePlan.getSchedulePlanDetailListAfternoon())) { + for (TableVo.SchedulePlanDetail schedulePlanDetail : schedulePlan.getSchedulePlanDetailListAfternoon()) { + Date date = new Date(schedulePlanDetail.getStartTime()); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm"); + String year = simpleDateFormat.format(date); + Date date1 = new Date(schedulePlanDetail.getEndTime()); + SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("HH:mm"); + String year1 = simpleDateFormat.format(date); + String string = schedulePlanDetail.getProjectName() + "(" + year +"-"+ year1 + ")"; + stringBuilder.append(string+" "); + } + } + PoiUtil.PoiUtilCell poiUtilCell = new PoiUtil.PoiUtilCell(stringBuilder1.toString()); + cells.add(poiUtilCell); + StringBuilder stringBuilder2 = new StringBuilder(); + if (CollectionUtil.isNotEmpty(schedulePlan.getSchedulePlanDetailListNight())){ + for (TableVo.SchedulePlanDetail schedulePlanDetail: schedulePlan.getSchedulePlanDetailListNight()){ + Date date = new Date(schedulePlanDetail.getStartTime()); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm"); + String year = simpleDateFormat.format(date); + Date date1 = new Date(schedulePlanDetail.getEndTime()); + SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("HH:mm"); + String year1 = simpleDateFormat.format(date); + String string = schedulePlanDetail.getProjectName() + "(" + year +"-"+ year1 + ")"; + stringBuilder.append(string+" "); + } + } + PoiUtil.PoiUtilCell poiUtilCel2 = new PoiUtil.PoiUtilCell(stringBuilder2.toString()); + cells.add(poiUtilCel2); + list.add(cells); + i++; + } + //生成excel表格对象，并将数据放入 + Workbook wbs = PoiUtil.exportWB("日程安排", list, workbook); + //8：关联金山在线文档 + String name = "日程安排" + ".xlsx"; + String filepath = "mt/" + DateUtil.today() + "/" + System.currentTimeMillis() + ".xlsx"; + String path = PropUtil.path + filepath; +// String path = filepath; + File tmpFile = new File(path); + if (!tmpFile.getParentFile().exists()) { + tmpFile.getParentFile().mkdirs(); + } + //PropUtil.path获取配置文件中的path属性，拼接生成写入信息的文件名， + File file = new File(path); + OutputStream stream = new FileOutputStream(file); + wbs.write(stream); + stream.close(); + return PropUtil.imgDomain+filepath; } + + + + + @Override - public String patternExpTable(ScoreDto.ShowResult param) { + public String patternExpTable(ScoreDto.ShowResultW param) { List totalScoreDisplays = competeService.showResult(param); List> list = new ArrayList<>(); List zero=new ArrayList<>(); @@ -1632,5 +1586,6 @@ public class ExcelService implements IExcelService { } return PropUtil.domain + "file/download/know?path="+path; } + } diff --git a/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java b/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java index 8ff1de62..699688e3 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java @@ -155,9 +155,9 @@ public interface ICompeteService { void submitOrderList(ScoreDto.InformationSubmitted param); - PageInfo showResultPage(ScoreDto.ShowResult param); + PageInfo showResultPage(ScoreDto.ShowResultW param); - List showResult(ScoreDto.ShowResult param); + List showResult(ScoreDto.ShowResultW param); /** @@ -195,19 +195,30 @@ public interface ICompeteService { * @param params 项目id和场次id * @return 返回项目，开始时间和比赛状态 */ - List speedPass(CompeteDto.CompeteTimeAndProjectId params); + PageInfo speedPass(CompeteDto.CompeteTimeAndProjectId params); + /** + <<<<<<< HEAD + * 速度通级赛(导出) + * @param params 项目id和场次id + * @return 返回项目，开始时间和比赛状态 + */ + String speedPassOut(CompeteDto.CompeteTimeAndProjectId params) throws IOException; + /** 查看技术赛成绩公示表 @param param @return */ - List queryCountScoreAll(ScoreDto.ShowResult param); + PageInfo queryCountScoreAll(ScoreDto.ShowResult param); CompeteVo.SelScropeVo selSubmitOrderList(ScoreDto.SelScrop param); Long getUserCompanyId(Long userId, Byte type); + + + } diff --git a/mt/src/main/java/com/ccsens/mt/service/IExcelService.java b/mt/src/main/java/com/ccsens/mt/service/IExcelService.java index 7cc6d65a..f49334f2 100644 --- a/mt/src/main/java/com/ccsens/mt/service/IExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/IExcelService.java @@ -7,6 +7,7 @@ import com.ccsens.mt.bean.vo.TableVo; import com.ccsens.util.bean.dto.QueryDto; import com.ccsens.mt.bean.dto.CompeteDto; import com.ccsens.util.bean.dto.QueryDto; +import com.github.pagehelper.PageInfo; import java.io.IOException; import java.util.List; @@ -43,7 +44,7 @@ public interface IExcelService { * @param params 大赛id * @return 返回失败的信息 */ - List getCompeteJoinDetail(CompeteDto.EnterInfo params); + PageInfo getCompeteJoinDetail(CompeteDto.EnterInfo params); /** @@ -83,9 +84,22 @@ public interface IExcelService { * @param params 大赛id * @return 返回失败的信息 */ - List schedulePlanning(CompeteDto.CompeteTime params); + List schedulePlanning(CompeteDto.CompeteTime params); - String patternExpTable(ScoreDto.ShowResult param); + /** + * 查询导出 + * @param params 大赛id + * @return 返回失败的信息 + */ + String schedulePlanningOut(CompeteDto.CompeteTime params) throws IOException; + + + + + + + + String patternExpTable(ScoreDto.ShowResultW param); String countExpTable(ScoreDto.ShowResult param); } diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml index f91a50a9..d9006c30 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml @@ -80,80 +80,182 @@ where project_id = #{projectId} + + + + + + + + + + + diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml index 02bfbd9c..54df5d89 100644 --- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml @@ -104,6 +104,64 @@ and tccs.rec_status =0 and tcso.id =#{siteId} + + + + + + + select tcg.group_name AS groupName, - tcp.`name` as playName, + tcp.`name` as playerName, tcc.`name` as companyName, tccp.player_id as playerId, tccp.project_id as projectId diff --git a/mt/src/main/resources/mapper_dao/CompeteTimeDao.xml b/mt/src/main/resources/mapper_dao/CompeteTimeDao.xml index b9d3884b..8c902a7f 100644 --- a/mt/src/main/resources/mapper_dao/CompeteTimeDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteTimeDao.xml @@ -49,6 +49,7 @@ rec_status = 0 and type = #{type} + and sex < 2 ORDER BY sequence diff --git a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java index 75eeab2a..077a72ae 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java @@ -26,6 +26,7 @@ import com.ccsens.util.WebConstant; import com.ccsens.util.cron.CronConstant; import com.ccsens.util.cron.NatureToDate; import com.ccsens.util.exception.BaseException; +import com.fasterxml.jackson.annotation.JsonFormat; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; @@ -282,6 +283,9 @@ public class ProTaskDetailService implements IProTaskDetailService { proTaskDetailExample.setOrderByClause("begin_time"); List firstTaskDetailList = taskDetailDao.selectByExample(proTaskDetailExample); PageInfo pageInfo = new PageInfo<>(firstTaskDetailList); + + + if (CollectionUtil.isNotEmpty(firstTaskDetailList)) { int sequence = 1; for (ProTaskDetail firstTaskDetail : firstTaskDetailList) {