diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcVoteResultController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcVoteResultController.java
index 143cefb..7f4c82c 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcVoteResultController.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcVoteResultController.java
@@ -1,25 +1,21 @@
 package com.ruoyi.szxc.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.szxc.domain.SzxcVoteResult;
 import com.ruoyi.szxc.service.ISzxcVoteResultService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 议事投票情况Controller
@@ -46,6 +42,21 @@ public class SzxcVoteResultController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询议事投票统计
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:voteresut:count')")
+    @GetMapping("/count")
+    public Map<String,Object> ResultCount(SzxcVoteResult szxcVoteResult)
+    {
+        startPage();
+        List<SzxcVoteResult> list = szxcVoteResultService.selectSzxcVoteResultList(szxcVoteResult);
+        Map<String,Object>  result = new HashMap<String,Object>();
+        result.put("data",getDataTable(list));
+        result.put("result",szxcVoteResultService.selectSzxcVoteResultByDiscussId(szxcVoteResult.getYsId()));
+        return result;
+    }
+
     /**
      * 导出议事投票情况列表
      */
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcGyApply.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcGyApply.java
index 31a3601..4ced04e 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcGyApply.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcGyApply.java
@@ -7,9 +7,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 公益报名情况对象 szxc_gy_apply
- * 
+ *
  * @author hs
- * @date 2024-03-20
+ * @date 2024-04-07
  */
 public class SzxcGyApply extends BaseEntity
 {
@@ -18,14 +18,14 @@ public class SzxcGyApply extends BaseEntity
     /** id */
     private Long id;
 
-    /** 居民id */
-    @Excel(name = "居民id")
-    private Long jmId;
-
     /** 公益id */
     @Excel(name = "公益id")
     private Long gyId;
 
+    /** 居民id */
+    @Excel(name = "居民id")
+    private Long jmId;
+
     /** 身份证号 */
     @Excel(name = "身份证号")
     private String cardId;
@@ -34,61 +34,74 @@ public class SzxcGyApply extends BaseEntity
     @Excel(name = "报名人")
     private String name;
 
+    /** 手机号 */
+    @Excel(name = "手机号")
+    private String phone;
+
     /** 创建者ID */
     @Excel(name = "创建者ID")
     private Long userId;
 
-    public void setId(Long id) 
+    public void setId(Long id)
     {
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
-    public void setJmId(Long jmId) 
+    public void setGyId(Long gyId)
     {
-        this.jmId = jmId;
+        this.gyId = gyId;
     }
 
-    public Long getJmId() 
+    public Long getGyId()
     {
-        return jmId;
+        return gyId;
     }
-    public void setGyId(Long gyId) 
+    public void setJmId(Long jmId)
     {
-        this.gyId = gyId;
+        this.jmId = jmId;
     }
 
-    public Long getGyId() 
+    public Long getJmId()
     {
-        return gyId;
+        return jmId;
     }
-    public void setCardId(String cardId) 
+    public void setCardId(String cardId)
     {
         this.cardId = cardId;
     }
 
-    public String getCardId() 
+    public String getCardId()
     {
         return cardId;
     }
-    public void setName(String name) 
+    public void setName(String name)
     {
         this.name = name;
     }
 
-    public String getName() 
+    public String getName()
     {
         return name;
     }
-    public void setUserId(Long userId) 
+    public void setPhone(String phone)
+    {
+        this.phone = phone;
+    }
+
+    public String getPhone()
+    {
+        return phone;
+    }
+    public void setUserId(Long userId)
     {
         this.userId = userId;
     }
 
-    public Long getUserId() 
+    public Long getUserId()
     {
         return userId;
     }
@@ -96,16 +109,17 @@ public class SzxcGyApply extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("jmId", getJmId())
-            .append("gyId", getGyId())
-            .append("cardId", getCardId())
-            .append("name", getName())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("userId", getUserId())
-            .toString();
+                .append("id", getId())
+                .append("gyId", getGyId())
+                .append("jmId", getJmId())
+                .append("cardId", getCardId())
+                .append("name", getName())
+                .append("phone", getPhone())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("userId", getUserId())
+                .toString();
     }
 }
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcVoteResult.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcVoteResult.java
index eb92e2b..f1149fa 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcVoteResult.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcVoteResult.java
@@ -7,9 +7,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 议事投票情况对象 szxc_vote_result
- * 
+ *
  * @author hs
