licailing 4 лет назад
Родитель
Сommit
2e7f25bc73

+ 2 - 6
src/main/h5/src/views/Home.vue

@@ -221,17 +221,13 @@ export default {
               this.isScore = true;
             }
             this.$http
-              .post(
-                "/performanceScore/breakdown?performanceApplyId=" + programmeId
-              )
+              .post("/programmeSocre/breakdown?programmeId=" + programmeId)
               .then(res => {
                 this.scores = res;
               });
             if (this.isAdmin) {
               this.$http
-                .post(
-                  "/performanceScore/myScore?performanceApplyId=" + programmeId
-                )
+                .post("/programmeSocre/myScore?programmeId=" + programmeId)
                 .then(res => {
                   if (res) {
                     this.myScore = res;

+ 2 - 0
src/main/java/com/izouma/wenlvju/repo/performance/ProgrammeScoreRepo.java

@@ -20,6 +20,8 @@ public interface ProgrammeScoreRepo extends JpaRepository<ProgrammeScore, Long>,
 
     List<ProgrammeScore> findByProgrammeIdInAndExpertId(Collection<Long> programmeId, Long expertId);
 
+    List<ProgrammeScore> findAllByProgrammeId(Long programmeId);
+
     @Query("select avg(score) from ProgrammeScore where programmeId = ?1")
     Object avgScore(Long programmeId);
 

+ 18 - 0
src/main/java/com/izouma/wenlvju/web/performance/ProgrammeScoreController.java

@@ -1,5 +1,7 @@
 package com.izouma.wenlvju.web.performance;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.izouma.wenlvju.domain.User;
 import com.izouma.wenlvju.utils.SecurityUtils;
 import com.izouma.wenlvju.web.BaseController;
 import com.izouma.wenlvju.domain.performance.ProgrammeScore;
@@ -67,5 +69,21 @@ public class ProgrammeScoreController extends BaseController {
     public void saveScore(@RequestParam Long programmeId, Double score, String remark) {
         programmeScoreService.saveScore(programmeId, score, remark, SecurityUtils.getAuthenticatedUser().getId());
     }
+
+    @ApiOperation("打分细则")
+    @PostMapping("/breakdown")
+    public List<ProgrammeScore> breakdown(@RequestParam Long programmeId) {
+        return programmeScoreRepo.findAllByProgrammeId(programmeId);
+    }
+
+    @ApiOperation("我的打分")
+    @PostMapping("/myScore")
+    public ProgrammeScore myScore(@RequestParam Long programmeId) {
+        User user = SecurityUtils.getAuthenticatedUser();
+        if (ObjectUtil.isNull(user)) {
+            return null;
+        }
+        return programmeScoreRepo.findByProgrammeIdAndExpertId(programmeId, user.getId());
+    }
 }