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

重新生成生涯规划-消费规划数据库相关表

Browse Source 
修改知识测试页面接口，实现重新答题
master
xiaoCJ 6 months ago
parent 74d11ef5c9
commit 30ebe199c8
7 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File

1
src/main/java/com/sztzjy/money_management/controller/SynthesisPlanController.java
Unescape Escape View File

@ -334,6 +334,7 @@ public class SynthesisPlanController {
userStatisticsDto.setYiYouTotalCount(yiYouTotalCount);
userStatisticsDto.setHighNetClientHaveCount(userStatistics.getHighNetClientHaveCount());
userStatisticsDto.setHighNetClientLatentCount(userStatistics.getHighNetClientLatentCount());
return new ResultEntity<>(HttpStatus.OK, "客户统计查询成功！", userStatisticsDto);
}

6
src/main/java/com/sztzjy/money_management/controller/TopicController.java
Unescape Escape View File

@ -163,8 +163,10 @@ public class TopicController {
@PostMapping("/getObjectiveRecord")
@ApiOperation("学习测评/随机10条展示/回显")
@AnonymousAccess
private ResultEntity<List<ObjectiveQuestionDto>> getObjectiveRecord(@RequestParam String chapterId, @RequestParam String trainingId) {
List<ObjectiveQuestionDto> list = objectiveQuestionService.getObjectiveRecord(chapterId, trainingId);
private ResultEntity<List<ObjectiveQuestionDto>> getObjectiveRecord(@RequestParam String chapterId,
@RequestParam String trainingId,
@ApiParam("重新作答按钮传true")@RequestParam boolean flag) {
List<ObjectiveQuestionDto> list = objectiveQuestionService.getObjectiveRecord(chapterId, trainingId,flag);
return new ResultEntity<List<ObjectiveQuestionDto>>(list);
}

24
src/main/java/com/sztzjy/money_management/entity/CaseConsumptionPlanExample.java
Unescape Escape View File

@ -306,62 +306,62 @@ public class CaseConsumptionPlanExample {
}
public Criteria andAvailableAssetsIsNull() {
addCriterion("\"available assets\" is null");
addCriterion("available_assets is null");
return (Criteria) this;
}
public Criteria andAvailableAssetsIsNotNull() {
addCriterion("\"available assets\" is not null");
addCriterion("available_assets is not null");
return (Criteria) this;
}
public Criteria andAvailableAssetsEqualTo(BigDecimal value) {
addCriterion("\"available assets\" =", value, "availableAssets");
addCriterion("available_assets =", value, "availableAssets");
return (Criteria) this;
}
public Criteria andAvailableAssetsNotEqualTo(BigDecimal value) {
addCriterion("\"available assets\" <>", value, "availableAssets");
addCriterion("available_assets <>", value, "availableAssets");
return (Criteria) this;
}
public Criteria andAvailableAssetsGreaterThan(BigDecimal value) {
addCriterion("\"available assets\" >", value, "availableAssets");
addCriterion("available_assets >", value, "availableAssets");
return (Criteria) this;
}
public Criteria andAvailableAssetsGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("\"available assets\" >=", value, "availableAssets");
addCriterion("available_assets >=", value, "availableAssets");
return (Criteria) this;
}
public Criteria andAvailableAssetsLessThan(BigDecimal value) {
addCriterion("\"available assets\" <", value, "availableAssets");
addCriterion("available_assets <", value, "availableAssets");
return (Criteria) this;
}
public Criteria andAvailableAssetsLessThanOrEqualTo(BigDecimal value) {
addCriterion("\"available assets\" <=", value, "availableAssets");
addCriterion("available_assets <=", value, "availableAssets");
return (Criteria) this;
}
public Criteria andAvailableAssetsIn(List<BigDecimal> values) {
addCriterion("\"available assets\" in", values, "availableAssets");
addCriterion("available_assets in", values, "availableAssets");
return (Criteria) this;
}
public Criteria andAvailableAssetsNotIn(List<BigDecimal> values) {
addCriterion("\"available assets\" not in", values, "availableAssets");
addCriterion("available_assets not in", values, "availableAssets");
return (Criteria) this;
}
public Criteria andAvailableAssetsBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("\"available assets\" between", value1, value2, "availableAssets");
addCriterion("available_assets between", value1, value2, "availableAssets");
return (Criteria) this;
}
public Criteria andAvailableAssetsNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("\"available assets\" not between", value1, value2, "availableAssets");
addCriterion("available_assets not between", value1, value2, "availableAssets");
return (Criteria) this;
}

