diff --git a/src/main/java/com/sztzjy/fund_investment/controller/InquiryIssuanceController.java b/src/main/java/com/sztzjy/fund_investment/controller/InquiryIssuanceController.java index 82e3a21..fa72ba5 100644 --- a/src/main/java/com/sztzjy/fund_investment/controller/InquiryIssuanceController.java +++ b/src/main/java/com/sztzjy/fund_investment/controller/InquiryIssuanceController.java @@ -38,6 +38,9 @@ public class InquiryIssuanceController { InquiryIssuanceService inquiryIssuanceService; @Resource AllotmentObjectMapper allotmentObjectMapper; + + + @AnonymousAccess @GetMapping("/queryInquiryInvestors") @ApiOperation("询价投资者查看") diff --git a/src/main/java/com/sztzjy/fund_investment/controller/ProfitDistributionController.java b/src/main/java/com/sztzjy/fund_investment/controller/ProfitDistributionController.java index 58f7fc3..5b6a60e 100644 --- a/src/main/java/com/sztzjy/fund_investment/controller/ProfitDistributionController.java +++ b/src/main/java/com/sztzjy/fund_investment/controller/ProfitDistributionController.java @@ -1,8 +1,15 @@ package com.sztzjy.fund_investment.controller; +import com.sztzjy.fund_investment.annotation.AnonymousAccess; +import com.sztzjy.fund_investment.entity.ProfitDistribution; import com.sztzjy.fund_investment.service.ProfitDistributionService; +import com.sztzjy.fund_investment.util.ResultEntity; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -12,8 +19,23 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @RequestMapping("/stu/profitDistribution") -@Api(tags = "学生端--收益管理相关接口") +@Api(tags = "学生端--收益分配") public class ProfitDistributionController { @Autowired private ProfitDistributionService profitDistributionService; + + + @AnonymousAccess + @PostMapping("/submit") + @ApiOperation("页面提交") + public void submit(@ApiParam("传id,flowID,用户输入8个框的内容(可用资金,自有资金和优先级LP必传)") ProfitDistribution profitDistribution) { + profitDistributionService.submit(profitDistribution); + } + + @AnonymousAccess + @GetMapping("/echo") + @ApiOperation("页面回显") + public ResultEntity echo(@ApiParam("流程ID") String flowId) { + return new ResultEntity(profitDistributionService.echo(flowId)); + } } diff --git a/src/main/java/com/sztzjy/fund_investment/entity/Fundraising.java b/src/main/java/com/sztzjy/fund_investment/entity/Fundraising.java index 6397870..01a0cbe 100644 --- a/src/main/java/com/sztzjy/fund_investment/entity/Fundraising.java +++ b/src/main/java/com/sztzjy/fund_investment/entity/Fundraising.java @@ -29,6 +29,9 @@ public class Fundraising { @ApiModelProperty("基金募资金额") private BigDecimal fundraisingAmount; + @ApiModelProperty("1:自有资金/优先级LP、2:自有资金/优先级LP/劣后级LP、3:自有资金/优先级LP/银行借款、4:自有资金/优先级LP/劣后级LP/银行借款") + private Integer type; + public String getId() { return id; } @@ -84,4 +87,12 @@ public class Fundraising { public void setFundraisingAmount(BigDecimal fundraisingAmount) { this.fundraisingAmount = fundraisingAmount; } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } } \ No newline at end of file diff --git a/src/main/java/com/sztzjy/fund_investment/entity/FundraisingExample.java b/src/main/java/com/sztzjy/fund_investment/entity/FundraisingExample.java index 3e8459d..1f4cf26 100644 --- a/src/main/java/com/sztzjy/fund_investment/entity/FundraisingExample.java +++ b/src/main/java/com/sztzjy/fund_investment/entity/FundraisingExample.java @@ -544,6 +544,66 @@ public class FundraisingExample { addCriterion("fundraising_amount not between", value1, value2, "fundraisingAmount"); return (Criteria) this; } + + public Criteria andTypeIsNull() { + addCriterion("type is null"); + return (Criteria) this; + } + + public Criteria andTypeIsNotNull() { + addCriterion("type is not null"); + return (Criteria) this; + } + + public Criteria andTypeEqualTo(Integer value) { + addCriterion("type =", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotEqualTo(Integer value) { + addCriterion("type <>", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThan(Integer value) { + addCriterion("type >", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("type >=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThan(Integer value) { + addCriterion("type <", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThanOrEqualTo(Integer value) { + addCriterion("type <=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeIn(List values) { + addCriterion("type in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotIn(List values) { + addCriterion("type not in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeBetween(Integer value1, Integer value2) { + addCriterion("type between", value1, value2, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotBetween(Integer value1, Integer value2) { + addCriterion("type not between", value1, value2, "type"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/src/main/java/com/sztzjy/fund_investment/entity/PerformanceScore.java b/src/main/java/com/sztzjy/fund_investment/entity/PerformanceScore.java index 3ce474c..17a9081 100644 --- a/src/main/java/com/sztzjy/fund_investment/entity/PerformanceScore.java +++ b/src/main/java/com/sztzjy/fund_investment/entity/PerformanceScore.java @@ -4,10 +4,7 @@ import java.lang.reflect.Method; import java.math.BigDecimal; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; -import org.springframework.format.annotation.DateTimeFormat; - /** * * @author xcj @@ -53,12 +50,12 @@ public class PerformanceScore { @ApiModelProperty("项目尽调/财务尽调结论得分") private BigDecimal projectDueDiligenceFinanceReportScore; - @ApiModelProperty("项目估值/相对估值结论得分") - private BigDecimal projectValuationRelativeScore; - @ApiModelProperty("项目估值/测验得分") private BigDecimal projectValuationScore; + @ApiModelProperty("项目估值/相对估值结论得分") + private BigDecimal projectValuationRelativeScore; + @ApiModelProperty("项目估值/绝对估值结论得分") private BigDecimal projectValuationAbsoluteScore; @@ -113,6 +110,9 @@ public class PerformanceScore { @ApiModelProperty("收益管理/退出时计算基金收益得分") private BigDecimal profitManagementMarketValueExitScore; + @ApiModelProperty("收益分配/可用资金得分") + private BigDecimal profitDistributionAvailablefundsScore; + @ApiModelProperty("收益分配得分") private BigDecimal profitDistributionScore; @@ -125,64 +125,44 @@ public class PerformanceScore { @ApiModelProperty("总成绩") private BigDecimal totalScore; - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @ApiModelProperty("实务认知完成时间") private Date practicalCognitionTime; - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @ApiModelProperty("知识测评完成时间") private Date knowledgeAssessmentTime; - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @ApiModelProperty("基金募资完成时间") private Date fundraisingTime; @ApiModelProperty("寻找项目完成时间") private Date projectSearchTime; - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @ApiModelProperty("项目尽调完成时间") private Date projectDueDiligenceTime; - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @ApiModelProperty("项目估值完成时间") private Date projectValuationTime; - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @ApiModelProperty("签约投资完成时间") private Date investmentSigningTime; - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @ApiModelProperty("ipo页面完成时间") private Date ipoTime; - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @ApiModelProperty("询价发行完成时间") private Date pricingIssuanceTime; - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @ApiModelProperty("收益管理完成时间") private Date profitManagementTime; - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @ApiModelProperty("收益分配完成时间") private Date profitDistributionTime; - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @ApiModelProperty("投资报告页面完成时间") private Date investmentReportTime; + + public void set(String methodName, Object value) { try { Method method = getClass().getMethod("set" + Character.toUpperCase(methodName.charAt(0)) + methodName.substring(1),value.getClass()); @@ -204,7 +184,6 @@ public class PerformanceScore { } - public String getId() { return id; } @@ -309,14 +288,6 @@ public class PerformanceScore { this.projectDueDiligenceFinanceReportScore = projectDueDiligenceFinanceReportScore; } - public BigDecimal getProjectValuationRelativeScore() { - return projectValuationRelativeScore; - } - - public void setProjectValuationRelativeScore(BigDecimal projectValuationRelativeScore) { - this.projectValuationRelativeScore = projectValuationRelativeScore; - } - public BigDecimal getProjectValuationScore() { return projectValuationScore; } @@ -325,6 +296,14 @@ public class PerformanceScore { this.projectValuationScore = projectValuationScore; } + public BigDecimal getProjectValuationRelativeScore() { + return projectValuationRelativeScore; + } + + public void setProjectValuationRelativeScore(BigDecimal projectValuationRelativeScore) { + this.projectValuationRelativeScore = projectValuationRelativeScore; + } + public BigDecimal getProjectValuationAbsoluteScore() { return projectValuationAbsoluteScore; } @@ -469,6 +448,14 @@ public class PerformanceScore { this.profitManagementMarketValueExitScore = profitManagementMarketValueExitScore; } + public BigDecimal getProfitDistributionAvailablefundsScore() { + return profitDistributionAvailablefundsScore; + } + + public void setProfitDistributionAvailablefundsScore(BigDecimal profitDistributionAvailablefundsScore) { + this.profitDistributionAvailablefundsScore = profitDistributionAvailablefundsScore; + } + public BigDecimal getProfitDistributionScore() { return profitDistributionScore; } diff --git a/src/main/java/com/sztzjy/fund_investment/entity/PerformanceScoreExample.java b/src/main/java/com/sztzjy/fund_investment/entity/PerformanceScoreExample.java index 0e4ef0e..f623697 100644 --- a/src/main/java/com/sztzjy/fund_investment/entity/PerformanceScoreExample.java +++ b/src/main/java/com/sztzjy/fund_investment/entity/PerformanceScoreExample.java @@ -926,123 +926,123 @@ public class PerformanceScoreExample { return (Criteria) this; } - public Criteria andProjectValuationRelativeScoreIsNull() { - addCriterion("project_valuation_relative_score is null"); + public Criteria andProjectValuationScoreIsNull() { + addCriterion("project_valuation_score is null"); return (Criteria) this; } - public Criteria andProjectValuationRelativeScoreIsNotNull() { - addCriterion("project_valuation_relative_score is not null"); + public Criteria andProjectValuationScoreIsNotNull() { + addCriterion("project_valuation_score is not null"); return (Criteria) this; } - public Criteria andProjectValuationRelativeScoreEqualTo(BigDecimal value) { - addCriterion("project_valuation_relative_score =", value, "projectValuationRelativeScore"); + public Criteria andProjectValuationScoreEqualTo(BigDecimal value) { + addCriterion("project_valuation_score =", value, "projectValuationScore"); return (Criteria) this; } - public Criteria andProjectValuationRelativeScoreNotEqualTo(BigDecimal value) { - addCriterion("project_valuation_relative_score <>", value, "projectValuationRelativeScore"); + public Criteria andProjectValuationScoreNotEqualTo(BigDecimal value) { + addCriterion("project_valuation_score <>", value, "projectValuationScore"); return (Criteria) this; } - public Criteria andProjectValuationRelativeScoreGreaterThan(BigDecimal value) { - addCriterion("project_valuation_relative_score >", value, "projectValuationRelativeScore"); + public Criteria andProjectValuationScoreGreaterThan(BigDecimal value) { + addCriterion("project_valuation_score >", value, "projectValuationScore"); return (Criteria) this; } - public Criteria andProjectValuationRelativeScoreGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("project_valuation_relative_score >=", value, "projectValuationRelativeScore"); + public Criteria andProjectValuationScoreGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("project_valuation_score >=", value, "projectValuationScore"); return (Criteria) this; } - public Criteria andProjectValuationRelativeScoreLessThan(BigDecimal value) { - addCriterion("project_valuation_relative_score <", value, "projectValuationRelativeScore"); + public Criteria andProjectValuationScoreLessThan(BigDecimal value) { + addCriterion("project_valuation_score <", value, "projectValuationScore"); return (Criteria) this; } - public Criteria andProjectValuationRelativeScoreLessThanOrEqualTo(BigDecimal value) { - addCriterion("project_valuation_relative_score <=", value, "projectValuationRelativeScore"); + public Criteria andProjectValuationScoreLessThanOrEqualTo(BigDecimal value) { + addCriterion("project_valuation_score <=", value, "projectValuationScore"); return (Criteria) this; } - public Criteria andProjectValuationRelativeScoreIn(List values) { - addCriterion("project_valuation_relative_score in", values, "projectValuationRelativeScore"); + public Criteria andProjectValuationScoreIn(List values) { + addCriterion("project_valuation_score in", values, "projectValuationScore"); return (Criteria) this; } - public Criteria andProjectValuationRelativeScoreNotIn(List values) { - addCriterion("project_valuation_relative_score not in", values, "projectValuationRelativeScore"); + public Criteria andProjectValuationScoreNotIn(List values) { + addCriterion("project_valuation_score not in", values, "projectValuationScore"); return (Criteria) this; } - public Criteria andProjectValuationRelativeScoreBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("project_valuation_relative_score between", value1, value2, "projectValuationRelativeScore"); + public Criteria andProjectValuationScoreBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("project_valuation_score between", value1, value2, "projectValuationScore"); return (Criteria) this; } - public Criteria andProjectValuationRelativeScoreNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("project_valuation_relative_score not between", value1, value2, "projectValuationRelativeScore"); + public Criteria andProjectValuationScoreNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("project_valuation_score not between", value1, value2, "projectValuationScore"); return (Criteria) this; } - public Criteria andProjectValuationScoreIsNull() { - addCriterion("project_valuation_score is null"); + public Criteria andProjectValuationRelativeScoreIsNull() { + addCriterion("project_valuation_relative_score is null"); return (Criteria) this; } - public Criteria andProjectValuationScoreIsNotNull() { - addCriterion("project_valuation_score is not null"); + public Criteria andProjectValuationRelativeScoreIsNotNull() { + addCriterion("project_valuation_relative_score is not null"); return (Criteria) this; } - public Criteria andProjectValuationScoreEqualTo(BigDecimal value) { - addCriterion("project_valuation_score =", value, "projectValuationScore"); + public Criteria andProjectValuationRelativeScoreEqualTo(BigDecimal value) { + addCriterion("project_valuation_relative_score =", value, "projectValuationRelativeScore"); return (Criteria) this; } - public Criteria andProjectValuationScoreNotEqualTo(BigDecimal value) { - addCriterion("project_valuation_score <>", value, "projectValuationScore"); + public Criteria andProjectValuationRelativeScoreNotEqualTo(BigDecimal value) { + addCriterion("project_valuation_relative_score <>", value, "projectValuationRelativeScore"); return (Criteria) this; } - public Criteria andProjectValuationScoreGreaterThan(BigDecimal value) { - addCriterion("project_valuation_score >", value, "projectValuationScore"); + public Criteria andProjectValuationRelativeScoreGreaterThan(BigDecimal value) { + addCriterion("project_valuation_relative_score >", value, "projectValuationRelativeScore"); return (Criteria) this; } - public Criteria andProjectValuationScoreGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("project_valuation_score >=", value, "projectValuationScore"); + public Criteria andProjectValuationRelativeScoreGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("project_valuation_relative_score >=", value, "projectValuationRelativeScore"); return (Criteria) this; } - public Criteria andProjectValuationScoreLessThan(BigDecimal value) { - addCriterion("project_valuation_score <", value, "projectValuationScore"); + public Criteria andProjectValuationRelativeScoreLessThan(BigDecimal value) { + addCriterion("project_valuation_relative_score <", value, "projectValuationRelativeScore"); return (Criteria) this; } - public Criteria andProjectValuationScoreLessThanOrEqualTo(BigDecimal value) { - addCriterion("project_valuation_score <=", value, "projectValuationScore"); + public Criteria andProjectValuationRelativeScoreLessThanOrEqualTo(BigDecimal value) { + addCriterion("project_valuation_relative_score <=", value, "projectValuationRelativeScore"); return (Criteria) this; } - public Criteria andProjectValuationScoreIn(List values) { - addCriterion("project_valuation_score in", values, "projectValuationScore"); + public Criteria andProjectValuationRelativeScoreIn(List values) { + addCriterion("project_valuation_relative_score in", values, "projectValuationRelativeScore"); return (Criteria) this; } - public Criteria andProjectValuationScoreNotIn(List values) { - addCriterion("project_valuation_score not in", values, "projectValuationScore"); + public Criteria andProjectValuationRelativeScoreNotIn(List values) { + addCriterion("project_valuation_relative_score not in", values, "projectValuationRelativeScore"); return (Criteria) this; } - public Criteria andProjectValuationScoreBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("project_valuation_score between", value1, value2, "projectValuationScore"); + public Criteria andProjectValuationRelativeScoreBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("project_valuation_relative_score between", value1, value2, "projectValuationRelativeScore"); return (Criteria) this; } - public Criteria andProjectValuationScoreNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("project_valuation_score not between", value1, value2, "projectValuationScore"); + public Criteria andProjectValuationRelativeScoreNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("project_valuation_relative_score not between", value1, value2, "projectValuationRelativeScore"); return (Criteria) this; } @@ -2126,6 +2126,66 @@ public class PerformanceScoreExample { return (Criteria) this; } + public Criteria andProfitDistributionAvailablefundsScoreIsNull() { + addCriterion("profit_distribution_availableFunds_score is null"); + return (Criteria) this; + } + + public Criteria andProfitDistributionAvailablefundsScoreIsNotNull() { + addCriterion("profit_distribution_availableFunds_score is not null"); + return (Criteria) this; + } + + public Criteria andProfitDistributionAvailablefundsScoreEqualTo(BigDecimal value) { + addCriterion("profit_distribution_availableFunds_score =", value, "profitDistributionAvailablefundsScore"); + return (Criteria) this; + } + + public Criteria andProfitDistributionAvailablefundsScoreNotEqualTo(BigDecimal value) { + addCriterion("profit_distribution_availableFunds_score <>", value, "profitDistributionAvailablefundsScore"); + return (Criteria) this; + } + + public Criteria andProfitDistributionAvailablefundsScoreGreaterThan(BigDecimal value) { + addCriterion("profit_distribution_availableFunds_score >", value, "profitDistributionAvailablefundsScore"); + return (Criteria) this; + } + + public Criteria andProfitDistributionAvailablefundsScoreGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("profit_distribution_availableFunds_score >=", value, "profitDistributionAvailablefundsScore"); + return (Criteria) this; + } + + public Criteria andProfitDistributionAvailablefundsScoreLessThan(BigDecimal value) { + addCriterion("profit_distribution_availableFunds_score <", value, "profitDistributionAvailablefundsScore"); + return (Criteria) this; + } + + public Criteria andProfitDistributionAvailablefundsScoreLessThanOrEqualTo(BigDecimal value) { + addCriterion("profit_distribution_availableFunds_score <=", value, "profitDistributionAvailablefundsScore"); + return (Criteria) this; + } + + public Criteria andProfitDistributionAvailablefundsScoreIn(List values) { + addCriterion("profit_distribution_availableFunds_score in", values, "profitDistributionAvailablefundsScore"); + return (Criteria) this; + } + + public Criteria andProfitDistributionAvailablefundsScoreNotIn(List values) { + addCriterion("profit_distribution_availableFunds_score not in", values, "profitDistributionAvailablefundsScore"); + return (Criteria) this; + } + + public Criteria andProfitDistributionAvailablefundsScoreBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("profit_distribution_availableFunds_score between", value1, value2, "profitDistributionAvailablefundsScore"); + return (Criteria) this; + } + + public Criteria andProfitDistributionAvailablefundsScoreNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("profit_distribution_availableFunds_score not between", value1, value2, "profitDistributionAvailablefundsScore"); + return (Criteria) this; + } + public Criteria andProfitDistributionScoreIsNull() { addCriterion("profit_distribution_score is null"); return (Criteria) this; diff --git a/src/main/java/com/sztzjy/fund_investment/entity/ProfitDistribution.java b/src/main/java/com/sztzjy/fund_investment/entity/ProfitDistribution.java index fa97a0b..2a54256 100644 --- a/src/main/java/com/sztzjy/fund_investment/entity/ProfitDistribution.java +++ b/src/main/java/com/sztzjy/fund_investment/entity/ProfitDistribution.java @@ -4,7 +4,7 @@ import java.math.BigDecimal; import io.swagger.annotations.ApiModelProperty; /** - * 收益分配表 + * * @author xcj * profit_distribution */ @@ -31,16 +31,16 @@ public class ProfitDistribution { private BigDecimal availableFunds; @ApiModelProperty("第一轮自有资金") - private BigDecimal round1OwnFunds; + private BigDecimal roundOwnFunds; @ApiModelProperty("第一轮劣后级LP") - private BigDecimal round1SubordinatedLp; + private BigDecimal roundSubordinatedLp; @ApiModelProperty("第一轮优先级LP") - private BigDecimal round1PreferredLp; + private BigDecimal roundPreferredLp; @ApiModelProperty("第一轮银行借款") - private BigDecimal round1BankLoan; + private BigDecimal roundBankLoan; @ApiModelProperty("剩余分配自有资金") private BigDecimal remainingOwnFunds; @@ -51,6 +51,30 @@ public class ProfitDistribution { @ApiModelProperty("剩余收益优先级LP") private BigDecimal remainingEarningsPreferredLp; + @ApiModelProperty("用户输入/可用资金") + private BigDecimal userAvailableFunds; + + @ApiModelProperty("用户输入/第一轮自有资金") + private BigDecimal userRoundOwnFunds; + + @ApiModelProperty("用户输入/第一轮劣后级LP") + private BigDecimal userRoundSubordinatedLp; + + @ApiModelProperty("用户输入/第一轮优先级LP") + private BigDecimal userRoundPreferredLp; + + @ApiModelProperty("用户输入/第一轮银行借款") + private BigDecimal userRoundBankLoan; + + @ApiModelProperty("用户输入/剩余分配自有资金") + private BigDecimal userRemainingOwnFunds; + + @ApiModelProperty("用户输入/剩余收益劣后级LP") + private BigDecimal userRemainingEarningsSubordinatedLp; + + @ApiModelProperty("用户输入/剩余收益优先级LP") + private BigDecimal userRemainingEarningsPreferredLp; + public String getId() { return id; } @@ -107,36 +131,36 @@ public class ProfitDistribution { this.availableFunds = availableFunds; } - public BigDecimal getRound1OwnFunds() { - return round1OwnFunds; + public BigDecimal getRoundOwnFunds() { + return roundOwnFunds; } - public void setRound1OwnFunds(BigDecimal round1OwnFunds) { - this.round1OwnFunds = round1OwnFunds; + public void setRoundOwnFunds(BigDecimal roundOwnFunds) { + this.roundOwnFunds = roundOwnFunds; } - public BigDecimal getRound1SubordinatedLp() { - return round1SubordinatedLp; + public BigDecimal getRoundSubordinatedLp() { + return roundSubordinatedLp; } - public void setRound1SubordinatedLp(BigDecimal round1SubordinatedLp) { - this.round1SubordinatedLp = round1SubordinatedLp; + public void setRoundSubordinatedLp(BigDecimal roundSubordinatedLp) { + this.roundSubordinatedLp = roundSubordinatedLp; } - public BigDecimal getRound1PreferredLp() { - return round1PreferredLp; + public BigDecimal getRoundPreferredLp() { + return roundPreferredLp; } - public void setRound1PreferredLp(BigDecimal round1PreferredLp) { - this.round1PreferredLp = round1PreferredLp; + public void setRoundPreferredLp(BigDecimal roundPreferredLp) { + this.roundPreferredLp = roundPreferredLp; } - public BigDecimal getRound1BankLoan() { - return round1BankLoan; + public BigDecimal getRoundBankLoan() { + return roundBankLoan; } - public void setRound1BankLoan(BigDecimal round1BankLoan) { - this.round1BankLoan = round1BankLoan; + public void setRoundBankLoan(BigDecimal roundBankLoan) { + this.roundBankLoan = roundBankLoan; } public BigDecimal getRemainingOwnFunds() { @@ -162,4 +186,68 @@ public class ProfitDistribution { public void setRemainingEarningsPreferredLp(BigDecimal remainingEarningsPreferredLp) { this.remainingEarningsPreferredLp = remainingEarningsPreferredLp; } + + public BigDecimal getUserAvailableFunds() { + return userAvailableFunds; + } + + public void setUserAvailableFunds(BigDecimal userAvailableFunds) { + this.userAvailableFunds = userAvailableFunds; + } + + public BigDecimal getUserRoundOwnFunds() { + return userRoundOwnFunds; + } + + public void setUserRoundOwnFunds(BigDecimal userRoundOwnFunds) { + this.userRoundOwnFunds = userRoundOwnFunds; + } + + public BigDecimal getUserRoundSubordinatedLp() { + return userRoundSubordinatedLp; + } + + public void setUserRoundSubordinatedLp(BigDecimal userRoundSubordinatedLp) { + this.userRoundSubordinatedLp = userRoundSubordinatedLp; + } + + public BigDecimal getUserRoundPreferredLp() { + return userRoundPreferredLp; + } + + public void setUserRoundPreferredLp(BigDecimal userRoundPreferredLp) { + this.userRoundPreferredLp = userRoundPreferredLp; + } + + public BigDecimal getUserRoundBankLoan() { + return userRoundBankLoan; + } + + public void setUserRoundBankLoan(BigDecimal userRoundBankLoan) { + this.userRoundBankLoan = userRoundBankLoan; + } + + public BigDecimal getUserRemainingOwnFunds() { + return userRemainingOwnFunds; + } + + public void setUserRemainingOwnFunds(BigDecimal userRemainingOwnFunds) { + this.userRemainingOwnFunds = userRemainingOwnFunds; + } + + public BigDecimal getUserRemainingEarningsSubordinatedLp() { + return userRemainingEarningsSubordinatedLp; + } + + public void setUserRemainingEarningsSubordinatedLp(BigDecimal userRemainingEarningsSubordinatedLp) { + this.userRemainingEarningsSubordinatedLp = userRemainingEarningsSubordinatedLp; + } + + public BigDecimal getUserRemainingEarningsPreferredLp() { + return userRemainingEarningsPreferredLp; + } + + public void setUserRemainingEarningsPreferredLp(BigDecimal userRemainingEarningsPreferredLp) { + this.userRemainingEarningsPreferredLp = userRemainingEarningsPreferredLp; + } } \ No newline at end of file diff --git a/src/main/java/com/sztzjy/fund_investment/entity/ProfitDistributionExample.java b/src/main/java/com/sztzjy/fund_investment/entity/ProfitDistributionExample.java index 76ffa3d..cb9aa96 100644 --- a/src/main/java/com/sztzjy/fund_investment/entity/ProfitDistributionExample.java +++ b/src/main/java/com/sztzjy/fund_investment/entity/ProfitDistributionExample.java @@ -555,243 +555,243 @@ public class ProfitDistributionExample { return (Criteria) this; } - public Criteria andRound1OwnFundsIsNull() { - addCriterion("round1_own_funds is null"); + public Criteria andRoundOwnFundsIsNull() { + addCriterion("round_own_funds is null"); return (Criteria) this; } - public Criteria andRound1OwnFundsIsNotNull() { - addCriterion("round1_own_funds is not null"); + public Criteria andRoundOwnFundsIsNotNull() { + addCriterion("round_own_funds is not null"); return (Criteria) this; } - public Criteria andRound1OwnFundsEqualTo(BigDecimal value) { - addCriterion("round1_own_funds =", value, "round1OwnFunds"); + public Criteria andRoundOwnFundsEqualTo(BigDecimal value) { + addCriterion("round_own_funds =", value, "roundOwnFunds"); return (Criteria) this; } - public Criteria andRound1OwnFundsNotEqualTo(BigDecimal value) { - addCriterion("round1_own_funds <>", value, "round1OwnFunds"); + public Criteria andRoundOwnFundsNotEqualTo(BigDecimal value) { + addCriterion("round_own_funds <>", value, "roundOwnFunds"); return (Criteria) this; } - public Criteria andRound1OwnFundsGreaterThan(BigDecimal value) { - addCriterion("round1_own_funds >", value, "round1OwnFunds"); + public Criteria andRoundOwnFundsGreaterThan(BigDecimal value) { + addCriterion("round_own_funds >", value, "roundOwnFunds"); return (Criteria) this; } - public Criteria andRound1OwnFundsGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("round1_own_funds >=", value, "round1OwnFunds"); + public Criteria andRoundOwnFundsGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("round_own_funds >=", value, "roundOwnFunds"); return (Criteria) this; } - public Criteria andRound1OwnFundsLessThan(BigDecimal value) { - addCriterion("round1_own_funds <", value, "round1OwnFunds"); + public Criteria andRoundOwnFundsLessThan(BigDecimal value) { + addCriterion("round_own_funds <", value, "roundOwnFunds"); return (Criteria) this; } - public Criteria andRound1OwnFundsLessThanOrEqualTo(BigDecimal value) { - addCriterion("round1_own_funds <=", value, "round1OwnFunds"); + public Criteria andRoundOwnFundsLessThanOrEqualTo(BigDecimal value) { + addCriterion("round_own_funds <=", value, "roundOwnFunds"); return (Criteria) this; } - public Criteria andRound1OwnFundsIn(List values) { - addCriterion("round1_own_funds in", values, "round1OwnFunds"); + public Criteria andRoundOwnFundsIn(List values) { + addCriterion("round_own_funds in", values, "roundOwnFunds"); return (Criteria) this; } - public Criteria andRound1OwnFundsNotIn(List values) { - addCriterion("round1_own_funds not in", values, "round1OwnFunds"); + public Criteria andRoundOwnFundsNotIn(List values) { + addCriterion("round_own_funds not in", values, "roundOwnFunds"); return (Criteria) this; } - public Criteria andRound1OwnFundsBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("round1_own_funds between", value1, value2, "round1OwnFunds"); + public Criteria andRoundOwnFundsBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("round_own_funds between", value1, value2, "roundOwnFunds"); return (Criteria) this; } - public Criteria andRound1OwnFundsNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("round1_own_funds not between", value1, value2, "round1OwnFunds"); + public Criteria andRoundOwnFundsNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("round_own_funds not between", value1, value2, "roundOwnFunds"); return (Criteria) this; } - public Criteria andRound1SubordinatedLpIsNull() { - addCriterion("round1_subordinated_lp is null"); + public Criteria andRoundSubordinatedLpIsNull() { + addCriterion("round_subordinated_lp is null"); return (Criteria) this; } - public Criteria andRound1SubordinatedLpIsNotNull() { - addCriterion("round1_subordinated_lp is not null"); + public Criteria andRoundSubordinatedLpIsNotNull() { + addCriterion("round_subordinated_lp is not null"); return (Criteria) this; } - public Criteria andRound1SubordinatedLpEqualTo(BigDecimal value) { - addCriterion("round1_subordinated_lp =", value, "round1SubordinatedLp"); + public Criteria andRoundSubordinatedLpEqualTo(BigDecimal value) { + addCriterion("round_subordinated_lp =", value, "roundSubordinatedLp"); return (Criteria) this; } - public Criteria andRound1SubordinatedLpNotEqualTo(BigDecimal value) { - addCriterion("round1_subordinated_lp <>", value, "round1SubordinatedLp"); + public Criteria andRoundSubordinatedLpNotEqualTo(BigDecimal value) { + addCriterion("round_subordinated_lp <>", value, "roundSubordinatedLp"); return (Criteria) this; } - public Criteria andRound1SubordinatedLpGreaterThan(BigDecimal value) { - addCriterion("round1_subordinated_lp >", value, "round1SubordinatedLp"); + public Criteria andRoundSubordinatedLpGreaterThan(BigDecimal value) { + addCriterion("round_subordinated_lp >", value, "roundSubordinatedLp"); return (Criteria) this; } - public Criteria andRound1SubordinatedLpGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("round1_subordinated_lp >=", value, "round1SubordinatedLp"); + public Criteria andRoundSubordinatedLpGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("round_subordinated_lp >=", value, "roundSubordinatedLp"); return (Criteria) this; } - public Criteria andRound1SubordinatedLpLessThan(BigDecimal value) { - addCriterion("round1_subordinated_lp <", value, "round1SubordinatedLp"); + public Criteria andRoundSubordinatedLpLessThan(BigDecimal value) { + addCriterion("round_subordinated_lp <", value, "roundSubordinatedLp"); return (Criteria) this; } - public Criteria andRound1SubordinatedLpLessThanOrEqualTo(BigDecimal value) { - addCriterion("round1_subordinated_lp <=", value, "round1SubordinatedLp"); + public Criteria andRoundSubordinatedLpLessThanOrEqualTo(BigDecimal value) { + addCriterion("round_subordinated_lp <=", value, "roundSubordinatedLp"); return (Criteria) this; } - public Criteria andRound1SubordinatedLpIn(List values) { - addCriterion("round1_subordinated_lp in", values, "round1SubordinatedLp"); + public Criteria andRoundSubordinatedLpIn(List values) { + addCriterion("round_subordinated_lp in", values, "roundSubordinatedLp"); return (Criteria) this; } - public Criteria andRound1SubordinatedLpNotIn(List values) { - addCriterion("round1_subordinated_lp not in", values, "round1SubordinatedLp"); + public Criteria andRoundSubordinatedLpNotIn(List values) { + addCriterion("round_subordinated_lp not in", values, "roundSubordinatedLp"); return (Criteria) this; } - public Criteria andRound1SubordinatedLpBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("round1_subordinated_lp between", value1, value2, "round1SubordinatedLp"); + public Criteria andRoundSubordinatedLpBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("round_subordinated_lp between", value1, value2, "roundSubordinatedLp"); return (Criteria) this; } - public Criteria andRound1SubordinatedLpNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("round1_subordinated_lp not between", value1, value2, "round1SubordinatedLp"); + public Criteria andRoundSubordinatedLpNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("round_subordinated_lp not between", value1, value2, "roundSubordinatedLp"); return (Criteria) this; } - public Criteria andRound1PreferredLpIsNull() { - addCriterion("round1_preferred_lp is null"); + public Criteria andRoundPreferredLpIsNull() { + addCriterion("round_preferred_lp is null"); return (Criteria) this; } - public Criteria andRound1PreferredLpIsNotNull() { - addCriterion("round1_preferred_lp is not null"); + public Criteria andRoundPreferredLpIsNotNull() { + addCriterion("round_preferred_lp is not null"); return (Criteria) this; } - public Criteria andRound1PreferredLpEqualTo(BigDecimal value) { - addCriterion("round1_preferred_lp =", value, "round1PreferredLp"); + public Criteria andRoundPreferredLpEqualTo(BigDecimal value) { + addCriterion("round_preferred_lp =", value, "roundPreferredLp"); return (Criteria) this; } - public Criteria andRound1PreferredLpNotEqualTo(BigDecimal value) { - addCriterion("round1_preferred_lp <>", value, "round1PreferredLp"); + public Criteria andRoundPreferredLpNotEqualTo(BigDecimal value) { + addCriterion("round_preferred_lp <>", value, "roundPreferredLp"); return (Criteria) this; } - public Criteria andRound1PreferredLpGreaterThan(BigDecimal value) { - addCriterion("round1_preferred_lp >", value, "round1PreferredLp"); + public Criteria andRoundPreferredLpGreaterThan(BigDecimal value) { + addCriterion("round_preferred_lp >", value, "roundPreferredLp"); return (Criteria) this; } - public Criteria andRound1PreferredLpGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("round1_preferred_lp >=", value, "round1PreferredLp"); + public Criteria andRoundPreferredLpGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("round_preferred_lp >=", value, "roundPreferredLp"); return (Criteria) this; } - public Criteria andRound1PreferredLpLessThan(BigDecimal value) { - addCriterion("round1_preferred_lp <", value, "round1PreferredLp"); + public Criteria andRoundPreferredLpLessThan(BigDecimal value) { + addCriterion("round_preferred_lp <", value, "roundPreferredLp"); return (Criteria) this; } - public Criteria andRound1PreferredLpLessThanOrEqualTo(BigDecimal value) { - addCriterion("round1_preferred_lp <=", value, "round1PreferredLp"); + public Criteria andRoundPreferredLpLessThanOrEqualTo(BigDecimal value) { + addCriterion("round_preferred_lp <=", value, "roundPreferredLp"); return (Criteria) this; } - public Criteria andRound1PreferredLpIn(List values) { - addCriterion("round1_preferred_lp in", values, "round1PreferredLp"); + public Criteria andRoundPreferredLpIn(List values) { + addCriterion("round_preferred_lp in", values, "roundPreferredLp"); return (Criteria) this; } - public Criteria andRound1PreferredLpNotIn(List values) { - addCriterion("round1_preferred_lp not in", values, "round1PreferredLp"); + public Criteria andRoundPreferredLpNotIn(List values) { + addCriterion("round_preferred_lp not in", values, "roundPreferredLp"); return (Criteria) this; } - public Criteria andRound1PreferredLpBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("round1_preferred_lp between", value1, value2, "round1PreferredLp"); + public Criteria andRoundPreferredLpBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("round_preferred_lp between", value1, value2, "roundPreferredLp"); return (Criteria) this; } - public Criteria andRound1PreferredLpNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("round1_preferred_lp not between", value1, value2, "round1PreferredLp"); + public Criteria andRoundPreferredLpNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("round_preferred_lp not between", value1, value2, "roundPreferredLp"); return (Criteria) this; } - public Criteria andRound1BankLoanIsNull() { - addCriterion("round1_bank_loan is null"); + public Criteria andRoundBankLoanIsNull() { + addCriterion("round_bank_loan is null"); return (Criteria) this; } - public Criteria andRound1BankLoanIsNotNull() { - addCriterion("round1_bank_loan is not null"); + public Criteria andRoundBankLoanIsNotNull() { + addCriterion("round_bank_loan is not null"); return (Criteria) this; } - public Criteria andRound1BankLoanEqualTo(BigDecimal value) { - addCriterion("round1_bank_loan =", value, "round1BankLoan"); + public Criteria andRoundBankLoanEqualTo(BigDecimal value) { + addCriterion("round_bank_loan =", value, "roundBankLoan"); return (Criteria) this; } - public Criteria andRound1BankLoanNotEqualTo(BigDecimal value) { - addCriterion("round1_bank_loan <>", value, "round1BankLoan"); + public Criteria andRoundBankLoanNotEqualTo(BigDecimal value) { + addCriterion("round_bank_loan <>", value, "roundBankLoan"); return (Criteria) this; } - public Criteria andRound1BankLoanGreaterThan(BigDecimal value) { - addCriterion("round1_bank_loan >", value, "round1BankLoan"); + public Criteria andRoundBankLoanGreaterThan(BigDecimal value) { + addCriterion("round_bank_loan >", value, "roundBankLoan"); return (Criteria) this; } - public Criteria andRound1BankLoanGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("round1_bank_loan >=", value, "round1BankLoan"); + public Criteria andRoundBankLoanGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("round_bank_loan >=", value, "roundBankLoan"); return (Criteria) this; } - public Criteria andRound1BankLoanLessThan(BigDecimal value) { - addCriterion("round1_bank_loan <", value, "round1BankLoan"); + public Criteria andRoundBankLoanLessThan(BigDecimal value) { + addCriterion("round_bank_loan <", value, "roundBankLoan"); return (Criteria) this; } - public Criteria andRound1BankLoanLessThanOrEqualTo(BigDecimal value) { - addCriterion("round1_bank_loan <=", value, "round1BankLoan"); + public Criteria andRoundBankLoanLessThanOrEqualTo(BigDecimal value) { + addCriterion("round_bank_loan <=", value, "roundBankLoan"); return (Criteria) this; } - public Criteria andRound1BankLoanIn(List values) { - addCriterion("round1_bank_loan in", values, "round1BankLoan"); + public Criteria andRoundBankLoanIn(List values) { + addCriterion("round_bank_loan in", values, "roundBankLoan"); return (Criteria) this; } - public Criteria andRound1BankLoanNotIn(List values) { - addCriterion("round1_bank_loan not in", values, "round1BankLoan"); + public Criteria andRoundBankLoanNotIn(List values) { + addCriterion("round_bank_loan not in", values, "roundBankLoan"); return (Criteria) this; } - public Criteria andRound1BankLoanBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("round1_bank_loan between", value1, value2, "round1BankLoan"); + public Criteria andRoundBankLoanBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("round_bank_loan between", value1, value2, "roundBankLoan"); return (Criteria) this; } - public Criteria andRound1BankLoanNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("round1_bank_loan not between", value1, value2, "round1BankLoan"); + public Criteria andRoundBankLoanNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("round_bank_loan not between", value1, value2, "roundBankLoan"); return (Criteria) this; } @@ -974,6 +974,486 @@ public class ProfitDistributionExample { addCriterion("remaining_earnings_preferred_lp not between", value1, value2, "remainingEarningsPreferredLp"); return (Criteria) this; } + + public Criteria andUserAvailableFundsIsNull() { + addCriterion("user_available_funds is null"); + return (Criteria) this; + } + + public Criteria andUserAvailableFundsIsNotNull() { + addCriterion("user_available_funds is not null"); + return (Criteria) this; + } + + public Criteria andUserAvailableFundsEqualTo(BigDecimal value) { + addCriterion("user_available_funds =", value, "userAvailableFunds"); + return (Criteria) this; + } + + public Criteria andUserAvailableFundsNotEqualTo(BigDecimal value) { + addCriterion("user_available_funds <>", value, "userAvailableFunds"); + return (Criteria) this; + } + + public Criteria andUserAvailableFundsGreaterThan(BigDecimal value) { + addCriterion("user_available_funds >", value, "userAvailableFunds"); + return (Criteria) this; + } + + public Criteria andUserAvailableFundsGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("user_available_funds >=", value, "userAvailableFunds"); + return (Criteria) this; + } + + public Criteria andUserAvailableFundsLessThan(BigDecimal value) { + addCriterion("user_available_funds <", value, "userAvailableFunds"); + return (Criteria) this; + } + + public Criteria andUserAvailableFundsLessThanOrEqualTo(BigDecimal value) { + addCriterion("user_available_funds <=", value, "userAvailableFunds"); + return (Criteria) this; + } + + public Criteria andUserAvailableFundsIn(List values) { + addCriterion("user_available_funds in", values, "userAvailableFunds"); + return (Criteria) this; + } + + public Criteria andUserAvailableFundsNotIn(List values) { + addCriterion("user_available_funds not in", values, "userAvailableFunds"); + return (Criteria) this; + } + + public Criteria andUserAvailableFundsBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("user_available_funds between", value1, value2, "userAvailableFunds"); + return (Criteria) this; + } + + public Criteria andUserAvailableFundsNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("user_available_funds not between", value1, value2, "userAvailableFunds"); + return (Criteria) this; + } + + public Criteria andUserRoundOwnFundsIsNull() { + addCriterion("user_round_own_funds is null"); + return (Criteria) this; + } + + public Criteria andUserRoundOwnFundsIsNotNull() { + addCriterion("user_round_own_funds is not null"); + return (Criteria) this; + } + + public Criteria andUserRoundOwnFundsEqualTo(BigDecimal value) { + addCriterion("user_round_own_funds =", value, "userRoundOwnFunds"); + return (Criteria) this; + } + + public Criteria andUserRoundOwnFundsNotEqualTo(BigDecimal value) { + addCriterion("user_round_own_funds <>", value, "userRoundOwnFunds"); + return (Criteria) this; + } + + public Criteria andUserRoundOwnFundsGreaterThan(BigDecimal value) { + addCriterion("user_round_own_funds >", value, "userRoundOwnFunds"); + return (Criteria) this; + } + + public Criteria andUserRoundOwnFundsGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("user_round_own_funds >=", value, "userRoundOwnFunds"); + return (Criteria) this; + } + + public Criteria andUserRoundOwnFundsLessThan(BigDecimal value) { + addCriterion("user_round_own_funds <", value, "userRoundOwnFunds"); + return (Criteria) this; + } + + public Criteria andUserRoundOwnFundsLessThanOrEqualTo(BigDecimal value) { + addCriterion("user_round_own_funds <=", value, "userRoundOwnFunds"); + return (Criteria) this; + } + + public Criteria andUserRoundOwnFundsIn(List values) { + addCriterion("user_round_own_funds in", values, "userRoundOwnFunds"); + return (Criteria) this; + } + + public Criteria andUserRoundOwnFundsNotIn(List values) { + addCriterion("user_round_own_funds not in", values, "userRoundOwnFunds"); + return (Criteria) this; + } + + public Criteria andUserRoundOwnFundsBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("user_round_own_funds between", value1, value2, "userRoundOwnFunds"); + return (Criteria) this; + } + + public Criteria andUserRoundOwnFundsNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("user_round_own_funds not between", value1, value2, "userRoundOwnFunds"); + return (Criteria) this; + } + + public Criteria andUserRoundSubordinatedLpIsNull() { + addCriterion("user_round_subordinated_lp is null"); + return (Criteria) this; + } + + public Criteria andUserRoundSubordinatedLpIsNotNull() { + addCriterion("user_round_subordinated_lp is not null"); + return (Criteria) this; + } + + public Criteria andUserRoundSubordinatedLpEqualTo(BigDecimal value) { + addCriterion("user_round_subordinated_lp =", value, "userRoundSubordinatedLp"); + return (Criteria) this; + } + + public Criteria andUserRoundSubordinatedLpNotEqualTo(BigDecimal value) { + addCriterion("user_round_subordinated_lp <>", value, "userRoundSubordinatedLp"); + return (Criteria) this; + } + + public Criteria andUserRoundSubordinatedLpGreaterThan(BigDecimal value) { + addCriterion("user_round_subordinated_lp >", value, "userRoundSubordinatedLp"); + return (Criteria) this; + } + + public Criteria andUserRoundSubordinatedLpGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("user_round_subordinated_lp >=", value, "userRoundSubordinatedLp"); + return (Criteria) this; + } + + public Criteria andUserRoundSubordinatedLpLessThan(BigDecimal value) { + addCriterion("user_round_subordinated_lp <", value, "userRoundSubordinatedLp"); + return (Criteria) this; + } + + public Criteria andUserRoundSubordinatedLpLessThanOrEqualTo(BigDecimal value) { + addCriterion("user_round_subordinated_lp <=", value, "userRoundSubordinatedLp"); + return (Criteria) this; + } + + public Criteria andUserRoundSubordinatedLpIn(List values) { + addCriterion("user_round_subordinated_lp in", values, "userRoundSubordinatedLp"); + return (Criteria) this; + } + + public Criteria andUserRoundSubordinatedLpNotIn(List values) { + addCriterion("user_round_subordinated_lp not in", values, "userRoundSubordinatedLp"); + return (Criteria) this; + } + + public Criteria andUserRoundSubordinatedLpBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("user_round_subordinated_lp between", value1, value2, "userRoundSubordinatedLp"); + return (Criteria) this; + } + + public Criteria andUserRoundSubordinatedLpNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("user_round_subordinated_lp not between", value1, value2, "userRoundSubordinatedLp"); + return (Criteria) this; + } + + public Criteria andUserRoundPreferredLpIsNull() { + addCriterion("user_round_preferred_lp is null"); + return (Criteria) this; + } + + public Criteria andUserRoundPreferredLpIsNotNull() { + addCriterion("user_round_preferred_lp is not null"); + return (Criteria) this; + } + + public Criteria andUserRoundPreferredLpEqualTo(BigDecimal value) { + addCriterion("user_round_preferred_lp =", value, "userRoundPreferredLp"); + return (Criteria) this; + } + + public Criteria andUserRoundPreferredLpNotEqualTo(BigDecimal value) { + addCriterion("user_round_preferred_lp <>", value, "userRoundPreferredLp"); + return (Criteria) this; + } + + public Criteria andUserRoundPreferredLpGreaterThan(BigDecimal value) { + addCriterion("user_round_preferred_lp >", value, "userRoundPreferredLp"); + return (Criteria) this; + } + + public Criteria andUserRoundPreferredLpGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("user_round_preferred_lp >=", value, "userRoundPreferredLp"); + return (Criteria) this; + } + + public Criteria andUserRoundPreferredLpLessThan(BigDecimal value) { + addCriterion("user_round_preferred_lp <", value, "userRoundPreferredLp"); + return (Criteria) this; + } + + public Criteria andUserRoundPreferredLpLessThanOrEqualTo(BigDecimal value) { + addCriterion("user_round_preferred_lp <=", value, "userRoundPreferredLp"); + return (Criteria) this; + } + + public Criteria andUserRoundPreferredLpIn(List values) { + addCriterion("user_round_preferred_lp in", values, "userRoundPreferredLp"); + return (Criteria) this; + } + + public Criteria andUserRoundPreferredLpNotIn(List values) { + addCriterion("user_round_preferred_lp not in", values, "userRoundPreferredLp"); + return (Criteria) this; + } + + public Criteria andUserRoundPreferredLpBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("user_round_preferred_lp between", value1, value2, "userRoundPreferredLp"); + return (Criteria) this; + } + + public Criteria andUserRoundPreferredLpNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("user_round_preferred_lp not between", value1, value2, "userRoundPreferredLp"); + return (Criteria) this; + } + + public Criteria andUserRoundBankLoanIsNull() { + addCriterion("user_round_bank_loan is null"); + return (Criteria) this; + } + + public Criteria andUserRoundBankLoanIsNotNull() { + addCriterion("user_round_bank_loan is not null"); + return (Criteria) this; + } + + public Criteria andUserRoundBankLoanEqualTo(BigDecimal value) { + addCriterion("user_round_bank_loan =", value, "userRoundBankLoan"); + return (Criteria) this; + } + + public Criteria andUserRoundBankLoanNotEqualTo(BigDecimal value) { + addCriterion("user_round_bank_loan <>", value, "userRoundBankLoan"); + return (Criteria) this; + } + + public Criteria andUserRoundBankLoanGreaterThan(BigDecimal value) { + addCriterion("user_round_bank_loan >", value, "userRoundBankLoan"); + return (Criteria) this; + } + + public Criteria andUserRoundBankLoanGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("user_round_bank_loan >=", value, "userRoundBankLoan"); + return (Criteria) this; + } + + public Criteria andUserRoundBankLoanLessThan(BigDecimal value) { + addCriterion("user_round_bank_loan <", value, "userRoundBankLoan"); + return (Criteria) this; + } + + public Criteria andUserRoundBankLoanLessThanOrEqualTo(BigDecimal value) { + addCriterion("user_round_bank_loan <=", value, "userRoundBankLoan"); + return (Criteria) this; + } + + public Criteria andUserRoundBankLoanIn(List values) { + addCriterion("user_round_bank_loan in", values, "userRoundBankLoan"); + return (Criteria) this; + } + + public Criteria andUserRoundBankLoanNotIn(List values) { + addCriterion("user_round_bank_loan not in", values, "userRoundBankLoan"); + return (Criteria) this; + } + + public Criteria andUserRoundBankLoanBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("user_round_bank_loan between", value1, value2, "userRoundBankLoan"); + return (Criteria) this; + } + + public Criteria andUserRoundBankLoanNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("user_round_bank_loan not between", value1, value2, "userRoundBankLoan"); + return (Criteria) this; + } + + public Criteria andUserRemainingOwnFundsIsNull() { + addCriterion("user_remaining_own_funds is null"); + return (Criteria) this; + } + + public Criteria andUserRemainingOwnFundsIsNotNull() { + addCriterion("user_remaining_own_funds is not null"); + return (Criteria) this; + } + + public Criteria andUserRemainingOwnFundsEqualTo(BigDecimal value) { + addCriterion("user_remaining_own_funds =", value, "userRemainingOwnFunds"); + return (Criteria) this; + } + + public Criteria andUserRemainingOwnFundsNotEqualTo(BigDecimal value) { + addCriterion("user_remaining_own_funds <>", value, "userRemainingOwnFunds"); + return (Criteria) this; + } + + public Criteria andUserRemainingOwnFundsGreaterThan(BigDecimal value) { + addCriterion("user_remaining_own_funds >", value, "userRemainingOwnFunds"); + return (Criteria) this; + } + + public Criteria andUserRemainingOwnFundsGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("user_remaining_own_funds >=", value, "userRemainingOwnFunds"); + return (Criteria) this; + } + + public Criteria andUserRemainingOwnFundsLessThan(BigDecimal value) { + addCriterion("user_remaining_own_funds <", value, "userRemainingOwnFunds"); + return (Criteria) this; + } + + public Criteria andUserRemainingOwnFundsLessThanOrEqualTo(BigDecimal value) { + addCriterion("user_remaining_own_funds <=", value, "userRemainingOwnFunds"); + return (Criteria) this; + } + + public Criteria andUserRemainingOwnFundsIn(List values) { + addCriterion("user_remaining_own_funds in", values, "userRemainingOwnFunds"); + return (Criteria) this; + } + + public Criteria andUserRemainingOwnFundsNotIn(List values) { + addCriterion("user_remaining_own_funds not in", values, "userRemainingOwnFunds"); + return (Criteria) this; + } + + public Criteria andUserRemainingOwnFundsBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("user_remaining_own_funds between", value1, value2, "userRemainingOwnFunds"); + return (Criteria) this; + } + + public Criteria andUserRemainingOwnFundsNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("user_remaining_own_funds not between", value1, value2, "userRemainingOwnFunds"); + return (Criteria) this; + } + + public Criteria andUserRemainingEarningsSubordinatedLpIsNull() { + addCriterion("user_remaining_earnings_subordinated_lp is null"); + return (Criteria) this; + } + + public Criteria andUserRemainingEarningsSubordinatedLpIsNotNull() { + addCriterion("user_remaining_earnings_subordinated_lp is not null"); + return (Criteria) this; + } + + public Criteria andUserRemainingEarningsSubordinatedLpEqualTo(BigDecimal value) { + addCriterion("user_remaining_earnings_subordinated_lp =", value, "userRemainingEarningsSubordinatedLp"); + return (Criteria) this; + } + + public Criteria andUserRemainingEarningsSubordinatedLpNotEqualTo(BigDecimal value) { + addCriterion("user_remaining_earnings_subordinated_lp <>", value, "userRemainingEarningsSubordinatedLp"); + return (Criteria) this; + } + + public Criteria andUserRemainingEarningsSubordinatedLpGreaterThan(BigDecimal value) { + addCriterion("user_remaining_earnings_subordinated_lp >", value, "userRemainingEarningsSubordinatedLp"); + return (Criteria) this; + } + + public Criteria andUserRemainingEarningsSubordinatedLpGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("user_remaining_earnings_subordinated_lp >=", value, "userRemainingEarningsSubordinatedLp"); + return (Criteria) this; + } + + public Criteria andUserRemainingEarningsSubordinatedLpLessThan(BigDecimal value) { + addCriterion("user_remaining_earnings_subordinated_lp <", value, "userRemainingEarningsSubordinatedLp"); + return (Criteria) this; + } + + public Criteria andUserRemainingEarningsSubordinatedLpLessThanOrEqualTo(BigDecimal value) { + addCriterion("user_remaining_earnings_subordinated_lp <=", value, "userRemainingEarningsSubordinatedLp"); + return (Criteria) this; + } + + public Criteria andUserRemainingEarningsSubordinatedLpIn(List values) { + addCriterion("user_remaining_earnings_subordinated_lp in", values, "userRemainingEarningsSubordinatedLp"); + return (Criteria) this; + } + + public Criteria andUserRemainingEarningsSubordinatedLpNotIn(List values) { + addCriterion("user_remaining_earnings_subordinated_lp not in", values, "userRemainingEarningsSubordinatedLp"); + return (Criteria) this; + } + + public Criteria andUserRemainingEarningsSubordinatedLpBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("user_remaining_earnings_subordinated_lp between", value1, value2, "userRemainingEarningsSubordinatedLp"); + return (Criteria) this; + } + + public Criteria andUserRemainingEarningsSubordinatedLpNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("user_remaining_earnings_subordinated_lp not between", value1, value2, "userRemainingEarningsSubordinatedLp"); + return (Criteria) this; + } + + public Criteria andUserRemainingEarningsPreferredLpIsNull() { + addCriterion("user_remaining_earnings_preferred_lp is null"); + return (Criteria) this; + } + + public Criteria andUserRemainingEarningsPreferredLpIsNotNull() { + addCriterion("user_remaining_earnings_preferred_lp is not null"); + return (Criteria) this; + } + + public Criteria andUserRemainingEarningsPreferredLpEqualTo(BigDecimal value) { + addCriterion("user_remaining_earnings_preferred_lp =", value, "userRemainingEarningsPreferredLp"); + return (Criteria) this; + } + + public Criteria andUserRemainingEarningsPreferredLpNotEqualTo(BigDecimal value) { + addCriterion("user_remaining_earnings_preferred_lp <>", value, "userRemainingEarningsPreferredLp"); + return (Criteria) this; + } + + public Criteria andUserRemainingEarningsPreferredLpGreaterThan(BigDecimal value) { + addCriterion("user_remaining_earnings_preferred_lp >", value, "userRemainingEarningsPreferredLp"); + return (Criteria) this; + } + + public Criteria andUserRemainingEarningsPreferredLpGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("user_remaining_earnings_preferred_lp >=", value, "userRemainingEarningsPreferredLp"); + return (Criteria) this; + } + + public Criteria andUserRemainingEarningsPreferredLpLessThan(BigDecimal value) { + addCriterion("user_remaining_earnings_preferred_lp <", value, "userRemainingEarningsPreferredLp"); + return (Criteria) this; + } + + public Criteria andUserRemainingEarningsPreferredLpLessThanOrEqualTo(BigDecimal value) { + addCriterion("user_remaining_earnings_preferred_lp <=", value, "userRemainingEarningsPreferredLp"); + return (Criteria) this; + } + + public Criteria andUserRemainingEarningsPreferredLpIn(List values) { + addCriterion("user_remaining_earnings_preferred_lp in", values, "userRemainingEarningsPreferredLp"); + return (Criteria) this; + } + + public Criteria andUserRemainingEarningsPreferredLpNotIn(List values) { + addCriterion("user_remaining_earnings_preferred_lp not in", values, "userRemainingEarningsPreferredLp"); + return (Criteria) this; + } + + public Criteria andUserRemainingEarningsPreferredLpBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("user_remaining_earnings_preferred_lp between", value1, value2, "userRemainingEarningsPreferredLp"); + return (Criteria) this; + } + + public Criteria andUserRemainingEarningsPreferredLpNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("user_remaining_earnings_preferred_lp not between", value1, value2, "userRemainingEarningsPreferredLp"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/src/main/java/com/sztzjy/fund_investment/service/ProfitDistributionService.java b/src/main/java/com/sztzjy/fund_investment/service/ProfitDistributionService.java index f92edbc..fadb994 100644 --- a/src/main/java/com/sztzjy/fund_investment/service/ProfitDistributionService.java +++ b/src/main/java/com/sztzjy/fund_investment/service/ProfitDistributionService.java @@ -1,8 +1,14 @@ package com.sztzjy.fund_investment.service; +import com.sztzjy.fund_investment.entity.ProfitDistribution; +import com.sztzjy.fund_investment.util.ResultEntity; + /** * @Author xcj * @Date 2023/12/6 */ public interface ProfitDistributionService { + void submit(ProfitDistribution profitDistribution); + + ProfitDistribution echo(String flowId); } diff --git a/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/PerformanceScoreServiceImpl.java b/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/PerformanceScoreServiceImpl.java index 338686b..7268695 100644 --- a/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/PerformanceScoreServiceImpl.java +++ b/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/PerformanceScoreServiceImpl.java @@ -26,11 +26,7 @@ public class PerformanceScoreServiceImpl implements PerformanceScoreService { */ @Override // 实体类字段名 分数 流程ID public void calculateScoreByModule(String methodName, Integer score, String flowId) { - PerformanceScoreExample performanceScoreExample = new PerformanceScoreExample(); - performanceScoreExample.createCriteria().andFlowIdEqualTo(flowId); - List performanceScores = performanceScoreMapper.selectByExample(performanceScoreExample); - PerformanceScore performanceScore = performanceScores.get(0); - + PerformanceScore performanceScore = getByFlowId(flowId); BigDecimal scoreOld =(BigDecimal) performanceScore.get(methodName); performanceScore.set(methodName, BigDecimal.valueOf(score)); performanceScore.setTotalScore(performanceScore.getTotalScore().add(BigDecimal.valueOf(score).subtract(scoreOld))); diff --git a/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/ProfitDistributionServiceImpl.java b/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/ProfitDistributionServiceImpl.java index 246f90a..3fca0bb 100644 --- a/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/ProfitDistributionServiceImpl.java +++ b/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/ProfitDistributionServiceImpl.java @@ -1,12 +1,150 @@ package com.sztzjy.fund_investment.service.serviceImpl; +import com.sztzjy.fund_investment.entity.ExitTime; +import com.sztzjy.fund_investment.entity.Fundraising; +import com.sztzjy.fund_investment.entity.ProfitDistribution; +import com.sztzjy.fund_investment.entity.ProfitDistributionExample; +import com.sztzjy.fund_investment.mapper.ExitTimeMapper; +import com.sztzjy.fund_investment.mapper.ProfitDistributionMapper; +import com.sztzjy.fund_investment.service.ISysFundraisingService; +import com.sztzjy.fund_investment.service.PerformanceScoreService; import com.sztzjy.fund_investment.service.ProfitDistributionService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; +import java.math.RoundingMode; + /** * @Author xcj * @Date 2023/12/6 */ @Service public class ProfitDistributionServiceImpl implements ProfitDistributionService { + @Autowired + private ProfitDistributionMapper profitDistributionMapper; + @Autowired + private ISysFundraisingService fundraisingService; + @Autowired + private ExitTimeMapper exitTimeMapper; + @Autowired + private PerformanceScoreService performanceScoreService; + + + /* 收益分配计算提交 + * @author xcj + * @Date 2023/12/11 + */ + @Override + public void submit(ProfitDistribution profitDistribution) { + //查看基金募集属于哪种情况 + String flowId = profitDistribution.getFlowId(); + Fundraising fundraising = fundraisingService.selectByFlowId(flowId); + ExitTime exitTime = exitTimeMapper.selectByPrimaryKey(flowId); + BigDecimal fundraisingAmount = fundraising.getFundraisingAmount(); //资金募集总金额 + BigDecimal priorityLp = fundraising.getPriorityLp(); //优先级LP本金 + BigDecimal subordinatedLp = fundraising.getSubordinatedLp();//劣后级LP本金 + BigDecimal bankLoan = fundraising.getBankLoan(); //银行借款本金 + BigDecimal exitFundEarnings = exitTime.getExitFundEarnings();//投资收益 + BigDecimal userRoundOwnFunds = profitDistribution.getUserRoundOwnFunds();//用户/第一轮自有资金 + BigDecimal userRoundPreferredLp = profitDistribution.getUserRoundPreferredLp(); //用户/第一轮优先级LP + BigDecimal remainingOwnFunds = profitDistribution.getRemainingOwnFunds();//用户/第二轮自有资金 + BigDecimal remainingEarningsPreferredLp = profitDistribution.getRemainingEarningsPreferredLp();//用户/第二轮优先级LP + BigDecimal rightOwnFunds = fundraising.getOwnFunds();//正确/第一轮自有资金 + BigDecimal rightFundraisingAmount = priorityLp.add(priorityLp.multiply(BigDecimal.valueOf(0.1))).setScale(2, RoundingMode.HALF_UP);//第一轮/优先级LP + //1.归还自有资金的本金，归还优先级LP本金+本金*10% (两个值必填且都一样，提高优先级复用) + profitDistribution.setRoundOwnFunds(rightOwnFunds); + profitDistribution.setRoundPreferredLp(rightFundraisingAmount); + Integer type = fundraising.getType(); + //计算可用资金是否正确 + BigDecimal rightAvailableFunds = fundraisingAmount.add(exitFundEarnings).setScale(2, RoundingMode.HALF_UP);//可用资金 + BigDecimal residualIncome = rightAvailableFunds.subtract(rightOwnFunds).subtract(rightFundraisingAmount); //剩余分配（减去优先级LP和自有资金） + if (profitDistribution.getUserAvailableFunds().compareTo(rightAvailableFunds) == 0) { + performanceScoreService.calculateScoreByModule("profitDistributionAvailablefundsScore", 1, flowId); + } + if (type == 1) { //1:自有资金/优先级LP + // 2.剩余收益分配比例为，自有资金25%，优先级LP75% + BigDecimal twoRightOwnFunds = residualIncome.multiply(BigDecimal.valueOf(0.25)).setScale(2, RoundingMode.HALF_UP);//剩余自有资金 + BigDecimal twoRightFundraisingAmount = residualIncome.subtract(twoRightOwnFunds); //剩余优先级LP + profitDistribution.setRemainingOwnFunds(twoRightOwnFunds); + profitDistribution.setRemainingEarningsPreferredLp(twoRightFundraisingAmount); + profitDistributionMapper.updateByPrimaryKey(profitDistribution); + //算分 共五分，可用资金1分，其他共4分，错一个不得分 + if (rightOwnFunds.compareTo(userRoundOwnFunds) == 0 && rightFundraisingAmount.compareTo(userRoundPreferredLp) == 0 && + twoRightOwnFunds.compareTo(remainingOwnFunds) == 0 && twoRightFundraisingAmount.compareTo(remainingEarningsPreferredLp) == 0) { + performanceScoreService.calculateScoreByModule("profitDistributionScore", 4, flowId); + } + } else if (type == 2) { //2:自有资金/优先级LP/劣后级LP + BigDecimal userRemainingEarningsSubordinatedLp = profitDistribution.getUserRemainingEarningsSubordinatedLp();//用户/剩余收益劣后级LP + BigDecimal userRoundSubordinatedLp = profitDistribution.getUserRoundSubordinatedLp();//用户/第一轮劣后级LP +// 第一轮归还劣后级LP本金 + profitDistribution.setRoundSubordinatedLp(subordinatedLp); + residualIncome = residualIncome.subtract(subordinatedLp); //剩余收益 +// 2.剩余收益分配比例为，自有资金25%，优先级LP 30%，劣后级LP 45% + BigDecimal twoRightOwnFunds = residualIncome.multiply(BigDecimal.valueOf(0.25)).setScale(2, RoundingMode.HALF_UP);//剩余自有资金 + BigDecimal twoRightFundraisingAmount = residualIncome.multiply(BigDecimal.valueOf(0.35)).setScale(2, RoundingMode.HALF_UP);//剩余自有资金 + BigDecimal twoRightSubordinatedLp = residualIncome.subtract(twoRightOwnFunds).subtract(twoRightFundraisingAmount); //剩余劣后级LP + profitDistribution.setRemainingOwnFunds(twoRightOwnFunds); + profitDistribution.setRemainingEarningsPreferredLp(twoRightFundraisingAmount); + profitDistribution.setRemainingEarningsSubordinatedLp(twoRightSubordinatedLp); + profitDistributionMapper.updateByPrimaryKey(profitDistribution); + if (rightOwnFunds.compareTo(userRoundOwnFunds) == 0 && rightFundraisingAmount.compareTo(userRoundPreferredLp) == 0 && + twoRightOwnFunds.compareTo(remainingOwnFunds) == 0 && twoRightFundraisingAmount.compareTo(remainingEarningsPreferredLp) == 0 && + userRoundSubordinatedLp.compareTo(subordinatedLp) == 0 && userRemainingEarningsSubordinatedLp.compareTo(twoRightSubordinatedLp) == 0) { + performanceScoreService.calculateScoreByModule("profitDistributionScore", 4, flowId); + } + } else if (type == 3) { //3:自有资金/优先级LP/银行借款 + BigDecimal userRoundBankLoan = profitDistribution.getUserRoundBankLoan(); //用户/银行借款 + BigDecimal rightBankLoan = bankLoan.add(bankLoan.multiply(BigDecimal.valueOf(0.0475))).setScale(2, RoundingMode.HALF_UP); //银行借款/+利息4.75% + profitDistribution.setRoundBankLoan(rightBankLoan); + residualIncome = residualIncome.subtract(rightBankLoan); //剩余收益 + // 2.剩余收益分配比例为，自有资金25%，优先级LP75% + BigDecimal twoRightOwnFunds = residualIncome.multiply(BigDecimal.valueOf(0.25)).setScale(2, RoundingMode.HALF_UP);//剩余自有资金 + BigDecimal twoRightFundraisingAmount = residualIncome.subtract(twoRightOwnFunds); //剩余优先级LP + profitDistribution.setRemainingOwnFunds(twoRightOwnFunds); + profitDistribution.setRemainingEarningsPreferredLp(twoRightFundraisingAmount); + profitDistributionMapper.updateByPrimaryKey(profitDistribution); + if (rightOwnFunds.compareTo(userRoundOwnFunds) == 0 && rightFundraisingAmount.compareTo(userRoundPreferredLp) == 0 && + twoRightOwnFunds.compareTo(remainingOwnFunds) == 0 && twoRightFundraisingAmount.compareTo(remainingEarningsPreferredLp) == 0 && + rightBankLoan.compareTo(userRoundBankLoan) == 0) { + performanceScoreService.calculateScoreByModule("profitDistributionScore", 4, flowId); + } + } else { //4:自有资金/优先级LP/劣后级LP/银行借款 + BigDecimal userRemainingEarningsSubordinatedLp = profitDistribution.getUserRemainingEarningsSubordinatedLp();//用户/剩余收益劣后级LP + BigDecimal userRoundSubordinatedLp = profitDistribution.getUserRoundSubordinatedLp();//用户/第一轮劣后级LP + BigDecimal userRoundBankLoan = profitDistribution.getUserRoundBankLoan(); //用户/银行借款 + // 第一轮归还劣后级LP本金和银行利息 + profitDistribution.setRoundSubordinatedLp(subordinatedLp); + BigDecimal rightBankLoan = bankLoan.add(bankLoan.multiply(BigDecimal.valueOf(0.0475))); //银行借款/+利息4.75% + profitDistribution.setRoundBankLoan(rightBankLoan); + residualIncome = residualIncome.subtract(subordinatedLp).subtract(rightBankLoan); //剩余收益 + //2.剩余收益分配比例为，自有资金25%，优先级LP 30%，劣后级LP 45% + BigDecimal twoRightOwnFunds = residualIncome.multiply(BigDecimal.valueOf(0.25)).setScale(2, RoundingMode.HALF_UP);//剩余自有资金 + BigDecimal twoRightFundraisingAmount = residualIncome.multiply(BigDecimal.valueOf(0.35)).setScale(2, RoundingMode.HALF_UP);//剩余自有资金 + BigDecimal twoRightSubordinatedLp = residualIncome.subtract(twoRightOwnFunds).subtract(twoRightFundraisingAmount); //剩余劣后级LP + profitDistribution.setRemainingOwnFunds(twoRightOwnFunds); + profitDistribution.setRemainingEarningsPreferredLp(twoRightFundraisingAmount); + profitDistribution.setRemainingEarningsSubordinatedLp(twoRightSubordinatedLp); + profitDistributionMapper.updateByPrimaryKey(profitDistribution); + if (rightOwnFunds.compareTo(userRoundOwnFunds) == 0 && rightFundraisingAmount.compareTo(userRoundPreferredLp) == 0 && + twoRightOwnFunds.compareTo(remainingOwnFunds) == 0 && twoRightFundraisingAmount.compareTo(remainingEarningsPreferredLp) == 0 && + rightBankLoan.compareTo(userRoundBankLoan) == 0 && userRoundSubordinatedLp.compareTo(subordinatedLp) == 0 && + userRemainingEarningsSubordinatedLp.compareTo(twoRightSubordinatedLp) == 0) { + performanceScoreService.calculateScoreByModule("profitDistributionScore", 4, flowId); + } + } + } + + + /* 回显接口 + * @author xcj + * @Date 2023/12/11 + */ + @Override + public ProfitDistribution echo(String flowId) { + ProfitDistributionExample profitDistributionExample = new ProfitDistributionExample(); + profitDistributionExample.createCriteria().andFlowIdEqualTo(flowId); + profitDistributionMapper.selectByExample(profitDistributionExample); + return null; + } } diff --git a/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/TopicServiceImpl.java b/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/TopicServiceImpl.java index eab83da..4c05b32 100644 --- a/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/TopicServiceImpl.java +++ b/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/TopicServiceImpl.java @@ -60,7 +60,7 @@ public class TopicServiceImpl implements TopicService { /*遍历sheet页*/ for (int i = 0; i < workbook.getNumberOfSheets(); i++) { Sheet sheet = workbook.getSheetAt(i); - if (sheet == null|| sheet.getLastRowNum()==0) { + if (sheet == null || sheet.getLastRowNum() == 0) { continue; } /*统计导入的总条数，要是你的excell包含了表头，就不用加1了*/ @@ -210,8 +210,8 @@ public class TopicServiceImpl implements TopicService { } PerformanceScore performanceScore = performanceScoreService.getByFlowId(flowId); - //IPO模块总分十分，其余5分 - if (!(module.equals(Constant.IPOBK) || module.equals(Constant.IPOTJ)) && score >= 5) { + //IPO模块总分十分，其余5分 板块3分，条件3分，流程4分（固定的题目，单独接口） + if (/*!(module.equals(Constant.IPOBK) || module.equals(Constant.IPOTJ)) &&*/ score >= 5) { score = 5; } // 调用计分方法 @@ -227,11 +227,12 @@ public class TopicServiceImpl implements TopicService { if (module.equals(Constant.XMGZTK)) { performanceScoreService.calculateScoreByModule("projectValuationScore", score, flowId); } - - //todo 暂时调用一个，两个字段是否合成一个后面再看 - if (module.equals(Constant.IPOBK) || module.equals(Constant.IPOTJ)) { + if (module.equals(Constant.IPOBK)) { performanceScoreService.calculateScoreByModule("ipoListedSectorScore", score, flowId); } + if (module.equals(Constant.IPOTJ)) { + performanceScoreService.calculateScoreByModule("ipoListedConditionScore", score, flowId); + } return new ResultEntity<>(list); } @@ -292,15 +293,13 @@ public class TopicServiceImpl implements TopicService { } - - /* 回显答题记录 * @author xcj * @Date 2023/11/21 */ @Override public List getTopicRecord(List ids) { - List list =new ArrayList<>(); + List list = new ArrayList<>(); for (String id : ids) { TopicRecord topicRecord = topicRecordMapper.selectByPrimaryKey(id); list.add(topicRecord); @@ -309,7 +308,6 @@ public class TopicServiceImpl implements TopicService { } - /* IPO页面弹窗2使用返回随机6条数据 * @author xcj * @Date 2023/11/21 @@ -378,7 +376,6 @@ public class TopicServiceImpl implements TopicService { } - public static void main(String[] args) throws Exception { //字符串切割转list String listString = "A:111,B:2222,C:333"; diff --git a/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/tea/ClassScoreServiceImpl.java b/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/tea/ClassScoreServiceImpl.java index da68f62..f7961ae 100644 --- a/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/tea/ClassScoreServiceImpl.java +++ b/src/main/java/com/sztzjy/fund_investment/service/serviceImpl/tea/ClassScoreServiceImpl.java @@ -103,8 +103,10 @@ public class ClassScoreServiceImpl implements ClassScoreService { teaClassScoreDto.setSchoolGoodCount(schoolGoodCount); teaClassScoreDto.setSchoolGeneralCount(schoolGeneralCount); teaClassScoreDto.setSchoolFailCount(schoolFailCount); - BigDecimal finalAVGScore = avgScoreBySchoolId.divide(BigDecimal.valueOf(teaClassScores.size()), 2, RoundingMode.HALF_UP); - teaClassScoreDto.setClassAverageScore(finalAVGScore); + if (teaClassScores.size() > 0) { + BigDecimal finalAVGScore = avgScoreBySchoolId.divide(BigDecimal.valueOf(teaClassScores.size()), 2, RoundingMode.HALF_UP); + teaClassScoreDto.setClassAverageScore(finalAVGScore); + } return teaClassScoreDto; } else { //选中某个班级返回 criteria.andClassIdEqualTo(classId).andStartTimeEqualTo(time); @@ -128,7 +130,7 @@ public class ClassScoreServiceImpl implements ClassScoreService { UserExample.Criteria orCriteria = userTableExample.createCriteria(); if (StringUtils.isNotBlank(classId)) { criteria.andClassIdEqualTo(classId); - }else { + } else { criteria.andSchoolIdEqualTo(schoolId); } if (StringUtils.isNotBlank(studentIdOrName)) { @@ -156,11 +158,11 @@ public class ClassScoreServiceImpl implements ClassScoreService { userDto.setReportId(trainingReport.getId()); userDto.setReportName(trainingReport.getReportName()); } - userDto.setFlowId(flowId); - userDto.setScore(performanceScore.getTotalScore()); - userDto.setPerformanceScoreId(performanceScore.getId()); - userDtoList.add(userDto); } + userDto.setFlowId(flowId); + userDto.setScore(performanceScore.getTotalScore()); + userDto.setPerformanceScoreId(performanceScore.getId()); + userDtoList.add(userDto); } } if (userDtoList.size() <= 0) { @@ -424,10 +426,10 @@ public class ClassScoreServiceImpl implements ClassScoreService { */ @Override public PerformanceTrainingScoreDto getStuTrainingScore(String flowId) { - PerformanceScoreExample example =new PerformanceScoreExample(); + PerformanceScoreExample example = new PerformanceScoreExample(); example.createCriteria().andFlowIdEqualTo(flowId); List performanceScores = performanceScoreMapper.selectByExample(example); - if (performanceScores.isEmpty()){ + if (performanceScores.isEmpty()) { return null; } PerformanceScore performanceScore = performanceScores.get(0); diff --git a/src/main/java/com/sztzjy/fund_investment/task/Task.java b/src/main/java/com/sztzjy/fund_investment/task/Task.java index cd33aa9..0eb6d6c 100644 --- a/src/main/java/com/sztzjy/fund_investment/task/Task.java +++ b/src/main/java/com/sztzjy/fund_investment/task/Task.java @@ -96,6 +96,7 @@ public class Task { //时间为年月日 LocalDate currentDate = LocalDate.now(); Date date = Date.from(currentDate.atStartOfDay(ZoneId.systemDefault()).toInstant()); + teaClassScore.setSchoolId(schoolId); teaClassScore.setStartTime(date); teaClassScore.setId(IdUtil.simpleUUID()); teaClassScore.setClassMaxScore(classMaxScore); diff --git a/src/main/resources/mappers/FundraisingMapper.xml b/src/main/resources/mappers/FundraisingMapper.xml index c08587c..bf32bb3 100644 --- a/src/main/resources/mappers/FundraisingMapper.xml +++ b/src/main/resources/mappers/FundraisingMapper.xml @@ -9,6 +9,7 @@ + @@ -69,7 +70,8 @@ - id, flow_id, own_funds, bank_loan, priority_LP, subordinated_LP, fundraising_amount + id, flow_id, own_funds, bank_loan, priority_LP, subordinated_LP, fundraising_amount, + type @@ -188,6 +196,9 @@ fundraising_amount = #{record.fundraisingAmount,jdbcType=DECIMAL}, + + type = #{record.type,jdbcType=INTEGER}, + @@ -201,7 +212,8 @@ bank_loan = #{record.bankLoan,jdbcType=DECIMAL}, priority_LP = #{record.priorityLp,jdbcType=DECIMAL}, subordinated_LP = #{record.subordinatedLp,jdbcType=DECIMAL}, - fundraising_amount = #{record.fundraisingAmount,jdbcType=DECIMAL} + fundraising_amount = #{record.fundraisingAmount,jdbcType=DECIMAL}, + type = #{record.type,jdbcType=INTEGER} @@ -227,6 +239,9 @@ fundraising_amount = #{fundraisingAmount,jdbcType=DECIMAL}, + + type = #{type,jdbcType=INTEGER}, + where id = #{id,jdbcType=VARCHAR} @@ -237,7 +252,8 @@ bank_loan = #{bankLoan,jdbcType=DECIMAL}, priority_LP = #{priorityLp,jdbcType=DECIMAL}, subordinated_LP = #{subordinatedLp,jdbcType=DECIMAL}, - fundraising_amount = #{fundraisingAmount,jdbcType=DECIMAL} + fundraising_amount = #{fundraisingAmount,jdbcType=DECIMAL}, + type = #{type,jdbcType=INTEGER} where id = #{id,jdbcType=VARCHAR} \ No newline at end of file diff --git a/src/main/resources/mappers/PerformanceScoreMapper.xml b/src/main/resources/mappers/PerformanceScoreMapper.xml index bd4dca9..50c14a2 100644 --- a/src/main/resources/mappers/PerformanceScoreMapper.xml +++ b/src/main/resources/mappers/PerformanceScoreMapper.xml @@ -15,8 +15,8 @@ - + @@ -35,6 +35,7 @@ + @@ -114,17 +115,18 @@ id, flow_id, school_id, class_id, practical_cognition_score, knowledge_assessment_score, fundraising_score, project_search_score, project_search_report_score, project_due_diligence_score, project_valuation_estimation_risk_score, project_due_diligence_business_report_score, - project_due_diligence_finance_report_score, project_valuation_relative_score, project_valuation_score, + project_due_diligence_finance_report_score, project_valuation_score, project_valuation_relative_score, project_valuation_absolute_score, project_use_valuation_absolute_score, project_use_valuation_relative_score, investment_signing_vlauation_report_score, investment_signing_diligence_report_score, investment_signing_invest_score, investment_signing_score, IPO_flow_score, IPO_listed_sector_score, IPO_listed_condition_score, new_pricing_issuance_score, pricing_issuance_confirm_score, init_pricing_issuance_score, pricing_issuance_entering_score, profit_management_market_value_score, profit_management_fund_score, profit_management_fund_exit_score, profit_management_market_value_exit_score, - profit_distribution_score, investment_report_score, experience_score, total_score, - practical_cognition_time, knowledge_assessment_time, fundraising_time, project_search_time, - project_due_diligence_time, project_valuation_time, investment_signing_time, IPO_time, - pricing_issuance_time, profit_management_time, profit_distribution_time, investment_report_time + profit_distribution_availableFunds_score, profit_distribution_score, investment_report_score, + experience_score, total_score, practical_cognition_time, knowledge_assessment_time, + fundraising_time, project_search_time, project_due_diligence_time, project_valuation_time, + investment_signing_time, IPO_time, pricing_issuance_time, profit_management_time, + profit_distribution_time, investment_report_time - select - - distinct - - - from profit_distribution - - - - - order by ${orderByClause} - - - - - delete from profit_distribution - where id = #{id,jdbcType=VARCHAR} - - - delete from profit_distribution - - - - - - insert into profit_distribution (id, flow_id, project_name, - investment_amount, exit_stock_price, fund_earnings, - available_funds, round1_own_funds, round1_subordinated_lp, - round1_preferred_lp, round1_bank_loan, remaining_own_funds, - remaining_earnings_subordinated_lp, remaining_earnings_preferred_lp - ) - values (#{id,jdbcType=VARCHAR}, #{flowId,jdbcType=VARCHAR}, #{projectName,jdbcType=VARCHAR}, - #{investmentAmount,jdbcType=DECIMAL}, #{exitStockPrice,jdbcType=DECIMAL}, #{fundEarnings,jdbcType=DECIMAL}, - #{availableFunds,jdbcType=DECIMAL}, #{round1OwnFunds,jdbcType=DECIMAL}, #{round1SubordinatedLp,jdbcType=DECIMAL}, - #{round1PreferredLp,jdbcType=DECIMAL}, #{round1BankLoan,jdbcType=DECIMAL}, #{remainingOwnFunds,jdbcType=DECIMAL}, - #{remainingEarningsSubordinatedLp,jdbcType=DECIMAL}, #{remainingEarningsPreferredLp,jdbcType=DECIMAL} - ) - - - insert into profit_distribution - - - id, - - - flow_id, - - - project_name, - - - investment_amount, - - - exit_stock_price, - - - fund_earnings, - - - available_funds, - - - round1_own_funds, - - - round1_subordinated_lp, - - - round1_preferred_lp, - - - round1_bank_loan, - - - remaining_own_funds, - - - remaining_earnings_subordinated_lp, - - - remaining_earnings_preferred_lp, - - - - - #{id,jdbcType=VARCHAR}, - - - #{flowId,jdbcType=VARCHAR}, - - - #{projectName,jdbcType=VARCHAR}, - - - #{investmentAmount,jdbcType=DECIMAL}, - - - #{exitStockPrice,jdbcType=DECIMAL}, - - - #{fundEarnings,jdbcType=DECIMAL}, - - - #{availableFunds,jdbcType=DECIMAL}, - - - #{round1OwnFunds,jdbcType=DECIMAL}, - - - #{round1SubordinatedLp,jdbcType=DECIMAL}, - - - #{round1PreferredLp,jdbcType=DECIMAL}, - - - #{round1BankLoan,jdbcType=DECIMAL}, - - - #{remainingOwnFunds,jdbcType=DECIMAL}, - - - #{remainingEarningsSubordinatedLp,jdbcType=DECIMAL}, - - - #{remainingEarningsPreferredLp,jdbcType=DECIMAL}, - - - - - - update profit_distribution - - - id = #{record.id,jdbcType=VARCHAR}, - - - flow_id = #{record.flowId,jdbcType=VARCHAR}, - - - project_name = #{record.projectName,jdbcType=VARCHAR}, - - - investment_amount = #{record.investmentAmount,jdbcType=DECIMAL}, - - - exit_stock_price = #{record.exitStockPrice,jdbcType=DECIMAL}, - - - fund_earnings = #{record.fundEarnings,jdbcType=DECIMAL}, - - - available_funds = #{record.availableFunds,jdbcType=DECIMAL}, - - - round1_own_funds = #{record.round1OwnFunds,jdbcType=DECIMAL}, - - - round1_subordinated_lp = #{record.round1SubordinatedLp,jdbcType=DECIMAL}, - - - round1_preferred_lp = #{record.round1PreferredLp,jdbcType=DECIMAL}, - - - round1_bank_loan = #{record.round1BankLoan,jdbcType=DECIMAL}, - - - remaining_own_funds = #{record.remainingOwnFunds,jdbcType=DECIMAL}, - - - remaining_earnings_subordinated_lp = #{record.remainingEarningsSubordinatedLp,jdbcType=DECIMAL}, - - - remaining_earnings_preferred_lp = #{record.remainingEarningsPreferredLp,jdbcType=DECIMAL}, - - - - - - - - update profit_distribution - set id = #{record.id,jdbcType=VARCHAR}, - flow_id = #{record.flowId,jdbcType=VARCHAR}, - project_name = #{record.projectName,jdbcType=VARCHAR}, - investment_amount = #{record.investmentAmount,jdbcType=DECIMAL}, - exit_stock_price = #{record.exitStockPrice,jdbcType=DECIMAL}, - fund_earnings = #{record.fundEarnings,jdbcType=DECIMAL}, - available_funds = #{record.availableFunds,jdbcType=DECIMAL}, - round1_own_funds = #{record.round1OwnFunds,jdbcType=DECIMAL}, - round1_subordinated_lp = #{record.round1SubordinatedLp,jdbcType=DECIMAL}, - round1_preferred_lp = #{record.round1PreferredLp,jdbcType=DECIMAL}, - round1_bank_loan = #{record.round1BankLoan,jdbcType=DECIMAL}, - remaining_own_funds = #{record.remainingOwnFunds,jdbcType=DECIMAL}, - remaining_earnings_subordinated_lp = #{record.remainingEarningsSubordinatedLp,jdbcType=DECIMAL}, - remaining_earnings_preferred_lp = #{record.remainingEarningsPreferredLp,jdbcType=DECIMAL} - - - - - - update profit_distribution - - - flow_id = #{flowId,jdbcType=VARCHAR}, - - - project_name = #{projectName,jdbcType=VARCHAR}, - - - investment_amount = #{investmentAmount,jdbcType=DECIMAL}, - - - exit_stock_price = #{exitStockPrice,jdbcType=DECIMAL}, - - - fund_earnings = #{fundEarnings,jdbcType=DECIMAL}, - - - available_funds = #{availableFunds,jdbcType=DECIMAL}, - - - round1_own_funds = #{round1OwnFunds,jdbcType=DECIMAL}, - - - round1_subordinated_lp = #{round1SubordinatedLp,jdbcType=DECIMAL}, - - - round1_preferred_lp = #{round1PreferredLp,jdbcType=DECIMAL}, - - - round1_bank_loan = #{round1BankLoan,jdbcType=DECIMAL}, - - - remaining_own_funds = #{remainingOwnFunds,jdbcType=DECIMAL}, - - - remaining_earnings_subordinated_lp = #{remainingEarningsSubordinatedLp,jdbcType=DECIMAL}, - - - remaining_earnings_preferred_lp = #{remainingEarningsPreferredLp,jdbcType=DECIMAL}, - - - where id = #{id,jdbcType=VARCHAR} - - - update profit_distribution - set flow_id = #{flowId,jdbcType=VARCHAR}, - project_name = #{projectName,jdbcType=VARCHAR}, - investment_amount = #{investmentAmount,jdbcType=DECIMAL}, - exit_stock_price = #{exitStockPrice,jdbcType=DECIMAL}, - fund_earnings = #{fundEarnings,jdbcType=DECIMAL}, - available_funds = #{availableFunds,jdbcType=DECIMAL}, - round1_own_funds = #{round1OwnFunds,jdbcType=DECIMAL}, - round1_subordinated_lp = #{round1SubordinatedLp,jdbcType=DECIMAL}, - round1_preferred_lp = #{round1PreferredLp,jdbcType=DECIMAL}, - round1_bank_loan = #{round1BankLoan,jdbcType=DECIMAL}, - remaining_own_funds = #{remainingOwnFunds,jdbcType=DECIMAL}, - remaining_earnings_subordinated_lp = #{remainingEarningsSubordinatedLp,jdbcType=DECIMAL}, - remaining_earnings_preferred_lp = #{remainingEarningsPreferredLp,jdbcType=DECIMAL} - where id = #{id,jdbcType=VARCHAR} - - \ No newline at end of file