fix 委员履职信息详细信息

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

@@ -82,9 +82,9 @@ public class ZxActivityController extends BaseController {
      * 获取政协活动人员详细信息
      */
     @PreAuthorize("@ss.hasPermi('zxActivity:activity:getUserInfo')")
-    @GetMapping(value = "/getUserInfo/{activityId}")
-    public TableDataInfo getUserInfo(@PathVariable("activityId") Long activityId) {
-        return getDataTable(zxActivityService.selectZxActivityUserByActivityId(activityId));
+    @PostMapping(value = "/getUserInfo")
+    public TableDataInfo getUserInfo(@RequestBody ZxActivityUser zxActivityUser) {
+        return getDataTable(zxActivityService.selectZxActivityUser(zxActivityUser));
     }
 
     /**

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

@@ -81,9 +81,9 @@ public class ZxConferenceController extends BaseController {
      * 获取政协会议活动人员详细信息
      */
     @PreAuthorize("@ss.hasPermi('zxConference:conference:getUserInfo')")
-    @GetMapping(value = "/getUserInfo/{conferenceId}")
-    public TableDataInfo getUserInfo(@PathVariable("conferenceId") Long conferenceId) {
-        return getDataTable(zxConferenceService.selectZxConferenceUserByConferenceId(conferenceId));
+    @PostMapping(value = "/getUserInfo")
+    public TableDataInfo getUserInfo(@RequestBody ZxConferenceUser zxConferenceUser) {
+        return getDataTable(zxConferenceService.selectZxConferenceUser(zxConferenceUser));
     }
 
     /**

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 List<ZxActivityUser> selectZxActivityUser(ZxActivityUser zxActivityUser);
 
     /**
      * 查询政协活动列表

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

@@ -26,6 +26,11 @@ public interface ZxConferenceMapper
      * @return
      */
     public List<ZxConferenceUser> selectZxConferenceUserByConferenceId(Long conferenceId);
+    /**
+     *查询政协会议活动人员详情
+     * @return
+     */
+    public List<ZxConferenceUser> selectZxConferenceUser(ZxConferenceUser zxConferenceUser);
 
     /**
      * 查询政协会议活动列表

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 List<ZxActivityUser> selectZxActivityUser(ZxActivityUser zxActivityUser);
 
     /**
      * 查询政协活动列表

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

@@ -28,6 +28,11 @@ public interface IZxConferenceService
      * @return
      */
     public List<ZxConferenceUser> selectZxConferenceUserByConferenceId(Long conferenceId);
+    /**
+     *查询政协会议活动人员详情
+     * @return
+     */
+    public List<ZxConferenceUser> selectZxConferenceUser(ZxConferenceUser zxConferenceUser);
 
     /**
      * 查询政协会议活动列表

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

@@ -49,6 +49,13 @@ public class ZxActivityServiceImpl implements IZxActivityService {
     public List<ZxActivityUser> selectZxActivityUserByActivityId(Long activityId) {
         return zxActivityMapper.selectZxActivityUserByActivityId(activityId);
     }
+    /**
+     * 获取政协活动人员详细信息
+     */
+    @Override
+    public List<ZxActivityUser> selectZxActivityUser(ZxActivityUser zxActivityUser) {
+        return zxActivityMapper.selectZxActivityUser(zxActivityUser);
+    }
 
     /**
      * 查询政协活动列表

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

@@ -48,6 +48,15 @@ public class ZxConferenceServiceImpl implements IZxConferenceService {
         return zxConferenceMapper.selectZxConferenceUserByConferenceId(conferenceId);
     }
 
+    /**
+     *查询政协会议活动人员详情
+     * @return
+     */
+    @Override
+    public List<ZxConferenceUser> selectZxConferenceUser(ZxConferenceUser zxConferenceUser) {
+        return zxConferenceMapper.selectZxConferenceUser(zxConferenceUser);
+    }
+
     /**
      * 查询政协会议活动列表
      *

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

@@ -80,6 +80,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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
+        <where>
+            b.activity_id = #{activityId}
+            <if test="userName != null  and userName != ''"> and b.user_name = #{userName}</if>
+        </where>
+    </select>
 
     <insert id="insertZxActivity" parameterType="ZxActivity" useGeneratedKeys="true" keyProperty="activityId">
         insert into zx_activity

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

@@ -73,6 +73,14 @@ 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 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>
+            b.conference_id = #{conferenceId}
+            <if test="userName != null  and userName != ''"> and b.user_name = #{userName}</if>
+        </where>
+    </select>
 
     <insert id="insertZxConference" parameterType="ZxConference" useGeneratedKeys="true" keyProperty="conferenceId">
         insert into zx_conference