From 7e8f46a6ec0bc1941cda32a60d1cd6465d19dd22 Mon Sep 17 00:00:00 2001
From: xiaoCJ <406612557@qq.com>
Date: Mon, 2 Sep 2024 16:19:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90=E6=B6=88?=
=?UTF-8?q?=E8=B4=B9=E8=A7=84=E5=88=92=E8=A1=A8=EF=BC=8C=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E5=AE=9E=E9=AA=8C=E5=AE=9E=E8=AE=AD=E6=8F=90=E4=BA=A4=E5=92=8C?=
=?UTF-8?q?=E8=A7=84=E5=88=92=E6=8A=A5=E5=91=8A=E6=8F=90=E4=BA=A4=E7=AE=97?=
=?UTF-8?q?=E5=88=86=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/CaseController.java | 1 -
.../entity/CaseConsumptionPlan.java | 153 +--
.../entity/CaseConsumptionPlanExample.java | 796 ++++++++-------
.../entity/CaseInsurancePlan.java | 66 +-
.../mapper/CaseConsumptionPlanMapper.java | 1 -
.../service/impl/CaseServiceImpl.java | 906 +++++++-----------
.../impl/SynthesisPlanServiceImpl.java | 68 +-
.../mapper/CaseConsumptionPlanMapper.xml | 297 +++---
8 files changed, 1081 insertions(+), 1207 deletions(-)
diff --git a/src/main/java/com/sztzjy/money_management/controller/CaseController.java b/src/main/java/com/sztzjy/money_management/controller/CaseController.java
index 55f4880..3d47600 100644
--- a/src/main/java/com/sztzjy/money_management/controller/CaseController.java
+++ b/src/main/java/com/sztzjy/money_management/controller/CaseController.java
@@ -105,7 +105,6 @@ public class CaseController {
caseService.commitTraining(json, type, trainingId);
}
-
// @PostMapping("/updateExamPoint")
// @ApiOperation("修改考核点内容")
// @AnonymousAccess
diff --git a/src/main/java/com/sztzjy/money_management/entity/CaseConsumptionPlan.java b/src/main/java/com/sztzjy/money_management/entity/CaseConsumptionPlan.java
index e0ea1c7..8f16365 100644
--- a/src/main/java/com/sztzjy/money_management/entity/CaseConsumptionPlan.java
+++ b/src/main/java/com/sztzjy/money_management/entity/CaseConsumptionPlan.java
@@ -16,12 +16,24 @@ public class CaseConsumptionPlan {
@ApiModelProperty("案例题id")
private String caseId;
+ @ApiModelProperty("每月可支配资金")
+ private BigDecimal monthlyInvestment;
+
+ @ApiModelProperty("可用资产")
+ private BigDecimal availableAssets;
+
+ @ApiModelProperty("距离购房年限")
+ private Integer shopHouseYear;
+
@ApiModelProperty("面积")
private BigDecimal houseArea;
- @ApiModelProperty("单价")
+ @ApiModelProperty("预计单价")
private BigDecimal housePrice;
+ @ApiModelProperty("房屋总金额")
+ private BigDecimal houseAllMoney;
+
@ApiModelProperty("首付比例")
private BigDecimal houseDownPaymentPercent;
@@ -37,9 +49,15 @@ public class CaseConsumptionPlan {
@ApiModelProperty("购房总花费")
private BigDecimal houseTotalAmount;
+ @ApiModelProperty("可支配收入")
+ private BigDecimal disposableInput;
+
@ApiModelProperty("购房月供")
private BigDecimal houseMonthlyAmount;
+ @ApiModelProperty("距离购车年限")
+ private Integer shopCarYear;
+
@ApiModelProperty("车款型号")
private String carType;
@@ -49,7 +67,7 @@ public class CaseConsumptionPlan {
@ApiModelProperty("首付比例")
private BigDecimal carDownPaymentPercent;
- @ApiModelProperty("贷款期限")
+ @ApiModelProperty("贷款年限")
private Integer carLoanYear;
@ApiModelProperty("贷款利率")
@@ -82,33 +100,18 @@ public class CaseConsumptionPlan {
@ApiModelProperty("购车月供")
private BigDecimal carMonthlyAmount;
- @ApiModelProperty("初始金额")
- private BigDecimal firstAmount;
-
- @ApiModelProperty("投资回报率")
+ @ApiModelProperty("预计投资收益率")
private BigDecimal returnOnInvestment;
- @ApiModelProperty("可支配收入")
- private BigDecimal disposableInput;
+ @ApiModelProperty("一次性投入金额")
+ private BigDecimal lumpSum;
- @ApiModelProperty("月度投资")
- private BigDecimal monthlyInvestment;
+ @ApiModelProperty("每月定期投资金额")
+ private BigDecimal monthRegularInvestAmount;
- @ApiModelProperty("定期年")
+ @ApiModelProperty("定期定额投资年限")
private Integer regularYear;
- @ApiModelProperty("目标金额")
- private BigDecimal targetAmount;
-
- @ApiModelProperty("购房年")
- private Integer shopHouseYear;
-
- @ApiModelProperty("房屋总花费")
- private BigDecimal houseAllMoney;
-
- @ApiModelProperty("购车年")
- private Integer shopCarYear;
-
@ApiModelProperty("消费规划分析老师评分")
private BigDecimal analysisTeacherScore;
@@ -140,6 +143,30 @@ public class CaseConsumptionPlan {
this.caseId = caseId == null ? null : caseId.trim();
}
+ public BigDecimal getMonthlyInvestment() {
+ return monthlyInvestment;
+ }
+
+ public void setMonthlyInvestment(BigDecimal monthlyInvestment) {
+ this.monthlyInvestment = monthlyInvestment;
+ }
+
+ public BigDecimal getAvailableAssets() {
+ return availableAssets;
+ }
+
+ public void setAvailableAssets(BigDecimal availableAssets) {
+ this.availableAssets = availableAssets;
+ }
+
+ public Integer getShopHouseYear() {
+ return shopHouseYear;
+ }
+
+ public void setShopHouseYear(Integer shopHouseYear) {
+ this.shopHouseYear = shopHouseYear;
+ }
+
public BigDecimal getHouseArea() {
return houseArea;
}
@@ -156,6 +183,14 @@ public class CaseConsumptionPlan {
this.housePrice = housePrice;
}
+ public BigDecimal getHouseAllMoney() {
+ return houseAllMoney;
+ }
+
+ public void setHouseAllMoney(BigDecimal houseAllMoney) {
+ this.houseAllMoney = houseAllMoney;
+ }
+
public BigDecimal getHouseDownPaymentPercent() {
return houseDownPaymentPercent;
}
@@ -196,6 +231,14 @@ public class CaseConsumptionPlan {
this.houseTotalAmount = houseTotalAmount;
}
+ public BigDecimal getDisposableInput() {
+ return disposableInput;
+ }
+
+ public void setDisposableInput(BigDecimal disposableInput) {
+ this.disposableInput = disposableInput;
+ }
+
public BigDecimal getHouseMonthlyAmount() {
return houseMonthlyAmount;
}
@@ -204,6 +247,14 @@ public class CaseConsumptionPlan {
this.houseMonthlyAmount = houseMonthlyAmount;
}
+ public Integer getShopCarYear() {
+ return shopCarYear;
+ }
+
+ public void setShopCarYear(Integer shopCarYear) {
+ this.shopCarYear = shopCarYear;
+ }
+
public String getCarType() {
return carType;
}
@@ -316,14 +367,6 @@ public class CaseConsumptionPlan {
this.carMonthlyAmount = carMonthlyAmount;
}
- public BigDecimal getFirstAmount() {
- return firstAmount;
- }
-
- public void setFirstAmount(BigDecimal firstAmount) {
- this.firstAmount = firstAmount;
- }
-
public BigDecimal getReturnOnInvestment() {
return returnOnInvestment;
}
@@ -332,20 +375,20 @@ public class CaseConsumptionPlan {
this.returnOnInvestment = returnOnInvestment;
}
- public BigDecimal getDisposableInput() {
- return disposableInput;
+ public BigDecimal getLumpSum() {
+ return lumpSum;
}
- public void setDisposableInput(BigDecimal disposableInput) {
- this.disposableInput = disposableInput;
+ public void setLumpSum(BigDecimal lumpSum) {
+ this.lumpSum = lumpSum;
}
- public BigDecimal getMonthlyInvestment() {
- return monthlyInvestment;
+ public BigDecimal getMonthRegularInvestAmount() {
+ return monthRegularInvestAmount;
}
- public void setMonthlyInvestment(BigDecimal monthlyInvestment) {
- this.monthlyInvestment = monthlyInvestment;
+ public void setMonthRegularInvestAmount(BigDecimal monthRegularInvestAmount) {
+ this.monthRegularInvestAmount = monthRegularInvestAmount;
}
public Integer getRegularYear() {
@@ -356,38 +399,6 @@ public class CaseConsumptionPlan {
this.regularYear = regularYear;
}
- public BigDecimal getTargetAmount() {
- return targetAmount;
- }
-
- public void setTargetAmount(BigDecimal targetAmount) {
- this.targetAmount = targetAmount;
- }
-
- public Integer getShopHouseYear() {
- return shopHouseYear;
- }
-
- public void setShopHouseYear(Integer shopHouseYear) {
- this.shopHouseYear = shopHouseYear;
- }
-
- public BigDecimal getHouseAllMoney() {
- return houseAllMoney;
- }
-
- public void setHouseAllMoney(BigDecimal houseAllMoney) {
- this.houseAllMoney = houseAllMoney;
- }
-
- public Integer getShopCarYear() {
- return shopCarYear;
- }
-
- public void setShopCarYear(Integer shopCarYear) {
- this.shopCarYear = shopCarYear;
- }
-
public BigDecimal getAnalysisTeacherScore() {
return analysisTeacherScore;
}
diff --git a/src/main/java/com/sztzjy/money_management/entity/CaseConsumptionPlanExample.java b/src/main/java/com/sztzjy/money_management/entity/CaseConsumptionPlanExample.java
index dd728af..040613d 100644
--- a/src/main/java/com/sztzjy/money_management/entity/CaseConsumptionPlanExample.java
+++ b/src/main/java/com/sztzjy/money_management/entity/CaseConsumptionPlanExample.java
@@ -245,6 +245,186 @@ public class CaseConsumptionPlanExample {
return (Criteria) this;
}
+ public Criteria andMonthlyInvestmentIsNull() {
+ addCriterion("monthly_investment is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMonthlyInvestmentIsNotNull() {
+ addCriterion("monthly_investment is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andMonthlyInvestmentEqualTo(BigDecimal value) {
+ addCriterion("monthly_investment =", value, "monthlyInvestment");
+ return (Criteria) this;
+ }
+
+ public Criteria andMonthlyInvestmentNotEqualTo(BigDecimal value) {
+ addCriterion("monthly_investment <>", value, "monthlyInvestment");
+ return (Criteria) this;
+ }
+
+ public Criteria andMonthlyInvestmentGreaterThan(BigDecimal value) {
+ addCriterion("monthly_investment >", value, "monthlyInvestment");
+ return (Criteria) this;
+ }
+
+ public Criteria andMonthlyInvestmentGreaterThanOrEqualTo(BigDecimal value) {
+ addCriterion("monthly_investment >=", value, "monthlyInvestment");
+ return (Criteria) this;
+ }
+
+ public Criteria andMonthlyInvestmentLessThan(BigDecimal value) {
+ addCriterion("monthly_investment <", value, "monthlyInvestment");
+ return (Criteria) this;
+ }
+
+ public Criteria andMonthlyInvestmentLessThanOrEqualTo(BigDecimal value) {
+ addCriterion("monthly_investment <=", value, "monthlyInvestment");
+ return (Criteria) this;
+ }
+
+ public Criteria andMonthlyInvestmentIn(List<BigDecimal> values) {
+ addCriterion("monthly_investment in", values, "monthlyInvestment");
+ return (Criteria) this;
+ }
+
+ public Criteria andMonthlyInvestmentNotIn(List<BigDecimal> values) {
+ addCriterion("monthly_investment not in", values, "monthlyInvestment");
+ return (Criteria) this;
+ }
+
+ public Criteria andMonthlyInvestmentBetween(BigDecimal value1, BigDecimal value2) {
+ addCriterion("monthly_investment between", value1, value2, "monthlyInvestment");
+ return (Criteria) this;
+ }
+
+ public Criteria andMonthlyInvestmentNotBetween(BigDecimal value1, BigDecimal value2) {
+ addCriterion("monthly_investment not between", value1, value2, "monthlyInvestment");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvailableAssetsIsNull() {
+ addCriterion("\"available assets\" is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvailableAssetsIsNotNull() {
+ addCriterion("\"available assets\" is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvailableAssetsEqualTo(BigDecimal value) {
+ addCriterion("\"available assets\" =", value, "availableAssets");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvailableAssetsNotEqualTo(BigDecimal value) {
+ addCriterion("\"available assets\" <>", value, "availableAssets");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvailableAssetsGreaterThan(BigDecimal value) {
+ addCriterion("\"available assets\" >", value, "availableAssets");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvailableAssetsGreaterThanOrEqualTo(BigDecimal value) {
+ addCriterion("\"available assets\" >=", value, "availableAssets");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvailableAssetsLessThan(BigDecimal value) {
+ addCriterion("\"available assets\" <", value, "availableAssets");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvailableAssetsLessThanOrEqualTo(BigDecimal value) {
+ addCriterion("\"available assets\" <=", value, "availableAssets");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvailableAssetsIn(List<BigDecimal> values) {
+ addCriterion("\"available assets\" in", values, "availableAssets");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvailableAssetsNotIn(List<BigDecimal> values) {
+ addCriterion("\"available assets\" not in", values, "availableAssets");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvailableAssetsBetween(BigDecimal value1, BigDecimal value2) {
+ addCriterion("\"available assets\" between", value1, value2, "availableAssets");
+ return (Criteria) this;
+ }
+
+ public Criteria andAvailableAssetsNotBetween(BigDecimal value1, BigDecimal value2) {
+ addCriterion("\"available assets\" not between", value1, value2, "availableAssets");
+ return (Criteria) this;
+ }
+
+ public Criteria andShopHouseYearIsNull() {
+ addCriterion("shop_house_year is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andShopHouseYearIsNotNull() {
+ addCriterion("shop_house_year is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andShopHouseYearEqualTo(Integer value) {
+ addCriterion("shop_house_year =", value, "shopHouseYear");
+ return (Criteria) this;
+ }
+
+ public Criteria andShopHouseYearNotEqualTo(Integer value) {
+ addCriterion("shop_house_year <>", value, "shopHouseYear");
+ return (Criteria) this;
+ }
+
+ public Criteria andShopHouseYearGreaterThan(Integer value) {
+ addCriterion("shop_house_year >", value, "shopHouseYear");
+ return (Criteria) this;
+ }
+
+ public Criteria andShopHouseYearGreaterThanOrEqualTo(Integer value) {
+ addCriterion("shop_house_year >=", value, "shopHouseYear");
+ return (Criteria) this;
+ }
+
+ public Criteria andShopHouseYearLessThan(Integer value) {
+ addCriterion("shop_house_year <", value, "shopHouseYear");
+ return (Criteria) this;
+ }
+
+ public Criteria andShopHouseYearLessThanOrEqualTo(Integer value) {
+ addCriterion("shop_house_year <=", value, "shopHouseYear");
+ return (Criteria) this;
+ }
+
+ public Criteria andShopHouseYearIn(List<Integer> values) {
+ addCriterion("shop_house_year in", values, "shopHouseYear");
+ return (Criteria) this;
+ }
+
+ public Criteria andShopHouseYearNotIn(List<Integer> values) {
+ addCriterion("shop_house_year not in", values, "shopHouseYear");
+ return (Criteria) this;
+ }
+
+ public Criteria andShopHouseYearBetween(Integer value1, Integer value2) {
+ addCriterion("shop_house_year between", value1, value2, "shopHouseYear");
+ return (Criteria) this;
+ }
+
+ public Criteria andShopHouseYearNotBetween(Integer value1, Integer value2) {
+ addCriterion("shop_house_year not between", value1, value2, "shopHouseYear");
+ return (Criteria) this;
+ }
+
public Criteria andHouseAreaIsNull() {
addCriterion("house_area is null");
return (Criteria) this;
@@ -365,6 +545,66 @@ public class CaseConsumptionPlanExample {
return (Criteria) this;
}
+ public Criteria andHouseAllMoneyIsNull() {
+ addCriterion("house_all_money is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andHouseAllMoneyIsNotNull() {
+ addCriterion("house_all_money is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andHouseAllMoneyEqualTo(BigDecimal value) {
+ addCriterion("house_all_money =", value, "houseAllMoney");
+ return (Criteria) this;
+ }
+
+ public Criteria andHouseAllMoneyNotEqualTo(BigDecimal value) {
+ addCriterion("house_all_money <>", value, "houseAllMoney");
+ return (Criteria) this;
+ }
+
+ public Criteria andHouseAllMoneyGreaterThan(BigDecimal value) {
+ addCriterion("house_all_money >", value, "houseAllMoney");
+ return (Criteria) this;
+ }
+
+ public Criteria andHouseAllMoneyGreaterThanOrEqualTo(BigDecimal value) {
+ addCriterion("house_all_money >=", value, "houseAllMoney");
+ return (Criteria) this;
+ }
+
+ public Criteria andHouseAllMoneyLessThan(BigDecimal value) {
+ addCriterion("house_all_money <", value, "houseAllMoney");
+ return (Criteria) this;
+ }
+
+ public Criteria andHouseAllMoneyLessThanOrEqualTo(BigDecimal value) {
+ addCriterion("house_all_money <=", value, "houseAllMoney");
+ return (Criteria) this;
+ }
+
+ public Criteria andHouseAllMoneyIn(List<BigDecimal> values) {
+ addCriterion("house_all_money in", values, "houseAllMoney");
+ return (Criteria) this;
+ }
+
+ public Criteria andHouseAllMoneyNotIn(List<BigDecimal> values) {
+ addCriterion("house_all_money not in", values, "houseAllMoney");
+ return (Criteria) this;
+ }
+
+ public Criteria andHouseAllMoneyBetween(BigDecimal value1, BigDecimal value2) {
+ addCriterion("house_all_money between", value1, value2, "houseAllMoney");
+ return (Criteria) this;
+ }
+
+ public Criteria andHouseAllMoneyNotBetween(BigDecimal value1, BigDecimal value2) {
+ addCriterion("house_all_money not between", value1, value2, "houseAllMoney");
+ return (Criteria) this;
+ }
+
public Criteria andHouseDownPaymentPercentIsNull() {
addCriterion("house_down_payment_percent is null");
return (Criteria) this;
@@ -665,53 +905,113 @@ public class CaseConsumptionPlanExample {
return (Criteria) this;
}
- public Criteria andHouseMonthlyAmountIsNull() {
- addCriterion("house_monthly_amount is null");
+ public Criteria andDisposableInputIsNull() {
+ addCriterion("disposable_input is null");
return (Criteria) this;
}
- public Criteria andHouseMonthlyAmountIsNotNull() {
- addCriterion("house_monthly_amount is not null");
+ public Criteria andDisposableInputIsNotNull() {
+ addCriterion("disposable_input is not null");
return (Criteria) this;
}
- public Criteria andHouseMonthlyAmountEqualTo(BigDecimal value) {
- addCriterion("house_monthly_amount =", value, "houseMonthlyAmount");
+ public Criteria andDisposableInputEqualTo(BigDecimal value) {
+ addCriterion("disposable_input =", value, "disposableInput");
return (Criteria) this;
}
- public Criteria andHouseMonthlyAmountNotEqualTo(BigDecimal value) {
- addCriterion("house_monthly_amount <>", value, "houseMonthlyAmount");
+ public Criteria andDisposableInputNotEqualTo(BigDecimal value) {
+ addCriterion("disposable_input <>", value, "disposableInput");
return (Criteria) this;
}
- public Criteria andHouseMonthlyAmountGreaterThan(BigDecimal value) {
- addCriterion("house_monthly_amount >", value, "houseMonthlyAmount");
+ public Criteria andDisposableInputGreaterThan(BigDecimal value) {
+ addCriterion("disposable_input >", value, "disposableInput");
return (Criteria) this;
}
- public Criteria andHouseMonthlyAmountGreaterThanOrEqualTo(BigDecimal value) {
- addCriterion("house_monthly_amount >=", value, "houseMonthlyAmount");
+ public Criteria andDisposableInputGreaterThanOrEqualTo(BigDecimal value) {
+ addCriterion("disposable_input >=", value, "disposableInput");
return (Criteria) this;
}
- public Criteria andHouseMonthlyAmountLessThan(BigDecimal value) {
- addCriterion("house_monthly_amount <", value, "houseMonthlyAmount");
+ public Criteria andDisposableInputLessThan(BigDecimal value) {
+ addCriterion("disposable_input <", value, "disposableInput");
return (Criteria) this;
}
- public Criteria andHouseMonthlyAmountLessThanOrEqualTo(BigDecimal value) {
- addCriterion("house_monthly_amount <=", value, "houseMonthlyAmount");
+ public Criteria andDisposableInputLessThanOrEqualTo(BigDecimal value) {
+ addCriterion("disposable_input <=", value, "disposableInput");
return (Criteria) this;
}
- public Criteria andHouseMonthlyAmountIn(List<BigDecimal> values) {
- addCriterion("house_monthly_amount in", values, "houseMonthlyAmount");
+ public Criteria andDisposableInputIn(List<BigDecimal> values) {
+ addCriterion("disposable_input in", values, "disposableInput");
return (Criteria) this;
}
- public Criteria andHouseMonthlyAmountNotIn(List<BigDecimal> values) {
- addCriterion("house_monthly_amount not in", values, "houseMonthlyAmount");
+ public Criteria andDisposableInputNotIn(List<BigDecimal> values) {
+ addCriterion("disposable_input not in", values, "disposableInput");
+ return (Criteria) this;
+ }
+
+ public Criteria andDisposableInputBetween(BigDecimal value1, BigDecimal value2) {
+ addCriterion("disposable_input between", value1, value2, "disposableInput");
+ return (Criteria) this;
+ }
+
+ public Criteria andDisposableInputNotBetween(BigDecimal value1, BigDecimal value2) {
+ addCriterion("disposable_input not between", value1, value2, "disposableInput");
+ return (Criteria) this;
+ }
+
+ public Criteria andHouseMonthlyAmountIsNull() {
+ addCriterion("house_monthly_amount is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andHouseMonthlyAmountIsNotNull() {
+ addCriterion("house_monthly_amount is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andHouseMonthlyAmountEqualTo(BigDecimal value) {
+ addCriterion("house_monthly_amount =", value, "houseMonthlyAmount");
+ return (Criteria) this;
+ }
+
+ public Criteria andHouseMonthlyAmountNotEqualTo(BigDecimal value) {
+ addCriterion("house_monthly_amount <>", value, "houseMonthlyAmount");
+ return (Criteria) this;
+ }
+
+ public Criteria andHouseMonthlyAmountGreaterThan(BigDecimal value) {
+ addCriterion("house_monthly_amount >", value, "houseMonthlyAmount");
+ return (Criteria) this;
+ }
+
+ public Criteria andHouseMonthlyAmountGreaterThanOrEqualTo(BigDecimal value) {
+ addCriterion("house_monthly_amount >=", value, "houseMonthlyAmount");
+ return (Criteria) this;
+ }
+
+ public Criteria andHouseMonthlyAmountLessThan(BigDecimal value) {
+ addCriterion("house_monthly_amount <", value, "houseMonthlyAmount");
+ return (Criteria) this;
+ }
+
+ public Criteria andHouseMonthlyAmountLessThanOrEqualTo(BigDecimal value) {
+ addCriterion("house_monthly_amount <=", value, "houseMonthlyAmount");
+ return (Criteria) this;
+ }
+
+ public Criteria andHouseMonthlyAmountIn(List<BigDecimal> values) {
+ addCriterion("house_monthly_amount in", values, "houseMonthlyAmount");
+ return (Criteria) this;
+ }
+
+ public Criteria andHouseMonthlyAmountNotIn(List<BigDecimal> values) {
+ addCriterion("house_monthly_amount not in", values, "houseMonthlyAmount");
return (Criteria) this;
}
@@ -725,6 +1025,66 @@ public class CaseConsumptionPlanExample {
return (Criteria) this;
}
+ public Criteria andShopCarYearIsNull() {
+ addCriterion("shop_car_year is null");
+ return (Criteria) this;
+ }
+
+ public Criteria andShopCarYearIsNotNull() {
+ addCriterion("shop_car_year is not null");
+ return (Criteria) this;
+ }
+
+ public Criteria andShopCarYearEqualTo(Integer value) {
+ addCriterion("shop_car_year =", value, "shopCarYear");
+ return (Criteria) this;
+ }
+
+ public Criteria andShopCarYearNotEqualTo(Integer value) {
+ addCriterion("shop_car_year <>", value, "shopCarYear");
+ return (Criteria) this;
+ }
+
+ public Criteria andShopCarYearGreaterThan(Integer value) {
+ addCriterion("shop_car_year >", value, "shopCarYear");
+ return (Criteria) this;
+ }
+
+ public Criteria andShopCarYearGreaterThanOrEqualTo(Integer value) {
+ addCriterion("shop_car_year >=", value, "shopCarYear");
+ return (Criteria) this;
+ }
+
+ public Criteria andShopCarYearLessThan(Integer value) {
+ addCriterion("shop_car_year <", value, "shopCarYear");
+ return (Criteria) this;
+ }
+
+ public Criteria andShopCarYearLessThanOrEqualTo(Integer value) {
+ addCriterion("shop_car_year <=", value, "shopCarYear");
+ return (Criteria) this;
+ }
+
+ public Criteria andShopCarYearIn(List<Integer> values) {
+ addCriterion("shop_car_year in", values, "shopCarYear");
+ return (Criteria) this;
+ }
+
+ public Criteria andShopCarYearNotIn(List<Integer> values) {
+ addCriterion("shop_car_year not in", values, "shopCarYear");
+ return (Criteria) this;
+ }
+
+ public Criteria andShopCarYearBetween(Integer value1, Integer value2) {
+ addCriterion("shop_car_year between", value1, value2, "shopCarYear");
+ return (Criteria) this;
+ }
+
+ public Criteria andShopCarYearNotBetween(Integer value1, Integer value2) {
+ addCriterion("shop_car_year not between", value1, value2, "shopCarYear");
+ return (Criteria) this;
+ }
+
public Criteria andCarTypeIsNull() {
addCriterion("car_type is null");
return (Criteria) this;
@@ -1575,66 +1935,6 @@ public class CaseConsumptionPlanExample {
return (Criteria) this;
}
- public Criteria andFirstAmountIsNull() {
- addCriterion("first_amount is null");
- return (Criteria) this;
- }
-
- public Criteria andFirstAmountIsNotNull() {
- addCriterion("first_amount is not null");
- return (Criteria) this;
- }
-
- public Criteria andFirstAmountEqualTo(BigDecimal value) {
- addCriterion("first_amount =", value, "firstAmount");
- return (Criteria) this;
- }
-
- public Criteria andFirstAmountNotEqualTo(BigDecimal value) {
- addCriterion("first_amount <>", value, "firstAmount");
- return (Criteria) this;
- }
-
- public Criteria andFirstAmountGreaterThan(BigDecimal value) {
- addCriterion("first_amount >", value, "firstAmount");
- return (Criteria) this;
- }
-
- public Criteria andFirstAmountGreaterThanOrEqualTo(BigDecimal value) {
- addCriterion("first_amount >=", value, "firstAmount");
- return (Criteria) this;
- }
-
- public Criteria andFirstAmountLessThan(BigDecimal value) {
- addCriterion("first_amount <", value, "firstAmount");
- return (Criteria) this;
- }
-
- public Criteria andFirstAmountLessThanOrEqualTo(BigDecimal value) {
- addCriterion("first_amount <=", value, "firstAmount");
- return (Criteria) this;
- }
-
- public Criteria andFirstAmountIn(List<BigDecimal> values) {
- addCriterion("first_amount in", values, "firstAmount");
- return (Criteria) this;
- }
-
- public Criteria andFirstAmountNotIn(List<BigDecimal> values) {
- addCriterion("first_amount not in", values, "firstAmount");
- return (Criteria) this;
- }
-
- public Criteria andFirstAmountBetween(BigDecimal value1, BigDecimal value2) {
- addCriterion("first_amount between", value1, value2, "firstAmount");
- return (Criteria) this;
- }
-
- public Criteria andFirstAmountNotBetween(BigDecimal value1, BigDecimal value2) {
- addCriterion("first_amount not between", value1, value2, "firstAmount");
- return (Criteria) this;
- }
-
public Criteria andReturnOnInvestmentIsNull() {
addCriterion("return_on_investment is null");
return (Criteria) this;
@@ -1695,123 +1995,123 @@ public class CaseConsumptionPlanExample {
return (Criteria) this;
}
- public Criteria andDisposableInputIsNull() {
- addCriterion("disposable_input is null");
+ public Criteria andLumpSumIsNull() {
+ addCriterion("lump_sum is null");
return (Criteria) this;
}
- public Criteria andDisposableInputIsNotNull() {
- addCriterion("disposable_input is not null");
+ public Criteria andLumpSumIsNotNull() {
+ addCriterion("lump_sum is not null");
return (Criteria) this;
}
- public Criteria andDisposableInputEqualTo(BigDecimal value) {
- addCriterion("disposable_input =", value, "disposableInput");
+ public Criteria andLumpSumEqualTo(BigDecimal value) {
+ addCriterion("lump_sum =", value, "lumpSum");
return (Criteria) this;
}
- public Criteria andDisposableInputNotEqualTo(BigDecimal value) {
- addCriterion("disposable_input <>", value, "disposableInput");
+ public Criteria andLumpSumNotEqualTo(BigDecimal value) {
+ addCriterion("lump_sum <>", value, "lumpSum");
return (Criteria) this;
}
- public Criteria andDisposableInputGreaterThan(BigDecimal value) {
- addCriterion("disposable_input >", value, "disposableInput");
+ public Criteria andLumpSumGreaterThan(BigDecimal value) {
+ addCriterion("lump_sum >", value, "lumpSum");
return (Criteria) this;
}
- public Criteria andDisposableInputGreaterThanOrEqualTo(BigDecimal value) {
- addCriterion("disposable_input >=", value, "disposableInput");
+ public Criteria andLumpSumGreaterThanOrEqualTo(BigDecimal value) {
+ addCriterion("lump_sum >=", value, "lumpSum");
return (Criteria) this;
}
- public Criteria andDisposableInputLessThan(BigDecimal value) {
- addCriterion("disposable_input <", value, "disposableInput");
+ public Criteria andLumpSumLessThan(BigDecimal value) {
+ addCriterion("lump_sum <", value, "lumpSum");
return (Criteria) this;
}
- public Criteria andDisposableInputLessThanOrEqualTo(BigDecimal value) {
- addCriterion("disposable_input <=", value, "disposableInput");
+ public Criteria andLumpSumLessThanOrEqualTo(BigDecimal value) {
+ addCriterion("lump_sum <=", value, "lumpSum");
return (Criteria) this;
}
- public Criteria andDisposableInputIn(List<BigDecimal> values) {
- addCriterion("disposable_input in", values, "disposableInput");
+ public Criteria andLumpSumIn(List<BigDecimal> values) {
+ addCriterion("lump_sum in", values, "lumpSum");
return (Criteria) this;
}
- public Criteria andDisposableInputNotIn(List<BigDecimal> values) {
- addCriterion("disposable_input not in", values, "disposableInput");
+ public Criteria andLumpSumNotIn(List<BigDecimal> values) {
+ addCriterion("lump_sum not in", values, "lumpSum");
return (Criteria) this;
}
- public Criteria andDisposableInputBetween(BigDecimal value1, BigDecimal value2) {
- addCriterion("disposable_input between", value1, value2, "disposableInput");
+ public Criteria andLumpSumBetween(BigDecimal value1, BigDecimal value2) {
+ addCriterion("lump_sum between", value1, value2, "lumpSum");
return (Criteria) this;
}
- public Criteria andDisposableInputNotBetween(BigDecimal value1, BigDecimal value2) {
- addCriterion("disposable_input not between", value1, value2, "disposableInput");
+ public Criteria andLumpSumNotBetween(BigDecimal value1, BigDecimal value2) {
+ addCriterion("lump_sum not between", value1, value2, "lumpSum");
return (Criteria) this;
}
- public Criteria andMonthlyInvestmentIsNull() {
- addCriterion("monthly_investment is null");
+ public Criteria andMonthRegularInvestAmountIsNull() {
+ addCriterion("month_regular_invest_amount is null");
return (Criteria) this;
}
- public Criteria andMonthlyInvestmentIsNotNull() {
- addCriterion("monthly_investment is not null");
+ public Criteria andMonthRegularInvestAmountIsNotNull() {
+ addCriterion("month_regular_invest_amount is not null");
return (Criteria) this;
}
- public Criteria andMonthlyInvestmentEqualTo(BigDecimal value) {
- addCriterion("monthly_investment =", value, "monthlyInvestment");
+ public Criteria andMonthRegularInvestAmountEqualTo(BigDecimal value) {
+ addCriterion("month_regular_invest_amount =", value, "monthRegularInvestAmount");
return (Criteria) this;
}
- public Criteria andMonthlyInvestmentNotEqualTo(BigDecimal value) {
- addCriterion("monthly_investment <>", value, "monthlyInvestment");
+ public Criteria andMonthRegularInvestAmountNotEqualTo(BigDecimal value) {
+ addCriterion("month_regular_invest_amount <>", value, "monthRegularInvestAmount");
return (Criteria) this;
}
- public Criteria andMonthlyInvestmentGreaterThan(BigDecimal value) {
- addCriterion("monthly_investment >", value, "monthlyInvestment");
+ public Criteria andMonthRegularInvestAmountGreaterThan(BigDecimal value) {
+ addCriterion("month_regular_invest_amount >", value, "monthRegularInvestAmount");
return (Criteria) this;
}
- public Criteria andMonthlyInvestmentGreaterThanOrEqualTo(BigDecimal value) {
- addCriterion("monthly_investment >=", value, "monthlyInvestment");
+ public Criteria andMonthRegularInvestAmountGreaterThanOrEqualTo(BigDecimal value) {
+ addCriterion("month_regular_invest_amount >=", value, "monthRegularInvestAmount");
return (Criteria) this;
}
- public Criteria andMonthlyInvestmentLessThan(BigDecimal value) {
- addCriterion("monthly_investment <", value, "monthlyInvestment");
+ public Criteria andMonthRegularInvestAmountLessThan(BigDecimal value) {
+ addCriterion("month_regular_invest_amount <", value, "monthRegularInvestAmount");
return (Criteria) this;
}
- public Criteria andMonthlyInvestmentLessThanOrEqualTo(BigDecimal value) {
- addCriterion("monthly_investment <=", value, "monthlyInvestment");
+ public Criteria andMonthRegularInvestAmountLessThanOrEqualTo(BigDecimal value) {
+ addCriterion("month_regular_invest_amount <=", value, "monthRegularInvestAmount");
return (Criteria) this;
}
- public Criteria andMonthlyInvestmentIn(List<BigDecimal> values) {
- addCriterion("monthly_investment in", values, "monthlyInvestment");
+ public Criteria andMonthRegularInvestAmountIn(List<BigDecimal> values) {
+ addCriterion("month_regular_invest_amount in", values, "monthRegularInvestAmount");
return (Criteria) this;
}
- public Criteria andMonthlyInvestmentNotIn(List<BigDecimal> values) {
- addCriterion("monthly_investment not in", values, "monthlyInvestment");
+ public Criteria andMonthRegularInvestAmountNotIn(List<BigDecimal> values) {
+ addCriterion("month_regular_invest_amount not in", values, "monthRegularInvestAmount");
return (Criteria) this;
}
- public Criteria andMonthlyInvestmentBetween(BigDecimal value1, BigDecimal value2) {
- addCriterion("monthly_investment between", value1, value2, "monthlyInvestment");
+ public Criteria andMonthRegularInvestAmountBetween(BigDecimal value1, BigDecimal value2) {
+ addCriterion("month_regular_invest_amount between", value1, value2, "monthRegularInvestAmount");
return (Criteria) this;
}
- public Criteria andMonthlyInvestmentNotBetween(BigDecimal value1, BigDecimal value2) {
- addCriterion("monthly_investment not between", value1, value2, "monthlyInvestment");
+ public Criteria andMonthRegularInvestAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+ addCriterion("month_regular_invest_amount not between", value1, value2, "monthRegularInvestAmount");
return (Criteria) this;
}
@@ -1875,246 +2175,6 @@ public class CaseConsumptionPlanExample {
return (Criteria) this;
}
- public Criteria andTargetAmountIsNull() {
- addCriterion("target_amount is null");
- return (Criteria) this;
- }
-
- public Criteria andTargetAmountIsNotNull() {
- addCriterion("target_amount is not null");
- return (Criteria) this;
- }
-
- public Criteria andTargetAmountEqualTo(BigDecimal value) {
- addCriterion("target_amount =", value, "targetAmount");
- return (Criteria) this;
- }
-
- public Criteria andTargetAmountNotEqualTo(BigDecimal value) {
- addCriterion("target_amount <>", value, "targetAmount");
- return (Criteria) this;
- }
-
- public Criteria andTargetAmountGreaterThan(BigDecimal value) {
- addCriterion("target_amount >", value, "targetAmount");
- return (Criteria) this;
- }
-
- public Criteria andTargetAmountGreaterThanOrEqualTo(BigDecimal value) {
- addCriterion("target_amount >=", value, "targetAmount");
- return (Criteria) this;
- }
-
- public Criteria andTargetAmountLessThan(BigDecimal value) {
- addCriterion("target_amount <", value, "targetAmount");
- return (Criteria) this;
- }
-
- public Criteria andTargetAmountLessThanOrEqualTo(BigDecimal value) {
- addCriterion("target_amount <=", value, "targetAmount");
- return (Criteria) this;
- }
-
- public Criteria andTargetAmountIn(List<BigDecimal> values) {
- addCriterion("target_amount in", values, "targetAmount");
- return (Criteria) this;
- }
-
- public Criteria andTargetAmountNotIn(List<BigDecimal> values) {
- addCriterion("target_amount not in", values, "targetAmount");
- return (Criteria) this;
- }
-
- public Criteria andTargetAmountBetween(BigDecimal value1, BigDecimal value2) {
- addCriterion("target_amount between", value1, value2, "targetAmount");
- return (Criteria) this;
- }
-
- public Criteria andTargetAmountNotBetween(BigDecimal value1, BigDecimal value2) {
- addCriterion("target_amount not between", value1, value2, "targetAmount");
- return (Criteria) this;
- }
-
- public Criteria andShopHouseYearIsNull() {
- addCriterion("shop_house_year is null");
- return (Criteria) this;
- }
-
- public Criteria andShopHouseYearIsNotNull() {
- addCriterion("shop_house_year is not null");
- return (Criteria) this;
- }
-
- public Criteria andShopHouseYearEqualTo(Integer value) {
- addCriterion("shop_house_year =", value, "shopHouseYear");
- return (Criteria) this;
- }
-
- public Criteria andShopHouseYearNotEqualTo(Integer value) {
- addCriterion("shop_house_year <>", value, "shopHouseYear");
- return (Criteria) this;
- }
-
- public Criteria andShopHouseYearGreaterThan(Integer value) {
- addCriterion("shop_house_year >", value, "shopHouseYear");
- return (Criteria) this;
- }
-
- public Criteria andShopHouseYearGreaterThanOrEqualTo(Integer value) {
- addCriterion("shop_house_year >=", value, "shopHouseYear");
- return (Criteria) this;
- }
-
- public Criteria andShopHouseYearLessThan(Integer value) {
- addCriterion("shop_house_year <", value, "shopHouseYear");
- return (Criteria) this;
- }
-
- public Criteria andShopHouseYearLessThanOrEqualTo(Integer value) {
- addCriterion("shop_house_year <=", value, "shopHouseYear");
- return (Criteria) this;
- }
-
- public Criteria andShopHouseYearIn(List<Integer> values) {
- addCriterion("shop_house_year in", values, "shopHouseYear");
- return (Criteria) this;
- }
-
- public Criteria andShopHouseYearNotIn(List<Integer> values) {
- addCriterion("shop_house_year not in", values, "shopHouseYear");
- return (Criteria) this;
- }
-
- public Criteria andShopHouseYearBetween(Integer value1, Integer value2) {
- addCriterion("shop_house_year between", value1, value2, "shopHouseYear");
- return (Criteria) this;
- }
-
- public Criteria andShopHouseYearNotBetween(Integer value1, Integer value2) {
- addCriterion("shop_house_year not between", value1, value2, "shopHouseYear");
- return (Criteria) this;
- }
-
- public Criteria andHouseAllMoneyIsNull() {
- addCriterion("house_all_money is null");
- return (Criteria) this;
- }
-
- public Criteria andHouseAllMoneyIsNotNull() {
- addCriterion("house_all_money is not null");
- return (Criteria) this;
- }
-
- public Criteria andHouseAllMoneyEqualTo(BigDecimal value) {
- addCriterion("house_all_money =", value, "houseAllMoney");
- return (Criteria) this;
- }
-
- public Criteria andHouseAllMoneyNotEqualTo(BigDecimal value) {
- addCriterion("house_all_money <>", value, "houseAllMoney");
- return (Criteria) this;
- }
-
- public Criteria andHouseAllMoneyGreaterThan(BigDecimal value) {
- addCriterion("house_all_money >", value, "houseAllMoney");
- return (Criteria) this;
- }
-
- public Criteria andHouseAllMoneyGreaterThanOrEqualTo(BigDecimal value) {
- addCriterion("house_all_money >=", value, "houseAllMoney");
- return (Criteria) this;
- }
-
- public Criteria andHouseAllMoneyLessThan(BigDecimal value) {
- addCriterion("house_all_money <", value, "houseAllMoney");
- return (Criteria) this;
- }
-
- public Criteria andHouseAllMoneyLessThanOrEqualTo(BigDecimal value) {
- addCriterion("house_all_money <=", value, "houseAllMoney");
- return (Criteria) this;
- }
-
- public Criteria andHouseAllMoneyIn(List<BigDecimal> values) {
- addCriterion("house_all_money in", values, "houseAllMoney");
- return (Criteria) this;
- }
-
- public Criteria andHouseAllMoneyNotIn(List<BigDecimal> values) {
- addCriterion("house_all_money not in", values, "houseAllMoney");
- return (Criteria) this;
- }
-
- public Criteria andHouseAllMoneyBetween(BigDecimal value1, BigDecimal value2) {
- addCriterion("house_all_money between", value1, value2, "houseAllMoney");
- return (Criteria) this;
- }
-
- public Criteria andHouseAllMoneyNotBetween(BigDecimal value1, BigDecimal value2) {
- addCriterion("house_all_money not between", value1, value2, "houseAllMoney");
- return (Criteria) this;
- }
-
- public Criteria andShopCarYearIsNull() {
- addCriterion("shop_car_year is null");
- return (Criteria) this;
- }
-
- public Criteria andShopCarYearIsNotNull() {
- addCriterion("shop_car_year is not null");
- return (Criteria) this;
- }
-
- public Criteria andShopCarYearEqualTo(Integer value) {
- addCriterion("shop_car_year =", value, "shopCarYear");
- return (Criteria) this;
- }
-
- public Criteria andShopCarYearNotEqualTo(Integer value) {
- addCriterion("shop_car_year <>", value, "shopCarYear");
- return (Criteria) this;
- }
-
- public Criteria andShopCarYearGreaterThan(Integer value) {
- addCriterion("shop_car_year >", value, "shopCarYear");
- return (Criteria) this;
- }
-
- public Criteria andShopCarYearGreaterThanOrEqualTo(Integer value) {
- addCriterion("shop_car_year >=", value, "shopCarYear");
- return (Criteria) this;
- }
-
- public Criteria andShopCarYearLessThan(Integer value) {
- addCriterion("shop_car_year <", value, "shopCarYear");
- return (Criteria) this;
- }
-
- public Criteria andShopCarYearLessThanOrEqualTo(Integer value) {
- addCriterion("shop_car_year <=", value, "shopCarYear");
- return (Criteria) this;
- }
-
- public Criteria andShopCarYearIn(List<Integer> values) {
- addCriterion("shop_car_year in", values, "shopCarYear");
- return (Criteria) this;
- }
-
- public Criteria andShopCarYearNotIn(List<Integer> values) {
- addCriterion("shop_car_year not in", values, "shopCarYear");
- return (Criteria) this;
- }
-
- public Criteria andShopCarYearBetween(Integer value1, Integer value2) {
- addCriterion("shop_car_year between", value1, value2, "shopCarYear");
- return (Criteria) this;
- }
-
- public Criteria andShopCarYearNotBetween(Integer value1, Integer value2) {
- addCriterion("shop_car_year not between", value1, value2, "shopCarYear");
- return (Criteria) this;
- }
-
public Criteria andAnalysisTeacherScoreIsNull() {
addCriterion("analysis_teacher_score is null");
return (Criteria) this;
diff --git a/src/main/java/com/sztzjy/money_management/entity/CaseInsurancePlan.java b/src/main/java/com/sztzjy/money_management/entity/CaseInsurancePlan.java
index b702081..f1a88b3 100644
--- a/src/main/java/com/sztzjy/money_management/entity/CaseInsurancePlan.java
+++ b/src/main/java/com/sztzjy/money_management/entity/CaseInsurancePlan.java
@@ -24,106 +24,106 @@ public class CaseInsurancePlan {
@ApiModelProperty("被保险人年龄客户")
private Integer ageb;
- @ApiModelProperty("被保险人年龄配偶")
+ @ApiModelProperty("被保险人年龄-配偶")
private Integer agec;
- @ApiModelProperty("预计退休年龄客户")
+ @ApiModelProperty("预计退休年龄-客户")
private Integer retirementAgeb;
- @ApiModelProperty("预计退休年龄配偶")
+ @ApiModelProperty("预计退休年龄-配偶")
private Integer retirementAgec;
- @ApiModelProperty("投资报酬率客户")
+ @ApiModelProperty("投资报酬率-客户")
private BigDecimal returnOnInvestmentb;
- @ApiModelProperty("投资报酬率配偶")
+ @ApiModelProperty("投资报酬率-配偶")
private BigDecimal returnOnInvestmentc;
- @ApiModelProperty("通货膨胀率客户")
+ @ApiModelProperty("通货膨胀率-客户")
private BigDecimal inflationRateb;
- @ApiModelProperty("通货膨胀率配偶")
+ @ApiModelProperty("通货膨胀率-配偶")
private BigDecimal inflationRatec;
- @ApiModelProperty("收入增长率客户")
+ @ApiModelProperty("收入增长率-客户")
private BigDecimal revenueGrowthb;
- @ApiModelProperty("收入增长率配偶")
+ @ApiModelProperty("收入增长率-配偶")
private BigDecimal revenueGrowthc;
- @ApiModelProperty("当前的家庭生活费用客户")
+ @ApiModelProperty("当前的家庭生活费用-客户")
private BigDecimal matrimonialFeeb;
- @ApiModelProperty("当前的家庭生活费用配偶")
+ @ApiModelProperty("当前的家庭生活费用-配偶")
private BigDecimal matrimonialFeec;
- @ApiModelProperty("保险事故发生后支出调整率客户")
+ @ApiModelProperty("保险事故发生后支出调整率-客户")
private BigDecimal afterAccidentRateb;
- @ApiModelProperty("保险事故发生后支出调整率配偶")
+ @ApiModelProperty("保险事故发生后支出调整率-配偶")
private BigDecimal afterAccidentRatec;
@ApiModelProperty("年支出")
private BigDecimal expenditure;
- @ApiModelProperty("个人/配偶的个人年收入客户")
+ @ApiModelProperty("配偶的个人年收入-客户")
private BigDecimal incomeb;
- @ApiModelProperty("个人/配偶的个人年收入配偶")
+ @ApiModelProperty("配偶的个人年收入-配偶")
private BigDecimal incomec;
- @ApiModelProperty("紧急备用金现值客户")
+ @ApiModelProperty("紧急备用金现值-客户")
private BigDecimal reserveFundb;
- @ApiModelProperty("紧急备用金现值配偶")
+ @ApiModelProperty("紧急备用金现值-配偶")
private BigDecimal reserveFundc;
- @ApiModelProperty("教育金现值客户")
+ @ApiModelProperty("教育金现值-客户")
private BigDecimal eduAmountb;
- @ApiModelProperty("教育金现值配偶")
+ @ApiModelProperty("教育金现值-配偶")
private BigDecimal eduAmountc;
- @ApiModelProperty("养老基金现值客户")
+ @ApiModelProperty("养老基金现值-客户")
private BigDecimal pensionFundsb;
- @ApiModelProperty("养老基金现值配偶")
+ @ApiModelProperty("养老基金现值-配偶")
private BigDecimal pensionFundsc;
- @ApiModelProperty("临终及丧葬支出现值客户")
+ @ApiModelProperty("临终及丧葬支出现值-客户")
private BigDecimal deathExpenseb;
- @ApiModelProperty("临终及丧葬支出现值配偶")
+ @ApiModelProperty("临终及丧葬支出现值-配偶")
private BigDecimal deathExpensec;
- @ApiModelProperty("目前贷款余额客户")
+ @ApiModelProperty("目前贷款余额-客户")
private BigDecimal loanBalanceb;
- @ApiModelProperty("目前贷款余额配偶")
+ @ApiModelProperty("目前贷款余额-配偶")
private BigDecimal loanBalancec;
- @ApiModelProperty("家庭生息资产客户")
+ @ApiModelProperty("家庭生息资产-客户")
private BigDecimal earningAssetsb;
- @ApiModelProperty("家庭生息资产配偶")
+ @ApiModelProperty("家庭生息资产-配偶")
private BigDecimal earningAssetsc;
- @ApiModelProperty("已有额度客户")
+ @ApiModelProperty("已有额度-客户")
private BigDecimal insuranceAmountb;
- @ApiModelProperty("已有额度配偶")
+ @ApiModelProperty("已有额度-配偶")
private BigDecimal insuranceAmountc;
- @ApiModelProperty("预算金额客户")
+ @ApiModelProperty("预算金额-客户")
private BigDecimal budgetAmountb;
- @ApiModelProperty("预算金额配偶")
+ @ApiModelProperty("预算金额-配偶")
private BigDecimal budgetAmountc;
- @ApiModelProperty("补充额度客户")
+ @ApiModelProperty("补充额度-客户")
private BigDecimal supplementaryQuotab;
- @ApiModelProperty("补充额度配偶")
+ @ApiModelProperty("补充额度-配偶")
private BigDecimal supplementaryQuotac;
@ApiModelProperty("用户ID")
diff --git a/src/main/java/com/sztzjy/money_management/mapper/CaseConsumptionPlanMapper.java b/src/main/java/com/sztzjy/money_management/mapper/CaseConsumptionPlanMapper.java
index 89caddb..21c665a 100644
--- a/src/main/java/com/sztzjy/money_management/mapper/CaseConsumptionPlanMapper.java
+++ b/src/main/java/com/sztzjy/money_management/mapper/CaseConsumptionPlanMapper.java
@@ -4,7 +4,6 @@ import com.sztzjy.money_management.entity.CaseConsumptionPlan;
import com.sztzjy.money_management.entity.CaseConsumptionPlanExample;
import java.util.List;
-import com.sztzjy.money_management.entity.CaseConsumptionPlanWithBLOBs;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
diff --git a/src/main/java/com/sztzjy/money_management/service/impl/CaseServiceImpl.java b/src/main/java/com/sztzjy/money_management/service/impl/CaseServiceImpl.java
index 6b0731a..cb1896b 100644
--- a/src/main/java/com/sztzjy/money_management/service/impl/CaseServiceImpl.java
+++ b/src/main/java/com/sztzjy/money_management/service/impl/CaseServiceImpl.java
@@ -81,7 +81,6 @@ public class CaseServiceImpl implements CaseService {
@Autowired
private CaseInvestmentPlanSelectMapper caseInvestmentPlanSelectMapper;
-
private void insertSynthesisPlanClient(CaseInfo newCase) {
SynthesisPlanClient synthesisPlanClient = new SynthesisPlanClient();
@@ -646,7 +645,7 @@ public class CaseServiceImpl implements CaseService {
}
}
- @Override //重新实训 先把数据库的数据替换成本次数据，再设置实训表中的数据，没分数则加上，有则不改
+ @Override //重新实训 先把数据库的数据替换成本次数据，再设置实训表中的数据，没分数则加上，有则不改。2、算分只算老师端设置的考核点
public void commitTraining(String json, String type, String trainingId) {
StuTrainingWithBLOBs stuTrainingWithBLOBs = stuTrainingMapper.selectByPrimaryKey(trainingId);
@@ -743,12 +742,10 @@ public class CaseServiceImpl implements CaseService {
caseFinancialRatiosMapper.deleteByPrimaryKey(financialRatiosWithBLOBs.getCaseFinancialRatiosId());
}
}
-
stuData.setCaseFinancialRatiosId(IdUtil.randomUUID());
caseFinancialRatiosMapper.insert(stuData);
- //比较正确答案
- wrongCount = getCaseFinancialRatiosWrongCount(wrongCount, stuData);
+ //老师端考核点为一个主观题，无需比较正确答案
}
if (type.equals("现金规划")) {
@@ -808,7 +805,6 @@ public class CaseServiceImpl implements CaseService {
wrongCount = getCaseConsumptionPlanWrongCount(wrongCount, stuData);
}
-
if (type.equals("生涯规划-创业规划")) {
CaseStartAnUndertakingPlan stuData = gson.fromJson(json, CaseStartAnUndertakingPlan.class);
@@ -867,7 +863,20 @@ public class CaseServiceImpl implements CaseService {
}
if (type.equals("投资规划")) {
- // todo 表暂时没有
+ CaseInvestmentPlan stuInvestmentPlan = gson.fromJson(json, CaseInvestmentPlan.class);
+ CaseInvestmentPlanExample caseInvestmentPlanExample = new CaseInvestmentPlanExample();
+ caseInvestmentPlanExample.createCriteria().andIsAnswerEqualTo("学生答案").andUserIdEqualTo(stuInvestmentPlan.getUserId()).andCaseIdEqualTo(stuInvestmentPlan.getCaseId());
+ List<CaseInvestmentPlan> caseInvestmentPlans = investmentPlanMapper.selectByExampleWithBLOBs(caseInvestmentPlanExample);
+ if (!caseInvestmentPlans.isEmpty()) {
+ for (CaseInvestmentPlan caseInvestmentPlan : caseInvestmentPlans) {
+ investmentPlanMapper.deleteByPrimaryKey(caseInvestmentPlan.getCaseInvestmentPlanId());
+ }
+ }
+ stuInvestmentPlan.setCaseInvestmentPlanId(IdUtil.randomUUID());
+ investmentPlanMapper.insert(stuInvestmentPlan);
+
+ //比较正确答案
+ wrongCount = getCaseInvestmentPlan(wrongCount, stuInvestmentPlan);
}
if (type.equals("税务筹划")) {
@@ -904,8 +913,7 @@ public class CaseServiceImpl implements CaseService {
stuData.setCaseDistributionOfPropertyId(IdUtil.randomUUID());
caseDistributionOfPropertyMapper.insert(stuData);
- //比较正确答案
- wrongCount = getCaseDistributionOfPropertyWrongCount(wrongCount, stuData);
+ //考核点都为主观题，无需算分
}
if (type.equals("财产传承")) {
@@ -939,8 +947,21 @@ public class CaseServiceImpl implements CaseService {
}
- //todo 消费规划表缺字段，对照一下再重新生成
- //todo 理财方案老师和管理员新增时多是一个考核点，学生端要填多条，可能有问题，这里对比的字段需要修改
+ private int getCaseInvestmentPlan(int wrongCount, CaseInvestmentPlan stuInvestmentPlan) {
+ CaseInvestmentPlanExample example = new CaseInvestmentPlanExample();
+ example.createCriteria().andCaseIdEqualTo(stuInvestmentPlan.getCaseId()).andIsAnswerEqualTo("题目答案");
+ List<CaseInvestmentPlan> caseInvestmentPlans = investmentPlanMapper.selectByExampleWithBLOBs(example);
+
+ if (caseInvestmentPlans != null && !caseInvestmentPlans.isEmpty()) {
+ CaseInvestmentPlan investmentPlan = caseInvestmentPlans.get(0);
+ //当前客户所处家庭生命周期
+ if (stuInvestmentPlan.getLifeCycleId() == null || !stuInvestmentPlan.getLifeCycleId().equals(investmentPlan.getLifeCycleId())) {
+ wrongCount += 1;
+ }
+ }
+ return wrongCount;
+ }
+
private int getCaseConsumptionPlanWrongCount(int wrongCount, CaseConsumptionPlanWithBLOBs stuData) {
CaseConsumptionPlanExample example = new CaseConsumptionPlanExample();
example.createCriteria().andCaseIdEqualTo(stuData.getCaseId()).andIsAnswerEqualTo("题目答案");
@@ -948,103 +969,46 @@ public class CaseServiceImpl implements CaseService {
if (CaseConsumptionPlans != null && !CaseConsumptionPlans.isEmpty()) {
CaseConsumptionPlan rightData = CaseConsumptionPlans.get(0);
-
- if (stuData.getHouseArea() == null || !stuData.getHouseArea().equals(rightData.getHouseArea())) {
+ //距离购房年限
+ if (stuData.getShopHouseYear() == null || !stuData.getShopHouseYear().equals(rightData.getShopHouseYear())) {
wrongCount += 1;
- }
- if (stuData.getHousePrice() == null || !stuData.getHousePrice().equals(rightData.getHousePrice())) {
+ }//购房 总金额
+ if (stuData.getHouseAllMoney() == null || !stuData.getHouseAllMoney().equals(rightData.getHouseAllMoney())) {
wrongCount += 1;
- }
+ }//首付比例
if (stuData.getHouseDownPaymentPercent() == null || !stuData.getHouseDownPaymentPercent().equals(rightData.getHouseDownPaymentPercent())) {
wrongCount += 1;
- }
+ }//贷款年限
if (stuData.getHouseLoanYear() == null || !stuData.getHouseLoanYear().equals(rightData.getHouseLoanYear())) {
wrongCount += 1;
- }
+ }//贷款利率
if (stuData.getHouseLoanRate() == null || !stuData.getHouseLoanRate().equals(rightData.getHouseLoanRate())) {
wrongCount += 1;
- }
- if (stuData.getHouseDownPayment() == null || !stuData.getHouseDownPayment().equals(rightData.getHouseDownPayment())) {
- wrongCount += 1;
- }
- if (stuData.getHouseTotalAmount() == null || !stuData.getHouseTotalAmount().equals(rightData.getHouseTotalAmount())) {
- wrongCount += 1;
- }
- if (stuData.getHouseMonthlyAmount() == null || !stuData.getHouseMonthlyAmount().equals(rightData.getHouseMonthlyAmount())) {
- wrongCount += 1;
- }
- if (stuData.getCarType() == null || !stuData.getCarType().equals(rightData.getCarType())) {
+ }//距离购车年限
+ if (stuData.getShopCarYear() == null || !stuData.getShopCarYear().equals(rightData.getShopCarYear())) {
wrongCount += 1;
- }
+ }//裸车价格
if (stuData.getCarPrice() == null || !stuData.getCarPrice().equals(rightData.getCarPrice())) {
wrongCount += 1;
- }
+ }//首付比例
if (stuData.getCarDownPaymentPercent() == null || !stuData.getCarDownPaymentPercent().equals(rightData.getCarDownPaymentPercent())) {
wrongCount += 1;
- }
+ }//贷款年限
if (stuData.getCarLoanYear() == null || !stuData.getCarLoanYear().equals(rightData.getCarLoanYear())) {
wrongCount += 1;
- }
+ }//贷款利率
if (stuData.getCarLoanRate() == null || !stuData.getCarLoanRate().equals(rightData.getCarLoanRate())) {
wrongCount += 1;
- }
- if (stuData.getPurchaseTax() == null || !stuData.getPurchaseTax().equals(rightData.getPurchaseTax())) {
- wrongCount += 1;
- }
+ }//上牌费用
if (stuData.getCarRegFee() == null || !stuData.getCarRegFee().equals(rightData.getCarRegFee())) {
wrongCount += 1;
- }
- if (stuData.getDisplacement() == null || !stuData.getDisplacement().equals(rightData.getDisplacement())) {
- wrongCount += 1;
- }
+ }//车船使用税
if (stuData.getVehicleAndVesselTax() == null || !stuData.getVehicleAndVesselTax().equals(rightData.getVehicleAndVesselTax())) {
wrongCount += 1;
- }
- if (stuData.getMotorVehicleCompulsory() == null || !stuData.getMotorVehicleCompulsory().equals(rightData.getMotorVehicleCompulsory())) {
- wrongCount += 1;
- }
+ }//商业保险
if (stuData.getMotorVehicleCommercial() == null || !stuData.getMotorVehicleCommercial().equals(rightData.getMotorVehicleCommercial())) {
wrongCount += 1;
}
- if (stuData.getCarDownPayment() == null || !stuData.getCarDownPayment().equals(rightData.getCarDownPayment())) {
- wrongCount += 1;
- }
- if (stuData.getCarTotalAmount() == null || !stuData.getCarTotalAmount().equals(rightData.getCarTotalAmount())) {
- wrongCount += 1;
- }
- if (stuData.getCarMonthlyAmount() == null || !stuData.getCarMonthlyAmount().equals(rightData.getCarMonthlyAmount())) {
- wrongCount += 1;
- }
- if (stuData.getFirstAmount() == null || !stuData.getFirstAmount().equals(rightData.getFirstAmount())) {
- wrongCount += 1;
- }
- if (stuData.getReturnOnInvestment() == null || !stuData.getReturnOnInvestment().equals(rightData.getReturnOnInvestment())) {
- wrongCount += 1;
- }
- if (stuData.getDisposableInput() == null || !stuData.getDisposableInput().equals(rightData.getDisposableInput())) {
- wrongCount += 1;
- }
- if (stuData.getMonthlyInvestment() == null || !stuData.getMonthlyInvestment().equals(rightData.getMonthlyInvestment())) {
- wrongCount += 1;
- }
- if (stuData.getRegularYear() == null || !stuData.getRegularYear().equals(rightData.getRegularYear())) {
- wrongCount += 1;
- }
- if (stuData.getTargetAmount() == null || !stuData.getTargetAmount().equals(rightData.getTargetAmount())) {
- wrongCount += 1;
- }
- if (stuData.getShopHouseYear() == null || !stuData.getShopHouseYear().equals(rightData.getShopHouseYear())) {
- wrongCount += 1;
- }
- if (stuData.getHouseAllMoney() == null || !stuData.getHouseAllMoney().equals(rightData.getHouseAllMoney())) {
- wrongCount += 1;
- }
- if (stuData.getShopCarYear() == null || !stuData.getShopCarYear().equals(rightData.getShopCarYear())) {
- wrongCount += 1;
- }
- if (stuData.getAnalysis() == null || !stuData.getAnalysis().equals(rightData.getAnalysis())) {
- wrongCount += 1;
- }
}
return wrongCount;
}
@@ -1055,128 +1019,82 @@ public class CaseServiceImpl implements CaseService {
List<CaseHeritageWithBLOBs> caseHeritageWithBLOBs = caseHeritageMapper.selectByExampleWithBLOBs(example);
if (caseHeritageWithBLOBs != null && !caseHeritageWithBLOBs.isEmpty()) {
CaseHeritageWithBLOBs rightData = caseHeritageWithBLOBs.get(0);
+ //现金
if (stuData.getCash() == null || !stuData.getCash().equals(rightData.getCash())) {
wrongCount += 1;
- }
+ }//银行存款
if (stuData.getDeposit() == null || !stuData.getDeposit().equals(rightData.getDeposit())) {
wrongCount += 1;
- }
+ }//人寿保单赔偿金额
if (stuData.getLifeInsurance() == null || !stuData.getLifeInsurance().equals(rightData.getLifeInsurance())) {
wrongCount += 1;
- }
+ }//其他现金账户
if (stuData.getOtherCashAccount() == null || !stuData.getOtherCashAccount().equals(rightData.getOtherCashAccount())) {
wrongCount += 1;
- }
+ }//股票
if (stuData.getStock() == null || !stuData.getStock().equals(rightData.getStock())) {
wrongCount += 1;
- }
+ }//债券
if (stuData.getBond() == null || !stuData.getBond().equals(rightData.getBond())) {
wrongCount += 1;
- }
+ }//基金
if (stuData.getFund() == null || !stuData.getFund().equals(rightData.getFund())) {
wrongCount += 1;
- }
+ }//其他投资收益
if (stuData.getOtherInvestment() == null || !stuData.getOtherInvestment().equals(rightData.getOtherInvestment())) {
wrongCount += 1;
- }
+ }//养老金（一次性收入现值）
if (stuData.getPension() == null || !stuData.getPension().equals(rightData.getPension())) {
wrongCount += 1;
- }
+ }//配偶/遗孤年金收益（现值）
if (stuData.getAnnuityRevenue() == null || !stuData.getAnnuityRevenue().equals(rightData.getAnnuityRevenue())) {
wrongCount += 1;
- }
+ }//其他退休基金
if (stuData.getOtherPension() == null || !stuData.getOtherPension().equals(rightData.getOtherPension())) {
wrongCount += 1;
- }
+ }//房产
if (stuData.getHouse() == null || !stuData.getHouse().equals(rightData.getHouse())) {
wrongCount += 1;
- }
+ }//汽车
if (stuData.getCar() == null || !stuData.getCar().equals(rightData.getCar())) {
wrongCount += 1;
- }
+ }//其他个人资产
if (stuData.getOther() == null || !stuData.getOther().equals(rightData.getOther())) {
wrongCount += 1;
- }
+ }//其他资产
if (stuData.getOtherProperty() == null || !stuData.getOtherProperty().equals(rightData.getOtherProperty())) {
wrongCount += 1;
- }
- if (stuData.getTotalProperty() == null || !stuData.getTotalProperty().equals(rightData.getTotalProperty())) {
- wrongCount += 1;
- }
+ }//短期贷款
if (stuData.getShortTermLoan() == null || !stuData.getShortTermLoan().equals(rightData.getShortTermLoan())) {
wrongCount += 1;
- }
+ }//中期贷款
if (stuData.getMediumTermLoans() == null || !stuData.getMediumTermLoans().equals(rightData.getMediumTermLoans())) {
wrongCount += 1;
- }
+ }//长期贷款
if (stuData.getLongTermLoan() == null || !stuData.getLongTermLoan().equals(rightData.getLongTermLoan())) {
wrongCount += 1;
- }
+ }//其他贷款
if (stuData.getOtherLoan() == null || !stuData.getOtherLoan().equals(rightData.getOtherLoan())) {
wrongCount += 1;
- }
+ }//临终医疗费用
if (stuData.getMedicalCosts() == null || !stuData.getMedicalCosts().equals(rightData.getMedicalCosts())) {
wrongCount += 1;
- }
+ }//预期收入纳税额支出
if (stuData.getTaxCosts() == null || !stuData.getTaxCosts().equals(rightData.getTaxCosts())) {
wrongCount += 1;
- }
+ }//丧葬费用
if (stuData.getFuneralExpenses() == null || !stuData.getFuneralExpenses().equals(rightData.getFuneralExpenses())) {
wrongCount += 1;
- }
+ }//遗产处置费用
if (stuData.getHeritageCosts() == null || !stuData.getHeritageCosts().equals(rightData.getHeritageCosts())) {
wrongCount += 1;
- }
+ }//其他费用
if (stuData.getOtherCosts() == null || !stuData.getOtherCosts().equals(rightData.getOtherCosts())) {
wrongCount += 1;
- }
+ }//其他负债
if (stuData.getOtherLiabilities() == null || !stuData.getOtherLiabilities().equals(rightData.getOtherLiabilities())) {
wrongCount += 1;
}
- if (stuData.getTotalLiabilities() == null || !stuData.getTotalLiabilities().equals(rightData.getTotalLiabilities())) {
- wrongCount += 1;
- }
- if (stuData.getPlanTool() == null || !stuData.getPlanTool().equals(rightData.getPlanTool())) {
- wrongCount += 1;
- }
- if (stuData.getFinanceAnalysis() == null || !stuData.getFinanceAnalysis().equals(rightData.getFinanceAnalysis())) {
- wrongCount += 1;
- }
- if (stuData.getPlanAnalysis() == null || !stuData.getPlanAnalysis().equals(rightData.getPlanAnalysis())) {
- wrongCount += 1;
- }
- }
- return wrongCount;
- }
-
- private int getCaseDistributionOfPropertyWrongCount(int wrongCount, CaseDistributionOfPropertyWithBLOBs
- stuData) {
- CaseDistributionOfPropertyExample example = new CaseDistributionOfPropertyExample();
- example.createCriteria().andCaseidEqualTo(stuData.getCaseid()).andIsAnswerEqualTo("题目答案");
- List<CaseDistributionOfPropertyWithBLOBs> caseDistributionOfPropertyWithBLOBs = caseDistributionOfPropertyMapper.selectByExampleWithBLOBs(example);
- if (caseDistributionOfPropertyWithBLOBs != null && !caseDistributionOfPropertyWithBLOBs.isEmpty()) {
- CaseDistributionOfPropertyWithBLOBs rightData = caseDistributionOfPropertyWithBLOBs.get(0);
- if (stuData.getCustomerSex() == null || !stuData.getCustomerSex().equals(rightData.getCustomerSex())) {
- wrongCount += 1;
- }
- if (stuData.getAddress() == null || !stuData.getAddress().equals(rightData.getAddress())) {
- wrongCount += 1;
- }
- if (stuData.getPosition() == null || !stuData.getPosition().equals(rightData.getPosition())) {
- wrongCount += 1;
- }
- if (stuData.getFamilyNum() == null || !stuData.getFamilyNum().equals(rightData.getFamilyNum())) {
- wrongCount += 1;
- }
- if (stuData.getPlanTool() == null || !stuData.getPlanTool().equals(rightData.getPlanTool())) {
- wrongCount += 1;
- }
- if (stuData.getSituationAnalysis() == null || !stuData.getSituationAnalysis().equals(rightData.getSituationAnalysis())) {
- wrongCount += 1;
- }
- if (stuData.getPlanAnalysis() == null || !stuData.getPlanAnalysis().equals(rightData.getPlanAnalysis())) {
- wrongCount += 1;
- }
}
return wrongCount;
}
@@ -1188,70 +1106,34 @@ public class CaseServiceImpl implements CaseService {
if (caseTaxPlans != null && !caseTaxPlans.isEmpty()) {
CaseTaxPlan rightData = caseTaxPlans.get(0);
-
+ //工资、薪金所得
if (stuData.getSalary() == null || stuData.getSalary().compareTo(rightData.getSalary()) != 0) {
wrongCount += 1;
- }
- if (stuData.getSalaryTax() == null || stuData.getSalaryTax().compareTo(rightData.getSalaryTax()) != 0) {
- wrongCount += 1;
- }
+ }//个体工商户的生产、经营所得
if (stuData.getOperatingRevenue() == null || stuData.getOperatingRevenue().compareTo(rightData.getOperatingRevenue()) != 0) {
wrongCount += 1;
- }
- if (stuData.getOperatingRevenueTax() == null || stuData.getOperatingRevenueTax().compareTo(rightData.getOperatingRevenueTax()) != 0) {
- wrongCount += 1;
- }
+ }//对企事业单位承包、承租经营所得
if (stuData.getEnterprisesRevenue() == null || stuData.getEnterprisesRevenue().compareTo(rightData.getEnterprisesRevenue()) != 0) {
wrongCount += 1;
- }
- if (stuData.getEnterprisesRevenueTax() == null || stuData.getEnterprisesRevenueTax().compareTo(rightData.getEnterprisesRevenueTax()) != 0) {
- wrongCount += 1;
- }
+ }//劳务报酬所得税
if (stuData.getServiceIncome() == null || stuData.getServiceIncome().compareTo(rightData.getServiceIncome()) != 0) {
wrongCount += 1;
- }
- if (stuData.getServiceIncomeTax() == null || stuData.getServiceIncomeTax().compareTo(rightData.getServiceIncomeTax()) != 0) {
- wrongCount += 1;
- }
+ }//稿酬所得
if (stuData.getRemuneration() == null || stuData.getRemuneration().compareTo(rightData.getRemuneration()) != 0) {
wrongCount += 1;
- }
- if (stuData.getRemunerationTax() == null || stuData.getRemunerationTax().compareTo(rightData.getRemunerationTax()) != 0) {
- wrongCount += 1;
- }
+ }//特许权使用费所得
if (stuData.getLoyalities() == null || stuData.getLoyalities().compareTo(rightData.getLoyalities()) != 0) {
wrongCount += 1;
- }
- if (stuData.getLoyalitiesTax() == null || stuData.getLoyalitiesTax().compareTo(rightData.getLoyalitiesTax()) != 0) {
- wrongCount += 1;
- }
+ }//财产转让所得
if (stuData.getDemise() == null || stuData.getDemise().compareTo(rightData.getDemise()) != 0) {
wrongCount += 1;
- }
- if (stuData.getDemiseTax() == null || stuData.getDemiseTax().compareTo(rightData.getDemiseTax()) != 0) {
- wrongCount += 1;
- }
+ }//偶然所得
if (stuData.getIncidentalIncome() == null || stuData.getIncidentalIncome().compareTo(rightData.getIncidentalIncome()) != 0) {
wrongCount += 1;
- }
- if (stuData.getIncidentalIncomeTax() == null || stuData.getIncidentalIncomeTax().compareTo(rightData.getIncidentalIncomeTax()) != 0) {
- wrongCount += 1;
- }
+ }//利息、红利、股利所得
if (stuData.getInterest() == null || stuData.getInterest().compareTo(rightData.getInterest()) != 0) {
wrongCount += 1;
}
- if (stuData.getInterestTax() == null || stuData.getInterestTax().compareTo(rightData.getInterestTax()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getTotalAmount() == null || stuData.getTotalAmount().compareTo(rightData.getTotalAmount()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getTotalTax() == null || stuData.getTotalTax().compareTo(rightData.getTotalTax()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getAnalysis() == null || !stuData.getAnalysis().equals(rightData.getAnalysis())) {
- wrongCount += 1;
- }
}
return wrongCount;
}
@@ -1262,119 +1144,124 @@ public class CaseServiceImpl implements CaseService {
List<CaseInsurancePlan> caseInsurancePlans = caseInsurancePlanMapper.selectByExampleWithBLOBs(example);
if (caseInsurancePlans != null && !caseInsurancePlans.isEmpty()) {
CaseInsurancePlan rightData = caseInsurancePlans.get(0);
- if (stuData.getSpouseName() == null || !stuData.getSpouseName().equals(rightData.getSpouseName())) {
- wrongCount += 1;
- }
- if (stuData.getMethodTypeId() == null || !stuData.getMethodTypeId().equals(rightData.getMethodTypeId())) { //todo 这是什么
- wrongCount += 1;
- }
- if (stuData.getAgeb() == null || !stuData.getAgeb().equals(rightData.getAgeb())) {
- wrongCount += 1;
- }
- if (stuData.getAgec() == null || !stuData.getAgec().equals(rightData.getAgec())) {
- wrongCount += 1;
- }
- if (stuData.getRetirementAgeb() == null || !stuData.getRetirementAgeb().equals(rightData.getRetirementAgeb())) {
- wrongCount += 1;
- }
- if (stuData.getRetirementAgec() == null || !stuData.getRetirementAgec().equals(rightData.getRetirementAgec())) {
- wrongCount += 1;
- }
- if (stuData.getReturnOnInvestmentb() == null || stuData.getReturnOnInvestmentb().compareTo(rightData.getReturnOnInvestmentb()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getReturnOnInvestmentc() == null || stuData.getReturnOnInvestmentc().compareTo(rightData.getReturnOnInvestmentc()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getInflationRateb() == null || stuData.getInflationRateb().compareTo(rightData.getInflationRateb()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getInflationRatec() == null || stuData.getInflationRatec().compareTo(rightData.getInflationRatec()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getRevenueGrowthb() == null || stuData.getRevenueGrowthb().compareTo(rightData.getRevenueGrowthb()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getRevenueGrowthc() == null || stuData.getRevenueGrowthc().compareTo(rightData.getRevenueGrowthc()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getMatrimonialFeeb() == null || stuData.getMatrimonialFeeb().compareTo(rightData.getMatrimonialFeeb()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getMatrimonialFeec() == null || stuData.getMatrimonialFeec().compareTo(rightData.getMatrimonialFeec()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getAfterAccidentRateb() == null || stuData.getAfterAccidentRateb().compareTo(rightData.getAfterAccidentRateb()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getAfterAccidentRatec() == null || stuData.getAfterAccidentRatec().compareTo(rightData.getAfterAccidentRatec()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getExpenditure() == null || stuData.getExpenditure().compareTo(rightData.getExpenditure()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getIncomeb() == null || stuData.getIncomeb().compareTo(rightData.getIncomeb()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getIncomec() == null || stuData.getIncomec().compareTo(rightData.getIncomec()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getReserveFundb() == null || stuData.getReserveFundb().compareTo(rightData.getReserveFundb()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getReserveFundc() == null || stuData.getReserveFundc().compareTo(rightData.getReserveFundc()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getEduAmountb() == null || stuData.getEduAmountb().compareTo(rightData.getEduAmountb()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getEduAmountc() == null || stuData.getEduAmountc().compareTo(rightData.getEduAmountc()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getPensionFundsb() == null || stuData.getPensionFundsb().compareTo(rightData.getPensionFundsb()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getPensionFundsc() == null || stuData.getPensionFundsc().compareTo(rightData.getPensionFundsc()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getDeathExpenseb() == null || stuData.getDeathExpenseb().compareTo(rightData.getDeathExpenseb()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getDeathExpensec() == null || stuData.getDeathExpensec().compareTo(rightData.getDeathExpensec()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getLoanBalanceb() == null || stuData.getLoanBalanceb().compareTo(rightData.getLoanBalanceb()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getLoanBalancec() == null || stuData.getLoanBalancec().compareTo(rightData.getLoanBalancec()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getEarningAssetsb() == null || stuData.getEarningAssetsb().compareTo(rightData.getEarningAssetsb()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getEarningAssetsc() == null || stuData.getEarningAssetsc().compareTo(rightData.getEarningAssetsc()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getInsuranceAmountb() == null || stuData.getInsuranceAmountb().compareTo(rightData.getInsuranceAmountb()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getInsuranceAmountc() == null || stuData.getInsuranceAmountc().compareTo(rightData.getInsuranceAmountc()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getBudgetAmountb() == null || stuData.getBudgetAmountb().compareTo(rightData.getBudgetAmountb()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getBudgetAmountc() == null || stuData.getBudgetAmountc().compareTo(rightData.getBudgetAmountc()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getSupplementaryQuotab() == null || stuData.getSupplementaryQuotab().compareTo(rightData.getSupplementaryQuotab()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getSupplementaryQuotac() == null || stuData.getSupplementaryQuotac().compareTo(rightData.getSupplementaryQuotac()) != 0) {
- wrongCount += 1;
+ if (stuData.getMethodTypeId().equals("遗嘱需求法")) {
+ //配偶名称
+ if (stuData.getSpouseName() == null || !stuData.getSpouseName().equals(rightData.getSpouseName())) {
+ wrongCount += 1;
+ }//被保险人年龄--配偶
+ if (stuData.getAgec() == null || !stuData.getAgec().equals(rightData.getAgec())) {
+ wrongCount += 1;
+ }//预计退休年龄-客户
+ if (stuData.getRetirementAgeb() == null || !stuData.getRetirementAgeb().equals(rightData.getRetirementAgeb())) {
+ wrongCount += 1;
+ }//预计退休年龄-配偶
+ if (stuData.getRetirementAgec() == null || !stuData.getRetirementAgec().equals(rightData.getRetirementAgec())) {
+ wrongCount += 1;
+ }//投资报酬率-客户
+ if (stuData.getReturnOnInvestmentb() == null || stuData.getReturnOnInvestmentb().compareTo(rightData.getReturnOnInvestmentb()) != 0) {
+ wrongCount += 1;
+ }//投资报酬率-配偶
+ if (stuData.getReturnOnInvestmentc() == null || stuData.getReturnOnInvestmentc().compareTo(rightData.getReturnOnInvestmentc()) != 0) {
+ wrongCount += 1;
+ }//通货膨胀率-客户
+ if (stuData.getInflationRateb() == null || stuData.getInflationRateb().compareTo(rightData.getInflationRateb()) != 0) {
+ wrongCount += 1;
+ }//通货膨胀率-配偶
+ if (stuData.getInflationRatec() == null || stuData.getInflationRatec().compareTo(rightData.getInflationRatec()) != 0) {
+ wrongCount += 1;
+ }//收入增长率-客户
+ if (stuData.getRevenueGrowthb() == null || stuData.getRevenueGrowthb().compareTo(rightData.getRevenueGrowthb()) != 0) {
+ wrongCount += 1;
+ }//收入增长率-配偶
+ if (stuData.getRevenueGrowthc() == null || stuData.getRevenueGrowthc().compareTo(rightData.getRevenueGrowthc()) != 0) {
+ wrongCount += 1;
+ }//当前的家庭生活费用-客户
+ if (stuData.getMatrimonialFeeb() == null || stuData.getMatrimonialFeeb().compareTo(rightData.getMatrimonialFeeb()) != 0) {
+ wrongCount += 1;
+ }//当前的家庭生活费用-配偶
+ if (stuData.getMatrimonialFeec() == null || stuData.getMatrimonialFeec().compareTo(rightData.getMatrimonialFeec()) != 0) {
+ wrongCount += 1;
+ }//保险事故发生后支出调整率-客户
+ if (stuData.getAfterAccidentRateb() == null || stuData.getAfterAccidentRateb().compareTo(rightData.getAfterAccidentRateb()) != 0) {
+ wrongCount += 1;
+ }//保险事故发生后支出调整率-配偶
+ if (stuData.getAfterAccidentRatec() == null || stuData.getAfterAccidentRatec().compareTo(rightData.getAfterAccidentRatec()) != 0) {
+ wrongCount += 1;
+ }//配偶的个人年收入-客户
+ if (stuData.getIncomeb() == null || stuData.getIncomeb().compareTo(rightData.getIncomeb()) != 0) {
+ wrongCount += 1;
+ }//配偶的个人年收入-配偶
+ if (stuData.getIncomec() == null || stuData.getIncomec().compareTo(rightData.getIncomec()) != 0) {
+ wrongCount += 1;
+ }//临终及丧葬支出现值-客户
+ if (stuData.getDeathExpenseb() == null || stuData.getDeathExpenseb().compareTo(rightData.getDeathExpenseb()) != 0) {
+ wrongCount += 1;
+ }//临终及丧葬支出现值-配偶
+ if (stuData.getDeathExpensec() == null || stuData.getDeathExpensec().compareTo(rightData.getDeathExpensec()) != 0) {
+ wrongCount += 1;
+ }//目前贷款余额-客户
+ if (stuData.getLoanBalanceb() == null || stuData.getLoanBalanceb().compareTo(rightData.getLoanBalanceb()) != 0) {
+ wrongCount += 1;
+ }//目前贷款余额-配偶
+ if (stuData.getLoanBalancec() == null || stuData.getLoanBalancec().compareTo(rightData.getLoanBalancec()) != 0) {
+ wrongCount += 1;
+ }//家庭生息资产-客户
+ if (stuData.getReserveFundb() == null || stuData.getReserveFundb().compareTo(rightData.getReserveFundb()) != 0) {
+ wrongCount += 1;
+ }//家庭生息资产-配偶
+ if (stuData.getReserveFundc() == null || stuData.getReserveFundc().compareTo(rightData.getReserveFundc()) != 0) {
+ wrongCount += 1;
+ }//已有额度-客户
+ if (stuData.getInsuranceAmountb() == null || stuData.getInsuranceAmountb().compareTo(rightData.getInsuranceAmountb()) != 0) {
+ wrongCount += 1;
+ }//已有额度-配偶
+ if (stuData.getInsuranceAmountc() == null || stuData.getInsuranceAmountc().compareTo(rightData.getInsuranceAmountc()) != 0) {
+ wrongCount += 1;
+ }//预算金额-客户
+ if (stuData.getBudgetAmountb() == null || stuData.getBudgetAmountb().compareTo(rightData.getBudgetAmountb()) != 0) {
+ wrongCount += 1;
+ }//预算金额-配偶
+ if (stuData.getBudgetAmountc() == null || stuData.getBudgetAmountc().compareTo(rightData.getBudgetAmountc()) != 0) {
+ wrongCount += 1;
+ }//补充额度-客户
+ if (stuData.getSupplementaryQuotab() == null || stuData.getSupplementaryQuotab().compareTo(rightData.getSupplementaryQuotab()) != 0) {
+ wrongCount += 1;
+ }//补充额度-配偶
+ if (stuData.getSupplementaryQuotac() == null || stuData.getSupplementaryQuotac().compareTo(rightData.getSupplementaryQuotac()) != 0) {
+ wrongCount += 1;
+ }
}
- if (stuData.getAnalysis() == null || !stuData.getAnalysis().equals(rightData.getAnalysis())) {
- wrongCount += 1;
+
+ //字段全部都取客户的
+ if (stuData.getMethodTypeId().equals("生命价值法")) {
+ //预计退休年龄-客户
+ if (stuData.getEduAmountb() == null || stuData.getEduAmountb().compareTo(rightData.getEduAmountb()) != 0) {
+ wrongCount += 1;
+ }//投资报酬率-客户
+ if (stuData.getReturnOnInvestmentb() == null || stuData.getReturnOnInvestmentb().compareTo(rightData.getReturnOnInvestmentb()) != 0) {
+ wrongCount += 1;
+ }//配偶的个人年收入-客户
+ if (stuData.getIncomeb() == null || stuData.getIncomeb().compareTo(rightData.getIncomeb()) != 0) {
+ wrongCount += 1;
+ }//收入增长率-客户
+ if (stuData.getRevenueGrowthb() == null || stuData.getRevenueGrowthb().compareTo(rightData.getRevenueGrowthb()) != 0) {
+ wrongCount += 1;
+ }//年支出
+ if (stuData.getExpenditure() == null || stuData.getExpenditure().compareTo(rightData.getExpenditure()) != 0) {
+ wrongCount += 1;
+ }//通货膨胀率-客户
+ if (stuData.getInflationRateb() == null || stuData.getInflationRateb().compareTo(rightData.getInflationRateb()) != 0) {
+ wrongCount += 1;
+ }//已有额度-客户
+ if (stuData.getInsuranceAmountb() == null || stuData.getInsuranceAmountb().compareTo(rightData.getInsuranceAmountb()) != 0) {
+ wrongCount += 1;
+ }//预算金额-客户
+ if (stuData.getBudgetAmountb() == null || stuData.getBudgetAmountb().compareTo(rightData.getBudgetAmountb()) != 0) {
+ wrongCount += 1;
+ }//补充额度-客户
+ if (stuData.getSupplementaryQuotab() == null || stuData.getSupplementaryQuotab().compareTo(rightData.getSupplementaryQuotab()) != 0) {
+ wrongCount += 1;
+ }
}
}
return wrongCount;
@@ -1386,91 +1273,46 @@ public class CaseServiceImpl implements CaseService {
List<CaseRetirementPlan> caseRetirementPlans = caseRetirementPlanMapper.selectByExampleWithBLOBs(example);
if (caseRetirementPlans != null && !caseRetirementPlans.isEmpty()) {
CaseRetirementPlan rightData = caseRetirementPlans.get(0);
-
- if (stuData.getAge() == null || !stuData.getAge().equals(rightData.getAge())) {
- wrongCount += 1;
- }
+ //退休前通货膨胀率
if (stuData.getBeforeInflationRate() == null || stuData.getBeforeInflationRate().compareTo(rightData.getBeforeInflationRate()) != 0) {
wrongCount += 1;
- }
+ }//退休后通货膨胀率
if (stuData.getAfterInflationRate() == null || stuData.getAfterInflationRate().compareTo(rightData.getAfterInflationRate()) != 0) {
wrongCount += 1;
- }
+ }//退休后投资收益率
if (stuData.getRetirementRate() == null || stuData.getRetirementRate().compareTo(rightData.getRetirementRate()) != 0) {
wrongCount += 1;
- }
- if (stuData.getSociaSecurityRate() == null || stuData.getSociaSecurityRate().compareTo(rightData.getSociaSecurityRate()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getRentRate() == null || stuData.getRentRate().compareTo(rightData.getRentRate()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getOtherRate() == null || stuData.getOtherRate().compareTo(rightData.getOtherRate()) != 0) {
- wrongCount += 1;
- }
+ }//计划退休年龄
if (stuData.getRetirementAge() == null || !stuData.getRetirementAge().equals(rightData.getRetirementAge())) {
wrongCount += 1;
- }
+ }//希望享有退休生活年限
if (stuData.getRetirementYears() == null || !stuData.getRetirementYears().equals(rightData.getRetirementYears())) {
wrongCount += 1;
- }
+ }//目前生活水平
if (stuData.getLivingStandardNow() == null || !stuData.getLivingStandardNow().equals(rightData.getLivingStandardNow())) {
wrongCount += 1;
- }
+ }//生活满意度
if (stuData.getSatisfaction() == null || !stuData.getSatisfaction().equals(rightData.getSatisfaction())) {
wrongCount += 1;
- }
- if (stuData.getSatisfactionLivingStandard() == null || !stuData.getSatisfactionLivingStandard().equals(rightData.getSatisfactionLivingStandard())) {
- wrongCount += 1;
- }
+ }//退休后、退休前生活水平折算比例
if (stuData.getConvertProportion() == null || stuData.getConvertProportion().compareTo(rightData.getConvertProportion()) != 0) {
wrongCount += 1;
- }
+ }//子女传承费用
if (stuData.getLineageFee() == null || stuData.getLineageFee().compareTo(rightData.getLineageFee()) != 0) {
wrongCount += 1;
- }
- if (stuData.getRetirementLivingStandard() == null || !stuData.getRetirementLivingStandard().equals(rightData.getRetirementLivingStandard())) {
- wrongCount += 1;
- }
- if (stuData.getAfterLivingStandard() == null || !stuData.getAfterLivingStandard().equals(rightData.getAfterLivingStandard())) {
- wrongCount += 1;
- }
+ }//社会保险
if (stuData.getSocialInsurance() == null || stuData.getSocialInsurance().compareTo(rightData.getSocialInsurance()) != 0) {
wrongCount += 1;
- }
+ }//商业保险
if (stuData.getCommercialInsurance() == null || stuData.getCommercialInsurance().compareTo(rightData.getCommercialInsurance()) != 0) {
wrongCount += 1;
- }
+ }//租金收入
if (stuData.getRentIncome() == null || stuData.getRentIncome().compareTo(rightData.getRentIncome()) != 0) {
wrongCount += 1;
- }
+ }//其他收入
if (stuData.getOtherIncome() == null || stuData.getOtherIncome().compareTo(rightData.getOtherIncome()) != 0) {
wrongCount += 1;
}
- if (stuData.getTotalIncome() == null || stuData.getTotalIncome().compareTo(rightData.getTotalIncome()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getTotalAmount() == null || stuData.getTotalAmount().compareTo(rightData.getTotalAmount()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getReturnOnInvestmentRate() == null || stuData.getReturnOnInvestmentRate().compareTo(rightData.getReturnOnInvestmentRate()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getDisposableInput() == null || stuData.getDisposableInput().compareTo(rightData.getDisposableInput()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getMonthlyInvestment() == null || stuData.getMonthlyInvestment().compareTo(rightData.getMonthlyInvestment()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getRegularYear() == null || !stuData.getRegularYear().equals(rightData.getRegularYear())) {
- wrongCount += 1;
- }
- if (stuData.getTargetAmount() == null || stuData.getTargetAmount().compareTo(rightData.getTargetAmount()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getAnalysis() == null || !stuData.getAnalysis().equals(rightData.getAnalysis())) {
- wrongCount += 1;
- }
}
return wrongCount;
}
@@ -1481,37 +1323,13 @@ public class CaseServiceImpl implements CaseService {
List<CaseStartAnUndertakingPlan> caseStartAnUndertakingPlans = caseStartAnUndertakingPlanMapper.selectByExampleWithBLOBs(example);
if (caseStartAnUndertakingPlans != null && !caseStartAnUndertakingPlans.isEmpty()) {
CaseStartAnUndertakingPlan rightData = caseStartAnUndertakingPlans.get(0);
-
- if (stuData.getAge() == null || !stuData.getAge().equals(rightData.getAge())) {
- wrongCount += 1;
- }
+ //计划创业年龄
if (stuData.getStartPlanAge() == null || !stuData.getStartPlanAge().equals(rightData.getStartPlanAge())) {
wrongCount += 1;
- }
- if (stuData.getDistanceYear() == null || !stuData.getDistanceYear().equals(rightData.getDistanceYear())) {
- wrongCount += 1;
- }
+ }//创业时一次性投入金额
if (stuData.getCostInput() == null || stuData.getCostInput().compareTo(rightData.getCostInput()) != 0) {
wrongCount += 1;
}
- if (stuData.getReturnOnInvestmentRate() == null || stuData.getReturnOnInvestmentRate().compareTo(rightData.getReturnOnInvestmentRate()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getDisposableInput() == null || stuData.getDisposableInput().compareTo(rightData.getDisposableInput()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getMonthlyInvestment() == null || stuData.getMonthlyInvestment().compareTo(rightData.getMonthlyInvestment()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getRegularYear() == null || !stuData.getRegularYear().equals(rightData.getRegularYear())) {
- wrongCount += 1;
- }
- if (stuData.getTargetAmount() == null || stuData.getTargetAmount().compareTo(rightData.getTargetAmount()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getAnalysis() == null || !stuData.getAnalysis().equals(rightData.getAnalysis())) {
- wrongCount += 1;
- }
}
return wrongCount;
}
@@ -1522,134 +1340,116 @@ public class CaseServiceImpl implements CaseService {
List<CaseLifeEducationPlan> caseLifeEducationPlans = caseLifeEducationPlanMapper.selectByExampleWithBLOBs(example);
if (caseLifeEducationPlans != null && !caseLifeEducationPlans.isEmpty()) {
CaseLifeEducationPlan rightData = caseLifeEducationPlans.get(0);
-
+ //子女年龄
if (stuData.getChildAge() == null || !stuData.getChildAge().equals(rightData.getChildAge())) {
wrongCount += 1;
- }
+ }//国内学费增长率
if (stuData.getInlandEduFee() == null || stuData.getInlandEduFee().compareTo(rightData.getInlandEduFee()) != 0) {
wrongCount += 1;
}
-
+ //国外学费增长率
if (stuData.getForeignEduFee() == null || stuData.getForeignEduFee().compareTo(rightData.getForeignEduFee()) != 0) {
wrongCount += 1;
- }
+ }//A求学年龄
if (stuData.getaEduAge() == null || !stuData.getaEduAge().equals(rightData.getaEduAge())) {
wrongCount += 1;
- }
+ }//A求学时间
if (stuData.getaEduTime() == null || !stuData.getaEduTime().equals(rightData.getaEduTime())) {
wrongCount += 1;
- }
+ }//A目前学费
if (stuData.getaTuition() == null || stuData.getaTuition().compareTo(rightData.getaTuition()) != 0) {
wrongCount += 1;
- }
+ }//A上学时学费
if (stuData.getaEduTuition() == null || stuData.getaEduTuition().compareTo(rightData.getaEduTuition()) != 0) {
wrongCount += 1;
- }
+ }//A上学前需准备的总学费
if (stuData.getaTotalTuition() == null || stuData.getaTotalTuition().compareTo(rightData.getaTotalTuition()) != 0) {
wrongCount += 1;
- }
+ }//B求学年龄
if (stuData.getbEduAge() == null || !stuData.getbEduAge().equals(rightData.getbEduAge())) {
wrongCount += 1;
- }
+ }//B求学时间
if (stuData.getbEduTime() == null || !stuData.getbEduTime().equals(rightData.getbEduTime())) {
wrongCount += 1;
- }
+ }//B目前学费
if (stuData.getbTuition() == null || stuData.getbTuition().compareTo(rightData.getbTuition()) != 0) {
wrongCount += 1;
- }
+ }//B上学时学费
if (stuData.getbEduTuition() == null || stuData.getbEduTuition().compareTo(rightData.getbEduTuition()) != 0) {
wrongCount += 1;
- }
+ }//B上学前需准备的总学费
if (stuData.getbTotalTuition() == null || stuData.getbTotalTuition().compareTo(rightData.getbTotalTuition()) != 0) {
wrongCount += 1;
- }
+ }//C求学年龄
if (stuData.getcEduAge() == null || !stuData.getcEduAge().equals(rightData.getcEduAge())) {
wrongCount += 1;
- }
+ }//C求学时间
if (stuData.getcEduTime() == null || !stuData.getcEduTime().equals(rightData.getcEduTime())) {
wrongCount += 1;
- }
+ }//C目前学费
if (stuData.getcTuition() == null || stuData.getcTuition().compareTo(rightData.getcTuition()) != 0) {
wrongCount += 1;
- }
+ }//C上学时学费
if (stuData.getcEduTuition() == null || stuData.getcEduTuition().compareTo(rightData.getcEduTuition()) != 0) {
wrongCount += 1;
- }
+ }//C上学前需准备的总学费
if (stuData.getcTotalTuition() == null || stuData.getcTotalTuition().compareTo(rightData.getcTotalTuition()) != 0) {
wrongCount += 1;
- }
+ }//D求学年龄
if (stuData.getdEduAge() == null || !stuData.getdEduAge().equals(rightData.getdEduAge())) {
wrongCount += 1;
- }
+ }//D求学时间
if (stuData.getdEduTime() == null || !stuData.getdEduTime().equals(rightData.getdEduTime())) {
wrongCount += 1;
- }
+ }//D目前学费
if (stuData.getdTuition() == null || stuData.getdTuition().compareTo(rightData.getdTuition()) != 0) {
wrongCount += 1;
- }
+ }//D上学时学费
if (stuData.getdEduTuition() == null || stuData.getdEduTuition().compareTo(rightData.getdEduTuition()) != 0) {
wrongCount += 1;
- }
+ }//D上学前需准备的总学费
if (stuData.getdTotalTuition() == null || stuData.getdTotalTuition().compareTo(rightData.getdTotalTuition()) != 0) {
wrongCount += 1;
- }
+ }//E求学年龄
if (stuData.geteEduAge() == null || !stuData.geteEduAge().equals(rightData.geteEduAge())) {
wrongCount += 1;
- }
+ }//E求学时间
if (stuData.geteEduTime() == null || !stuData.geteEduTime().equals(rightData.geteEduTime())) {
wrongCount += 1;
- }
+ }//E目前学费
if (stuData.geteTuition() == null || stuData.geteTuition().compareTo(rightData.geteTuition()) != 0) {
wrongCount += 1;
- }
+ }//E上学时学费
if (stuData.geteEduTuition() == null || stuData.geteEduTuition().compareTo(rightData.geteEduTuition()) != 0) {
wrongCount += 1;
- }
+ }//E上学前需准备的总学费
if (stuData.geteTotalTuition() == null || stuData.geteTotalTuition().compareTo(rightData.geteTotalTuition()) != 0) {
wrongCount += 1;
- }
+ }//F求学年龄
if (stuData.getfEduAge() == null || !stuData.getfEduAge().equals(rightData.getfEduAge())) {
wrongCount += 1;
- }
+ }//F求学时间
if (stuData.getfEduTime() == null || !stuData.getfEduTime().equals(rightData.getfEduTime())) {
wrongCount += 1;
- }
+ }//F目前学费
if (stuData.getfTuition() == null || stuData.getfTuition().compareTo(rightData.getfTuition()) != 0) {
wrongCount += 1;
- }
+ }//F上学时学费
if (stuData.getfEduTuition() == null || stuData.getfEduTuition().compareTo(rightData.getfEduTuition()) != 0) {
wrongCount += 1;
- }
+ }//F上学前需准备的总学费
if (stuData.getfTotalTuition() == null || stuData.getfTotalTuition().compareTo(rightData.getfTotalTuition()) != 0) {
wrongCount += 1;
- }
+ }//商业保险
if (stuData.getInsurance() == null || stuData.getInsurance().compareTo(rightData.getInsurance()) != 0) {
wrongCount += 1;
- }
+ }//储蓄计划
if (stuData.getDeposit() == null || stuData.getDeposit().compareTo(rightData.getDeposit()) != 0) {
wrongCount += 1;
- }
+ }//其他安排
if (stuData.getOther() == null || stuData.getOther().compareTo(rightData.getOther()) != 0) {
wrongCount += 1;
}
- if (stuData.getEduTotalAmount() == null || stuData.getEduTotalAmount().compareTo(rightData.getEduTotalAmount()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getReturnOnInvestment() == null || stuData.getReturnOnInvestment().compareTo(rightData.getReturnOnInvestment()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getDisposableInput() == null || stuData.getDisposableInput().compareTo(rightData.getDisposableInput()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getMonthlyInvestment() == null || stuData.getMonthlyInvestment().compareTo(rightData.getMonthlyInvestment()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getRegularYear() == null || !stuData.getRegularYear().equals(rightData.getRegularYear())) {
- wrongCount += 1;
- }
- if (stuData.getTargetAmount() == null || stuData.getTargetAmount().compareTo(rightData.getTargetAmount()) != 0) {
- wrongCount += 1;
- }
}
return wrongCount;
}
@@ -1660,44 +1460,10 @@ public class CaseServiceImpl implements CaseService {
List<CaseCashPlan> caseCashPlans = caseCashPlanMapper.selectByExampleWithBLOBs(example);
if (caseCashPlans != null && !caseCashPlans.isEmpty()) {
CaseCashPlan rightData = caseCashPlans.get(0);
+ //家庭月支出
if (stuData.getFamilyMonthExpense() == null || rightData.getFamilyMonthExpense().compareTo(stuData.getFamilyMonthExpense()) != 0) {
wrongCount += 1;
}
- if (StringUtils.isBlank(stuData.getRetainCashType())
- || !stuData.getRetainCashType().equals(rightData.getRetainCashType())) {
- wrongCount += 1;
- }
- if (stuData.getDeposit() == null || rightData.getDeposit().compareTo(stuData.getDeposit()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getFund() == null || rightData.getFund().compareTo(stuData.getFund()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getCreditCard() == null || rightData.getCreditCard().compareTo(stuData.getCreditCard()) != 0) {
- wrongCount += 1;
- }
- }
- return wrongCount;
- }
-
- private int getCaseFinancialRatiosWrongCount(int wrongCount, CaseFinancialRatiosWithBLOBs stuData) {
- CaseFinancialRatiosExample example = new CaseFinancialRatiosExample();
- example.createCriteria().andCaseidEqualTo(stuData.getCaseid()).andIsAnswerEqualTo("题目答案");
- List<CaseFinancialRatiosWithBLOBs> caseFinancialRatiosWithBLOBs = caseFinancialRatiosMapper.selectByExampleWithBLOBs(example);
- if (caseFinancialRatiosWithBLOBs != null && !caseFinancialRatiosWithBLOBs.isEmpty()) {
- CaseFinancialRatiosWithBLOBs rightData = caseFinancialRatiosWithBLOBs.get(0);
- if (StringUtils.isBlank(stuData.getLiabilityAnalysis())
- || !stuData.getLiabilityAnalysis().equals(rightData.getLiabilityAnalysis())) {
- wrongCount += 1;
- }
- if (StringUtils.isBlank(stuData.getIncomeAndExpensesAnalysis())
- || !stuData.getIncomeAndExpensesAnalysis().equals(rightData.getIncomeAndExpensesAnalysis())) {
- wrongCount += 1;
- }
- if (StringUtils.isBlank(stuData.getAnalysis())
- || !stuData.getAnalysis().equals(rightData.getAnalysis())) {
- wrongCount += 1;
- }
}
return wrongCount;
}
@@ -1708,33 +1474,19 @@ public class CaseServiceImpl implements CaseService {
List<CaseCashFlow> caseCashFlows = caseCashFlowMapper.selectByExample(example);
if (caseCashFlows != null && !caseCashFlows.isEmpty()) {
CaseCashFlow rightData = caseCashFlows.get(0);
+ //投资赎回
if (stuData.getRedemption() == null || stuData.getRedemption().compareTo(rightData.getRedemption()) != 0) {
wrongCount += 1;
- }
+ }//新增投资
if (stuData.getInvestment() == null || stuData.getInvestment().compareTo(rightData.getInvestment()) != 0) {
wrongCount += 1;
- }
+ }//借入本金
if (stuData.getBorrowCapital() == null || stuData.getBorrowCapital().compareTo(rightData.getBorrowCapital()) != 0) {
wrongCount += 1;
- }
+ }//还款本金
if (stuData.getRepaymentCapital() == null || stuData.getRepaymentCapital().compareTo(rightData.getRepaymentCapital()) != 0) {
wrongCount += 1;
}
- if (stuData.getWorkIncome() == null || stuData.getWorkIncome().compareTo(rightData.getWorkIncome()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getLiveExpense() == null || stuData.getLiveExpense().compareTo(rightData.getLiveExpense()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getInvestIncome() == null || stuData.getInvestIncome().compareTo(rightData.getInvestIncome()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getInterestExpense() == null || stuData.getInterestExpense().compareTo(rightData.getInterestExpense()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getInsuranceExpense() == null || stuData.getInsuranceExpense().compareTo(rightData.getInsuranceExpense()) != 0) {
- wrongCount += 1;
- }
}
return wrongCount;
}
@@ -1746,45 +1498,46 @@ public class CaseServiceImpl implements CaseService {
if (caseIncomeAndExpenses != null && !caseIncomeAndExpenses.isEmpty()) {
CaseIncomeAndExpenses rightData = caseIncomeAndExpenses.get(0);
+ //薪资收入
if (stuData.getJobIncome() == null || stuData.getJobIncome().compareTo(rightData.getJobIncome()) != 0) {
wrongCount += 1;
- }
+ }//养老保险储蓄
if (stuData.getEndowmentInsurance() == null || stuData.getEndowmentInsurance().compareTo(rightData.getEndowmentInsurance()) != 0) {
wrongCount += 1;
- }
+ }//医疗保险储蓄
if (stuData.getMedicalInsurance() == null || stuData.getMedicalInsurance().compareTo(rightData.getMedicalInsurance()) != 0) {
wrongCount += 1;
- }
+ }//住房公积金储蓄
if (stuData.getHousingFund() == null || stuData.getHousingFund().compareTo(rightData.getHousingFund()) != 0) {
wrongCount += 1;
- }
+ }//其他工作收入
if (stuData.getOtherJobIncome() == null || stuData.getOtherJobIncome().compareTo(rightData.getOtherJobIncome()) != 0) {
wrongCount += 1;
- }
+ }//家计支出
if (stuData.getFamilyExpense() == null || stuData.getFamilyExpense().compareTo(rightData.getFamilyExpense()) != 0) {
wrongCount += 1;
- }
+ }//子女教育支出
if (stuData.getChildExpense() == null || stuData.getChildExpense().compareTo(rightData.getChildExpense()) != 0) {
wrongCount += 1;
- }
+ }//其他支出
if (stuData.getOtherExpense() == null || stuData.getOtherExpense().compareTo(rightData.getOtherExpense()) != 0) {
wrongCount += 1;
- }
+ }//利息收入
if (stuData.getInterest() == null || stuData.getInterest().compareTo(rightData.getInterest()) != 0) {
wrongCount += 1;
- }
+ }//资本利得
if (stuData.getCapitalGains() == null || stuData.getCapitalGains().compareTo(rightData.getCapitalGains()) != 0) {
wrongCount += 1;
- }
+ }//其他理财收入
if (stuData.getOtherIncome() == null || stuData.getOtherIncome().compareTo(rightData.getOtherIncome()) != 0) {
wrongCount += 1;
- }
+ }//利息支出
if (stuData.getInterestExpense() == null || stuData.getInterestExpense().compareTo(rightData.getInterestExpense()) != 0) {
wrongCount += 1;
- }
+ }//保障型保费支出
if (stuData.getInsuranceExpense() == null || stuData.getInsuranceExpense().compareTo(rightData.getInsuranceExpense()) != 0) {
wrongCount += 1;
- }
+ }//其他理财支出
if (stuData.getOtherFinanceExpense() == null || stuData.getOtherFinanceExpense().compareTo(rightData.getOtherFinanceExpense()) != 0) {
wrongCount += 1;
}
@@ -1799,91 +1552,83 @@ public class CaseServiceImpl implements CaseService {
if (caseFinanceLiabilities != null && !caseFinanceLiabilities.isEmpty()) {
CaseFinanceLiability rightData = caseFinanceLiabilities.get(0);
+ //现金
if (stuData.getCash() == null || rightData.getCash().compareTo(stuData.getCash()) != 0) {
wrongCount += 1;
- }
+ }//人民币银行活存
if (stuData.getRmbDeposit() == null || rightData.getRmbDeposit().compareTo(stuData.getRmbDeposit()) != 0) {
wrongCount += 1;
- }
+ }//其他流动资产
if (stuData.getOtherAsset() == null || rightData.getOtherAsset().compareTo(stuData.getOtherAsset()) != 0) {
wrongCount += 1;
- }
+ }//人民币银行定存
if (stuData.getRmbFixedDeposit() == null || rightData.getRmbFixedDeposit().compareTo(stuData.getRmbFixedDeposit()) != 0) {
wrongCount += 1;
- }
+ }//外币银行定存
if (stuData.getForeignCurrencyFixedDeposit() == null
|| rightData.getForeignCurrencyFixedDeposit().compareTo(stuData.getForeignCurrencyFixedDeposit()) != 0) {
wrongCount += 1;
- }
+ }//股票投资
if (stuData.getStockInvestment() == null || rightData.getStockInvestment().compareTo(stuData.getStockInvestment()) != 0) {
wrongCount += 1;
- }
+ }//债券投资
if (stuData.getBondInvestment() == null || rightData.getBondInvestment().compareTo(stuData.getBondInvestment()) != 0) {
wrongCount += 1;
- }
+ }//基金投资
if (stuData.getFundInvestment() == null || rightData.getFundInvestment().compareTo(stuData.getFundInvestment()) != 0) {
wrongCount += 1;
- }
+ }//实业投资
if (stuData.getIndustryInvestment() == null || rightData.getIndustryInvestment().compareTo(stuData.getIndustryInvestment()) != 0) {
wrongCount += 1;
- }
+ }//投资性房地产
if (stuData.getEstateInvestment() == null || rightData.getEstateInvestment().compareTo(stuData.getEstateInvestment()) != 0) {
wrongCount += 1;
- }
+ }//保单现金价值
if (stuData.getPolicyInvestment() == null || rightData.getPolicyInvestment().compareTo(stuData.getPolicyInvestment()) != 0) {
wrongCount += 1;
- }
+ }//其他投资性资产
if (stuData.getOtherInvestment() == null || rightData.getOtherInvestment().compareTo(stuData.getOtherInvestment()) != 0) {
wrongCount += 1;
- }
+ }//自用房地产
if (stuData.getEstate() == null || rightData.getEstate().compareTo(stuData.getEstate()) != 0) {
wrongCount += 1;
- }
+ }//自用汽车
if (stuData.getCar() == null || rightData.getCar().compareTo(stuData.getCar()) != 0) {
wrongCount += 1;
- }
+ }//自用其他资产
if (stuData.getOthers() == null || rightData.getOthers().compareTo(stuData.getOthers()) != 0) {
wrongCount += 1;
- }
- if (stuData.getTotalAssets() == null || rightData.getTotalAssets().compareTo(stuData.getTotalAssets()) != 0) {
- wrongCount += 1;
- }
+ }//信用卡欠款
if (stuData.getCreditCard() == null || rightData.getCreditCard().compareTo(stuData.getCreditCard()) != 0) {
wrongCount += 1;
- }
+ }//小额消费信贷
if (stuData.getMicrofinance() == null || rightData.getMicrofinance().compareTo(stuData.getMicrofinance()) != 0) {
wrongCount += 1;
- }
+ }//其他消费性负债
if (stuData.getOtherLoan() == null || rightData.getOtherLoan().compareTo(stuData.getOtherLoan()) != 0) {
wrongCount += 1;
- }
+ }//金融投资借款
if (stuData.getFinancialLoan() == null || rightData.getFinancialLoan().compareTo(stuData.getFinancialLoan()) != 0) {
wrongCount += 1;
- }
+ }//实业投资借款
if (stuData.getIndustryInvestmentLoan() == null || rightData.getIndustryInvestmentLoan().compareTo(stuData.getIndustryInvestmentLoan()) != 0) {
wrongCount += 1;
- }
+ }//投资性房地产按揭贷款
if (stuData.getEstateInvestmentLoan() == null || rightData.getEstateInvestmentLoan().compareTo(stuData.getEstateInvestmentLoan()) != 0) {
wrongCount += 1;
- }
+ }//其他投资性负债
if (stuData.getOtherInvestmentLoan() == null || rightData.getOtherInvestmentLoan().compareTo(stuData.getOtherInvestmentLoan()) != 0) {
wrongCount += 1;
- }
+ }//自用房地产贷款
if (stuData.getEstateLoan() == null || rightData.getEstateLoan().compareTo(stuData.getEstateLoan()) != 0) {
wrongCount += 1;
- }
+ }//自用汽车贷款
if (stuData.getCarLoan() == null || rightData.getCarLoan().compareTo(stuData.getCarLoan()) != 0) {
wrongCount += 1;
- }
+ }//其他自用贷款
if (stuData.getOthersLoan() == null || rightData.getOthersLoan().compareTo(stuData.getOthersLoan()) != 0) {
wrongCount += 1;
}
- if (stuData.getTotalLoan() == null || rightData.getTotalLoan().compareTo(stuData.getTotalLoan()) != 0) {
- wrongCount += 1;
- }
- if (stuData.getTotalNet() == null || rightData.getTotalNet().compareTo(stuData.getTotalNet()) != 0) {
- wrongCount += 1;
- }
}
return wrongCount;
}
@@ -1896,47 +1641,42 @@ public class CaseServiceImpl implements CaseService {
if (caseRiskIndices != null && !caseRiskIndices.isEmpty()) {
CaseRiskIndex rightRiskIndex = caseRiskIndices.get(0);
- if (stuRiskIndex.getAdiScore() == null || rightRiskIndex.getAdiScore().compareTo(stuRiskIndex.getAdiScore()) != 0) {
- wrongCount += 1;
- }
+ //年龄
if (stuRiskIndex.getAgeScore() == null || rightRiskIndex.getAgeScore().compareTo(stuRiskIndex.getAgeScore()) != 0) {
wrongCount += 1;
- }
- if (stuRiskIndex.getAvoidScore() == null || rightRiskIndex.getAvoidScore().compareTo(stuRiskIndex.getAvoidScore()) != 0) {
- wrongCount += 1;
- }
- if (stuRiskIndex.getCharacterScore() == null || rightRiskIndex.getCharacterScore().compareTo(stuRiskIndex.getCharacterScore()) != 0) {
- wrongCount += 1;
- }
- if (stuRiskIndex.getConsiderationScore() == null || rightRiskIndex.getConsiderationScore().compareTo(stuRiskIndex.getConsiderationScore()) != 0) {
- wrongCount += 1;
- }
- if (stuRiskIndex.getExpScore() == null || rightRiskIndex.getExpScore().compareTo(stuRiskIndex.getExpScore()) != 0) {
- wrongCount += 1;
- }
+ }//就业状况
if (stuRiskIndex.getJobScore() == null || rightRiskIndex.getJobScore().compareTo(stuRiskIndex.getJobScore()) != 0) {
wrongCount += 1;
- }
+ }//家庭负担
if (stuRiskIndex.getFamilyScore() == null || rightRiskIndex.getFamilyScore().compareTo(stuRiskIndex.getFamilyScore()) != 0) {
wrongCount += 1;
- }
+ }//置产状况
if (stuRiskIndex.getHouseScore() == null || rightRiskIndex.getHouseScore().compareTo(stuRiskIndex.getHouseScore()) != 0) {
wrongCount += 1;
- }
- if (stuRiskIndex.getKnowledgeScore() == null || rightRiskIndex.getKnowledgeScore().compareTo(stuRiskIndex.getKnowledgeScore()) != 0) {
+ }//投资经验
+ if (stuRiskIndex.getExpScore() == null || rightRiskIndex.getExpScore().compareTo(stuRiskIndex.getExpScore()) != 0) {
wrongCount += 1;
- }
- if (stuRiskIndex.getRciScore() == null || rightRiskIndex.getRciScore().compareTo(stuRiskIndex.getRciScore()) != 0) {
+ }//投资知识
+ if (stuRiskIndex.getKnowledgeScore() == null || rightRiskIndex.getKnowledgeScore().compareTo(stuRiskIndex.getKnowledgeScore()) != 0) {
wrongCount += 1;
- }
+ }//忍受亏损百分比
if (stuRiskIndex.getTolerateScore() == null || rightRiskIndex.getTolerateScore().compareTo(stuRiskIndex.getTolerateScore()) != 0) {
wrongCount += 1;
- }
- if (stuRiskIndex.getMentalityScore() == null || rightRiskIndex.getMentalityScore().compareTo(stuRiskIndex.getMentalityScore()) != 0) {
+ }//首要考虑
+ if (stuRiskIndex.getConsiderationScore() == null || rightRiskIndex.getConsiderationScore().compareTo(stuRiskIndex.getConsiderationScore()) != 0) {
wrongCount += 1;
- }
+ }//认赔动作
if (stuRiskIndex.getLossScore() == null || rightRiskIndex.getLossScore().compareTo(stuRiskIndex.getLossScore()) != 0) {
wrongCount += 1;
+ }//赔钱心理
+ if (stuRiskIndex.getMentalityScore() == null || rightRiskIndex.getMentalityScore().compareTo(stuRiskIndex.getMentalityScore()) != 0) {
+ wrongCount += 1;
+ }//最重要特性
+ if (stuRiskIndex.getCharacterScore() == null || rightRiskIndex.getCharacterScore().compareTo(stuRiskIndex.getCharacterScore()) != 0) {
+ wrongCount += 1;
+ }//避免工具
+ if (stuRiskIndex.getAvoidScore() == null || rightRiskIndex.getAvoidScore().compareTo(stuRiskIndex.getAvoidScore()) != 0) {
+ wrongCount += 1;
}
}
return wrongCount;
@@ -2108,37 +1848,37 @@ public class CaseServiceImpl implements CaseService {
if (investmentPlanSelects != null && !investmentPlanSelects.isEmpty()) {
for (CaseInvestmentPlanSelect investmentPlanSelect : investmentPlanSelects) {
- CaseInvestmentPlanSelectDto caseInvestmentPlanSelectDto =new CaseInvestmentPlanSelectDto();
+ CaseInvestmentPlanSelectDto caseInvestmentPlanSelectDto = new CaseInvestmentPlanSelectDto();
caseInvestmentPlanSelectDto.setCaseInvestmentPlanSelect(investmentPlanSelect);
String productSelectId = investmentPlanSelect.getProductSelectId();
//set剩余五张表
//投资规划-银行储蓄信息表
- CaseInvestmentPlanBankProductInfoExample investmentPlanBankProductInfoExample =new CaseInvestmentPlanBankProductInfoExample();
+ CaseInvestmentPlanBankProductInfoExample investmentPlanBankProductInfoExample = new CaseInvestmentPlanBankProductInfoExample();
investmentPlanBankProductInfoExample.createCriteria().andProductSelectIdEqualTo(productSelectId);
List<CaseInvestmentPlanBankProductInfo> caseInvestmentPlanBankProductInfos = investmentPlanBankProductInfoMapper.selectByExample(investmentPlanBankProductInfoExample);
caseInvestmentPlanSelectDto.setInvestmentPlanBankProductInfos(caseInvestmentPlanBankProductInfos);
//投资规划-基金产品信息表
- CaseInvestmentPlanFundProductInfoExample investmentPlanFundProductInfoExample =new CaseInvestmentPlanFundProductInfoExample();
+ CaseInvestmentPlanFundProductInfoExample investmentPlanFundProductInfoExample = new CaseInvestmentPlanFundProductInfoExample();
investmentPlanFundProductInfoExample.createCriteria().andProductSelectIdEqualTo(productSelectId);
- List<CaseInvestmentPlanFundProductInfo> caseInvestmentPlanFundProductInfos = investmentPlanFundProductInfoMapper.selectByExample(investmentPlanFundProductInfoExample);
+ List<CaseInvestmentPlanFundProductInfo> caseInvestmentPlanFundProductInfos = investmentPlanFundProductInfoMapper.selectByExample(investmentPlanFundProductInfoExample);
caseInvestmentPlanSelectDto.setInvestmentPlanFundProductInfos(caseInvestmentPlanFundProductInfos);
//投资规划-保险产品信息表
- CaseInvestmentPlanInsuranceProductInfoExample investmentPlanInsuranceProductInfoExample =new CaseInvestmentPlanInsuranceProductInfoExample();
+ CaseInvestmentPlanInsuranceProductInfoExample investmentPlanInsuranceProductInfoExample = new CaseInvestmentPlanInsuranceProductInfoExample();
investmentPlanInsuranceProductInfoExample.createCriteria().andProductSelectIdEqualTo(productSelectId);
- List<CaseInvestmentPlanInsuranceProductInfo> caseInvestmentPlanInsuranceProductInfos = investmentPlanInsuranceProductInfoMapper.selectByExample(investmentPlanInsuranceProductInfoExample);
+ List<CaseInvestmentPlanInsuranceProductInfo> caseInvestmentPlanInsuranceProductInfos = investmentPlanInsuranceProductInfoMapper.selectByExample(investmentPlanInsuranceProductInfoExample);
caseInvestmentPlanSelectDto.setInvestmentPlanInsuranceProductInfos(caseInvestmentPlanInsuranceProductInfos);
//投资规划-P2P产品信息表
- CaseInvestmentPlanP2PProductInfoExample caseInvestmentPlanP2PProductInfoExample =new CaseInvestmentPlanP2PProductInfoExample();
+ CaseInvestmentPlanP2PProductInfoExample caseInvestmentPlanP2PProductInfoExample = new CaseInvestmentPlanP2PProductInfoExample();
caseInvestmentPlanP2PProductInfoExample.createCriteria().andProductSelectIdEqualTo(productSelectId);
List<CaseInvestmentPlanP2PProductInfo> caseInvestmentPlanP2PProductInfos = investmentPlanP2PProductInfoMapper.selectByExample(caseInvestmentPlanP2PProductInfoExample);
caseInvestmentPlanSelectDto.setInvestmentPlanP2PProductInfos(caseInvestmentPlanP2PProductInfos);
//投资规划-实物黄金信息表
- CaseInvestmentPlanRealGoldProductInfoExample caseInvestmentPlanRealGoldProductInfoExample =new CaseInvestmentPlanRealGoldProductInfoExample();
+ CaseInvestmentPlanRealGoldProductInfoExample caseInvestmentPlanRealGoldProductInfoExample = new CaseInvestmentPlanRealGoldProductInfoExample();
caseInvestmentPlanRealGoldProductInfoExample.createCriteria().andProductSelectIdEqualTo(productSelectId);
List<CaseInvestmentPlanRealGoldProductInfo> caseInvestmentPlanRealGoldProductInfos = investmentPlanRealGoldProductInfoMapper.selectByExample(caseInvestmentPlanRealGoldProductInfoExample);
caseInvestmentPlanSelectDto.setInvestmentPlanRealGoldProductInfos(caseInvestmentPlanRealGoldProductInfos);
diff --git a/src/main/java/com/sztzjy/money_management/service/impl/SynthesisPlanServiceImpl.java b/src/main/java/com/sztzjy/money_management/service/impl/SynthesisPlanServiceImpl.java
index 9d1de36..a9c10cd 100644
--- a/src/main/java/com/sztzjy/money_management/service/impl/SynthesisPlanServiceImpl.java
+++ b/src/main/java/com/sztzjy/money_management/service/impl/SynthesisPlanServiceImpl.java
@@ -10,10 +10,7 @@ import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @Author xcj
@@ -227,8 +224,23 @@ public class SynthesisPlanServiceImpl implements SynthesisPlanService {
} else {
typeList.add(caseInfo.getManageMoneyMattersType());
}
+
+ //综合规划算分 学生客户信息是否填写正确
+ SynthesisPlanClientExample synthesisPlanClientExample = new SynthesisPlanClientExample();
+ synthesisPlanClientExample.createCriteria().andCaseidEqualTo(caseID).andUseridEqualTo(userId);
+ List<SynthesisPlanClient> synthesisPlanClientList = synthesisPlanClientMapper.selectByExample(synthesisPlanClientExample);
+
+ List<SynthesisPlanScoreWithBLOBs> list = new ArrayList<>();
+ CaseInfo teaCaseInfo = caseInfoMapper.selectByPrimaryKey(caseID);
+
+ // 如果客户信息列表为空，则返回错误
+ if (synthesisPlanClientList == null || synthesisPlanClientList.isEmpty()) {
+ return new ResultEntity<>(HttpStatus.BAD_REQUEST, "客户信息还未填写！");
+ }
+ //算分 添加成绩表
+ synthesisPlanClient(userId, caseID, synthesisPlanClientList, list, teaCaseInfo);
+
for (String type : typeList) {
- List<SynthesisPlanScoreWithBLOBs> list = new ArrayList<>();
if (type.equals("风险测评-风险指标")) {
//风险测评-风险指标
CaseRiskIndexExample example = new CaseRiskIndexExample();
@@ -482,9 +494,45 @@ public class SynthesisPlanServiceImpl implements SynthesisPlanService {
throw new RuntimeException("新增失败");
}
}
- return new ResultEntity<HttpStatus>(HttpStatus.OK,"");
+ return new ResultEntity<HttpStatus>(HttpStatus.OK, "");
+ }
+
+ private void synthesisPlanClient(String userId, String caseID, List<SynthesisPlanClient> synthesisPlanClientList, List<SynthesisPlanScoreWithBLOBs> list, CaseInfo teaCaseInfo) {
+ // 取出客户信息
+ SynthesisPlanClient synthesisPlanClient = synthesisPlanClientList.get(0);
+ Integer age = teaCaseInfo.getAge();
+ String idCard = teaCaseInfo.getIdCard();
+ String customerName = teaCaseInfo.getCustomerName();
+
+ // 定义一个信息数组，用于存储需要验证的信息
+ String[] fields = {"年龄", "姓名", "证件号码"};
+ String[] values = {synthesisPlanClient.getAge() != null ? synthesisPlanClient.getAge().toString() : null,
+ synthesisPlanClient.getIdcard(),
+ synthesisPlanClient.getName()};
+
+ // 定义对应的正确答案
+ Object[] correctAnswers = {age, idCard, customerName};
+
+ // 循环处理每个字段
+ for (int i = 0; i < fields.length; i++) {
+ SynthesisPlanScoreWithBLOBs synthesisPlanScore = new SynthesisPlanScoreWithBLOBs();
+ synthesisPlanScore.setUserid(userId);
+ synthesisPlanScore.setCaseid(caseID);
+ synthesisPlanScore.setTestCenter(fields[i]);
+ synthesisPlanScore.setManageMoneyMattersType("客户信息");
+
+ if (values[i] == null || !Objects.equals(values[i], correctAnswers[i].toString())) {
+ synthesisPlanScore.setStatus("答错");
+ synthesisPlanScore.setScore(BigDecimal.ZERO);
+ } else {
+ synthesisPlanScore.setStatus("答对");
+ synthesisPlanScore.setScore(BigDecimal.valueOf(2));
+ }
+ list.add(synthesisPlanScore);
+ }
}
+
private void caseHeritageWithBLOBs(String userId, String
caseID, List<CaseHeritageWithBLOBs> rightCaseHeritageWithBLOBs,
List<CaseHeritageWithBLOBs> stuCaseHeritageWithBLOBs, List<SynthesisPlanScoreWithBLOBs> list) {
@@ -804,7 +852,7 @@ public class SynthesisPlanServiceImpl implements SynthesisPlanService {
Map<String, java.util.function.Function<CaseStartAnUndertakingPlan, String>> testCenters = new HashMap<>();
testCenters.put("计划创业年龄", item -> convertToString(item.getStartPlanAge()));
testCenters.put("创业时一次性投入", item -> convertToString(item.getCostInput()));
- testCenters.put("理财方案", item -> convertToString(item.getReturnOnInvestmentRate()));
+ testCenters.put("理财方案", item -> convertToString(item.getReturnOnInvestmentRate())); //学生使用预计投资收益字段
testCenters.put("创业规划分析", CaseStartAnUndertakingPlan::getAnalysis);
for (Map.Entry<String, java.util.function.Function<CaseStartAnUndertakingPlan, String>> entry : testCenters.entrySet()) {
@@ -862,7 +910,7 @@ public class SynthesisPlanServiceImpl implements SynthesisPlanService {
testCenters.put("消费目标-购车-上牌费用", item -> convertToString(item.getCarRegFee()));
testCenters.put("消费目标-购车-车船使用税", item -> convertToString(item.getVehicleAndVesselTax()));
testCenters.put("消费目标-购车-商业保险", item -> convertToString(item.getMotorVehicleCommercial()));
- testCenters.put("理财方案", item -> convertToString(item.getReturnOnInvestment()));
+ testCenters.put("理财方案", item -> convertToString(item.getReturnOnInvestment())); //学生端为投资收益率
testCenters.put("消费规划分析", CaseConsumptionPlan::getAnalysis);
for (Map.Entry<String, java.util.function.Function<CaseConsumptionPlan, String>> entry : testCenters.entrySet()) {
@@ -931,7 +979,7 @@ public class SynthesisPlanServiceImpl implements SynthesisPlanService {
testCenters.put("商业保险", item -> convertToString(item.getInsurance()));
testCenters.put("储蓄计划", item -> convertToString(item.getDeposit()));
testCenters.put("其他安排", item -> convertToString(item.getOther()));
- testCenters.put("理财方案", item -> convertToString(item.getReturnOnInvestment()));
+ testCenters.put("理财方案", item -> convertToString(item.getReturnOnInvestment())); //理财方案学生端使用【预计投资收益率】字段
testCenters.put("教育规划分析", CaseLifeEducationPlan::getAnalysis);
for (Map.Entry<String, java.util.function.Function<CaseLifeEducationPlan, String>> entry : testCenters.entrySet()) {
@@ -1215,11 +1263,9 @@ public class SynthesisPlanServiceImpl implements SynthesisPlanService {
synthesisPlanScore.setStatus("答对");
synthesisPlanScore.setScore(BigDecimal.valueOf(2));
}
-
list.add(synthesisPlanScore);
}
}
-
}
private void caseRiskIndex(String userId, String
diff --git a/src/main/resources/mapper/CaseConsumptionPlanMapper.xml b/src/main/resources/mapper/CaseConsumptionPlanMapper.xml
index 138111d..476196a 100644
--- a/src/main/resources/mapper/CaseConsumptionPlanMapper.xml
+++ b/src/main/resources/mapper/CaseConsumptionPlanMapper.xml
@@ -4,14 +4,20 @@
<resultMap id="BaseResultMap" type="com.sztzjy.money_management.entity.CaseConsumptionPlan">
<id column="case_consumption_plan_id" jdbcType="VARCHAR" property="caseConsumptionPlanId" />
<result column="case_id" jdbcType="VARCHAR" property="caseId" />
+ <result column="monthly_investment" jdbcType="DECIMAL" property="monthlyInvestment" />
+ <result column="available assets" jdbcType="DECIMAL" property="availableAssets" />
+ <result column="shop_house_year" jdbcType="INTEGER" property="shopHouseYear" />
<result column="house_area" jdbcType="DECIMAL" property="houseArea" />
<result column="house_price" jdbcType="DECIMAL" property="housePrice" />
+ <result column="house_all_money" jdbcType="DECIMAL" property="houseAllMoney" />
<result column="house_down_payment_percent" jdbcType="DECIMAL" property="houseDownPaymentPercent" />
<result column="house_loan_year" jdbcType="INTEGER" property="houseLoanYear" />
<result column="house_loan_rate" jdbcType="DECIMAL" property="houseLoanRate" />
<result column="house_down_payment" jdbcType="DECIMAL" property="houseDownPayment" />
<result column="house_total_amount" jdbcType="DECIMAL" property="houseTotalAmount" />
+ <result column="disposable_input" jdbcType="DECIMAL" property="disposableInput" />
<result column="house_monthly_amount" jdbcType="DECIMAL" property="houseMonthlyAmount" />
+ <result column="shop_car_year" jdbcType="INTEGER" property="shopCarYear" />
<result column="car_type" jdbcType="VARCHAR" property="carType" />
<result column="car_price" jdbcType="DECIMAL" property="carPrice" />
<result column="car_down_payment_percent" jdbcType="DECIMAL" property="carDownPaymentPercent" />
@@ -26,15 +32,10 @@
<result column="car_down_payment" jdbcType="DECIMAL" property="carDownPayment" />
<result column="car_total_amount" jdbcType="DECIMAL" property="carTotalAmount" />
<result column="car_monthly_amount" jdbcType="DECIMAL" property="carMonthlyAmount" />
- <result column="first_amount" jdbcType="DECIMAL" property="firstAmount" />
<result column="return_on_investment" jdbcType="DECIMAL" property="returnOnInvestment" />
- <result column="disposable_input" jdbcType="DECIMAL" property="disposableInput" />
- <result column="monthly_investment" jdbcType="DECIMAL" property="monthlyInvestment" />
+ <result column="lump_sum" jdbcType="DECIMAL" property="lumpSum" />
+ <result column="month_regular_invest_amount" jdbcType="DECIMAL" property="monthRegularInvestAmount" />
<result column="regular_year" jdbcType="INTEGER" property="regularYear" />
- <result column="target_amount" jdbcType="DECIMAL" property="targetAmount" />
- <result column="shop_house_year" jdbcType="INTEGER" property="shopHouseYear" />
- <result column="house_all_money" jdbcType="DECIMAL" property="houseAllMoney" />
- <result column="shop_car_year" jdbcType="INTEGER" property="shopCarYear" />
<result column="analysis_teacher_score" jdbcType="DECIMAL" property="analysisTeacherScore" />
<result column="case_teacher_score" jdbcType="DECIMAL" property="caseTeacherScore" />
<result column="user_id" jdbcType="VARCHAR" property="userId" />
@@ -102,14 +103,14 @@
</where>
</sql>
<sql id="Base_Column_List">
- case_consumption_plan_id, case_id, house_area, house_price, house_down_payment_percent,
- house_loan_year, house_loan_rate, house_down_payment, house_total_amount, house_monthly_amount,
- car_type, car_price, car_down_payment_percent, car_loan_year, car_loan_rate, purchase_tax,
- car_reg_fee, displacement, vehicle_and_vessel_tax, motor_vehicle_compulsory, motor_vehicle_commercial,
- car_down_payment, car_total_amount, car_monthly_amount, first_amount, return_on_investment,
- disposable_input, monthly_investment, regular_year, target_amount, shop_house_year,
- house_all_money, shop_car_year, analysis_teacher_score, case_teacher_score, user_id,
- is_answer
+ case_consumption_plan_id, case_id, monthly_investment, "available assets", shop_house_year,
+ house_area, house_price, house_all_money, house_down_payment_percent, house_loan_year,
+ house_loan_rate, house_down_payment, house_total_amount, disposable_input, house_monthly_amount,
+ shop_car_year, car_type, car_price, car_down_payment_percent, car_loan_year, car_loan_rate,
+ purchase_tax, car_reg_fee, displacement, vehicle_and_vessel_tax, motor_vehicle_compulsory,
+ motor_vehicle_commercial, car_down_payment, car_total_amount, car_monthly_amount,
+ return_on_investment, lump_sum, month_regular_invest_amount, regular_year, analysis_teacher_score,
+ case_teacher_score, user_id, is_answer
</sql>
<sql id="Blob_Column_List">
analysis
@@ -163,34 +164,36 @@
</if>
</delete>
<insert id="insert" parameterType="com.sztzjy.money_management.entity.CaseConsumptionPlan">
- insert into case_consumption_plan (case_consumption_plan_id, case_id, house_area,
- house_price, house_down_payment_percent, house_loan_year,
- house_loan_rate, house_down_payment, house_total_amount,
- house_monthly_amount, car_type, car_price,
+ insert into case_consumption_plan (case_consumption_plan_id, case_id, monthly_investment,
+ "available assets", shop_house_year, house_area,
+ house_price, house_all_money, house_down_payment_percent,
+ house_loan_year, house_loan_rate, house_down_payment,
+ house_total_amount, disposable_input, house_monthly_amount,
+ shop_car_year, car_type, car_price,
car_down_payment_percent, car_loan_year, car_loan_rate,
purchase_tax, car_reg_fee, displacement,
vehicle_and_vessel_tax, motor_vehicle_compulsory,
motor_vehicle_commercial, car_down_payment,
- car_total_amount, car_monthly_amount, first_amount,
- return_on_investment, disposable_input, monthly_investment,
- regular_year, target_amount, shop_house_year,
- house_all_money, shop_car_year, analysis_teacher_score,
- case_teacher_score, user_id, is_answer,
- analysis)
- values (#{caseConsumptionPlanId,jdbcType=VARCHAR}, #{caseId,jdbcType=VARCHAR}, #{houseArea,jdbcType=DECIMAL},
- #{housePrice,jdbcType=DECIMAL}, #{houseDownPaymentPercent,jdbcType=DECIMAL}, #{houseLoanYear,jdbcType=INTEGER},
- #{houseLoanRate,jdbcType=DECIMAL}, #{houseDownPayment,jdbcType=DECIMAL}, #{houseTotalAmount,jdbcType=DECIMAL},
- #{houseMonthlyAmount,jdbcType=DECIMAL}, #{carType,jdbcType=VARCHAR}, #{carPrice,jdbcType=DECIMAL},
+ car_total_amount, car_monthly_amount, return_on_investment,
+ lump_sum, month_regular_invest_amount, regular_year,
+ analysis_teacher_score, case_teacher_score,
+ user_id, is_answer, analysis
+ )
+ values (#{caseConsumptionPlanId,jdbcType=VARCHAR}, #{caseId,jdbcType=VARCHAR}, #{monthlyInvestment,jdbcType=DECIMAL},
+ #{availableAssets,jdbcType=DECIMAL}, #{shopHouseYear,jdbcType=INTEGER}, #{houseArea,jdbcType=DECIMAL},
+ #{housePrice,jdbcType=DECIMAL}, #{houseAllMoney,jdbcType=DECIMAL}, #{houseDownPaymentPercent,jdbcType=DECIMAL},
+ #{houseLoanYear,jdbcType=INTEGER}, #{houseLoanRate,jdbcType=DECIMAL}, #{houseDownPayment,jdbcType=DECIMAL},
+ #{houseTotalAmount,jdbcType=DECIMAL}, #{disposableInput,jdbcType=DECIMAL}, #{houseMonthlyAmount,jdbcType=DECIMAL},
+ #{shopCarYear,jdbcType=INTEGER}, #{carType,jdbcType=VARCHAR}, #{carPrice,jdbcType=DECIMAL},
#{carDownPaymentPercent,jdbcType=DECIMAL}, #{carLoanYear,jdbcType=INTEGER}, #{carLoanRate,jdbcType=DECIMAL},
#{purchaseTax,jdbcType=DECIMAL}, #{carRegFee,jdbcType=DECIMAL}, #{displacement,jdbcType=INTEGER},
#{vehicleAndVesselTax,jdbcType=DECIMAL}, #{motorVehicleCompulsory,jdbcType=DECIMAL},
#{motorVehicleCommercial,jdbcType=DECIMAL}, #{carDownPayment,jdbcType=DECIMAL},
- #{carTotalAmount,jdbcType=DECIMAL}, #{carMonthlyAmount,jdbcType=DECIMAL}, #{firstAmount,jdbcType=DECIMAL},
- #{returnOnInvestment,jdbcType=DECIMAL}, #{disposableInput,jdbcType=DECIMAL}, #{monthlyInvestment,jdbcType=DECIMAL},
- #{regularYear,jdbcType=INTEGER}, #{targetAmount,jdbcType=DECIMAL}, #{shopHouseYear,jdbcType=INTEGER},
- #{houseAllMoney,jdbcType=DECIMAL}, #{shopCarYear,jdbcType=INTEGER}, #{analysisTeacherScore,jdbcType=DECIMAL},
- #{caseTeacherScore,jdbcType=DECIMAL}, #{userId,jdbcType=VARCHAR}, #{isAnswer,jdbcType=VARCHAR},
- #{analysis,jdbcType=LONGVARCHAR})
+ #{carTotalAmount,jdbcType=DECIMAL}, #{carMonthlyAmount,jdbcType=DECIMAL}, #{returnOnInvestment,jdbcType=DECIMAL},
+ #{lumpSum,jdbcType=DECIMAL}, #{monthRegularInvestAmount,jdbcType=DECIMAL}, #{regularYear,jdbcType=INTEGER},
+ #{analysisTeacherScore,jdbcType=DECIMAL}, #{caseTeacherScore,jdbcType=DECIMAL},
+ #{userId,jdbcType=VARCHAR}, #{isAnswer,jdbcType=VARCHAR}, #{analysis,jdbcType=LONGVARCHAR}
+ )
</insert>
<insert id="insertSelective" parameterType="com.sztzjy.money_management.entity.CaseConsumptionPlan">
insert into case_consumption_plan
@@ -201,12 +204,24 @@
<if test="caseId != null">
case_id,
</if>
+ <if test="monthlyInvestment != null">
+ monthly_investment,
+ </if>
+ <if test="availableAssets != null">
+ "available assets",
+ </if>
+ <if test="shopHouseYear != null">
+ shop_house_year,
+ </if>
<if test="houseArea != null">
house_area,
</if>
<if test="housePrice != null">
house_price,
</if>
+ <if test="houseAllMoney != null">
+ house_all_money,
+ </if>
<if test="houseDownPaymentPercent != null">
house_down_payment_percent,
</if>
@@ -222,9 +237,15 @@
<if test="houseTotalAmount != null">
house_total_amount,
</if>
+ <if test="disposableInput != null">
+ disposable_input,
+ </if>
<if test="houseMonthlyAmount != null">
house_monthly_amount,
</if>
+ <if test="shopCarYear != null">
+ shop_car_year,
+ </if>
<if test="carType != null">
car_type,
</if>
@@ -267,33 +288,18 @@
<if test="carMonthlyAmount != null">
car_monthly_amount,
</if>
- <if test="firstAmount != null">
- first_amount,
- </if>
<if test="returnOnInvestment != null">
return_on_investment,
</if>
- <if test="disposableInput != null">
- disposable_input,
+ <if test="lumpSum != null">
+ lump_sum,
</if>
- <if test="monthlyInvestment != null">
- monthly_investment,
+ <if test="monthRegularInvestAmount != null">
+ month_regular_invest_amount,
</if>
<if test="regularYear != null">
regular_year,
</if>
- <if test="targetAmount != null">
- target_amount,
- </if>
- <if test="shopHouseYear != null">
- shop_house_year,
- </if>
- <if test="houseAllMoney != null">
- house_all_money,
- </if>
- <if test="shopCarYear != null">
- shop_car_year,
- </if>
<if test="analysisTeacherScore != null">
analysis_teacher_score,
</if>
@@ -317,12 +323,24 @@
<if test="caseId != null">
#{caseId,jdbcType=VARCHAR},
</if>
+ <if test="monthlyInvestment != null">
+ #{monthlyInvestment,jdbcType=DECIMAL},
+ </if>
+ <if test="availableAssets != null">
+ #{availableAssets,jdbcType=DECIMAL},
+ </if>
+ <if test="shopHouseYear != null">
+ #{shopHouseYear,jdbcType=INTEGER},
+ </if>
<if test="houseArea != null">
#{houseArea,jdbcType=DECIMAL},
</if>
<if test="housePrice != null">
#{housePrice,jdbcType=DECIMAL},
</if>
+ <if test="houseAllMoney != null">
+ #{houseAllMoney,jdbcType=DECIMAL},
+ </if>
<if test="houseDownPaymentPercent != null">
#{houseDownPaymentPercent,jdbcType=DECIMAL},
</if>
@@ -338,9 +356,15 @@
<if test="houseTotalAmount != null">
#{houseTotalAmount,jdbcType=DECIMAL},
</if>
+ <if test="disposableInput != null">
+ #{disposableInput,jdbcType=DECIMAL},
+ </if>
<if test="houseMonthlyAmount != null">
#{houseMonthlyAmount,jdbcType=DECIMAL},
</if>
+ <if test="shopCarYear != null">
+ #{shopCarYear,jdbcType=INTEGER},
+ </if>
<if test="carType != null">
#{carType,jdbcType=VARCHAR},
</if>
@@ -383,33 +407,18 @@
<if test="carMonthlyAmount != null">
#{carMonthlyAmount,jdbcType=DECIMAL},
</if>
- <if test="firstAmount != null">
- #{firstAmount,jdbcType=DECIMAL},
- </if>
<if test="returnOnInvestment != null">
#{returnOnInvestment,jdbcType=DECIMAL},
</if>
- <if test="disposableInput != null">
- #{disposableInput,jdbcType=DECIMAL},
+ <if test="lumpSum != null">
+ #{lumpSum,jdbcType=DECIMAL},
</if>
- <if test="monthlyInvestment != null">
- #{monthlyInvestment,jdbcType=DECIMAL},
+ <if test="monthRegularInvestAmount != null">
+ #{monthRegularInvestAmount,jdbcType=DECIMAL},
</if>
<if test="regularYear != null">
#{regularYear,jdbcType=INTEGER},
</if>
- <if test="targetAmount != null">
- #{targetAmount,jdbcType=DECIMAL},
- </if>
- <if test="shopHouseYear != null">
- #{shopHouseYear,jdbcType=INTEGER},
- </if>
- <if test="houseAllMoney != null">
- #{houseAllMoney,jdbcType=DECIMAL},
- </if>
- <if test="shopCarYear != null">
- #{shopCarYear,jdbcType=INTEGER},
- </if>
<if test="analysisTeacherScore != null">
#{analysisTeacherScore,jdbcType=DECIMAL},
</if>
@@ -442,12 +451,24 @@
<if test="record.caseId != null">
case_id = #{record.caseId,jdbcType=VARCHAR},
</if>
+ <if test="record.monthlyInvestment != null">
+ monthly_investment = #{record.monthlyInvestment,jdbcType=DECIMAL},
+ </if>
+ <if test="record.availableAssets != null">
+ "available assets" = #{record.availableAssets,jdbcType=DECIMAL},
+ </if>
+ <if test="record.shopHouseYear != null">
+ shop_house_year = #{record.shopHouseYear,jdbcType=INTEGER},
+ </if>
<if test="record.houseArea != null">
house_area = #{record.houseArea,jdbcType=DECIMAL},
</if>
<if test="record.housePrice != null">
house_price = #{record.housePrice,jdbcType=DECIMAL},
</if>
+ <if test="record.houseAllMoney != null">
+ house_all_money = #{record.houseAllMoney,jdbcType=DECIMAL},
+ </if>
<if test="record.houseDownPaymentPercent != null">
house_down_payment_percent = #{record.houseDownPaymentPercent,jdbcType=DECIMAL},
</if>
@@ -463,9 +484,15 @@
<if test="record.houseTotalAmount != null">
house_total_amount = #{record.houseTotalAmount,jdbcType=DECIMAL},
</if>
+ <if test="record.disposableInput != null">
+ disposable_input = #{record.disposableInput,jdbcType=DECIMAL},
+ </if>
<if test="record.houseMonthlyAmount != null">
house_monthly_amount = #{record.houseMonthlyAmount,jdbcType=DECIMAL},
</if>
+ <if test="record.shopCarYear != null">
+ shop_car_year = #{record.shopCarYear,jdbcType=INTEGER},
+ </if>
<if test="record.carType != null">
car_type = #{record.carType,jdbcType=VARCHAR},
</if>
@@ -508,33 +535,18 @@
<if test="record.carMonthlyAmount != null">
car_monthly_amount = #{record.carMonthlyAmount,jdbcType=DECIMAL},
</if>
- <if test="record.firstAmount != null">
- first_amount = #{record.firstAmount,jdbcType=DECIMAL},
- </if>
<if test="record.returnOnInvestment != null">
return_on_investment = #{record.returnOnInvestment,jdbcType=DECIMAL},
</if>
- <if test="record.disposableInput != null">
- disposable_input = #{record.disposableInput,jdbcType=DECIMAL},
+ <if test="record.lumpSum != null">
+ lump_sum = #{record.lumpSum,jdbcType=DECIMAL},
</if>
- <if test="record.monthlyInvestment != null">
- monthly_investment = #{record.monthlyInvestment,jdbcType=DECIMAL},
+ <if test="record.monthRegularInvestAmount != null">
+ month_regular_invest_amount = #{record.monthRegularInvestAmount,jdbcType=DECIMAL},
</if>
<if test="record.regularYear != null">
regular_year = #{record.regularYear,jdbcType=INTEGER},
</if>
- <if test="record.targetAmount != null">
- target_amount = #{record.targetAmount,jdbcType=DECIMAL},
- </if>
- <if test="record.shopHouseYear != null">
- shop_house_year = #{record.shopHouseYear,jdbcType=INTEGER},
- </if>
- <if test="record.houseAllMoney != null">
- house_all_money = #{record.houseAllMoney,jdbcType=DECIMAL},
- </if>
- <if test="record.shopCarYear != null">
- shop_car_year = #{record.shopCarYear,jdbcType=INTEGER},
- </if>
<if test="record.analysisTeacherScore != null">
analysis_teacher_score = #{record.analysisTeacherScore,jdbcType=DECIMAL},
</if>
@@ -559,14 +571,20 @@
update case_consumption_plan
set case_consumption_plan_id = #{record.caseConsumptionPlanId,jdbcType=VARCHAR},
case_id = #{record.caseId,jdbcType=VARCHAR},
+ monthly_investment = #{record.monthlyInvestment,jdbcType=DECIMAL},
+ "available assets" = #{record.availableAssets,jdbcType=DECIMAL},
+ shop_house_year = #{record.shopHouseYear,jdbcType=INTEGER},
house_area = #{record.houseArea,jdbcType=DECIMAL},
house_price = #{record.housePrice,jdbcType=DECIMAL},
+ house_all_money = #{record.houseAllMoney,jdbcType=DECIMAL},
house_down_payment_percent = #{record.houseDownPaymentPercent,jdbcType=DECIMAL},
house_loan_year = #{record.houseLoanYear,jdbcType=INTEGER},
house_loan_rate = #{record.houseLoanRate,jdbcType=DECIMAL},
house_down_payment = #{record.houseDownPayment,jdbcType=DECIMAL},
house_total_amount = #{record.houseTotalAmount,jdbcType=DECIMAL},
+ disposable_input = #{record.disposableInput,jdbcType=DECIMAL},
house_monthly_amount = #{record.houseMonthlyAmount,jdbcType=DECIMAL},
+ shop_car_year = #{record.shopCarYear,jdbcType=INTEGER},
car_type = #{record.carType,jdbcType=VARCHAR},
car_price = #{record.carPrice,jdbcType=DECIMAL},
car_down_payment_percent = #{record.carDownPaymentPercent,jdbcType=DECIMAL},
@@ -581,15 +599,10 @@
car_down_payment = #{record.carDownPayment,jdbcType=DECIMAL},
car_total_amount = #{record.carTotalAmount,jdbcType=DECIMAL},
car_monthly_amount = #{record.carMonthlyAmount,jdbcType=DECIMAL},
- first_amount = #{record.firstAmount,jdbcType=DECIMAL},
return_on_investment = #{record.returnOnInvestment,jdbcType=DECIMAL},
- disposable_input = #{record.disposableInput,jdbcType=DECIMAL},
- monthly_investment = #{record.monthlyInvestment,jdbcType=DECIMAL},
+ lump_sum = #{record.lumpSum,jdbcType=DECIMAL},
+ month_regular_invest_amount = #{record.monthRegularInvestAmount,jdbcType=DECIMAL},
regular_year = #{record.regularYear,jdbcType=INTEGER},
- target_amount = #{record.targetAmount,jdbcType=DECIMAL},
- shop_house_year = #{record.shopHouseYear,jdbcType=INTEGER},
- house_all_money = #{record.houseAllMoney,jdbcType=DECIMAL},
- shop_car_year = #{record.shopCarYear,jdbcType=INTEGER},
analysis_teacher_score = #{record.analysisTeacherScore,jdbcType=DECIMAL},
case_teacher_score = #{record.caseTeacherScore,jdbcType=DECIMAL},
user_id = #{record.userId,jdbcType=VARCHAR},
@@ -603,14 +616,20 @@
update case_consumption_plan
set case_consumption_plan_id = #{record.caseConsumptionPlanId,jdbcType=VARCHAR},
case_id = #{record.caseId,jdbcType=VARCHAR},
+ monthly_investment = #{record.monthlyInvestment,jdbcType=DECIMAL},
+ "available assets" = #{record.availableAssets,jdbcType=DECIMAL},
+ shop_house_year = #{record.shopHouseYear,jdbcType=INTEGER},
house_area = #{record.houseArea,jdbcType=DECIMAL},
house_price = #{record.housePrice,jdbcType=DECIMAL},
+ house_all_money = #{record.houseAllMoney,jdbcType=DECIMAL},
house_down_payment_percent = #{record.houseDownPaymentPercent,jdbcType=DECIMAL},
house_loan_year = #{record.houseLoanYear,jdbcType=INTEGER},
house_loan_rate = #{record.houseLoanRate,jdbcType=DECIMAL},
house_down_payment = #{record.houseDownPayment,jdbcType=DECIMAL},
house_total_amount = #{record.houseTotalAmount,jdbcType=DECIMAL},
+ disposable_input = #{record.disposableInput,jdbcType=DECIMAL},
house_monthly_amount = #{record.houseMonthlyAmount,jdbcType=DECIMAL},
+ shop_car_year = #{record.shopCarYear,jdbcType=INTEGER},
car_type = #{record.carType,jdbcType=VARCHAR},
car_price = #{record.carPrice,jdbcType=DECIMAL},
car_down_payment_percent = #{record.carDownPaymentPercent,jdbcType=DECIMAL},
@@ -625,15 +644,10 @@
car_down_payment = #{record.carDownPayment,jdbcType=DECIMAL},
car_total_amount = #{record.carTotalAmount,jdbcType=DECIMAL},
car_monthly_amount = #{record.carMonthlyAmount,jdbcType=DECIMAL},
- first_amount = #{record.firstAmount,jdbcType=DECIMAL},
return_on_investment = #{record.returnOnInvestment,jdbcType=DECIMAL},
- disposable_input = #{record.disposableInput,jdbcType=DECIMAL},
- monthly_investment = #{record.monthlyInvestment,jdbcType=DECIMAL},
+ lump_sum = #{record.lumpSum,jdbcType=DECIMAL},
+ month_regular_invest_amount = #{record.monthRegularInvestAmount,jdbcType=DECIMAL},
regular_year = #{record.regularYear,jdbcType=INTEGER},
- target_amount = #{record.targetAmount,jdbcType=DECIMAL},
- shop_house_year = #{record.shopHouseYear,jdbcType=INTEGER},
- house_all_money = #{record.houseAllMoney,jdbcType=DECIMAL},
- shop_car_year = #{record.shopCarYear,jdbcType=INTEGER},
analysis_teacher_score = #{record.analysisTeacherScore,jdbcType=DECIMAL},
case_teacher_score = #{record.caseTeacherScore,jdbcType=DECIMAL},
user_id = #{record.userId,jdbcType=VARCHAR},
@@ -648,12 +662,24 @@
<if test="caseId != null">
case_id = #{caseId,jdbcType=VARCHAR},
</if>
+ <if test="monthlyInvestment != null">
+ monthly_investment = #{monthlyInvestment,jdbcType=DECIMAL},
+ </if>
+ <if test="availableAssets != null">
+ "available assets" = #{availableAssets,jdbcType=DECIMAL},
+ </if>
+ <if test="shopHouseYear != null">
+ shop_house_year = #{shopHouseYear,jdbcType=INTEGER},
+ </if>
<if test="houseArea != null">
house_area = #{houseArea,jdbcType=DECIMAL},
</if>
<if test="housePrice != null">
house_price = #{housePrice,jdbcType=DECIMAL},
</if>
+ <if test="houseAllMoney != null">
+ house_all_money = #{houseAllMoney,jdbcType=DECIMAL},
+ </if>
<if test="houseDownPaymentPercent != null">
house_down_payment_percent = #{houseDownPaymentPercent,jdbcType=DECIMAL},
</if>
@@ -669,9 +695,15 @@
<if test="houseTotalAmount != null">
house_total_amount = #{houseTotalAmount,jdbcType=DECIMAL},
</if>
+ <if test="disposableInput != null">
+ disposable_input = #{disposableInput,jdbcType=DECIMAL},
+ </if>
<if test="houseMonthlyAmount != null">
house_monthly_amount = #{houseMonthlyAmount,jdbcType=DECIMAL},
</if>
+ <if test="shopCarYear != null">
+ shop_car_year = #{shopCarYear,jdbcType=INTEGER},
+ </if>
<if test="carType != null">
car_type = #{carType,jdbcType=VARCHAR},
</if>
@@ -714,33 +746,18 @@
<if test="carMonthlyAmount != null">
car_monthly_amount = #{carMonthlyAmount,jdbcType=DECIMAL},
</if>
- <if test="firstAmount != null">
- first_amount = #{firstAmount,jdbcType=DECIMAL},
- </if>
<if test="returnOnInvestment != null">
return_on_investment = #{returnOnInvestment,jdbcType=DECIMAL},
</if>
- <if test="disposableInput != null">
- disposable_input = #{disposableInput,jdbcType=DECIMAL},
+ <if test="lumpSum != null">
+ lump_sum = #{lumpSum,jdbcType=DECIMAL},
</if>
- <if test="monthlyInvestment != null">
- monthly_investment = #{monthlyInvestment,jdbcType=DECIMAL},
+ <if test="monthRegularInvestAmount != null">
+ month_regular_invest_amount = #{monthRegularInvestAmount,jdbcType=DECIMAL},
</if>
<if test="regularYear != null">
regular_year = #{regularYear,jdbcType=INTEGER},
</if>
- <if test="targetAmount != null">
- target_amount = #{targetAmount,jdbcType=DECIMAL},
- </if>
- <if test="shopHouseYear != null">
- shop_house_year = #{shopHouseYear,jdbcType=INTEGER},
- </if>
- <if test="houseAllMoney != null">
- house_all_money = #{houseAllMoney,jdbcType=DECIMAL},
- </if>
- <if test="shopCarYear != null">
- shop_car_year = #{shopCarYear,jdbcType=INTEGER},
- </if>
<if test="analysisTeacherScore != null">
analysis_teacher_score = #{analysisTeacherScore,jdbcType=DECIMAL},
</if>
@@ -762,14 +779,20 @@
<update id="updateByPrimaryKeyWithBLOBs" parameterType="com.sztzjy.money_management.entity.CaseConsumptionPlan">
update case_consumption_plan
set case_id = #{caseId,jdbcType=VARCHAR},
+ monthly_investment = #{monthlyInvestment,jdbcType=DECIMAL},
+ "available assets" = #{availableAssets,jdbcType=DECIMAL},
+ shop_house_year = #{shopHouseYear,jdbcType=INTEGER},
house_area = #{houseArea,jdbcType=DECIMAL},
house_price = #{housePrice,jdbcType=DECIMAL},
+ house_all_money = #{houseAllMoney,jdbcType=DECIMAL},
house_down_payment_percent = #{houseDownPaymentPercent,jdbcType=DECIMAL},
house_loan_year = #{houseLoanYear,jdbcType=INTEGER},
house_loan_rate = #{houseLoanRate,jdbcType=DECIMAL},
house_down_payment = #{houseDownPayment,jdbcType=DECIMAL},
house_total_amount = #{houseTotalAmount,jdbcType=DECIMAL},
+ disposable_input = #{disposableInput,jdbcType=DECIMAL},
house_monthly_amount = #{houseMonthlyAmount,jdbcType=DECIMAL},
+ shop_car_year = #{shopCarYear,jdbcType=INTEGER},
car_type = #{carType,jdbcType=VARCHAR},
car_price = #{carPrice,jdbcType=DECIMAL},
car_down_payment_percent = #{carDownPaymentPercent,jdbcType=DECIMAL},
@@ -784,15 +807,10 @@
car_down_payment = #{carDownPayment,jdbcType=DECIMAL},
car_total_amount = #{carTotalAmount,jdbcType=DECIMAL},
car_monthly_amount = #{carMonthlyAmount,jdbcType=DECIMAL},
- first_amount = #{firstAmount,jdbcType=DECIMAL},
return_on_investment = #{returnOnInvestment,jdbcType=DECIMAL},
- disposable_input = #{disposableInput,jdbcType=DECIMAL},
- monthly_investment = #{monthlyInvestment,jdbcType=DECIMAL},
+ lump_sum = #{lumpSum,jdbcType=DECIMAL},
+ month_regular_invest_amount = #{monthRegularInvestAmount,jdbcType=DECIMAL},
regular_year = #{regularYear,jdbcType=INTEGER},
- target_amount = #{targetAmount,jdbcType=DECIMAL},
- shop_house_year = #{shopHouseYear,jdbcType=INTEGER},
- house_all_money = #{houseAllMoney,jdbcType=DECIMAL},
- shop_car_year = #{shopCarYear,jdbcType=INTEGER},
analysis_teacher_score = #{analysisTeacherScore,jdbcType=DECIMAL},
case_teacher_score = #{caseTeacherScore,jdbcType=DECIMAL},
user_id = #{userId,jdbcType=VARCHAR},
@@ -803,14 +821,20 @@
<update id="updateByPrimaryKey" parameterType="com.sztzjy.money_management.entity.CaseConsumptionPlan">
update case_consumption_plan
set case_id = #{caseId,jdbcType=VARCHAR},
+ monthly_investment = #{monthlyInvestment,jdbcType=DECIMAL},
+ "available assets" = #{availableAssets,jdbcType=DECIMAL},
+ shop_house_year = #{shopHouseYear,jdbcType=INTEGER},
house_area = #{houseArea,jdbcType=DECIMAL},
house_price = #{housePrice,jdbcType=DECIMAL},
+ house_all_money = #{houseAllMoney,jdbcType=DECIMAL},
house_down_payment_percent = #{houseDownPaymentPercent,jdbcType=DECIMAL},
house_loan_year = #{houseLoanYear,jdbcType=INTEGER},
house_loan_rate = #{houseLoanRate,jdbcType=DECIMAL},
house_down_payment = #{houseDownPayment,jdbcType=DECIMAL},
house_total_amount = #{houseTotalAmount,jdbcType=DECIMAL},
+ disposable_input = #{disposableInput,jdbcType=DECIMAL},
house_monthly_amount = #{houseMonthlyAmount,jdbcType=DECIMAL},
+ shop_car_year = #{shopCarYear,jdbcType=INTEGER},
car_type = #{carType,jdbcType=VARCHAR},
car_price = #{carPrice,jdbcType=DECIMAL},
car_down_payment_percent = #{carDownPaymentPercent,jdbcType=DECIMAL},
@@ -825,15 +849,10 @@
car_down_payment = #{carDownPayment,jdbcType=DECIMAL},
car_total_amount = #{carTotalAmount,jdbcType=DECIMAL},
car_monthly_amount = #{carMonthlyAmount,jdbcType=DECIMAL},
- first_amount = #{firstAmount,jdbcType=DECIMAL},
return_on_investment = #{returnOnInvestment,jdbcType=DECIMAL},
- disposable_input = #{disposableInput,jdbcType=DECIMAL},
- monthly_investment = #{monthlyInvestment,jdbcType=DECIMAL},
+ lump_sum = #{lumpSum,jdbcType=DECIMAL},
+ month_regular_invest_amount = #{monthRegularInvestAmount,jdbcType=DECIMAL},
regular_year = #{regularYear,jdbcType=INTEGER},
- target_amount = #{targetAmount,jdbcType=DECIMAL},
- shop_house_year = #{shopHouseYear,jdbcType=INTEGER},
- house_all_money = #{houseAllMoney,jdbcType=DECIMAL},
- shop_car_year = #{shopCarYear,jdbcType=INTEGER},
analysis_teacher_score = #{analysisTeacherScore,jdbcType=DECIMAL},
case_teacher_score = #{caseTeacherScore,jdbcType=DECIMAL},
user_id = #{userId,jdbcType=VARCHAR},