修改西区uu洗车登录接口500 7

lidongdong

2024-04-01 cdca957e4835e359a89fe4c7c9833ab0c78ee4e3

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

@@ -3,7 +3,7 @@
import java.util.Date;
import java.util.List;

import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.*;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.community.acid.*;
import com.panzhihua.common.model.dtos.community.building.BuildingDto;
@@ -52,8 +52,6 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

import com.panzhihua.common.model.dtos.AppletesBackstageConfigDTO;
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerAddDTO;
@@ -256,6 +254,7 @@
import org.springframework.web.multipart.MultipartFile;

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

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -9953,12 +9952,28 @@
     * 单位活动统计
     */
    @GetMapping("/neighbor/activityAnalysis")
    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,
    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 = "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 = "unitId",required = false) Long unitId,
                                       @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,
                                @RequestParam(value = "belongTo",required = false) String belongTo,
                                @RequestParam(value = "communityId",required = false) Long communityId);

    @GetMapping("/neighbor/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);

    /**
     * 批量删除活动
     * @param ids