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 81bb0ffa..dbd6081c 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java @@ -18,6 +18,7 @@ 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 springfox.documentation.spring.web.json.Json; import javax.annotation.Resource; import java.util.List; 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 80ea10e5..c497e672 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ExcelController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ExcelController.java @@ -4,6 +4,7 @@ package com.ccsens.mt.api; import com.ccsens.cloudutil.annotation.MustLogin; import com.ccsens.mt.bean.dto.CompeteDto; import com.ccsens.mt.bean.dto.ProvinceCompeteDto; +import com.ccsens.mt.bean.dto.ScoreDto; import com.ccsens.mt.bean.vo.TableVo; import com.ccsens.mt.service.IExcelService; import com.ccsens.util.JsonResponse; @@ -122,4 +123,13 @@ public class ExcelController { List schedulePlanDetailList = excelService.schedulePlanning(params.getParam()); return JsonResponse.newInstance().ok(schedulePlanDetailList); } + @MustLogin + @ApiOperation(value = "花样赛成绩导出(导出)", notes = "") + @RequestMapping(value = "/patternExpTable", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse patternExpTable(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("参赛人数统计表:{}",params); + String path = excelService.patternExpTable(params.getParam()); + return JsonResponse.newInstance().ok(path); + } + } 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 73f4b577..36d990fd 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 @@ -468,7 +468,7 @@ public class CompeteVo { @ApiModel("花样赛总成绩") public static class TotalScoreDisplay{ - @ApiModelProperty("项目名") + @ApiModelProperty("单位名") public String companyName; @ApiModelProperty("参赛队员名") public String peopleName; 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 006938c2..fe673a9a 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -5,8 +5,10 @@ import cn.hutool.core.util.IdcardUtil; import cn.hutool.core.util.ObjectUtil; import com.ccsens.mt.bean.dto.CompeteDto; import com.ccsens.mt.bean.dto.ProvinceCompeteDto; +import com.ccsens.mt.bean.dto.ScoreDto; import com.ccsens.mt.bean.po.*; import com.ccsens.mt.bean.vo.CompeteExcelVo; +import com.ccsens.mt.bean.vo.CompeteVo; import com.ccsens.mt.bean.vo.TableVo; import com.ccsens.mt.persist.dao.*; import com.ccsens.mt.persist.mapper.*; @@ -81,6 +83,9 @@ public class ExcelService implements IExcelService { @Resource private CompeteProjectDao competeProjectDao; + @Resource + private ICompeteService competeService; + @Override public String dasaiduiwuxinxiWPS(QueryDto params) { //这个里面包含联系人得信息 @@ -1368,5 +1373,35 @@ public class ExcelService implements IExcelService { // } return schedulePlanDetailList; } + + @Override + public String patternExpTable(ScoreDto.ShowResult param) { + List totalScoreDisplays = competeService.showResult(param); + List> list = new ArrayList<>(); + List one=new ArrayList<>(); + PoiUtil.PoiUtilCell oneOne=new PoiUtil.PoiUtilCell("参赛单位", 1, 2); + 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 oneFive=new PoiUtil.PoiUtilCell("完成质量分", 3, 1); + PoiUtil.PoiUtilCell oneSix=new PoiUtil.PoiUtilCell("完成最后得分", 1, 1); + PoiUtil.PoiUtilCell oneSeven=new PoiUtil.PoiUtilCell("主裁判扣分", 1, 1); + PoiUtil.PoiUtilCell oneEight=new PoiUtil.PoiUtilCell("最后得分", 1, 1); + PoiUtil.PoiUtilCell oneNine=new PoiUtil.PoiUtilCell("名次", 1, 1); + PoiUtil.PoiUtilCell oneTen=new PoiUtil.PoiUtilCell("备注", 1, 1); + one.add(oneOne); + one.add(oneTwo); + one.add(oneThree); + one.add(oneFour); + one.add(oneFive); + one.add(oneSix); + one.add(oneSeven); + one.add(oneEight); + one.add(oneNine); + one.add(oneTen); + List two=new ArrayList<>(); + PoiUtil.PoiUtilCell twoOne=new PoiUtil.PoiUtilCell("参赛单位", 1, 2); + return null; + } } 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 29fb90a6..9eb5a563 100644 --- a/mt/src/main/java/com/ccsens/mt/service/IExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/IExcelService.java @@ -2,6 +2,7 @@ package com.ccsens.mt.service; import com.ccsens.mt.bean.dto.CompeteDto; import com.ccsens.mt.bean.dto.ProvinceCompeteDto; +import com.ccsens.mt.bean.dto.ScoreDto; import com.ccsens.mt.bean.vo.TableVo; import com.ccsens.util.bean.dto.QueryDto; import com.ccsens.mt.bean.dto.CompeteDto; @@ -84,4 +85,5 @@ public interface IExcelService { */ List schedulePlanning(CompeteDto.CompeteTime params); + String patternExpTable(ScoreDto.ShowResult param); } diff --git a/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml b/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml index 88fcaf07..fb61539f 100644 --- a/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml @@ -14,16 +14,16 @@ select company_id,max(look_time) as `look_time` FROM t_compete_player_look where `rec_status`=0 - + and t_compete_player_look.`look_time` <= #{param.signEndTime} ) tcpl on tcpl.company_id=tcc.id where tct.id= #{param.id} - + and tcc.`name`=#{param.name} - + and tcc.`contacts_name`=#{param.phone} and tcc.`rec_status`=0 @@ -43,17 +43,17 @@ user_id From tall.t_sys_log where `url`='/users/signin' and `rec_status`=0 - + and tall.t_sys_log.created_at <= #{param.signEndTime} ) tt on tt.`user_id`=tcj.`user_id` LEFT JOIN t_compete_time tct on tct.id =tcj.`compete_time_id` WHERE tct.id=#{param.id} - + and tcj.`name`=#{param.name} - + and tcj.`phone`=#{param.phone} and tcj.`rec_status`=0