From 8d1d546ad729da0e809e17e8161376adcc662c96 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 21 一月 2026 11:51:36 +0800
Subject: [PATCH] update代码合并
---
admin-server/src/main/java/com/estate/expert/admin/stat/report/render/CheckInfoTablePolicy.java | 44 ++------------------------------------------
1 files changed, 2 insertions(+), 42 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 d68e388..5f3cedc 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
@@ -1,9 +1,7 @@
package com.estate.expert.admin.stat.report.render;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.deepoove.poi.policy.DynamicTableRenderPolicy;
-import com.estate.expert.admin.domain.exam.record.error.ErrorLevel;
import org.apache.poi.xwpf.usermodel.XWPFTable;
import org.springframework.util.CollectionUtils;
@@ -13,12 +11,6 @@
* 这里循环渲染表格
* */
public class CheckInfoTablePolicy extends DynamicTableRenderPolicy {
-
- private String colorCommon = "000000";
- private String colorP1 = "FF0000";
-
- // 橙色
- private String colorP2 = "FF8000";
/**
* 渲染检查信息表格
@@ -80,17 +72,12 @@
var errors = info.getJSONArray("问题");
if(!CollectionUtils.isEmpty(errors)){
- var highLevelColor = highLevelColor(errors);
+ var highLevelColor = RenderHelper.highLevelColor(errors);
for(var error : errors){
var e = (JSONObject) error;
var row = table.insertNewTableRow(table.getRows().size());
- var textColor = colorCommon;
var errorLevel = e.getString("隐患等级");
- if(errorLevel.equals("一级隐患")){
- textColor = colorP1;
- }else if(errorLevel.equals("二级隐患")){
- textColor = colorP2;
- }
+ var textColor = RenderHelper.getErrorLevelColor(errorLevel);
RenderHelper.renderCell(row, info.getString("类别"), highLevelColor);
RenderHelper.renderCell(row, e.getString("问题部位"), textColor);
RenderHelper.renderCell(row, e.getString("问题备注"), textColor);
@@ -114,33 +101,6 @@
int endRow = table.getRows().size() - 1;
if(isErrorSummary && endRow > 3){
RenderHelper.mergeCellsVertically(table, 2, 0);
- }
- }
-
- /**
- * 获取最高隐患等级颜色
- * @param errorRecords 错误记录
- * @return 最高隐患等级颜色
- */
- private String highLevelColor(JSONArray errorRecords){
- var minLevel = ErrorLevel.P4;
-
- for(var errorRecord : errorRecords){
- var e = (JSONObject) errorRecord;
- var levelStr = e.getString("隐患等级");
- var level = ErrorLevel.getByDesc(levelStr);
- if(level != null && level.ordinal() < minLevel.ordinal()){
- minLevel = level;
- }
- }
-
- switch (minLevel){
- case P1:
- return colorP1;
- case P2:
- return colorP2;
- default:
- return colorCommon;
}
}
--
Gitblit v1.7.1