From 435f2db211316b840a6055a9a12cb1ef94e5d9d9 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 4 Dec 2018 10:59:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/common/utils/ExcelUtil.java  |  51 +++++++++++----------
 .../platform/operate/web/facade/ViewFacade.java    |   9 ++--
 .../src/main/resources/fm_record.xls               | Bin 19968 -> 49152 bytes
 3 files changed, 33 insertions(+), 27 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 93db010..a155bf0 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
@@ -4,10 +4,7 @@ import java.io.*;
 import java.util.*;
 
 
-import jxl.Cell;
-import jxl.Range;
-import jxl.Sheet;
-import jxl.Workbook;
+import jxl.*;
 import jxl.format.*;
 import jxl.format.Alignment;
 import jxl.format.Colour;
@@ -241,8 +238,9 @@ public class ExcelUtil
                 try {
                         in = new FileInputStream(file);
                         wb = Workbook.getWorkbook(in);
-
-                        WritableWorkbook book = wb.createWorkbook(out,wb);
+                        WorkbookSettings settings = new WorkbookSettings ();
+                        settings.setWriteAccess(null);
+                        WritableWorkbook book = wb.createWorkbook(out,wb,settings);
                         WritableSheet ws = book.getSheet(0);
 
                         WritableFont contentFont = new WritableFont(WritableFont.ARIAL, 12, WritableFont.NO_BOLD, false, UnderlineStyle.NO_UNDERLINE, Colour.BLACK);
@@ -255,26 +253,33 @@ public class ExcelUtil
                         for (int i = 2, len = values.size()+2; i < len; i++, arrayIndex++)
                         {
 
-                                Set<String> sets = values.get(arrayIndex).keySet();
-                                int j = 0;
-                                for (String key : sets)
-                                {
-                                        String value = values.get(arrayIndex).get(key)+"";
-                                        if (StringUtils.isNotEmpty(value) && StringUtils.isNum(value))
-                                        {
-                                                WritableCellFormat wcfN = new WritableCellFormat(contentFont);
-                                                wcfN.setBorder(jxl.format.Border.ALL, jxl.format.BorderLineStyle.THIN);
-                                                wcfN.setAlignment(jxl.format.Alignment.CENTRE);
-                                                wcfN.setVerticalAlignment(VerticalAlignment.CENTRE);
-                                                Number labelNF = new Number(j,  i,Integer.parseInt(value), wcfN);
-                                                ws.addCell(labelNF);
-                                        }
-                                        else
+                                try {
+                                        Set<String> sets = values.get(arrayIndex).keySet();
+                                        int j = 0;
+                                        for (String key : sets)
                                         {
-                                                ws.addCell(new Label(j,  i,value, contentFormt));
+                                                String value = values.get(arrayIndex).get(key)+"";
+                                                if (StringUtils.isNotEmpty(value) && StringUtils.isNum(value))
+                                                {
+                                                        WritableCellFormat wcfN = new WritableCellFormat(contentFont);
+                                                        wcfN.setBorder(jxl.format.Border.ALL, jxl.format.BorderLineStyle.THIN);
+                                                        wcfN.setAlignment(jxl.format.Alignment.CENTRE);
+                                                        wcfN.setVerticalAlignment(VerticalAlignment.CENTRE);
+                                                        Number labelNF = new Number(j,  i,Integer.parseInt(value), wcfN);
+                                                        ws.addCell(labelNF);
+                                                }
+                                                else
+                                                {
+                                                        ws.addCell(new Label(j,  i,value, contentFormt));
+                                                }
+                                                j++;
                                         }
-                                        j++;
                                 }
+                                catch (Exception e)
+                                {
+                                        continue;
+                                }
+
                         }
 
                         book.write();
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
index 3356b10..000c012 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
@@ -2860,12 +2860,13 @@ public class ViewFacade {
                 String tpSize = "";
                 if (temp.getTpSize() != null && temp.getTpSize().size() > 0) {
                     tpSize += temp.getTpSize().get("c") + UnitConstants.CM + "*" + temp.getTpSize().get("k") + UnitConstants.CM + "*" + temp.getTpSize().get("g") + UnitConstants.CM;
+                    sizeMap.put("c",temp.getTpSize().get("c"));
+                    sizeMap.put("k",temp.getTpSize().get("k"));
+                    sizeMap.put("g",temp.getTpSize().get("g"));
+                    extMap.put("tpSizeList",sizeMap);
                 }
                 extMap.put("tpSize", tpSize);
-                sizeMap.put("c",temp.getTpSize().get("c"));
-                sizeMap.put("k",temp.getTpSize().get("k"));
-                sizeMap.put("g",temp.getTpSize().get("g"));
-                extMap.put("tpSizeList",sizeMap);
+
                 extMap.put("tpWeight", UnitUtils.unitSplice(temp.getTpWeight(), UnitConstants.G));
                 extMap.put("umbilicalCordLength", UnitUtils.unitSplice(temp.getUmbilicalCordLength(), UnitConstants.CM));
 
diff --git a/platform-operate-api/src/main/resources/fm_record.xls b/platform-operate-api/src/main/resources/fm_record.xls
index d885369b44771e67d4d2373c26486989f0150309..2f87b7bfcd485e172cdf4de6cd8dff407eebf03e 100644
GIT binary patch
literal 49152
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
bQIYmSX&tI;tBOjZil~mF|1ST7Ti|~Ig8}FI

delta 891
zcmZ`&&1(}u6o0ebY<9CvHj`|3H%UL%)E+8ow9-nn#k2<xwxA;3>c>S?C`d~cMYO>n
zLO~k)go2dT|G>tTq7|%);ITa@LNDpTlO7799(w5dc9V#ZIK#e~o!{^M-p9`7^G*4A
zR_tfHN&_Dm+l>L?c6i5iUGM1xfG!+wnt62b>#R7YoEk1X{C@QlOXGF1AjAf6TfED9
zoLhmofInpeCxSXI1V=C_>v&#n#S^sNp!L0M;WS}8goP9X*MmviptEmu)~@v7m}0PA
zr=WBOSO~WwCR1^hY>U75PZDuT<(C@;ctIO)h>E=lI;hy8nF);!YG}^R*&y!o(TbYn
zaqzch{Z}P{Q=}5Bsmyb3sD=t+(pQnNteGtAahQV7G#eji8ngU&j@P0llRcY|YW|dC
zC5yeje;5~uQ&BN-jhLw#^D*ah>KsL?R1-y)P_>5s)!9?cBf~Q+h!?mSH|jY!&P{yE
zCF<T5_u{ScMp`Lf%jYzRRH<0?DsE8E;c6ZyV~vz+zB3fJz88J}#H~lIs&YBzef<vV
zw1ir`7f0i^Gz8skH}^aD;ymnpus19=f{R%*nLa{20EwM}D{zVCB=o?2x)M*0I_ue2
zO!|BXpc(LVsa4lKrauI-T|t0Q7Vng{1p%<!f55qXEX`U5!Mgx&AVSuH!OC<NatB%S
z7m%Syt~yLG99~LA1n^2=Ab<$qI+IK9#OKR~5HtjFy8ZZ&)AlkX$WxoddFzHS^SXO>
US;WzmqLe>(mVP1U$4Vsd2Y1ZavH$=8

-- 
1.8.3.1