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

ruoyi-admin/src/main/java/com/ruoyi/web/controller/activity/ZxActivityController.java

@@ -72,10 +72,9 @@ public class ZxActivityController extends BaseController {
     /**
      * 获取政协活动详细信息
      */
-    @PreAuthorize("@ss.hasPermi('zxActivity:activity:query')")
-    @GetMapping(value = "/{activityId}")
-    public AjaxResult getInfo(@PathVariable("activityId") Long activityId) {
-        return success(zxActivityService.selectZxActivityByActivityId(activityId));
+    @PostMapping(value = "/info")
+    public AjaxResult getInfo(@RequestBody ZxActivity zxActivity) {
+        return success(zxActivityService.selectZxActivityInfo(zxActivity));
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/conference/ZxConferenceController.java

@@ -71,10 +71,9 @@ public class ZxConferenceController extends BaseController {
     /**
      * 获取政协会议活动详细信息
      */
-    @PreAuthorize("@ss.hasPermi('zxConference:conference:query')")
-    @GetMapping(value = "/{conferenceId}")
-    public AjaxResult getInfo(@PathVariable("conferenceId") Long conferenceId) {
-        return success(zxConferenceService.selectZxConferenceByConferenceId(conferenceId));
+    @PostMapping(value = "/info")
+    public AjaxResult getInfo(@RequestBody ZxConference zxConference) {
+        return success(zxConferenceService.selectZxConferenceInfo(zxConference));
     }
 
     /**

ruoyi-admin/src/main/resources/application.yml

@@ -41,7 +41,7 @@ token:
   # 令牌密钥
   secret: abcdefghijklmnopqrstuvwxyz
   # 令牌有效期（默认30分钟）
-  expireTime: 30
+  expireTime: 240
 
 # MyBatis配置
 mybatis:
@@ -70,6 +70,6 @@ xss:
   # 过滤开关
   enabled: true
   # 排除链接（多个用逗号分隔）
-  excludes: /system/notice,/zxNotice/*
+  excludes: /system/notice,/zxNotice/*,/zxActivity/*
   # 匹配链接
-  urlPatterns: /system/*,/monitor/*,/tool/*,/zxNotice/*，,/category/*
+  urlPatterns: /system/*,/monitor/*,/tool/*,/zxNotice/*,/zxActivity/*,/category/*

ruoyi-system/src/main/java/com/ruoyi/system/domain/activity/ZxActivity.java

@@ -80,6 +80,17 @@ public class ZxActivity extends BaseEntity
      */
     private List<ZxFj> zxFjListFj;
 
+    /** 是否参会 N:不参加 Y：参加 不在数据库中*/
+    private String isJoin;
+
+    public String getIsJoin() {
+        return isJoin;
+    }
+
+    public void setIsJoin(String isJoin) {
+        this.isJoin = isJoin;
+    }
+
     public List<ZxFj> getZxFjListFj() {
         return zxFjListFj;
     }

ruoyi-system/src/main/java/com/ruoyi/system/domain/conference/ZxConference.java

@@ -72,6 +72,17 @@ public class ZxConference extends BaseEntity
      */
     private List<ZxFj> zxFjListFj;
 
+    /** 是否参会 N:不参加 Y：参加 不在数据库中*/
+    private String isJoin;
+
+    public String getIsJoin() {
+        return isJoin;
+    }
+
+    public void setIsJoin(String isJoin) {
+        this.isJoin = isJoin;
+    }
+
     public List<ZxFj> getZxFjListFj() {
         return zxFjListFj;
     }

ruoyi-system/src/main/java/com/ruoyi/system/domain/notice/ZxNotice.java

@@ -22,6 +22,10 @@ public class ZxNotice extends BaseEntity
 
     /** 公告ID */
     private Long zxNoticeId;
+    /**
+     * 用户id查询时使用
+     */
+    private Long userId;
 
     /** 公告标题 */
     @Excel(name = "公告标题")
@@ -68,6 +72,14 @@ public class ZxNotice extends BaseEntity
      */
     private List<ZxFj> zxFjListFj;
 
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
     public List<ZxFj> getZxFjListFj() {
         return zxFjListFj;
     }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/ZxActivityMapper.java

@@ -28,6 +28,10 @@ public interface ZxActivityMapper
      * @return 政协活动
      */
     public List<ZxActivityUser> selectZxActivityUserByActivityId(Long activityId);
+    /**
+     * 获取政协活动详细信息
+     */
+    public ZxActivity selectZxActivityInfo(ZxActivity zxActivity);
     /**
      * 获取政协活动人员详细信息
      */

ruoyi-system/src/main/java/com/ruoyi/system/mapper/ZxConferenceMapper.java

@@ -20,6 +20,7 @@ public interface ZxConferenceMapper
      * @return 政协会议活动
      */
     public ZxConference selectZxConferenceByConferenceId(Long conferenceId);
+    public ZxConference selectZxConferenceInfo(ZxConference zxConference);
     /**
      *查询政协会议活动人员详情
      * @param conferenceId 政协会议活动主键

ruoyi-system/src/main/java/com/ruoyi/system/mapper/ZxNoticeMapper.java

@@ -77,6 +77,7 @@ public interface ZxNoticeMapper
      * @return 结果
      */
     public int batchZxUserNotice(List<ZxUserNotice> zxUserNoticeList);
+    public int updateZxNoticeUser(ZxUserNotice zxUserNotice);
     /**
      * 新增用户与政协通知公告关联
      *

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

@@ -27,6 +27,10 @@ public interface IZxActivityService
      * @return 政协活动
      */
     public List<ZxActivityUser> selectZxActivityUserByActivityId(Long activityId);
+    /**
+     * 获取政协活动详细信息
+     */
+    public ZxActivity selectZxActivityInfo(ZxActivity zxActivity);
     /**
      * 获取政协活动人员详细信息
      */

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

@@ -15,12 +15,9 @@ import java.util.List;
 public interface IZxConferenceService 
 {
     /**
-     * 查询政协会议活动
-     * 
-     * @param conferenceId 政协会议活动主键
-     * @return 政协会议活动
+     * 获取政协会议活动详细信息
      */
-    public ZxConference selectZxConferenceByConferenceId(Long conferenceId);
+    public ZxConference selectZxConferenceInfo(ZxConference zxConference);
 
     /**
      *查询政协会议活动人员详情

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

@@ -63,6 +63,15 @@ public class ZxActivityServiceImpl implements IZxActivityService {
     public List<ZxActivityUser> selectZxActivityUserByActivityId(Long activityId) {
         return zxActivityMapper.selectZxActivityUserByActivityId(activityId);
     }
+
+    /**
+     * 获取政协活动详细信息
+     */
+    @Override
+    public ZxActivity selectZxActivityInfo(ZxActivity zxActivity) {
+        return zxActivityMapper.selectZxActivityInfo(zxActivity);
+    }
+
     /**
      * 获取政协活动人员详细信息
      */
@@ -91,6 +100,10 @@ public class ZxActivityServiceImpl implements IZxActivityService {
                     count = zxActivityUserList.stream().filter(e -> e.getIsJoin() != null).count();
                     activity.setRead(count + "");
                     activity.setNoRead(String.valueOf(zxActivityUserList.size() - count));
+                    String isJoin = zxActivityUserList.get(0).getIsJoin();
+                    if (StringUtils.isNotEmpty(isJoin)){
+                        activity.setIsJoin(isJoin);
+                    }
                 }
             }
         }
@@ -206,9 +219,9 @@ public class ZxActivityServiceImpl implements IZxActivityService {
                 int times = 0;// 循环几个100  用List的长度 除 100
                 int size = phoneList.size(); // 数据数量
                 //会议通知模板id
-                String templateCode = "SMS_465322668";
+                String templateCode = "SMS_465342955";
                 //签名
-                String SignName = "潜山市政协办公室";
+                String signName = "潜山市政协办公室";
                 List<String> signNameList = new ArrayList<>();
                 List<String> templateList = new ArrayList<>();
                 List<String> phoneJsonList = new ArrayList<>();
@@ -231,6 +244,7 @@ public class ZxActivityServiceImpl implements IZxActivityService {
                         templateParamJson = new StringBuffer();
                         phoneNumberJson.append("[");
                         signNameJson.append("[");
+                        templateParamJson.append("[");
                         for (int k = j * maxNums; k < size && k < (j + 1) * maxNums; k++) {
                             // 防止有空行，手机号是必须要有的
                             String phone = phoneList.get(k);
@@ -238,11 +252,11 @@ public class ZxActivityServiceImpl implements IZxActivityService {
                                 continue;
                             }
                             phoneNumberJson.append("\"" + phoneList.get(k) + "\",");
-                            signNameJson.append(SignName+",");
+                            signNameJson.append("\"" + signName + "\",");
                             /**
-                             * 活动：定于${monthname}月${dayname}日(星期${weekname)} ${time) 在${address}地点举行${content}活动，请${name}准时参加。
+                             * 定于${month}月${day}日（${week}） ${time} 在${place}地点举行${content}活动，请${name}准时参加。
                              */
-                            templateParamJson.append("{\"monthname\":\"" + localDate.getMonthValue() + "\",\"dayname\":\"" + localDate.getDayOfMonth() + "\",\"weekname\":\"" + localDate.getDayOfWeek().getDisplayName(TextStyle.FULL, Locale.CHINESE) + "\",\"time\":\"" + activityTime +  "\",\"address\":\"" + activityAddress + "\",\"content\":\"" + activityTitle + "\",\"name\":\"" + userNameList.get(k) + "\"},");
+                            templateParamJson.append("{\"month\":\"" + localDate.getMonthValue() + "\",\"day\":\"" + localDate.getDayOfMonth() + "\",\"week\":\"" + localDate.getDayOfWeek().getDisplayName(TextStyle.FULL, Locale.CHINESE) + "\",\"time\":\"" + activityTime +  "\",\"place\":\"" + activityAddress + "\",\"content\":\"" + activityTitle + "\",\"name\":\"" + userNameList.get(k) + "\"},");
                         }
                         phoneNumberJson.deleteCharAt(phoneNumberJson.length() - 1);//移除最后一个逗号字符，
                         signNameJson.deleteCharAt(signNameJson.length() - 1);

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

@@ -40,14 +40,11 @@ public class ZxConferenceServiceImpl implements IZxConferenceService {
     private ZxFjMapper zxFjMapper;
 
     /**
-     * 查询政协会议活动
-     *
-     * @param conferenceId 政协会议活动主键
-     * @return 政协会议活动
+     * 获取政协会议活动详细信息
      */
     @Override
-    public ZxConference selectZxConferenceByConferenceId(Long conferenceId) {
-        return zxConferenceMapper.selectZxConferenceByConferenceId(conferenceId);
+    public ZxConference selectZxConferenceInfo(ZxConference zxConference) {
+        return zxConferenceMapper.selectZxConferenceInfo(zxConference);
     }
 
     /**
@@ -67,7 +64,8 @@ public class ZxConferenceServiceImpl implements IZxConferenceService {
      */
     @Override
     public List<ZxConferenceUser> selectZxConferenceUser(ZxConferenceUser zxConferenceUser) {
-        return zxConferenceMapper.selectZxConferenceUser(zxConferenceUser);
+        List<ZxConferenceUser> zxConferenceUsers = zxConferenceMapper.selectZxConferenceUser(zxConferenceUser);
+        return zxConferenceUsers;
     }
 
     /**
@@ -91,6 +89,10 @@ public class ZxConferenceServiceImpl implements IZxConferenceService {
                     count = zxConferenceUserList.stream().filter(e -> e.getIsJoin() != null).count();
                     conference.setRead(count + "");
                     conference.setNoRead(String.valueOf(zxConferenceUserList.size() - count));
+                    String isJoin = zxConferenceUserList.get(0).getIsJoin();
+                    if (StringUtils.isNotEmpty(isJoin)){
+                        conference.setIsJoin(isJoin);
+                    }
                 }
             }
         }
@@ -107,6 +109,7 @@ public class ZxConferenceServiceImpl implements IZxConferenceService {
     @Override
     public int insertZxConference(ZxConference zxConference) {
         zxConference.setCreateTime(DateUtils.getNowDate());
+        zxConference.setPublishTime(DateUtils.getNowDate());
         int rows = zxConferenceMapper.insertZxConference(zxConference);
         insertZxConferenceUser(zxConference);
         insertZxFj(zxConference);
@@ -208,9 +211,9 @@ public class ZxConferenceServiceImpl implements IZxConferenceService {
                 int times = 0;// 循环几个100  用List的长度 除 100
                 int size = phoneList.size(); // 数据数量
                 //会议通知模板id
-                String templateCode = "SMS_465407754";
+                String templateCode = "SMS_465422107";
                 //签名
-                String SignName = "潜山市政协办公室";
+                String signName = "潜山市政协办公室";
                 List<String> signNameList = new ArrayList<>();
                 List<String> templateList = new ArrayList<>();
                 List<String> phoneJsonList = new ArrayList<>();
@@ -233,6 +236,7 @@ public class ZxConferenceServiceImpl implements IZxConferenceService {
                         templateParamJson = new StringBuffer();
                         phoneNumberJson.append("[");
                         signNameJson.append("[");
+                        templateParamJson.append("[");
                         for (int k = j * maxNums; k < size && k < (j + 1) * maxNums; k++) {
                             // 防止有空行，手机号是必须要有的
                             String phone = phoneList.get(k);
@@ -240,11 +244,11 @@ public class ZxConferenceServiceImpl implements IZxConferenceService {
                                 continue;
                             }
                             phoneNumberJson.append("\"" + phoneList.get(k) + "\",");
-                            signNameJson.append(SignName+",");
+                            signNameJson.append("\"" + signName + "\",");
                             /**
-                             * 活动：定于${monthname}月${dayname}日(星期${weekname)} ${time) 在${address}地点举行${content}活动，请${name}准时参加。
+                             * 定于${month}月${day}日（${week}） ${time} 在${place}地点召开${content}会议，请${name}准时参加。
                              */
-                            templateParamJson.append("{\"monthname\":\"" + localDate.getMonthValue() + "\",\"dayname\":\"" + localDate.getDayOfMonth() + "\",\"weekname\":\"" + localDate.getDayOfWeek().getDisplayName(TextStyle.FULL, Locale.CHINESE) + "\",\"time\":\"" + conferenceTime +  "\",\"address\":\"" + conferenceAddress + "\",\"content\":\"" + conferenceTitle + "\",\"name\":\"" + userNameList.get(k) + "\"},");
+                            templateParamJson.append("{\"month\":\"" + localDate.getMonthValue() + "\",\"day\":\"" + localDate.getDayOfMonth() + "\",\"week\":\"" + localDate.getDayOfWeek().getDisplayName(TextStyle.FULL, Locale.CHINESE) + "\",\"time\":\"" + conferenceTime +  "\",\"place\":\"" + conferenceAddress + "\",\"content\":\"" + conferenceTitle + "\",\"name\":\"" + userNameList.get(k) + "\"},");
                         }
                         phoneNumberJson.deleteCharAt(phoneNumberJson.length() - 1);//移除最后一个逗号字符，
                         signNameJson.deleteCharAt(signNameJson.length() - 1);

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

@@ -6,6 +6,7 @@ import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.system.domain.ZxFj;
 import com.ruoyi.system.domain.notice.ZxNotice;
 import com.ruoyi.system.domain.notice.ZxUserNotice;
+import com.ruoyi.system.mapper.SysUserMapper;
 import com.ruoyi.system.mapper.ZxFjMapper;
 import com.ruoyi.system.service.IZxNoticeService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +33,8 @@ public class ZxNoticeServiceImpl implements IZxNoticeService
 
     @Autowired
     private ZxFjMapper zxFjMapper;
+    @Autowired
+    private SysUserMapper sysUserMapper;
 
     /**
      * 查询政协通知公告
@@ -44,17 +47,11 @@ public class ZxNoticeServiceImpl implements IZxNoticeService
     {
 
         ZxNotice zxNotice = zxNoticeMapper.selectZxNoticeByZxNoticeId(zxNoticeId);
-        //记录是谁看的
-        //先去查询是否已经看过
         ZxUserNotice zxUserNotice = new ZxUserNotice();
-        SysUser user = SecurityUtils.getLoginUser().getUser();
-        zxUserNotice.setUserId(user.getUserId());
+        zxUserNotice.setUserId(SecurityUtils.getUserId());
         zxUserNotice.setZxNoticeId(zxNoticeId);
-        int i = zxNoticeMapper.selectZxUserNoticeByUserIdAndNoticeId(user.getUserId(), zxNoticeId);
-        if (i == 0){
-            zxUserNotice.setUserName(user.getUserName());
-            zxNoticeMapper.insterZxUserNotice(zxUserNotice);
-        }
+        zxUserNotice.setZxNoticeType("Y");
+        zxNoticeMapper.updateZxNoticeUser(zxUserNotice);
         return zxNotice;
     }
 
@@ -67,6 +64,7 @@ public class ZxNoticeServiceImpl implements IZxNoticeService
     @Override
     public List<ZxNotice> selectZxNoticeList(ZxNotice zxNotice)
     {
+        zxNotice.setUserId(SecurityUtils.getUserId());
         return zxNoticeMapper.selectZxNoticeList(zxNotice);
     }
 
@@ -82,6 +80,18 @@ public class ZxNoticeServiceImpl implements IZxNoticeService
     {
         zxNotice.setCreateTime(DateUtils.getNowDate());
         int rows = zxNoticeMapper.insertZxNotice(zxNotice);
+        List<SysUser> sysUsers = sysUserMapper.selectUserList(new SysUser());
+        if (sysUsers != null && sysUsers.size() >0){
+            List<ZxUserNotice> list= new ArrayList<>();
+            for (SysUser sysUser : sysUsers) {
+                ZxUserNotice  zxUserNotice = new ZxUserNotice();
+                zxUserNotice.setUserId(sysUser.getUserId());
+                zxUserNotice.setUserName(sysUser.getUserName());
+                zxUserNotice.setZxNoticeId(zxNotice.getZxNoticeId());
+                list.add(zxUserNotice);
+            }
+            zxNoticeMapper.batchZxUserNotice(list);
+        }
         insertZxFj(zxNotice);
         insertZxUserNotice(zxNotice);
         return rows;

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

@@ -48,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ranking != null  and ranking != ''"> and ranking = #{ranking}</if>
             <if test="grade != null  and grade != ''"> and find_in_set(#{grade}, grade)</if>
         </where>
+        order by  create_time DESC
     </select>
     
     <select id="selectMemberInfoByMemberId" parameterType="Long" resultMap="MemberInfoResult">

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

@@ -1,110 +1,207 @@
 <?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.system.mapper.ZxActivityMapper">
-    
+
     <resultMap type="ZxActivity" id="ZxActivityResult">
-        <result property="activityId"    column="activity_id"    />
-        <result property="activityTitle"    column="activity_title"    />
-        <result property="activityDate"    column="activity_date"    />
-        <result property="activityTime"    column="activity_time"    />
-        <result property="activityAddress"    column="activity_address"    />
-        <result property="activityType"    column="activity_type"    />
-        <result property="activityDetails"    column="activity_details"    />
-        <result property="publishTime"    column="publish_time"    />
-        <result property="publishDept"    column="publish_dept"    />
-        <result property="publishDeptId"    column="publish_dept_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
+        <result property="activityId" column="activity_id"/>
+        <result property="activityTitle" column="activity_title"/>
+        <result property="activityDate" column="activity_date"/>
+        <result property="activityTime" column="activity_time"/>
+        <result property="activityAddress" column="activity_address"/>
+        <result property="activityType" column="activity_type"/>
+        <result property="activityDetails" column="activity_details"/>
+        <result property="publishTime" column="publish_time"/>
+        <result property="publishDept" column="publish_dept"/>
+        <result property="publishDeptId" column="publish_dept_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <resultMap id="ZxActivityZxActivityUserResult" type="ZxActivity" extends="ZxActivityResult">
-        <collection property="zxActivityUserList" notNullColumn="sub_activity_id" javaType="java.util.List" resultMap="ZxActivityUserResult" />
-        <collection property="zxFjListFj" notNullColumn="fj_source_id" javaType="java.util.List" resultMap="ZxFjResult" />
+        <collection property="zxActivityUserList" notNullColumn="sub_activity_id" javaType="java.util.List"
+                    resultMap="ZxActivityUserResult"/>
+        <collection property="zxFjListFj" notNullColumn="fj_source_id" javaType="java.util.List"
+                    resultMap="ZxFjResult"/>
     </resultMap>
 
     <resultMap type="ZxActivityUser" id="ZxActivityUserResult">
-        <result property="activityId"    column="sub_activity_id"    />
-        <result property="userId"    column="sub_user_id"    />
-        <result property="userName"    column="sub_user_name"    />
-        <result property="postName"    column="sub_post_name"    />
-        <result property="userLevel"    column="sub_user_level"    />
-        <result property="replyTime"    column="sub_reply_time"    />
-        <result property="isJoin"    column="sub_is_join"    />
-        <result property="leaveType"    column="sub_leave_type"    />
-        <result property="leaveReason"    column="sub_leave_reason"    />
-        <result property="signIn"    column="sub_sign_in"    />
-        <result property="createBy"    column="sub_create_by"    />
-        <result property="createTime"    column="sub_create_time"    />
-        <result property="updateBy"    column="sub_update_by"    />
-        <result property="updateTime"    column="sub_update_time"    />
-        <result property="remark"    column="sub_remark"    />
+        <result property="activityId" column="sub_activity_id"/>
+        <result property="userId" column="sub_user_id"/>
+        <result property="userName" column="sub_user_name"/>
+        <result property="postName" column="sub_post_name"/>
+        <result property="userLevel" column="sub_user_level"/>
+        <result property="replyTime" column="sub_reply_time"/>
+        <result property="isJoin" column="sub_is_join"/>
+        <result property="leaveType" column="sub_leave_type"/>
+        <result property="leaveReason" column="sub_leave_reason"/>
+        <result property="signIn" column="sub_sign_in"/>
+        <result property="createBy" column="sub_create_by"/>
+        <result property="createTime" column="sub_create_time"/>
+        <result property="updateBy" column="sub_update_by"/>
+        <result property="updateTime" column="sub_update_time"/>
+        <result property="remark" column="sub_remark"/>
     </resultMap>
 
     <resultMap type="ZxFj" id="ZxFjResult">
-        <result property="id"    column="fj_id"    />
-        <result property="mainId"    column="fj_main_id"    />
-        <result property="sourceId"    column="fj_source_id"    />
-        <result property="name"    column="fj_name"    />
-        <result property="url"    column="fj_url"    />
-        <result property="type"    column="fj_type"    />
-        <result property="stytle"    column="fj_stytle"    />
-        <result property="remark"    column="fj_remark"    />
+        <result property="id" column="fj_id"/>
+        <result property="mainId" column="fj_main_id"/>
+        <result property="sourceId" column="fj_source_id"/>
+        <result property="name" column="fj_name"/>
+        <result property="url" column="fj_url"/>
+        <result property="type" column="fj_type"/>
+        <result property="stytle" column="fj_stytle"/>
+        <result property="remark" column="fj_remark"/>
     </resultMap>
 
     <sql id="selectZxActivityVo">
-        select activity_id, activity_title, activity_date, activity_time, activity_address, activity_type, activity_details, publish_time, publish_dept, publish_dept_id, create_by, create_time, update_by, update_time, remark from zx_activity
+        select activity_id,
+               activity_title,
+               activity_date,
+               activity_time,
+               activity_address,
+               activity_type,
+               activity_details,
+               publish_time,
+               publish_dept,
+               publish_dept_id,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark
+        from zx_activity
     </sql>
 
     <select id="selectZxActivityList" parameterType="ZxActivity" resultMap="ZxActivityZxActivityUserResult">
-        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.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
+        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.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_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>
-            <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>
-            <if test="activityAddress != null  and activityAddress != ''"> and a.activity_address = #{activityAddress}</if>
-            <if test="activityType != null  and activityType != ''"> and a.activity_type = #{activityType}</if>
-            <if test="activityDetails != null  and activityDetails != ''"> and a.activity_details = #{activityDetails}</if>
-            <if test="publishTime != null "> and a.publish_time = #{publishTime}</if>
-            <if test="publishDept != null  and publishDept != ''"> and a.publish_dept = #{publishDept}</if>
-            <if test="publishDeptId != null "> and a.publish_dept_id = #{publishDeptId}</if>
-            <if test="userId != null "> and b.user_id = #{userId}</if>
+            <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>
+            <if test="activityAddress != null  and activityAddress != ''">and a.activity_address = #{activityAddress}
+            </if>
+            <if test="activityType != null  and activityType != ''">and a.activity_type = #{activityType}</if>
+            <if test="activityDetails != null  and activityDetails != ''">and a.activity_details = #{activityDetails}
+            </if>
+            <if test="publishTime != null ">and a.publish_time = #{publishTime}</if>
+            <if test="publishDept != null  and publishDept != ''">and a.publish_dept = #{publishDept}</if>
+            <if test="publishDeptId != null ">and a.publish_dept_id = #{publishDeptId}</if>
+            <if test="userId != null ">and b.user_id = #{userId}</if>
             <if test="year != null and year != ''"><!-- 开始时间检索 -->
                 AND date_format(a.publish_time,'%y') = date_format(#{year},'%y')
             </if>
         </where>
         order by a.publish_time DESC
     </select>
-    
+
     <select id="selectZxActivityByActivityId" parameterType="Long" resultMap="ZxActivityZxActivityUserResult">
-        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.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
+        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.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_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
+                 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 a.activity_id = #{activityId}
     </select>
     <select id="selectZxActivityUserByActivityId" 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.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_activity_user b
+        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.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_activity_user b
         where b.activity_id = #{activityId}
     </select>
     <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.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_activity_user b
+        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.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_activity_user b
         <where>
             b.activity_id = #{activityId}
-            <if test="userName != null  and userName != ''"> and b.user_name = #{userName}</if>
+            <if test="userName != null  and userName != ''">and b.user_name = #{userName}</if>
+        </where>
+    </select>
+    <select id="selectZxActivityInfo" parameterType="ZxActivity" resultMap="ZxActivityZxActivityUserResult">
+        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.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_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>
+            a.activity_id = #{activityId}
+            <if test="userId != null ">and b.user_id = #{userId}</if>
         </where>
     </select>
 
@@ -125,7 +222,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="activityTitle != null and activityTitle != ''">#{activityTitle},</if>
             <if test="activityDate != null">#{activityDate},</if>
@@ -141,7 +238,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateZxActivity" parameterType="ZxActivity">
@@ -167,7 +264,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateReply" parameterType="ZxActivityUser">
         update zx_activity_user
         <trim prefix="SET" suffixOverrides=",">
-            <if test="replyTime != null and replyTime != ''">reply_time = #{replyTime},</if>
+            <if test="replyTime != null">reply_time = #{replyTime},</if>
             <if test="isJoin != null and isJoin != ''">is_join = #{isJoin},</if>
             <if test="leaveType != null and leaveType != ''">leave_type = #{leaveType},</if>
             <if test="leaveReason != null and leaveReason != ''">leave_reason = #{leaveReason},</if>
@@ -177,31 +274,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteZxActivityByActivityId" parameterType="Long">
-        delete from zx_activity where activity_id = #{activityId}
+        delete
+        from zx_activity
+        where activity_id = #{activityId}
     </delete>
 
     <delete id="deleteZxActivityByActivityIds" parameterType="String">
-        delete from zx_activity where activity_id in 
+        delete from zx_activity where activity_id in
         <foreach item="activityId" collection="array" open="(" separator="," close=")">
             #{activityId}
         </foreach>
     </delete>
-    
+
     <delete id="deleteZxActivityUserByActivityIds" parameterType="String">
-        delete from zx_activity_user where activity_id in 
+        delete from zx_activity_user where activity_id in
         <foreach item="activityId" collection="array" open="(" separator="," close=")">
             #{activityId}
         </foreach>
     </delete>
 
     <delete id="deleteZxActivityUserByActivityId" parameterType="Long">
-        delete from zx_activity_user where activity_id = #{activityId}
+        delete
+        from zx_activity_user
+        where activity_id = #{activityId}
     </delete>
 
     <insert id="batchZxActivityUser">
-        insert into zx_activity_user( activity_id, user_id, user_name, post_name, user_level, reply_time, is_join, leave_type, 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.replyTime}, #{item.isJoin}, #{item.leaveType}, #{item.leaveReason}, #{item.signIn}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.remark})
+        insert into zx_activity_user( activity_id, user_id, user_name, post_name, user_level, reply_time, is_join,
+        leave_type, 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.replyTime}, #{item.isJoin}, #{item.leaveType}, #{item.leaveReason}, #{item.signIn}, #{item.createBy},
+            #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.remark})
         </foreach>
     </insert>
 </mapper>

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

@@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="score != null  and score != ''"> and score = #{score}</if>
             <if test="type != null  and type != ''"> and type = #{type}</if>
         </where>
+        order by bonus_time desc
     </select>
     
     <select id="selectZxBonusByBonusId" parameterType="Long" resultMap="ZxBonusResult">

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

@@ -67,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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>  
-            <if test="conferenceTitle != null  and conferenceTitle != ''"> and a.conference_title = #{conferenceTitle}</if>
+            <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>
             <if test="conferenceAddress != null  and conferenceAddress != ''"> and a.conference_address = #{conferenceAddress}</if>
@@ -94,7 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from  zx_conference_user b
         where b.conference_id = #{conferenceId}
     </select>
-    <select id="selectZxConferenceUser" resultMap="ZxConferenceUserResult">
+    <select id="selectZxConferenceUser" parameterType = "zxConferenceUser" resultMap="ZxConferenceUserResult">
         select 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.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>
@@ -102,6 +102,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userName != null  and userName != ''"> and b.user_name = #{userName}</if>
         </where>
     </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.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
+                 left join zx_fj f on f.source_id = a.conference_id
+        <where>
+            a.conference_id = #{conferenceId}
+            <if test="userId != null "> and b.user_id = #{userId}</if>
+        </where>
+    </select>
 
     <insert id="insertZxConference" parameterType="ZxConference" useGeneratedKeys="true" keyProperty="conferenceId">
         insert into zx_conference
@@ -156,7 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateReply" parameterType="zxConferenceUser">
         update zx_conference_user
         <trim prefix="SET" suffixOverrides=",">
-            <if test="replyTime != null and replyTime != ''">reply_time = #{replyTime},</if>
+            <if test="replyTime != null">reply_time = #{replyTime},</if>
             <if test="isJoin != null and isJoin != ''">is_join = #{isJoin},</if>
             <if test="leaveType != null and leaveType != ''">leave_type = #{leaveType},</if>
             <if test="leaveReason != null and leaveReason != ''">leave_reason = #{leaveReason},</if>

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

@@ -57,12 +57,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.issuer_dept, a.issuer_dept_id, a.issuer_time, a.create_by, a.create_time, a.update_by, a.update_time,
             a.remark,
             b.user_id as sub_user_id,
-            IFNULL( b.zx_notice_type, 'N' ) as type,
+            b.zx_notice_type  as type,
             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_notice a
             left join zx_user_notice b on b.zx_notice_id = a.zx_notice_id
             left join zx_fj f on f.source_id = a.zx_notice_id
             <where>
+            <if test="userId != null">and b.user_id = #{userId}</if>
             <if test="zxNoticeId != null">and a.zx_notice_id = #{zxNoticeId}</if>
             <if test="noticeTitle != null  and noticeTitle != ''">and a.notice_title = #{noticeTitle}</if>
             <if test="noticeType != null  and noticeType != ''"> and a.notice_type = #{noticeType}</if>
@@ -146,6 +147,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         where zx_notice_id = #{zxNoticeId}
     </update>
+    <update id="updateZxNoticeUser" parameterType="ZxUserNotice">
+        update zx_user_notice set zx_notice_type = #{zxNoticeType} where user_id = #{userId} and zx_notice_id =#{zxNoticeId}
+    </update>
 
     <delete id="deleteZxNoticeByZxNoticeId" parameterType="Long">
         delete from zx_notice where zx_notice_id = #{zxNoticeId}

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

@@ -48,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="acceptDeptId != null "> and accept_dept_id = #{acceptDeptId}</if>
             <if test="urgeTime != null "> and urge_time = #{urgeTime}</if>
         </where>
+        order by urge_time DESC
     </select>
     
     <select id="selectZxUrgeByZxUrgeId" parameterType="Long" resultMap="ZxUrgeResult">