lidongdong
2024-07-11 eef6d2bcdb29348efe4ef17bc45a4c6886b487b1
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java
@@ -2,8 +2,8 @@
import javax.annotation.Resource;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleDO;
import org.springframework.beans.BeanUtils;
import com.panzhihua.common.model.dtos.ExcelDO;
import com.panzhihua.common.model.dtos.PartyExcelDO;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -17,6 +17,8 @@
import com.panzhihua.service_community.service.ComActNeighborCircleTopicService;
import lombok.extern.slf4j.Slf4j;
import java.util.List;
@Slf4j
@RestController
@@ -418,14 +420,35 @@
     * @return
     * */
    @GetMapping("/activityAnalysis")
    public R institutionalUnitServiceAnalysis(@RequestParam(value = "year",required = false) Integer year,@RequestParam(value = "type",required = false) Integer type,
                                              @RequestParam(value = "range",required = false)Integer range,@RequestParam(value = "communityId",required = false) Long communityId,
    public R institutionalUnitServiceAnalysis(@RequestParam(value = "year",required = false) Integer year,
                                              @RequestParam(value = "type",required = false) Integer type,
                                              @RequestParam(value = "range",required = false)Integer range,
                                              @RequestParam(value = "communityId",required = false) Long communityId,
                                              @RequestParam(value = "page",required = false) Integer page,
                                              @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);
    }
    /**
     * 导出
     */
    @GetMapping("/export")
    public List<ExcelDO> export(@RequestParam(value = "year",required = false) Integer year,
                                @RequestParam(value = "belongTo",required = false) String belongTo,
                                @RequestParam(value = "communityId",required = false) Long communityId) throws Exception {
        return this.comActNeighborCircleService.export(year,belongTo,communityId);
    }
    @GetMapping("/partyExcel")
    public List<PartyExcelDO> partyExcel(@RequestParam(value = "year",required = false) Integer year,
                                         @RequestParam(value = "belongTo",required = false) String belongTo,
                                         @RequestParam(value = "communityId",required = false) Long communityId,
                                         @RequestParam(value = "unitId",required = false) Long unitId){
        return this.comActNeighborCircleService.partyExcel(year,belongTo,communityId,unitId);
    }
    /**