fix:查询子模块，删除子模块子系统

src/main/java/com/jsl/oa/controllers/ProjectController.java

@@ -51,6 +51,8 @@ public class ProjectController {
 
 
     /**
+     * 获取子模块详细
+     *
      * @param id 要查询的 id
      * @return {@link BaseResponse}
      */
@@ -292,4 +294,32 @@ public BaseResponse projectParticipateGet(
     }
 
 
+    /**
+     *  删除子系统
+     *
+     * @param id
+     * @param request
+     * @return
+     */
+    @DeleteMapping("/project/child/delete")
+    public BaseResponse projectChildDelete(
+            @RequestParam List<Long> id,
+            HttpServletRequest request) {
+        if (id == null) {
+            return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
+        }
+        return projectService.projectChildDelete(request, id);
+    }
+
+    @DeleteMapping("/project/module/delete")
+    public BaseResponse projectModuleDelete(
+            @RequestParam List<Long> id,
+            HttpServletRequest request) {
+        if (id == null) {
+            return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
+        }
+        return projectService.projectModuleDelete(request, id);
+    }
+
+
 }

src/main/java/com/jsl/oa/mapper/ModuleMapper.java

@@ -1,5 +1,6 @@
 package com.jsl.oa.mapper;
 
+import com.jsl.oa.model.dodata.ProjectChildDO;
 import com.jsl.oa.model.dodata.ProjectModuleDO;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
@@ -12,14 +13,14 @@ public interface ModuleMapper {
 
 
 
-    List<ProjectModuleDO> getByProjectId(Integer projectId, Long userId, int is);
+    List<ProjectChildDO> getByProjectId(Integer projectId, Long userId, int is);
 
     List<ProjectModuleDO> getBySysId(Integer sysId, Long userId, int is);
 
     @Select("select principal_id from organize_oa.oa_project where id=#{projectId}")
     Long getPidByProjectid(Integer projectId);
 
-    @Select("select principal_id from organize_oa.oa_project_work where id=#{sysId}")
+    @Select("select principal_id from organize_oa.oa_project_child where id=#{sysId}")
     Long getPidBySysid(Integer sysId);
 
     @Delete("DELETE FROM organize_oa.oa_project_work WHERE id = #{id}")
@@ -29,6 +30,6 @@ public interface ModuleMapper {
     List<ProjectModuleDO> getAllMoudleByPid(Long id);
 
     @Select("select principal_id from organize_oa.oa_project where id=(select project_id "
-            + "from organize_oa.oa_project_work where oa_project_work.id = #{sysId})")
+            + "from organize_oa.oa_project_child where id = #{sysId})")
     Long getPridBySysyid(Integer sysId);
 }

src/main/java/com/jsl/oa/mapper/ProjectMapper.java

