From a5527ad5f0c05ad147c093f93b77222b00f9863a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=87=E8=88=AA?= <653809315@qq.com>
Date: Tue, 13 Aug 2024 18:39:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=A2=9E=E5=8A=A0=E6=8A=A5?=
 =?UTF-8?q?=E5=90=8D=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/app/domain/AppEvents.java  |   2 +
 .../com/ruoyi/app/domain/AppEventsUser.java   | 109 ++++++++++--------
 .../service/impl/AppEventsServiceImpl.java    |   7 +-
 .../mapper/app/AppEventsUserMapper.xml        |  25 +++-
 gan-ui/src/views/app/events/index.vue         |  75 +++++++++---
 5 files changed, 157 insertions(+), 61 deletions(-)

diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppEvents.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppEvents.java
index 0c45c71..30ca057 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppEvents.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppEvents.java
@@ -62,6 +62,8 @@ public class AppEvents extends BaseEntity
 
     private Long userId;
 
+    private List<AppEventsUser> appEventsUserList;
+
 
     public void setId(Long id) 
     {
diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppEventsUser.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppEventsUser.java
index ca16bb5..142e11a 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppEventsUser.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppEventsUser.java
@@ -8,109 +8,126 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
 
 /**
  * 活动发布对象 app_events_user
- * 
+ *
  * @author wyh
  * @date 2024-07-23
  */
 @Data
-public class AppEventsUser extends BaseEntity
-{
+public class AppEventsUser extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 话题id */
+    /**
+     * 话题id
+     */
     private Long id;
 
-    /** 活动id */
+    /**
+     * 活动id
+     */
     @Excel(name = "活动id")
     private Long eventsId;
 
-    /** 负责人 */
+    /**
+     * 负责人
+     */
     @Excel(name = "负责人")
     private String name;
 
-    /** 公司名称 */
+    /**
+     * 公司名称
+     */
     @Excel(name = "公司名称")
     private String companyName;
 
-    /** 手机号 */
+    /**
+     * 手机号
+     */
     @Excel(name = "手机号")
     private String phone;
 
-    /** 微信号 */
+    /**
+     * 微信号
+     */
     @Excel(name = "微信号")
     private String wechatId;
 
     private Long userId;
 
-    public void setId(Long id) 
-    {
+    private String userName;
+
+
+    private String avatarUrl;
+    private String nickName;
+    private String email;
+    private String company;
+    private Integer sex;
+
+    private String schoolName;
+
+    private String education;
+
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public Long getId() 
-    {
+    public Long getId() {
         return id;
     }
-    public void setEventsId(Long eventsId) 
-    {
+
+    public void setEventsId(Long eventsId) {
         this.eventsId = eventsId;
     }
 
-    public Long getEventsId() 
-    {
+    public Long getEventsId() {
         return eventsId;
     }
-    public void setName(String name) 
-    {
+
+    public void setName(String name) {
         this.name = name;
     }
 
-    public String getName() 
-    {
+    public String getName() {
         return name;
     }
-    public void setCompanyName(String companyName) 
-    {
+
+    public void setCompanyName(String companyName) {
         this.companyName = companyName;
     }
 
-    public String getCompanyName() 
-    {
+    public String getCompanyName() {
         return companyName;
     }
-    public void setPhone(String phone) 
-    {
+
+    public void setPhone(String phone) {
         this.phone = phone;
     }
 
-    public String getPhone() 
-    {
+    public String getPhone() {
         return phone;
     }
-    public void setWechatId(String wechatId) 
-    {
+
+    public void setWechatId(String wechatId) {
         this.wechatId = wechatId;
     }
 
-    public String getWechatId() 
-    {
+    public String getWechatId() {
         return wechatId;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("eventsId", getEventsId())
-            .append("name", getName())
-            .append("companyName", getCompanyName())
-            .append("phone", getPhone())
-            .append("wechatId", getWechatId())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .append("createBy", getCreateBy())
-            .append("updateBy", getUpdateBy())
-            .append("remark", getRemark())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("eventsId", getEventsId())
+                .append("name", getName())
+                .append("companyName", getCompanyName())
+                .append("phone", getPhone())
+                .append("wechatId", getWechatId())
+                .append("createTime", getCreateTime())
+                .append("updateTime", getUpdateTime())
+                .append("createBy", getCreateBy())
+                .append("updateBy", getUpdateBy())
+                .append("remark", getRemark())
+                .toString();
     }
 }
diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppEventsServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppEventsServiceImpl.java
index 8f7c1b6..a6b4159 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppEventsServiceImpl.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppEventsServiceImpl.java
@@ -37,7 +37,12 @@ public class AppEventsServiceImpl implements IAppEventsService
     @Override
     public AppEvents selectAppEventsById(Long id)
     {
-        return appEventsMapper.selectAppEventsById(id);
+        AppEvents appEvents = appEventsMapper.selectAppEventsById(id);
+        AppEventsUser appEventsUser = new AppEventsUser();
+        appEventsUser.setEventsId(appEvents.getId());
+        List<AppEventsUser> appEventsUsers = appEventsUserMapper.selectAppEventsUserList(appEventsUser);
+        appEvents.setAppEventsUserList(appEventsUsers);
+        return appEvents;
     }
 
     /**
diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppEventsUserMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppEventsUserMapper.xml
index e4e1578..83cf77a 100644
--- a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppEventsUserMapper.xml
+++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppEventsUserMapper.xml
@@ -24,7 +24,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectAppEventsUserList" parameterType="AppEventsUser" resultMap="AppEventsUserResult">
-        <include refid="selectAppEventsUserVo"/>
+        select aev.id,
+        aev.events_id,
+        aev.name,
+        aev.company_name,
+        aev.phone,
+        aev.wechat_id,
+        aev.create_time,
+        aev.update_time,
+        aev.create_by,
+        aev.updateBy,
+        aev.remark,
+        aev.user_id,
+        au.avatar_url as avatarUrl,
+        au.nickName as nickName,
+        au.email as email,
+        au.company_name as company,
+        au.sex as sex,
+        au.education as education,
+        au.address as address,
+        `as`.name as schoolName
+
+        from app_events_user aev
+        left join app_user au on aev.user_id = au.id
+        left join app_school `as` on au.school = `as`.id
         <where>  
             <if test="eventsId != null "> and events_id = #{eventsId}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
diff --git a/gan-ui/src/views/app/events/index.vue b/gan-ui/src/views/app/events/index.vue
index fc7abcf..4141dac 100644
--- a/gan-ui/src/views/app/events/index.vue
+++ b/gan-ui/src/views/app/events/index.vue
@@ -66,12 +66,12 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-info"-->
-<!--            @click="handleDetail(scope.row)"-->
-<!--          >详情</el-button>-->
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-info"
+            @click="handleShow(scope.row)"
+          >详情</el-button>
           <el-button
             size="mini"
             type="text"
@@ -150,6 +150,37 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog class="table" :title="title" :visible.sync="show"  width="1500px" append-to-body>
+      <el-table  v-loading="loading"  :data="userFrom">
+        <el-table-column label="用户名" align="center" prop="name" />
+        <el-table-column
+          prop="avatarUrl"
+          header-align="center"
+          align="center"
+          label="头像"
+        >
+          <template slot-scope="scope" class="demo-image__preview">
+            <img
+              :src="scope.row.avatarUrl"
+              width="40"
+              height="40"
+              class="head_pic"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="昵称" align="center" prop="nickName" />
+        <el-table-column label="邮箱" align="center" prop="email" />
+        <el-table-column label="电话" align="center" prop="phone" />
+        <el-table-column label="性别" align="center" prop="sex" >
+          <template slot-scope="scope">
+            {{ scope.row.sex == 0 ? '男' : scope.row.sex == 1 ? '女' : '未知' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="公司" align="center" prop="company" />
+        <el-table-column label="学校" align="center" prop="schoolName" />
+        <el-table-column label="学历" align="center" prop="education" />
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 
@@ -179,6 +210,8 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+
+      show: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -197,6 +230,8 @@ export default {
       form: {
         type: 0,
       },
+
+      userFrom:[],
       // 表单校验
       rules: {
         title: [
@@ -315,14 +350,26 @@ export default {
       return isJPG && isLt5M;
     },
 
-    handleDetail(row){
-      this.reset();
+    // handleDetail(row){
+    //   this.reset();
+    //   const id = row.id || this.ids
+    //   this.$router.push({
+    //     path: "/appData/events_detail",
+    //     query: {
+    //       id,
+    //     },
+    //   });
+    // },
+
+    handleShow(row){
+      this.show = true;
+      this.reset()
       const id = row.id || this.ids
-      this.$router.push({
-        path: "/appData/events_detail",
-        query: {
-          id,
-        },
+      getEvents(id).then(response => {
+        this.userFrom = response.data.appEventsUserList;
+        console.log(this.userFrom);
+      }).catch(error => {
+        this.$message.error(error);
       });
     },
     /** 提交按钮 */
@@ -389,4 +436,6 @@ export default {
   height: 178px;
   display: block;
 }
+
+
 </style>