diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java index 644838c1..e185a41c 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/VideoProjectVo.java @@ -6,6 +6,8 @@ import lombok.Data; import lombok.Getter; import lombok.Setter; +import java.util.Date; + @Data public class VideoProjectVo { @@ -48,7 +50,7 @@ public class VideoProjectVo { @ApiModelProperty("裁判类型") private byte chiefJudgment; @ApiModelProperty("最近签到时间") - private Long time; + private Date time; } 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 fe673a9a..8ef0e06e 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -1379,8 +1379,8 @@ public class ExcelService implements IExcelService { 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 oneOne=new PoiUtil.PoiUtilCell("参赛单位", 1, 1); + PoiUtil.PoiUtilCell oneTwo=new PoiUtil.PoiUtilCell("参赛队员", 1, 1); PoiUtil.PoiUtilCell oneThree=new PoiUtil.PoiUtilCell("创意编排分", 3, 1); PoiUtil.PoiUtilCell oneFour=new PoiUtil.PoiUtilCell("创意最后得分", 1, 1); PoiUtil.PoiUtilCell oneFive=new PoiUtil.PoiUtilCell("完成质量分", 3, 1); @@ -1399,8 +1399,21 @@ public class ExcelService implements IExcelService { one.add(oneEight); one.add(oneNine); one.add(oneTen); + list.add(one); List two=new ArrayList<>(); - PoiUtil.PoiUtilCell twoOne=new PoiUtil.PoiUtilCell("参赛单位", 1, 2); + PoiUtil.PoiUtilCell twoOne=new PoiUtil.PoiUtilCell(); + PoiUtil.PoiUtilCell twoTwo=new PoiUtil.PoiUtilCell(); + 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); + PoiUtil.PoiUtilCell twoSix=new PoiUtil.PoiUtilCell(); + PoiUtil.PoiUtilCell twoSeven=new PoiUtil.PoiUtilCell("1", 1, 1); + PoiUtil.PoiUtilCell twoEight=new PoiUtil.PoiUtilCell("2", 1, 1); + PoiUtil.PoiUtilCell twoNight=new PoiUtil.PoiUtilCell("3", 1, 1); + two.add(twoOne); + two.add(twoTwo); + two.add(twoThree); + two.add(twoFour); return null; } }