Merge branch 'test' into 'master'

罗元桥

2021-08-05 cc1098fc00a50cb1591d182f04bc37066ff0a9e2

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActSignDAO.java

@@ -12,6 +12,7 @@
import org.apache.ibatis.annotations.Select;

import java.util.List;
import java.util.Map;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -61,6 +62,44 @@

    @Select("<script> " +
            "SELECT " +
            "u.user_id id, " +
            "u.image_url, " +
            "u.name, " +
            "u.nick_name, " +
            "case WHEN u.is_partymember = 1 THEN '党员' WHEN a.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity, " +
            "u.phone, " +
            "u.openid, " +
            "a.create_at,  " +
            "a.is_volunteer  " +
            "FROM " +
            "com_act_act_sign a " +
            "JOIN sys_user u ON a.user_id = u.user_id  " +
            "WHERE " +
            "a.activity_id = #{activitySignVO.activityId}  " +
            "<if test='activitySignVO.phone != null and activitySignVO.phone != &quot;&quot;'>" +
            "AND u.phone = #{activitySignVO.phone}  " +
            " </if> " +
            "<if test='activitySignVO.name != null and activitySignVO.name != &quot;&quot;'>" +
            "AND u.`name` = #{activitySignVO.name}  " +
            " </if> " +
            "<if test='activitySignVO.identity != null and activitySignVO.identity != &quot;&quot; and activitySignVO.identity==1'>" +
            "AND u.is_partymember = 0 and a.is_volunteer=0  " +
            " </if> " +
            "<if test='activitySignVO.identity != null and activitySignVO.identity != &quot;&quot; and activitySignVO.identity==2'>" +
            "AND u.is_partymember = 1    " +
            " </if> " +
            "<if test='activitySignVO.identity != null and activitySignVO.identity != &quot;&quot; and activitySignVO.identity==3'>" +
            "AND a.is_volunteer=1   " +
            " </if> " +
            "<if test='activitySignVO.type != null and activitySignVO.type != 0'>" +
            "AND a.is_volunteer=#{activitySignVO.type}-1   " +
            " </if> " +
            " order by a.create_at desc "+
            "</script>")
    List<ActivitySignVO> listActivitySigns(@Param("activitySignVO") ActivitySignVO activitySignVO);

    @Select("<script> " +
            "SELECT " +
            " caas.user_id, " +
            " su.NAME, " +
            "CASE " +
@@ -83,4 +122,7 @@
            " </if> " +
            " </script>")
    IPage<ActActivityPeopleListVO> getActActivityPeopleList(Page page,@Param("activityPeopleListDTO") ScreenActActivityPeopleListDTO activityPeopleListDTO);

    @Select("select openid from sys_user where user_id = #{userId}")
    Map<String,String> getUserOpenId(@Param("userId")Long userId);
}