修改党员双报到 列表积分新增筛选

lidongdong

2024-03-21 f3951ba869c515f2b5934f271959a4c086a7394f

修改党员双报到  列表积分新增筛选

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java

@@ -454,8 +454,10 @@
                                  @RequestParam(value = "page", required = false) Integer page,
                                  @RequestParam(value = "size", required = false) Integer size,
                                  @RequestParam(value = "belongTo", required = false) String belongTo,
                                  @RequestParam(value = "unitId", required = false) Long unitId) {
        return communityService.institutionalUnitServiceAnalysis(year, type, range, communityId, page, size, belongTo, unitId, this.getLoginUserInfo().getAccount());
                                  @RequestParam(value = "unitId", required = false) Long unitId,
                                  @RequestParam(value = "searchContent",required = false) String searchContent) {
        return communityService.institutionalUnitServiceAnalysis(year, type, range, communityId, page,
                size, belongTo, unitId, this.getLoginUserInfo().getAccount(),searchContent);
    }



 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -9960,7 +9960,8 @@
                                       @RequestParam(value = "size",required = false) Integer size,
                                       @RequestParam(value = "belongTo",required = false) String  belongTo,
                                       @RequestParam(value = "unitId",required = false) Long unitId,
                                       @RequestParam(value = "loginAccount",required = false) String loginAccount);
                                       @RequestParam(value = "loginAccount",required = false) String loginAccount,
                                       @RequestParam(value = "searchContent",required = false) String searchContent);

    @GetMapping("/neighbor/export")
    public List<ExcelDO> export(@RequestParam(value = "year",required = false) Integer year,

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BasicScreenApi.java

@@ -103,8 +103,11 @@
                                  @RequestParam(value = "page", required = false) Integer page,
                                  @RequestParam(value = "size", required = false) Integer size,
                                  @RequestParam(value = "belongTo", required = false) String belongTo,
                                  @RequestParam(value = "unitId", required = false) Long unitId) {
        return communityService.institutionalUnitServiceAnalysis(year, type, range, communityId, page, size, belongTo, unitId, null);
                                  @RequestParam(value = "unitId", required = false) Long unitId,
                                  @RequestParam(value = "searchContent", required = false) String searchContent
                                  ) {
        return communityService.institutionalUnitServiceAnalysis(year, type, range, communityId, page, size, belongTo,
                unitId, null,searchContent);
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java

@@ -1380,8 +1380,10 @@
                                  @RequestParam(value = "belongTo",required = false) String  belongTo,
                                  @RequestParam(value = "page",required = false) Integer page,
                                  @RequestParam(value = "size",required = false) Integer size,
                                  @RequestParam(value = "unitId",required = false) Long unitId){
        return communityService.institutionalUnitServiceAnalysis(year,type,range,communityId,page,size,belongTo,unitId,this.getLoginUserInfo().getAccount());
                                  @RequestParam(value = "unitId",required = false) Long unitId,
                                  @RequestParam(value = "searchContent", required = false) String searchContent){
        return communityService.institutionalUnitServiceAnalysis(year,type,range,communityId,page,size,belongTo,unitId,
                this.getLoginUserInfo().getAccount(),searchContent);
    }

    @GetMapping("/exportExcel")

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java

