From fa3ccd26be9d1eb0ca40e242e199457e8ec10a08 Mon Sep 17 00:00:00 2001
From: "jiakun.lin" <mzh820631607@163.com>
Date: Thu, 18 Mar 2021 10:57:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E7=BB=A9=E5=88=97=E8=A1=A8=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E6=95=B0=E6=8D=AE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/msdw/tms/TmsApplication.java             | 2 +-
 src/main/java/com/msdw/tms/entity/ResultsEntity.java       | 3 ---
 .../tms/service/impl/AchievementManagementServiceImpl.java | 6 ------
 src/main/resources/mapper/tms/AchievementManagementDao.xml | 7 ++++++-
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/msdw/tms/TmsApplication.java b/src/main/java/com/msdw/tms/TmsApplication.java
index 1e5e101..e2715d0 100644
--- a/src/main/java/com/msdw/tms/TmsApplication.java
+++ b/src/main/java/com/msdw/tms/TmsApplication.java
@@ -6,7 +6,7 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
-//@EnableScheduling//定时任务
+@EnableScheduling//定时任务
 @SpringBootApplication
 public class TmsApplication extends SpringBootServletInitializer {
 
diff --git a/src/main/java/com/msdw/tms/entity/ResultsEntity.java b/src/main/java/com/msdw/tms/entity/ResultsEntity.java
index 653355a..f52b044 100644
--- a/src/main/java/com/msdw/tms/entity/ResultsEntity.java
+++ b/src/main/java/com/msdw/tms/entity/ResultsEntity.java
@@ -51,7 +51,4 @@ public class ResultsEntity{
 	//是否删除
 	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 b21b766..958d62c 100644
--- a/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java
+++ b/src/main/java/com/msdw/tms/service/impl/AchievementManagementServiceImpl.java
@@ -100,9 +100,6 @@ 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);
         }
 /*
         Date begin = new Date();
@@ -144,9 +141,6 @@ 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);
         }
 
         PageInfo info = new PageInfo(newList);
diff --git a/src/main/resources/mapper/tms/AchievementManagementDao.xml b/src/main/resources/mapper/tms/AchievementManagementDao.xml
index bb2f4b6..9479928 100644
--- a/src/main/resources/mapper/tms/AchievementManagementDao.xml
+++ b/src/main/resources/mapper/tms/AchievementManagementDao.xml
@@ -442,9 +442,11 @@
         hpm.isdel
         FROM
         hr_project_management hpm
+        LEFT JOIN
+        tms_project_hidden tph on hpm.projectId = tph.project_id
         WHERE systemId = #{systemId}
         AND hpm.projectPermissions = #{projectPermissions}
-
+        AND tph.is_hidden is NULL
         <if test="searchContant!=null and searchContant!=''">and hpm.projectName like concat('%',#{searchContant},'%')
         </if>
         <if test="startTime!=null and startTime!='' and endTime!=null and endTime != ''">and hpm.creationTime between
@@ -500,8 +502,11 @@
         FROM
         tms_experimental_teaching et inner join
         hr_project_management pm on et.project_id = pm.projectId
+        LEFT JOIN
+        tms_project_hidden tph on et.id = tph.teach_id
         WHERE
         user_id = #{userId}
+        AND tph.is_hidden is NULL
         /*AND pm.isdel = 0*/
         <if test="searchContant!=null and searchContant!=''">and et.experimental_class_name like
             concat('%',#{searchContant},'%') or et.experimental_name like concat('%',#{searchContant},'%') or