2
src/main/java/com/sztzjy/money_management/service/ObjectiveQuestionService.java
Unescape Escape View File

@ -23,5 +23,5 @@ public interface ObjectiveQuestionService {
void commitObjectiveAnswer(List<ObjectiveQuestionDto> dtoList, String userId, String chapterId);
List<ObjectiveQuestionDto> getObjectiveRecord(String chapterId,String trainingId);
List<ObjectiveQuestionDto> getObjectiveRecord(String chapterId,String trainingId,boolean flag);
}

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

@ -787,7 +787,7 @@ public class CaseServiceImpl implements CaseService {
}
if (type.equals("生涯规划-消费规划")) {
CaseConsumptionPlanWithBLOBs stuData = gson.fromJson(json, CaseConsumptionPlanWithBLOBs.class);
CaseConsumptionPlan stuData = gson.fromJson(json, CaseConsumptionPlan.class);
CaseConsumptionPlanExample caseConsumptionPlanExample = new CaseConsumptionPlanExample();
caseConsumptionPlanExample.createCriteria().andIsAnswerEqualTo("学生答案").andUserIdEqualTo(stuData.getUserId()).andCaseIdEqualTo(stuData.getCaseId());
@ -962,7 +962,7 @@ public class CaseServiceImpl implements CaseService {
return wrongCount;
}
private int getCaseConsumptionPlanWrongCount(int wrongCount, CaseConsumptionPlanWithBLOBs stuData) {
private int getCaseConsumptionPlanWrongCount(int wrongCount, CaseConsumptionPlan stuData) {
CaseConsumptionPlanExample example = new CaseConsumptionPlanExample();
example.createCriteria().andCaseIdEqualTo(stuData.getCaseId()).andIsAnswerEqualTo("题目答案");
List<CaseConsumptionPlan> CaseConsumptionPlans = caseConsumptionPlanMapper.selectByExampleWithBLOBs(example);

7
src/main/java/com/sztzjy/money_management/service/impl/ObjectiveQuestionServiceImpl.java
Unescape Escape View File

@ -172,13 +172,14 @@ public class ObjectiveQuestionServiceImpl implements ObjectiveQuestionService {
}
@Override
public List<ObjectiveQuestionDto> getObjectiveRecord(String chapterId, String trainingId) {
public List<ObjectiveQuestionDto> getObjectiveRecord(String chapterId, String trainingId, boolean flag) {
StuTrainingWithBLOBs stuTrainingWithBLOBs = stuTrainingMapper.selectByPrimaryKey(trainingId);
//沒提交过的展示十条随机
//沒提交过的展示十条随机 重新作答
if (stuTrainingWithBLOBs == null
|| StringUtils.isBlank(stuTrainingWithBLOBs.getLearningEvalAnswer())
|| StringUtils.isBlank(stuTrainingWithBLOBs.getLearningEvalIdList())) {
|| StringUtils.isBlank(stuTrainingWithBLOBs.getLearningEvalIdList())
|| flag) {
return objectiveQuestionMapper.getObjectiveCount10(chapterId);
}

20
src/main/resources/mapper/CaseConsumptionPlanMapper.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<id column="case_consumption_plan_id" jdbcType="VARCHAR" property="caseConsumptionPlanId" />
<result column="case_id" jdbcType="VARCHAR" property="caseId" />
<result column="monthly_investment" jdbcType="DECIMAL" property="monthlyInvestment" />
<result column="available assets" jdbcType="DECIMAL" property="availableAssets" />
<result column="available_assets" jdbcType="DECIMAL" property="availableAssets" />
<result column="shop_house_year" jdbcType="INTEGER" property="shopHouseYear" />
<result column="house_area" jdbcType="DECIMAL" property="houseArea" />
<result column="house_price" jdbcType="DECIMAL" property="housePrice" />
@ -103,7 +103,7 @@
</where>
</sql>
<sql id="Base_Column_List">
case_consumption_plan_id, case_id, monthly_investment, "available assets", shop_house_year,
case_consumption_plan_id, case_id, monthly_investment, available_assets, shop_house_year,
house_area, house_price, house_all_money, house_down_payment_percent, house_loan_year,
house_loan_rate, house_down_payment, house_total_amount, disposable_input, house_monthly_amount,
shop_car_year, car_type, car_price, car_down_payment_percent, car_loan_year, car_loan_rate,
@ -165,7 +165,7 @@
</delete>
<insert id="insert" parameterType="com.sztzjy.money_management.entity.CaseConsumptionPlan">
insert into case_consumption_plan (case_consumption_plan_id, case_id, monthly_investment,
"available assets", shop_house_year, house_area,
available_assets, shop_house_year, house_area,
house_price, house_all_money, house_down_payment_percent,
house_loan_year, house_loan_rate, house_down_payment,
house_total_amount, disposable_input, house_monthly_amount,
@ -208,7 +208,7 @@
monthly_investment,
</if>
<if test="availableAssets != null">
"available assets",
available_assets,
</if>
<if test="shopHouseYear != null">
shop_house_year,
@ -455,7 +455,7 @@
monthly_investment = #{record.monthlyInvestment,jdbcType=DECIMAL},
</if>
<if test="record.availableAssets != null">
"available assets" = #{record.availableAssets,jdbcType=DECIMAL},
available_assets = #{record.availableAssets,jdbcType=DECIMAL},
</if>
<if test="record.shopHouseYear != null">
shop_house_year = #{record.shopHouseYear,jdbcType=INTEGER},
@ -572,7 +572,7 @@
set case_consumption_plan_id = #{record.caseConsumptionPlanId,jdbcType=VARCHAR},
case_id = #{record.caseId,jdbcType=VARCHAR},
monthly_investment = #{record.monthlyInvestment,jdbcType=DECIMAL},
"available assets" = #{record.availableAssets,jdbcType=DECIMAL},
available_assets = #{record.availableAssets,jdbcType=DECIMAL},
shop_house_year = #{record.shopHouseYear,jdbcType=INTEGER},
house_area = #{record.houseArea,jdbcType=DECIMAL},
house_price = #{record.housePrice,jdbcType=DECIMAL},
@ -617,7 +617,7 @@
set case_consumption_plan_id = #{record.caseConsumptionPlanId,jdbcType=VARCHAR},
case_id = #{record.caseId,jdbcType=VARCHAR},
monthly_investment = #{record.monthlyInvestment,jdbcType=DECIMAL},
"available assets" = #{record.availableAssets,jdbcType=DECIMAL},
available_assets = #{record.availableAssets,jdbcType=DECIMAL},
shop_house_year = #{record.shopHouseYear,jdbcType=INTEGER},
house_area = #{record.houseArea,jdbcType=DECIMAL},
house_price = #{record.housePrice,jdbcType=DECIMAL},
@ -666,7 +666,7 @@
monthly_investment = #{monthlyInvestment,jdbcType=DECIMAL},
</if>
<if test="availableAssets != null">
"available assets" = #{availableAssets,jdbcType=DECIMAL},
available_assets = #{availableAssets,jdbcType=DECIMAL},
</if>
<if test="shopHouseYear != null">
shop_house_year = #{shopHouseYear,jdbcType=INTEGER},
@ -780,7 +780,7 @@
update case_consumption_plan
set case_id = #{caseId,jdbcType=VARCHAR},
monthly_investment = #{monthlyInvestment,jdbcType=DECIMAL},
"available assets" = #{availableAssets,jdbcType=DECIMAL},
available_assets = #{availableAssets,jdbcType=DECIMAL},
shop_house_year = #{shopHouseYear,jdbcType=INTEGER},
house_area = #{houseArea,jdbcType=DECIMAL},
house_price = #{housePrice,jdbcType=DECIMAL},
@ -822,7 +822,7 @@
update case_consumption_plan
set case_id = #{caseId,jdbcType=VARCHAR},
monthly_investment = #{monthlyInvestment,jdbcType=DECIMAL},
"available assets" = #{availableAssets,jdbcType=DECIMAL},
available_assets = #{availableAssets,jdbcType=DECIMAL},
shop_house_year = #{shopHouseYear,jdbcType=INTEGER},
house_area = #{houseArea,jdbcType=DECIMAL},
house_price = #{housePrice,jdbcType=DECIMAL},

Write Preview
Loading…
Cancel
Save