Merge branch 'test' into 'test_screen'

罗元桥

2021-06-22 c6512655e722d9ca80dd8c34b79f6d3923ecf86c

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

@@ -60,8 +60,9 @@
            "  SELECT id, id_card, ROUND(DATEDIFF(CURDATE(), STR_TO_DATE(SUBSTRING(id_card,7,15), '%Y%m%d'))/365.2422) AS age    " +
            "  FROM com_pb_member  " +
            " <where> " +
                " audit_result = 1 " +
                "<if test='queryDTO.communityId != null'> " +
                "   community_id = #{queryDTO.communityId} " +
                " AND  community_id = #{queryDTO.communityId} " +
                "</if> " +
            " </where>" +
            "  ) t     " +
@@ -82,8 +83,9 @@
            "  SELECT CONVERT(SUBSTRING(id_card,'17',1), UNSIGNED INTEGER)%2 AS sxi, COUNT(id_card) AS total " +
            "  FROM com_pb_member " +
            " <where> " +
                " audit_result = 1 " +
                "<if test='queryDTO.communityId != null'>" +
                "   community_id = #{queryDTO.communityId} " +
                "  AND community_id = #{queryDTO.communityId} " +
                "</if> " +
            " </where>" +
            "  GROUP BY sxi  " +
@@ -119,9 +121,15 @@
    BigScreenStatisticPartyBuild partybuild(@Param("communityId") Long communityId);

    @Select("<script> " +
            " SELECT pm.id, pm.member_id, pm.user_id, pm.name, pm.photo_path, COUNT(pa.id) AS total   " +
            " FROM com_pb_activity_member  pm  LEFT JOIN com_pb_activity pa  ON pm.activity_id = pa.id   " +
            " WHERE pa.community_id = #{communityId}   " +
            " SELECT pm.id, pm.member_id, pm.user_id, pm.name, " +
            " case " +
            " when me.photo_path is NOT NULL then  me.photo_path \n" +
            " when CAST(SUBSTRING(me.id_card , 17, 1) AS SIGNED)%2=1 then 'https://www.psciio.com/idcard/tst/idcard/a723e5bcbd594a48956ef9354c8b477c.jpg' " +
            " ELSE 'https://www.psciio.com/idcard/tst/idcard/cfb9b58913074068bba8c7002f91e7ff.jpg' END AS photo_path " +
            " ,COUNT(pa.id) AS total   " +
            " FROM com_pb_activity_member  pm  LEFT JOIN com_pb_activity pa  ON pm.activity_id = pa.id  " +
            " LEFT JOIN com_pb_member me ON pm.member_id = me.id  " +
            " WHERE pa.community_id = #{communityId}  AND me.id IS NOT null  " +
            " GROUP BY pm.member_id  " +
            " ORDER BY total DESC  " +
            " LIMIT 3  " +
@@ -129,10 +137,15 @@
    List<PartyBuildingMemberVO> bigscreenPartyactivitytopuser(@Param("communityId")Long communityId);

    @Select("<script> " +
            "  SELECT id AS member_id, user_id, NAME, photo_path, 0 AS total  " +
            "  SELECT id AS member_id, user_id, NAME, " +
            " case " +
            " when photo_path IS NOT NULL then  photo_path  " +
            " when CAST(SUBSTRING(id_card , 17, 1) AS SIGNED)%2=1 then 'https://www.psciio.com/idcard/tst/idcard/a723e5bcbd594a48956ef9354c8b477c.jpg' " +
            " ELSE 'https://www.psciio.com/idcard/tst/idcard/cfb9b58913074068bba8c7002f91e7ff.jpg' END AS photo_path , " +
            " 0 AS total  " +
            " FROM  com_pb_member " +
            " WHERE community_id=#{communityId}  " +
            " ORDER BY join_time DESC  " +
            " ORDER BY join_time ASC  " +
            " LIMIT 3  " +
            "</script>")
    List<PartyBuildingMemberVO> defaultPartyactivity(@Param("communityId")Long communityId);