- * @date 2024-03-20
+ * @date 2024-04-07
  */
 public class SzxcVoteResult extends BaseEntity
 {
@@ -18,6 +18,10 @@ public class SzxcVoteResult extends BaseEntity
     /** id */
     private Long id;
 
+    /** 议事id */
+    @Excel(name = "议事id")
+    private Long ysId;
+
     /** 居民id */
     @Excel(name = "居民id")
     private Long jmId;
@@ -30,9 +34,9 @@ public class SzxcVoteResult extends BaseEntity
     @Excel(name = "投票人")
     private String voteName;
 
-    /** 议事id */
-    @Excel(name = "议事id")
-    private Long ysId;
+    /** 手机号 */
+    @Excel(name = "手机号")
+    private String phone;
 
     /** 同意、反对、弃权 */
     @Excel(name = "同意、反对、弃权")
@@ -46,75 +50,84 @@ public class SzxcVoteResult extends BaseEntity
     @Excel(name = "创建者ID")
     private Long userId;
 
-    public void setId(Long id) 
+    public void setId(Long id)
     {
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
-    public void setJmId(Long jmId) 
+    public void setYsId(Long ysId)
+    {
+        this.ysId = ysId;
+    }
+
+    public Long getYsId()
+    {
+        return ysId;
+    }
+    public void setJmId(Long jmId)
     {
         this.jmId = jmId;
     }
 
-    public Long getJmId() 
+    public Long getJmId()
     {
         return jmId;
     }
-    public void setCardId(String cardId) 
+    public void setCardId(String cardId)
     {
         this.cardId = cardId;
     }
 
-    public String getCardId() 
+    public String getCardId()
     {
         return cardId;
     }
-    public void setVoteName(String voteName) 
+    public void setVoteName(String voteName)
     {
         this.voteName = voteName;
     }
 
-    public String getVoteName() 
+    public String getVoteName()
     {
         return voteName;
     }
-    public void setYsId(Long ysId) 
+    public void setPhone(String phone)
     {
-        this.ysId = ysId;
+        this.phone = phone;
     }
 
-    public Long getYsId() 
+    public String getPhone()
     {
-        return ysId;
+        return phone;
     }
-    public void setVote(String vote) 
+    public void setVote(String vote)
     {
         this.vote = vote;
     }
 
-    public String getVote() 
+    public String getVote()
     {
         return vote;
     }
-    public void setOpinion(String opinion) 
+    public void setOpinion(String opinion)
     {
         this.opinion = opinion;
     }
 
-    public String getOpinion() 
+    public String getOpinion()
     {
         return opinion;
     }
-    public void setUserId(Long userId) 
+    public void setUserId(Long userId)
     {
         this.userId = userId;
     }
 
-    public Long getUserId() 
+    public Long getUserId()
     {
         return userId;
     }
@@ -122,18 +135,19 @@ public class SzxcVoteResult extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("jmId", getJmId())
-            .append("cardId", getCardId())
-            .append("voteName", getVoteName())
-            .append("ysId", getYsId())
-            .append("vote", getVote())
-            .append("opinion", getOpinion())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("userId", getUserId())
-            .toString();
+                .append("id", getId())
+                .append("ysId", getYsId())
+                .append("jmId", getJmId())
+                .append("cardId", getCardId())
+                .append("voteName", getVoteName())
+                .append("phone", getPhone())
+                .append("vote", getVote())
+                .append("opinion", getOpinion())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("userId", getUserId())
+                .toString();
     }
 }
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/YsResult.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/YsResult.java
new file mode 100644
index 0000000..7725ecb
--- /dev/null
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/YsResult.java
@@ -0,0 +1,48 @@
+package com.ruoyi.szxc.domain;
+
+public class YsResult {
+
+    /** 议事id */
+    private Long ysId;
+
+    /** 同意票数 */
+    private Integer tyCount;
+
+    /** 反对票数 */
+    private Integer fdCount;
+
+    /** 弃权票数 */
+        private Integer qqCount;
+
+    public Long getYsId() {
+        return ysId;
+    }
+
+    public void setYsId(Long ysId) {
+        this.ysId = ysId;
+    }
+
+    public Integer getTyCount() {
+        return tyCount;
+    }
+
+    public void setTyCount(Integer tyCount) {
+        this.tyCount = tyCount;
+    }
+
+    public Integer getFdCount() {
+        return fdCount;
+    }
+
+    public void setFdCount(Integer fdCount) {
+        this.fdCount = fdCount;
+    }
+
+    public Integer getQqCount() {
+        return qqCount;
+    }
+
+    public void setQqCount(Integer qqCount) {
+        this.qqCount = qqCount;
+    }
+}
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcVoteResultMapper.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcVoteResultMapper.java
index 3e064f7..4fe1173 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcVoteResultMapper.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcVoteResultMapper.java
@@ -1,7 +1,9 @@
 package com.ruoyi.szxc.mapper;
 
