diff --git a/src/main/java/com/sztzjy/money_management/controller/GradeController.java b/src/main/java/com/sztzjy/money_management/controller/GradeController.java index b22aea1..3513f19 100644 --- a/src/main/java/com/sztzjy/money_management/controller/GradeController.java +++ b/src/main/java/com/sztzjy/money_management/controller/GradeController.java @@ -2,6 +2,7 @@ package com.sztzjy.money_management.controller; import cn.hutool.core.util.IdUtil; import cn.hutool.json.JSONObject; +import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.nimbusds.jose.shaded.gson.Gson; @@ -834,10 +835,13 @@ public class GradeController { @PostMapping("/updateSynthesisPlanMark") @ApiOperation("教师端 综合规划老师评分") @AnonymousAccess - private ResultEntity updateSynthesisPlanMark(@ApiParam("map type为更新的表名,json为预览展示单个表中的对象") @RequestBody Map updateMap, + private ResultEntity updateSynthesisPlanMark(@ApiParam("map type为更新的表名,json为预览展示单个表中的对象") @RequestBody Map updateMap, @RequestParam String userId,@RequestParam String caseId) { + System.out.println(); for(String type:updateMap.keySet()){ - String json = updateMap.get(type); +// String json = updateMap.get(type); + LinkedHashMap map = (LinkedHashMap) updateMap.get(type); + String json = new Gson().toJson(map); Gson gson = new Gson(); caseService.addCorrelationTable(type,json,gson,"stu"); } diff --git a/src/main/java/com/sztzjy/money_management/entity/CaseInvestmentPlan.java b/src/main/java/com/sztzjy/money_management/entity/CaseInvestmentPlan.java index f3ae4e1..2e09ece 100644 --- a/src/main/java/com/sztzjy/money_management/entity/CaseInvestmentPlan.java +++ b/src/main/java/com/sztzjy/money_management/entity/CaseInvestmentPlan.java @@ -34,9 +34,12 @@ public class CaseInvestmentPlan { @ApiModelProperty("学生答案/题目答案") private String isAnswer; - @ApiModelProperty("老师评分") + @ApiModelProperty("产品选择老师评分") private BigDecimal analysisTeacherScore; + @ApiModelProperty("投资规划分析老师评分") + private BigDecimal tzghfxTeacherScore; + @ApiModelProperty("投资规划分析") private String analysis; @@ -112,6 +115,14 @@ public class CaseInvestmentPlan { this.analysisTeacherScore = analysisTeacherScore; } + public BigDecimal getTzghfxTeacherScore() { + return tzghfxTeacherScore; + } + + public void setTzghfxTeacherScore(BigDecimal tzghfxTeacherScore) { + this.tzghfxTeacherScore = tzghfxTeacherScore; + } + public String getAnalysis() { return analysis; } diff --git a/src/main/java/com/sztzjy/money_management/entity/CaseInvestmentPlanExample.java b/src/main/java/com/sztzjy/money_management/entity/CaseInvestmentPlanExample.java index 5f28c1a..4053d23 100644 --- a/src/main/java/com/sztzjy/money_management/entity/CaseInvestmentPlanExample.java +++ b/src/main/java/com/sztzjy/money_management/entity/CaseInvestmentPlanExample.java @@ -694,6 +694,66 @@ public class CaseInvestmentPlanExample { addCriterion("analysis_teacher_score not between", value1, value2, "analysisTeacherScore"); return (Criteria) this; } + + public Criteria andTzghfxTeacherScoreIsNull() { + addCriterion("tzghfx_teacher_score is null"); + return (Criteria) this; + } + + public Criteria andTzghfxTeacherScoreIsNotNull() { + addCriterion("tzghfx_teacher_score is not null"); + return (Criteria) this; + } + + public Criteria andTzghfxTeacherScoreEqualTo(BigDecimal value) { + addCriterion("tzghfx_teacher_score =", value, "tzghfxTeacherScore"); + return (Criteria) this; + } + + public Criteria andTzghfxTeacherScoreNotEqualTo(BigDecimal value) { + addCriterion("tzghfx_teacher_score <>", value, "tzghfxTeacherScore"); + return (Criteria) this; + } + + public Criteria andTzghfxTeacherScoreGreaterThan(BigDecimal value) { + addCriterion("tzghfx_teacher_score >", value, "tzghfxTeacherScore"); + return (Criteria) this; + } + + public Criteria andTzghfxTeacherScoreGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("tzghfx_teacher_score >=", value, "tzghfxTeacherScore"); + return (Criteria) this; + } + + public Criteria andTzghfxTeacherScoreLessThan(BigDecimal value) { + addCriterion("tzghfx_teacher_score <", value, "tzghfxTeacherScore"); + return (Criteria) this; + } + + public Criteria andTzghfxTeacherScoreLessThanOrEqualTo(BigDecimal value) { + addCriterion("tzghfx_teacher_score <=", value, "tzghfxTeacherScore"); + return (Criteria) this; + } + + public Criteria andTzghfxTeacherScoreIn(List values) { + addCriterion("tzghfx_teacher_score in", values, "tzghfxTeacherScore"); + return (Criteria) this; + } + + public Criteria andTzghfxTeacherScoreNotIn(List values) { + addCriterion("tzghfx_teacher_score not in", values, "tzghfxTeacherScore"); + return (Criteria) this; + } + + public Criteria andTzghfxTeacherScoreBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("tzghfx_teacher_score between", value1, value2, "tzghfxTeacherScore"); + return (Criteria) this; + } + + public Criteria andTzghfxTeacherScoreNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("tzghfx_teacher_score not between", value1, value2, "tzghfxTeacherScore"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/src/main/java/com/sztzjy/money_management/service/impl/ScoreRankServiceImpl.java b/src/main/java/com/sztzjy/money_management/service/impl/ScoreRankServiceImpl.java index c48fcc7..af498a8 100644 --- a/src/main/java/com/sztzjy/money_management/service/impl/ScoreRankServiceImpl.java +++ b/src/main/java/com/sztzjy/money_management/service/impl/ScoreRankServiceImpl.java @@ -36,7 +36,7 @@ public class ScoreRankServiceImpl implements ScoreRankService { StuTheoryRecordMapper stuTheoryRecordMapper; @Override - @Scheduled(cron = "0 0 23 * * ?") + @Scheduled(cron = "0 0 1 * * ?") public Boolean doRank() { //先查询userInfo表 获取所有学校ID List schoolIdList = userInfoMapper.selectAllSchoolIds(); diff --git a/src/main/java/com/sztzjy/money_management/service/impl/SynthesisPlanServiceImpl.java b/src/main/java/com/sztzjy/money_management/service/impl/SynthesisPlanServiceImpl.java index 2c536ad..ee1fe32 100644 --- a/src/main/java/com/sztzjy/money_management/service/impl/SynthesisPlanServiceImpl.java +++ b/src/main/java/com/sztzjy/money_management/service/impl/SynthesisPlanServiceImpl.java @@ -242,6 +242,7 @@ public class SynthesisPlanServiceImpl implements SynthesisPlanService { synthesisPlanClient(userId, caseID, synthesisPlanClientList, list, teaCaseInfo); for (String type : typeList) { + System.out.println(type); if (type.equals("风险测评-风险指标")) { //风险测评-风险指标 CaseRiskIndexExample example = new CaseRiskIndexExample(); diff --git a/src/main/resources/mapper/CaseInvestmentPlanMapper.xml b/src/main/resources/mapper/CaseInvestmentPlanMapper.xml index ce11d6a..ec7365d 100644 --- a/src/main/resources/mapper/CaseInvestmentPlanMapper.xml +++ b/src/main/resources/mapper/CaseInvestmentPlanMapper.xml @@ -11,6 +11,7 @@ + @@ -75,7 +76,7 @@ case_investment_plan_id, case_id, life_cycle_id, hold_rate, increase_rate, speculation_rate, - user_id, is_answer, analysis_teacher_score + user_id, is_answer, analysis_teacher_score, tzghfx_teacher_score analysis @@ -132,11 +133,11 @@ insert into case_investment_plan (case_investment_plan_id, case_id, life_cycle_id, hold_rate, increase_rate, speculation_rate, user_id, is_answer, analysis_teacher_score, - analysis) + tzghfx_teacher_score, analysis) values (#{caseInvestmentPlanId,jdbcType=VARCHAR}, #{caseId,jdbcType=VARCHAR}, #{lifeCycleId,jdbcType=VARCHAR}, #{holdRate,jdbcType=DECIMAL}, #{increaseRate,jdbcType=DECIMAL}, #{speculationRate,jdbcType=DECIMAL}, #{userId,jdbcType=VARCHAR}, #{isAnswer,jdbcType=VARCHAR}, #{analysisTeacherScore,jdbcType=DECIMAL}, - #{analysis,jdbcType=LONGVARCHAR}) + #{tzghfxTeacherScore,jdbcType=DECIMAL}, #{analysis,jdbcType=LONGVARCHAR}) insert into case_investment_plan @@ -168,6 +169,9 @@ analysis_teacher_score, + + tzghfx_teacher_score, + analysis, @@ -200,6 +204,9 @@ #{analysisTeacherScore,jdbcType=DECIMAL}, + + #{tzghfxTeacherScore,jdbcType=DECIMAL}, + #{analysis,jdbcType=LONGVARCHAR}, @@ -241,6 +248,9 @@ analysis_teacher_score = #{record.analysisTeacherScore,jdbcType=DECIMAL}, + + tzghfx_teacher_score = #{record.tzghfxTeacherScore,jdbcType=DECIMAL}, + analysis = #{record.analysis,jdbcType=LONGVARCHAR}, @@ -260,6 +270,7 @@ user_id = #{record.userId,jdbcType=VARCHAR}, is_answer = #{record.isAnswer,jdbcType=VARCHAR}, analysis_teacher_score = #{record.analysisTeacherScore,jdbcType=DECIMAL}, + tzghfx_teacher_score = #{record.tzghfxTeacherScore,jdbcType=DECIMAL}, analysis = #{record.analysis,jdbcType=LONGVARCHAR} @@ -275,7 +286,8 @@ speculation_rate = #{record.speculationRate,jdbcType=DECIMAL}, user_id = #{record.userId,jdbcType=VARCHAR}, is_answer = #{record.isAnswer,jdbcType=VARCHAR}, - analysis_teacher_score = #{record.analysisTeacherScore,jdbcType=DECIMAL} + analysis_teacher_score = #{record.analysisTeacherScore,jdbcType=DECIMAL}, + tzghfx_teacher_score = #{record.tzghfxTeacherScore,jdbcType=DECIMAL} @@ -307,6 +319,9 @@ analysis_teacher_score = #{analysisTeacherScore,jdbcType=DECIMAL}, + + tzghfx_teacher_score = #{tzghfxTeacherScore,jdbcType=DECIMAL}, + analysis = #{analysis,jdbcType=LONGVARCHAR}, @@ -323,6 +338,7 @@ user_id = #{userId,jdbcType=VARCHAR}, is_answer = #{isAnswer,jdbcType=VARCHAR}, analysis_teacher_score = #{analysisTeacherScore,jdbcType=DECIMAL}, + tzghfx_teacher_score = #{tzghfxTeacherScore,jdbcType=DECIMAL}, analysis = #{analysis,jdbcType=LONGVARCHAR} where case_investment_plan_id = #{caseInvestmentPlanId,jdbcType=VARCHAR} @@ -335,7 +351,8 @@ speculation_rate = #{speculationRate,jdbcType=DECIMAL}, user_id = #{userId,jdbcType=VARCHAR}, is_answer = #{isAnswer,jdbcType=VARCHAR}, - analysis_teacher_score = #{analysisTeacherScore,jdbcType=DECIMAL} + analysis_teacher_score = #{analysisTeacherScore,jdbcType=DECIMAL}, + tzghfx_teacher_score = #{tzghfxTeacherScore,jdbcType=DECIMAL} where case_investment_plan_id = #{caseInvestmentPlanId,jdbcType=VARCHAR} \ No newline at end of file