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 queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, request.getParameterMap()); List pageList = payMeetingService.list(queryWrapper); - List exportList = new ArrayList<>(); + List exportList = new ArrayList<>(); // 过滤选中数据 String selections = request.getParameter("selections"); if (oConvertUtils.isNotEmpty(selections)) { @@ -274,21 +275,20 @@ public class PayMeetingController extends JeroController()); + 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; /**工作组项目名称*/