@@ -428,8 +428,9 @@
                                              @RequestParam(value = "belongTo",required = false) String  belongTo,
                                              @RequestParam(value = "size",required = false) Integer size,
                                              @RequestParam(value = "unitId",required = false) Long unitId,
                                              @RequestParam(value = "loginAccount",required = false) String loginAccount){
        return this.comActNeighborCircleService.institutionalUnitServiceAnalysis(year,type,range,communityId,page,size,belongTo,unitId);
                                              @RequestParam(value = "loginAccount",required = false) String loginAccount,
                                              @RequestParam(value = "searchContent",required = false) String searchContent){
        return this.comActNeighborCircleService.institutionalUnitServiceAnalysis(year,type,range,communityId,page,size,belongTo,unitId,searchContent);
    }

    /**

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

@@ -164,8 +164,19 @@
    List<UnitActivityAnalysisVO> institutionalUnitServiceAnalysis(@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<PartyMemberAnalysisVO> institutionalPartyMemberServiceAnalysis(@Param("beginTime") String beginTime, @Param("endTime") String endTIme, @Param("belongTo") String belongTo,@Param("communityId") Long communityId,@Param("unitId") Long unitId);
    List<PartyMemberAnalysisVO> institutionalPartyMemberActAnalysis(@Param("beginTime") String beginTime, @Param("endTime") String endTIme, @Param("belongTo") String belongTo,@Param("communityId") Long communityId,@Param("unitId") Long unitId);
    List<PartyMemberAnalysisVO> institutionalPartyMemberServiceAnalysis(@Param("beginTime") String beginTime,
                                                                        @Param("endTime") String endTIme,
                                                                        @Param("belongTo") String belongTo,
                                                                        @Param("communityId") Long communityId,
                                                                        @Param("unitId") Long unitId,
                                                                        @Param("searchContent") String searchContent
                                                                        );
    List<PartyMemberAnalysisVO> institutionalPartyMemberActAnalysis(@Param("beginTime") String beginTime,
                                                                    @Param("endTime") String endTIme,
                                                                    @Param("belongTo") String belongTo,
                                                                    @Param("communityId") Long communityId,
                                                                    @Param("unitId") Long unitId,
                                                                    @Param("searchContent") String searchContent);
    List<PartyMemberAnalysisVO> institutionalPartyMemberServiceAnalysisByServicesTimes(@Param("beginTime") String beginTime, @Param("endTime") String endTIme, @Param("belongTo") String belongTo);

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleService.java

@@ -258,7 +258,8 @@
     * 机关单位服务统计排行
     * @return
     * */
    R institutionalUnitServiceAnalysis(Integer year, Integer type, Integer range,Long communityId,Integer page,Integer size,String belongTo,Long unitId);
    R institutionalUnitServiceAnalysis(Integer year, Integer type, Integer range,Long communityId,
                                       Integer page,Integer size,String belongTo,Long unitId,String searchContent);

    /**
     * 导出

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

@@ -1151,7 +1151,8 @@
    }

    @Override
    public R institutionalUnitServiceAnalysis(Integer year, Integer type, Integer range, Long communityId,Integer page,Integer size,String belongTo,Long unitId) {
    public R institutionalUnitServiceAnalysis(Integer year, Integer type, Integer range, Long communityId,
                                              Integer page,Integer size,String belongTo,Long unitId,String searchContent) {
        ActivityAnalysisVO activityVO=new ActivityAnalysisVO();
        String beginTime=null;
        String endTime=null;
@@ -1212,8 +1213,8 @@
            }
        }
        //获取党员活动统计数据
        List<PartyMemberAnalysisVO> partyMemberAnalysisVOS = comActNeighborCircleDAO.institutionalPartyMemberServiceAnalysis(beginTime, endTime, belongTo,communityId,unitId);
        List<PartyMemberAnalysisVO> partyMemberAnalysisVOS1 = comActNeighborCircleDAO.institutionalPartyMemberActAnalysis(beginTime, endTime, belongTo,communityId,unitId);
        List<PartyMemberAnalysisVO> partyMemberAnalysisVOS = comActNeighborCircleDAO.institutionalPartyMemberServiceAnalysis(beginTime, endTime, belongTo,communityId,unitId,searchContent);
        List<PartyMemberAnalysisVO> partyMemberAnalysisVOS1 = comActNeighborCircleDAO.institutionalPartyMemberActAnalysis(beginTime, endTime, belongTo,communityId,unitId,searchContent);
        if (partyMemberAnalysisVOS1.size()>0){
            for (PartyMemberAnalysisVO vo : partyMemberAnalysisVOS1) {
                if (ObjectUtils.isNotEmpty(vo)){
@@ -1476,8 +1477,8 @@
            endTime=year.toString().concat("-12-31");
        }
        //获取党员活动统计数据
        List<PartyMemberAnalysisVO> partyMemberAnalysisVOS = comActNeighborCircleDAO.institutionalPartyMemberServiceAnalysis(beginTime, endTime, belongTo,communityId,unitId);
        List<PartyMemberAnalysisVO> partyMemberAnalysisVOS1 = comActNeighborCircleDAO.institutionalPartyMemberActAnalysis(beginTime, endTime, belongTo,communityId,unitId);
        List<PartyMemberAnalysisVO> partyMemberAnalysisVOS = comActNeighborCircleDAO.institutionalPartyMemberServiceAnalysis(beginTime, endTime, belongTo,communityId,unitId,null);
        List<PartyMemberAnalysisVO> partyMemberAnalysisVOS1 = comActNeighborCircleDAO.institutionalPartyMemberActAnalysis(beginTime, endTime, belongTo,communityId,unitId,null);
        if (partyMemberAnalysisVOS1.size()>0){
            for (PartyMemberAnalysisVO vo : partyMemberAnalysisVOS1) {
                if (ObjectUtils.isNotEmpty(vo)){

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

@@ -358,7 +358,8 @@
//            endTime=year.toString().concat("-12-31");
//        }
        activityVO.setUnitCount(comActDAO.arriveUnit(belongTo));
        R r = communityService.institutionalUnitServiceAnalysis(year, null, null, null, null, null, belongTo, null, null);
        R r = communityService.institutionalUnitServiceAnalysis(year, null, null, null,
                null, null, belongTo, null, null,null);
        Object data = r.getData();
        String jsonString = JSON.toJSONString(data);
        ActivityAnalysisVO activityAnalysisVO = JSON.parseObject(jsonString, ActivityAnalysisVO.class);

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

@@ -669,6 +669,12 @@
            <if test="unitId != null">
                and cpcu.id=#{unitId}
            </if>
            <if test="searchContent != null and searchContent != ''">
                and (su.name like concat('%',#{searchContent},'%')
                         or su.phone like concat('%',#{searchContent},'%')
                         or ca.name like concat('%',#{searchContent},'%')
                         or cpcu.name like concat('%',#{searchContent},'%'))
            </if>
            GROUP BY caa.id,caar.user_id
        ) temp GROUP BY memberId
        having serviceTimes&lt;>'' and serviceTime&lt;>'' and memberName&lt;>''
@@ -697,6 +703,12 @@
        <if test="unitId != null">
            and cpcu.id=#{unitId}
        </if>
        <if test="searchContent != null and searchContent != ''">
            and (su.name like concat('%',#{searchContent},'%')
            or su.phone like concat('%',#{searchContent},'%')
            or ca.name like concat('%',#{searchContent},'%')
            or cpcu.name like concat('%',#{searchContent},'%'))
        </if>
        GROUP BY (canc.solve_id)
        having serviceTimes&lt;>'' and serviceTime&lt;>'' and memberName&lt;>''
        order by serviceTime desc