lidongdong
2024-03-20 dd7450fff5213a59c16136d94d1efb703186db0b
修改党员双报到  列表积分不显示9
3个文件已修改
8 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/PartyMemberAnalysisVO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/UnitActivityAnalysisVO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/PartyMemberAnalysisVO.java
@@ -39,5 +39,5 @@
    private Long memberId;
    @ApiModelProperty("党员积分")
    private Long partyCount;
    private Long partyCount=0l;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/UnitActivityAnalysisVO.java
@@ -38,6 +38,6 @@
    private String communityId;
    @ApiModelProperty("累计积分")
    private Long awardSum;
    private Long awardSum=0l;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
@@ -1243,7 +1243,7 @@
            Map<String, Long> collectMap = inventories.stream()
                    .collect(Collectors.groupingBy(NewFightNeedProblemClaim::getTaskId, Collectors.counting()));
            long sum = 0l;
            if(unitVO.getAwardSum()!=null || unitVO.getAwardSum()>0l )
            if(unitVO.getAwardSum()!=null || unitVO.getAwardSum()!=0l )
            {
                sum=unitVO.getAwardSum();
            }
@@ -1268,7 +1268,7 @@
            List<NewFightNeedProblemClaim> newFightNeedProblemInventories = newFightNeedProblemClaimMapper.selectList(wrapper);
            long sumAward = 0l;
            if(memberAnalysisVO.getPartyCount()!=null || memberAnalysisVO.getPartyCount()>0l )
            if(memberAnalysisVO.getPartyCount()!=null || memberAnalysisVO.getPartyCount()!=0l )
            {
                sumAward=memberAnalysisVO.getPartyCount();
            }