-import java.util.List;
 import com.ruoyi.szxc.domain.SzxcVoteResult;
+import com.ruoyi.szxc.domain.YsResult;
+
+import java.util.List;
 
 /**
  * 议事投票情况Mapper接口
@@ -58,4 +60,6 @@ public interface SzxcVoteResultMapper
      * @return 结果
      */
     public int deleteSzxcVoteResultByIds(Long[] ids);
+
+    YsResult selectSzxcVoteResultByDiscussId(Long ysId);
 }
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcVoteResultService.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcVoteResultService.java
index a7c983c..b222ab0 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcVoteResultService.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcVoteResultService.java
@@ -1,7 +1,9 @@
 package com.ruoyi.szxc.service;
 
-import java.util.List;
 import com.ruoyi.szxc.domain.SzxcVoteResult;
+import com.ruoyi.szxc.domain.YsResult;
+
+import java.util.List;
 
 /**
  * 议事投票情况Service接口
@@ -58,4 +60,6 @@ public interface ISzxcVoteResultService
      * @return 结果
      */
     public int deleteSzxcVoteResultById(Long id);
+
+    YsResult selectSzxcVoteResultByDiscussId(Long ysId);
 }
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcVoteResultServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcVoteResultServiceImpl.java
index 3f54b02..3ef2d51 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcVoteResultServiceImpl.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcVoteResultServiceImpl.java
@@ -1,12 +1,14 @@
 package com.ruoyi.szxc.service.impl;
 
-import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.szxc.mapper.SzxcVoteResultMapper;
 import com.ruoyi.szxc.domain.SzxcVoteResult;
+import com.ruoyi.szxc.domain.YsResult;
+import com.ruoyi.szxc.mapper.SzxcVoteResultMapper;
 import com.ruoyi.szxc.service.ISzxcVoteResultService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 议事投票情况Service业务层处理
@@ -93,4 +95,9 @@ public class SzxcVoteResultServiceImpl implements ISzxcVoteResultService
     {
         return szxcVoteResultMapper.deleteSzxcVoteResultById(id);
     }
+
+    @Override
+    public YsResult selectSzxcVoteResultByDiscussId(Long ysId) {
+        return szxcVoteResultMapper.selectSzxcVoteResultByDiscussId(ysId);
+    }
 }
diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcGyApplyMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcGyApplyMapper.xml
index f93ed19..86e6a51 100644
--- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcGyApplyMapper.xml
+++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcGyApplyMapper.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.szxc.mapper.SzxcGyApplyMapper">
-    
+
     <resultMap type="SzxcGyApply" id="SzxcGyApplyResult">
         <result property="id"    column="id"    />
-        <result property="jmId"    column="jm_id"    />
         <result property="gyId"    column="gy_id"    />
+        <result property="jmId"    column="jm_id"    />
         <result property="cardId"    column="card_id"    />
         <result property="name"    column="name"    />
+        <result property="phone"    column="phone"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -18,58 +19,62 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSzxcGyApplyVo">
-        select id, jm_id, gy_id, card_id, name, create_by, create_time, update_by, update_time, user_id from szxc_gy_apply
+        select id, gy_id, jm_id, card_id, name, phone, create_by, create_time, update_by, update_time, user_id from szxc_gy_apply
     </sql>
 
     <select id="selectSzxcGyApplyList" parameterType="SzxcGyApply" resultMap="SzxcGyApplyResult">
         <include refid="selectSzxcGyApplyVo"/>
-        <where>  
-            <if test="jmId != null "> and jm_id = #{jmId}</if>
+        <where>
             <if test="gyId != null "> and gy_id = #{gyId}</if>
+            <if test="jmId != null "> and jm_id = #{jmId}</if>
             <if test="cardId != null  and cardId != ''"> and card_id = #{cardId}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
             <if test="userId != null "> and user_id = #{userId}</if>
         </where>
     </select>
-    
+
     <select id="selectSzxcGyApplyById" parameterType="Long" resultMap="SzxcGyApplyResult">
         <include refid="selectSzxcGyApplyVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertSzxcGyApply" parameterType="SzxcGyApply" useGeneratedKeys="true" keyProperty="id">
         insert into szxc_gy_apply
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="jmId != null">jm_id,</if>
             <if test="gyId != null">gy_id,</if>
