From 49c8857de1c1110c47f9e7d5d683a905ea890cd0 Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Fri, 12 Apr 2024 14:21:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=A5=96=E9=A1=B9=E8=AF=84=E5=88=86?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/manager/ScoreInfoManager.java  | 25 +++++++++++++++++++
 .../reward/ScoreInfoController.java           | 17 ++++++++++---
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/hyp-admin/src/main/java/com/hyp/web/controller/manager/ScoreInfoManager.java b/hyp-admin/src/main/java/com/hyp/web/controller/manager/ScoreInfoManager.java
index dc0f64e..098e885 100644
--- a/hyp-admin/src/main/java/com/hyp/web/controller/manager/ScoreInfoManager.java
+++ b/hyp-admin/src/main/java/com/hyp/web/controller/manager/ScoreInfoManager.java
@@ -1,17 +1,25 @@
 package com.hyp.web.controller.manager;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.hyp.common.core.domain.model.LoginUser;
 import com.hyp.common.utils.SecurityUtils;
 import com.hyp.common.utils.StringUtils;
+import com.hyp.system.domain.RewApplyInfoList;
+import com.hyp.system.domain.RewFileRelation;
 import com.hyp.system.domain.RewScoreInfo;
 import com.hyp.system.domain.dto.ScoreInfoSaveDTO;
+import com.hyp.system.domain.vo.ApplyInfoListVO;
+import com.hyp.system.domain.vo.FileRelationVO;
 import com.hyp.system.service.RewScoreInfoService;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.Date;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * packageName com.hyp.web.controller.manager
@@ -51,4 +59,21 @@ public class ScoreInfoManager {
     }
 
 
+    /**
+     *
+     *  查询评分
+     * @param applyId
+     * @param createId
+     * @return java.util.List<com.hyp.system.domain.RewScoreInfo>
+     */
+
+    public List<RewScoreInfo> getScoreInfo(String applyId,Long createId){
+        LambdaQueryWrapper<RewScoreInfo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(RewScoreInfo::getApplyId,applyId);
+        queryWrapper.eq(Objects.nonNull(createId), RewScoreInfo::getCreateId, createId);
+        return scoreInfoService.list(queryWrapper);
+
+    }
+
+
 }
diff --git a/hyp-admin/src/main/java/com/hyp/web/controller/reward/ScoreInfoController.java b/hyp-admin/src/main/java/com/hyp/web/controller/reward/ScoreInfoController.java
index 1fd3a51..6cab836 100644
--- a/hyp-admin/src/main/java/com/hyp/web/controller/reward/ScoreInfoController.java
+++ b/hyp-admin/src/main/java/com/hyp/web/controller/reward/ScoreInfoController.java
@@ -9,10 +9,7 @@ import com.hyp.web.controller.manager.ScoreInfoManager;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
@@ -42,6 +39,18 @@ public class ScoreInfoController extends BaseController {
 
 
 
+    @ApiOperation("评分查询")
+    @GetMapping("/getScoreInfo")
+    public AjaxResult getScoreInfo(@RequestParam String applyId,
+                                    @RequestParam(required = false) Long createId) {
+        return success(scoreInfoManager.getScoreInfo(applyId,createId));
+    }
+
+
+
+
+
+