From f6b439c8958e7e0520057404b7226c7507f5d1a1 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期四, 11 四月 2024 18:01:23 +0800
Subject: [PATCH] 报告生成功能：支持数据填充，发现单元格合并bug，发现模板重复
---
framework/src/main/java/com/yuanchu/mom/common/AllController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/framework/src/main/java/com/yuanchu/mom/common/AllController.java b/framework/src/main/java/com/yuanchu/mom/common/AllController.java
index 2097319..f850b67 100644
--- a/framework/src/main/java/com/yuanchu/mom/common/AllController.java
+++ b/framework/src/main/java/com/yuanchu/mom/common/AllController.java
@@ -36,7 +36,7 @@
type = "鏌ヨ";
} else if(remark.contains("鍒犻櫎")){
type = "鍒犻櫎";
- } else if(remark.contains("娣诲姞")||remark.contains("鏂板")){
+ } else if(remark.contains("娣诲姞")||remark.contains("鏂板")||remark.contains("璁ら")){
type = "娣诲姞";
} else if(remark.contains("瀵煎叆")){
type = "瀵煎叆";
@@ -51,6 +51,7 @@
}
}
}
+ System.out.println("********************鏉冮檺鑿滃崟瀹屾垚********************");
}
@PostConstruct
--
Gitblit v1.9.3