From 31ce33abc5d8078203c4823944040189bae72f50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Tue, 2 Jul 2024 00:07:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/vo/SmzSspProblemmodifyExport.java  | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/vo/SmzSspProblemmodifyExport.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/vo/SmzSspProblemmodifyExport.java
index 673b6d54..ef41ea26 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/vo/SmzSspProblemmodifyExport.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/vo/SmzSspProblemmodifyExport.java
@@ -2,11 +2,13 @@ package com.yanzhu.jh.trouble.domain.vo;
 
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.utils.StringUtils;
 import com.yanzhu.jh.trouble.domain.SmzSspProblemmodify;
 import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.apache.poi.ss.usermodel.IndexedColors;
 
 import java.util.Date;
+import java.util.Objects;
 
 public class SmzSspProblemmodifyExport {
     @Excel(name = "项目名称",align= HorizontalAlignment.LEFT,width =30 )
@@ -25,16 +27,25 @@ public class SmzSspProblemmodifyExport {
 
     @Excel(name = "整改要求" ,align= HorizontalAlignment.LEFT,width =30)
     private String changeInfo;
+
     @Excel(name = "整改截至时间", width = 20, dateFormat = "yyyy-MM-dd HH:ss")
     private Date nickedTime;
+
     @Excel(name = "隐患整改人",align= HorizontalAlignment.LEFT,width =30)
     private String lordSent;
 
+    @Excel(name = "整改人单位类型",align= HorizontalAlignment.LEFT,width =30)
+    private String lordSentDeptType;
+
     @Excel(name = "流程状态")
     private String checkState;
 
     @Excel(name = "复检人",align= HorizontalAlignment.LEFT,width =30)
     private String recheckSend;
+
+    @Excel(name = "复检人单位类型",align= HorizontalAlignment.LEFT,width =30)
+    private String recheckSendDeptType;
+
     @Excel(name = "抄送人",align= HorizontalAlignment.LEFT,width =30)
     private String copySend;
 
@@ -60,6 +71,32 @@ public class SmzSspProblemmodifyExport {
         d.createBy=it.getCreateBy();
         d.createTime=it.getCreateTime();
         d.marksPicture= RuoYiConfig.getProjectUrl()+it.getMarksPicture();
+        if(StringUtils.isNotEmpty(it.getZgDeptType())){
+            if(Objects.equals(it.getZgDeptType(),"1")){
+                d.lordSentDeptType="集团公司";
+            }else if(Objects.equals(it.getZgDeptType(),"11")){
+                d.lordSentDeptType="子公司";
+            }else if(Objects.equals(it.getZgDeptType(),"2")){
+                d.lordSentDeptType="总包单位";
+            }else if(Objects.equals(it.getZgDeptType(),"3")){
+                d.lordSentDeptType="分包单位";
+            }else{
+                d.lordSentDeptType="监理单位";
+            }
+        }
+        if(StringUtils.isNotEmpty(it.getFjDeptType())){
+            if(Objects.equals(it.getFjDeptType(),"1")){
+                d.recheckSendDeptType="集团公司";
+            }else if(Objects.equals(it.getFjDeptType(),"11")){
+                d.recheckSendDeptType="子公司";
+            }else if(Objects.equals(it.getFjDeptType(),"2")){
+                d.recheckSendDeptType="总包单位";
+            }else if(Objects.equals(it.getFjDeptType(),"3")){
+                d.recheckSendDeptType="分包单位";
+            }else{
+                d.recheckSendDeptType="监理单位";
+            }
+        }
         return d;
     }
 
@@ -174,4 +211,20 @@ public class SmzSspProblemmodifyExport {
     public void setProblemType(String problemType) {
         this.problemType = problemType;
     }
+
+    public String getLordSentDeptType() {
+        return lordSentDeptType;
+    }
+
+    public void setLordSentDeptType(String lordSentDeptType) {
+        this.lordSentDeptType = lordSentDeptType;
+    }
+
+    public String getRecheckSendDeptType() {
+        return recheckSendDeptType;
+    }
+
+    public void setRecheckSendDeptType(String recheckSendDeptType) {
+        this.recheckSendDeptType = recheckSendDeptType;
+    }
 }