From c2b7a1dca2e846953321a9d1139dd3d6351cc130 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 8 Sep 2021 09:44:57 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=B7=A5=E4=BD=9C=E7=BB=84=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE=E5=AF=BC=E5=87=BA=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meeting/controller/PayMeetingController.java | 16 ++++++++--------
 .../jero/meeting/vo/WorkingGroupMeetingExel.java | 13 +------------
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
index d834aa56..a1d223c5 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
@@ -26,6 +26,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.meeting.vo.PayMeetingVO;
+import com.jero.meeting.vo.WorkingGroupMeetingExel;
 import com.jero.modules.system.volid.group.UpdateGroup;
 import com.jero.project.entity.PayWorkingGroup;
 import com.jero.project.service.IPayWorkingGroupService;
@@ -262,7 +263,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
     public ModelAndView exportWorkingGroupXls(HttpServletRequest request, PayMeeting payMeeting) {
         QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, request.getParameterMap());
         List<PayMeeting> pageList = payMeetingService.list(queryWrapper);
-        List<PayMeetingVO> exportList = new ArrayList<>();
+        List<WorkingGroupMeetingExel> exportList = new ArrayList<>();
         // 过滤选中数据
         String selections = request.getParameter("selections");
         if (oConvertUtils.isNotEmpty(selections)) {
@@ -274,21 +275,20 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
             LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId());
             meeting.setDirectorName(user.getUsername());
             meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
-            PayMeetingVO payMeetingVO = new PayMeetingVO();
-            BeanUtils.copyProperties(meeting, payMeetingVO);
+            WorkingGroupMeetingExel workingGroupMeetingExel = new WorkingGroupMeetingExel();
+            BeanUtils.copyProperties(meeting, workingGroupMeetingExel);
             String meetingType = meeting.getMeetingType().toString();
             String meetingType1 = sysBaseApi.translateDict("meeting_type", meetingType);
-            payMeetingVO.setMeetingType(meetingType1);
-            payMeetingVO.setHotelContactsList(new ArrayList<>());
+            workingGroupMeetingExel.setMeetingType(meetingType1);
             //    工作组项目查询工作组项目名
              if (meetingType.equals(MeetingCommon.WORKING_GROUP_MEETING)) {
                 String workingGroupId = meeting.getWorkingGroupId();
                 PayWorkingGroup workingGroup = payWorkingGroupService.getById(workingGroupId);
-                payMeetingVO.setWorkingGroupName(workingGroup.getWorkingGroupProject());
+                workingGroupMeetingExel.setWorkingGroupName(workingGroup.getWorkingGroupProject());
             }
-            exportList.add(payMeetingVO);
+            exportList.add(workingGroupMeetingExel);
         }
-        return super.exportListXls(exportList, PayMeetingVO.class, "会议管理");
+        return super.exportListXls(exportList, WorkingGroupMeetingExel.class, "会议管理");
     }
 
     /**
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/WorkingGroupMeetingExel.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/WorkingGroupMeetingExel.java
index 91d132cb..3b072a96 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/WorkingGroupMeetingExel.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/WorkingGroupMeetingExel.java
@@ -26,11 +26,6 @@ import java.util.List;
 public class WorkingGroupMeetingExel {
     private static final long serialVersionUID = 1L;
 
-    /**id*/
-    @NotBlank(message = "会议id不能为空",groups = UpdateGroup.class)
-    @ApiModelProperty(value = "id")
-    private String id;
-
     /**会议名称*/
     @Excel(name = "会议名称", width = 15)
     @ApiModelProperty(value = "会议名称")
@@ -44,15 +39,9 @@ public class WorkingGroupMeetingExel {
     @NotBlank(message = "会议类型不能为空")
     private String meetingType;
 
-    /**标协会议类型*/
-    @Excel(name = "标协会议类型", width = 15)
-    @ApiModelProperty(value = "标协会议类型")
-    @NotBlank(message = "标协会议类型不能为空", groups = StandardMeeting.class)
-    private String tbMeetingType;
-
     /**工作组项目id*/
     @ApiModelProperty(value = "工作组项目id")
-    @NotBlank(message = "工作组项目名称不能为空", groups = WorkingGroupMeeting.class)
+    @NotBlank(message = "工作组项目名称不能为空")
     private String workingGroupId;
 
     /**工作组项目名称*/