From b1e227a49fdf29a0079ad5af1a6edc144d7340fd Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Wed, 25 Nov 2020 20:19:34 +0800 Subject: [PATCH 1/4] =?UTF-8?q?20201125v1.8=E4=BF=AE=E6=94=B9=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mt/src/main/resources/mapper_dao/CompeteScoreDao.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml index 0355187d..85d0c322 100644 --- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml @@ -743,8 +743,8 @@ IF ( ( - ( tcp.id IN ( SELECT t_compete_project_player.player_id FROM t_compete_project_player ) ) - OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member ) ) + ( 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) ) ), 1, 0 @@ -839,8 +839,8 @@ IF ( ( - ( tcp.id IN ( SELECT t_compete_project_player.player_id FROM t_compete_project_player ) ) - OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member ) ) + ( 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) ) ), 1, 0 From 9b48f85094aa6b0fa92169a6922584760708063b Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Wed, 25 Nov 2020 20:19:50 +0800 Subject: [PATCH 2/4] =?UTF-8?q?poi=20=E6=95=B4=E6=95=B0=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E8=BD=AC=E6=88=90=E6=95=B0=E5=AD=97=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- util/src/main/java/com/ccsens/util/PoiUtil.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/util/src/main/java/com/ccsens/util/PoiUtil.java b/util/src/main/java/com/ccsens/util/PoiUtil.java index af0f96ad..9f0c5826 100644 --- a/util/src/main/java/com/ccsens/util/PoiUtil.java +++ b/util/src/main/java/com/ccsens/util/PoiUtil.java @@ -178,9 +178,14 @@ public class PoiUtil { CellStyle style = wb.createCellStyle(); //设置内容 if (!WebConstant.CELL_NULL.equals(cell.value)){ - if(cell.num == 1){ - newCell.setCellValue(Integer.parseInt(cell.value)); - }else { +// if(cell.num == 1){ +// newCell.setCellValue(Integer.parseInt(cell.value)); +// }else { +// newCell.setCellValue(cell.value); +// } + if (cell.value.matches("\\d+")) { + newCell.setCellValue(Long.parseLong(cell.value)); + } else { newCell.setCellValue(cell.value); } } @@ -627,7 +632,7 @@ public class PoiUtil { PoiUtilCell poiUtilCella = new PoiUtilCell(); PoiUtilCell poiUtilCellb = new PoiUtilCell(); PoiUtilCell poiUtilCell1 = new PoiUtilCell(); - poiUtilCell1.setValue("aaadddfffersdfsdfasftargadfgergsdfhasfgasfgaertagaergafdhsfgjfyk"); + poiUtilCell1.setValue("1"); List cells = new ArrayList<>(); cells.add(poiUtilCell); From 91d2343ffda6803909b2c1bd6092f2368dba409e Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Wed, 25 Nov 2020 20:45:56 +0800 Subject: [PATCH 3/4] =?UTF-8?q?poi=20=E6=95=B0=E5=AD=97=E9=95=BF=E5=BA=A6?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E8=B6=85=E8=BF=8714=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- util/src/main/java/com/ccsens/util/PoiUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/src/main/java/com/ccsens/util/PoiUtil.java b/util/src/main/java/com/ccsens/util/PoiUtil.java index 9f0c5826..d6920a3d 100644 --- a/util/src/main/java/com/ccsens/util/PoiUtil.java +++ b/util/src/main/java/com/ccsens/util/PoiUtil.java @@ -183,7 +183,7 @@ public class PoiUtil { // }else { // newCell.setCellValue(cell.value); // } - if (cell.value.matches("\\d+")) { + if (cell.value.length() <= 14 && cell.value.matches("\\d+")) { newCell.setCellValue(Long.parseLong(cell.value)); } else { newCell.setCellValue(cell.value); From adefe2cfc961c1f1c5ff1c22f18143c5bda47535 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Wed, 25 Nov 2020 20:53:57 +0800 Subject: [PATCH 4/4] 20201125v1.9 --- .../java/com/ccsens/mt/service/ExcelService.java | 2 ++ mt/src/main/resources/application.yml | 4 ++-- util/src/main/java/com/ccsens/util/PoiUtil.java | 12 ++++++------ 3 files changed, 10 insertions(+), 8 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 fb1e23a2..0465d9ce 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -858,6 +858,8 @@ public class ExcelService implements IExcelService { cells.add(poiUtilCel); } } +// PoiUtil.PoiUtilCell poiUtilCel = new PoiUtil.PoiUtilCell("","=SUM(D"+i+":R"+i+")"); +// cells.add(poiUtilCel); // PoiUtil.PoiUtilCell poiUtilCel = new PoiUtil.PoiUtilCell(String.valueOf(competeAllCount.getNums().get(0))); // cells.add(poiUtilCel); // PoiUtil.PoiUtilCell poiUtilCell = new PoiUtil.PoiUtilCell(String.valueOf(competeAllCount.getNums().get(1))); diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index b9b264a7..f59084b0 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: prod - include: common, util-prod + active: test + include: common, util-test diff --git a/util/src/main/java/com/ccsens/util/PoiUtil.java b/util/src/main/java/com/ccsens/util/PoiUtil.java index af0f96ad..a5242a95 100644 --- a/util/src/main/java/com/ccsens/util/PoiUtil.java +++ b/util/src/main/java/com/ccsens/util/PoiUtil.java @@ -623,17 +623,17 @@ public class PoiUtil { PoiUtilCell poiUtilCell = new PoiUtilCell(); poiUtilCell.setValue("111222333"); - poiUtilCell.setColspan(3); - PoiUtilCell poiUtilCella = new PoiUtilCell(); - PoiUtilCell poiUtilCellb = new PoiUtilCell(); + poiUtilCell.setColspan(1); PoiUtilCell poiUtilCell1 = new PoiUtilCell(); - poiUtilCell1.setValue("aaadddfffersdfsdfasftargadfgergsdfhasfgasfgaertagaergafdhsfgjfyk"); + poiUtilCell1.setValue("123"); + PoiUtilCell poiUtilCell2 = new PoiUtilCell(); + poiUtilCell2.setValue(""); + poiUtilCell2.setFunction("SUM(A1:B1)"); List cells = new ArrayList<>(); cells.add(poiUtilCell); - cells.add(poiUtilCella); - cells.add(poiUtilCellb); cells.add(poiUtilCell1); + cells.add(poiUtilCell2); List> list = new ArrayList<>(); list.add(cells);