From 480d849b1beb118caa344558fa939a99f1817069 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 14 Nov 2018 10:50:16 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AD=9B=E6=9F=A5=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/common/utils/ExcelUtil.java | 14 +++----------- .../com/lyms/platform/operate/web/facade/SieveFacade.java | 11 ----------- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java index adf2e73..bb41d70 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java @@ -357,27 +357,19 @@ public class ExcelUtil WritableWorkbook book = wb.createWorkbook(out,wb); WritableSheet ws = book.getSheet(0); - WritableFont contentFont = new WritableFont(WritableFont.ARIAL, 12, WritableFont.NO_BOLD, false, UnderlineStyle.NO_UNDERLINE, Colour.BLACK); WritableCellFormat contentFormt = new WritableCellFormat(contentFont); contentFormt.setAlignment(jxl.format.Alignment.CENTRE); contentFormt.setBorder(jxl.format.Border.ALL, jxl.format.BorderLineStyle.THIN); contentFormt.setVerticalAlignment(VerticalAlignment.CENTRE); - WritableFont leftFont = new WritableFont(WritableFont.ARIAL, 12, WritableFont.NO_BOLD, false, UnderlineStyle.NO_UNDERLINE, Colour.BLACK); - WritableCellFormat leftFormt = new WritableCellFormat(leftFont); - leftFormt.setBorder(jxl.format.Border.ALL, jxl.format.BorderLineStyle.THIN); - leftFormt.setAlignment(Alignment.LEFT); - leftFormt.setVerticalAlignment(VerticalAlignment.CENTRE); - - - WritableFont title = new WritableFont(WritableFont.ARIAL, 18, WritableFont.BOLD, false, UnderlineStyle.NO_UNDERLINE, Colour.BLACK); + WritableFont title = new WritableFont(WritableFont.ARIAL, 18, WritableFont.NO_BOLD, false, UnderlineStyle.NO_UNDERLINE, Colour.BLACK); WritableCellFormat titleFormt = new WritableCellFormat(title); titleFormt.setBorder(jxl.format.Border.ALL, jxl.format.BorderLineStyle.THIN); titleFormt.setAlignment(jxl.format.Alignment.CENTRE); titleFormt.setVerticalAlignment(VerticalAlignment.CENTRE); - WritableFont h1Title = new WritableFont(WritableFont.ARIAL, 18, WritableFont.BOLD, false, UnderlineStyle.NO_UNDERLINE, Colour.BLACK); + WritableFont h1Title = new WritableFont(WritableFont.ARIAL, 18, WritableFont.NO_BOLD, false, UnderlineStyle.NO_UNDERLINE, Colour.BLACK); WritableCellFormat h1Formt = new WritableCellFormat(h1Title); h1Formt.setBorder(jxl.format.Border.ALL, jxl.format.BorderLineStyle.THIN); h1Formt.setAlignment(Alignment.LEFT); @@ -386,7 +378,7 @@ public class ExcelUtil Label label = new Label(0, 0, titleName,titleFormt); ws.addCell(label); - Label label1 = new Label(1, 0, h1,h1Formt); + Label label1 = new Label(0, 1, h1,h1Formt); ws.addCell(label1); int arrayIndex = 0; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index f5e6b6a..5c2dd85 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -1791,9 +1791,6 @@ public class SieveFacade { } } disStopCount = diagnosisService.queryDiagnosisCount(diagnosisQuery1); - - - dataMap.put("sieveCount",String.valueOf(sieveCount)); dataMap.put("st21Count",String.valueOf(st21Count)); dataMap.put("st1813Count",String.valueOf(st1813Count)); @@ -1802,7 +1799,6 @@ public class SieveFacade { dataMap.put("disCount",String.valueOf(disCount)); dataMap.put("disExcCount",String.valueOf(disExcCount)); dataMap.put("disStopCount",String.valueOf(disStopCount)); - dataMap.put("csDiaCount",String.valueOf(csDiaCount)); dataMap.put("csClCount",String.valueOf(csClCount)); dataMap.put("csDzCount",String.valueOf(csDzCount)); @@ -1814,16 +1810,12 @@ public class SieveFacade { dataMap.put("csJxCount",String.valueOf(csJxCount)); dataMap.put("ysDiaCount",String.valueOf(ysDiaCount)); dataMap.put("csDiaExcCount",String.valueOf(csDiaExcCount)); - dataMap.put("rmDiaCount",String.valueOf(rmDiaCount)); dataMap.put("rmDiaExcCount",String.valueOf(rmDiaExcCount)); - dataMap.put("teDiaCount",String.valueOf(teDiaCount)); dataMap.put("teDiaExcCount",String.valueOf(teDiaExcCount)); - dataMap.put("qtDiaCount",String.valueOf(qtDiaCount)); dataMap.put("qtDiaExcCount",String.valueOf(qtDiaExcCount)); - dataMap.put("hjDiaCount",String.valueOf(hjDiaCount)); dataMap.put("hjDiaExcCount",String.valueOf(hjDiaExcCount)); dataMap.put("hjStopCount",String.valueOf(hjStopCount)); @@ -1887,13 +1879,11 @@ public class SieveFacade { disCount += Integer.parseInt(map.get("disCount")); disExcCount += Integer.parseInt(map.get("disExcCount")); disStopCount += Integer.parseInt(map.get("disStopCount")); - csDiaCount += Integer.parseInt(map.get("csDiaCount")); csClCount += Integer.parseInt(map.get("csClCount")); csDzCount += Integer.parseInt(map.get("csDzCount")); csXzbCount += Integer.parseInt(map.get("csXzbCount")); csSjgqxCount += Integer.parseInt(map.get("csSjgqxCount")); - csNjsCount += Integer.parseInt(map.get("csNjsCount")); csZtdsCount += Integer.parseInt(map.get("csZtdsCount")); csQtCount += Integer.parseInt(map.get("csQtCount")); @@ -1905,7 +1895,6 @@ public class SieveFacade { teDiaCount += Integer.parseInt(map.get("teDiaCount")); teDiaExcCount += Integer.parseInt(map.get("teDiaExcCount")); qtDiaCount += Integer.parseInt(map.get("qtDiaCount")); - qtDiaExcCount += Integer.parseInt(map.get("qtDiaExcCount")); hjDiaCount += Integer.parseInt(map.get("hjDiaCount")); hjDiaExcCount += Integer.parseInt(map.get("hjDiaExcCount")); -- 1.8.3.1