From 5daff3511eb027b6ad22c70c4de080cadc6def47 Mon Sep 17 00:00:00 2001
From: yanghb <yangbhwork@163.com>
Date: 星期三, 18 十二月 2024 16:52:42 +0800
Subject: [PATCH] feat: 格式化
---
land-system/src/main/java/com/zzg/system/service/state/impl/StateDataCenterServiceImpl.java | 32 --------------------------------
1 files changed, 0 insertions(+), 32 deletions(-)
diff --git a/land-system/src/main/java/com/zzg/system/service/state/impl/StateDataCenterServiceImpl.java b/land-system/src/main/java/com/zzg/system/service/state/impl/StateDataCenterServiceImpl.java
index 6b010b6..464adfb 100644
--- a/land-system/src/main/java/com/zzg/system/service/state/impl/StateDataCenterServiceImpl.java
+++ b/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)) {
--
Gitblit v1.7.1