花城 排行范围选择本单位，呈现出了该账号单位以外的其它单位信息 党员活动的时长计算有问题。

lidongdong

2024-07-24 d20cf2979502fd58c999d2dc7df12e554a31d3df

花城 排行范围选择本单位，呈现出了该账号单位以外的其它单位信息   党员活动的时长计算有问题。

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

@@ -162,9 +162,22 @@
    /**
     * 单位服务统计
     */
    List<UnitActivityAnalysisVO> institutionalUnitServiceAnalysis(@Param("beginTime") String beginTime, @Param("endTime") String endTIme, @Param("belongTo") String belongTo,@Param("communityId") Long communityId);
    List<UnitActivityAnalysisVO> getNewTaskList(@Param("beginTime") String beginTime, @Param("endTime") String endTIme, @Param("belongTo") String belongTo,@Param("communityId") Long communityId);
    List<UnitActivityAnalysisVO> institutionalUnitActivityAnalysis(@Param("beginTime") String beginTime, @Param("endTime") String endTIme, @Param("belongTo") String belongTo,@Param("communityId") Long communityId);
    List<UnitActivityAnalysisVO> institutionalUnitServiceAnalysis(@Param("beginTime") String beginTime,
                                                                  @Param("endTime") String endTIme,
                                                                  @Param("belongTo") String belongTo,
                                                                  @Param("communityId") Long communityId,
                                                                  @Param("unitId") Long unitId);

    List<UnitActivityAnalysisVO> getNewTaskList(@Param("beginTime") String beginTime,
                                                @Param("endTime") String endTIme,
                                                @Param("belongTo") String belongTo,
                                                @Param("communityId") Long communityId);

    List<UnitActivityAnalysisVO> institutionalUnitActivityAnalysis(@Param("beginTime") String beginTime,
                                                                   @Param("endTime") String endTIme,
                                                                   @Param("belongTo") String belongTo,
                                                                   @Param("communityId") Long communityId,
                                                                   @Param("unitId") Long unitId);

    List<PartyMemberAnalysisVO> getNewPartyMemberTaskList(@Param("beginTime") String beginTime,
                                                            @Param("endTime") String endTIme,

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java

@@ -747,7 +747,7 @@
        if(!isNull(type)){
            comActActivityDOS=comActActivityDOS.stream().filter(comActActivityDO -> comActActivityDO.getType().equals(type)).collect(Collectors.toList());
        }
        if (!comActActivityDOS.isEmpty()) {
        if (comActActivityDOS != null  ) {
            comActActivityDOS.forEach(comActActivityDO -> {
                ComActActivityVO comActActivityVO = new ComActActivityVO();
                BeanUtils.copyProperties(comActActivityDO, comActActivityVO);

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java

@@ -1265,9 +1265,9 @@
        activityVO.setPartyMemberCount(comActDAO.selectUnitCount());
        activityVO.setUnitCount(comActDAO.selectMemberCount());
        //获取单位活动统计数据（邻里圈）
        List<UnitActivityAnalysisVO> unitActivityAnalysisVOS = comActNeighborCircleDAO.institutionalUnitServiceAnalysis(beginTime, endTime, belongTo,communityId);
        List<UnitActivityAnalysisVO> unitActivityAnalysisVOS = comActNeighborCircleDAO.institutionalUnitServiceAnalysis(beginTime, endTime, belongTo,communityId,unitId);
        //获取单位活动统计数据（活动）
        List<UnitActivityAnalysisVO> unitActivityAnalysisVOS1 = comActNeighborCircleDAO.institutionalUnitActivityAnalysis(beginTime, endTime, belongTo,communityId);
        List<UnitActivityAnalysisVO> unitActivityAnalysisVOS1 = comActNeighborCircleDAO.institutionalUnitActivityAnalysis(beginTime, endTime, belongTo,communityId,unitId);
        //获取新双挣双评清单任务
        List<UnitActivityAnalysisVO> newTaskList=comActNeighborCircleDAO.getNewTaskList(beginTime, endTime, belongTo,communityId);

@@ -1351,7 +1351,7 @@
                            Integer serviceTimes = item.getServiceTimes();

                            DecimalFormat df2 = new DecimalFormat("#.##");
                            String formattedNumber2 = df2.format(serviceTimes);
                            String formattedNumber2 = df2.format(serviceTime);
                            Double result2 = Double.parseDouble(formattedNumber2);

                            unitActivityAnalysisVOS.get(param.get("index")).setServiceTime(result2);
@@ -1639,9 +1639,9 @@
            endTime=year.toString().concat("-12-31");
        }
        //获取单位活动统计数据（邻里圈）
        List<UnitActivityAnalysisVO> unitActivityAnalysisVOS = comActNeighborCircleDAO.institutionalUnitServiceAnalysis(beginTime, endTime, belongTo,communityId);
        List<UnitActivityAnalysisVO> unitActivityAnalysisVOS = comActNeighborCircleDAO.institutionalUnitServiceAnalysis(beginTime, endTime, belongTo,communityId,null);
        //获取单位活动统计数据（活动）
        List<UnitActivityAnalysisVO> unitActivityAnalysisVOS1 = comActNeighborCircleDAO.institutionalUnitActivityAnalysis(beginTime, endTime, belongTo,communityId);
        List<UnitActivityAnalysisVO> unitActivityAnalysisVOS1 = comActNeighborCircleDAO.institutionalUnitActivityAnalysis(beginTime, endTime, belongTo,communityId,null);
        if (!unitActivityAnalysisVOS.isEmpty()){
            for (UnitActivityAnalysisVO unitActivityAnalysisVO : unitActivityAnalysisVOS){
                if (ObjectUtils.isNotEmpty(unitActivityAnalysisVO)){

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleDOMapper.xml

@@ -629,6 +629,9 @@
        <if test="communityId != null">
            and canc.community_id=#{communityId}
        </if>
        <if test="unitId != null and unitId != ''">
            and canc.solve_unit_id = #{unitId}
        </if>
        group by(canc.solve_unit_id)
        having serviceTimes&lt;>'' and serviceTime&lt;>''
        order by serviceTime desc
@@ -683,6 +686,9 @@
            <if test="communityId != null">
                and caa.community_id=#{communityId}
            </if>
            <if test="unitId != null and unitId != ''">
                and caa.check_unit_id = #{unitId}
            </if>
            GROUP BY (caa.check_unit_id)
            UNION ALL
            SELECT count(id) as serviceTimes, sum(duration) as serviceTime, check_unit_id as unitId, community_id as
@@ -701,6 +707,9 @@
                </if>
                <if test="communityId != null">
                    and caa.community_id=#{communityId}
                </if>
                <if test="unitId != null and unitId != ''">
                    and caa.check_unit_id = #{unitId}
                </if>
                GROUP BY caa.id,s.check_unit_id
            ) temp
@@ -762,7 +771,7 @@
        SELECT count(id) as serviceTimes, sum(duration) as serviceTime, unitId,unitName,orgName,
        communityId, memberId, memberName, belongUnit, belongCommunity, belongTo,sum(award) as partyCount
        FROM (
            SELECT caa.id, caa.duration, cpcu.id as unitId,cpcu.name as unitName,cpcu.org_name as orgName, cpcu.community_id as communityId, su.user_id as
            SELECT caa.id, ROUND((TIMESTAMPDIFF(SECOND, caar.start_time, caar.end_time) / 3600000), 2) as duration, cpcu.id as unitId,cpcu.name as unitName,cpcu.org_name as orgName, cpcu.community_id as communityId, su.user_id as
            memberId, su.name as memberName, cpcu.name as belongUnit, ca.name as belongCommunity, cpcu.belong_to belongTo,caa.pb_reward_integral as award
            FROM `com_act_activity` as caa
            left join com_act_act_regist as caar on caa.id=caar.activity_id
@@ -770,7 +779,10 @@
            left join com_pb_member as cpm on su.phone=cpm.phone
            left join com_pb_check_unit as cpcu on cpm.check_unit_id=cpcu.id
            left join com_act as ca on cpcu.community_id=ca.community_id
            where caar.sign_identity = 2 AND cpcu.id IS NOT NULL
            where caar.sign_identity = 2
                AND cpcu.id IS NOT NULL
                and caar.start_time IS NOT NULL
                and caar.end_time IS NOT NULL
            <if test="beginTime != null">
                and caar.start_time between #{beginTime} and #{endTime}
            </if>