From 28e68c33134c4934bdeee1498992c29a989f8878 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 15 五月 2026 10:44:04 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/estate_expert
---
admin-server/src/main/java/com/estate/expert/admin/service/impl/ReportServiceImpl.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/admin-server/src/main/java/com/estate/expert/admin/service/impl/ReportServiceImpl.java b/admin-server/src/main/java/com/estate/expert/admin/service/impl/ReportServiceImpl.java
index 855b526..edd3eba 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/service/impl/ReportServiceImpl.java
+++ b/admin-server/src/main/java/com/estate/expert/admin/service/impl/ReportServiceImpl.java
@@ -48,6 +48,8 @@
@Service
public class ReportServiceImpl implements ReportService {
+ private static final String DAIGUAN_TECH_REMARK = "岱观科技";
+ private static final String DAIGUAN_SYSTEM_TEMPLATE_FILE = "第三方评估报告new.docx";
private static final String DAIGUAN_REMARK = "岱观科技";
private static final String DAIGUAN_DEVICE_TEMPLATE_FILE = "设备风险评估报告new.docx";
@@ -192,6 +194,9 @@
BizResultCode.BIZ_REPORT_TEMPLATE_NOT_EXIST.check(reportTemplate == null);
switch (reportTemplate.getType()) {
case ThirdPartyReport:
+ if (isDaiguanTechTemplate(reportTemplate)) {
+ return new SystemReportBuilder(userFileService, DAIGUAN_SYSTEM_TEMPLATE_FILE);
+ }
return new SystemReportBuilder(userFileService);
case DeviceReport:
if (DAIGUAN_REMARK.equals(reportTemplate.getRemark())) {
@@ -467,6 +472,13 @@
return reportTemplate != null && DAIGUAN_REMARK.equals(reportTemplate.getRemark());
}
+ private boolean isDaiguanTechTemplate(ReportTemplate reportTemplate) {
+ if (reportTemplate == null || reportTemplate.getRemark() == null) {
+ return false;
+ }
+ return DAIGUAN_TECH_REMARK.equals(reportTemplate.getRemark().trim());
+ }
+
private long countProjectChecks(Integer projectId) {
if (projectId == null) {
return 0L;
--
Gitblit v1.7.1