+            <if test="jmId != null">jm_id,</if>
             <if test="cardId != null">card_id,</if>
             <if test="name != null and name != ''">name,</if>
+            <if test="phone != null">phone,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="userId != null">user_id,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="jmId != null">#{jmId},</if>
             <if test="gyId != null">#{gyId},</if>
+            <if test="jmId != null">#{jmId},</if>
             <if test="cardId != null">#{cardId},</if>
             <if test="name != null and name != ''">#{name},</if>
+            <if test="phone != null">#{phone},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="userId != null">#{userId},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateSzxcGyApply" parameterType="SzxcGyApply">
         update szxc_gy_apply
         <trim prefix="SET" suffixOverrides=",">
-            <if test="jmId != null">jm_id = #{jmId},</if>
             <if test="gyId != null">gy_id = #{gyId},</if>
+            <if test="jmId != null">jm_id = #{jmId},</if>
             <if test="cardId != null">card_id = #{cardId},</if>
             <if test="name != null and name != ''">name = #{name},</if>
+            <if test="phone != null">phone = #{phone},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
@@ -84,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteSzxcGyApplyByIds" parameterType="String">
-        delete from szxc_gy_apply where id in 
+        delete from szxc_gy_apply where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcVoteResultMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcVoteResultMapper.xml
index 759a205..94bf9a7 100644
--- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcVoteResultMapper.xml
+++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcVoteResultMapper.xml
@@ -3,13 +3,14 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.szxc.mapper.SzxcVoteResultMapper">
-    
+
     <resultMap type="SzxcVoteResult" id="SzxcVoteResultResult">
         <result property="id"    column="id"    />
+        <result property="ysId"    column="ys_id"    />
         <result property="jmId"    column="jm_id"    />
         <result property="cardId"    column="card_id"    />
         <result property="voteName"    column="vote_name"    />
-        <result property="ysId"    column="ys_id"    />
+        <result property="phone"    column="phone"    />
         <result property="vote"    column="vote"    />
         <result property="opinion"    column="opinion"    />
         <result property="createBy"    column="create_by"    />
@@ -18,85 +19,69 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="userId"    column="user_id"    />
     </resultMap>
+    <resultMap type="YsResult" id="YsResult">
+        <result property="ysId"    column="ys_id"    />
+        <result property="tyCount"    column="ty"    />
+        <result property="fdCount"    column="fd"    />
+        <result property="qqCount"    column="qq"    />
+    </resultMap>
 
     <sql id="selectSzxcVoteResultVo">
         select id, jm_id, card_id, vote_name, ys_id, vote, opinion, create_by, create_time, update_by, update_time, user_id from szxc_vote_result
     </sql>
 
+    <sql id="selectSzxcVoteResultVo">
+        select id, ys_id, jm_id, card_id, vote_name, phone, vote, opinion, create_by, create_time, update_by, update_time, user_id from szxc_vote_result
+    </sql>
+
     <select id="selectSzxcVoteResultList" parameterType="SzxcVoteResult" resultMap="SzxcVoteResultResult">
         <include refid="selectSzxcVoteResultVo"/>
