From fc06d493b5f1b68e84367483c4d9e8ee5c68cd5d Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Sat, 25 May 2024 17:43:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=92=8C=E8=B4=A8=E9=87=8F?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=9A=84=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../QualityInspectionRecordServiceImpl.java    | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java
index 76c54a837..c00c899dd 100644
--- a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java
@@ -414,11 +414,16 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl<QualityInspe
                         statusName = "不合格";
                     }
                 }
+                demo.put("site_rectification_name", status == 5 ? "已完成" : "未完成");
                 demo.put("statusname", statusName);
+                Integer recordType = MapUtils.getInteger(demo, "recordType");
+                demo.put("record_type_name", recordType == 2 ? "排查记录" : "安全问题");
+                demo.put("question_desc", StrUtil.subAfter(MapUtils.getString(demo, "dangerItemContent"), "/", true));
             }
-            String[] heads = {"检查结果", "检查人", "检查时间", "检查部位", "问题描述", "补充说明", "整改要求", "问题等级", "紧急程度", "整改人", "整改时限", "复查人", "核验人"};
+            String[] heads = {"检查结果", "检查人", "检查时间", "检查部位", "问题描述", "补充说明", "整改要求", "问题等级", "紧急程度", "整改人", "整改时限", "复查人", "核验人", "检查类型", "分包单位", "现场整改", "事件描述", "问题描述"};
             String[] headsStr = {"statusname", "inspectManName", "inspectTime", "regionName", "dangerItemContent", "dangerDesc", "remark", "levelname",
-                    "urgentlevelname", "changeName", "changeLimitTime", "reviewName", "verifyManName"};
+                    "urgentlevelname", "changeName", "changeLimitTime", "reviewName", "verifyManName", "recordTypeName",
+                    "enterpriseName", "siteRectificationName", "addedDescription", "questionDesc"};
             JxlExcelUtils.excelExport("质量检查列表", heads, headsStr, list, response);
 
         } catch (Exception e) {
@@ -479,11 +484,16 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl<QualityInspe
                         statusName = "不合格";
                     }
                 }
+                demo.put("site_rectification_name", status == 5 ? "已完成" : "未完成");
                 demo.put("statusname", statusName);
+                Integer recordType = MapUtils.getInteger(demo, "recordType");
+                demo.put("record_type_name", recordType == 2 ? "排查记录" : "安全问题");
+                demo.put("question_desc", StrUtil.subAfter(MapUtils.getString(demo, "dangerItemContent"), "/", true));
             }
-            String[] heads = {"检查结果", "检查人", "检查时间", "检查部位", "问题描述", "补充说明", "整改要求", "问题等级", "紧急程度", "整改人", "整改时限", "复查人", "核验人"};
+            String[] heads = {"检查结果", "检查人", "检查时间", "检查部位", "问题描述", "补充说明", "整改要求", "问题等级", "紧急程度", "整改人", "整改时限", "复查人", "核验人", "检查类型", "分包单位", "现场整改", "事件描述", "问题描述"};
             String[] headsStr = {"statusname", "inspectManName", "inspectTime", "regionName", "dangerItemContent", "dangerDesc", "remark", "levelname",
-                    "urgentlevelname", "changeName", "changeLimitTime", "reviewName", "verifyManName"};
+                    "urgentlevelname", "changeName", "changeLimitTime", "reviewName", "verifyManName", "recordTypeName",
+                    "enterpriseName", "siteRectificationName", "addedDescription", "questionDesc"};
             JxlExcelUtils.excelExport("安全检查列表", heads, headsStr, list, response);
 
         } catch (Exception e) {