From f8a3a9826738a397bdf4aff4ca7a5116344b5a0a Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 09 五月 2024 07:26:56 +0800
Subject: [PATCH] 实现报告生成合并单元格；修复部分bug
---
framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java b/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java
index bf88a10..62a181b 100644
--- a/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java
+++ b/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java
@@ -21,7 +21,7 @@
String nums = num + "";
if(nums.length() == 1) nums = "00" + num;
else if(nums.length() == 2) nums = "0" + num;
- return code + date2 + symbol + nums;
+ return code + (date2==null?date:date2) + symbol + nums;
}
}
--
Gitblit v1.9.3