From 46a2436778fbde103150a7bd9ca4c18868831efe Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期四, 01 八月 2024 16:09:37 +0800
Subject: [PATCH] commit
---
src/main/java/com/product/print/util/FlowOpinionRenderPolicy.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/product/print/util/FlowOpinionRenderPolicy.java b/src/main/java/com/product/print/util/FlowOpinionRenderPolicy.java
index 7dcc8b5..6488a83 100644
--- a/src/main/java/com/product/print/util/FlowOpinionRenderPolicy.java
+++ b/src/main/java/com/product/print/util/FlowOpinionRenderPolicy.java
@@ -7,7 +7,9 @@
import com.deepoove.poi.render.RenderContext;
import com.deepoove.poi.xwpf.BodyContainer;
import com.deepoove.poi.xwpf.BodyContainerFactory;
+import com.product.admin.service.OrganizationCacheService;
import com.product.common.lang.StringUtils;
+import com.product.core.entity.FieldSetEntity;
import org.apache.poi.util.Units;
import org.apache.poi.xwpf.usermodel.*;
@@ -39,11 +41,11 @@
XWPFRun run = context.getRun();
//鏍囩鍚嶇О
String tagName = context.getEleTemplate().getTagName();
- JSONObject opinion=null;
+ JSONObject opinion = null;
//鏀寔澶氫釜鏍囩鍚嶇О锛岀敤|鍒嗛殧 渚嬪锛歿{@var1|var2|var3...}} 鎸夌収椤哄簭鏌ユ壘鎰忚鍒楄〃
for (String name : tagName.split("\\|")) {
opinion = getOpinion(name);
- if(opinion!=null){
+ if (opinion != null) {
break;
}
}
@@ -70,8 +72,14 @@
//鎻掑叆鍥剧墖
newRun.addPicture(byteArrayInputStream, XWPFDocument.PICTURE_TYPE_PNG, "sign.png", Units.toEMU(50), Units.toEMU(20));
byteArrayInputStream.close();
- newRun.setText("", 0);
+ } else {
+
+ //娴佺▼鑺傜偣瀹為檯澶勭悊浜�
+ String actualPerson = opinion.getString("actual_person");
+ newRun.setText(actualPerson);
}
+ newRun.addBreak();
+ newRun.setText(opinion.getString("deal_time").substring(0, 16));
XWPFParagraph paragraph = createParagraph(newRun);
//娈佃惤鏍峰紡涓庡師濮嬫钀戒竴鑷�
paragraph.getCTP().setPPr(parent.getCTP().getPPr());
--
Gitblit v1.9.2