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

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -244,7 +244,7 @@ public class SysUserController extends BaseController
     /**
      * 获取部门树列表
      */
-    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @PreAuthorize("@ss.hasPermi('system:user:deptTree')")
     @GetMapping("/deptTree")
     public AjaxResult deptTree(SysDept dept)
     {

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

@@ -39,6 +39,10 @@ public class ZxActivityUser extends BaseEntity
     @Excel(name = "级别")
     private String userLevel;
 
+    /**
+     * 父级别
+     */
+    private String parentGrade;
     /** 答复时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "答复时间", width = 30, dateFormat = "yyyy-MM-dd")
@@ -61,6 +65,14 @@ public class ZxActivityUser extends BaseEntity
     @Excel(name = "签到时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date signIn;
 
+    public String getParentGrade() {
+        return parentGrade;
+    }
+
+    public void setParentGrade(String parentGrade) {
+        this.parentGrade = parentGrade;
+    }
+
     public String getPhonenumber() {
         return phonenumber;
     }

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

@@ -38,6 +38,11 @@ public class ZxConferenceUser extends BaseEntity
     /** 级别 */
     @Excel(name = "级别")
     private String userLevel;
+    /**
+     * 父级别
+     */
+    private String parentGrade;
+
 
     /** 答复时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -61,6 +66,14 @@ public class ZxConferenceUser extends BaseEntity
     @Excel(name = "请假原因")
     private String leaveReason;
 
+    public String getParentGrade() {
+        return parentGrade;
+    }
+
+    public void setParentGrade(String parentGrade) {
+        this.parentGrade = parentGrade;
+    }
+
     public String getPhonenumber() {
         return phonenumber;
     }

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

@@ -64,8 +64,7 @@ public class ZxConferenceServiceImpl implements IZxConferenceService {
      */
     @Override
     public List<ZxConferenceUser> selectZxConferenceUser(ZxConferenceUser zxConferenceUser) {
-        List<ZxConferenceUser> zxConferenceUsers = zxConferenceMapper.selectZxConferenceUser(zxConferenceUser);
-        return zxConferenceUsers;
+        return zxConferenceMapper.selectZxConferenceUser(zxConferenceUser);
     }
 
     /**

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

@@ -166,9 +166,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="keyPointArgument != null  and keyPointArgument != ''"> and p.key_point_argument = #{keyPointArgument}</if>
         <if test="isOutstanding != null  and isOutstanding != ''"> and p.is_outstanding = #{isOutstanding}</if>
         <if test="outstandingArgument != null  and outstandingArgument != ''"> and p.outstanding_argument = #{outstandingArgument}</if>
-        <if test="proposalUserId != null  and proposalUserId != ''"> and u.user_id = #{proposalUserId}</if>
         <if test="year != null and year != ''"><!-- 开始时间检索 -->
-            AND date_format(p.update_time,'%y') = date_format(#{year},'%y')
+            AND date_format(p.update_time,'%Y') = #{year}
         </if>
         </where>
         order by p.update_time desc

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

@@ -84,6 +84,9 @@
             <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
                 AND date_format(create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
             </if>
+            <if test="year != null and year != ''"><!-- 开始时间检索 -->
+                AND date_format(create_time,'%Y') = #{year}
+            </if>
         </where>
         order by update_time desc
     </select>

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

@@ -35,6 +35,7 @@
         <result property="userName" column="sub_user_name"/>
         <result property="postName" column="sub_post_name"/>
         <result property="userLevel" column="sub_user_level"/>
+        <result property="parentGrade"    column="sub_parent_grade"/>
         <result property="replyTime" column="sub_reply_time"/>
         <result property="isJoin" column="sub_is_join"/>
         <result property="leaveType" column="sub_leave_type"/>
@@ -81,7 +82,7 @@
         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
+        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
         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,
@@ -105,7 +106,7 @@
             <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')
+                AND date_format(a.publish_time,'%Y') = #{year}
             </if>
         </where>
         order by a.publish_time DESC
@@ -128,6 +129,7 @@
                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 sub_post_name,
@@ -175,7 +177,7 @@
     </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,
+        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
         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
@@ -189,7 +191,7 @@
         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
+        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
         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,
@@ -301,10 +303,10 @@
 
     <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
+        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.replyTime}, #{item.isJoin}, #{item.leaveType}, #{item.leaveReason}, #{item.signIn}, #{item.createBy},
+            #{item.replyTime}, #{item.isJoin}, #{item.leaveType},#{item.parentGrade}, #{item.leaveReason}, #{item.signIn}, #{item.createBy},
             #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.remark})
         </foreach>
     </insert>

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

@@ -32,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="userName"    column="sub_user_name"    />
         <result property="postName"    column="sub_post_name"    />
         <result property="userLevel"    column="sub_user_level"    />
+        <result property="parentGrade"    column="sub_parent_grade"    />
         <result property="replyTime"    column="sub_reply_time"    />
         <result property="isJoin"    column="sub_is_join"    />
         <result property="leaveType"    column="sub_leave_type"    />
@@ -61,7 +62,7 @@ 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.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.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
         from zx_conference a
         left join zx_conference_user b on b.conference_id = a.conference_id
@@ -74,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="publishTime != null "> and a.publish_time = #{publishTime}</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')
+                AND date_format(a.publish_time,'%Y') = #{year}
             </if>
         </where>
         order  by a.publish_time DESC
@@ -82,7 +83,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.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.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
@@ -90,12 +91,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.conference_id = #{conferenceId}
     </select>
     <select id="selectZxConferenceUserByConferenceId" 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
+        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
         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.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.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}
@@ -104,7 +105,7 @@ 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.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.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
@@ -200,9 +201,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, 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, 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.leaveReason},#{item.signIn}, #{item.createBy}, sysdate(), #{item.updateBy}, #{item.updateTime}, #{item.remark})
+            ( #{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})
         </foreach>
     </insert>
 </mapper>

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

@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="speakStatus != null  and speakStatus != ''"> and speak_status = #{speakStatus}</if>
             <if test="userId != null  "> and user_id = #{userId}</if>
             <if test="year != null and year != ''"><!-- 开始时间检索 -->
-                AND date_format(publish_time,'%y') = date_format(#{year},'%y')
+                AND date_format(publish_time,'%Y') = #{year}
             </if>
         </where>
         order by publish_time DESC