From 700a1db0965f9a251f053b3f16733bca6d627eb9 Mon Sep 17 00:00:00 2001
From: "jiakun.lin" <mzh820631607@163.com>
Date: Wed, 17 Mar 2021 16:27:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E7=BB=A9=E7=AE=A1=E7=90=86=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=A0=87=E8=AF=86=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/msdw/tms/dao/ProjectHiddenDao.java   |  3 +++
 src/main/java/com/msdw/tms/entity/ResultsEntity.java   |  4 +++-
 .../service/impl/AchievementManagementServiceImpl.java |  8 ++++++++
 src/main/resources/mapper/tms/ProjectHiddenDao.xml     | 10 +++++++++-
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/msdw/tms/dao/ProjectHiddenDao.java b/src/main/java/com/msdw/tms/dao/ProjectHiddenDao.java
index 75566f6..ea4ef92 100644
--- a/src/main/java/com/msdw/tms/dao/ProjectHiddenDao.java
+++ b/src/main/java/com/msdw/tms/dao/ProjectHiddenDao.java
@@ -7,4 +7,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ProjectHiddenDao extends BaseMapper<ProjectHiddenEntity> {
 
+    ProjectHiddenEntity selectByProjectId(Integer projectId);
+
+    ProjectHiddenEntity selectByTeachId(Integer teachId);
 }
diff --git a/src/main/java/com/msdw/tms/entity/ResultsEntity.java b/src/main/java/com/msdw/tms/entity/ResultsEntity.java
index 4ec085d..653355a 100644
--- a/src/main/java/com/msdw/tms/entity/ResultsEntity.java
+++ b/src/main/java/com/msdw/tms/entity/ResultsEntity.java
@@ -48,8 +48,10 @@ public class ResultsEntity{
 	//实验名称
 	private String experimentalName;
 
+	//是否删除
 	private Integer isdel;
 
-
+	//是否隐藏项目实体类
+	private ProjectHiddenEntity projectHiddenEntity;
 
 }
diff --git a/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java
index c1c96e2..065cf3a 100644
--- a/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java
+++ b/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java
@@ -96,9 +96,14 @@ public class AchievementManagementServiceImpl extends ServiceImpl<AchievementMan
         for (ResultsEntity entity : list) {
             Integer number = achievementManagementDao.getImitationAchievement(entity.getProjectId()).size();
             entity.setNumber(number);
+
+            ProjectHiddenEntity hiddenEntity = projectHiddenDao.selectByProjectId(entity.getProjectId());
+            entity.setProjectHiddenEntity(hiddenEntity);
         }
 
 
+
+
         return list;
     }
 
@@ -114,6 +119,9 @@ public class AchievementManagementServiceImpl extends ServiceImpl<AchievementMan
         for (ResultsEntity entity : newList) {
             Integer number = achievementManagementDao.getTeachAchievement(entity.getId()).size();
             entity.setNumber(number);
+
+            ProjectHiddenEntity hiddenEntity = projectHiddenDao.selectByTeachId(entity.getId());
+            entity.setProjectHiddenEntity(hiddenEntity);
         }
         return newList;
     }
diff --git a/src/main/resources/mapper/tms/ProjectHiddenDao.xml b/src/main/resources/mapper/tms/ProjectHiddenDao.xml
index 4b8bc59..0c29f1b 100644
--- a/src/main/resources/mapper/tms/ProjectHiddenDao.xml
+++ b/src/main/resources/mapper/tms/ProjectHiddenDao.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.msdw.tms.dao.ProjectDao">
+<mapper namespace="com.msdw.tms.dao.ProjectHiddenDao">
+
+    <select id="selectByProjectId"  resultType="com.msdw.tms.entity.ProjectHiddenEntity">
+        SELECT is_hidden FROM tms_project_hidden WHERE project_id = #{projectId}
+    </select>
+
+    <select id="selectByTeachId"  resultType="com.msdw.tms.entity.ProjectHiddenEntity">
+        SELECT is_hidden FROM tms_project_hidden WHERE teach_id = #{teachId}
+    </select>
 
 </mapper>
\ No newline at end of file