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

huanghongfa

2021-07-14 1aa40090d6b2339990b2fcac6aac75b96c7bc6db

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

@@ -36,28 +36,65 @@
            "com_act_act_sign a " +
            "JOIN sys_user u ON a.user_id = u.user_id  " +
            "WHERE " +
            "a.activity_id = #{activityId}  " +
            "<if test='phone != null and phone.trim() != &quot;&quot;'>" +
            "AND u.phone = #{phone}  " +
            "a.activity_id = #{activitySignVO.activityId}  " +
            "<if test='activitySignVO.phone != null and activitySignVO.phone != &quot;&quot;'>" +
            "AND u.phone = #{activitySignVO.phone}  " +
            " </if> " +
            "<if test='name != null and name.trim() != &quot;&quot;'>" +
            "AND u.`name` = #{name}  " +
            "<if test='activitySignVO.name != null and activitySignVO.name != &quot;&quot;'>" +
            "AND u.`name` = #{activitySignVO.name}  " +
            " </if> " +
            "<if test='identity != null and identity.trim() != &quot;&quot; and identity==1'>" +
            "<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='identity != null and identity.trim() != &quot;&quot; and identity==2'>" +
            "<if test='activitySignVO.identity != null and activitySignVO.identity != &quot;&quot; and activitySignVO.identity==2'>" +
            "AND u.is_partymember = 1    " +
            " </if> " +
            "<if test='identity != null and identity.trim() != &quot;&quot; and identity==3'>" +
            "<if test='activitySignVO.identity != null and activitySignVO.identity != &quot;&quot; and activitySignVO.identity==3'>" +
            "AND a.is_volunteer=1   " +
            " </if> " +
            "<if test='type != null and type != 0'>" +
            "AND a.is_volunteer=#{type}-1   " +
            "<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> listActivitySign(ActivitySignVO activitySignVO);
    IPage<ActivitySignVO> listActivitySign(Page page,@Param("activitySignVO") ActivitySignVO activitySignVO);

    @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, " +
            "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 " +