update

liujie

2026-05-16 d6968f0c33f2ce53018af4b0d6bae79a91f2332a

update

 admin-server/src/main/java/com/estate/expert/admin/domain/report/ReportTemplate.java

@@ -46,4 +46,7 @@
    @Column(columnDefinition = "json")
    private Map<String, Integer> config;

}
    @Column(nullable = false)
    private boolean active = true;

}

 admin-server/src/main/java/com/estate/expert/admin/stat/report/builder/DeviceReportBuilder.java

@@ -7,7 +7,9 @@
import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy;
import com.estate.expert.admin.service.UserFileService;
import com.estate.expert.admin.stat.report.render.CustomPictureRenderPolicy;
import com.estate.expert.admin.stat.report.render.DeviceGroupTablePolicy;
import com.estate.expert.admin.stat.report.render.DeviceTablePolicy;
import com.estate.expert.admin.stat.report.render.WordNumberingSanitizer;
import org.springframework.core.io.ClassPathResource;

import java.io.IOException;
@@ -73,7 +75,7 @@

        ConfigureBuilder builder = Configure.builder();
        builder.bind("data.设备信息", new LoopRowTableRenderPolicy());
        builder.bind("data.设备分组信息", new LoopRowTableRenderPolicy());
        builder.bind("data.设备分组信息", new DeviceGroupTablePolicy());
        builder.bind("data.评估结果.设备得分情况", new LoopRowTableRenderPolicy());
        builder.bind("详情", new LoopRowTableRenderPolicy());
        builder.bind("data.评估结果.分类评估", new LoopRowTableRenderPolicy());
@@ -96,9 +98,9 @@

    private XWPFTemplate compileAndRender(ClassPathResource res, ConfigureBuilder builder, JSONObject data) {
        try {
            return XWPFTemplate.compile(res.getInputStream(), builder.build()).render(
            return WordNumberingSanitizer.sanitize(XWPFTemplate.compile(res.getInputStream(), builder.build()).render(
                    Map.of("data", data)
            );
            ));
        } catch (IOException e) {
            throw new RuntimeException(e);
        }

 admin-server/src/main/java/com/estate/expert/admin/stat/report/data/ReportDataBase.java

@@ -186,7 +186,7 @@
        }

        info.put("工程类型", project.getType().getDesc());
        info.put("工程规模", project.getProjectCost());
        info.put("工程规模", project.getScale());

        if (projectInfo != null) {
            info.put("项目简介", projectInfo.getDetail());

 admin-server/src/main/resources/templates/设备风险评估报告new.docx

Binary files differ