land-admin/src/main/java/com/zzg/web/controller/state/StateAgreementController.java
@@ -48,7 +48,6 @@ @PostMapping(UrlConstants.STATE_AGREEMENT_SAVE) public AjaxResult<Boolean> createAgreement(@RequestBody StateAgreementSaveBO saveBO) { //根据协议类型和房产id进行排重 每个协议只能存在一份 LambdaQueryWrapper<StateAgreement> queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(StateAgreement::getAgreementFileType, saveBO.getAgreementFileType()); @@ -59,6 +58,7 @@ if (ObjectUtil.isNotEmpty(stateAgreement) && Objects.isNull(saveBO.getId())) { throw new GlobalException("每种协议类型只能存在一份"); } if (!CollectionUtils.isEmpty(saveBO.getFileBOList())) { saveBO.setFileUrl(JSON.toJSONString(saveBO.getFileBOList())); String appendFileName = saveBO.getFileBOList().stream().map(FileBO::getOriginalFilename).collect(Collectors.joining(",")); @@ -103,7 +103,6 @@ .set(StateAgreement::getFileUrl, null); return AjaxResult.success(stateAgreementService.update(updateWrapper)); } return AjaxResult.success(stateAgreementService.removeById(agreementId)); } @@ -118,7 +117,11 @@ } @GetMapping(UrlConstants.STATE_AGREEMENT_GENERATE) public void generateAgreementDetail(@RequestParam String stateHouseholdId, @RequestParam String stateAgreementId, HttpServletResponse response) throws Exception { public void generateAgreementDetail( @RequestParam String stateHouseholdId, @RequestParam String stateAgreementId, HttpServletResponse response ) throws Exception { StateAgreementBO request = new StateAgreementBO(); request.setStateHouseholdId(stateHouseholdId); Map<String, Object> wordData = stateAgreementService.getWordData(stateHouseholdId, stateAgreementId); @@ -142,7 +145,6 @@ default: templatePath = "templates/word_template.docx"; } XWPFDocument document = WordExportUtil.exportWord07(templatePath, wordData); response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); @@ -187,7 +189,6 @@ processStartBO.setVariable(variable); stateProcessTemplateService.start(processStartBO); } return AjaxResult.success(stateAgreementService.saveOrUpdateBatch(agreementList)); } } land-admin/src/main/java/com/zzg/web/controller/state/StateAssetController.java
@@ -45,9 +45,11 @@ } @GetMapping(UrlConstants.STATE_PROJECT_ASSET_LIST) public AjaxResult<List<StateAsset>> listAsset(@RequestParam String projectId, @RequestParam String street, @RequestParam(required = false) String assetId) { public AjaxResult<List<StateAsset>> listAsset( @RequestParam String projectId, @RequestParam String street, @RequestParam(required = false) String assetId ) { LambdaQueryWrapper<StateAsset> stateAssetQueryWrapper = new LambdaQueryWrapper<>(); stateAssetQueryWrapper.eq(StateAsset::getStateProjectId, projectId); stateAssetQueryWrapper.eq(StateAsset::getStreet, street); land-admin/src/main/java/com/zzg/web/controller/state/StateDataCenterController.java
@@ -22,10 +22,12 @@ private final StateDateCenterService dateCenterService; @GetMapping(UrlConstants.STATE_DATA_CENTER_SUM) public AjaxResult<ProjectAnalysisSumVO> dataCenterSum(@RequestParam(required = false) String location, @RequestParam(required = false) Integer projectStatus, @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date projectStartTime) { public AjaxResult<ProjectAnalysisSumVO> dataCenterSum( @RequestParam(required = false) String location, @RequestParam(required = false) Integer projectStatus, @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date projectStartTime ) { return AjaxResult.success(dateCenterService.projectSumCount(location, projectStatus, projectStartTime)); } @@ -36,7 +38,8 @@ //安置情况 @GetMapping(UrlConstants.STATE_DATA_CENTER_PLACEMENT_STATISTICS) public AjaxResult<PlacementStatisticsVO> stateDataCenterPlacementStatistics( public AjaxResult<PlacementStatisticsVO> stateDataCenterPlacementStatistics ( @RequestParam(required = false) String projectStreet, @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date projectStartTime, @RequestParam(required = false) Integer type @@ -48,25 +51,32 @@ @GetMapping(UrlConstants.STATE_DATA_CENTER_PLACEMENT_STATISTICS_STREET) public AjaxResult<PlacementStreetVO> stateDataCenterPlacementStatisticsStreet( @RequestParam(required = false) String projectStreet, @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date projectStartTime) { @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date projectStartTime ) { return AjaxResult.success(dateCenterService.sumPlacementStreet(projectStreet, projectStartTime)); } @PostMapping(UrlConstants.STATE_DATA_CENTER_PLACEMENT_STATISTICS_PAGE) public AjaxResult<PageInfo<TransitionPageVO>> stateDataCenterPlacementStatisticsPage(@RequestBody PlacementStatisticsBO placementStatisticsBO) throws ParseException { public AjaxResult<PageInfo<TransitionPageVO>> stateDataCenterPlacementStatisticsPage( @RequestBody PlacementStatisticsBO placementStatisticsBO ) throws ParseException { return AjaxResult.success(dateCenterService.placementStatisticsPage(placementStatisticsBO)); } //项目资金 @GetMapping(UrlConstants.STATE_DATA_CENTER_ASSET_SUM_MONEY) public AjaxResult<AssetMoneyVO> stateCenterAssetSumMoney(@RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date projectStartTime) { public AjaxResult<AssetMoneyVO> stateCenterAssetSumMoney( @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date projectStartTime ) { return AjaxResult.success(dateCenterService.sumAssetMoney(projectStartTime)); } @GetMapping(UrlConstants.STATE_DATA_CENTER_ASSET_SUM_MONEY_GRAPH) public AjaxResult<List<AssetGraphVO>> stateCenterAssetSumGraph(@RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date projectStartTime) { public AjaxResult<List<AssetGraphVO>> stateCenterAssetSumGraph( @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date projectStartTime ) { return AjaxResult.success(dateCenterService.listAssetGraph(projectStartTime)); } } land-admin/src/main/java/com/zzg/web/controller/state/StateProcessController.java
@@ -74,12 +74,10 @@ if (Objects.isNull(stateProcessTemplate)) { return AjaxResult.success(); } StateProcessModule stateProcessModule = new StateProcessModule(); stateProcessModule.setId(processModuleUpdateBO.getId()); stateProcessModule.setTemplateId(processModuleUpdateBO.getTemplateId()); stateProcessModule.setTemplateName(stateProcessTemplate.getTemplateName()); System.out.println(JSONUtil.toJsonStr(SecurityUtils.getLoginUser().getUser())); stateProcessModule.setUpdateBy(SecurityUtils.getLoginUser().getUser().getNickName()); stateProcessModule.setCreateTime(new Date()); stateProcessModule.setUpdateTime(new Date()); land-admin/src/main/java/com/zzg/web/controller/state/StateProjectCompensateStandardController.java
@@ -16,32 +16,32 @@ @RestController @RequiredArgsConstructor public class StateProjectCompensateStandardController { private final StateProjectCompensateStandardService stateProjectCompensateStandardService; @GetMapping(UrlConstants.STATE_PROJECT_COMPENSATE_STANDARD_LIST) public AjaxResult<Map<String, List<StateProjectCompensateStandardVO>>> getAll(@RequestParam(required = false) String standardName, @RequestParam(required = false) Integer stopFlag, @RequestParam(required = false) Integer compensateType public AjaxResult<Map<String, List<StateProjectCompensateStandardVO>>> getAll( @RequestParam(required = false) String standardName, @RequestParam(required = false) Integer stopFlag, @RequestParam(required = false) Integer compensateType ) { return AjaxResult.success(stateProjectCompensateStandardService.getCompensateStandardMap(standardName, stopFlag, compensateType)); } @PostMapping(UrlConstants.STATE_PROJECT_COMPENSATE_STANDARD_ADD) public AjaxResult<Boolean> create(@RequestBody StateProjectCompensateStandard stateProjectCompensateStandard) { return AjaxResult.success(stateProjectCompensateStandardService.createCompensatesStandard(stateProjectCompensateStandard)); } @PostMapping(UrlConstants.STATE_PROJECT_COMPENSATE_STANDARD_UPDATE) public AjaxResult<Boolean> update(@RequestBody StateProjectCompensateStandard stateProjectCompensateStandard) { return AjaxResult.success(stateProjectCompensateStandardService.saveOrUpdate(stateProjectCompensateStandard)); } @PostMapping(UrlConstants.STATE_PROJECT_COMPENSATE_STANDARD_UPDATE_NAME) public AjaxResult<Boolean> updateName(@RequestBody StateProjectCompensateStandard stateProjectCompensateStandard) { return AjaxResult.success(stateProjectCompensateStandardService.updateName(stateProjectCompensateStandard)); } @PostMapping(UrlConstants.STATE_PROJECT_COMPENSATE_STANDARD_STOP) public AjaxResult<Boolean> stop(@RequestParam String standardName, @RequestParam Integer compensateType) { @@ -51,6 +51,7 @@ .set(StateProjectCompensateStandard::getStopFlag, 0); return AjaxResult.success(stateProjectCompensateStandardService.update(wrapper)); } @PostMapping(UrlConstants.STATE_PROJECT_COMPENSATE_STANDARD_START) public AjaxResult<Boolean> start(@RequestParam String standardName, @RequestParam Integer compensateType) { LambdaUpdateWrapper<StateProjectCompensateStandard> wrapper = new LambdaUpdateWrapper<>(); @@ -59,6 +60,7 @@ .set(StateProjectCompensateStandard::getStopFlag, 1); return AjaxResult.success(stateProjectCompensateStandardService.update(wrapper)); } @PostMapping(UrlConstants.STATE_PROJECT_COMPENSATE_STANDARD_IMPORT) public AjaxResult<Boolean> importExcelFile(@RequestParam("file") MultipartFile file) { return AjaxResult.success(stateProjectCompensateStandardService.importByExcel(file)); land-admin/src/main/java/com/zzg/web/controller/state/StateProjectController.java
@@ -40,11 +40,9 @@ @RequiredArgsConstructor public class StateProjectController { private final StateProjectService stateProjectService; private final StateProjectCollectionFileService stateProjectCollectionFileService; private final StateProjectNoticeService stateProjectNoticeService; private final StateProcessTemplateService processTemplateService; private final StateHouseholdService stateHouseholdService; // 查询所有项目 @@ -66,7 +64,6 @@ public AjaxResult<JSONObject> pageForApplyRecord(@RequestBody GetProjectPageBO getProjectPageBO) { return AjaxResult.success(stateProjectService.getPageForApplyRecord(getProjectPageBO)); } // 根据ID查询项目 @GetMapping(UrlConstants.STATE_PROJECT_GET_BY_ID) @@ -95,8 +92,6 @@ @PostMapping(UrlConstants.STATE_PROJECT_UPDATE_STATUS) @ApiOperation(value = "修改项目状态，例如转征收，并发布公告", notes = "修改项目状态，例如转征收，并发布公告") public AjaxResult<Boolean> update(@RequestBody UpdateProjectAndAddNoticeBO updateProjectAndAddNoticeBO) { if (StateProjectStatusEnum.LEVY.getKey().equals(updateProjectAndAddNoticeBO.getProjectStatus()) || StateProjectStatusEnum.SIMULATE.getKey().equals(updateProjectAndAddNoticeBO.getProjectStatus())) { HouseAgreeMoveRateBO houseAgreeMoveRateBO = stateHouseholdService.currentProjectRate(updateProjectAndAddNoticeBO.getProjectId()); @@ -173,8 +168,8 @@ public AjaxResult<Boolean> delete(@PathVariable String id) { return AjaxResult.success(stateProjectService.removeById(id)); } // 删除项目 // 删除项目 @PostMapping(UrlConstants.STATE_PROJECT_SUCCESS) @ApiOperation(value = "将项目改为已完成", notes = "将项目改为已完成") public AjaxResult<Boolean> successProject(@RequestBody GetProjectPageBO getProjectPageBO) { @@ -197,7 +192,6 @@ stateProjectService.updateProjectAppStage(getProjectPageBO.getProjectId(), StateProjectStatusEnum.SIMULATE.getKey()); return AjaxResult.success(stateProjectService.updateProjectStatus(getProjectPageBO.getProjectId(), StateProjectStatusEnum.SIMULATE.getKey())); } @DeleteMapping(UrlConstants.STATE_PROJECT_CANCELLATION) @ApiOperation(value = "作废项目", notes = "作废项目") @@ -230,13 +224,11 @@ return AjaxResult.success(stateProjectCollectionFileService.addCollectionFile(uploadFileBO)); } @PostMapping(UrlConstants.STATE_PROJECT_NOTICE_PAGE) @ApiOperation(value = "分页查询公告", notes = "分页查询公告") public AjaxResult<Page<StateProjectNotice>> pageNotice(@RequestBody GetProjectPageBO getProjectPageBO) { return AjaxResult.success(stateProjectNoticeService.page(new Page<>(getProjectPageBO.getPageNum(), getProjectPageBO.getPageSize()))); } @PostMapping(UrlConstants.STATE_PROJECT_NOTICE_PAGE_AFTER_UPDATE_PROJECT) @ApiOperation(value = "分页查询公告", notes = "分页查询公告在更新项目之后") @@ -257,7 +249,6 @@ return AjaxResult.success(stateProjectNoticeVO); } @DeleteMapping(UrlConstants.STATE_PROJECT_NOTICE_DELETE) @ApiOperation(value = "删除公告", notes = "删除公告") public AjaxResult<Boolean> deleteNotice(@PathVariable String id) { @@ -276,15 +267,12 @@ } //1 正常公告 2转征收的公告 stateProjectNotice.setType(1); return AjaxResult.success(stateProjectNoticeService.saveOrUpdate(stateProjectNotice)); } @PostMapping(UrlConstants.STATE_PROJECT_IMPL_PAGE) @ApiOperation(value = "项目实施查询", notes = "项目实施查询") public AjaxResult<PageInfo<ProjectImplPageVO>> projectImplPage(@RequestBody GetProjectPageBO getProjectPageBO) { return AjaxResult.success(stateProjectService.getProjectImplPage(getProjectPageBO)); } } land-admin/src/main/java/com/zzg/web/controller/state/StateSettlementController.java
@@ -43,7 +43,6 @@ public class StateSettlementController { private final StateSettlementService settlementService; private final StateHouseholdService stateHouseholdService; private final ISysDeptService deptService; @PostMapping(UrlConstants.STATE_SETTLEMENT_SAVE) @@ -85,7 +84,6 @@ public AjaxResult<Void> exportSettlement(@RequestBody SettlementBO settlementBO, HttpServletResponse response) { try { List<HouseholdVO> result = settlementService.exportSettleData(settlementBO, response); if (Objects.equals(settlementBO.getIsSettled(), SettledProcessEnum.NOT_SETTLE.getValue())) { List<NotResettlementHouseholdExportVO> exportVOList = StateProjectConvert.INSTANCE.toNotResettlementHouseholdExportVO(result); List<String> deptIdList = exportVOList.stream() @@ -191,7 +189,6 @@ @PostMapping(UrlConstants.STATE_SETTLEMENT_IMPORT) public AjaxResult<Void> importSettlement(ImportSettlementBO importSettlementBO) throws IOException { settlementService.stateSettlementImport(importSettlementBO); return AjaxResult.success(); @@ -214,7 +211,6 @@ return AjaxResult.error(); } } //项目实施明细 @PostMapping(UrlConstants.STATE_EXECUTION_DETAIL) @@ -261,7 +257,6 @@ public AjaxResult<List<String>> listBatchName(@RequestParam String projectId) { return AjaxResult.success(settlementService.listBatchName(projectId)); } }
@@ -13,19 +13,19 @@ public interface StateApplyRecordService extends IService<StateApplyRecord> { PageInfo<StateApplyRecordVO> pageInfo(StateApplyRecordPageBO stateApplyRecordPageBO); boolean saveStateApplyRecordAndItem(SaveRecordAndItemBO stateApplyRecordPageBO); ApplyHouseholdOwnerVO getApplyHouseholdOwner(GetApplyHouseholdOwnerBO getApplyHouseholdOwnerBO); Object apply(StateApplyRecordPageBO stateApplyRecordPageBO); StateApplyRecordPageInfoLevelVO pageInfoLevel(StateApplyRecordPageInfoLevelBO stateApplyRecordPageBO); PageInfo<ApplyOwnerBO> getApplyHouseholdOwnerInfo(GetApplyHouseholdOwnerBO getApplyHouseholdOwnerBO); List<ApplyOwnerBO> importOwnerByFile(ImportApplyRecordBO importApplyRecordBO); ApplyBO stateApplyRecordDetail(GetApplyHouseholdOwnerBO getApplyHouseholdOwnerBO); void updateApplyStatus(String recordId, Integer status); land-system/src/main/java/com/zzg/system/service/state/StateDateCenterService.java
@@ -1,13 +1,11 @@ package com.zzg.system.service.state; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.pagehelper.PageInfo; import com.zzg.system.domain.bo.PlacementStatisticsBO; import com.zzg.system.domain.bo.ProjectStatisticsBO; import com.zzg.system.domain.vo.*; import java.text.ParseException; import java.util.Date; import java.util.List; @@ -18,8 +16,6 @@ Date projectStartTime); PageInfo<ProjectStatusExpiredVO> expiredProjectStatus(ProjectStatisticsBO projectStatisticsBO); PlacementStatisticsVO placementStatistics(String projectStreet, Date projectStartTime, Integer type);
@@ -15,7 +15,5 @@ JSONObject getPersonsInfo(String stateHouseholdId); Map<String, String> appendOwnerName(List<String> houseId); List<StateProjectCompensateStandard> getCalculateCompensation(String projectId); } land-system/src/main/java/com/zzg/system/service/state/StateHouseholdService.java
@@ -16,19 +16,13 @@ public interface StateHouseholdService extends IService<StateHousehold> { HouseholdDetailVO queryPage(GetProjectPageBO getProjectPageBO); HouseholdDetailVO queryList(HouseholdBO householdBOBody); void sumHouseholdData(String stateProjectId); PageInfo<HouseholdVO> pageByProjectId(List<String> projectIdList, String street); StateHouseholdVO getStateHouseholdInfo(String id); Boolean resetStatusAfterSearch(String projectId); Boolean importStateHousehold(MultipartFile file, String projectId);
@@ -12,8 +12,6 @@ // Read List<StateProjectCollectionFile> getByProjectIdAndType(String projectId, Integer fileType, Boolean isBefore); Object uploadCollectionFile(UploadFileBO uploadFileBO); List<ParentCollectionFileVO> getParentCollectionFile(Boolean isBefore); Boolean addCollectionFile(UploadFileBO uploadFileBO); land-system/src/main/java/com/zzg/system/service/state/StateProjectCompensateStandardService.java
@@ -9,7 +9,9 @@ import java.util.Map; public interface StateProjectCompensateStandardService extends IService<StateProjectCompensateStandard> { Map<String, List<StateProjectCompensateStandardVO>> getCompensateStandardMap(String standardName, Integer stopFlag, Integer compensateType); List<StateProjectCompensateStandard> getEnableCompensateStandard(List<String> standardNameList); boolean importByExcel(MultipartFile file); @@ -17,6 +19,5 @@ Boolean createCompensatesStandard(StateProjectCompensateStandard stateProjectCompensateStandard); Boolean updateName(StateProjectCompensateStandard stateProjectCompensateStandard); // 定义额外的业务逻辑方法 }
@@ -8,6 +8,7 @@ import java.util.Map; public interface StateProjectNoticeService extends IService<StateProjectNotice> { StateProjectNoticeVO getStateProjectNoticeVO(String noticeId); Map<String, List<StateProjectNotice>> listNoticeMapByProjectIdList(List<String> projectIdList); land-system/src/main/java/com/zzg/system/service/state/StateProjectService.java
@@ -28,14 +28,15 @@ boolean saveProject(StateProject stateProject); StateProject getProjectById(String id); StateProjectBO getProjectInfoById(String id); StateProject getEnableProjectById(String id); PageInfo<ProjectImplPageVO> getProjectImplPage(GetProjectPageBO getProjectPageBO); boolean cancellationStateProject(String id); Boolean updateProjectStatus(String projectId, Integer key); Boolean updateProjectAppStage(String projectId, Integer key); Boolean updateProjectAuditStatus(String projectId, Integer status); land-system/src/main/java/com/zzg/system/service/state/StateSettlementService.java
@@ -17,7 +17,6 @@ public interface StateSettlementService extends IService<StateSettlement> { PageInfo<HouseholdVO> listSettleData(SettlementBO settlementBO); List<HouseholdVO> exportSettleData(SettlementBO settlementB, HttpServletResponse response) throws IOException; land-system/src/main/java/com/zzg/system/service/state/impl/FlowListenerService.java
@@ -62,7 +62,6 @@ private final FlwTaskActorMapper flwTaskActorMapper; private final FlwHisTaskMapper flwHisTaskMapper; private final ISysRoleService sysRoleService; private final FlwHisInstanceMapper flwHisInstanceMapper; private final FlwTaskMapper flwTaskMapper;
@@ -52,7 +52,6 @@ @Override public PageInfo<StateAgreementVO> listDataByCondition(StateAgreementBO request) { PageUtils.startPage(); List<StateAgreementVO> sqlResult = this.getBaseMapper().listDataByConditions(request); if (CollectionUtils.isEmpty(sqlResult)) { return new PageInfo<>(); @@ -81,9 +80,6 @@ } else { useList = stateHouseholdOwners; } // if (CollectionUtils.isEmpty(useList)) { // return new PageInfo<>(); // } Map<String, List<StateHouseholdOwner>> map = useList.stream().collect(Collectors.groupingBy(StateHouseholdOwner::getStateHouseholdId)); @@ -107,18 +103,7 @@ } if (map.containsKey(innerData.getStateHouseholdId())) { List<StateHouseholdOwner> innerOwner = map.get(innerData.getStateHouseholdId()); // String ownerName = innerOwner.stream() // .map(StateHouseholdOwner::getOwnerName) // .distinct() // .collect(Collectors.joining("|")); // long countPersons = innerOwner.stream() // .map(StateHouseholdOwner::getOwnerName) // .distinct() // .count(); innerData.setOwnerType(innerOwner.get(0).getOwnerType()); // innerData.setOwnerName(ownerName); // innerData.setPersonNum(countPersons); } }); @@ -267,7 +252,7 @@ return String.join(",", list); } })); ; String ownerPhone = ownerList.stream() .map(StateHouseholdOwner::getPhoneNumber) .filter(Objects::nonNull) // 过滤掉 null 值 @@ -281,7 +266,7 @@ return String.join(",", list); } })); ; String concatenatedIdForPerson = ownerList.stream() .filter(e -> Objects.nonNull(e.getPersonIdCard())) @@ -321,7 +306,6 @@ agreementWrapper.eq(StateAgreement::getId, stateAgreementId); agreementWrapper.isNotNull(StateAgreement::getAgreementNumber); StateAgreement one = this.getOne(agreementWrapper); Map<String, Object> dataMap = new HashMap<>(); if (StringUtils.isNotBlank(ownerName)) { @@ -384,7 +368,6 @@ StateAgreement virtualAgreement = virtual.get(); StateAgreement dbAgreement = agreement.get(); dbAgreement.setMoney(virtualAgreement.getMoney()); dbAgreement.setEffectiveDate(virtualAgreement.getEffectiveDate()); dbAgreement.setAppendFileName("(转)" + virtualAgreement.getAppendFileName()); @@ -406,7 +389,6 @@ e.printStackTrace(); } agreementList.add(dbAgreement); } } if (CollectionUtils.isEmpty(agreementList)) { land-system/src/main/java/com/zzg/system/service/state/impl/StateApplyRecordServiceImpl.java
@@ -256,11 +256,6 @@ } @Override public Object apply(StateApplyRecordPageBO stateApplyRecordPageBO) { return null; } @Override public StateApplyRecordPageInfoLevelVO pageInfoLevel(StateApplyRecordPageInfoLevelBO stateApplyRecordPageBO) { List<StateApplyRecordVO> allStateApplyRecordVOList = this.getBaseMapper().selectApplyRecordWithProject(stateApplyRecordPageBO); if (CollectionUtils.isEmpty(allStateApplyRecordVOList)) { land-system/src/main/java/com/zzg/system/service/state/impl/StateAssetServiceImpl.java
@@ -38,43 +38,28 @@ @Service @RequiredArgsConstructor public class StateAssetServiceImpl extends ServiceImpl<StateAssetMapper, StateAsset> implements StateAssetService { public class StateAssetServiceImpl extends ServiceImpl<StateAssetMapper, StateAsset> implements StateAssetService { private final StateAgreementService agreementService; private final StateAssetMapper assetMapper; private final StateSettlementService settlementService; @Lazy @Resource private final StateProjectService stateProjectService; @Lazy @Resource private final StateHouseholdService stateHouseholdService; @Lazy @Resource private final StateProcessTemplateService stateProcessTemplateService; @Lazy @Resource private final StateHouseholdOwnerService stateHouseholdOwnerService; @Lazy @Resource private final ISysDeptService deptService; @Override public PageInfo<StateAssetDetailVO> listAssetDetail(AssetDetailBO assetDetailBO) { StateProject stateProject = stateProjectService.getById(assetDetailBO.getProjectId()); Integer currentStatus = stateProject.getStatus(); PageUtils.startPage(); @@ -83,20 +68,6 @@ return new PageInfo<>(); } PageInfo<StateAssetDetailVO> stateAssetDetailVOPageInfo = new PageInfo<>(assetDetailVOList); // //组装名字 // List<String> houseIdList = assetDetailVOList.stream().map(StateAssetDetailVO::getHouseId).collect(Collectors.toList()); // LambdaQueryWrapper<StateHouseholdOwner> householdOwnerLambdaQueryWrapper = new LambdaQueryWrapper<>(); // householdOwnerLambdaQueryWrapper.in(StateHouseholdOwner::getStateHouseholdId, houseIdList); // // if (!StringUtils.isEmpty(assetDetailBO.getOwnerName())) { // householdOwnerLambdaQueryWrapper.like(StateHouseholdOwner::getOwnerName, assetDetailBO.getOwnerName()); // } // List<StateHouseholdOwner> stateHouseholdOwners = stateHouseholdOwnerService.list(householdOwnerLambdaQueryWrapper); // Map<String, List<StateHouseholdOwner>> ownerMap = stateHouseholdOwners.stream().collect(Collectors.groupingBy(StateHouseholdOwner::getStateHouseholdId)); // if (!StringUtils.isEmpty(assetDetailBO.getOwnerName())) { // assetDetailVOList = assetDetailVOList.stream().filter(data -> ownerMap.containsKey(data.getHouseId())).collect(Collectors.toList()); // } stateAssetDetailVOPageInfo.setList(assetDetailVOList); Map<String, List<StateAssetDetailVO>> listMap = stateAssetDetailVOPageInfo.getList().stream().collect(Collectors.groupingBy(StateAssetDetailVO::getHouseId)); @@ -105,12 +76,6 @@ for (String houseId : listMap.keySet()) { List<StateAssetDetailVO> stateAssetDetailVOList = listMap.get(houseId); StateAssetDetailVO assetDetailVO = stateAssetDetailVOList.get(0); // //组装名字 // if (ownerMap.containsKey(houseId)) { // String fullName = ownerMap.get(houseId).stream().map(StateHouseholdOwner::getOwnerName).collect(Collectors.joining("|")); // assetDetailVO.setOwnerName(fullName); // assetDetailVO.setPersonNum(ownerMap.get(houseId).size()); // } result.add(assetDetailVO); } @@ -152,23 +117,18 @@ Map<String, StateSettlement> stateSettlementMap = stateSettlementList.stream() .collect(Collectors.toMap(StateSettlement::getStateHouseholdId, Function.identity())); result.forEach(data -> { StateSettlement stateSettlement = stateSettlementMap.get(data.getHouseId()); if (Objects.isNull(stateSettlement)) { return; } Double dbSettleMoney = Objects.nonNull(stateSettlement.getSettlementMoney()) ? stateSettlement.getSettlementMoney() : 0; Double dbExchangeMoney = Objects.nonNull(stateSettlement.getExchangeMoney()) ? stateSettlement.getExchangeMoney() : 0; BigDecimal settleMoney = BigDecimal.valueOf(dbSettleMoney + dbExchangeMoney).setScale(4, RoundingMode.HALF_UP); data.setSettleMoney(settleMoney); Number agreementMoney = Objects.nonNull(data.getAgreementMoney()) ? data.getAgreementMoney() : 0; settleMoney = Objects.nonNull(data.getSettleMoney()) ? data.getSettleMoney() : BigDecimal.ZERO; data.setDiffMoney(BigDecimal.valueOf(agreementMoney.doubleValue()).subtract(settleMoney)); data.setPaidOffTime(Objects.nonNull(stateSettlement.getPaidTime()) ? stateSettlement.getPaidTime() : null); }); stateAssetDetailVOPageInfo.setList(result); @@ -178,9 +138,7 @@ @Override public JSONObject sumAsset(String projectId) { JSONObject jsonObject = new JSONObject(); StateProject stateProject = stateProjectService.getProjectById(projectId); LambdaQueryWrapper<StateAsset> stateAssetQueryWrapper = new LambdaQueryWrapper<>(); stateAssetQueryWrapper.eq(StateAsset::getStateProjectId, projectId); List<StateAsset> stateAssets = this.list(stateAssetQueryWrapper); @@ -191,13 +149,10 @@ .sum(); String roundedBudgetAmount = BigDecimal.valueOf(budgetAmount) .setScale(4, RoundingMode.HALF_UP).toPlainString(); jsonObject.put("budgetAmount", roundedBudgetAmount); //合同金额 LambdaQueryWrapper<StateHousehold> stateHouseholdLambdaQueryWrapper = new LambdaQueryWrapper<>(); stateHouseholdLambdaQueryWrapper.eq(StateHousehold::getStateProjectId, projectId); // stateHouseholdLambdaQueryWrapper.eq(StateHousehold::getAgreementStatus,SubmitStatusEnum.ACCEPT.getValue()); stateHouseholdLambdaQueryWrapper.eq(StateHousehold::getDelFlag, DeleteFlagEnum.NOT_DELETED.getKey()); stateHouseholdLambdaQueryWrapper.isNotNull(StateHousehold::getAgreementStatus); List<StateHousehold> stateHouseholds = stateHouseholdService.list(stateHouseholdLambdaQueryWrapper); @@ -221,12 +176,10 @@ } } stateAgreementLambdaQueryWrapper.isNotNull(StateAgreement::getAgreementNumber); stateAgreementLambdaQueryWrapper.in(StateAgreement::getStateHouseholdId, houseIds); List<StateAgreement> stateAgreements = agreementService.list(stateAgreementLambdaQueryWrapper); if (CollectionUtils.isNotEmpty(stateAgreements)) { Integer projectStatus = stateProject.getStatus(); if (Objects.equals(projectStatus, StateProjectStatusEnum.SIMULATE.getKey())) { stateAgreementLambdaQueryWrapper.eq(StateAgreement::getAgreementFileType, AgreementTypeEnum.VIRTUAL_STATE_AGREEMENT.getValue()); @@ -251,8 +204,6 @@ && data.getCompensationType().equals(CompensationCategoryEnum.PROPERTY_SWAP_2.getCode())).map(StateHousehold::getId).collect(Collectors.toList()); BigDecimal roundedAgreementMoney = BigDecimal.ZERO; if (ObjectUtil.isNotEmpty(componseTypeHouseIds)) { componseTypeAgreementLambdaQueryWrapper.isNotNull(StateAgreement::getAgreementNumber); componseTypeAgreementLambdaQueryWrapper.in(StateAgreement::getStateHouseholdId, componseTypeHouseIds); @@ -271,11 +222,8 @@ stateSettlementLambdaQueryWrapper.in(StateSettlement::getStateHouseholdId, houseIds); stateSettlementLambdaQueryWrapper.isNotNull(StateSettlement::getAuditStatus); List<StateSettlement> stateSettlementList = settlementService.list(stateSettlementLambdaQueryWrapper); jsonObject.put("settlementMoney", 0); if (CollectionUtils.isNotEmpty(stateSettlementList)) { Double settlementMoney = stateSettlementList.stream() .mapToDouble(stateSettlement -> { Double settlementMoneyValue = stateSettlement.getSettlementMoney(); @@ -295,12 +243,9 @@ // 四舍五入保留两位小数 String roundedSettlementMoney = BigDecimal.valueOf(settlementMoney) .setScale(4, RoundingMode.HALF_UP).toPlainString(); jsonObject.put("settlementMoney", roundedSettlementMoney); } jsonObject.put("status", stateProject.getStatus()); return jsonObject; } @@ -308,9 +253,7 @@ @Override public boolean saveAsset(StateAssetBO asset) { String deptId = SecurityUtils.getLoginUser().getUser().getDept().getDeptId(); Map<String, SysDept> stringSysDeptMap = deptService.selectMapDeptById(Collections.singletonList(deptId)); asset.setSubmittedBy(stringSysDeptMap.values().stream().map(SysDept::getDeptName).collect(Collectors.joining(","))); if (CollectionUtils.isNotEmpty(asset.getFileBOList())) { land-system/src/main/java/com/zzg/system/service/state/impl/StateDataCenterServiceImpl.java
@@ -52,18 +52,6 @@ @Lazy private final ISysDictTypeService dictTypeService; @Resource @Lazy private final StateAgreementService stateAgreementService; @Resource @Lazy private final StateApplyRecordItemService stateApplyRecordItemService; @Resource @Lazy private final StateApplyRecordService stateApplyRecordService; //计算最上面顶部统计数据 @Override @@ -273,18 +261,6 @@ // 遍历内层的 Map（按项目阶段分类） for (ProjectExecutionSumVO executionSum : projectExecutionMap.values()) { // // 累加签字人数 // totalSignedPersons += executionSum.getSignedPersons() != null ? executionSum.getSignedPersons() : 0L; // // // 累加未签字人数 // totalNotSignedPersons += executionSum.getNotSignedPersons() != null ? executionSum.getNotSignedPersons() : 0L; // // 累加货币补偿人数 // totalMoneyCompensationPersons += executionSum.getMoneyCompensationPersons() != null ? executionSum.getMoneyCompensationPersons() : 0L; // // // 累加房屋置换人数 // totalGoodsCompensationPersons += executionSum.getGoodsCompensationPersons() != null ? executionSum.getGoodsCompensationPersons() : 0L; // 累加项目预算金额 totalVirtualMoney.add(executionSum.getVirtualMoney() != null ? executionSum.getVirtualMoney() : new BigDecimal("0")); } @@ -427,9 +403,7 @@ double settlementMoney = 0; if (CollectionUtils.isNotEmpty(stateHouseholdList)) { List<String> stateHouseholdIds = stateHouseholdList.stream().map(StateHousehold::getId).collect(Collectors.toList()); //合同金额 LambdaQueryWrapper<StateAgreement> stateAgreementLambdaQueryWrapper = new LambdaQueryWrapper<>(); stateAgreementLambdaQueryWrapper.in(StateAgreement::getStateHouseholdId, stateHouseholdIds); @@ -441,7 +415,6 @@ if (CollectionUtils.isNotEmpty(stateAgreementList)) { agreementMoney = stateAgreementList.stream().mapToDouble(StateAgreement::getMoney).sum(); } //产全置换合同金额 double cqzhagreementMoney = 0; @@ -479,12 +452,10 @@ //结算金额=货币补偿+产权置换价值差 settlementMoney = settlementMoney + cqxhMoney; } } result.setAgreementMoney(BigDecimal.valueOf(agreementMoney).setScale(4, RoundingMode.HALF_UP)); result.setSettlementMoney(BigDecimal.valueOf(settlementMoney).setScale(4, RoundingMode.HALF_UP)); return result; } @@ -500,7 +471,6 @@ if (CollectionUtils.isEmpty(list)) { return new ArrayList<>(); } List<String> streetList = new ArrayList<>(); List<String> projectIdList = list.stream().map(StateProject::getId).collect(Collectors.toList()); @@ -747,8 +717,6 @@ } //设置置换前面积 现在有项目所有信息 需要通过项目获取关联的房产信息总和 private Map<String, Integer> appendProcessStatusMap(List<StateProject> stateProjectList) { Map<String, Integer> result = new HashMap<>(); if (CollectionUtils.isEmpty(stateProjectList)) { land-system/src/main/java/com/zzg/system/service/state/impl/StateHouseholdOwnerServiceImpl.java
@@ -928,27 +928,6 @@ } @Override public Map<String, String> appendOwnerName(List<String> houseIds) { Map<String, String> stringMap = new HashMap<>(); LambdaQueryWrapper<StateHouseholdOwner> stateHouseholdOwnerLambdaQueryWrapper = new LambdaQueryWrapper<>(); stateHouseholdOwnerLambdaQueryWrapper.in(StateHouseholdOwner::getStateHouseholdId, houseIds.stream() .distinct().collect(Collectors.toList())); List<StateHouseholdOwner> stateHouseholdOwners = this.list(stateHouseholdOwnerLambdaQueryWrapper); if (CollectionUtils.isEmpty(stateHouseholdOwners)) { return stringMap; } Map<String, List<StateHouseholdOwner>> listMap = stateHouseholdOwners.stream() .collect(Collectors.groupingBy(StateHouseholdOwner::getStateHouseholdId)); for (String houseId : houseIds) { String fullName = getFullName(listMap.get(houseId)); stringMap.put(houseId, fullName); } return stringMap; } @Override public List<StateProjectCompensateStandard> getCalculateCompensation(String projectId) { StateProjectCompensation compensation = stateProjectCompensationService.getById(projectId); if (Objects.isNull(compensation)) { land-system/src/main/java/com/zzg/system/service/state/impl/StateHouseholdServiceImpl.java
@@ -61,33 +61,6 @@ private final ISysDeptService deptService; @Override public HouseholdDetailVO queryPage(GetProjectPageBO getProjectPageBO) { List<HouseholdVO> householdVOS = this.getBaseMapper().pageByConditions(getProjectPageBO); //总面积 double totalArea = householdVOS.stream().mapToDouble(HouseholdVO::getHouseHoldArea).sum(); //总人数 long totalPersons = householdVOS.size(); List<HouseholdVO> agreeMoveOnes = householdVOS.stream().filter(hv -> Objects.nonNull(hv.getAgreeMove()) && (hv.getAgreeMove() == 1)).collect(Collectors.toList()); //同意迁移的总面积 double agreeMoveArea = agreeMoveOnes.stream().mapToDouble(HouseholdVO::getHouseHoldArea).sum(); long agreeMovePersons = agreeMoveOnes.size(); HouseholdDetailPageVO result = new HouseholdDetailPageVO(); result.setAllHouse(totalPersons); result.setAllArea(totalArea); result.setAgreeToMoveArea(agreeMoveArea); result.setAgreeToMovePersons(agreeMovePersons); result.setAgreeToMovePersonsRate((double) agreeMovePersons / totalPersons * 100); result.setAgreeToMoveAreaRate(agreeMoveArea / totalArea * 100); PageUtils.startPage(); List<HouseholdVO> householdVoPage = this.getBaseMapper().pageByConditions(getProjectPageBO); new PageInfo<>(householdVoPage); return null; } @Override public HouseholdDetailVO queryList(HouseholdBO householdBOBody) { // 1. 获取所有数据并计算总人数、总面积 List<HouseholdVO> householdVOS = this.getBaseMapper().listByConditions(householdBOBody); @@ -259,12 +232,6 @@ vo.setAppendData(JSON.toJSONString(stateHouseholdOwnerService.calculateCompensation(calculateCompensationBO))); } return vo; } //TODO二次评估 需要修改状态 @Override public Boolean resetStatusAfterSearch(String projectId) { return null; } @Override land-system/src/main/java/com/zzg/system/service/state/impl/StateProjectCollectionFileServiceImpl.java
@@ -52,13 +52,6 @@ } @Override public Object uploadCollectionFile(UploadFileBO uploadFileBO) { return null; } @Override public List<ParentCollectionFileVO> getParentCollectionFile(Boolean isBefore) { LambdaQueryWrapper<StateProjectCollectionFile> queryWrapper = new LambdaQueryWrapper<>();
@@ -29,11 +29,12 @@ import java.util.stream.Collectors; @Service public class StateProjectCompensateStandardServiceImpl extends ServiceImpl<StateProjectCompensateStandardMapper, StateProjectCompensateStandard> implements StateProjectCompensateStandardService { public class StateProjectCompensateStandardServiceImpl extends ServiceImpl<StateProjectCompensateStandardMapper, StateProjectCompensateStandard> implements StateProjectCompensateStandardService { @Lazy @Resource private StateProjectCompensationService stateProjectCompensationService; @Override public Map<String, List<StateProjectCompensateStandardVO>> getCompensateStandardMap(String standardName, Integer stopFlag, Integer compensateType) { LambdaQueryWrapper<StateProjectCompensateStandard> queryWrapper = new LambdaQueryWrapper<>(); @@ -60,7 +61,6 @@ vo.setSubTypeStr(CompensationSubTypeEnum.getDescription(e.getSubType())); voList.add(vo); } return voList.stream().collect(Collectors.groupingBy(StateProjectCompensateStandardVO::getStandardName)); } @@ -108,7 +108,6 @@ @Override public Boolean createCompensatesStandard(StateProjectCompensateStandard stateProjectCompensateStandard) { String standardName = stateProjectCompensateStandard.getStandardName(); LambdaQueryWrapper<StateProjectCompensateStandard> queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(StateProjectCompensateStandard::getStandardName, standardName); @@ -195,13 +194,11 @@ if (!toUpdateList.isEmpty()) { stateProjectCompensationService.updateBatchById(toUpdateList); } return update(updateWrapper); } private void handleSpecialCases(CompensateTypeEnum typeEnum, CompensationCategoryEnum categoryEnum, StateProjectCompensateStandard compensation, List<StateProjectCompensateStandard> standardList) { if (typeEnum.equals(CompensateTypeEnum.POLICY_ALLOWANCE) && categoryEnum.equals(CompensationCategoryEnum.HOUSE_PURCHASE_SUBSIDY)) { addCompensationWithSpecifications(compensation, standardList); land-system/src/main/java/com/zzg/system/service/state/impl/StateProjectNoticeServiceImpl.java
@@ -25,24 +25,7 @@ @Override public StateProjectNoticeVO getStateProjectNoticeVO(String noticeId) { StateProjectNotice byId = this.getById(noticeId); StateProjectNoticeVO stateProjectNoticeVO = StateProjectConvert.INSTANCE.entityToStateProjectNoticeVO(byId); // if (byId != null) { // String fileUrl = byId.getFileUrl(); // String imgUrl = byId.getImgUrl(); // // if (fileUrl != null && !fileUrl.isEmpty()) { // stateProjectNoticeVO.setFileUrlList(Arrays.asList(fileUrl.split(","))); // } else { // stateProjectNoticeVO.setFileUrlList(Collections.emptyList()); // 或根据需求设置其他默认值 // } // // if (imgUrl != null && !imgUrl.isEmpty()) { // stateProjectNoticeVO.setImgUrlList(Arrays.asList(imgUrl.split(","))); // } else { // stateProjectNoticeVO.setImgUrlList(Collections.emptyList()); // 或根据需求设置其他默认值 // } // } return stateProjectNoticeVO; return StateProjectConvert.INSTANCE.entityToStateProjectNoticeVO(byId); } @Override @@ -56,6 +39,5 @@ } return list.stream().collect(Collectors.groupingBy(StateProjectNotice::getProjectId)); } } land-system/src/main/java/com/zzg/system/service/state/impl/StateProjectServiceImpl.java
@@ -300,14 +300,6 @@ } @Override public StateProject getEnableProjectById(String id) { LambdaQueryWrapper<StateProject> queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(StateProject::getDelFlag, NOT_DELETED.getKey()); queryWrapper.eq(StateProject::getId, id); return getOne(queryWrapper); } @Override public PageInfo<ProjectImplPageVO> getProjectImplPage(GetProjectPageBO getProjectPageBO) { PageUtils.startPage(); @@ -316,26 +308,7 @@ if (CollectionUtils.isEmpty(projectList)) { return new PageInfo<>(); } //现在存储的department是项目名字这里直接注释掉 // // 获取所有的 department ID 列表 // List<String> deptIdList = projectList.stream() // .flatMap(project -> Arrays.stream(project.getDepartment().split(","))) // 根据逗号分隔 // .map(String::trim) // 去除空格 // .distinct() // 去重 // .collect(Collectors.toList()); // // // 获取对应的部门数据 // Map<String, SysDept> stringSysDeptMap = deptService.selectMapDeptById(deptIdList); // // // 更新 projectList 中的 department // projectList.forEach(project -> { // // 将 department 以逗号分隔并获取对应的部门名称 // String newDepartment = Arrays.stream(project.getDepartment().split(",")) // .map(deptId -> Optional.ofNullable(stringSysDeptMap.get(deptId.trim())).map(SysDept::getDeptName).orElse("")) // .filter(name -> !name.isEmpty()) // 过滤空的部门名称 // .collect(Collectors.joining(",")); // 以逗号连接 // project.setDepartment(newDepartment); // }); // 4. 构建结果对象 PageInfo<StateProject> stateProjectPageInfo = new PageInfo<>(projectList); List<String> projectIdList = stateProjectPageInfo.getList().stream().map(StateProject::getId).collect(Collectors.toList()); land-system/src/main/java/com/zzg/system/service/state/impl/StateSettlementImpl.java
@@ -50,18 +50,12 @@ public class StateSettlementImpl extends ServiceImpl<StateSettlementMapper, StateSettlement> implements StateSettlementService { private final StateSettlementMapper settlementMapper; private final StateProjectMapper stateProjectMapper; private final StateHouseholdMapper stateHouseholdMapper; private final StateAgreementMapper stateAgreementMapper; private final StateHouseholdOwnerService stateHouseholdOwnerService; private final StateAssetMapper stateAssetMapper; private final ISysDeptService deptService; private final StateProcessTemplateService processTemplateService; private final StateSettlementMapper stateSettlementMapper;
