Merge pull request 'develop' (#21) from develop into master

Reviewed-on: #21

.run/wyj [clean,spring-boot_run].run.xml

@@ -0,0 +1,48 @@
+<component name="ProjectRunConfigurationManager">
+    <configuration default="false" name="wyj [clean,spring-boot:run]" type="MavenRunConfiguration" factoryName="Maven" nameIsGenerated="true">
+        <MavenSettings>
+            <option name="myGeneralSettings" />
+            <option name="myRunnerSettings">
+                <MavenRunnerSettings>
+                    <option name="delegateBuildToMaven" value="false" />
+                    <option name="environmentProperties">
+                        <map />
+                    </option>
+                    <option name="jreName" value="corretto-17" />
+                    <option name="mavenProperties">
+                        <map />
+                    </option>
+                    <option name="passParentEnv" value="true" />
+                    <option name="runMavenInBackground" value="true" />
+                    <option name="skipTests" value="false" />
+                    <option name="vmOptions" value="-Dfile.encoding=GB2312" />
+                </MavenRunnerSettings>
+            </option>
+            <option name="myRunnerParameters">
+                <MavenRunnerParameters>
+                    <option name="cmdOptions" />
+                    <option name="profiles">
+                        <set />
+                    </option>
+                    <option name="goals">
+                        <list>
+                            <option value="clean" />
+                            <option value="spring-boot:run" />
+                        </list>
+                    </option>
+                    <option name="multimoduleDir" />
+                    <option name="pomFileName" />
+                    <option name="profilesMap">
+                        <map />
+                    </option>
+                    <option name="projectsCmdOptionValues">
+                        <list />
+                    </option>
+                    <option name="resolveToWorkspace" value="false" />
+                    <option name="workingDirPath" value="$PROJECT_DIR$" />
+                </MavenRunnerParameters>
+            </option>
+        </MavenSettings>
+        <method v="2" />
+    </configuration>
+</component>

pom.xml

@@ -17,6 +17,7 @@
         <java.version>1.8</java.version>
         <skipTests>true</skipTests>
     </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -166,10 +167,12 @@
                             <goal>timestamp-property</goal>
                         </goals>
                         <configuration>
+                            
                             <name>buildDate</name>
                             <pattern>yyyy-MM-dd HH:mm:ss</pattern>
                             <locale>en_US</locale>
                             <timeZone>GMT+8</timeZone>
+
                         </configuration>
                     </execution>
                 </executions>

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

@@ -51,12 +51,14 @@ public class ProjectController {
 
 
     /**
+     * 获取子模块详细
+     *
      * @param id 要查询的 id
      * @return {@link BaseResponse}
      */
-    @GetMapping("/project/getwork/id")
+    @GetMapping("/project/module/id")
-    public BaseResponse projectWorkGetById(@RequestParam Integer id) {
+    public BaseResponse projectModuleGetById(@RequestParam Integer id) {
-        return projectService.getWorkById(id);
+        return projectService.getModuleById(id);
     }
 
     /**
@@ -110,15 +112,15 @@ public class ProjectController {
      * @return {@link BaseResponse}
      */
     @GetMapping("/project/child/get")
-    public BaseResponse projectWorkGet(
+    public BaseResponse projectModuleGet(
             @RequestParam(required = false) List<String> tags,
-            @RequestParam(required = false) List<String> isFinish,
+            @RequestParam(required = false) List<String> status,
             @RequestParam(required = false) Integer is,
             @RequestParam(required = false, defaultValue = "1") Integer page,
             @RequestParam(required = false, defaultValue = "10") Integer pageSize,
             HttpServletRequest request
     ) {
-        return projectService.workGet(request, tags, isFinish, is, page, pageSize);
+        return projectService.workGet(request, tags, status, is, page, pageSize);
     }
 
     /**
@@ -179,6 +181,42 @@ public class ProjectController {
         return projectService.projectEdit(request, projectEdit, projectId);
     }
 
+
+    /**
+     * 获取我负责的项目
+     *
+     * @param page  页数
+     * @param pageSize  每页大小
+     * @param request
+     * @return
+     */
+    @GetMapping("/project/my/get")
+    public BaseResponse projectMyGet(
+            @RequestParam(required = false, defaultValue = "1") Integer page,
+            @RequestParam(required = false, defaultValue = "10") Integer pageSize,
+            HttpServletRequest request) {
+        return projectService.getPrincipalProject(page, pageSize, request);
+    }
+
+    /**
+     *
+     * 获取我参与的项目
+     *
+     * @param page  页数
+     * @param pageSize  每页大小
+     * @param request
+     * @return
+     */
+    @GetMapping("/project/participate/get")
+public BaseResponse projectParticipateGet(
+            @RequestParam(required = false, defaultValue = "1") Integer page,
+            @RequestParam(required = false, defaultValue = "10") Integer pageSize,
+            HttpServletRequest request) {
+        return projectService.getParticipateProject(page, pageSize, request);
+    }
+
+
+
     /**
      * 子系统子模块的增加
      *
@@ -219,7 +257,7 @@ public class ProjectController {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(ErrorCode.PARAMETER_ERROR, Processing.getValidatedErrorList(bindingResult));
         }
-        return ResultUtil.success(projectService.projectAdd(request, projectInfoVO));
+        return projectService.projectAdd(request, projectInfoVO);
     }
 
     /**
@@ -256,4 +294,32 @@ public class ProjectController {
     }
 
 
+    /**
+     *  删除子系统
+     *
+     * @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);
 
@@ -108,7 +113,7 @@ public interface ProjectMapper {
     List <Long> getMemberBySystemId(Integer id);
 
     @Select("select * from organize_oa.oa_project_modules "
-            + "where DATE(deadline) = DATE(#{threeDayLater}) and status = 0")
+            + "where DATE(dead_line) = DATE(#{threeDayLater}) and status != 'complete' ")
     List<ProjectModuleDO> getProjectWorkByTime(LocalDateTime threeDayLater);
 
 
@@ -126,11 +131,18 @@ public interface ProjectMapper {
 
 
     @Select("select * from organize_oa.oa_project_child where "
-            + "DATE (created_at) = DATE (#{threeDaysLater}) ")
+            + "DATE (dead_line) = DATE (#{threeDaysLater}) and status != 'complete' ")
     List<ProjectChildDO> getProjectChildByTime(LocalDateTime threeDaysLater);
 
 
     @Select("select * from organize_oa.oa_project_child where "
             + "id = #{id} and is_delete = 0")
     ProjectChildDO getProjectChildById(Integer id);
+
+
+    List<ProjectDO> getParticipateProject(Long userId);
+
+    void deleteProjectChild(Long id1);
+
+    void deleteProjectModule(Long id1);
 }

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

@@ -23,6 +23,7 @@ public class ProjectInfoVO {
     private String files;
     private Timestamp beginTime;
     private Timestamp completeTime;
+    @NotNull(message = "截止时间不能为空")
     private Timestamp deadLine;
     private String status;
 

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/ProjectSimpleVO.java

@@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.sql.Date;
+
 @Data
 @Accessors(chain = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
@@ -14,5 +16,8 @@ public class ProjectSimpleVO {
     private Long cycle;
     private Long workLoad;
     private Long id;
+    private String files;
+    private String status;
+    private Date deadLine;
     private String tags;
 }

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

@@ -41,9 +41,9 @@ public interface ProjectService {
 
     BaseResponse projectFileGet(HttpServletRequest request, Long projectId);
 
-    BaseResponse getById(Integer id);
+    BaseResponse getProjectModuleById(Integer id);
 
-    BaseResponse getWorkById(Integer id);
+    BaseResponse getModuleById(Integer id);
 
     BaseResponse projectPrincipalGet();
 
@@ -57,4 +57,14 @@ public interface ProjectService {
      * @return 根据用户所属角色组的不同返回不同的内容
      */
     BaseResponse getProjectById(HttpServletRequest request, Long projectId);
+
+    BaseResponse getById(Integer id);
+
+    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/MessageServiceImpl.java

@@ -1,4 +1,6 @@
 package com.jsl.oa.services.impl;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.jsl.oa.dao.UserDAO;
 import com.jsl.oa.mapper.MessageMapper;
 import com.jsl.oa.mapper.ProjectMapper;
@@ -7,7 +9,6 @@ import com.jsl.oa.model.dodata.ProjectChildDO;
 import com.jsl.oa.model.dodata.ProjectModuleDO;
 import com.jsl.oa.model.vodata.MessageAddVO;
 import com.jsl.oa.model.vodata.MessageGetVO;
-import com.jsl.oa.model.vodata.PageBean;
 import com.jsl.oa.services.MessageService;
 import com.jsl.oa.utils.*;
 import lombok.RequiredArgsConstructor;
@@ -67,6 +68,7 @@ public class MessageServiceImpl implements MessageService {
             endTime = LocalDateTime.now();
             beginTime = endTime.minusDays(30);
         }
+        PageHelper.startPage(page, pageSize);
         List<MessageDO> messageDOList = messageMapper.page(beginTime, endTime, uid);
         //封装返回数据
         List<MessageGetVO> messageGetVOList = new ArrayList<>();
@@ -89,16 +91,8 @@ public class MessageServiceImpl implements MessageService {
         }
 
         //分页返回
-        int start = (page - 1) * pageSize;
+        PageInfo<MessageGetVO> pageInfo = new PageInfo<>(messageGetVOList);
-        int end = start + pageSize;
+        return ResultUtil.success(pageInfo);
-        List<MessageGetVO> pageData = messageGetVOList.subList(start,
-                Math.min(end, messageGetVOList.size()));
-        PageBean<MessageGetVO> pageBean = new PageBean<>();
-        pageBean.setTotalCount(messageGetVOList.size());
-        pageBean.setCurrentPage(page);
-        pageBean.setPageSize(pageSize);
-        pageBean.setList(pageData);
-        return ResultUtil.success(pageBean);
     }
 
     /**

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

@@ -3,6 +3,8 @@ package com.jsl.oa.services.impl;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.jsl.oa.annotations.NeedPermission;
 import com.jsl.oa.dao.ProjectDAO;
 import com.jsl.oa.dao.RoleDAO;
@@ -10,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;
@@ -30,6 +34,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
+import static java.lang.System.*;
+
 /**
  * <h1>项目服务层实现类</h1>
  * <hr/>
@@ -51,13 +57,19 @@ 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) {
+        // 判断权限
+        if (!Processing.checkUserIsPrincipal(request, roleDAO)) {
+            return ResultUtil.error(ErrorCode.NOT_PERMISSION);
+        }
+
         if (projectAdd.getDescription().isEmpty()) {
             projectAdd.setDescription("{}");
         } else {
-            projectAdd.setDescription("{\"description\":\" " + projectAdd.getDescription() + "\"}");
+            projectAdd.setDescription("{\"描述\":\" " + projectAdd.getDescription() + "\"}");
         }
         String tags = projectAdd.getTags();
         String[] split = tags.split(",");
@@ -92,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);
@@ -147,6 +159,11 @@ public class ProjectServiceImpl implements ProjectService {
 
     }
 
+    @Override
+    public BaseResponse getProjectModuleById(Integer id) {
+        return null;
+    }
+
     @Override
     public BaseResponse getById(Integer id) {
         ProjectDO projectDO = projectMapper.tgetProjectById(id);
@@ -154,10 +171,79 @@ public class ProjectServiceImpl implements ProjectService {
     }
 
     @Override
-    public BaseResponse getWorkById(Integer id) {
+    public BaseResponse getPrincipalProject(Integer page, Integer pageSize, HttpServletRequest request) {
-        ProjectWorkSimpleVO projectWorkSimpleVO = projectMapper.getWorkById(id);
+        //获取用户id
+        Long userId = Processing.getAuthHeaderToUserId(request);
 
-        projectWorkSimpleVO.setPrincipalUser(userDAO.getUserById(projectMapper.getPid(id)).getUsername());
+        PageHelper.startPage(page, pageSize);
+        List<ProjectDO> projectDOList = projectDAO.get(userId, null, null);
+
+        List<ProjectSimpleVO> projectSimpleVOList = new ArrayList<>();
+        for (ProjectDO projectDO : projectDOList) {
+            ProjectSimpleVO projectSimpleVO1 = new ProjectSimpleVO();
+            Processing.projectTosimply(projectSimpleVO1, projectDO, userDAO, objectMapper);
+            projectSimpleVOList.add(projectSimpleVO1);
+        }
+        //分页返回
+        PageInfo<ProjectSimpleVO> pageInfo = new PageInfo<>(projectSimpleVOList);
+        return ResultUtil.success(pageInfo);
+    }
+
+    @Override
+    public BaseResponse getParticipateProject(Integer page, Integer pageSize, HttpServletRequest request) {
+        //获取用户id
+        Long userId = Processing.getAuthHeaderToUserId(request);
+
+        PageHelper.startPage(page, pageSize);
+        List<ProjectDO> projectDOList = projectMapper.getParticipateProject(userId);
+
+        List<ProjectSimpleVO> projectSimpleVOList = new ArrayList<>();
+        for (ProjectDO projectDO : projectDOList) {
+            ProjectSimpleVO projectSimpleVO1 = new ProjectSimpleVO();
+            Processing.projectTosimply(projectSimpleVO1, projectDO, userDAO, objectMapper);
+            projectSimpleVOList.add(projectSimpleVO1);
+        }
+        //分页返回
+        PageInfo<ProjectSimpleVO> pageInfo = new PageInfo<>(projectSimpleVOList);
+        return ResultUtil.success(pageInfo);
+    }
+
+    @Override
+    public BaseResponse projectChildDelete(HttpServletRequest request, List<Long> 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();
+    }
+
+
+    @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 {
@@ -172,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
@@ -247,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)) {
@@ -294,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();
@@ -312,9 +403,10 @@ public class ProjectServiceImpl implements ProjectService {
             Integer page,
             Integer pageSize
     ) {
-        //获取用户
+        //获取用户id
         Long userId = Processing.getAuthHeaderToUserId(request);
 
+        PageHelper.startPage(page, pageSize);
         List<ProjectDO> projectDOList = projectDAO.workget(userId, tags, isFinish, is);
         List<ProjectSimpleVO> projectSimpleVOList = new ArrayList<>();
         for (ProjectDO projectDO : projectDOList) {
@@ -323,12 +415,8 @@ public class ProjectServiceImpl implements ProjectService {
             projectSimpleVOList.add(projectSimpleVO1);
         }
         //分页返回
-        int start = (page - 1) * pageSize;
+        PageInfo<ProjectSimpleVO> pageInfo = new PageInfo<>(projectSimpleVOList);
-        int end = start + pageSize;
+        return ResultUtil.success(pageInfo);
-        List<ProjectSimpleVO> pageData = projectSimpleVOList.subList(start,
-                Math.min(end, projectSimpleVOList.size()));
-
-        return ResultUtil.success(pageData);
 
     }
 

src/main/java/com/jsl/oa/utils/Processing.java

@@ -341,6 +341,9 @@ public class Processing {
         projectSimpleVO.setTags(projectDO.getTags());
         projectSimpleVO.setCycle(projectDO.getCycle().longValue());
         projectSimpleVO.setWorkLoad(projectDO.getWorkLoad().longValue());
+        projectSimpleVO.setFiles(projectDO.getFiles());
+        projectSimpleVO.setStatus(projectDO.getStatus());
+        projectSimpleVO.setDeadLine(projectDO.getDeadline());
         projectSimpleVO.setPrincipalUser(userDAO.getUserById(projectDO.getPrincipalId()).getUsername());
         // 解析JSON字符串
         JsonNode rootNode = null;

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
@@ -102,7 +110,7 @@
         <if test="is != null">
             (principal_id = #{userId} and is_delete=false) or
         </if>
-        id in(select project_id from organize_oa.oa_project_child where is_delete=false and (principal_id=#{userId}) and oa_project.status in
+        id in(select project_id from organize_oa.oa_project_child where is_delete=false and (principal_id=#{userId}) and status in
         <foreach collection="isFinish" item="Finish" separator="," open="(" close="))">
             #{Finish}
         </foreach>
@@ -151,7 +159,12 @@
             #{Finish}
         </foreach>
     </select>
-
+    <select id="getParticipateProject" resultType="com.jsl.oa.model.dodata.ProjectDO">
+        select * from organize_oa.oa_project where id in
+        (select project_id from organize_oa.oa_project_child where id in
+        (select project_child_id from organize_oa.oa_project_modules
+                    where oa_project_modules.principal_id=#{userId} and is_delete=false) )
+    </select>
 
 
 </mapper>

src/main/resources/mysql/oa_project_child.sql

@@ -13,6 +13,8 @@ create table oa_project_child
     created_at    timestamp    default CURRENT_TIMESTAMP not null comment '创建时间',
     updated_at    timestamp                              null comment '更新时间',
     is_delete     tinyint(1)   default 0                 not null comment '项目是否删除',
+    dead_line     timestamp                              not null comment '子系统的截止时间',
+    status        varchar(8)   default 'progress'        not null comment '系统状态（draft: 草稿，progress: 进行，pause: 暂停，abnormal: 异常，complete: 完成）',
     constraint oa_project_child_oa_user_id_fk
         foreign key (principal_id) references oa_user (id)
             on update cascade

src/main/resources/mysql/oa_project_modules.sql

@@ -11,6 +11,8 @@ create table oa_project_modules
     created_at       timestamp    default CURRENT_TIMESTAMP not null comment '创建时间',
     updated_at       timestamp                              null comment '更新时间',
     is_delete        tinyint(1)   default 0                 not null comment '项目是否删除',
+    dead_line        timestamp                              not null comment '子模块的截止时间',
+    status        varchar(8)   default 'progress'        not null comment '模块状态（draft: 草稿，progress: 进行，pause: 暂停，abnormal: 异常，complete: 完成）',
     constraint oa_project_modules_oa_user_id_fk
         foreign key (principal_id) references oa_user (id)
             on update cascade