tianzeOrg
/
money_management
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增查询保险规划产品名称

Browse Source 
修改银行储蓄编辑
提交接口参数
重新生成案例财产分配家庭结构记录表,修改字段sort为create_time
修改管理员老师接口的规划报告新增,编辑接口
master
xiaoCJ 6 months ago
parent d41881df15
commit 84b4f72d33
9 changed files with 314 additions and 194 deletions
Show Stats Download Patch File Download Diff File

10
src/main/java/com/sztzjy/money_management/controller/CaseController.java
Unescape Escape View File

@ -9,6 +9,7 @@ import com.sztzjy.money_management.entity.dto.CaseInvestmentPlanDto;
import com.sztzjy.money_management.mapper.CaseInfoMapper;
import com.sztzjy.money_management.mapper.ChapterMapper;
import com.sztzjy.money_management.mapper.ComCaseMapper;
import com.sztzjy.money_management.mapper.InsuranceProMapper;
import com.sztzjy.money_management.service.CaseService;
import com.sztzjy.money_management.util.ResultEntity;
import io.swagger.annotations.Api;
@ -37,6 +38,8 @@ public class CaseController {
private ComCaseMapper comCaseMapper;
@Autowired
private ChapterMapper chapterMapper;
@Autowired
private InsuranceProMapper insuranceProMapper;
@PostMapping("/insertCase")
@ApiOperation("新增/编辑案例，老师和管理员新增根据caseInfo中的publish区分都是题目答案，学生端新增传isAnswer为学生答案+userId")
@ -54,6 +57,13 @@ public class CaseController {
return caseService.insertComprehensivePlanCase(stuCaseDto);
}
@PostMapping("/getInsurancePro")
@ApiOperation("查询保险规划产品名称")
private ResultEntity<List<String>> getInsurancePro(@RequestParam String type) {
return new ResultEntity<List<String>>(insuranceProMapper.getInsurancePro(type));
}
@PostMapping("/insertOrUpdateInvestmentPlan")
@ApiOperation("新增/编辑案例，投资规划")
private ResultEntity<HttpStatus> insertOrUpdateInvestmentPlan(@ApiParam("老师或管理员新增修改不传userId") @RequestBody CaseInvestmentPlanDto caseInvestmentPlanDto) {

7
src/main/java/com/sztzjy/money_management/controller/ProductCenter.java
Unescape Escape View File

@ -12,10 +12,7 @@ import io.swagger.annotations.ApiParam;
import io.swagger.models.auth.In;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@ -83,7 +80,7 @@ public class ProductCenter {
@PostMapping("updateBankDeposits")
@ApiOperation("银行储蓄编辑")
@AnonymousAccess
public ResultEntity updateBankDeposits(@RequestParam BankDeposits bankDeposits) {
public ResultEntity updateBankDeposits(@RequestBody BankDeposits bankDeposits) {
bankDepositsMapper.updateByPrimaryKeySelective(bankDeposits);
return new ResultEntity<>(HttpStatus.OK, "银行储蓄编辑成功");
}

13
src/main/java/com/sztzjy/money_management/entity/CaseDistributionOfPropertyFamilyRecords.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.sztzjy.money_management.entity;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModelProperty;
/**
@ -30,8 +31,8 @@ public class CaseDistributionOfPropertyFamilyRecords {
@ApiModelProperty("年收入")
private BigDecimal annualIncome;
@ApiModelProperty("排序")
private Integer sort;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("用户ID")
private String userId;
@ -95,12 +96,12 @@ public class CaseDistributionOfPropertyFamilyRecords {
this.annualIncome = annualIncome;
}
public Integer getSort() {
return sort;
public Date getCreateTime() {
return createTime;
}
public void setSort(Integer sort) {
this.sort = sort;
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public String getUserId() {

49
src/main/java/com/sztzjy/money_management/entity/CaseDistributionOfPropertyFamilyRecordsExample.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.sztzjy.money_management.entity;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class CaseDistributionOfPropertyFamilyRecordsExample {
@ -575,63 +576,63 @@ public class CaseDistributionOfPropertyFamilyRecordsExample {
return (Criteria) this;
}
public Criteria andSortIsNull() {
addCriterion("sort is null");
public Criteria andCreateTimeIsNull() {
addCriterion("create_time is null");
return (Criteria) this;
}
public Criteria andSortIsNotNull() {
addCriterion("sort is not null");
public Criteria andCreateTimeIsNotNull() {
addCriterion("create_time is not null");
return (Criteria) this;
}
public Criteria andSortEqualTo(Integer value) {
addCriterion("sort =", value, "sort");
public Criteria andCreateTimeEqualTo(Date value) {
addCriterion("create_time =", value, "createTime");
return (Criteria) this;
}
public Criteria andSortNotEqualTo(Integer value) {
addCriterion("sort <>", value, "sort");
public Criteria andCreateTimeNotEqualTo(Date value) {
addCriterion("create_time <>", value, "createTime");
return (Criteria) this;
}
public Criteria andSortGreaterThan(Integer value) {
addCriterion("sort >", value, "sort");
public Criteria andCreateTimeGreaterThan(Date value) {
addCriterion("create_time >", value, "createTime");
return (Criteria) this;
}
public Criteria andSortGreaterThanOrEqualTo(Integer value) {
addCriterion("sort >=", value, "sort");
public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("create_time >=", value, "createTime");
return (Criteria) this;
}
public Criteria andSortLessThan(Integer value) {
addCriterion("sort <", value, "sort");
public Criteria andCreateTimeLessThan(Date value) {
addCriterion("create_time <", value, "createTime");
return (Criteria) this;
}
public Criteria andSortLessThanOrEqualTo(Integer value) {
addCriterion("sort <=", value, "sort");
public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
addCriterion("create_time <=", value, "createTime");
return (Criteria) this;
}
public Criteria andSortIn(List<Integer> values) {
addCriterion("sort in", values, "sort");
public Criteria andCreateTimeIn(List<Date> values) {
addCriterion("create_time in", values, "createTime");
return (Criteria) this;
}
public Criteria andSortNotIn(List<Integer> values) {
addCriterion("sort not in", values, "sort");
public Criteria andCreateTimeNotIn(List<Date> values) {
addCriterion("create_time not in", values, "createTime");
return (Criteria) this;
}
public Criteria andSortBetween(Integer value1, Integer value2) {
addCriterion("sort between", value1, value2, "sort");
public Criteria andCreateTimeBetween(Date value1, Date value2) {
addCriterion("create_time between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andSortNotBetween(Integer value1, Integer value2) {
addCriterion("sort not between", value1, value2, "sort");
public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
addCriterion("create_time not between", value1, value2, "createTime");
return (Criteria) this;
}

2
src/main/java/com/sztzjy/money_management/entity/StuCaseDto.java
Unescape Escape View File

@ -19,8 +19,6 @@ public class StuCaseDto {
private CaseConsumptionPlan caseConsumptionPlan;
@ApiModelProperty("案例财产分配表")
private CaseDistributionOfPropertyWithBLOBs caseDistributionOfProperty;
@ApiModelProperty("案例财产分配家庭结构记录表")
private CaseDistributionOfPropertyFamilyRecords caseDistributionOfPropertyFamilyRecords;
@ApiModelProperty("财务分析-资产负债表")
private CaseFinanceLiability caseFinanceLiability;
@ApiModelProperty("案例财务分析财务比率分析表")

43
src/main/java/com/sztzjy/money_management/entity/dto/CaseDistributionOfPropertyFamilyDto.java
Unescape Escape View File

@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
/**
@ -13,7 +14,45 @@ import java.util.List;
* @Date 2024/8/21
*/
@Data
public class CaseDistributionOfPropertyFamilyDto extends CaseDistributionOfProperty {
@ApiModelProperty("案例-财产分配-家庭结构记录集合")
public class CaseDistributionOfPropertyFamilyDto{
@ApiModelProperty("案例-财产分配id")
private String caseDistributionOfPropertyId;
private String caseid;
@ApiModelProperty("客户性别")
private String customerSex;
@ApiModelProperty("住址")
private String address;
@ApiModelProperty("职业")
private String position;
@ApiModelProperty("家庭成员数")
private Integer familyNum;
@ApiModelProperty("财产分配规划工具")
private String planTool;
@ApiModelProperty("用户ID")
private String userId;
@ApiModelProperty("学生答案/题目答案")
private String isAnswer;
@ApiModelProperty("婚姻、财产状况分析老师评分")
private BigDecimal situationanalysisTeacherScore;
@ApiModelProperty("财产分配规划分析老师评分")
private BigDecimal plananalysisTeacherScore;
@ApiModelProperty("婚姻、财产状况分析")
private String situationAnalysis;
@ApiModelProperty("财产分配规划分析")
private String planAnalysis;
@ApiModelProperty("案例-财产分配-家庭结构记录表集合")
List<CaseDistributionOfPropertyFamilyRecords> CaseDistributionOfPropertyFamilyRecordsList;
}

7
src/main/java/com/sztzjy/money_management/mapper/InsuranceProMapper.java
Unescape Escape View File

@ -3,10 +3,14 @@ package com.sztzjy.money_management.mapper;
import com.sztzjy.money_management.entity.InsurancePro;
import com.sztzjy.money_management.entity.InsuranceProExample;
import com.sztzjy.money_management.entity.InsuranceProWithBLOBs;
import java.util.List;
import com.sztzjy.money_management.util.ResultEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@Mapper
public interface InsuranceProMapper {
long countByExample(InsuranceProExample example);
@ -36,4 +40,7 @@ public interface InsuranceProMapper {
int updateByPrimaryKeyWithBLOBs(InsuranceProWithBLOBs record);
int updateByPrimaryKey(InsurancePro record);
@Select("select name from insurance_pro where kind=#{type}")
List<String> getInsurancePro(@Param("type") String type);
}

1
src/main/java/com/sztzjy/money_management/service/CaseService.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.sztzjy.money_management.service;
import com.nimbusds.jose.shaded.gson.Gson;
import com.sztzjy.money_management.entity.CaseInfo;
import com.sztzjy.money_management.entity.StuCaseDto;
import com.sztzjy.money_management.entity.dto.CaseInvestmentPlanDto;
import com.sztzjy.money_management.util.ResultEntity;

376
src/main/java/com/sztzjy/money_management/service/impl/CaseServiceImpl.java
Unescape Escape View File

@ -95,7 +95,7 @@ public class CaseServiceImpl implements CaseService {
String formattedDate = currentDate.format(formatter);
SynthesisPlanClientExample example1 = new SynthesisPlanClientExample();
example1.setOrderByClause("createTime");
example1.setOrderByClause("create_time");
List<SynthesisPlanClient> synthesisPlanClients = synthesisPlanClientMapper.selectByExample(example1);
String clientNumber;
@ -150,211 +150,213 @@ public class CaseServiceImpl implements CaseService {
adminOrTeaInsert("master", caseInfo);
//财务分析现金流量表
CaseCashFlow caseCashFlow = new CaseCashFlow();
if (stuCaseDto.getCaseCashFlow() != null) {
CaseCashFlow caseCashFlow = stuCaseDto.getCaseCashFlow();
//ID为空新增，不为空编辑
if (StringUtils.isBlank(caseCashFlow.getCaseCashFlowId())) {
caseCashFlow.setCaseCashFlowId(IdUtil.randomUUID());
caseCashFlowMapper.insert(caseCashFlow);
}
if (StringUtils.isNotBlank(caseCashFlow.getCaseCashFlowId())) {
caseCashFlowMapper.updateByPrimaryKeySelective(caseCashFlow);
}
caseCashFlow = stuCaseDto.getCaseCashFlow();
}
//ID为空新增，不为空编辑
if (StringUtils.isBlank(caseCashFlow.getCaseCashFlowId())) {
caseCashFlow.setCaseid(IdUtil.randomUUID());
caseCashFlow.setCaseCashFlowId(IdUtil.randomUUID());
caseCashFlowMapper.insert(caseCashFlow);
} else {
caseCashFlowMapper.updateByPrimaryKeySelective(caseCashFlow);
}
//案例现金规划表
CaseCashPlan caseCashPlan = new CaseCashPlan();
if (stuCaseDto.getCaseCashPlan() != null) {
CaseCashPlan caseCashPlan = stuCaseDto.getCaseCashPlan();
//ID为空新增，不为空编辑
if (StringUtils.isBlank(caseCashPlan.getCaseCashPlanId())) {
caseCashPlan.setCaseCashPlanId(IdUtil.randomUUID());
caseCashPlanMapper.insert(caseCashPlan);
}
if (StringUtils.isNotBlank(caseCashPlan.getCaseCashPlanId())) {
caseCashPlanMapper.updateByPrimaryKeySelective(caseCashPlan);
}
caseCashPlan = stuCaseDto.getCaseCashPlan();
}
//ID为空新增，不为空编辑
if (StringUtils.isBlank(caseCashPlan.getCaseCashPlanId())) {
caseCashPlan.setCaseid(IdUtil.randomUUID());
caseCashPlan.setCaseCashPlanId(IdUtil.randomUUID());
caseCashPlanMapper.insert(caseCashPlan);
} else {
caseCashPlanMapper.updateByPrimaryKeySelective(caseCashPlan);
}
//生涯规划-消费规划表
CaseConsumptionPlan caseConsumptionPlan = new CaseConsumptionPlan();
if (stuCaseDto.getCaseConsumptionPlan() != null) {
CaseConsumptionPlan caseConsumptionPlan = stuCaseDto.getCaseConsumptionPlan();
//ID为空新增，不为空编辑
if (StringUtils.isBlank(caseConsumptionPlan.getCaseConsumptionPlanId())) {
caseConsumptionPlan.setCaseConsumptionPlanId(IdUtil.randomUUID());
caseConsumptionPlanMapper.insert(caseConsumptionPlan);
}
if (StringUtils.isNotBlank(caseConsumptionPlan.getCaseConsumptionPlanId())) {
caseConsumptionPlanMapper.updateByPrimaryKeySelective(caseConsumptionPlan);
}
caseConsumptionPlan = stuCaseDto.getCaseConsumptionPlan();
}
//ID为空新增，不为空编辑
if (StringUtils.isBlank(caseConsumptionPlan.getCaseConsumptionPlanId())) {
caseConsumptionPlan.setCaseId(IdUtil.randomUUID());
caseConsumptionPlan.setCaseConsumptionPlanId(IdUtil.randomUUID());
caseConsumptionPlanMapper.insert(caseConsumptionPlan);
} else {
caseConsumptionPlanMapper.updateByPrimaryKeySelective(caseConsumptionPlan);
}
//案例财产分配表
CaseDistributionOfPropertyWithBLOBs caseDistributionOfProperty = new CaseDistributionOfPropertyWithBLOBs();
if (stuCaseDto.getCaseDistributionOfProperty() != null) {
CaseDistributionOfPropertyWithBLOBs caseDistributionOfProperty = stuCaseDto.getCaseDistributionOfProperty();
//ID为空新增，不为空编辑
if (StringUtils.isBlank(caseDistributionOfProperty.getCaseDistributionOfPropertyId())) {
caseDistributionOfProperty.setCaseDistributionOfPropertyId(IdUtil.randomUUID());
caseDistributionOfPropertyMapper.insert(caseDistributionOfProperty);
}
if (StringUtils.isNotBlank(caseDistributionOfProperty.getCaseDistributionOfPropertyId())) {
caseDistributionOfPropertyMapper.updateByPrimaryKeySelective(caseDistributionOfProperty);
}
caseDistributionOfProperty = stuCaseDto.getCaseDistributionOfProperty();
}
//案例财产分配家庭结构记录表
if (stuCaseDto.getCaseDistributionOfPropertyFamilyRecords() != null) {
CaseDistributionOfPropertyFamilyRecords caseDistributionOfPropertyFamilyRecords = stuCaseDto.getCaseDistributionOfPropertyFamilyRecords();
//ID为空新增，不为空编辑
if (StringUtils.isBlank(caseDistributionOfPropertyFamilyRecords.getCaseDistributionOfPropertyFamilyRecordsId())) {
caseDistributionOfPropertyFamilyRecords.setCaseDistributionOfPropertyFamilyRecordsId(IdUtil.randomUUID());
caseDistributionOfPropertyFamilyRecordsMapper.insert(caseDistributionOfPropertyFamilyRecords);
}
if (StringUtils.isNotBlank(caseDistributionOfPropertyFamilyRecords.getCaseDistributionOfPropertyFamilyRecordsId())) {
caseDistributionOfPropertyFamilyRecordsMapper.updateByPrimaryKeySelective(caseDistributionOfPropertyFamilyRecords);
}
//ID为空新增，不为空编辑
if (StringUtils.isBlank(caseDistributionOfProperty.getCaseDistributionOfPropertyId())) {
caseDistributionOfProperty.setCaseid(IdUtil.randomUUID());
caseDistributionOfProperty.setCaseDistributionOfPropertyId(IdUtil.randomUUID());
caseDistributionOfPropertyMapper.insert(caseDistributionOfProperty);
} else {
caseDistributionOfPropertyMapper.updateByPrimaryKeySelective(caseDistributionOfProperty);
}
//财务分析-资产负债表
CaseFinanceLiability caseFinanceLiability = new CaseFinanceLiability();
if (stuCaseDto.getCaseFinanceLiability() != null) {
CaseFinanceLiability caseFinanceLiability = stuCaseDto.getCaseFinanceLiability();
//ID为空新增，不为空编辑
if (StringUtils.isBlank(caseFinanceLiability.getCaseFinanceLiabilityId())) {
caseFinanceLiability.setCaseFinanceLiabilityId(IdUtil.randomUUID());
caseFinanceLiabilityMapper.insert(caseFinanceLiability);
}
if (StringUtils.isNotBlank(caseFinanceLiability.getCaseFinanceLiabilityId())) {
caseFinanceLiabilityMapper.updateByPrimaryKeySelective(caseFinanceLiability);
}
caseFinanceLiability = stuCaseDto.getCaseFinanceLiability();
}
//ID为空新增，不为空编辑
if (StringUtils.isBlank(caseFinanceLiability.getCaseFinanceLiabilityId())) {
caseFinanceLiability.setCaseId(IdUtil.randomUUID());
caseFinanceLiability.setCaseFinanceLiabilityId(IdUtil.randomUUID());
caseFinanceLiabilityMapper.insert(caseFinanceLiability);
} else {
caseFinanceLiabilityMapper.updateByPrimaryKeySelective(caseFinanceLiability);
}
//案例财务分析财务比率分析表
CaseFinancialRatiosWithBLOBs caseFinancialRatios = new CaseFinancialRatiosWithBLOBs();
if (stuCaseDto.getCaseFinancialRatios() != null) {
CaseFinancialRatiosWithBLOBs caseFinancialRatios = stuCaseDto.getCaseFinancialRatios();
//ID为空新增，不为空编辑
if (StringUtils.isBlank(caseFinancialRatios.getCaseFinancialRatiosId())) {
caseFinancialRatios.setCaseFinancialRatiosId(IdUtil.randomUUID());
caseFinancialRatiosMapper.insert(caseFinancialRatios);
}
if (StringUtils.isNotBlank(caseFinancialRatios.getCaseFinancialRatiosId())) {
caseFinancialRatiosMapper.updateByPrimaryKeySelective(caseFinancialRatios);
}
caseFinancialRatios = stuCaseDto.getCaseFinancialRatios();
}
//ID为空新增，不为空编辑
if (StringUtils.isBlank(caseFinancialRatios.getCaseFinancialRatiosId())) {
caseFinancialRatios.setCaseFinancialRatiosId(IdUtil.randomUUID());
caseFinancialRatios.setCaseid(IdUtil.randomUUID());
caseFinancialRatiosMapper.insert(caseFinancialRatios);
} else {
caseFinancialRatiosMapper.updateByPrimaryKeySelective(caseFinancialRatios);
}
//案例遗产传承表
CaseHeritageWithBLOBs caseHeritage = new CaseHeritageWithBLOBs();
if (stuCaseDto.getCaseHeritage() != null) {
CaseHeritageWithBLOBs caseHeritage = stuCaseDto.getCaseHeritage();
//ID为空新增，不为空编辑
if (StringUtils.isBlank(caseHeritage.getCaseHeritageId())) {
caseHeritage.setCaseHeritageId(IdUtil.randomUUID());
caseHeritageMapper.insert(caseHeritage);
}
if (StringUtils.isNotBlank(caseHeritage.getCaseHeritageId())) {
caseHeritageMapper.updateByPrimaryKeySelective(caseHeritage);
}
caseHeritage = stuCaseDto.getCaseHeritage();
}
//ID为空新增，不为空编辑
if (StringUtils.isBlank(caseHeritage.getCaseHeritageId())) {
caseHeritage.setCaseHeritageId(IdUtil.randomUUID());
caseHeritage.setCaseid(IdUtil.randomUUID());
caseHeritageMapper.insert(caseHeritage);
} else {
caseHeritageMapper.updateByPrimaryKeySelective(caseHeritage);
}
//案例财务分析收支储蓄表
CaseIncomeAndExpenses caseIncomeAndExpenses = new CaseIncomeAndExpenses();
if (stuCaseDto.getCaseIncomeAndExpenses() != null) {
CaseIncomeAndExpenses caseIncomeAndExpenses = stuCaseDto.getCaseIncomeAndExpenses();
//ID为空新增，不为空编辑
if (StringUtils.isBlank(caseIncomeAndExpenses.getCaseIncomeAndExpensesId())) {
caseIncomeAndExpenses.setCaseIncomeAndExpensesId(IdUtil.randomUUID());
caseIncomeAndExpensesMapper.insert(caseIncomeAndExpenses);
}
if (StringUtils.isNotBlank(caseIncomeAndExpenses.getCaseIncomeAndExpensesId())) {
caseIncomeAndExpensesMapper.updateByPrimaryKeySelective(caseIncomeAndExpenses);
}
caseIncomeAndExpenses = stuCaseDto.getCaseIncomeAndExpenses();
}
//ID为空新增，不为空编辑
if (StringUtils.isBlank(caseIncomeAndExpenses.getCaseIncomeAndExpensesId())) {
caseIncomeAndExpenses.setCaseIncomeAndExpensesId(IdUtil.randomUUID());
caseIncomeAndExpenses.setCaseid(IdUtil.randomUUID());
caseIncomeAndExpensesMapper.insert(caseIncomeAndExpenses);
} else {
caseIncomeAndExpensesMapper.updateByPrimaryKeySelective(caseIncomeAndExpenses);
}
//投资规划案例表
CaseInvestmentPlan caseInvestmentPlan = new CaseInvestmentPlan();
if (stuCaseDto.getCaseInvestmentPlan() != null) {
CaseInvestmentPlan caseInvestmentPlan = stuCaseDto.getCaseInvestmentPlan();
//ID为空新增，不为空编辑
if (StringUtils.isBlank(caseInvestmentPlan.getCaseInvestmentPlanId())) {
caseInvestmentPlan.setCaseInvestmentPlanId(IdUtil.randomUUID());
investmentPlanMapper.insert(caseInvestmentPlan);
}
if (StringUtils.isNotBlank(caseInvestmentPlan.getCaseInvestmentPlanId())) {
investmentPlanMapper.updateByPrimaryKeySelective(caseInvestmentPlan);
}
caseInvestmentPlan = stuCaseDto.getCaseInvestmentPlan();
}
//ID为空新增，不为空编辑
if (StringUtils.isBlank(caseInvestmentPlan.getCaseInvestmentPlanId())) {
caseInvestmentPlan.setCaseInvestmentPlanId(IdUtil.randomUUID());
caseInvestmentPlan.setCaseId(IdUtil.randomUUID());
investmentPlanMapper.insert(caseInvestmentPlan);
} else {
investmentPlanMapper.updateByPrimaryKeySelective(caseInvestmentPlan);
}
//案例生涯规划保险规划表
CaseInsurancePlan caseInsurancePlan = new CaseInsurancePlan();
if (stuCaseDto.getCaseInsurancePlan() != null) {
CaseInsurancePlan caseInsurancePlan = stuCaseDto.getCaseInsurancePlan();
//ID为空新增，不为空编辑
if (StringUtils.isBlank(caseInsurancePlan.getCaseInsurancePlanId())) {
caseInsurancePlan.setCaseInsurancePlanId(IdUtil.randomUUID());
caseInsurancePlanMapper.insert(caseInsurancePlan);
}
if (StringUtils.isNotBlank(caseInsurancePlan.getCaseInsurancePlanId())) {
caseInsurancePlanMapper.updateByPrimaryKeySelective(caseInsurancePlan);
}
caseInsurancePlan = stuCaseDto.getCaseInsurancePlan();
}
//ID为空新增，不为空编辑
if (StringUtils.isBlank(caseInsurancePlan.getCaseInsurancePlanId())) {
caseInsurancePlan.setCaseInsurancePlanId(IdUtil.randomUUID());
caseInsurancePlan.setCaseid(IdUtil.randomUUID());
caseInsurancePlanMapper.insert(caseInsurancePlan);
} else {
caseInsurancePlanMapper.updateByPrimaryKeySelective(caseInsurancePlan);
}
//案例生涯规划教育规划表
CaseLifeEducationPlan caseLifeEducationPlan = new CaseLifeEducationPlan();
if (stuCaseDto.getCaseLifeEducationPlan() != null) {
CaseLifeEducationPlan caseLifeEducationPlan = stuCaseDto.getCaseLifeEducationPlan();
//ID为空新增，不为空编辑
if (StringUtils.isBlank(caseLifeEducationPlan.getCaseLifeEducationPlanId())) {
caseLifeEducationPlan.setCaseLifeEducationPlanId(IdUtil.randomUUID());
caseLifeEducationPlanMapper.insert(caseLifeEducationPlan);
}
if (StringUtils.isNotBlank(caseLifeEducationPlan.getCaseLifeEducationPlanId())) {
caseLifeEducationPlanMapper.updateByPrimaryKeySelective(caseLifeEducationPlan);
}
caseLifeEducationPlan = stuCaseDto.getCaseLifeEducationPlan();
}
//ID为空新增，不为空编辑
if (StringUtils.isBlank(caseLifeEducationPlan.getCaseLifeEducationPlanId())) {
caseLifeEducationPlan.setCaseLifeEducationPlanId(IdUtil.randomUUID());
caseLifeEducationPlan.setCaseid(IdUtil.randomUUID());
caseLifeEducationPlanMapper.insert(caseLifeEducationPlan);
} else {
caseLifeEducationPlanMapper.updateByPrimaryKeySelective(caseLifeEducationPlan);
}
//案例生涯规划退休规划表
CaseRetirementPlan caseRetirementPlan = new CaseRetirementPlan();
if (stuCaseDto.getCaseRetirementPlan() != null) {
CaseRetirementPlan caseRetirementPlan = stuCaseDto.getCaseRetirementPlan();
//ID为空新增，不为空编辑
if (StringUtils.isBlank(caseRetirementPlan.getCaseRetirementPlanId())) {
caseRetirementPlan.setCaseRetirementPlanId(IdUtil.randomUUID());
caseRetirementPlanMapper.insert(caseRetirementPlan);
}
if (StringUtils.isNotBlank(caseRetirementPlan.getCaseRetirementPlanId())) {
caseRetirementPlanMapper.updateByPrimaryKeySelective(caseRetirementPlan);
}
caseRetirementPlan = stuCaseDto.getCaseRetirementPlan();
}
//ID为空新增，不为空编辑
if (StringUtils.isBlank(caseRetirementPlan.getCaseRetirementPlanId())) {
caseRetirementPlan.setCaseRetirementPlanId(IdUtil.randomUUID());
caseRetirementPlan.setCaseid(IdUtil.randomUUID());
caseRetirementPlanMapper.insert(caseRetirementPlan);
} else {
caseRetirementPlanMapper.updateByPrimaryKeySelective(caseRetirementPlan);
}
//风险测评-风险指标表
CaseRiskIndex caseRiskIndex = new CaseRiskIndex();
if (stuCaseDto.getCaseRiskIndex() != null) {
CaseRiskIndex caseRiskIndex = stuCaseDto.getCaseRiskIndex();
//ID为空新增，不为空编辑
if (StringUtils.isBlank(caseRiskIndex.getCaseRiskIndexId())) {
caseRiskIndex.setCaseRiskIndexId(IdUtil.randomUUID());
caseRiskIndexMapper.insert(caseRiskIndex);
}
if (StringUtils.isNotBlank(caseRiskIndex.getCaseRiskIndexId())) {
caseRiskIndexMapper.updateByPrimaryKeySelective(caseRiskIndex);
}
caseRiskIndex = stuCaseDto.getCaseRiskIndex();
}
//ID为空新增，不为空编辑
if (StringUtils.isBlank(caseRiskIndex.getCaseRiskIndexId())) {
caseRiskIndex.setCaseRiskIndexId(IdUtil.randomUUID());
caseRiskIndex.setCaseid(IdUtil.randomUUID());
caseRiskIndexMapper.insert(caseRiskIndex);
} else {
caseRiskIndexMapper.updateByPrimaryKeySelective(caseRiskIndex);
}
//案例生涯规划创业规划表
CaseStartAnUndertakingPlan caseStartAnUndertakingPlan = new CaseStartAnUndertakingPlan();
if (stuCaseDto.getCaseStartAnUndertakingPlan() != null) {
CaseStartAnUndertakingPlan caseStartAnUndertakingPlan = stuCaseDto.getCaseStartAnUndertakingPlan();
//ID为空新增，不为空编辑
if (StringUtils.isBlank(caseStartAnUndertakingPlan.getCaseStartAnUndertakingPlanId())) {
caseStartAnUndertakingPlan.setCaseStartAnUndertakingPlanId(IdUtil.randomUUID());
caseStartAnUndertakingPlanMapper.insert(caseStartAnUndertakingPlan);
}
if (StringUtils.isNotBlank(caseStartAnUndertakingPlan.getCaseStartAnUndertakingPlanId())) {
caseStartAnUndertakingPlanMapper.updateByPrimaryKeySelective(caseStartAnUndertakingPlan);
}
caseStartAnUndertakingPlan = stuCaseDto.getCaseStartAnUndertakingPlan();
}
//ID为空新增，不为空编辑
if (StringUtils.isBlank(caseStartAnUndertakingPlan.getCaseStartAnUndertakingPlanId())) {
caseStartAnUndertakingPlan.setCaseStartAnUndertakingPlanId(IdUtil.randomUUID());
caseStartAnUndertakingPlan.setCaseid(IdUtil.randomUUID());
caseStartAnUndertakingPlanMapper.insert(caseStartAnUndertakingPlan);
} else {
caseStartAnUndertakingPlanMapper.updateByPrimaryKeySelective(caseStartAnUndertakingPlan);
}
//案例税务筹划表
CaseTaxPlan caseTaxPlan = new CaseTaxPlan();
if (stuCaseDto.getCaseTaxPlan() != null) {
CaseTaxPlan caseTaxPlan = stuCaseDto.getCaseTaxPlan();
//ID为空新增，不为空编辑
if (StringUtils.isBlank(caseTaxPlan.getCaseTaxPlanId())) {
caseTaxPlan.setCaseTaxPlanId(IdUtil.randomUUID());
caseTaxPlanMapper.insert(caseTaxPlan);
}
if (StringUtils.isNotBlank(caseTaxPlan.getCaseTaxPlanId())) {
caseTaxPlanMapper.updateByPrimaryKeySelective(caseTaxPlan);
}
caseTaxPlan = stuCaseDto.getCaseTaxPlan();
}
//ID为空新增，不为空编辑
if (StringUtils.isBlank(caseTaxPlan.getCaseTaxPlanId())) {
caseTaxPlan.setCaseTaxPlanId(IdUtil.randomUUID());
caseTaxPlan.setCaseid(IdUtil.randomUUID());
caseTaxPlanMapper.insert(caseTaxPlan);
} else {
caseTaxPlanMapper.updateByPrimaryKeySelective(caseTaxPlan);
}
return null;
}
@ -446,6 +448,10 @@ public class CaseServiceImpl implements CaseService {
//主键id为空则新增 否则编辑
if (StringUtils.isBlank(caseRiskIndex.getCaseRiskIndexId())) {
caseRiskIndex.setCaseRiskIndexId(IdUtil.randomUUID());
//为空是老师新增，给一个caseID
if (operator.equals("master")) {
caseRiskIndex.setCaseid(IdUtil.randomUUID());
}
caseRiskIndexMapper.insert(caseRiskIndex);
return new ResultEntity<HttpStatus>(HttpStatus.OK, "新增成功！");
}
@ -468,6 +474,9 @@ public class CaseServiceImpl implements CaseService {
//主键id为空则新增 否则编辑
if (StringUtils.isBlank(caseFinanceLiability.getCaseFinanceLiabilityId())) {
caseFinanceLiability.setCaseFinanceLiabilityId(IdUtil.randomUUID());
if (operator.equals("master")) {
caseFinanceLiability.setCaseId(IdUtil.randomUUID());
}
caseFinanceLiabilityMapper.insert(caseFinanceLiability);
return new ResultEntity<HttpStatus>(HttpStatus.OK, "新增成功！");
}
@ -489,6 +498,9 @@ public class CaseServiceImpl implements CaseService {
//主键id为空则新增 否则编辑
if (StringUtils.isBlank(caseIncomeAndExpenses.getCaseIncomeAndExpensesId())) {
caseIncomeAndExpenses.setCaseIncomeAndExpensesId(IdUtil.randomUUID());
if (operator.equals("master")) {
caseIncomeAndExpenses.setCaseid(IdUtil.randomUUID());
}
caseIncomeAndExpensesMapper.insert(caseIncomeAndExpenses);
return new ResultEntity<HttpStatus>(HttpStatus.OK, "新增成功！");
}
@ -510,6 +522,9 @@ public class CaseServiceImpl implements CaseService {
if (StringUtils.isBlank(caseCashFlow.getCaseCashFlowId())) {
caseCashFlow.setCaseCashFlowId(IdUtil.randomUUID());
if (operator.equals("master")) {
caseCashFlow.setCaseid(IdUtil.randomUUID());
}
caseCashFlowMapper.insert(caseCashFlow);
return new ResultEntity<HttpStatus>(HttpStatus.OK, "新增成功！");
}
@ -528,6 +543,9 @@ public class CaseServiceImpl implements CaseService {
CaseFinancialRatiosWithBLOBs caseFinancialRatios = gson.fromJson(json, CaseFinancialRatiosWithBLOBs.class);
if (StringUtils.isBlank(caseFinancialRatios.getCaseFinancialRatiosId())) {
caseFinancialRatios.setCaseFinancialRatiosId(IdUtil.randomUUID());
if (operator.equals("master")) {
caseFinancialRatios.setCaseid(IdUtil.randomUUID());
}
caseFinancialRatiosMapper.insert(caseFinancialRatios);
return new ResultEntity<HttpStatus>(HttpStatus.OK, "新增成功！");
}
@ -547,6 +565,9 @@ public class CaseServiceImpl implements CaseService {
if (StringUtils.isBlank(caseCashPlan.getCaseCashPlanId())) {
caseCashPlan.setCaseCashPlanId(IdUtil.randomUUID());
if (operator.equals("master")) {
caseCashPlan.setCaseid(IdUtil.randomUUID());
}
caseCashPlanMapper.insert(caseCashPlan);
return new ResultEntity<HttpStatus>(HttpStatus.OK, "新增成功！");
}
@ -565,6 +586,9 @@ public class CaseServiceImpl implements CaseService {
CaseLifeEducationPlan caseLifeEducationPlan = gson.fromJson(json, CaseLifeEducationPlan.class);
if (StringUtils.isBlank(caseLifeEducationPlan.getCaseLifeEducationPlanId())) {
caseLifeEducationPlan.setCaseLifeEducationPlanId(IdUtil.randomUUID());
if (operator.equals("master")) {
caseLifeEducationPlan.setCaseid(IdUtil.randomUUID());
}
caseLifeEducationPlanMapper.insert(caseLifeEducationPlan);
return new ResultEntity<HttpStatus>(HttpStatus.OK, "新增成功！");
}
@ -583,6 +607,9 @@ public class CaseServiceImpl implements CaseService {
CaseConsumptionPlan caseConsumptionPlan = gson.fromJson(json, CaseConsumptionPlan.class);
if (StringUtils.isBlank(caseConsumptionPlan.getCaseConsumptionPlanId())) {
caseConsumptionPlan.setCaseConsumptionPlanId(IdUtil.randomUUID());
if (operator.equals("master")) {
caseConsumptionPlan.setCaseId(IdUtil.randomUUID());
}
caseConsumptionPlanMapper.insert(caseConsumptionPlan);
return new ResultEntity<HttpStatus>(HttpStatus.OK, "新增成功！");
}
@ -601,6 +628,9 @@ public class CaseServiceImpl implements CaseService {
CaseStartAnUndertakingPlan caseStartAnUndertakingPlan = gson.fromJson(json, CaseStartAnUndertakingPlan.class);
if (StringUtils.isBlank(caseStartAnUndertakingPlan.getCaseStartAnUndertakingPlanId())) {
caseStartAnUndertakingPlan.setCaseStartAnUndertakingPlanId(IdUtil.randomUUID());
if (operator.equals("master")) {
caseStartAnUndertakingPlan.setCaseid(IdUtil.randomUUID());
}
caseStartAnUndertakingPlanMapper.insert(caseStartAnUndertakingPlan);
return new ResultEntity<HttpStatus>(HttpStatus.OK, "新增成功！");
}
@ -619,6 +649,9 @@ public class CaseServiceImpl implements CaseService {
CaseRetirementPlan caseRetirementPlan = gson.fromJson(json, CaseRetirementPlan.class);
if (StringUtils.isBlank(caseRetirementPlan.getCaseRetirementPlanId())) {
caseRetirementPlan.setCaseRetirementPlanId(IdUtil.randomUUID());
if (operator.equals("master")) {
caseRetirementPlan.setCaseid(IdUtil.randomUUID());
}
caseRetirementPlanMapper.insert(caseRetirementPlan);
return new ResultEntity<HttpStatus>(HttpStatus.OK, "新增成功！");
}
@ -637,6 +670,9 @@ public class CaseServiceImpl implements CaseService {
CaseInsurancePlan caseInsurancePlan = gson.fromJson(json, CaseInsurancePlan.class);
if (StringUtils.isBlank(caseInsurancePlan.getCaseInsurancePlanId())) {
caseInsurancePlan.setCaseInsurancePlanId(IdUtil.randomUUID());
if (operator.equals("master")) {
caseInsurancePlan.setCaseid(IdUtil.randomUUID());
}
caseInsurancePlanMapper.insert(caseInsurancePlan);
return new ResultEntity<HttpStatus>(HttpStatus.OK, "新增成功！");
}
@ -656,6 +692,9 @@ public class CaseServiceImpl implements CaseService {
CaseTaxPlan caseTaxPlan = gson.fromJson(json, CaseTaxPlan.class);
if (StringUtils.isBlank(caseTaxPlan.getCaseTaxPlanId())) {
caseTaxPlan.setCaseTaxPlanId(IdUtil.randomUUID());
if (operator.equals("master")) {
caseTaxPlan.setCaseid(IdUtil.randomUUID());
}
caseTaxPlanMapper.insert(caseTaxPlan);
return new ResultEntity<HttpStatus>(HttpStatus.OK, "新增成功！");
}
@ -673,10 +712,14 @@ public class CaseServiceImpl implements CaseService {
if (type.equals("财产分配")) {
CaseDistributionOfPropertyFamilyDto dto = gson.fromJson(json, CaseDistributionOfPropertyFamilyDto.class);
dto.setCaseDistributionOfPropertyId(IdUtil.randomUUID());
if (operator.equals("master")) {
dto.setCaseid(IdUtil.randomUUID());
}
CaseDistributionOfPropertyWithBLOBs caseDistributionOfPropertyWithBLOBs = new CaseDistributionOfPropertyWithBLOBs();
if (StringUtils.isBlank(dto.getCaseDistributionOfPropertyId())) {
BeanUtils.copyProperties(dto, caseDistributionOfPropertyWithBLOBs);
caseDistributionOfPropertyWithBLOBs.setCaseDistributionOfPropertyId(IdUtil.randomUUID());
caseDistributionOfPropertyMapper.insert(caseDistributionOfPropertyWithBLOBs);
//需要多存一张记录表,多条数据
@ -685,6 +728,8 @@ public class CaseServiceImpl implements CaseService {
List<CaseDistributionOfPropertyFamilyRecords> addList = dto.getCaseDistributionOfPropertyFamilyRecordsList();
for (CaseDistributionOfPropertyFamilyRecords caseDistributionOfPropertyFamilyRecords : recordsList) {
caseDistributionOfPropertyFamilyRecords.setCaseDistributionOfPropertyFamilyRecordsId(IdUtil.randomUUID());
caseDistributionOfPropertyFamilyRecords.setCaseDistributionOfPropertyId(caseDistributionOfPropertyWithBLOBs.getCaseDistributionOfPropertyId());
caseDistributionOfPropertyFamilyRecords.setCreateTime(new Date());
addList.add(caseDistributionOfPropertyFamilyRecords);
}
caseDistributionOfPropertyFamilyRecordsMapper.batchInsert(addList);
@ -705,6 +750,9 @@ public class CaseServiceImpl implements CaseService {
CaseHeritageWithBLOBs caseHeritageWithBLOBs = gson.fromJson(json, CaseHeritageWithBLOBs.class);
if (StringUtils.isBlank(caseHeritageWithBLOBs.getCaseHeritageId())) {
caseHeritageWithBLOBs.setCaseHeritageId(IdUtil.randomUUID());
if (operator.equals("master")) {
caseHeritageWithBLOBs.setCaseid(IdUtil.randomUUID());
}
caseHeritageMapper.insert(caseHeritageWithBLOBs);
return new ResultEntity<HttpStatus>(HttpStatus.OK, "新增成功！");
}
@ -762,6 +810,9 @@ public class CaseServiceImpl implements CaseService {
//操作产品选择表
//id为空则新增
if (StringUtils.isBlank(caseInvestmentPlanSelect.getProductSelectId())) {
if (StringUtils.isBlank(newCase.getCaseid())) {
}
caseInvestmentPlanSelect.setProductSelectId(IdUtil.randomUUID());
caseInvestmentPlanSelectMapper.insert(caseInvestmentPlanSelect);
} else {
@ -852,7 +903,8 @@ public class CaseServiceImpl implements CaseService {
}
private ResultEntity<HttpStatus> teaOrAdminUpdateOrInsertInvestmentPlan(CaseInvestmentPlanDto caseInvestmentPlanDto) {
private ResultEntity<HttpStatus> teaOrAdminUpdateOrInsertInvestmentPlan(CaseInvestmentPlanDto
caseInvestmentPlanDto) {
CaseInvestmentPlan investmentPlan = caseInvestmentPlanDto.getInvestmentPlan();
if (StringUtils.isBlank(investmentPlan.getCaseInvestmentPlanId())) { //主键为空为新增
@ -1119,7 +1171,7 @@ public class CaseServiceImpl implements CaseService {
}
if (type.equals("财产分配")) {
CaseDistributionOfPropertyWithBLOBs stuData = gson.fromJson(json, CaseDistributionOfPropertyWithBLOBs.class);
CaseDistributionOfPropertyFamilyDto stuData = gson.fromJson(json, CaseDistributionOfPropertyFamilyDto.class);
CaseDistributionOfPropertyExample caseDistributionOfPropertyExample = new CaseDistributionOfPropertyExample();
caseDistributionOfPropertyExample.createCriteria().andIsAnswerEqualTo("学生答案").andUserIdEqualTo(stuData.getUserId()).andCaseidEqualTo(stuData.getCaseid());
@ -1129,10 +1181,23 @@ public class CaseServiceImpl implements CaseService {
caseDistributionOfPropertyMapper.deleteByPrimaryKey(distributionOfPropertyWithBLOBs.getCaseDistributionOfPropertyId());
}
}
stuData.setCaseDistributionOfPropertyId(IdUtil.randomUUID());
caseDistributionOfPropertyMapper.insert(stuData);
CaseDistributionOfPropertyWithBLOBs newData = new CaseDistributionOfPropertyWithBLOBs();
BeanUtils.copyProperties(stuData, newData);
String id = IdUtil.randomUUID();
newData.setCaseDistributionOfPropertyId(id);
caseDistributionOfPropertyMapper.insert(newData);
List<CaseDistributionOfPropertyFamilyRecords> list = new ArrayList<>();
if (stuData.getCaseDistributionOfPropertyFamilyRecordsList() != null && !stuData.getCaseDistributionOfPropertyFamilyRecordsList().isEmpty()) {
List<CaseDistributionOfPropertyFamilyRecords> caseDistributionOfPropertyFamilyRecordsList = stuData.getCaseDistributionOfPropertyFamilyRecordsList();
for (CaseDistributionOfPropertyFamilyRecords caseDistributionOfPropertyFamilyRecords : caseDistributionOfPropertyFamilyRecordsList) {
caseDistributionOfPropertyFamilyRecords.setCaseDistributionOfPropertyId(id);
caseDistributionOfPropertyFamilyRecords.setCaseDistributionOfPropertyFamilyRecordsId(IdUtil.randomUUID());
caseDistributionOfPropertyFamilyRecords.setCreateTime(new Date());
list.add(caseDistributionOfPropertyFamilyRecords);
}
}
caseDistributionOfPropertyFamilyRecordsMapper.batchInsert(list);
//考核点都为主观题，无需算分
}
@ -2263,7 +2328,8 @@ public class CaseServiceImpl implements CaseService {
return caseCashPlans.get(0);
}
private CaseFinancialRatiosWithBLOBs getCaseFinancialRatiosWithBLOBs(String caseID, String userId, String isAnswer) {
private CaseFinancialRatiosWithBLOBs getCaseFinancialRatiosWithBLOBs(String caseID, String userId, String
isAnswer) {
CaseFinancialRatiosExample example = new CaseFinancialRatiosExample();
CaseFinancialRatiosExample.Criteria criteria = example.createCriteria().andCaseidEqualTo(caseID).andIsAnswerEqualTo(isAnswer);
if (StringUtils.isBlank(userId)) {

Write Preview
Loading…
Cancel
Save