From 839babf29c6cc3a788e02f475f135d3940a627ad Mon Sep 17 00:00:00 2001 From: yz <3614508250@qq.com> Date: Tue, 26 Nov 2024 16:53:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=92=E5=BA=8F=20?= =?UTF-8?q?=E8=AF=84=E5=88=86=E5=88=86=E6=95=B0=E8=AE=A1=E7=AE=97=E6=9C=89?= =?UTF-8?q?=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CaseController.java | 29 +++++++++++++------ .../controller/GradeController.java | 3 ++ .../controller/ProductCenter.java | 5 ++++ .../common/StatisticsController.java | 2 +- .../entity/dto/StuSynthesisPlanScoreDto.java | 1 - .../entity/vo/ObjCaseScoreVo.java | 2 +- src/main/resources/mapper/ScoreRankMapper.xml | 1 + 7 files changed, 31 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/sztzjy/money_management/controller/CaseController.java b/src/main/java/com/sztzjy/money_management/controller/CaseController.java index 701d415..19a22c3 100644 --- a/src/main/java/com/sztzjy/money_management/controller/CaseController.java +++ b/src/main/java/com/sztzjy/money_management/controller/CaseController.java @@ -323,24 +323,35 @@ public class CaseController { @PostMapping("countLearnTime") @ApiOperation("统计实训学习时长") @AnonymousAccess - public void countLearnTime(@RequestParam String trainingId, + public void countLearnTime(@RequestParam(required = false) String trainingId, @ApiParam("时间，单位分钟") BigDecimal minuter) { + if(trainingId==null){ + return; + } StuTrainingWithBLOBs stuTrainingWithBLOBs = stuTrainingMapper.selectByPrimaryKey(trainingId); - if (stuTrainingWithBLOBs.getTrainingTime() == null) { - stuTrainingWithBLOBs.setTrainingTime(minuter); - } else { - stuTrainingWithBLOBs.setTrainingTime(stuTrainingWithBLOBs.getTrainingTime().add(minuter)); + if(stuTrainingWithBLOBs!=null){ + if (stuTrainingWithBLOBs.getTrainingTime()==null){ + stuTrainingWithBLOBs.setTrainingTime(minuter); + }else { + stuTrainingWithBLOBs.setTrainingTime(stuTrainingWithBLOBs.getTrainingTime().add(minuter)); + } + stuTrainingMapper.updateByPrimaryKeyWithBLOBs(stuTrainingWithBLOBs); } - stuTrainingMapper.updateByPrimaryKeyWithBLOBs(stuTrainingWithBLOBs); } @PostMapping("countCaseTime") @ApiOperation("统计综合规划编辑建议书时间") @AnonymousAccess - public void countCaseTime(@RequestParam String stuClientId, - @ApiParam("时间，单位分钟") BigDecimal minuter) { + public void countCaseTime(@RequestParam(required = false) String stuClientId, + @ApiParam("时间，单位分钟") BigDecimal minuter) { + if(stuClientId==null){ + return; + } SynthesisPlanClient synthesisPlanClient = synthesisPlanClientMapper.selectByPrimaryKey(stuClientId); - if (synthesisPlanClient.getSubmitStatus().equals("已审核") || synthesisPlanClient.getSubmitStatus().equals("未审核")) { + if(synthesisPlanClient==null){ + return; + } + if (synthesisPlanClient.getSubmitStatus().equals("已审核")||synthesisPlanClient.getSubmitStatus().equals("未审核")){ return; } else { if (synthesisPlanClient.getUseTime() == null) { 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 cc79a21..687b923 100644 --- a/src/main/java/com/sztzjy/money_management/controller/GradeController.java +++ b/src/main/java/com/sztzjy/money_management/controller/GradeController.java @@ -718,6 +718,9 @@ public class GradeController { Map map = new HashMap<>(); for (int i = 0; i < synthesisPlanScores.size(); i++) { SynthesisPlanScore synthesisPlanScore = synthesisPlanScores.get(i); + if(synthesisPlanScore.getTestCenter().contains("分析") || synthesisPlanScore.getTestCenter().contains("理财方案")){ + continue; + } if (map.containsKey(synthesisPlanScore.getManageMoneyMattersType())) { ObjCaseScoreVo objCaseScoreVo = map.get(synthesisPlanScore.getManageMoneyMattersType()); objCaseScoreVo.setStandardScore(objCaseScoreVo.getStandardScore().add(BigDecimal.valueOf(2))); diff --git a/src/main/java/com/sztzjy/money_management/controller/ProductCenter.java b/src/main/java/com/sztzjy/money_management/controller/ProductCenter.java index 95ce068..5035225 100644 --- a/src/main/java/com/sztzjy/money_management/controller/ProductCenter.java +++ b/src/main/java/com/sztzjy/money_management/controller/ProductCenter.java @@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.File; +import java.math.BigDecimal; import java.util.List; @RestController @@ -107,6 +108,10 @@ public class ProductCenter { } example.setOrderByClause("code_id asc"); List p2pData = p2pDataMapper.selectByExample(example); + for (int i = 0; i < p2pData.size(); i++) { + p2pData.get(i).setAnnualReturn(String.valueOf(BigDecimal.valueOf(Double.parseDouble(p2pData.get(i).getAnnualReturn())).setScale(2,BigDecimal.ROUND_HALF_UP))); + p2pData.get(i).setPeratio(String.valueOf(BigDecimal.valueOf(Double.parseDouble(p2pData.get(i).getPeratio())).setScale(2,BigDecimal.ROUND_HALF_UP))); + } PageInfo pageInfo = new PageInfo<>(p2pData); return new ResultEntity<>(HttpStatus.OK, "P2P产品查询成功！", pageInfo); } diff --git a/src/main/java/com/sztzjy/money_management/controller/common/StatisticsController.java b/src/main/java/com/sztzjy/money_management/controller/common/StatisticsController.java index 6346ebb..5cabab4 100644 --- a/src/main/java/com/sztzjy/money_management/controller/common/StatisticsController.java +++ b/src/main/java/com/sztzjy/money_management/controller/common/StatisticsController.java @@ -170,7 +170,7 @@ public class StatisticsController { @AnonymousAccess @GetMapping("/getTeaTrainingScoreAnalysis") @ApiOperation("老师端 -班级成绩统计分析") - public TeaClassScoreDto getTeaTrainingScoreAnalysis(String schoolId, String classId, Date time) { + public TeaClassScoreDto getTeaTrainingScoreAnalysis(@RequestParam String schoolId,@RequestParam(required = false) String classId,@RequestParam Date time) { ScoreRankExample scoreExample = new ScoreRankExample(); ScoreRankExample.Criteria criteria = scoreExample.createCriteria(); // 将Date对象转换为指定格式的字符串 diff --git a/src/main/java/com/sztzjy/money_management/entity/dto/StuSynthesisPlanScoreDto.java b/src/main/java/com/sztzjy/money_management/entity/dto/StuSynthesisPlanScoreDto.java index f46a85a..9da5c7d 100644 --- a/src/main/java/com/sztzjy/money_management/entity/dto/StuSynthesisPlanScoreDto.java +++ b/src/main/java/com/sztzjy/money_management/entity/dto/StuSynthesisPlanScoreDto.java @@ -9,7 +9,6 @@ import java.math.BigDecimal; @Data @NoArgsConstructor public class StuSynthesisPlanScoreDto { - @ApiModelProperty("学习项目") private String name; diff --git a/src/main/java/com/sztzjy/money_management/entity/vo/ObjCaseScoreVo.java b/src/main/java/com/sztzjy/money_management/entity/vo/ObjCaseScoreVo.java index 0f451af..20b5196 100644 --- a/src/main/java/com/sztzjy/money_management/entity/vo/ObjCaseScoreVo.java +++ b/src/main/java/com/sztzjy/money_management/entity/vo/ObjCaseScoreVo.java @@ -7,7 +7,7 @@ import java.math.BigDecimal; @Data public class ObjCaseScoreVo { - @ApiModelProperty("标准分") + @ApiModelProperty("客观题标准分") private BigDecimal StandardScore; @ApiModelProperty("学生得分") diff --git a/src/main/resources/mapper/ScoreRankMapper.xml b/src/main/resources/mapper/ScoreRankMapper.xml index b16ba8c..17a0b14 100644 --- a/src/main/resources/mapper/ScoreRankMapper.xml +++ b/src/main/resources/mapper/ScoreRankMapper.xml @@ -606,6 +606,7 @@ from score_rank s where school_id = #{schoolId,jdbcType=VARCHAR} and class_name=#{className,jdbcType=VARCHAR} group BY update_date + order by update_date asc LIMIT 5