From 1691149bedbf75fa638942b93927c0636140c928 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 8 Jul 2024 13:57:07 +0800
Subject: [PATCH] =?UTF-8?q?fix=2086933=20=E5=8A=9F=E8=83=BD=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83--=E9=A1=B9=E7=9B=AE=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE--=E5=AF=BC=E5=87=BA=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayMeetingSituationServiceImpl.java  | 16 +++++
 .../SafetyCenterMeetingSituationExcel.java    | 70 +++++++++++++++++++
 2 files changed, 86 insertions(+)
 create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/SafetyCenterMeetingSituationExcel.java

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
index 2548a577..31fa3394 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
@@ -1804,6 +1804,18 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                     BeanUtils.copyProperties(meetingSituation, draftingGroupSituationExcel);
                     exportList.add(draftingGroupSituationExcel);
                     break;
+                case MeetingCommon.SAFETY_CENTER_MEETING:
+                    //保存数据
+                    SafetyCenterMeetingSituationExcel situationExcel2 = new SafetyCenterMeetingSituationExcel();
+                    BeanUtils.copyProperties(meetingSituation, situationExcel2);
+                    exportList.add(situationExcel2);
+                    break;
+                default:
+                    //保存数据
+                    SituationExcel situationExcel1 = new SituationExcel();
+                    BeanUtils.copyProperties(meetingSituation, situationExcel1);
+                    exportList.add(situationExcel1);
+                    break;
             }
         }
         return exportList;
@@ -1870,6 +1882,10 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             classToExport = CouncilSituationExcel.class;
         }else if (meetingType.equals(MeetingCommon.DRAFTING_GROUP_MEETING_INT)){
             classToExport = DraftingGroupSituationExcel.class;
+        }else if (meetingType.equals(MeetingCommon.SAFETY_CENTER_MEETING_INT)){
+            classToExport = SafetyCenterMeetingSituationExcel.class;
+        }else {
+            classToExport = SituationExcel.class;
         }
         return classToExport;
     }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/SafetyCenterMeetingSituationExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/SafetyCenterMeetingSituationExcel.java
new file mode 100644
index 00000000..691b03ac
--- /dev/null
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/SafetyCenterMeetingSituationExcel.java
@@ -0,0 +1,70 @@
+package com.jero.meeting.vo.excel;
+
+import com.jero.common.aspect.annotation.Dict;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * @author liJiaRao
+ * @date 2021-09-22 15:39
+ */
+@Data
+public class SafetyCenterMeetingSituationExcel {
+
+    /**
+     * 会议id
+     */
+    @Excel(name = "会议名称", width = 15, dictTable = "pay_meeting", dicCode = "id", dicText = "meeting_name")
+    private String meetingId;
+
+    /**
+     * 企业id
+     */
+    @Excel(name = "企业名称", width = 15)
+    private String companyName;
+
+    /**
+     * 企业联系人id
+     */
+    @Excel(name = "企业联系人名称", width = 15)
+    private String companyContactName;
+
+    /**
+     * 职务
+     */
+    @Excel(name = "职务", width = 15)
+    private String post;
+
+    /**
+     * 手机号
+     */
+    @Excel(name = "手机号", width = 15)
+    private String phone;
+
+    /**
+     * 邮箱
+     */
+    @Excel(name = "邮箱", width = 15)
+    private String email;
+
+    /**
+     * 身份
+     */
+    @Dict(dicCode = "meet_identify_type")
+    @Excel(name = "身份", width = 15, dicCode = "meet_identify_type")
+    private Integer identity;
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注", width = 15)
+    private String remark;
+
+    /**
+     * 签到文件
+     */
+    @Excel(name = "手动签到", type = 2, width = 40, height = 20, imageType = 3)
+    private String checkFile;
+
+
+}