双争双评积分

luoxinwu

2024-03-05 f7b14aa7b17d465f82d8213d0c9949ffdeae4533

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

@@ -1,10 +1,9 @@
package com.panzhihua.service_community.api;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;

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.*;

@@ -18,6 +17,8 @@
import com.panzhihua.service_community.service.ComActNeighborCircleTopicService;

import lombok.extern.slf4j.Slf4j;

import java.util.List;

@Slf4j
@RestController
@@ -433,8 +434,18 @@
     * 导出
     */
    @GetMapping("/export")
    public R export(@RequestParam("year") Integer year, @RequestParam("belongTo") String belongTo, @RequestParam("communityId") Long communityId, HttpServletResponse response) throws Exception {
        return this.comActNeighborCircleService.export(year,belongTo,communityId,response);
    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);
    }

    /**