党建相关bug修改

101captain

2022-03-28 5191fc389a1136de742ebc3772b271f560520498

党建相关bug修改

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComDataStatisticsOrgVo.java

@@ -79,25 +79,25 @@
    private Integer participateVolunteerActivityNum;

    @ApiModelProperty(value = "参与志愿者活动次数百分比")
    private BigDecimal participateVolunteerActivityNumPercent = new BigDecimal(0);
    private BigDecimal participateVolunteerActivityNumPercent;

    @ApiModelProperty(value = "参与志愿者活动时长")
    private Integer participateVolunteerActivityDuration;

    @ApiModelProperty(value = "参与志愿者活动时长百分比")
    private BigDecimal participateVolunteerActivityDurationPercent = new BigDecimal(0);
    private BigDecimal participateVolunteerActivityDurationPercent;

    @ApiModelProperty(value = "参与党员活动次数")
    private Integer participatePartyActivityNum;

    @ApiModelProperty(value = "参与党员活动次数百分比")
    private BigDecimal participatePartyActivityNumPercent = new BigDecimal(0);
    private BigDecimal participatePartyActivityNumPercent;

    @ApiModelProperty(value = "参与党员活动时长")
    private Integer participatePartyActivityDuration;

    @ApiModelProperty(value = "参与党员活动时长百分比")
    private BigDecimal participatePartyActivityDurationPercent = new BigDecimal(0);
    private BigDecimal participatePartyActivityDurationPercent;

    @ApiModelProperty(value = "月份统计list")
    private List<String> monthList;

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

@@ -403,6 +403,45 @@
            ) AS participateVolunteerActivityDuration,
            (
            SELECT
        IFNULL( sum( caa3.duration ), 0 )
        FROM
        com_act_act_sign AS caas3
        LEFT JOIN com_act_activity AS caa3 ON caa3.id = caas3.activity_id
        WHERE
        caas3.`status` = 1
        AND caa3.type = 3
        AND caas3.user_id IN ( SELECT t1.user_id FROM com_pb_member t left join sys_user t1 on t.id_card=t1.id_card WHERE audit_result = 1 AND t.community_id = #{communityId} AND t1.type=1
        <if test="orgIds != null and orgIds.size > 0">
            AND org_id in
            <foreach collection="orgIds" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>
        )
        AND caas3.create_at BETWEEN #{startTime}
        AND #{endTime}
        ) AS participatePartyActivityDuration,
        (
        SELECT
        IFNULL( sum( caa4.duration ), 0 )
        FROM
        com_act_act_sign AS caas4
        LEFT JOIN com_act_activity AS caa4 ON caa4.id = caas4.activity_id
        WHERE
        caas4.`status` = 1
        AND caas4.user_id IN ( SELECT t1.user_id FROM com_pb_member t left join sys_user t1 on t.id_card=t1.id_card WHERE audit_result = 1 AND t.community_id = #{communityId} AND t1.type=1
        <if test="orgIds != null and orgIds.size > 0">
            AND org_id in
            <foreach collection="orgIds" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>
        )
        AND caas4.create_at BETWEEN #{startTime}
        AND #{endTime}
        ) AS participateActivityDuration,
            (
            SELECT
                count( caas2.id )
            FROM
                com_act_act_sign as caas2
@@ -419,7 +458,26 @@
            )
            AND caas2.create_at BETWEEN #{startTime}
            AND #{endTime}
            ) AS participatePartyActivityNum
            ) AS participatePartyActivityNum,
        (
        SELECT
        count( caas5.id )
        FROM
        com_act_act_sign as caas5
        left join com_act_activity as caa5 on caa5.id = caas5.activity_id
        WHERE
        caas5.`status` = 1
        AND caas5.user_id IN ( SELECT t1.user_id FROM com_pb_member t left join sys_user t1 on t.id_card=t1.id_card WHERE audit_result = 1 AND t.community_id = #{communityId} AND t1.type=1
        <if test="orgIds != null and orgIds.size > 0">
            AND org_id in
            <foreach collection="orgIds" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>
        )
        AND caas5.create_at BETWEEN #{startTime}
        AND #{endTime}
        ) AS participateActivityNum
        FROM
            com_act_act_sign as caas1
            left join com_act_activity as caa1 on caa1.id = caas1.activity_id