重新生成消费规划表，修改实验实训提交和规划报告提交算分接口

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

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;
     }

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;

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")

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

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

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},