From d2d385792283c86819118d1f85b112d7ffe03064 Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Thu, 26 Nov 2020 11:38:35 +0800 Subject: [PATCH 1/5] 1 --- .../com/ccsens/mt/api/ExcelController.java | 2 +- .../com/ccsens/mt/service/ExcelService.java | 94 ++++++++++++++++++- .../com/ccsens/mt/service/IExcelService.java | 2 +- .../main/java/com/ccsens/util/PoiUtil.java | 3 + 4 files changed, 97 insertions(+), 4 deletions(-) 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 c09e9d95..c5a54df3 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ExcelController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ExcelController.java @@ -69,7 +69,7 @@ public class ExcelController { @MustLogin @ApiOperation(value = "XXX比赛报名汇总表(导出)", notes = "") @RequestMapping(value = "/competeAllCount", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse competeAllCount(@ApiParam @Validated @RequestBody QueryDto params) throws IOException { + public JsonResponse competeAllCount(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { log.info("XXX比赛报名汇总表：{}",params); String path = excelService.competeAllCount(params.getParam()); return JsonResponse.newInstance().ok(path); 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 6d7bb9c9..45dd5b42 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -683,7 +683,7 @@ public class ExcelService implements IExcelService { } @Override - public String competeAllCount(CompeteDto.CompeteTime params) throws IOException { + public String competeAllCount(CompeteDto.CompeteTime params) throws Exception { List competeAllCountList = competeAllCountList1(params.getCompeteTimeId()); return getExcelFilePathForCompeteAllCount(competeAllCountList); } @@ -814,7 +814,7 @@ public class ExcelService implements IExcelService { } - private String getExcelFilePathForCompeteAllCount(List arrayList) throws IOException { + private String getExcelFilePathForCompeteAllCount(List arrayList) throws Exception { //创建excle表格对象 List> list = new ArrayList<>(); //创建行对象 @@ -866,6 +866,96 @@ public class ExcelService implements IExcelService { list.add(cells); i++; a++; + if (competeAllCount.getProjectId()==2017){ + cells = new ArrayList<>(); + PoiUtil.PoiUtilCell poiUtilCel = new PoiUtil.PoiUtilCell(); + poiUtilCel.setValue("--"); + cells.add(poiUtilCel); + PoiUtil.PoiUtilCell poiUtilCel1 = new PoiUtil.PoiUtilCell(); + poiUtilCel1.setValue("合计"); + cells.add(poiUtilCel1); + for (int j = 3; j <19 ; j++) { + PoiUtil.PoiUtilCell poiUtilCel2 = new PoiUtil.PoiUtilCell(); + if (j==3){ + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(C2:C8)"); + cells.add(poiUtilCel2); + } + if (j==4){ + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(D2:D8)"); + cells.add(poiUtilCel2); + } + if (j==5){ + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(E2:E8)"); + cells.add(poiUtilCel2); + } + if (j==6){ + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(F2:F8)"); + cells.add(poiUtilCel2); + } if (j==7){ + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(G2:G8)"); + cells.add(poiUtilCel2); + } if (j==8){ + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(H2:H8)"); + cells.add(poiUtilCel2); + } if (j==9){ + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(I2:I8)"); + cells.add(poiUtilCel2); + } if (j==10){ + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(J2:J8)"); + cells.add(poiUtilCel2); + } if (j==11){ + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(K2:K8)"); + cells.add(poiUtilCel2); + } + if (j==12){ + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(L2:L8)"); + cells.add(poiUtilCel2); + } + if (j==13){ + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(M2:N8)"); + cells.add(poiUtilCel2); + } + if (j==14){ + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(N2:N8)"); + cells.add(poiUtilCel2); + } + if (j==15){ + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(O2:O8)"); + cells.add(poiUtilCel2); + } + if (j==16){ + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(P2:P8)"); + cells.add(poiUtilCel2); + } + if (j==17){ + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(Q2:Q8)"); + cells.add(poiUtilCel2); + } + if (j==18){ + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(R2:R8)"); + cells.add(poiUtilCel2); + } +// String T1 = PoiUtil.toRadix(j); +// poiUtilCel2.setFunction("sum(c"+2+":c"+8+")"); + } + list.add(cells); + } } //生成excel表格对象，并将数据放入 Workbook wbs = PoiUtil.exportWB("比赛报名汇总表", list, workbook); 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 f000aa2b..3fca6b81 100644 --- a/mt/src/main/java/com/ccsens/mt/service/IExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/IExcelService.java @@ -58,7 +58,7 @@ public interface IExcelService { * @param params 大赛id * @return 返回失败的信息 */ - String competeAllCount(CompeteDto.CompeteTime params) throws IOException; + String competeAllCount(CompeteDto.CompeteTime params) throws Exception; String iCompetitionOrderService(QueryDto params); diff --git a/util/src/main/java/com/ccsens/util/PoiUtil.java b/util/src/main/java/com/ccsens/util/PoiUtil.java index 7500c5bf..63dd5078 100644 --- a/util/src/main/java/com/ccsens/util/PoiUtil.java +++ b/util/src/main/java/com/ccsens/util/PoiUtil.java @@ -597,6 +597,9 @@ public class PoiUtil { public static void main(String[] args) throws Exception { + String s = toRadix(3); + System.out.println(s); + // File file = new File("F:\\wenjian\\3.xlsx"); // file.createNewFile(); From e8032c64310648dac9059452868c83c54e8f897a Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Thu, 26 Nov 2020 11:54:38 +0800 Subject: [PATCH 2/5] 1 --- .../com/ccsens/mt/service/ExcelService.java | 18 ++++++++++++++++++ mt/src/main/resources/application.yml | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) 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 32ddc1d4..f589028e 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -863,6 +863,24 @@ public class ExcelService implements IExcelService { } list.add(cells); } +// +// if (competeAllCount.getProjectId()==2026){ +// cells = new ArrayList<>(); +// PoiUtil.PoiUtilCell poiUtilCel = new PoiUtil.PoiUtilCell(); +// poiUtilCel.setValue("--"); +// cells.add(poiUtilCel); +// PoiUtil.PoiUtilCell poiUtilCel1 = new PoiUtil.PoiUtilCell(); +// poiUtilCel1.setValue("合计"); +// cells.add(poiUtilCel1); +// PoiUtil.PoiUtilCell poiUtilCel2 = new PoiUtil.PoiUtilCell(3 + "", 15, 1, 300, 18); +// poiUtilCel2.setValue(""); +// poiUtilCel2.setFunction("sum(C8:C16)"); +// cells.add(poiUtilCel2); +// list.add(cells); +// } + + + } //生成excel表格对象，并将数据放入 Workbook wbs = PoiUtil.exportWB("比赛报名汇总表", list, workbook); diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index 1ac895fc..a47f2a7b 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: prod - include: common, util-prod + active: dev + include: common, util-dev From 574232213da6e398d07a4b841e798c64ed86b821 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Thu, 26 Nov 2020 14:12:27 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E7=AD=BE=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccsens/mt/api/CompeteVideoController.java | 3 +- .../mt/service/CompeteVedioService.java | 2 +- .../resources/mapper_dao/CompeteScoreDao.xml | 10 +---- .../resources/mapper_dao/CompeteVideoDao.xml | 44 +++++++++++++------ 4 files changed, 34 insertions(+), 25 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java index de32b618..a508ebdd 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteVideoController.java @@ -32,7 +32,7 @@ public class CompeteVideoController { private ICompeteVedioService iCompeteVedioService; @MustLogin - @ApiOperation(value = "添加用户观看开幕式视频记录（签到用）", notes = "Mr.王---------根据公司的id在t_compete_player_look表中插入一条数据，单表操作，") + @ApiOperation(value = "添加单位观看开幕式视频记录（签到用）", notes = "Mr.王---------根据公司的id在t_compete_player_look表中插入一条数据，单表操作，") @RequestMapping(value = "/addUserSign", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse addCompeteCompany(@ApiParam @Validated @RequestBody QueryDto params) { log.info("添加用户观看开幕式视频记录（签到用）:{}",params); @@ -42,7 +42,6 @@ public class CompeteVideoController { @MustLogin @ApiOperation(value = "查看用户观看视频记录（签到用）", notes = "Mr.王---------根据公司的id在t_compete_player_look表中查询数据，单表操作，如果是看了，返回true，没看返回false") @RequestMapping(value = "/selectUserSign", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse selCompeteCompany(@ApiParam @Validated @RequestBody QueryDto params) { log.info("添加用户观看开幕式视频记录（签到用）:{}",params); boolean code= iCompeteVedioService.selectSignVideo(params.getParam().getCompanyId()); diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java index 7ac80102..ba21294c 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteVedioService.java @@ -61,7 +61,7 @@ public class CompeteVedioService implements ICompeteVedioService{ @Override public boolean selectSignVideo(Long companyId) { CompetePlayerLookExample competePlayerLookExample=new CompetePlayerLookExample(); - competePlayerLookExample.createCriteria().andCompanyIdEqualTo(companyId); + competePlayerLookExample.createCriteria().andCompanyIdEqualTo(companyId).andRecStatusEqualTo((byte) 0); List competePlayerLooks = competePlayerLookMapper.selectByExample(competePlayerLookExample); return competePlayerLooks.size()==0? false:true; } diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml index 82dc9fa9..ddf2bf95 100644 --- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml @@ -743,13 +743,9 @@ IF ( ( -<<<<<<< HEAD + ( tcp.id IN ( SELECT t_compete_project_player.player_id FROM t_compete_project_player where t_compete_project_player.rec_status=0) ) OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member where t_compete_team_member.rec_status=0 ) ) -======= - ( tcp.id IN ( SELECT t_compete_project_player.player_id FROM t_compete_project_player WHERE rec_status = 0) ) - OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member WHERE rec_status = 0) ) ->>>>>>> 4adc089d09a6c4afde0f4ad70b88920c167d5e7a ), 1, 0 @@ -847,10 +843,6 @@ ( tcp.id IN ( SELECT t_compete_project_player.player_id FROM t_compete_project_player where t_compete_project_player.rec_status=0 ) ) OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member where t_compete_team_member.rec_status=0 ) ) --- ======= --- ( tcp.id IN ( SELECT t_compete_project_player.player_id FROM t_compete_project_player WHERE rec_status = 0) ) --- OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member WHERE rec_status = 0) ) --- >>>>>>> 4adc089d09a6c4afde0f4ad70b88920c167d5e7a ), 1, 0 diff --git a/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml b/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml index afe3cafe..47ac4744 100644 --- a/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml @@ -8,7 +8,37 @@ tcc.`contacts_phone` as phone, tcpl.`look_time` as `time` from - t_compete_company tcc + ( + SELECT + * + FROM + ( + SELECT + tcc.*, + ( + IF + ( + ( + ( tcp.id IN ( SELECT t_compete_project_player.player_id FROM t_compete_project_player WHERE t_compete_project_player.rec_status = 0 ) ) + OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member WHERE t_compete_team_member.rec_status = 0 ) ) + ), + 1, + 0 + ) + ) AS `after` + FROM + t_compete_company tcc + LEFT JOIN t_compete_player tcp ON tcp.company_id = tcc.id + WHERE + tcc.rec_status = 0 + AND tcp.rec_status = 0 + AND tcc.compete_time_id = 1 + ) t + WHERE + `after` != 0 + GROUP BY + t.id + ) tcc LEFT JOIN t_compete_time tct on tct.id=tcc.compete_time_id LEFT JOIN ( select company_id,max(look_time) as `look_time` @@ -18,18 +48,6 @@ and t_compete_player_look.`look_time` <= #{param.signEndTime,jdbcType=TIMESTAMP} group by company_id - - - - - - - - - - - - ) tcpl on tcpl.company_id=tcc.id where tct.id= #{param.id} From 19ada2817f0d04e4409e23ecf7c3792a8122b65d Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Thu, 26 Nov 2020 14:29:50 +0800 Subject: [PATCH 4/5] 11-26-1 --- .../com/ccsens/mt/service/ExcelService.java | 34 +++++++++++-------- .../resources/mapper_dao/CompeteScoreDao.xml | 5 --- 2 files changed, 19 insertions(+), 20 deletions(-) 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 f589028e..07e3f9e0 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -863,21 +863,25 @@ public class ExcelService implements IExcelService { } list.add(cells); } -// -// if (competeAllCount.getProjectId()==2026){ -// cells = new ArrayList<>(); -// PoiUtil.PoiUtilCell poiUtilCel = new PoiUtil.PoiUtilCell(); -// poiUtilCel.setValue("--"); -// cells.add(poiUtilCel); -// PoiUtil.PoiUtilCell poiUtilCel1 = new PoiUtil.PoiUtilCell(); -// poiUtilCel1.setValue("合计"); -// cells.add(poiUtilCel1); -// PoiUtil.PoiUtilCell poiUtilCel2 = new PoiUtil.PoiUtilCell(3 + "", 15, 1, 300, 18); -// poiUtilCel2.setValue(""); -// poiUtilCel2.setFunction("sum(C8:C16)"); -// cells.add(poiUtilCel2); -// list.add(cells); -// } + + if (competeAllCount.getProjectId()==2026){ + cells = new ArrayList<>(); + PoiUtil.PoiUtilCell poiUtilCel = new PoiUtil.PoiUtilCell(); + poiUtilCel.setValue("--"); + cells.add(poiUtilCel); + PoiUtil.PoiUtilCell poiUtilCel1 = new PoiUtil.PoiUtilCell(); + poiUtilCel1.setValue("合计"); + cells.add(poiUtilCel1); + PoiUtil.PoiUtilCell poiUtilCel2 = new PoiUtil.PoiUtilCell(3 + "", 15, 1, 300, 18); + poiUtilCel2.setValue(""); + poiUtilCel2.setFunction("sum(C10:C18)"); + cells.add(poiUtilCel2); + PoiUtil.PoiUtilCell poiUtilCel3 = new PoiUtil.PoiUtilCell(); + poiUtilCel3.setValue(""); + poiUtilCel3.setFunction("sum(R2:C19)"); + cells.add(poiUtilCel3); + list.add(cells); + } diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml index 82dc9fa9..fa3c0e0d 100644 --- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml @@ -743,13 +743,8 @@ IF ( ( -<<<<<<< HEAD ( tcp.id IN ( SELECT t_compete_project_player.player_id FROM t_compete_project_player where t_compete_project_player.rec_status=0) ) OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member where t_compete_team_member.rec_status=0 ) ) -======= - ( tcp.id IN ( SELECT t_compete_project_player.player_id FROM t_compete_project_player WHERE rec_status = 0) ) - OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member WHERE rec_status = 0) ) ->>>>>>> 4adc089d09a6c4afde0f4ad70b88920c167d5e7a ), 1, 0 From cc91b0f3502f4aae800a4a732e86019e32360b22 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Thu, 26 Nov 2020 14:32:49 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E9=97=B4?= =?UTF-8?q?=E9=9A=94=E4=B8=BA=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mt/src/main/resources/mapper_dao/CompeteScoreDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml index ddf2bf95..c6d4860b 100644 --- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml @@ -732,7 +732,7 @@ SELECT id, companyName, - GROUP_CONCAT( `name` ) AS `names` + GROUP_CONCAT( `name` separator '、' ) AS `names` FROM ( SELECT