From afdf4e21143b4f7b26daebdd63e218940214a02c Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期三, 08 五月 2024 22:41:35 +0800
Subject: [PATCH] 修改
---
zhang-content/src/main/java/com/ruoyi/service/impl/MeetingStatisticServiceImpl.java | 2 +-
zhang-content/src/main/java/com/ruoyi/domain/Meeting.java | 2 +-
zhang-content/src/main/java/com/ruoyi/domain/MeetingStatistic.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java b/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
index d945927..ad0f606 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
@@ -42,7 +42,7 @@
* 鐢宠浜�
*/
@Excel(name = "鐢宠浜�")
- private int applyPerson;
+ private String applyPerson;
/**
* 鐢宠閮ㄩ棬鎴栧搴�
*/
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/MeetingStatistic.java b/zhang-content/src/main/java/com/ruoyi/domain/MeetingStatistic.java
index 3f3197d..a94a2c8 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/MeetingStatistic.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/MeetingStatistic.java
@@ -32,7 +32,7 @@
/**
* 鐢宠浜�
*/
- private int applyPerson;
+ private String applyPerson;
/**
* 瀹℃壒浜�
*/
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingStatisticServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingStatisticServiceImpl.java
index b835fdb..90129db 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingStatisticServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/MeetingStatisticServiceImpl.java
@@ -50,7 +50,7 @@
lqw.eq(!StringUtils.isEmpty(meetingStatistic.getConferenceRoom()), MeetingStatistic::getConferenceRoom, meetingStatistic.getConferenceRoom());
lqw.eq(!StringUtils.isEmpty(meetingStatistic.getTitle()), MeetingStatistic::getTitle, meetingStatistic.getTitle());
// lqw.eq(meetingStatistic.getFamilyId()!=null,MeetingStatistic::getFamilyId,meeting.getFamilyId());
- lqw.eq(!StringUtils.isEmpty(String.valueOf(meetingStatistic.getApplyPerson())), MeetingStatistic::getApplyPerson, meetingStatistic.getApplyPerson());
+ lqw.eq(!StringUtils.isEmpty(meetingStatistic.getApplyPerson()), MeetingStatistic::getApplyPerson, meetingStatistic.getApplyPerson());
lqw.eq(!StringUtils.isEmpty(String.valueOf(meetingStatistic.getRatifyPerson())), MeetingStatistic::getRatifyPerson, meetingStatistic.getRatifyPerson());
lqw.eq(!StringUtils.isEmpty(String.valueOf(meetingStatistic.getStatus())), MeetingStatistic::getStatus, meetingStatistic.getStatus());
lqw.eq(!StringUtils.isEmpty(String.valueOf(meetingStatistic.getFamilyId())), MeetingStatistic::getFamilyId, meetingStatistic.getFamilyId());
--
Gitblit v1.9.1