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

修改综合规划老师评分

Browse Source
master
yz 5 months ago
parent 2c501ea328
commit 1ef4f54531
6 changed files with 102 additions and 9 deletions
Show Stats Download Patch File Download Diff File

8
src/main/java/com/sztzjy/money_management/controller/GradeController.java
Unescape Escape View File

@ -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> type为更新的表名，json为预览展示单个表中的对象") @RequestBody Map<String, String> updateMap,
private ResultEntity updateSynthesisPlanMark(@ApiParam("map<type,json> type为更新的表名，json为预览展示单个表中的对象") @RequestBody Map<String, Object> 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<String, String> map = (LinkedHashMap<String, String>) updateMap.get(type);
String json = new Gson().toJson(map);
Gson gson = new Gson();
caseService.addCorrelationTable(type,json,gson,"stu");
}

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

@ -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;
}

60
src/main/java/com/sztzjy/money_management/entity/CaseInvestmentPlanExample.java
Unescape Escape View File

@ -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<BigDecimal> values) {
addCriterion("tzghfx_teacher_score in", values, "tzghfxTeacherScore");
return (Criteria) this;
}
public Criteria andTzghfxTeacherScoreNotIn(List<BigDecimal> 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 {

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

@ -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<String> schoolIdList = userInfoMapper.selectAllSchoolIds();

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

@ -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();

27
src/main/resources/mapper/CaseInvestmentPlanMapper.xml
Unescape Escape View File

@ -11,6 +11,7 @@
<result column="user_id" jdbcType="VARCHAR" property="userId" />
<result column="is_answer" jdbcType="VARCHAR" property="isAnswer" />
<result column="analysis_teacher_score" jdbcType="DECIMAL" property="analysisTeacherScore" />
<result column="tzghfx_teacher_score" jdbcType="DECIMAL" property="tzghfxTeacherScore" />
</resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.sztzjy.money_management.entity.CaseInvestmentPlan">
<result column="analysis" jdbcType="LONGVARCHAR" property="analysis" />
@ -75,7 +76,7 @@
</sql>
<sql id="Base_Column_List">
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
</sql>
<sql id="Blob_Column_List">
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>
<insert id="insertSelective" parameterType="com.sztzjy.money_management.entity.CaseInvestmentPlan">
insert into case_investment_plan
@ -168,6 +169,9 @@
<if test="analysisTeacherScore != null">
analysis_teacher_score,
</if>
<if test="tzghfxTeacherScore != null">
tzghfx_teacher_score,
</if>
<if test="analysis != null">
analysis,
</if>
@ -200,6 +204,9 @@
<if test="analysisTeacherScore != null">
#{analysisTeacherScore,jdbcType=DECIMAL},
</if>
<if test="tzghfxTeacherScore != null">
#{tzghfxTeacherScore,jdbcType=DECIMAL},
</if>
<if test="analysis != null">
#{analysis,jdbcType=LONGVARCHAR},
</if>
@ -241,6 +248,9 @@
<if test="record.analysisTeacherScore != null">
analysis_teacher_score = #{record.analysisTeacherScore,jdbcType=DECIMAL},
</if>
<if test="record.tzghfxTeacherScore != null">
tzghfx_teacher_score = #{record.tzghfxTeacherScore,jdbcType=DECIMAL},
</if>
<if test="record.analysis != null">
analysis = #{record.analysis,jdbcType=LONGVARCHAR},
</if>
@ -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}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
@ -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}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
@ -307,6 +319,9 @@
<if test="analysisTeacherScore != null">
analysis_teacher_score = #{analysisTeacherScore,jdbcType=DECIMAL},
</if>
<if test="tzghfxTeacherScore != null">
tzghfx_teacher_score = #{tzghfxTeacherScore,jdbcType=DECIMAL},
</if>
<if test="analysis != null">
analysis = #{analysis,jdbcType=LONGVARCHAR},
</if>
@ -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}
</update>
@ -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}
</update>
</mapper>
Write Preview
Loading…
Cancel
Save