Merge remote-tracking branch 'origin/master'

yanghb

2025-02-18 1fc203f758ace853f4bfa900c422c2f741d09e79

 land-admin/src/main/java/com/zzg/web/controller/state/householdQuery/StateHouseholdController.java

@@ -11,7 +11,6 @@
import com.zzg.common.core.domain.AjaxResult;
import com.zzg.common.core.domain.entity.state.StateHousehold;
import com.zzg.common.enums.HouseMoveEnum;
import com.zzg.common.enums.HouseSearchStatusEnum;
import com.zzg.common.enums.HouseUsingTypeEnum;
import com.zzg.common.enums.StateHouseholdStageEnums;
import com.zzg.common.exception.GlobalException;
@@ -21,17 +20,30 @@
import com.zzg.system.domain.bo.HouseQueryBO;
import com.zzg.system.domain.bo.HouseholdBO;
import com.zzg.system.domain.bo.StateHouseholdBO;
import com.zzg.system.domain.vo.*;
import com.zzg.system.domain.vo.HouseQueryVO;
import com.zzg.system.domain.vo.HouseUsingTypeVO;
import com.zzg.system.domain.vo.HouseholdDetailVO;
import com.zzg.system.domain.vo.HouseholdVO;
import com.zzg.system.domain.vo.StateHouseholdExportVO;
import com.zzg.system.domain.vo.StateHouseholdVO;
import com.zzg.system.service.state.StateHouseholdService;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.*;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;

@RestController
@RequiredArgsConstructor
@@ -44,18 +56,18 @@
    public AjaxResult<Page<StateHousehold>> page(@RequestParam int currentPage, @RequestParam int pageSize) {
        return AjaxResult.success(stateHouseholdService.page(new Page<>(currentPage, pageSize)));
    }

    //入户调查 - 入户调查列表数据查询页面
    @PostMapping(UrlConstants.STATE_HOUSEHOLD_LIST_BY_CONDITION)
    public AjaxResult<HouseholdDetailVO> list(@RequestBody(required = false) HouseholdBO householdBOBody) {
        return AjaxResult.success(stateHouseholdService.queryList(householdBOBody));
    }

    //国有入户调查
    @PostMapping(UrlConstants.STATE_HOUSEHOLD_QUERY)
    public AjaxResult<PageInfo<HouseQueryVO>> houseQuery(@RequestBody HouseQueryBO houseQueryBO) {
        return AjaxResult.success(stateHouseholdService.queryData(houseQueryBO));
    }


    //入户调查列表页面-导出
    @PostMapping(UrlConstants.STATE_HOUSEHOLD_LIST_EXPORT)
    public AjaxResult<HouseholdDetailVO> export(@RequestBody(required = false) HouseholdBO householdBOBody, HttpServletResponse response) throws IOException {
        householdBOBody.setPageNum(1);
@@ -91,7 +103,7 @@
        response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
        return AjaxResult.success();
    }

    //入户调查页面-导入
    @PostMapping(UrlConstants.STATE_HOUSEHOLD_LIST_IMPORT)
    public AjaxResult<Boolean> importStateHousehold(@RequestParam("file") MultipartFile file, String projectId) {

@@ -126,13 +138,14 @@
    }


    // 删除项目
    // 删除房屋
    @GetMapping(UrlConstants.STATE_HOUSEHOLD_DELETE)
    public AjaxResult<Boolean> delete(@RequestParam String id) {
        return AjaxResult.success(stateHouseholdService.removeById(id));
    }

    //安置情况数据统计
    //安置情况数据统计 未使用
    @Deprecated
    @GetMapping(UrlConstants.STATE_HOUSEHOLD_SUM)
    public AjaxResult<Void> sumHouseholdData(@RequestParam String stateProjectId) {
        stateHouseholdService.sumHouseholdData(stateProjectId);
@@ -146,12 +159,12 @@
        return AjaxResult.success();
    }


    //项目资金情况 街道标签 - 查询该项目所有的街道
    @GetMapping(UrlConstants.STATE_HOUSEHOLD_STREET_LIST)
    public AjaxResult<List<JSONObject>> listHouseStreet(@RequestParam String projectId) {
        return AjaxResult.success(stateHouseholdService.listStreet(projectId));
    }

    //入户调查 - 点击完成提交
    @GetMapping(UrlConstants.STATE_HOUSEHOLD_COMPLETE_SEARCH)
    public AjaxResult<Boolean> completeSearch(@RequestParam String houseId,
                                              @RequestParam Integer searchStatus) {
@@ -183,7 +196,7 @@
        }
        return AjaxResult.success(stateHouseholdService.saveOrUpdate(stateHousehold));
    }

    //撤回按钮
    @GetMapping(UrlConstants.STATE_HOUSEHOLD_MOBILE_BACK)
    public AjaxResult<Boolean> mobileBack(@RequestParam String houseId) {
        return AjaxResult.success(stateHouseholdService.mobileBack(houseId));