From 881332a25bcbbe3bebb696f6d0728fba559ef635 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期六, 16 五月 2026 15:59:03 +0800
Subject: [PATCH] feat:安全检查报告模版
---
admin-server/src/main/java/com/estate/expert/admin/stat/report/data/ReportDataBase.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/admin-server/src/main/java/com/estate/expert/admin/stat/report/data/ReportDataBase.java b/admin-server/src/main/java/com/estate/expert/admin/stat/report/data/ReportDataBase.java
index 02fd682..f97776d 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/stat/report/data/ReportDataBase.java
+++ b/admin-server/src/main/java/com/estate/expert/admin/stat/report/data/ReportDataBase.java
@@ -68,6 +68,9 @@
result.put("报告编号", template.getNumber() + "-" + String.format("%08d", reportId));
result.put("报告日期", reportDate);
result.put("报告日期中文", reportDate.format(DateTimeFormatter.ofPattern("yyyy年M月d日")));
+ result.put("报告年份", reportDate.getYear());
+ result.put("报告月份", reportDate.getMonthValue());
+ result.put("报告日期日", reportDate.getDayOfMonth());
result.put("公司名称", "四川信立隆第三方评估咨询有限公司");
return result;
}
@@ -186,7 +189,7 @@
}
info.put("工程类型", project.getType().getDesc());
- info.put("工程规模", project.getProjectCost());
+ info.put("工程规模", StringUtils.hasText(project.getScale()) ? project.getScale() : project.getProjectCost());
if (projectInfo != null) {
info.put("项目简介", projectInfo.getDetail());
--
Gitblit v1.7.1