-        <where>  
+        <where>
+            <if test="ysId != null "> and ys_id = #{ysId}</if>
             <if test="jmId != null "> and jm_id = #{jmId}</if>
             <if test="cardId != null  and cardId != ''"> and card_id = #{cardId}</if>
             <if test="voteName != null  and voteName != ''"> and vote_name like concat('%', #{voteName}, '%')</if>
-            <if test="ysId != null "> and ys_id = #{ysId}</if>
+            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
             <if test="vote != null  and vote != ''"> and vote = #{vote}</if>
             <if test="opinion != null  and opinion != ''"> and opinion = #{opinion}</if>
             <if test="userId != null "> and user_id = #{userId}</if>
         </where>
     </select>
-    
+
     <select id="selectSzxcVoteResultById" parameterType="Long" resultMap="SzxcVoteResultResult">
         <include refid="selectSzxcVoteResultVo"/>
         where id = #{id}
     </select>
-        
-    <insert id="insertSzxcVoteResult" parameterType="SzxcVoteResult" useGeneratedKeys="true" keyProperty="id">
-        insert into szxc_vote_result
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="jmId != null">jm_id,</if>
-            <if test="cardId != null">card_id,</if>
-            <if test="voteName != null and voteName != ''">vote_name,</if>
-            <if test="ysId != null">ys_id,</if>
-            <if test="vote != null">vote,</if>
-            <if test="opinion != null">opinion,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="userId != null">user_id,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="jmId != null">#{jmId},</if>
-            <if test="cardId != null">#{cardId},</if>
-            <if test="voteName != null and voteName != ''">#{voteName},</if>
-            <if test="ysId != null">#{ysId},</if>
-            <if test="vote != null">#{vote},</if>
-            <if test="opinion != null">#{opinion},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="userId != null">#{userId},</if>
-         </trim>
-    </insert>
 
-    <update id="updateSzxcVoteResult" parameterType="SzxcVoteResult">
-        update szxc_vote_result
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="jmId != null">jm_id = #{jmId},</if>
-            <if test="cardId != null">card_id = #{cardId},</if>
-            <if test="voteName != null and voteName != ''">vote_name = #{voteName},</if>
-            <if test="ysId != null">ys_id = #{ysId},</if>
-            <if test="vote != null">vote = #{vote},</if>
-            <if test="opinion != null">opinion = #{opinion},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="userId != null">user_id = #{userId},</if>
-        </trim>
-        where id = #{id}
-    </update>
+    <!--通过议事id获取投票情况-->
+    <select id="selectSzxcVoteResultByDiscussId" parameterType="Long" resultMap="YsResult">
+       SELECT ys_Id, COUNT(vote = "0" or null) ty,COUNT(vote = "1" or null) fd,COUNT(vote = "2" or null) qq
+       FROM `szxc_vote_result`
+        <where>
+            <if test="ysId != null "> ys_id = #{ysId}</if>
+        </where>
+    </select>
+
+    <sql id="selectSzxcVoteResultVo">
+        select id, ys_id, jm_id, card_id, vote_name, phone, vote, opinion, create_by, create_time, update_by, update_time, user_id from szxc_vote_result
+    </sql>
 
-    <delete id="deleteSzxcVoteResultById" parameterType="Long">
-        delete from szxc_vote_result where id = #{id}
-    </delete>
+    <select id="selectSzxcVoteResultList" parameterType="SzxcVoteResult" resultMap="SzxcVoteResultResult">
+        <include refid="selectSzxcVoteResultVo"/>
+        <where>
+            <if test="ysId != null "> and ys_id = #{ysId}</if>
+            <if test="jmId != null "> and jm_id = #{jmId}</if>
+            <if test="cardId != null  and cardId != ''"> and card_id = #{cardId}</if>
+            <if test="voteName != null  and voteName != ''"> and vote_name like concat('%', #{voteName}, '%')</if>
+            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="vote != null  and vote != ''"> and vote = #{vote}</if>
+            <if test="opinion != null  and opinion != ''"> and opinion = #{opinion}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+        </where>
+    </select>
 
-    <delete id="deleteSzxcVoteResultByIds" parameterType="String">
-        delete from szxc_vote_result where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
+    <select id="selectSzxcVoteResultById" parameterType="Long" resultMap="SzxcVoteResultResult">
+        <include refid="selectSzxcVoteResultVo"/>
+        where id = #{id}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/szxc/apply/index.vue b/ruoyi-ui/src/views/szxc/apply/index.vue
index 39c9609..281edcb 100644
--- a/ruoyi-ui/src/views/szxc/apply/index.vue
+++ b/ruoyi-ui/src/views/szxc/apply/index.vue
@@ -1,18 +1,18 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="居民id" prop="jmId">
+      <el-form-item label="公益id" prop="gyId">
         <el-input
-          v-model="queryParams.jmId"
-          placeholder="请输入居民id"
+          v-model="queryParams.gyId"
+          placeholder="请输入公益id"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="公益id" prop="gyId">
+      <el-form-item label="居民id" prop="jmId">
         <el-input
-          v-model="queryParams.gyId"
-          placeholder="请输入公益id"
+          v-model="queryParams.jmId"
+          placeholder="请输入居民id"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -33,6 +33,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="手机号" prop="phone">
+        <el-input
+          v-model="queryParams.phone"
+          placeholder="请输入手机号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="创建者ID" prop="userId">
         <el-input
           v-model="queryParams.userId"
@@ -96,10 +104,11 @@
     <el-table v-loading="loading" :data="applyList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="id" align="center" prop="id" />
-      <el-table-column label="居民id" align="center" prop="jmId" />
       <el-table-column label="公益id" align="center" prop="gyId" />
+      <el-table-column label="居民id" align="center" prop="jmId" />
       <el-table-column label="身份证号" align="center" prop="cardId" />
       <el-table-column label="报名人" align="center" prop="name" />
+      <el-table-column label="手机号" align="center" prop="phone" />
       <el-table-column label="创建者ID" align="center" prop="userId" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -120,7 +129,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -132,18 +141,21 @@
     <!-- 添加或修改公益报名情况对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="居民id" prop="jmId">
-          <el-input v-model="form.jmId" placeholder="请输入居民id" />
-        </el-form-item>
         <el-form-item label="公益id" prop="gyId">
           <el-input v-model="form.gyId" placeholder="请输入公益id" />
         </el-form-item>
+        <el-form-item label="居民id" prop="jmId">
+          <el-input v-model="form.jmId" placeholder="请输入居民id" />
+        </el-form-item>
         <el-form-item label="身份证号" prop="cardId">
           <el-input v-model="form.cardId" placeholder="请输入身份证号" />
         </el-form-item>
         <el-form-item label="报名人" prop="name">
           <el-input v-model="form.name" placeholder="请输入报名人" />
         </el-form-item>
+        <el-form-item label="手机号" prop="phone">
+          <el-input v-model="form.phone" placeholder="请输入手机号" />
+        </el-form-item>
         <el-form-item label="创建者ID" prop="userId">
           <el-input v-model="form.userId" placeholder="请输入创建者ID" />
         </el-form-item>
@@ -157,152 +169,154 @@
 </template>
 
 <script>
-import { listApply, getApply, delApply, addApply, updateApply } from "@/api/szxc/apply";
+  import { listApply, getApply, delApply, addApply, updateApply } from "@/api/szxc/apply";
 
-export default {
-  name: "Apply",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 公益报名情况表格数据
-      applyList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        jmId: null,
-        gyId: null,
-        cardId: null,
-        name: null,
-        userId: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        name: [
-          { required: true, message: "报名人不能为空", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询公益报名情况列表 */
-    getList() {
-      this.loading = true;
-      listApply(this.queryParams).then(response => {
-        this.applyList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        jmId: null,
-        gyId: null,
-        cardId: null,
-        name: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null,
-        userId: null
+  export default {
+    name: "Apply",
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 公益报名情况表格数据
+        applyList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          gyId: null,
+          jmId: null,
+          cardId: null,
+          name: null,
+          phone: null,
+          userId: null
+        },
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {
+          name: [
+            { required: true, message: "报名人不能为空", trigger: "blur" }
+          ],
+        }
       };
-      this.resetForm("form");
     },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
+    created() {
       this.getList();
     },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加公益报名情况";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getApply(id).then(response => {
-        this.form = response.data;
+    methods: {
+      /** 查询公益报名情况列表 */
+      getList() {
+        this.loading = true;
+        listApply(this.queryParams).then(response => {
+          this.applyList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          id: null,
+          gyId: null,
+          jmId: null,
+          cardId: null,
+          name: null,
+          phone: null,
+          createBy: null,
+          createTime: null,
+          updateBy: null,
+          updateTime: null,
+          userId: null
+        };
+        this.resetForm("form");
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.id)
+        this.single = selection.length!==1
+        this.multiple = !selection.length
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        this.reset();
         this.open = true;
-        this.title = "修改公益报名情况";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateApply(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addApply(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+        this.title = "添加公益报名情况";
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        this.reset();
+        const id = row.id || this.ids
+        getApply(id).then(response => {
+          this.form = response.data;
+          this.open = true;
+          this.title = "修改公益报名情况";
+        });
+      },
+      /** 提交按钮 */
+      submitForm() {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            if (this.form.id != null) {
+              updateApply(this.form).then(response => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            } else {
+              addApply(this.form).then(response => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            }
           }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除公益报名情况编号为"' + ids + '"的数据项？').then(function() {
-        return delApply(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('szxc/apply/export', {
-        ...this.queryParams
-      }, `apply_${new Date().getTime()}.xlsx`)
+        });
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const ids = row.id || this.ids;
+        this.$modal.confirm('是否确认删除公益报名情况编号为"' + ids + '"的数据项？').then(function() {
+          return delApply(ids);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        this.download('szxc/apply/export', {
+          ...this.queryParams
+        }, `apply_${new Date().getTime()}.xlsx`)
+      }
     }
-  }
-};
+  };
 </script>