From c7cc76c799059664a1bec9b3999627c91bc1dcf8 Mon Sep 17 00:00:00 2001
From: "zhiyong.ning" <354350178@qq.com>
Date: Fri, 5 Mar 2021 15:00:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=9D=E5=A4=A7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ProjectManagementMapper.java        | 18 +++++++++++-------
 .../service/ProjectManagementService.java      |  6 +++---
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java b/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java
index 01896c6..349b7af 100644
--- a/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java
+++ b/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java
@@ -1,10 +1,15 @@
 package com.yipin.liuwanr.mapper;
 
-import com.yipin.liuwanr.entity.*;
-import org.apache.ibatis.annotations.*;
-
 import java.util.List;
 
+import com.yipin.liuwanr.entity.*;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
 /**
  * 项目管理系统 项目管理表
  *
@@ -18,7 +23,7 @@ public interface ProjectManagementMapper {
      * @param projectName
      * @return
      */
-    @Select("select count(*) from hr_project_management where projectName=#{projectName} and isdel=0")
+    @Select("select count(*) from hr_project_management where projectName=#{projectName}")
     Integer getByprojectName(String projectName);
 
     /**
@@ -71,8 +76,7 @@ public interface ProjectManagementMapper {
             "select * from hr_project_management where 1 = 1",//(roleId NOT LIKE '%3%' AND isdel = 0 AND projectPermissions != 0)",
             "<if test='userId==null'>AND roleId NOT LIKE '%3%' AND isdel = 0 AND projectPermissions != 0</if>",
             " <if test='userId!=null'>AND ((roleId NOT LIKE '%3%' AND isdel = 0 AND projectPermissions != 0) OR ( isdel = 0 AND projectPermissions != 0 AND userId = #{userId} ))</if>",//教师端，一开始进入项目管理，看见自己创建的和其他人看见的
-            "<if test='systemId!=null'> and systemId=#{systemId}</if>",
-            "<if test='projectName!=null'> and projectName like '%' #{projectName} '%'</if>",
+           " <if test='systemId!=null'> and systemId=#{systemId}</if>",
             " ORDER BY creationTime desc",
             "</script>"})
     List<ProjectManagement> queryManagementsExportTest(ProjectManagement management);
@@ -198,7 +202,7 @@ public interface ProjectManagementMapper {
      * @return
      */
     @Select({"<script>",
-            "select * from hr_judgment_points where find_in_set(#{projectId},projectId)",
+            "select * from hr_trading_judgment_points where find_in_set(#{projectId},project_id)",
             "</script>"})
     List<JudgmentPoints> getJudgmentPointsPs(@Param("projectId") Integer projectId);
 
diff --git a/src/main/java/com/yipin/liuwanr/service/ProjectManagementService.java b/src/main/java/com/yipin/liuwanr/service/ProjectManagementService.java
index 9b86f31..267c8b1 100644
--- a/src/main/java/com/yipin/liuwanr/service/ProjectManagementService.java
+++ b/src/main/java/com/yipin/liuwanr/service/ProjectManagementService.java
@@ -456,11 +456,11 @@ public class ProjectManagementService {
             }*/
 
             //根据projectId查询判分点信息
-            List<JudgmentPoints> judgmentPointsList = mapper.getJudgmentPointsPs(projectId);
+            List<TradingJudgmentPoints> judgmentPointsList = mapper.getJudgmentPoints(projectId);
             Integer size = judgmentPointsList.size();
             for (int i = 0; i<size; i++){
-                JudgmentPoints tradingJudgmentPoints = judgmentPointsList.get(i);
-                Integer judgmentPointsId = tradingJudgmentPoints.getJudgmentPointsId();
+                TradingJudgmentPoints tradingJudgmentPoints = judgmentPointsList.get(i);
+                Integer judgmentPointsId = tradingJudgmentPoints.getId();
                 Integer systemId = tradingJudgmentPoints.getSystemId();
                 scoreIndexList = mapper.getScore(judgmentPointsId,systemId,projectId);
                 score.put("scoreIndexList"+i,scoreIndexList);