@@ -90,14 +90,19 @@ public interface ProjectMapper {
     @Select("select * from organize_oa.oa_project_modules where id=#{id}")
     ProjectModuleDO getModuleById(Integer id);
 
-    @Select("select principal_id from organize_oa.oa_project_work where id=#{pid}")
+    @Select("select principal_id from organize_oa.oa_project where id="
-    Long getPirIdbyWorkid(Long pid);
+            + "(select project_id from organize_oa.oa_project_child where id=#{id})")
+    Long getPirIdbyId(Long id);
 
-    @Select("select principal_id from organize_oa.oa_project_modules where project_child_id=#{id} "
+    @Select("select principal_id from organize_oa.oa_project_child where id="
-            + "AND is_delete = 0")
+            + "(select project_child_id from organize_oa.oa_project_modules where id=#{id})")
+    Long getPirTdByModuleId(Long id);
+
+
+    @Select("select principal_id from organize_oa.oa_project_modules where id=#{id} ")
     Long getPid(Integer id);
 
-    @Select("select * from organize_oa.oa_project_work where id=#{id} "
+    @Select("select * from organize_oa.oa_project_child where id=#{id} "
             + "AND is_delete = 0")
     ProjectModuleDO getProjectWorkById(Long id);
 
@@ -136,4 +141,8 @@ public interface ProjectMapper {
 
 
     List<ProjectDO> getParticipateProject(Long userId);
+
+    void deleteProjectChild(Long id1);
+
+    void deleteProjectModule(Long id1);
 }

src/main/java/com/jsl/oa/model/vodata/ProjectModuleSimpleVO.java

@@ -0,0 +1,21 @@
+package com.jsl.oa.model.vodata;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.sql.Timestamp;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProjectModuleSimpleVO {
+    private String name;
+    private String description;
+    private Integer workLoad;
+    private Timestamp deadLine;
+    private String status;
+    private String principalUser;
+
+}

src/main/java/com/jsl/oa/model/vodata/ProjectWorkSimpleVO.java

@@ -13,14 +13,14 @@ public class ProjectWorkSimpleVO {
     private String name;
     private Long principalId;
     private String principalUser;
-    private Integer isFinish;
     private String description;
     private Long cycle;
     private Long projectId;
     private Long workLoad;
     private Long id;
     private String tags;
-    private Integer status;
+    private String status;
+    private Timestamp deadLine;
     private Timestamp beginTime;
     private Timestamp completeTime;
 }

src/main/java/com/jsl/oa/services/ProjectService.java

@@ -63,4 +63,8 @@ public interface ProjectService {
     BaseResponse getPrincipalProject(Integer page, Integer pageSize, HttpServletRequest request);
 
     BaseResponse getParticipateProject(Integer page, Integer pageSize, HttpServletRequest request);
+
+    BaseResponse projectChildDelete(HttpServletRequest request, List<Long> id);
+
+    BaseResponse projectModuleDelete(HttpServletRequest request, List<Long> id);
 }

src/main/java/com/jsl/oa/services/impl/ModuleServiceImpl.java

@@ -4,6 +4,7 @@ import com.jsl.oa.dao.ProjectDAO;
 import com.jsl.oa.dao.RoleDAO;
 import com.jsl.oa.dao.UserDAO;
 import com.jsl.oa.mapper.ModuleMapper;
+import com.jsl.oa.model.dodata.ProjectChildDO;
 import com.jsl.oa.model.dodata.ProjectModuleDO;
 import com.jsl.oa.model.vodata.ProjectWorkAndNameVO;
 import com.jsl.oa.services.ModuleService;
@@ -42,7 +43,7 @@ public class ModuleServiceImpl implements ModuleService {
             is = 0;
         }
 
-        List<ProjectModuleDO> projectWorkDOList = moduleMapper.getByProjectId(projectId, userId, is);
+        List<ProjectChildDO> projectWorkDOList = moduleMapper.getByProjectId(projectId, userId, is);
         return ResultUtil.success(projectWorkDOList);
     }
 

src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java

@@ -12,10 +12,12 @@ import com.jsl.oa.dao.UserDAO;
 import com.jsl.oa.mapper.ProjectMapper;
 import com.jsl.oa.mapper.UserMapper;
 import com.jsl.oa.model.dodata.ProjectDO;
+import com.jsl.oa.model.dodata.ProjectModuleDO;
 import com.jsl.oa.model.dodata.UserDO;
 import com.jsl.oa.model.dodata.info.ProjectShowDO;
 import com.jsl.oa.model.vodata.*;
 import com.jsl.oa.model.vodata.business.info.ProjectShowVO;
+import com.jsl.oa.services.MessageService;
 import com.jsl.oa.services.ProjectService;
 import com.jsl.oa.utils.BaseResponse;
 import com.jsl.oa.utils.ErrorCode;
@@ -32,6 +34,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
+import static java.lang.System.*;
+
 /**
  * <h1>项目服务层实现类</h1>
  * <hr/>
@@ -53,6 +57,7 @@ public class ProjectServiceImpl implements ProjectService {
     private final UserDAO userDAO;
     private final ObjectMapper objectMapper;
     private final RoleDAO roleDAO;
+    private final MessageService messageService;
 
     @Override
     public BaseResponse projectAdd(HttpServletRequest request, ProjectInfoVO projectAdd) {
@@ -99,7 +104,7 @@ public class ProjectServiceImpl implements ProjectService {
             }
         } else {
             //是否是子系统的负责人
-            if (Objects.equals(userId, projectMapper.getPirIdbyWorkid(projectWorkVO.getPid()))) {
+            if (Objects.equals(userId, projectMapper.getPirIdbyId(projectWorkVO.getPid()))) {
                 projectDAO.projectWorkAdd(projectWorkVO);
             } else {
                 return ResultUtil.error(ErrorCode.NOT_PERMISSION);
@@ -204,10 +209,41 @@ public class ProjectServiceImpl implements ProjectService {
     }
 
     @Override
-    public BaseResponse getModuleById(Integer id) {
+    public BaseResponse projectChildDelete(HttpServletRequest request, List<Long> id) {
-        ProjectWorkSimpleVO projectWorkSimpleVO = projectMapper.getWorkById(id);
+        //判断是否是项目负责人
+        for (Long id1 : id) {
+            if (!Objects.equals(Processing.getAuthHeaderToUserId(request), projectMapper.getPirIdbyId(id1))) {
+                return ResultUtil.error(ErrorCode.NOT_PERMISSION);
+            } else {
+                projectMapper.deleteProjectChild(id1);
+            }
+        }
+        return ResultUtil.success();
+    }
 
-        projectWorkSimpleVO.setPrincipalUser(userDAO.getUserById(projectMapper.getPid(id)).getUsername());
+
+    @Override
+    public BaseResponse projectModuleDelete(HttpServletRequest request, List<Long> id) {
+        //判断是否是子系统负责人
+        for (Long id1 : id) {
+            if (!Objects.equals(Processing.getAuthHeaderToUserId(request), projectMapper.getPirTdByModuleId(id1))) {
+                return ResultUtil.error(ErrorCode.NOT_PERMISSION);
+            } else {
+                Integer projectChildId = projectMapper.getModuleById(id1.intValue()).getProjectChildId().intValue();
+                out.println(projectChildId);
+                Integer projectId = projectMapper.getWorkById(projectChildId).getProjectId().intValue();
+                out.println(projectId);
+                projectMapper.deleteProjectModule(id1);
+                messageService.messageAdd(projectId, projectChildId, id1.intValue(), 1, request);
+
+            }
+        }
+        return ResultUtil.success();
+    }
+
+    @Override
+    public BaseResponse getModuleById(Integer id) {
+        ProjectModuleDO projectWorkSimpleVO = projectMapper.getModuleById(id);
         // 解析JSON字符串
         JsonNode rootNode;
         try {
@@ -222,7 +258,12 @@ public class ProjectServiceImpl implements ProjectService {
         } catch (JsonProcessingException ignored) {
 
         }
-        return ResultUtil.success(projectWorkSimpleVO);
+        ProjectModuleSimpleVO projectModuleSimpleVO = new ProjectModuleSimpleVO();
+        projectModuleSimpleVO.setPrincipalUser(userDAO.getUserById(projectMapper.getPid(id)).getUsername());
+        out.println("准备拷贝");
+        Processing.copyProperties(projectWorkSimpleVO, projectModuleSimpleVO);
+        out.println("拷贝wan");
+        return ResultUtil.success(projectModuleSimpleVO);
     }
 
     @Override
@@ -297,7 +338,7 @@ public class ProjectServiceImpl implements ProjectService {
                 .setStatus(projectShowVO.getStatus())
                 .setIsActive(projectShowVO.getIsActive())
                 .setAuthor(userDO.getUsername())
-                .setCreatedAt(new Timestamp(System.currentTimeMillis()).toString());
+                .setCreatedAt(new Timestamp(currentTimeMillis()).toString());
         projectShowDO.getData().add(projectShow);
         // 保存展示
         if (projectDAO.setProjectShow(projectShowDO)) {
@@ -344,7 +385,7 @@ public class ProjectServiceImpl implements ProjectService {
                 .setStatus(projectShowVO.getStatus())
                 .setIsActive(projectShowVO.getIsActive())
                 .setAuthor(userDO.getUsername())
-                .setUpdatedAt(new Timestamp(System.currentTimeMillis()).toString());
+                .setUpdatedAt(new Timestamp(currentTimeMillis()).toString());
         // 保存展示信息
         if (projectDAO.setProjectShow(projectShowDO)) {
             return ResultUtil.success();

src/main/resources/com/jsl/oa/mapper/ModuleMapper.xml

@@ -5,17 +5,17 @@
 
 <mapper namespace="com.jsl.oa.mapper.ModuleMapper">
 
-    <select id="getByProjectId" resultType="com.jsl.oa.model.dodata.ProjectModuleDO">
+    <select id="getByProjectId" resultType="com.jsl.oa.model.dodata.ProjectChildDO">
-        select * from organize_oa.oa_project_work where project_id=#{projectId} and type=0
+        select * from organize_oa.oa_project_child where project_id=#{projectId}
         <if test="is != 1 ">
-            and (principal_id=#{userId} or principal_id is null)
+            and (principal_id=#{userId})
         </if>
     </select>
 
     <select id="getBySysId" resultType="com.jsl.oa.model.dodata.ProjectModuleDO">
-        select * from organize_oa.oa_project_work where pid=#{sysId} and type=1
+        select * from organize_oa.oa_project_modules where project_child_id=#{sysId}
         <if test="is != 1 ">
-            and (principal_id=#{userId} or principal_id is null)
+            and (principal_id=#{userId})
         </if>
     </select>
 </mapper>

src/main/resources/com/jsl/oa/mapper/ProjectMapper.xml

@@ -47,6 +47,14 @@
         where id = #{id}
     </update>
 
+    <update id="deleteProjectChild">
+        update organize_oa.oa_project_child set is_delete=true where id=#{id1}
+    </update>
+
+    <update id="deleteProjectModule">
+        update organize_oa.oa_project_modules set is_delete=true where id=#{id1}
+    </update>
+
     <select id="getByTags" resultType="com.jsl.oa.model.dodata.ProjectDO">
         <if test="tags != null">
             select * from organize_oa.oa_project where is_delete=false and principal_id=#{userId}  and