fix 86933 功能安全中心--项目会议--导出报错

2024-07-08 13:57:07 +08:00
parent 939446f9a7
commit 1691149bed
2 changed files with 86 additions and 0 deletions
@@ -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;
    }
@@ -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;
+
+
+}