From 45b7124db16adeb897eac6c914feff9325e0a686 Mon Sep 17 00:00:00 2001
From: yjq <yjq@qq.com>
Date: Wed, 30 Nov 2022 22:36:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3-=E6=B3=95=E8=A7=84=E6=9C=88?=
 =?UTF-8?q?=E6=8A=A5-=E5=AF=BC=E5=87=BA=E4=B8=AD=E8=8B=B1=E6=96=87?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=8B=BE=E9=80=89=E4=B8=8D=E4=B8=80=E8=87=B4?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/modules/report/util/WordUtil.java | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java
index 1e6fd5ceb..c1a9c5bb6 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java
@@ -575,7 +575,9 @@ public class WordUtil {
         String applyScopeName = dictItem(sysDictItems, applyScope,cut, DictCodeReportEnum.APPLYSCOPE.getValue());
         String stateName = dictItem(sysDictItems, state,cut, DictCodeReportEnum.STATE_REPORT.getValue());
         String useMethodName = dictItem(sysDictItems, useMethod,cut, DictCodeReportEnum.USEMETHOD.getValue());
-
+        if(useMethodName.equals("安装即符合")){
+            useMethodName = "安装需符合";
+        }
         XWPFTable table = document.createTable(10, 2);
         //表格属性
         CTTblPr tablePr = table.getCTTbl().addNewTblPr();
@@ -1222,9 +1224,20 @@ public class WordUtil {
     }
 
     private static void setBlank(String text, XWPFRun run, StringBuilder sb, String itemText) {
+        //用法的三个复选框 在后端get到的英文和导出的word对应不上，也就是和itemText中的内容对应不上
+        if(text.equals("constraint")){
+            text = "Mandatory";
+        }
+        if(text.equals("recommend")){
+            text = "Voluntary";
+        }
+        if(text.equals("installation is compliant")){
+            text = "Mandatory if fitted";
+        }
+
         for (String value : itemText.split(",")) {
             String blank = getBlank(value);
-            if(text.contains(value)){
+            if(text.equals(value)){
                 sb.append("■"+value+blank);
             }else{
                 sb.append("□"+value+blank);
@@ -1361,7 +1374,6 @@ public class WordUtil {
         // 设置链接字体大小
         CTHpsMeasure sz = rpr.isSetSz() ? rpr.getSz() : rpr.addNewSz();
         sz.setVal(new BigInteger("22"));
-
 //        CTHpsMeasure szCs = rpr.isSetSzCs() ? rpr.getSzCs() : rpr
 //                .addNewSzCs();
 //        szCs.setVal(new BigInteger("11"));