From 39854ed874e1f38ce3f192ca8e0362a826cfdd55 Mon Sep 17 00:00:00 2001
From: yanghb <yangbhwork@163.com>
Date: 星期五, 25 四月 2025 14:35:47 +0800
Subject: [PATCH] fix: 修改字段
---
cz-bussiness/src/main/java/com/ruoyi/bussiness/service/impl/PlacementApplyServiceImpl.java | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/cz-bussiness/src/main/java/com/ruoyi/bussiness/service/impl/PlacementApplyServiceImpl.java b/cz-bussiness/src/main/java/com/ruoyi/bussiness/service/impl/PlacementApplyServiceImpl.java
index 107c329..0e90c4b 100644
--- a/cz-bussiness/src/main/java/com/ruoyi/bussiness/service/impl/PlacementApplyServiceImpl.java
+++ b/cz-bussiness/src/main/java/com/ruoyi/bussiness/service/impl/PlacementApplyServiceImpl.java
@@ -26,7 +26,6 @@
import com.ruoyi.system.service.ISysNoticeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
-import org.springframework.security.core.parameters.P;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -142,7 +141,7 @@
return;
}
for (PlacementApplyRecord record : records) {
- if(record.getChecks() == 1){
+ if (record.getChecks() == 1) {
//已核对直接跳过
continue;
}
@@ -151,7 +150,7 @@
if (count == 0) {
//安置表户主信息不存在
record.setIdCardExistsWarn(1);
- }else{
+ } else {
record.setIdCardExistsWarn(0);
}
//判断户主是否重名
@@ -194,22 +193,19 @@
BigDecimal waitFamilyArea = record.getWaitFamilyArea();
// Integer currentCollectiveNum = record.getCurrentCollectiveNum();
// Integer currentNoCollectiveNum = record.getCurrentNoCollectiveNum();
- boolean warn = compensateService.compensateSettleAreaCalculate(record.getOrgArea(),record.getNoOrgArea(), waitFamilyArea);
+ boolean warn = compensateService.compensateSettleAreaCalculate(record.getOrgArea(), record.getNoOrgArea(), waitFamilyArea);
if (warn) {
record.setWaitFamilyAreaWarn(0);
- }else{
+ } else {
record.setWaitFamilyAreaWarn(1);
}
//赔偿金额（判断新购房还是二手房，这两个只能存在一个）
- if (record.getCompensationNewAmount().compareTo(BigDecimal.ZERO) == 0 &&
- record.getCompensationOldAmount().compareTo(BigDecimal.ZERO) == 0) {
+ if (ObjUtil.isEmpty(record.getCompensationNewAmount()) &&
+ ObjUtil.isEmpty(record.getCompensationOldAmount())) {
record.setCompensationAmountWarn(1);
- }else{
- record.setCompensationAmountWarn(0);
- }
- if (record.getCompensationNewAmount().compareTo(BigDecimal.ZERO) > 0 &&
- record.getCompensationOldAmount().compareTo(BigDecimal.ZERO) > 0) {
+ } else if (ObjUtil.isNotEmpty(record.getCompensationNewAmount()) &&
+ ObjUtil.isNotEmpty(record.getCompensationOldAmount())) {
record.setCompensationAmountWarn(1);
}else{
record.setCompensationAmountWarn(0);
@@ -227,7 +223,7 @@
//过渡补贴
if (compensateService.compensateSubsidyCalculate(record.getCurrentCount(), record.getSubsidyAmount())) {
record.setSubsidyAmountWarn(0);
- }else{
+ } else {
record.setSubsidyAmountWarn(1);
}
}
@@ -237,14 +233,14 @@
BigDecimal quarterPayAmount = (record.getCompensationSum().subtract(pay)).divide(new BigDecimal("20"), 10, RoundingMode.DOWN);
if (quarterPayAmount.compareTo(record.getQuarterPayAmount()) != 0) {
record.setQuarterPayAmountWarn(1);
- }else{
+ } else {
record.setQuarterPayAmountWarn(0);
}
//首付款警告
boolean downPaymentAmountWarn = true;
BigDecimal cateAmount = record.getCompensationSum().multiply(new BigDecimal("0.25"));
- if(cateAmount.compareTo(record.getDownPaymentAmount()) == 0){
+ if (cateAmount.compareTo(record.getDownPaymentAmount()) == 0) {
downPaymentAmountWarn = false;
}
record.setDownPaymentAmountWarn(downPaymentAmountWarn ? 1 : 0);
--
Gitblit v1.7.1