Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

luoxinwu

2024-03-05 c88d1658a2b6b51ed1a81c3be3e9102b661970f3

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/ComPbCheckUnitController.java

@@ -1,5 +1,7 @@
package com.panzhihua.service_dangjian.api;

import com.panzhihua.common.model.dtos.partybuilding.ComPbCheckUserDTO;
import com.panzhihua.common.model.vos.TreeListVO;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitExcelVO;
import com.panzhihua.service_dangjian.service.ComPbCheckUnitService;
import com.panzhihua.common.model.dtos.common.*;
@@ -39,6 +41,15 @@
        return this.comPbCheckUnitService.queryByPage(comPbCheckUnit);
    }

    @PostMapping("/treeList")
    public R treeList(@RequestBody TreeListVO treeListVO){
        return this.comPbCheckUnitService.treeList(treeListVO);
    }

    @GetMapping("/orgList")
    public R orgList(){
        return this.comPbCheckUnitService.orgList();
    }
    /**
     * description  add  新增数据
     *
@@ -129,5 +140,66 @@
        return this.comPbCheckUnitService.importCheckUnit(list,communityId,userId);
    }

    /**
     * 报到单位统计-顶部数据
     * @param communityId
     * @param belongTo
     * @param choice
     * @return
     */
    @GetMapping("/statistics/top")
    public R unitStatisticsTop(@RequestParam(value = "communityId", required = false) Long communityId,
                               @RequestParam(value = "belongTo") String belongTo,
                               @RequestParam(value = "belongTo", required = false) String choice,
                               @RequestParam(value = "unitIds", required = false) Long[] unitIds) {
        return comPbCheckUnitService.unitStatisticsTop(communityId, belongTo, choice,unitIds);
    }

    /**
     * 报到单位统计
     * @param commonDto
     * @return
     */
    @PostMapping("/statistics")
    public R unitStatistics(@RequestBody PagePbCheckUnitCommonDto commonDto) {
        return comPbCheckUnitService.unitStatistics(commonDto);
    }

    /**
     * 报到党员统计-顶部数据
     * @param communityId
     * @param belongTo
     * @param choice
     * @param checkUnitId
     * @return
     */
    @GetMapping("/pbStatistics/top")
    public R pbStatisticsTop(@RequestParam(value = "communityId", required = false) Long communityId,
                             @RequestParam(value = "belongTo") String belongTo,
                             @RequestParam(value = "choice", required = false) String choice,
                             @RequestParam(value = "checkUnitId", required = false) Long checkUnitId,
                             @RequestParam(value = "unitIds", required = false) Long[] unitIds) {
        return comPbCheckUnitService.pbStatisticsTop(communityId, belongTo, choice, checkUnitId,unitIds);
    }

    /**
     * 报到党员统计-按单位归属统计
     * @param commonDto
     * @return
     */
    @PostMapping("/pbStatistics/belong")
    public R pbStatisticsBelong(@RequestBody PagePbCheckUnitCommonDto commonDto) {
        return comPbCheckUnitService.pbStatisticsBelong(commonDto);
    }

    /**
     * 报到党员统计-按单位统计
     * @param commonDto
     * @return
     */
    @PostMapping("/pbStatistics/unit")
    public R pbStatisticsUnit(@RequestBody PagePbCheckUnitCommonDto commonDto) {
        return comPbCheckUnitService.pbStatisticsUnit(commonDto);
    }
}