From 79e4810ef897ce5ebedf732b86550b6f2ed8c38d Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 1 Sep 2023 11:04:12 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsMonthlyReportWriteEOServiceImpl.java | 6 ++++-- .../main/java/com/jero/modules/report/util/WordUtil.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index 877e7d373..8ce919190 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -634,8 +634,10 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl Date: Fri, 1 Sep 2023 15:10:57 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jero/modules/report/util/WordUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 15a9f3f33..d450f3047 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 @@ -1241,7 +1241,7 @@ public class WordUtil { setBlank(text, run, sb, itemText); } if ("Usage".equals(fieldName)) { - String itemText = "Mandatory,Voluntary,if fitted"; + String itemText = "Mandatory,Recommend,if fitted"; setBlank(text, run, sb, itemText); } } @@ -1365,7 +1365,7 @@ public class WordUtil { case "Draft": blank = " "; break; - case "Public Notice": + case "Recommend": blank = " "; break; case "Release": From 9fdc0aeafd129980966acb90e2f5f76860f82d6a Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 1 Sep 2023 17:13:08 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/modules/report/util/WordUtil.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 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 d450f3047..95a35cde3 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 @@ -571,13 +571,22 @@ public class WordUtil { //拼接技术领域补充内容 if (cut.equals("cn")) { if (StringUtils.isNotBlank(technologyTerritoryCn)) { - sb.append(" 补充："+technologyTerritoryCn); + sb.append(technologyTerritoryCn + ","); } } else { if (StringUtils.isNotBlank(technologyTerritoryEn)) { - sb.append(" replenish："+technologyTerritoryEn); + sb.append(technologyTerritoryEn + ","); } } +// if (cut.equals("cn")) { +// if (StringUtils.isNotBlank(technologyTerritoryCn)) { +// sb.append(" 补充："+technologyTerritoryCn); +// } +// } else { +// if (StringUtils.isNotBlank(technologyTerritoryEn)) { +// sb.append(" replenish："+technologyTerritoryEn); +// } +// } if (org.apache.commons.lang3.StringUtils.isNotBlank(sb)) { technologyTerritoryName = sb.substring(0, sb.length()-1); From c69d68e4ec54d8c4f24b4994d41fb3829a32e549 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 1 Sep 2023 17:50:37 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsMonthlyReportWriteEOServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index 8ce919190..986d0ac9a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -963,7 +963,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl