Merge branch 'test_future_wangge' into 'test'

罗元桥

2021-06-04 c62d25bf9cf51d7421035abd6489945e77db1f04

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridDataMapper.xml

@@ -32,7 +32,7 @@


    <select id="findByPage" resultType="com.panzhihua.common.model.vos.grid.EventGridAdminVO"
        parameterType="com.panzhihua.common.model.dtos.grid.PageEventGridDataDTO">
        parameterType="com.panzhihua.common.model.dtos.grid.PageEventGridDataAdminDTO">
      SELECT DISTINCT
      egd.id,
      egd.grid_name,
@@ -137,11 +137,12 @@
   </select>

   <select id="getGridMemberLists" resultType="com.panzhihua.common.model.vos.grid.EventGridMemberAdminVO">
      select user_id,nick_name from sys_user where act_id = #{communityId}
      select user_id,nick_name from sys_user where community_id = #{communityId} and `type` = 6
   </select>

   <select id="getGridMember" resultType="String">
   <select id="getGridMember" resultType="com.panzhihua.common.model.vos.grid.GridMemberAdminVO">
      SELECT
         su.user_id,
         su.nick_name
      FROM
         event_grid_member_relation AS egmr
@@ -209,4 +210,12 @@

   </select>

   <select id="getComActByActId" resultType="com.panzhihua.common.model.vos.grid.ComGridActVO">
      select community_id,street_id,name,address,province_code,city_code,area_code from com_act where community_id = #{communityId}
   </select>

   <delete id="removeGridRelationByGridId">
      delete from event_grid_member_relation where grid_id = #{gridId}
   </delete>

</mapper>