From 2f156cf27acefb6eff97ecd25f702a1f061f4b77 Mon Sep 17 00:00:00 2001
From: mzh820631607 <mzh820631607@163.com>
Date: Fri, 30 Oct 2020 19:50:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E5=88=B6=E7=89=88=E4=BF=AE=E5=A4=8D-0?=
 =?UTF-8?q?.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ProjectManagementMapper.java       | 35 ++++++++++++++-----
 .../service/ProjectManagementService.java     |  6 ++++
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java b/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java
index f53a0c6..dbe638c 100644
--- a/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java
+++ b/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java
@@ -47,14 +47,10 @@ public interface ProjectManagementMapper {
      */
     @Select({"<script>",
 //            "select projectId,projectName,projectPermissions,founder,creationTime,state,knowledgePoints,experimentIntroduction from hr_project_management where isdel=0",
-            "select * from hr_project_management where isdel=0",
+            "select * from hr_project_management where (roleId NOT LIKE '%3%' AND isdel = 0)",
+            " <if test='userId!=null'>OR ( isdel = 0 AND userId = #{userId} )</if>",//教师端，一开始进入项目管理，看见自己创建的和其他人看见的
             " <if test='projectPermissions!=null'> and projectPermissions=#{projectPermissions}</if>",
-//            " <if test='founder!=null'> and founder=#{founder}</if>",
-//            " <if test='userId!=null'> and (userId=#{userId} or founder = 0)</if>",
-//            " <if test='userId==null and founder!=null '> and founder=#{founder}</if>",//服务端跳项目管理
-            " <if test='userId!=null'> and (userId=#{userId} or roleId not like '%3%')</if>",//教师端，一开始进入项目管理，看见自己创建的和其他人看见的
             " <if test='founder!=null'> and founder=#{founder}</if>",//教师选择创建人为系统
-//            " <if test='userId!=null and founder==1'> and userId=#{userId}</if>",//教师选则创建人为老师
            " <if test='state!=null'> and state=#{state}</if>",
            " <if test='systemId!=null'> and systemId=#{systemId}</if>",
            " <if test='projectName!=null'> and projectName like concat('%',#{projectName},'%')</if>",
@@ -79,8 +75,8 @@ public interface ProjectManagementMapper {
 //    List<ProjectManagement> queryManagements(ProjectManagement management);
 
     @Select({"<script>",
-            "select * from hr_project_management where isdel=0 and projectPermissions !=0",
-            " <if test='userId!=null'> and (userId=#{userId} or roleId not like '%3%')</if>",//教师端，一开始进入项目管理，看见自己创建的和其他人看见的
+            "select * from hr_project_management where (roleId NOT LIKE '%3%' AND isdel = 0 AND projectPermissions != 0)",
+            " <if test='userId!=null'>OR ( isdel = 0 AND projectPermissions != 0 AND userId = #{userId} )</if>",//教师端，一开始进入项目管理，看见自己创建的和其他人看见的
            " <if test='systemId!=null'> and systemId=#{systemId}</if>",
             " ORDER BY creationTime desc",
             "</script>"})
@@ -111,9 +107,21 @@ public interface ProjectManagementMapper {
      * @param projectId
      */
     @Update("<script>"
-            + "update hr_project_management set isdel=1 where projectId=#{projectId}"
+            + "update hr_project_management hpm ,tms_experimental_teaching tet " +
+            "set hpm.isdel=1 ,tet.is_del = 1 " +
+            "where hpm.projectId=#{projectId} and hpm.projectId = tet.project_id"
             + "</script>")
     void deleteProjectManagement(Integer projectId);
+//    202.10.29 标准版
+//    /**
+//     * 批量删除
+//     *
+//     * @param projectId
+//     */
+//    @Update("<script>"
+//            + "update hr_project_management set isdel=1 where projectId=#{projectId}"
+//            + "</script>")
+//    void deleteProjectManagement(Integer projectId);
 
 
     /**
@@ -308,4 +316,13 @@ public interface ProjectManagementMapper {
     Integer queryRoleId(Integer userId);
 
 
+    @Select("SELECT id FROM tms_experimental_teaching WHERE project_id =#{projectId}")
+    List<Integer> queryproject(Integer projectId);
+
+    @Update("<script>"
+            + "update hr_project_management " +
+            "set isdel=1 " +
+            "where projectId=#{projectId}"
+            + "</script>")
+    void daleteManegement(Integer id);
 }
diff --git a/src/main/java/com/yipin/liuwanr/service/ProjectManagementService.java b/src/main/java/com/yipin/liuwanr/service/ProjectManagementService.java
index 2a69546..250420f 100644
--- a/src/main/java/com/yipin/liuwanr/service/ProjectManagementService.java
+++ b/src/main/java/com/yipin/liuwanr/service/ProjectManagementService.java
@@ -180,6 +180,12 @@ public class ProjectManagementService {
             int size = projectId.size();
             for (int i = 0;i<size;i++){
                 Integer id = projectId.get(i);
+
+                List<Integer> result = mapper.queryproject(id);
+                if (result.size()==0){
+                    mapper.daleteManegement(id);
+                }
+
                 mapper.deleteProjectManagement(id);
             }
             resp.put("retcode", 200);