bugfix

ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/controller/BActivityController.java

@@ -92,6 +92,19 @@ public class BActivityController extends BaseController {
         return success();
     }
 
+    /**
+     * 邀请人员新
+     *
+     * @param id id
+     * @return 响应类
+     */
+    @ApiOperation(value = "邀请人员新")
+    @PostMapping("inviteTwo/{id}")
+    public AjaxResult inviteTwo(@PathVariable("id") Long id) {
+        bActivityService.inviteTwo(id);
+        return success();
+    }
+
     /**
      * 删除活动管理
      */

ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/mapper/ActivityUserMapper.java

@@ -69,5 +69,12 @@ public interface ActivityUserMapper {
      * @return 活动信息
      */
     List<BActivity> eventInvitations(@Param("req") EventRecommendationsRequest req);
+
+    /**
+     * 邀请人员新
+     *
+     * @param id id
+     */
+    void inviteTwo(Long id);
 }
 

ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/service/ActivityUserService.java

@@ -63,4 +63,11 @@ public interface ActivityUserService {
      * @return 活动信息
      */
     List<BActivity> eventInvitations(EventRecommendationsRequest req);
+
+    /**
+     * 邀请人员新
+     *
+     * @param id id
+     */
+    void inviteTwo(Long id);
 }

ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/service/IBActivityService.java

@@ -92,4 +92,11 @@ public interface IBActivityService {
      * @return 活动信息
      */
     List<BActivity> eventInvitations(EventRecommendationsRequest req);
+
+    /**
+     * 邀请人员新
+     *
+     * @param id id
+     */
+    void inviteTwo(Long id);
 }

ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/service/impl/ActivityUserServiceImpl.java

@@ -94,4 +94,14 @@ public class ActivityUserServiceImpl implements ActivityUserService {
     public List<BActivity> eventInvitations(EventRecommendationsRequest req) {
         return activityUserMapper.eventInvitations(req);
     }
+
+    /**
+     * 邀请人员新
+     *
+     * @param id id
+     */
+    @Override
+    public void inviteTwo(Long id) {
+        activityUserMapper.inviteTwo(id);
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/zhiyuanzhe/service/impl/BActivityServiceImpl.java

@@ -238,4 +238,14 @@ public class BActivityServiceImpl implements IBActivityService {
     public List<BActivity> eventInvitations(EventRecommendationsRequest req) {
         return activityUserService.eventInvitations(req);
     }
+
+    /**
+     * 邀请人员新
+     *
+     * @param id id
+     */
+    @Override
+    public void inviteTwo(Long id) {
+        activityUserService.inviteTwo(id);
+    }
 }

ruoyi-system/src/main/resources/mapper/zhiyuanzhe/ActivityUserMapper.xml

@@ -75,12 +75,20 @@
             <if test="status != null">#{status},</if>
         </trim>
     </insert>
+
     <update id="invite">
         update b_activity_user
         set status = 1
         where u_id = #{req.userId}
           and activity_id = #{req.activityId}
     </update>
+
+    <update id="inviteTwo">
+        update b_activity_user
+        set status = 1
+        where id = #{id}
+    </update>
+
     <update id="enroll">
         update b_activity_user
         set status = 2
@@ -101,7 +109,13 @@
         where activity_id = #{activityId}
     </delete>
     <select id="findUserByStatusAndActivityId" resultMap="personTags">
-        select bpt.*, bau.degree_of_match,bau.status
+        select bau.id, bau.u_id, bpt.age_range, bpt.housing_range, bpt.education_range, bpt.interest_range,
+        bpt.political_range, bpt.sex_range,
+        bpt.nationality_range, bpt.professional_range, bpt.industry_range, bpt.school_range, bpt.create_id,
+        bpt.create_by, bpt.create_time,
+        bpt.update_id, bpt.update_by, bpt.update_time,bpt. remark, bpt.user_id, bpt.dept_id,
+        bau.degree_of_match,bau.status,
+        (select nick_name from sys_user where user_id = bau.u_id) as nickName
         from b_activity_user bau
         left join b_person_tags bpt on bau.u_id = bpt.u_id
         where
@@ -130,8 +144,8 @@
     </select>
 
 
-    <select id="eventInvitations" resultType="BActivity">
-        select bau.degree_of_match, bau.status, ba.*
+    <select id="eventInvitations" resultMap="activityResult">
+        select bau.degree_of_match, bau.status activityStatus, ba.*
         from b_activity_user bau
         left join b_activity ba on bau.activity_id = ba.id
         where ba.status = 1 and bau.degree_of_match != 0

ruoyi-system/src/main/resources/mapper/zhiyuanzhe/BPersonTagsMapper.xml

@@ -89,6 +89,7 @@
                 </foreach>
             </if>
             <if test="housingRange != null  and housingRange != ''">and bpt.housing_range = #{housingRange}</if>
+            <if test="nickName != null  and nickName != ''">and u.nick_name like concat('%', #{nickName}, '%')</if>
             <if test="educationRange != null  and educationRange != ''">and bpt.education_range = #{educationRange}</if>
             <if test="interestRange != null  and interestRange != ''">and bpt.interest_range = #{interestRange}</if>
             <if test="politicalRange != null  and politicalRange != ''">and bpt.political_range = #{politicalRange}</if>