党建相关bug修改

101captain

2022-03-28 0839ddb07acd845d51a628fd49de99b7bcc3405a

党建相关bug修改

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java

@@ -761,6 +761,7 @@
            if(statisticsMemberVo != null){
                member.setPartyActivityCount(statisticsMemberVo.getPartyActivityCount());
                member.setPartyActivityDuration(statisticsMemberVo.getPartyActivityDuration());
                member.setPartyActivityIntegral(statisticsMemberVo.getPartyActivityIntegral());
                member.setVolunteerActivityCount(statisticsMemberVo.getVolunteerActivityCount());
                member.setVolunteerActivityDuration(statisticsMemberVo.getVolunteerActivityDuration());
                member.setVolunteerActivityIntegral(statisticsMemberVo.getVolunteerActivityIntegral());

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberMapper.xml

@@ -389,7 +389,7 @@
                LEFT JOIN com_act_activity AS caa ON caa.id = caas.activity_id
            WHERE
                caas.`status` = 1
                AND caas.is_volunteer = 1 and caa.type = 1
                AND caa.type = 1
                AND caas.user_id IN ( SELECT user_id FROM com_pb_member WHERE audit_result = 1 AND community_id = #{communityId} AND user_id IS NOT NULL
        <if test="orgIds != null and orgIds.size > 0">
            AND org_id in
@@ -403,28 +403,28 @@
            ) AS participateVolunteerActivityDuration,
            (
            SELECT
                count( cpam.id )
                count( caas2.id )
            FROM
                com_pb_activity_member AS cpam
                LEFT JOIN com_pb_member AS cpm ON cpm.id = cpam.member_id
                com_act_act_sign as caas2
                left join com_act_activity as caa2 on caa2.id = caas2.activity_id
            WHERE
                cpm.audit_result = 1
                AND cpm.community_id = #{communityId}
                AND cpam.create_at BETWEEN #{startTime}
                AND #{endTime}
        <if test="orgIds != null and orgIds.size > 0">
            AND org_id in
            <foreach collection="orgIds" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>
                caas2.`status` = 1 and caa2.type = 3
            AND caas2.user_id IN ( SELECT user_id FROM com_pb_member WHERE audit_result = 1 AND community_id = #{communityId} AND user_id IS NOT NULL
            <if test="orgIds != null and orgIds.size > 0">
                AND org_id in
                <foreach collection="orgIds" item="item" open="(" separator="," close=")">
                    #{item}
                </foreach>
            </if>
            )
            AND caas2.create_at BETWEEN #{startTime}
            AND #{endTime}
            ) AS participatePartyActivityNum
        FROM
            com_act_act_sign as caas1
            left join com_act_activity as caa1 on caa1.id = caas1.activity_id
        WHERE
        caas1.`status` = 1 and caa1.type = 1
            AND caas1.is_volunteer = 1
            AND caas1.user_id IN ( SELECT user_id FROM com_pb_member WHERE audit_result = 1 AND community_id = #{communityId} AND user_id IS NOT NULL
        <if test="orgIds != null and orgIds.size > 0">
            AND org_id in