From 30ebe199c89697ba1a2e251c0759520c276787e1 Mon Sep 17 00:00:00 2001 From: xiaoCJ <406612557@qq.com> Date: Tue, 24 Sep 2024 17:58:32 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90=E7=94=9F?= =?UTF-8?q?=E6=B6=AF=E8=A7=84=E5=88=92-=E6=B6=88=E8=B4=B9=E8=A7=84?= =?UTF-8?q?=E5=88=92=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9B=B8=E5=85=B3=E8=A1=A8?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E7=9F=A5=E8=AF=86=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=AD=94=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SynthesisPlanController.java | 1 + .../controller/TopicController.java | 6 +++-- .../entity/CaseConsumptionPlanExample.java | 24 +++++++++---------- .../service/ObjectiveQuestionService.java | 2 +- .../service/impl/CaseServiceImpl.java | 4 ++-- .../impl/ObjectiveQuestionServiceImpl.java | 7 +++--- .../mapper/CaseConsumptionPlanMapper.xml | 20 ++++++++-------- 7 files changed, 34 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/sztzjy/money_management/controller/SynthesisPlanController.java b/src/main/java/com/sztzjy/money_management/controller/SynthesisPlanController.java index dc28fde..6baac5c 100644 --- a/src/main/java/com/sztzjy/money_management/controller/SynthesisPlanController.java +++ b/src/main/java/com/sztzjy/money_management/controller/SynthesisPlanController.java @@ -334,6 +334,7 @@ public class SynthesisPlanController { userStatisticsDto.setYiYouTotalCount(yiYouTotalCount); userStatisticsDto.setHighNetClientHaveCount(userStatistics.getHighNetClientHaveCount()); userStatisticsDto.setHighNetClientLatentCount(userStatistics.getHighNetClientLatentCount()); + return new ResultEntity<>(HttpStatus.OK, "客户统计查询成功！", userStatisticsDto); } diff --git a/src/main/java/com/sztzjy/money_management/controller/TopicController.java b/src/main/java/com/sztzjy/money_management/controller/TopicController.java index ab8fd1f..a88baac 100644 --- a/src/main/java/com/sztzjy/money_management/controller/TopicController.java +++ b/src/main/java/com/sztzjy/money_management/controller/TopicController.java @@ -163,8 +163,10 @@ public class TopicController { @PostMapping("/getObjectiveRecord") @ApiOperation("学习测评/随机10条展示/回显") @AnonymousAccess - private ResultEntity> getObjectiveRecord(@RequestParam String chapterId, @RequestParam String trainingId) { - List list = objectiveQuestionService.getObjectiveRecord(chapterId, trainingId); + private ResultEntity> getObjectiveRecord(@RequestParam String chapterId, + @RequestParam String trainingId, + @ApiParam("重新作答按钮传true")@RequestParam boolean flag) { + List list = objectiveQuestionService.getObjectiveRecord(chapterId, trainingId,flag); return new ResultEntity>(list); } diff --git a/src/main/java/com/sztzjy/money_management/entity/CaseConsumptionPlanExample.java b/src/main/java/com/sztzjy/money_management/entity/CaseConsumptionPlanExample.java index 040613d..97563f2 100644 --- a/src/main/java/com/sztzjy/money_management/entity/CaseConsumptionPlanExample.java +++ b/src/main/java/com/sztzjy/money_management/entity/CaseConsumptionPlanExample.java @@ -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 values) { - addCriterion("\"available assets\" in", values, "availableAssets"); + addCriterion("available_assets in", values, "availableAssets"); return (Criteria) this; } public Criteria andAvailableAssetsNotIn(List 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; } diff --git a/src/main/java/com/sztzjy/money_management/service/ObjectiveQuestionService.java b/src/main/java/com/sztzjy/money_management/service/ObjectiveQuestionService.java index c8d7d24..d54225f 100644 --- a/src/main/java/com/sztzjy/money_management/service/ObjectiveQuestionService.java +++ b/src/main/java/com/sztzjy/money_management/service/ObjectiveQuestionService.java @@ -23,5 +23,5 @@ public interface ObjectiveQuestionService { void commitObjectiveAnswer(List dtoList, String userId, String chapterId); - List getObjectiveRecord(String chapterId,String trainingId); + List getObjectiveRecord(String chapterId,String trainingId,boolean flag); } diff --git a/src/main/java/com/sztzjy/money_management/service/impl/CaseServiceImpl.java b/src/main/java/com/sztzjy/money_management/service/impl/CaseServiceImpl.java index 6b62218..a1733ef 100644 --- a/src/main/java/com/sztzjy/money_management/service/impl/CaseServiceImpl.java +++ b/src/main/java/com/sztzjy/money_management/service/impl/CaseServiceImpl.java @@ -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 CaseConsumptionPlans = caseConsumptionPlanMapper.selectByExampleWithBLOBs(example); diff --git a/src/main/java/com/sztzjy/money_management/service/impl/ObjectiveQuestionServiceImpl.java b/src/main/java/com/sztzjy/money_management/service/impl/ObjectiveQuestionServiceImpl.java index ac1271a..0b12184 100644 --- a/src/main/java/com/sztzjy/money_management/service/impl/ObjectiveQuestionServiceImpl.java +++ b/src/main/java/com/sztzjy/money_management/service/impl/ObjectiveQuestionServiceImpl.java @@ -172,13 +172,14 @@ public class ObjectiveQuestionServiceImpl implements ObjectiveQuestionService { } @Override - public List getObjectiveRecord(String chapterId, String trainingId) { + public List 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); } diff --git a/src/main/resources/mapper/CaseConsumptionPlanMapper.xml b/src/main/resources/mapper/CaseConsumptionPlanMapper.xml index 476196a..c35a083 100644 --- a/src/main/resources/mapper/CaseConsumptionPlanMapper.xml +++ b/src/main/resources/mapper/CaseConsumptionPlanMapper.xml @@ -5,7 +5,7 @@ - + @@ -103,7 +103,7 @@ - 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 @@ 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, - "available assets", + available_assets, shop_house_year, @@ -455,7 +455,7 @@ 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}, @@ -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}, - "available assets" = #{availableAssets,jdbcType=DECIMAL}, + available_assets = #{availableAssets,jdbcType=DECIMAL}, 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},