项目阶段

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectController.java

@@ -533,10 +533,11 @@ public class ProjectController {
         return projectService.batchSetParticipation(request,projectIdArray,userIds);
     }
     @RequestMapping("/changeCurrentStage")
-    public HttpRespMsg changeCurrentStage(Integer projectId,String currentStage){
+    public HttpRespMsg changeCurrentStage(Integer projectId,Integer currentStageId,String currentStageName){
         HttpRespMsg httpRespMsg=new HttpRespMsg();
         Project project = projectService.getById(projectId);
-        project.setCurrentStage(currentStage);
+        project.setCurrentStageId(currentStageId);
+        project.setCurrentStageName(currentStageName);
         if(projectService.updateById(project)){
             return httpRespMsg;
         }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectStageController.java

@@ -0,0 +1,83 @@
+package com.management.platform.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.management.platform.entity.Project;
+import com.management.platform.entity.ProjectStage;
+import com.management.platform.mapper.UserMapper;
+import com.management.platform.service.ProjectService;
+import com.management.platform.service.ProjectStageService;
+import com.management.platform.util.HttpRespMsg;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-07-18
+ */
+@RestController
+@RequestMapping("/project-stage")
+public class ProjectStageController {
+    @Autowired
+    private ProjectStageService projectStageService;
+    @Resource
+    private UserMapper userMapper;
+    @Resource
+    private ProjectService projectService;
+
+    @RequestMapping("/list")
+    public HttpRespMsg list(HttpServletRequest request){
+        HttpRespMsg httpRespMsg=new HttpRespMsg();
+        Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
+        List<ProjectStage> projectStageList = projectStageService.list(new QueryWrapper<ProjectStage>().eq("company_id", companyId));
+        httpRespMsg.data=projectStageList;
+        return httpRespMsg;
+    }
+    @RequestMapping("/addOrMod")
+    public HttpRespMsg addOrMod(ProjectStage projectStage, HttpServletRequest request){
+        HttpRespMsg httpRespMsg=new HttpRespMsg();
+        Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
+        projectStage.setCompanyId(companyId);
+        if(projectStage.getId()!=null){
+            int cut = projectStageService.count(new QueryWrapper<ProjectStage>().eq("project_stage_name", projectStage.getProjectStageName()).eq("company_id",companyId).ne("id",projectStage.getId()));
+            if(cut>0){
+                httpRespMsg.setError("阶段名称已存在");
+                return httpRespMsg;
+            }
+            projectStageService.updateById(projectStage);
+        }else {
+            int cut = projectStageService.count(new QueryWrapper<ProjectStage>().eq("project_stage_name", projectStage.getProjectStageName()).eq("company_id", companyId));
+            if(cut>0){
+                httpRespMsg.setError("阶段名称已存在");
+                return httpRespMsg;
+            }
+            projectStageService.save(projectStage);
+        }
+        return httpRespMsg;
+    }
+    @RequestMapping("/delete")
+    public HttpRespMsg delete(Integer id){
+        HttpRespMsg httpRespMsg =new HttpRespMsg();
+        int cut = projectService.count(new QueryWrapper<Project>().eq("current_stage_id", id));
+        if(cut>0){
+            httpRespMsg.setError("该阶段已被使用");
+            return httpRespMsg;
+        }
+        if(projectStageService.removeById(id)){
+            return httpRespMsg;
+        }
+        httpRespMsg.setError("参数异常");
+        return httpRespMsg;
+    }
+
+}
+

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/StagesController.java

@@ -2,24 +2,18 @@ package com.management.platform.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.api.R;
 import com.management.platform.entity.*;
 import com.management.platform.entity.vo.SysRichFunction;
 import com.management.platform.mapper.*;
 import com.management.platform.service.StagesService;
-import com.management.platform.service.TaskGroupService;
 import com.management.platform.service.TaskService;
 import com.management.platform.util.HttpRespMsg;
-import com.management.platform.util.ListUtil;
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDate;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -56,6 +50,8 @@ public class StagesController {
      */
     @RequestMapping("/save")
     public HttpRespMsg save(Stages item) {
+        String trim = item.getStagesName().trim();
+        item.setStagesName(trim);
         HttpRespMsg msg = new HttpRespMsg();
         //检查名称是否已经存在
         boolean findSameName = false;

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Project.java

@@ -21,7 +21,7 @@ import java.util.Map;
  * </p>
  *
  * @author Seyason
- * @since 2022-07-12
+ * @since 2022-07-18
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -277,10 +277,16 @@ public class Project extends Model<Project> {
     private String providerNames;
 
     /**
-     * 当前任务阶段
+     * 阶段id
      */
-    @TableField("current_stage")
-    private String currentStage;
+    @TableField("current_stage_id")
+    private Integer currentStageId;
+
+    /**
+     * 当前任务阶段名称
+     */
+    @TableField("current_stage_name")
+    private String currentStageName;
 
 
     @Override

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/ProjectStageMapper.java

@@ -0,0 +1,16 @@
+package com.management.platform.mapper;
+
+import com.management.platform.entity.ProjectStage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-07-18
+ */
+public interface ProjectStageMapper extends BaseMapper<ProjectStage> {
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ProjectStageService.java

@@ -0,0 +1,16 @@
+package com.management.platform.service;
+
+import com.management.platform.entity.ProjectStage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-07-18
+ */
+public interface ProjectStageService extends IService<ProjectStage> {
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectStageServiceImpl.java

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.ProjectStage;
+import com.management.platform.mapper.ProjectStageMapper;
+import com.management.platform.service.ProjectStageService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-07-18
+ */
+@Service
+public class ProjectStageServiceImpl extends ServiceImpl<ProjectStageMapper, ProjectStage> implements ProjectStageService {
+
+}

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ProjectStageMapper.xml

@@ -0,0 +1,17 @@
+<?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.management.platform.mapper.ProjectStageMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.ProjectStage">
+        <id column="id" property="id" />
+        <result column="project_stage_name" property="projectStageName" />
+        <result column="company_id" property="companyId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, project_stage_name, company_id
+    </sql>
+
+</mapper>