Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

yanghui

2022-10-13 f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEventMapper.xml

@@ -93,6 +93,56 @@
      </where>
      order by create_at desc
   </select>
   <select id="pageByComEventExpert" resultType="com.panzhihua.service_community.entity.ComEvent">
      SELECT <include refid="columns" />
      FROM com_sanshuo_event_info
      <where>
         event_process_status !=9
         <if test="eventIds != null">
            AND id in 
            <foreach collection="eventIds" item="id" separator="," open="(" close=")">
               #{id}
            </foreach>
         </if>
         <if test="comEvent.keyword != null and comEvent.keyword!=''" >
            AND   ( order_sn = #{comEvent.keyword} or request_user_tel =#{comEvent.keyword} or current_org_name=#{comEvent.keyword})
         </if>
         <if test="comEvent.createBy != null and comEvent.createBy!=''" >
            AND create_by = #{comEvent.createBy}
         </if>
         <if test="comEvent.eventCategory != null">
            AND event_category = #{comEvent.eventCategory}
         </if>
         <if test="comEvent.eventProcessStatus != null">
            AND event_process_status = #{comEvent.eventProcessStatus}
         </if>
         <if test="comEvent.orderSn != null">
            AND order_sn = #{comEvent.orderSn}
         </if>
         <if test="comEvent.requestUserTel != null">
            AND request_user_tel = #{comEvent.requestUserTel}
         </if>
         <if test="comEvent.currentOrgName != null">
            AND current_org_name = #{comEvent.currentOrgName}
         </if>
         <!--<if test="comEvent.userType == 1">-->
            <!--AND request_user_id=#{comEvent.requestUserId}-->
         <!--</if>-->
         <!--<if test="comEvent.userType == 2">-->
            <!--AND specialist_id=#{comEvent.specialistId}-->
         <!--</if>-->
         <!--<if test="comEvent.userType == 3">-->
            <!--AND center_id=#{comEvent.centerId}-->
         <!--</if>-->
         <!--<if test="comEvent.userType == 4">-->
            <!--AND request_user_community=#{comEvent.communityId}-->
         <!--</if>-->
      </where>
      order by create_at desc
   </select>
   <select id="listEventIds" resultType="java.lang.Long">
      select event_id from com_sanshuo_expert_event where expert_id=#{expertId}
   </select>
   <select id="listByComEvent" resultType="com.panzhihua.service_community.entity.ComEvent">
      SELECT <include refid="columns" />
      FROM com_sanshuo_event_info
@@ -402,5 +452,11 @@
      group by t.event_category
   </select>

   <select id="getUserAvatar" resultType="String">
      select  image_url from sys_user where user_id = #{userId}
   </select>
   <select id="insertEventAndExpertRecord">
      insert into com_sanshuo_expert_event values(#{eventId},#{expertId},#{status})
   </select>

</mapper>