fix 会议，活动，通知修改好

ruoyi-common/src/main/java/com/ruoyi/common/utils/PDFUtil.java

@@ -68,11 +68,11 @@ public class PDFUtil {
         try
         {
             // 宋体资源文件路径,可以从C://Windows//Fonts//simsun.ttc拷贝到相应目录下
-            URL path = PDFUtil.class.getResource("/config/fonts/simsun.ttc");
-            return BaseFont.createFont(path + ",0", BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED);
+/*            URL path = PDFUtil.class.getResource("/config/fonts/simsun.ttc");
+            return BaseFont.createFont(path + ",0", BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED);*/
 
             // 本地测试：使用windows自带的宋体文件
-            // return BaseFont.createFont("C://Windows//Fonts//simsun.ttc,0", BaseFont.IDENTITY_H, false);
+             return BaseFont.createFont("C://Windows//Fonts//simsun.ttc,0", BaseFont.IDENTITY_H, false);
         }
         catch (Exception e)
         {

ruoyi-system/src/main/java/com/ruoyi/system/domain/bonus/ZxBonus.java

@@ -27,6 +27,10 @@ public class ZxBonus extends BaseEntity
     /** 考核界次 */
     @Excel(name = "考核界次")
     private String boundary;
+    /**
+     * 委员姓名
+     */
+    private String name;
 
     /** 考核类型 */
     @Excel(name = "考核类型")
@@ -49,6 +53,14 @@ public class ZxBonus extends BaseEntity
     @Excel(name = "加分时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date bonusTime;
 
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
     public String getType() {
         return type;
     }

ruoyi-system/src/main/java/com/ruoyi/system/domain/speak/ZxSpeak.java

@@ -1,7 +1,10 @@
 package com.ruoyi.system.domain.speak;
 
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.system.domain.ZxFj;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -66,6 +69,18 @@ public class ZxSpeak extends BaseEntity
     /** 状态 1:待审核 2:已审核 */
     @Excel(name = "状态 1:待审核 2:已审核")
     private String speakStatus;
+    /**
+     * 附件
+     */
+    private List<ZxFj> zxFjList;
+
+    public List<ZxFj> getZxFjList() {
+        return zxFjList;
+    }
+
+    public void setZxFjList(List<ZxFj> zxFjList) {
+        this.zxFjList = zxFjList;
+    }
 
     public String getName() {
         return name;

ruoyi-system/src/main/java/com/ruoyi/system/service/IZxActivityService.java

@@ -13,13 +13,13 @@ import java.util.List;
  */
 public interface IZxActivityService 
 {
-    /**
+/*    *//**
      * 查询政协活动
      * 
      * @param activityId 政协活动主键
      * @return 政协活动
-     */
-    public ZxActivity selectZxActivityByActivityId(Long activityId);
+     *//*
+    public ZxActivity selectZxActivityByActivityId(Long activityId);*/
     /**
      * 查询政协活动人员详情
      *

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StatisticsServiceImpl.java

@@ -122,7 +122,7 @@ public class StatisticsServiceImpl implements IStatisticsService {
         // 2.解析前台传来的echart图，生成pdf段落元素
         Paragraph pictureEle = PDFUtil.createImageFromEncodeBase64(memberInfo.getEle(), "柱状统计图", Float.parseFloat("34"),
                 Float.parseFloat("50"), true);
-        Paragraph picturePie = PDFUtil.createImageFromEncodeBase64(memberInfo.getPie(), "柱状统计图", Float.parseFloat("34"),
+        Paragraph picturePie = PDFUtil.createImageFromEncodeBase64(memberInfo.getPie(), "饼状统计图", Float.parseFloat("100"),
                 Float.parseFloat("100"), true);
         //查询界别字典值
         List<SysDictData> dictDataList = dictDataMapper.selectDictDataByType("circles");

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ZxActivityServiceImpl.java

@@ -43,16 +43,20 @@ public class ZxActivityServiceImpl implements IZxActivityService {
     @Autowired
     private ZxFjMapper zxFjMapper;
 
-    /**
+/*
+    */
+/**
      * 查询政协活动
      *
      * @param activityId 政协活动主键
      * @return 政协活动
-     */
+     *//*
+
     @Override
     public ZxActivity selectZxActivityByActivityId(Long activityId) {
         return zxActivityMapper.selectZxActivityByActivityId(activityId);
     }
+*/
 
     /**
      * 查询政协活动人员详情
@@ -70,7 +74,15 @@ public class ZxActivityServiceImpl implements IZxActivityService {
      */
     @Override
     public ZxActivity selectZxActivityInfo(ZxActivity zxActivity) {
-        return zxActivityMapper.selectZxActivityInfo(zxActivity);
+        ZxActivity zxActivityNew = zxActivityMapper.selectZxActivityInfo(zxActivity);
+        ZxFj zxFj = new ZxFj();
+        zxFj.setSourceId(zxActivityNew.getActivityId());
+        zxFj.setType(FIV);
+        List<ZxFj> zxFjs = zxFjMapper.selectZxFjList(zxFj);
+        if (zxFjs !=  null){
+            zxActivityNew.setZxFjList(zxFjs);
+        }
+        return zxActivityNew;
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ZxBonusServiceImpl.java

@@ -57,6 +57,7 @@ public class ZxBonusServiceImpl implements IZxBonusService
     {
         //只能给自己账号加分
         zxBonus.setUserId(SecurityUtils.getUserId());
+        zxBonus.setName(SecurityUtils.getUsername());
         zxBonus.setCreateTime(DateUtils.getNowDate());
         return zxBonusMapper.insertZxBonus(zxBonus);
     }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ZxConferenceServiceImpl.java

@@ -23,8 +23,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 
-import static com.ruoyi.common.constant.CommonConstants.FOR;
-import static com.ruoyi.common.constant.CommonConstants.THR;
+import static com.ruoyi.common.constant.CommonConstants.*;
 
 /**
  * 政协会议活动Service业务层处理
@@ -44,7 +43,15 @@ public class ZxConferenceServiceImpl implements IZxConferenceService {
      */
     @Override
     public ZxConference selectZxConferenceInfo(ZxConference zxConference) {
-        return zxConferenceMapper.selectZxConferenceInfo(zxConference);
+        ZxConference zxConferenceNew = zxConferenceMapper.selectZxConferenceInfo(zxConference);
+        ZxFj zxFj = new ZxFj();
+        zxFj.setSourceId(zxConferenceNew.getConferenceId());
+        zxFj.setType(FOR);
+        List<ZxFj> zxFjs = zxFjMapper.selectZxFjList(zxFj);
+        if (zxFjs !=  null){
+            zxConferenceNew.setZxFjList(zxFjs);
+        }
+        return zxConferenceNew;
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ZxSpeakServiceImpl.java

@@ -2,14 +2,22 @@ package com.ruoyi.system.service.impl;
 
 
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.ZxFj;
+import com.ruoyi.system.domain.activity.ZxActivity;
 import com.ruoyi.system.domain.speak.ZxSpeak;
+import com.ruoyi.system.mapper.ZxFjMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.ZxSpeakMapper;
 import com.ruoyi.system.service.IZxSpeakService;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import static com.ruoyi.common.constant.CommonConstants.FIV;
+import static com.ruoyi.common.constant.CommonConstants.SIX;
+
 /**
  * 政协发言Service业务层处理
  * 
@@ -21,6 +29,8 @@ public class ZxSpeakServiceImpl implements IZxSpeakService
 {
     @Autowired
     private ZxSpeakMapper zxSpeakMapper;
+    @Autowired
+    private ZxFjMapper zxFjMapper;
 
     /**
      * 查询政协发言
@@ -31,7 +41,15 @@ public class ZxSpeakServiceImpl implements IZxSpeakService
     @Override
     public ZxSpeak selectZxSpeakBySpeakId(Long speakId)
     {
-        return zxSpeakMapper.selectZxSpeakBySpeakId(speakId);
+        ZxSpeak zxSpeak = zxSpeakMapper.selectZxSpeakBySpeakId(speakId);
+        ZxFj zxFj = new ZxFj();
+        zxFj.setSourceId(zxSpeak.getSpeakId());
+        zxFj.setType(SIX);
+        List<ZxFj> zxFjs = zxFjMapper.selectZxFjList(zxFj);
+        if (zxFjs !=  null){
+            zxSpeak.setZxFjList(zxFjs);
+        }
+        return zxSpeak;
     }
 
     /**
@@ -56,8 +74,10 @@ public class ZxSpeakServiceImpl implements IZxSpeakService
     public int insertZxSpeak(ZxSpeak zxSpeak)
     {
         zxSpeak.setCreateTime(DateUtils.getNowDate());
-        zxSpeak.setSpeakTime(DateUtils.getNowDate());
-        return zxSpeakMapper.insertZxSpeak(zxSpeak);
+        zxSpeak.setPublishTime(DateUtils.getNowDate());
+        int i = zxSpeakMapper.insertZxSpeak(zxSpeak);
+        insertZxFj(zxSpeak);
+        return i;
     }
 
     /**
@@ -70,6 +90,8 @@ public class ZxSpeakServiceImpl implements IZxSpeakService
     public int updateZxSpeak(ZxSpeak zxSpeak)
     {
         zxSpeak.setUpdateTime(DateUtils.getNowDate());
+        zxFjMapper.deleteZxFjBySourceId(zxSpeak.getSpeakId());
+        insertZxFj(zxSpeak);
         return zxSpeakMapper.updateZxSpeak(zxSpeak);
     }
 
@@ -96,4 +118,28 @@ public class ZxSpeakServiceImpl implements IZxSpeakService
     {
         return zxSpeakMapper.deleteZxSpeakBySpeakId(speakId);
     }
+
+    /**
+     * 新增发言附件关联信息
+     */
+    public void insertZxFj(ZxSpeak zxSpeak)
+    {
+        List<ZxFj> zxFjListFj = zxSpeak.getZxFjList();
+        Long speakId = zxSpeak.getSpeakId();
+        if (StringUtils.isNotNull(zxFjListFj))
+        {
+            List<ZxFj> list = new ArrayList<ZxFj>();
+            for (ZxFj zxFj : zxFjListFj)
+            {
+                zxFj.setType(SIX);
+                zxFj.setMainId(speakId);
+                zxFj.setSourceId(speakId);
+                list.add(zxFj);
+            }
+            if (list.size() > 0)
+            {
+                zxFjMapper.batchZxFj(list);
+            }
+        }
+    }
 }

ruoyi-system/src/main/resources/mapper/system/ZxActivityMapper.xml

@@ -25,7 +25,7 @@
     <resultMap id="ZxActivityZxActivityUserResult" type="ZxActivity" extends="ZxActivityResult">
         <collection property="zxActivityUserList" notNullColumn="sub_activity_id" javaType="java.util.List"
                     resultMap="ZxActivityUserResult"/>
-        <collection property="zxFjList" notNullColumn="fj_source_id" javaType="java.util.List"
+        <collection property="zxFjList"  javaType="java.util.List"
                     resultMap="ZxFjResult"/>
     </resultMap>
 
@@ -34,6 +34,7 @@
         <result property="userId" column="sub_user_id"/>
         <result property="userName" column="sub_user_name"/>
         <result property="postName" column="sub_post_name"/>
+        <result property="phonenumber" column="sub_phonenumber"/>
         <result property="userLevel" column="sub_user_level"/>
         <result property="parentGrade"    column="sub_parent_grade"/>
         <result property="replyTime" column="sub_reply_time"/>
@@ -82,18 +83,14 @@
         select a.activity_id, a.activity_title, a.activity_date, a.activity_time, a.activity_address, a.activity_type,
         a.activity_details, a.publish_time, a.publish_dept, a.publish_dept_id, a.create_by, a.create_time, a.update_by,
         a.update_time, a.remark,
-        b.activity_id as sub_activity_id, b.parent_grade as sub_parent_grade,b.user_id as sub_user_id, b.user_name as sub_user_name, b.post_name as
+        b.activity_id as sub_activity_id,b.phonenumber as sub_phonenumber, b.parent_grade as sub_parent_grade,b.user_id as sub_user_id, b.user_name as sub_user_name, b.post_name as
         sub_post_name, b.user_level as sub_user_level, b.reply_time as sub_reply_time, b.is_join as sub_is_join,
         b.leave_type as sub_leave_type, b.leave_reason as sub_leave_reason, b.sign_in as sub_sign_in, b.create_by as
         sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time,
-        b.remark as sub_remark,
-        f.id as fj_id,f.main_id as fj_main_id, f.source_id as fj_source_id, f.name as fj_name, f.url as fj_url, f.type
-        as fj_type,f.stytle as fj_stytle
+        b.remark as sub_remark
         from zx_activity a
         left join zx_activity_user b on b.activity_id = a.activity_id
-        left join zx_fj f on f.source_id = a.activity_id
         <where>
-            f.type = '5'
             <if test="activityTitle != null  and activityTitle != ''">and a.activity_title = #{activityTitle}</if>
             <if test="activityDate != null ">and a.activity_date = #{activityDate}</if>
             <if test="activityTime != null  and activityTime != ''">and a.activity_time = #{activityTime}</if>
@@ -130,6 +127,7 @@
                a.update_time,
                a.remark,
                b.activity_id  as sub_activity_id,
+               b.phonenumber as sub_phonenumber,
                b.parent_grade as sub_parent_grade,
                b.user_id      as sub_user_id,
                b.user_name    as sub_user_name,
@@ -179,7 +177,7 @@
     <select id="selectZxActivityUser" resultMap="ZxActivityUserResult">
         select b.activity_id as sub_activity_id, b.user_id as sub_user_id, b.user_name as sub_user_name, b.post_name as
         sub_post_name, b.user_level as sub_user_level,b.parent_grade as sub_parent_grade, b.reply_time as sub_reply_time, b.is_join as sub_is_join,
-        b.leave_type as sub_leave_type, b.leave_reason as sub_leave_reason, b.sign_in as sub_sign_in, b.create_by as
+        b.leave_type as sub_leave_type,b.phonenumber as sub_phonenumber, b.leave_reason as sub_leave_reason, b.sign_in as sub_sign_in, b.create_by as
         sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time,
         b.remark as sub_remark
         from zx_activity_user b
@@ -192,19 +190,15 @@
         select a.activity_id, a.activity_title, a.activity_date, a.activity_time, a.activity_address, a.activity_type,
         a.activity_details, a.publish_time, a.publish_dept, a.publish_dept_id, a.create_by, a.create_time, a.update_by,
         a.update_time, a.remark,
-        b.activity_id as sub_activity_id,b.parent_grade as sub_parent_grade, b.user_id as sub_user_id, b.user_name as sub_user_name, b.post_name as
+        b.activity_id as sub_activity_id,b.phonenumber as sub_phonenumber,b.parent_grade as sub_parent_grade, b.user_id as sub_user_id, b.user_name as sub_user_name, b.post_name as
         sub_post_name, b.user_level as sub_user_level, b.reply_time as sub_reply_time, b.is_join as sub_is_join,
         b.leave_type as sub_leave_type, b.leave_reason as sub_leave_reason, b.sign_in as sub_sign_in, b.create_by as
         sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time,
-        b.remark as sub_remark,
-        f.id as fj_id,f.main_id as fj_main_id, f.source_id as fj_source_id, f.name as fj_name, f.url as fj_url, f.type
-        as fj_type,f.stytle as fj_stytle
+        b.remark as sub_remark
         from zx_activity a
         left join zx_activity_user b on b.activity_id = a.activity_id
-        left join zx_fj f on f.source_id = a.activity_id
         <where>
-            f.type = '5'
-           and a.activity_id = #{activityId}
+            a.activity_id = #{activityId}
             <if test="userId != null ">and b.user_id = #{userId}</if>
         </where>
     </select>
@@ -304,10 +298,10 @@
     </delete>
 
     <insert id="batchZxActivityUser">
-        insert into zx_activity_user( activity_id, user_id, user_name, post_name, user_level, reply_time, is_join,
+        insert into zx_activity_user( activity_id, user_id, user_name, phonenumber ,post_name, user_level, reply_time, is_join,
         leave_type,parent_grade, leave_reason, sign_in, create_by, create_time, update_by, update_time, remark) values
         <foreach item="item" index="index" collection="list" separator=",">
-            ( #{item.activityId}, #{item.userId}, #{item.userName}, #{item.postName}, #{item.userLevel},
+            ( #{item.activityId}, #{item.userId}, #{item.userName}, #{item.phonenumber},#{item.postName}, #{item.userLevel},
             #{item.replyTime}, #{item.isJoin}, #{item.leaveType},#{item.parentGrade}, #{item.leaveReason}, #{item.signIn}, #{item.createBy},
             #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.remark})
         </foreach>

ruoyi-system/src/main/resources/mapper/system/ZxBonusMapper.xml

@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="bonusId"    column="bonus_id"    />
         <result property="userId"    column="user_id"    />
         <result property="boundary"    column="boundary"    />
+        <result property="name"    column="name"    />
         <result property="checkType"    column="check_type"    />
         <result property="bonusType"    column="bonus_type"    />
         <result property="bonusReason"    column="bonus_reason"    />
@@ -22,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectZxBonusVo">
-        select bonus_id, user_id, boundary, check_type, bonus_type, bonus_reason, bonus_time, score,type, create_by, create_time, update_by, update_time, remark from zx_bonus
+        select bonus_id, user_id, boundary,name, check_type, bonus_type, bonus_reason, bonus_time, score,type, create_by, create_time, update_by, update_time, remark from zx_bonus
     </sql>
 
     <select id="selectZxBonusList" parameterType="ZxBonus" resultMap="ZxBonusResult">
@@ -30,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="boundary != null  and boundary != ''"> and boundary = #{boundary}</if>
+            <if test="name != null  and name != ''"> and name = #{name}</if>
             <if test="checkType != null  and checkType != ''"> and check_type = #{checkType}</if>
             <if test="bonusType != null  and bonusType != ''"> and bonus_type = #{bonusType}</if>
             <if test="bonusReason != null  and bonusReason != ''"> and bonus_reason = #{bonusReason}</if>
@@ -50,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="userId != null">user_id,</if>
             <if test="boundary != null">boundary,</if>
+            <if test="name != null">name,</if>
             <if test="checkType != null">check_type,</if>
             <if test="bonusType != null">bonus_type,</if>
             <if test="bonusReason != null">bonus_reason,</if>
@@ -65,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="userId != null">#{userId},</if>
             <if test="boundary != null">#{boundary},</if>
+            <if test="name != null">#{name},</if>
             <if test="checkType != null">#{checkType},</if>
             <if test="bonusType != null">#{bonusType},</if>
             <if test="bonusReason != null">#{bonusReason},</if>
@@ -84,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="userId != null">user_id = #{userId},</if>
             <if test="boundary != null">boundary = #{boundary},</if>
+            <if test="name != null and name != ''">name = #{name},</if>
             <if test="checkType != null">check_type = #{checkType},</if>
             <if test="bonusType != null">bonus_type = #{bonusType},</if>
             <if test="bonusReason != null">bonus_reason = #{bonusReason},</if>

ruoyi-system/src/main/resources/mapper/system/ZxConferenceMapper.xml

@@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap id="ZxConferenceZxConferenceUserResult" type="ZxConference" extends="ZxConferenceResult">
         <collection property="zxConferenceUserList" notNullColumn="sub_conference_id" javaType="java.util.List" resultMap="ZxConferenceUserResult" />
-        <collection property="zxFjList" notNullColumn="fj_source_id" javaType="java.util.List" resultMap="ZxFjResult" />
+        <collection property="zxFjList"  javaType="java.util.List" resultMap="ZxFjResult" />
     </resultMap>
 
     <resultMap type="ZxConferenceUser" id="ZxConferenceUserResult">
@@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="userId"    column="sub_user_id"    />
         <result property="userName"    column="sub_user_name"    />
         <result property="postName"    column="sub_post_name"    />
+        <result property="phonenumber" column="sub_phonenumber"/>
         <result property="userLevel"    column="sub_user_level"    />
         <result property="parentGrade"    column="sub_parent_grade"    />
         <result property="replyTime"    column="sub_reply_time"    />
@@ -62,13 +63,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectZxConferenceList" parameterType="ZxConference" resultMap="ZxConferenceZxConferenceUserResult">
         select a.conference_id, a.conference_title, a.conference_date,a.conference_type, a.conference_time, a.conference_address, a.publish_time,a.conference_qr, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,
-        b.conference_id as sub_conference_id, b.user_id as sub_user_id, b.user_name as sub_user_name, b.post_name as sub_post_name, b.user_level as sub_user_level, b.reply_time as sub_reply_time, b.is_join as sub_is_join, b.leave_type as sub_leave_type, b.parent_grade as sub_parent_grade,b.leave_reason as sub_leave_reason,b.sign_in as sub_sign_in, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.remark as sub_remark,
-        f.id as fj_id,f.main_id as fj_main_id, f.source_id as fj_source_id, f.name as fj_name, f.url as fj_url, f.type as fj_type,f.stytle as fj_stytle
+        b.conference_id as sub_conference_id,b.phonenumber as sub_phonenumber, b.user_id as sub_user_id, b.user_name as sub_user_name, b.post_name as sub_post_name, b.user_level as sub_user_level, b.reply_time as sub_reply_time, b.is_join as sub_is_join, b.leave_type as sub_leave_type, b.parent_grade as sub_parent_grade,b.leave_reason as sub_leave_reason,b.sign_in as sub_sign_in, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.remark as sub_remark
         from zx_conference a
         left join zx_conference_user b on b.conference_id = a.conference_id
-        left join zx_fj f on f.source_id = a.conference_id
         <where>
-            f.type = '4'
             <if test="conferenceTitle != null  and conferenceTitle != ''"> and a.conference_title like concat('%', #{conferenceTitle}, '%')</if>
             <if test="conferenceDate != null "> and a.conference_date = #{conferenceDate}</if>
             <if test="conferenceTime != null  and conferenceTime != ''"> and a.conference_time = #{conferenceTime}</if>
@@ -84,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectZxConferenceByConferenceId" parameterType="Long" resultMap="ZxConferenceZxConferenceUserResult">
         select a.conference_id, a.conference_title,a.conference_qr,a.conference_type, a.conference_date, a.conference_time, a.conference_address, a.publish_time, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,
- b.conference_id as sub_conference_id,b.parent_grade as sub_parent_grade, b.user_id as sub_user_id, b.user_name as sub_user_name, b.post_name as sub_post_name, b.user_level as sub_user_level, b.reply_time as sub_reply_time, b.is_join as sub_is_join, b.leave_type as sub_leave_type, b.leave_reason as sub_leave_reason,b.sign_in as sub_sign_in, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.remark as sub_remark,
+ b.conference_id as sub_conference_id,b.parent_grade as sub_parent_grade,b.phonenumber as sub_phonenumber, b.user_id as sub_user_id, b.user_name as sub_user_name, b.post_name as sub_post_name, b.user_level as sub_user_level, b.reply_time as sub_reply_time, b.is_join as sub_is_join, b.leave_type as sub_leave_type, b.leave_reason as sub_leave_reason,b.sign_in as sub_sign_in, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.remark as sub_remark,
         f.id as fj_id,f.main_id as fj_main_id, f.source_id as fj_source_id, f.name as fj_name, f.url as fj_url, f.type as fj_type,f.stytle as fj_stytle
         from zx_conference a
         left join zx_conference_user b on b.conference_id = a.conference_id
@@ -92,12 +90,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.conference_id = #{conferenceId} and f.type = '4'
     </select>
     <select id="selectZxConferenceUserByConferenceId" resultMap="ZxConferenceUserResult">
-        select b.conference_id as sub_conference_id,b.parent_grade as sub_parent_grade, b.user_id as sub_user_id, b.user_name as sub_user_name, b.post_name as sub_post_name, b.user_level as sub_user_level, b.reply_time as sub_reply_time, b.is_join as sub_is_join, b.leave_type as sub_leave_type, b.leave_reason as sub_leave_reason,b.sign_in as sub_sign_in, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.remark as sub_remark
+        select b.conference_id as sub_conference_id,b.phonenumber as sub_phonenumber,b.parent_grade as sub_parent_grade, b.user_id as sub_user_id, b.user_name as sub_user_name, b.post_name as sub_post_name, b.user_level as sub_user_level, b.reply_time as sub_reply_time, b.is_join as sub_is_join, b.leave_type as sub_leave_type, b.leave_reason as sub_leave_reason,b.sign_in as sub_sign_in, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.remark as sub_remark
         from  zx_conference_user b
         where b.conference_id = #{conferenceId}
     </select>
     <select id="selectZxConferenceUser" parameterType = "zxConferenceUser" resultMap="ZxConferenceUserResult">
-        select b.conference_id as sub_conference_id,b.parent_grade as sub_parent_grade, b.user_id as sub_user_id, b.user_name as sub_user_name, b.post_name as sub_post_name, b.user_level as sub_user_level, b.reply_time as sub_reply_time, b.is_join as sub_is_join, b.leave_type as sub_leave_type, b.leave_reason as sub_leave_reason,b.sign_in as sub_sign_in, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.remark as sub_remark
+        select b.conference_id as sub_conference_id,b.phonenumber as sub_phonenumber,b.parent_grade as sub_parent_grade, b.user_id as sub_user_id, b.user_name as sub_user_name, b.post_name as sub_post_name, b.user_level as sub_user_level, b.reply_time as sub_reply_time, b.is_join as sub_is_join, b.leave_type as sub_leave_type, b.leave_reason as sub_leave_reason,b.sign_in as sub_sign_in, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.remark as sub_remark
         from  zx_conference_user b
         <where>
             b.conference_id = #{conferenceId}
@@ -106,14 +104,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="selectZxConferenceInfo" parameterType="ZxConference" resultMap="ZxConferenceZxConferenceUserResult">
         select a.conference_id, a.conference_title,a.conference_qr,a.conference_type, a.conference_date, a.conference_time, a.conference_address, a.publish_time, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,
-               b.conference_id as sub_conference_id,b.parent_grade as sub_parent_grade, b.user_id as sub_user_id, b.user_name as sub_user_name, b.post_name as sub_post_name, b.user_level as sub_user_level, b.reply_time as sub_reply_time, b.is_join as sub_is_join, b.leave_type as sub_leave_type, b.leave_reason as sub_leave_reason,b.sign_in as sub_sign_in, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.remark as sub_remark,
-               f.id as fj_id,f.main_id as fj_main_id, f.source_id as fj_source_id, f.name as fj_name, f.url as fj_url, f.type as fj_type,f.stytle as fj_stytle
+               b.conference_id as sub_conference_id,b.phonenumber as sub_phonenumber,b.parent_grade as sub_parent_grade, b.user_id as sub_user_id, b.user_name as sub_user_name, b.post_name as sub_post_name, b.user_level as sub_user_level, b.reply_time as sub_reply_time, b.is_join as sub_is_join, b.leave_type as sub_leave_type, b.leave_reason as sub_leave_reason,b.sign_in as sub_sign_in, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.remark as sub_remark
         from zx_conference a
                  left join zx_conference_user b on b.conference_id = a.conference_id
-                 left join zx_fj f on f.source_id = a.conference_id
         <where>
-            f.type = '4'
-           and a.conference_id = #{conferenceId}
+            a.conference_id = #{conferenceId}
             <if test="userId != null "> and b.user_id = #{userId}</if>
         </where>
     </select>
@@ -207,9 +202,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <insert id="batchZxConferenceUser">
-        insert into zx_conference_user( conference_id, user_id, user_name, post_name, user_level, reply_time, is_join, leave_type,parent_grade, leave_reason, sign_in ,create_by, create_time, update_by, update_time, remark) values
+        insert into zx_conference_user( conference_id, user_id, user_name,phonenumber , post_name, user_level, reply_time, is_join, leave_type,parent_grade, leave_reason, sign_in ,create_by, create_time, update_by, update_time, remark) values
 		<foreach item="item" index="index" collection="list" separator=",">
-            ( #{item.conferenceId}, #{item.userId}, #{item.userName}, #{item.postName}, #{item.userLevel}, #{item.replyTime}, #{item.isJoin}, #{item.leaveType},#{item.parentGrade}, #{item.leaveReason},#{item.signIn}, #{item.createBy}, sysdate(), #{item.updateBy}, #{item.updateTime}, #{item.remark})
+            ( #{item.conferenceId}, #{item.userId}, #{item.userName}, #{item.phonenumber},#{item.postName}, #{item.userLevel}, #{item.replyTime}, #{item.isJoin}, #{item.leaveType},#{item.parentGrade}, #{item.leaveReason},#{item.signIn}, #{item.createBy}, sysdate(), #{item.updateBy}, #{item.updateTime}, #{item.remark})
         </foreach>
     </insert>
 </mapper>