From c556e46c2a6232d74ab6dbf7566479ec955d905d Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期六, 16 五月 2026 16:00:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin-server/src/main/java/com/estate/expert/admin/stat/report/render/CheckInfoTablePolicy.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/admin-server/src/main/java/com/estate/expert/admin/stat/report/render/CheckInfoTablePolicy.java b/admin-server/src/main/java/com/estate/expert/admin/stat/report/render/CheckInfoTablePolicy.java
index 7a6e95d..dda25ce 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/stat/report/render/CheckInfoTablePolicy.java
+++ b/admin-server/src/main/java/com/estate/expert/admin/stat/report/render/CheckInfoTablePolicy.java
@@ -25,22 +25,38 @@
List<JSONObject> categories = (List<JSONObject>) data;
+ int headerRowIndex = table.getRow(0).getTableCells().size() == 1 ? 1 : 0;
var title = table.getRow(0).getCell(0).getText();
- boolean isErrorSummary = title.contains("问题汇总表");
+ boolean isErrorSummary = title.contains("问题汇总表") || title.contains("问题清单");
if(isErrorSummary){
// renderErrors(categories, table);
}
- int colCnt = table.getRow(1).getTableCells().size();
- String colTitle = table.getRow(1).getCell(1).getText();
+ int colCnt = table.getRow(headerRowIndex).getTableCells().size();
+ String colTitle = table.getRow(headerRowIndex).getCell(1).getText();
+ int errorSummaryInsertIndex = headerRowIndex + 1;
for(var category : categories) {
var checkInfos = category.getJSONArray("分项");
for(var checkInfo : checkInfos) {
var info = (JSONObject) checkInfo;
switch (colCnt)
{
+ case 2: {
+ // 分项得分结果，去掉权重/评价列后只保留名称与得分
+ var row = table.insertNewTableRow(table.getRows().size() - 1);
+ RenderHelper.renderCell(row, info.getString("类别"));
+ RenderHelper.renderCell(row, info.containsKey("得分")
+ ? info.getString("得分")
+ : info.getString("模糊得分"));
+ }break;
case 3: {
- if(colTitle.equals("分项风险评价")) {
+ if(colTitle.equals("分项")) {
+ // 检查问题分布，去掉百分比列
+ var row = table.insertNewTableRow(table.getRows().size() -1);
+ RenderHelper.renderCell(row, info.getString("序号"));
+ RenderHelper.renderCell(row, info.getString("类别"));
+ RenderHelper.renderCell(row, info.getString("问题数量"));
+ } else if(colTitle.equals("分项风险评价")) {
//分项评估结果，样式0
var row = table.insertNewTableRow(table.getRows().size()-1);
RenderHelper.renderCell(row, info.getString("类别"));
@@ -75,7 +91,7 @@
var highLevelColor = RenderHelper.highLevelColor(errors);
for(var error : errors){
var e = (JSONObject) error;
- var row = table.insertNewTableRow(table.getRows().size());
+ var row = table.insertNewTableRow(errorSummaryInsertIndex++);
var errorLevel = e.getString("隐患等级");
var textColor = RenderHelper.getErrorLevelColor(errorLevel);
RenderHelper.renderCell(row, info.getString("类别"), highLevelColor);
@@ -101,7 +117,7 @@
var highLevelColor = RenderHelper.highLevelColor(errors);
for(var error : errors){
var e = (JSONObject) error;
- var row = table.insertNewTableRow(table.getRows().size());
+ var row = table.insertNewTableRow(errorSummaryInsertIndex++);
var errorLevel = e.getString("隐患等级");
var textColor = RenderHelper.getErrorLevelColor(errorLevel);
--
Gitblit v1.7.1