mitao
2025-01-15 da8bd34ef4e721b9d6255f983c68ef3975d0962d
添加接口备注
7个文件已修改
132 ■■■■■ 已修改文件
land-admin/src/main/java/com/zzg/web/controller/state/StateAgreementController.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
land-admin/src/main/java/com/zzg/web/controller/state/StateAssetController.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
land-admin/src/main/java/com/zzg/web/controller/state/StateProcessController.java 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
land-admin/src/main/java/com/zzg/web/controller/state/StateProjectController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
land-admin/src/main/java/com/zzg/web/controller/state/StateSettlementController.java 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
land-admin/src/main/java/com/zzg/web/controller/state/householdQuery/StateHouseholdController.java 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
land-admin/src/main/java/com/zzg/web/controller/state/householdQuery/StateHouseholdOwnerController.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
land-admin/src/main/java/com/zzg/web/controller/state/StateAgreementController.java
@@ -45,7 +45,7 @@
    private final StateHouseholdService stateHouseholdService;
    private final StateProcessTemplateService stateProcessTemplateService;
    private final StateProjectService stateProjectService;
    // 新增协议
    @PostMapping(UrlConstants.STATE_AGREEMENT_SAVE)
    public AjaxResult<Boolean> createAgreement(@RequestBody StateAgreementSaveBO saveBO) {
        //根据协议类型和房产id进行排重 每个协议只能存在一份
@@ -66,12 +66,12 @@
        }
        return AjaxResult.success(stateAgreementService.saveOrUpdate(saveBO));
    }
    // 模拟转征收
    @PostMapping(UrlConstants.STATE_AGREEMENT_UPDATE)
    public AjaxResult<Boolean> updateAgreement(@RequestBody UpdateAgreementBO bo) {
        return AjaxResult.success(stateAgreementService.updateStateAgreement(bo.getHouseId()));
    }
    // 更新协议
    @PostMapping(UrlConstants.STATE_AGREEMENT_UPDATE_AGREEMENT)
    public AjaxResult<StateAgreementSaveBO> updateAgreement(@RequestBody StateAgreementSaveBO saveBO) {
        if (!CollectionUtils.isEmpty(saveBO.getFileBOList())) {
@@ -82,7 +82,7 @@
        stateAgreementService.saveOrUpdate(saveBO);
        return AjaxResult.success(saveBO);
    }
    // 协议详情 - 编辑 -删除按钮
    @GetMapping(UrlConstants.STATE_AGREEMENT_DEL)
    public AjaxResult<Boolean> deleteAgreement(@RequestParam String agreementId) {
        StateAgreement stateAgreement = stateAgreementService.getById(agreementId);
@@ -105,17 +105,17 @@
        }
        return AjaxResult.success(stateAgreementService.removeById(agreementId));
    }
    // 协议管理 - 页面查询
    @PostMapping(UrlConstants.STATE_AGREEMENT_LIST)
    public AjaxResult<PageInfo<StateAgreementVO>> listStateAgreement(@RequestBody StateAgreementBO request) {
        return AjaxResult.success(stateAgreementService.listDataByCondition(request));
    }
    // 协议详情
    @GetMapping(UrlConstants.STATE_AGREEMENT_DETAIL)
    public AjaxResult<List<AgreementDetailVO>> getAgreementDetail(@RequestParam String stateHouseId) {
        return AjaxResult.success(stateAgreementService.listAgreementDetailByHouseId(stateHouseId));
    }
    //生成协议word
    @GetMapping(UrlConstants.STATE_AGREEMENT_GENERATE)
    public void generateAgreementDetail(
            @RequestParam String stateHouseholdId,
land-admin/src/main/java/com/zzg/web/controller/state/StateAssetController.java
@@ -14,9 +14,12 @@
import com.zzg.system.service.state.StateAssetService;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
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 java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.List;
import java.util.Objects;
@@ -26,12 +29,12 @@
public class StateAssetController {
    private final StateAssetService assetService;
    // 新增和修改 项目资金
    @PostMapping(UrlConstants.STATE_PROJECT_ASSET_SAVE)
    public AjaxResult<Boolean> saveAsset(@RequestBody StateAssetBO asset) {
        return AjaxResult.success(assetService.saveAsset(asset));
    }
    // 项目删除
    @GetMapping(UrlConstants.STATE_PROJECT_ASSET_DEL)
    public AjaxResult<Boolean> delAsset(@RequestParam String assetId) {
        StateAsset asset = assetService.getById(assetId);
@@ -43,7 +46,7 @@
        updateWrapper.set(StateAsset::getDelFlag, DeleteFlagEnum.DELETED.getKey());
        return AjaxResult.success(assetService.update(updateWrapper));
    }
    // 项目资金展示
    @GetMapping(UrlConstants.STATE_PROJECT_ASSET_LIST)
    public AjaxResult<List<StateAsset>> listAsset(
            @RequestParam String projectId,
@@ -62,12 +65,12 @@
                .setScale(4, RoundingMode.HALF_UP)));
        return AjaxResult.success(list);
    }
    // 项目资金 上方统计数据
    @GetMapping(UrlConstants.STATE_PROJECT_ASSET_SUM)
    public AjaxResult<JSONObject> sumAsset(@RequestParam String projectId) {
        return AjaxResult.success(assetService.sumAsset(projectId));
    }
    // 项目资金点击上方符号查询
    @PostMapping(UrlConstants.STATE_PROJECT_ASSET_DETAIL)
    public AjaxResult<PageInfo<StateAssetDetailVO>> listAssetDetail(@RequestBody AssetDetailBO detailBO) {
        return AjaxResult.success(assetService.listAssetDetail(detailBO));
land-admin/src/main/java/com/zzg/web/controller/state/StateProcessController.java
@@ -1,6 +1,5 @@
package com.zzg.web.controller.state;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -16,17 +15,31 @@
import com.zzg.common.enums.DeleteFlagEnum;
import com.zzg.common.exception.GlobalException;
import com.zzg.common.utils.SecurityUtils;
import com.zzg.framework.web.domain.server.Sys;
import com.zzg.system.domain.bo.*;
import com.zzg.system.domain.bo.ProcessAgreeBO;
import com.zzg.system.domain.bo.ProcessCreateBO;
import com.zzg.system.domain.bo.ProcessModuleUpdateBO;
import com.zzg.system.domain.bo.ProcessRefuseBO;
import com.zzg.system.domain.bo.ProcessStartBO;
import com.zzg.system.domain.bo.ProcessTaskListBO;
import com.zzg.system.domain.bo.ProcessTemplatePageBO;
import com.zzg.system.domain.bo.ProcessUpdateBO;
import com.zzg.system.domain.vo.ProcessTaskListVO;
import com.zzg.system.service.state.StateProcessModuleService;
import com.zzg.system.service.state.StateProcessTemplateService;
import com.zzg.system.service.system.ISysUserService;
import lombok.RequiredArgsConstructor;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import java.util.*;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -38,7 +51,7 @@
    private final StateProcessModuleService processModuleService;
    private final ISysUserService sysUserService;
    //应用流程
    @PostMapping(UrlConstants.STATE_PROCESS_STATE_MODULE_PAGE)
    public AjaxResult<PageInfo<StateProcessModule>> modulePage(@RequestBody PageDomain pageDomain) {
        PageHelper.startPage(pageDomain.getPageNum(), pageDomain.getPageSize());
@@ -67,7 +80,7 @@
        }
        return AjaxResult.success(pageInfo);
    }
    //修改应用流程
    @PostMapping(UrlConstants.STATE_PROCESS_STATE_MODULE_UPDATE)
    public AjaxResult<PageInfo<StateProcessModule>> moduleUpdate(@RequestBody ProcessModuleUpdateBO processModuleUpdateBO) {
        StateProcessTemplate stateProcessTemplate = processTemplateService.getById(processModuleUpdateBO.getTemplateId());
land-admin/src/main/java/com/zzg/web/controller/state/StateProjectController.java
@@ -70,7 +70,7 @@
    public AjaxResult<StateProjectBO> getById(@PathVariable String id) {
        return AjaxResult.success(stateProjectService.getProjectInfoById(id));
    }
    //获取当前项目的所有街道
    @GetMapping(UrlConstants.STATE_PROJECT_GET_STREET_BY_ID)
    public AjaxResult<String[]> getProjectBelongingStreetTownById(@PathVariable String id) {
        return AjaxResult.success(stateProjectService.getProjectBelongingStreetTownById(id));
land-admin/src/main/java/com/zzg/web/controller/state/StateSettlementController.java
@@ -14,9 +14,19 @@
import com.zzg.common.utils.file.FileUtils;
import com.zzg.system.convert.StateProjectConvert;
import com.zzg.system.convert.easyExcel.MultiDropdownWriteHandler;
import com.zzg.system.domain.bo.*;
import com.zzg.system.domain.vo.*;
import com.zzg.system.service.state.StateHouseholdService;
import com.zzg.system.domain.bo.ImportSettlementBO;
import com.zzg.system.domain.bo.SettlementBO;
import com.zzg.system.domain.bo.SettlementDetailBO;
import com.zzg.system.domain.bo.StateExecutionBO;
import com.zzg.system.domain.bo.WorkFlowSubmitBO;
import com.zzg.system.domain.vo.HouseholdVO;
import com.zzg.system.domain.vo.NotResettlementHouseholdExportVO;
import com.zzg.system.domain.vo.ProjectExecutionSumVO;
import com.zzg.system.domain.vo.ResettlementHouseholdExportVO;
import com.zzg.system.domain.vo.SettlementDetailPageVO;
import com.zzg.system.domain.vo.SettlementSumVO;
import com.zzg.system.domain.vo.StateExecutionDetailExportVO;
import com.zzg.system.domain.vo.StateExecutionDetailVO;
import com.zzg.system.service.state.StateSettlementService;
import com.zzg.system.service.system.ISysDeptService;
import com.zzg.web.core.enums.TemplateFileTypeEnum;
@@ -25,7 +35,11 @@
import lombok.extern.slf4j.Slf4j;
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 javax.servlet.http.HttpServletResponse;
import java.io.IOException;
@@ -77,12 +91,12 @@
    public AjaxResult<SettlementSumVO> sumSettled(@RequestParam String projectId) {
        return AjaxResult.success(settlementService.sumSettleData(projectId));
    }
    // 安置情况页面 数据
    @PostMapping(UrlConstants.STATE_SETTLEMENT_LIST)
    public AjaxResult<PageInfo<HouseholdVO>> listSettlement(@RequestBody SettlementBO settlementBO) {
        return AjaxResult.success(settlementService.listSettleData(settlementBO));
    }
    // 安置情况页面 导出
    @PostMapping(UrlConstants.STATE_SETTLEMENT_EXPORT)
    public AjaxResult<Void> exportSettlement(@RequestBody SettlementBO settlementBO, HttpServletResponse response) {
        try {
@@ -189,7 +203,7 @@
        }
    }
    // 新增安置详情页面 导入
    @PostMapping(UrlConstants.STATE_SETTLEMENT_IMPORT)
    public AjaxResult<Void> importSettlement(ImportSettlementBO importSettlementBO) throws IOException {
        settlementService.stateSettlementImport(importSettlementBO);
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) {
@@ -146,12 +158,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 +195,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));
land-admin/src/main/java/com/zzg/web/controller/state/householdQuery/StateHouseholdOwnerController.java
@@ -28,13 +28,13 @@
    private final StateHouseholdOwnerService householdOwnerService;
    //查询权利人
    @GetMapping(UrlConstants.STATE_HOUSEHOLD_OWNER_LIST_BY_SATE_HOUSEHOLD_ID)
    public AjaxResult<Object> listPersons(@RequestParam String stateHouseholdId) {
        JSONObject jsonObject = householdOwnerService.getPersonsInfo(stateHouseholdId);
        return AjaxResult.success(jsonObject);
    }
    //新增权利人
    @PostMapping(UrlConstants.STATE_HOUSEHOLD_OWNER_SAVE)
    public AjaxResult<Boolean> savePerson(@RequestBody StateHouseholdOwnerBO person) {
        List<StateHouseholdOwner> ownerBOList = person.getOwnerBOList();
@@ -51,7 +51,7 @@
        );
        return AjaxResult.success(householdOwnerService.saveOrUpdateBatch(ownerBOList));
    }
    //修改权利人信息
    @PostMapping(UrlConstants.STATE_HOUSEHOLD_OWNER_UPDATE)
    public AjaxResult<Boolean> updatePerson(@RequestBody StateHouseholdOwner stateHouseholdOwner) {
        //查询当前项目下所有的
@@ -74,12 +74,12 @@
        householdOwnerService.saveOrUpdate(stateHouseholdOwner);
        return AjaxResult.success();
    }
    //删除权利人
    @GetMapping(UrlConstants.STATE_HOUSEHOLD_OWNER_DELETE)
    public AjaxResult<Boolean> deletePerson(@RequestParam String stateHouseholdOwnerId) {
        return AjaxResult.success(householdOwnerService.removeById(stateHouseholdOwnerId));
    }
    //计算入户补偿的预估数据
    @PostMapping(UrlConstants.STATE_HOUSEHOLD_OWNER_CALCULATE_COMPENSATION)
    @ApiOperation(value = "计算入户补偿的预估数据", notes = "计算入户补偿的预估数据")
    public AjaxResult<CalculateCompensationVO> calculateCompensation(@RequestBody CalculateCompensationBO calculateCompensationBO) {