From 12aa661c4fa0d067c47916ebd96c262565a80e06 Mon Sep 17 00:00:00 2001
From: shijie <648688341@qq.com>
Date: Thu, 25 Feb 2021 11:52:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=88=A4=E5=88=86=E7=82=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ProjectManagementMapper.java       | 11 ++++++++++
 .../service/ProjectManagementService.java     | 22 ++++++++++++++++---
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java b/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java
index ce4e439..d2109cc 100644
--- a/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java
+++ b/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java
@@ -193,6 +193,17 @@ public interface ProjectManagementMapper {
             "</script>"})
     List<TradingJudgmentPoints> getJudgmentPoints(@Param("projectId") Integer projectId);
 
+    /**
+     * 查询单个项目判分点信息，根据项目id
+     *
+     * @param projectId 项目id
+     * @return
+     */
+    @Select({"<script>",
+            "select * from hr_judgment_points where find_in_set(#{projectId},projectId)",
+            "</script>"})
+    List<JudgmentPoints> getJudgmentPointsPs(@Param("projectId") Integer projectId);
+
     /**
      * 查询单个项目判分点信息，根据项目id
      *
diff --git a/src/main/java/com/yipin/liuwanr/service/ProjectManagementService.java b/src/main/java/com/yipin/liuwanr/service/ProjectManagementService.java
index 0b09827..a74ea0b 100644
--- a/src/main/java/com/yipin/liuwanr/service/ProjectManagementService.java
+++ b/src/main/java/com/yipin/liuwanr/service/ProjectManagementService.java
@@ -445,15 +445,29 @@ public class ProjectManagementService {
         HashMap<String, Object> score = new HashMap<String, Object>();
         List<ScoreIndex> scoreIndexList = null;
         try {
-            List<TradingJudgmentPoints> judgmentPointsList = mapper.getJudgmentPoints(projectId);
-            Integer size = judgmentPointsList.size();
+            //根据projectId查询判分点交易类型
+            //List<TradingJudgmentPoints> judgmentPointsList = mapper.getJudgmentPoints(projectId);
+
+            /*Integer size = judgmentPointsList.size();
             for (int i = 0; i<size; i++){
                 TradingJudgmentPoints tradingJudgmentPoints = judgmentPointsList.get(i);
                 Integer judgmentPointsId = tradingJudgmentPoints.getId();
                 Integer systemId = tradingJudgmentPoints.getSystemId();
                 scoreIndexList = mapper.getScore(judgmentPointsId,systemId,projectId);
                 score.put("scoreIndexList"+i,scoreIndexList);
+            }*/
+
+            //根据projectId查询判分点信息
+            List<JudgmentPoints> judgmentPointsList = mapper.getJudgmentPointsPs(projectId);
+            Integer size = judgmentPointsList.size();
+            for (int i = 0; i<size; i++){
+                JudgmentPoints tradingJudgmentPoints = judgmentPointsList.get(i);
+                Integer judgmentPointsId = tradingJudgmentPoints.getJudgmentPointsId();
+                Integer systemId = tradingJudgmentPoints.getSystemId();
+                scoreIndexList = mapper.getScore(judgmentPointsId,systemId,projectId);
+                score.put("scoreIndexList"+i,scoreIndexList);
             }
+
             List<Role> roleList = mapper.queryProjectId(projectId);
             obj.put("roleList",roleList);
             obj.put("judgmentPointsList", judgmentPointsList);
@@ -664,7 +678,9 @@ public class ProjectManagementService {
                 //判分点id
                 Integer pointId = points.get(i).getJudgmentPointsId();
                 //根据该判分点得到数据库存储的对应数据
-                JudgmentPoints point = mapper.getByjudgmentPointsId(pointId);
+                //JudgmentPoints point = mapper.getByjudgmentPointsId(pointId);
+
+                JudgmentPoints point = mapper.newGetProjectId(pointId);
                 //取出绑定的项目id
                 String projectIds = point.getProjectId();
                 //取出实验要求

From 448078d20d7ad785db59dd94e53894a69aa0b894 Mon Sep 17 00:00:00 2001
From: shijie <648688341@qq.com>
Date: Thu, 25 Feb 2021 15:31:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=88=A4=E5=88=86=E7=82=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yipin/liuwanr/service/ProjectManagementService.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/yipin/liuwanr/service/ProjectManagementService.java b/src/main/java/com/yipin/liuwanr/service/ProjectManagementService.java
index a74ea0b..eadd5e5 100644
--- a/src/main/java/com/yipin/liuwanr/service/ProjectManagementService.java
+++ b/src/main/java/com/yipin/liuwanr/service/ProjectManagementService.java
@@ -678,9 +678,9 @@ public class ProjectManagementService {
                 //判分点id
                 Integer pointId = points.get(i).getJudgmentPointsId();
                 //根据该判分点得到数据库存储的对应数据
-                //JudgmentPoints point = mapper.getByjudgmentPointsId(pointId);
+                JudgmentPoints point = mapper.getByjudgmentPointsId(pointId);
 
-                JudgmentPoints point = mapper.newGetProjectId(pointId);
+                //JudgmentPoints point = mapper.newGetProjectId(pointId);
                 //取出绑定的项目id
                 String projectIds = point.getProjectId();
                 //取出实验要求