管控平台，项目和流程信息

blade-service-api/blade-control-api/src/main/java/org/springblade/control/dto/ControlProjectInfoDTO.java

@@ -0,0 +1,25 @@
+package org.springblade.control.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.control.entity.ControlProjectInfo;
+import org.springblade.control.entity.ProjectProcess;
+
+import java.util.List;
+
+/**
+ * @Param
+ * @Author wangwl
+ * @Date 2023/5/12 16:40
+ **/
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ControlProjectInfoDTO extends ControlProjectInfo {
+    //项目进程集合
+    private List<ProjectProcess> projectProcessList;
+
+    //模糊查询
+    @ApiModelProperty(value = "搜索值")
+    private String queryValue;
+}

blade-service-api/blade-control-api/src/main/java/org/springblade/control/entity/ControlProjectInfo.java

@@ -0,0 +1,81 @@
+package org.springblade.control.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * @Param
+ * @Author wangwl
+ * @Date 2023/5/12 9:21
+ **/
+@Data
+@TableName("c_control_project_info")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "项目表", description = "项目表")
+public class ControlProjectInfo extends BaseEntity {
+    @ApiModelProperty(value = "项目编号")
+    private String number;
+
+    @ApiModelProperty(value = "项目名称")
+    private String name;
+
+    @ApiModelProperty(value = "项目进程")
+    private String process;
+
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @ApiModelProperty(value = "项目开始日期")
+    private LocalDate projectStartTime;
+
+    @ApiModelProperty(value = "项目类型")
+    private Integer projectType;
+
+    @ApiModelProperty(value = "合同类型")
+    private Integer contractType;
+
+    @ApiModelProperty(value = "合同金额")
+    private BigDecimal contractAmount;
+
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @ApiModelProperty(value = "合同开始时间")
+    private LocalDate contractStartTime;
+
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @ApiModelProperty(value = "合同停止日期")
+    private LocalDate contractEndTime;
+
+    @ApiModelProperty(value = "已回款")
+    private BigDecimal returnedMoney;
+
+    @ApiModelProperty(value = "合同pdf")
+    private String contractPdf;
+
+    @ApiModelProperty(value = "负责人")
+    private Long dutyUser;
+
+}

blade-service-api/blade-control-api/src/main/java/org/springblade/control/entity/ProjectProcess.java

@@ -0,0 +1,51 @@
+package org.springblade.control.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * @Param
+ * @Author wangwl
+ * @Date 2023/5/12 11:42
+ **/
+@Data
+@TableName("c_control_project_process")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "项目进程表", description = "项目进程表")
+public class ProjectProcess extends BaseEntity {
+    @ApiModelProperty(value = "项目id")
+    private Long projectId;
+
+    @ApiModelProperty(value = "进程名称")
+    private String name;
+
+    @ApiModelProperty(value = "进程排序")
+    private Integer sort;
+
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @ApiModelProperty(value = "进程开始日期")
+    private LocalDate processStartTime;
+
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @ApiModelProperty(value = "进程结束日期")
+    private LocalDate processEndTime;
+}

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/ControlProjectInfoVO.java

@@ -0,0 +1,23 @@
+package org.springblade.control.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.control.entity.ControlProjectInfo;
+
+import java.util.List;
+
+/**
+ * @Param
+ * @Author wangwl
+ * @Date 2023/5/12 11:20
+ **/
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ControlProjectInfoVO extends ControlProjectInfo {
+    //项目类型值
+    private String projectTypeValue;
+    //合同类型值
+    private String contractTypeValue;
+    //项目进程集合
+    private List<ProjectProcessVO> projectProcessList;
+}

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/ProjectProcessVO.java

@@ -0,0 +1,18 @@
+package org.springblade.control.vo;
+
+import jdk.net.SocketFlow;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.control.entity.ProjectProcess;
+
+/**
+ * @Param
+ * @Author wangwl
+ * @Date 2023/5/12 15:00
+ **/
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProjectProcessVO extends ProjectProcess {
+    //进程状态值
+    private String statusValue;
+}

blade-service/blade-control/src/main/java/org/springblade/control/controller/ProjectInfoController.java

@@ -0,0 +1,81 @@
+package org.springblade.control.controller;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springblade.common.utils.SnowFlakeUtil;
+import org.springblade.control.dto.ControlProjectInfoDTO;
+import org.springblade.control.entity.ControlProjectInfo;
+import org.springblade.control.service.IProjectInfoService;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @Param
+ * @Author wangwl
+ * @Date 2023/5/12 9:46
+ **/
+@RestController
+@AllArgsConstructor
+@RequestMapping("/projectInfo")
+@Api(value = "项目信息接口", tags = "项目信息接口")
+public class ProjectInfoController {
+    private final IProjectInfoService projectInfoService;
+
+    /**
+     * 项目列表
+     */
+    @GetMapping("/page")
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "分页查询项目列表")
+    public R page(ControlProjectInfoDTO dto, Query query){
+        return R.data(projectInfoService.page(dto,query));
+    }
+
+    /**
+     * 新增项目
+     */
+    @PostMapping("/addProjectInfo")
+    @ApiOperationSupport(order = 2)
+    @ApiOperation(value = "新增项目")
+    public R addProjectInfo(@RequestBody ControlProjectInfoDTO dto){
+        projectInfoService.addProjectInfo(dto);
+        return R.success("新增成功");
+    }
+
+    /**
+     * 修改项目
+     */
+    @PostMapping("/updateProjectInfo")
+    @ApiOperationSupport(order = 2)
+    @ApiOperation(value = "修改项目")
+    public R updateProjectInfo(@RequestBody ControlProjectInfoDTO dto){
+        projectInfoService.updateProjectInfo(dto);
+        return R.success("修改成功");
+    }
+
+    /**
+     * 删除项目
+     */
+    @GetMapping("removeProjectInfo")
+    @ApiOperationSupport(order = 2)
+    @ApiOperation(value = "删除项目")
+    public R removeProjectInfo(Long id){
+        projectInfoService.removeProjectInfo(id);
+        return R.success("删除成功");
+    }
+
+
+    /**
+     * 根据id获取项目和流程
+     */
+    @GetMapping("/getProjectInfoById")
+    @ApiOperationSupport(order = 2)
+    @ApiOperation(value = "根据id获取项目和流程")
+    public R getProjectInfoById(Long id){
+        return R.data(projectInfoService.getProjectInfoById(id));
+    }
+
+}

blade-service/blade-control/src/main/java/org/springblade/control/controller/ProjectProcessController.java

@@ -0,0 +1,33 @@
+package org.springblade.control.controller;
+
+
+import cn.hutool.core.util.ReUtil;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springblade.control.service.IProjectProcessService;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Param
+ * @Author wangwl
+ * @Date 2023/5/12 11:42
+ **/
+@RestController
+@AllArgsConstructor
+@RequestMapping("/projectProcess")
+@Api(value = "项目进程接口", tags = "项目进程接口")
+public class ProjectProcessController{
+   private final IProjectProcessService processService;
+
+   @GetMapping("/getBaseProcess")
+   @ApiOperationSupport(order = 2)
+   @ApiOperation(value = "新增项目获取项目流程")
+   public R getBaseProcess(){
+      return R.data(processService.getBaseProcess());
+   }
+}

blade-service/blade-control/src/main/java/org/springblade/control/mapper/ProjectInfoMapper.java

@@ -0,0 +1,21 @@
+package org.springblade.control.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.control.dto.ControlProjectInfoDTO;
+import org.springblade.control.entity.ControlProjectInfo;
+import org.springblade.control.vo.ControlProjectInfoVO;
+
+import java.util.List;
+
+/**
+ * @Param
+ * @Author wangwl
+ * @Date 2023/5/12 9:38
+ **/
+public interface ProjectInfoMapper extends BaseMapper<ControlProjectInfo> {
+    List<ControlProjectInfoVO> selectByPage(IPage page, @Param("dto") ControlProjectInfoDTO dto);
+
+    ControlProjectInfoVO getProjectInfoById(@Param("id") Long id);
+}

blade-service/blade-control/src/main/java/org/springblade/control/mapper/ProjectInfoMapper.xml

@@ -0,0 +1,30 @@
+<?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="org.springblade.control.mapper.ProjectInfoMapper">
+
+
+    <select id="selectByPage" resultType="org.springblade.control.vo.ControlProjectInfoVO">
+        select pi.* from c_control_project_info pi
+        where pi.is_deleted = 0
+        <if test="dto.projectType != null and dto.projectType != ''">
+            and pi.project_type = #{dto.projectType}
+        </if>
+        <if test="dto.contractType != null and dto.contractType != ''">
+            and pi.contract_type = #{dto.contractType}
+        </if>
+        <if test="dto.process != null and dto.process != ''">
+            and pi.process = #{dto.process}
+        </if>
+        <if test="dto.queryValue != null and dto.queryValue != ''">
+            and pi.name like concat('%', #{dto.queryValue}, '%')
+        </if>
+
+
+    </select>
+    <select id="getProjectInfoById" resultType="org.springblade.control.vo.ControlProjectInfoVO">
+        select pi.*
+        from c_control_project_info pi
+        where pi.is_deleted = 0 and pi.id = #{id}
+    </select>
+
+</mapper>

blade-service/blade-control/src/main/java/org/springblade/control/mapper/ProjectProcessMapper.java

@@ -0,0 +1,19 @@
+package org.springblade.control.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.control.entity.ProjectProcess;
+import org.springblade.control.vo.ProjectProcessVO;
+
+import java.util.List;
+
+/**
+ * @Param
+ * @Author wangwl
+ * @Date 2023/5/12 13:38
+ **/
+public interface ProjectProcessMapper extends BaseMapper<ProjectProcess> {
+    List<ProjectProcessVO> getBaseProcess();
+
+    List<ProjectProcessVO> getProjectProcess(@Param("id") Long id);
+}

blade-service/blade-control/src/main/java/org/springblade/control/mapper/ProjectProcessMapper.xml

@@ -0,0 +1,16 @@
+<?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="org.springblade.control.mapper.ProjectProcessMapper">
+
+
+    <select id="getBaseProcess" resultType="org.springblade.control.vo.ProjectProcessVO">
+        SELECT bdb.dict_value as name,bdb.sort as sort
+        FROM blade_dict_biz bdb
+        WHERE bdb.code = 'project_process' AND  bdb.parent_id > 0
+        ORDER BY bdb.sort
+    </select>
+    <select id="getProjectProcess" resultType="org.springblade.control.vo.ProjectProcessVO">
+        SELECT * FROM c_control_project_process ccpp
+        WHERE ccpp.project_id = #{id}
+    </select>
+</mapper>

blade-service/blade-control/src/main/java/org/springblade/control/service/IProjectInfoService.java

@@ -0,0 +1,25 @@
+package org.springblade.control.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.control.dto.ControlProjectInfoDTO;
+import org.springblade.control.entity.ControlProjectInfo;
+import org.springblade.control.vo.ControlProjectInfoVO;
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.core.mp.support.Query;
+
+/**
+ * @Param
+ * @Author wangwl
+ * @Date 2023/5/12 9:41
+ **/
+public interface IProjectInfoService extends BaseService<ControlProjectInfo> {
+    IPage<ControlProjectInfoVO> page(ControlProjectInfoDTO dto, Query query);
+
+    void addProjectInfo(ControlProjectInfoDTO dto);
+
+    void updateProjectInfo(ControlProjectInfoDTO dto);
+
+    void removeProjectInfo(Long id);
+
+    ControlProjectInfoVO getProjectInfoById(Long id);
+}

blade-service/blade-control/src/main/java/org/springblade/control/service/IProjectProcessService.java

@@ -0,0 +1,21 @@
+package org.springblade.control.service;
+
+import org.springblade.control.dto.ControlProjectInfoDTO;
+import org.springblade.control.entity.ProjectProcess;
+import org.springblade.control.vo.ProjectProcessVO;
+import org.springblade.core.mp.base.BaseService;
+
+import java.util.List;
+
+/**
+ * @Param
+ * @Author wangwl
+ * @Date 2023/5/12 13:41
+ **/
+public interface IProjectProcessService extends BaseService<ProjectProcess> {
+    void addProjectProcess(ControlProjectInfoDTO dto);
+    void updateProjectProcess(List<ProjectProcess> processList);
+    void removeProjectProcess(Long projectId);
+    List<ProjectProcessVO> getBaseProcess();
+    List<ProjectProcessVO> getProjectProcess(Long id);
+}

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/ProjectInfoServiceImpl.java

@@ -0,0 +1,96 @@
+package org.springblade.control.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.AllArgsConstructor;
+import org.springblade.common.utils.SnowFlakeUtil;
+import org.springblade.control.dto.ControlProjectInfoDTO;
+import org.springblade.control.entity.ControlProjectInfo;
+import org.springblade.control.mapper.ProjectInfoMapper;
+import org.springblade.control.service.IProjectInfoService;
+import org.springblade.control.service.IProjectProcessService;
+import org.springblade.control.vo.ControlProjectInfoVO;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.mp.support.Query;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * @Param
+ * @Author wangwl
+ * @Date 2023/5/12 9:43
+ **/
+@Service
+@AllArgsConstructor
+public class ProjectInfoServiceImpl extends BaseServiceImpl<ProjectInfoMapper, ControlProjectInfo> implements IProjectInfoService {
+    private final ProjectInfoMapper infoMapper;
+    private final IProjectProcessService processService;
+
+    /**
+     * 自定义分页
+     * @param dto
+     * @param query
+     * @return
+     */
+    @Override
+    public IPage<ControlProjectInfoVO> page(ControlProjectInfoDTO dto, Query query) {
+        IPage page = new Page(query.getCurrent(),query.getSize());
+        List<ControlProjectInfoVO> projectInfoVos = infoMapper.selectByPage(page, dto);
+        return page.setRecords(projectInfoVos);
+    }
+
+    /**
+     * 新增项目
+     * @param dto
+     */
+    @Override
+    @Transactional
+    public void addProjectInfo(ControlProjectInfoDTO dto) {
+        Long id = SnowFlakeUtil.getId();
+        dto.setId(id);
+        ControlProjectInfo info = new ControlProjectInfo();
+        BeanUtils.copyProperties(dto,info);
+        infoMapper.insert(info);
+        processService.addProjectProcess(dto);
+    }
+
+    /**
+     * 修改项目
+     * @param dto
+     */
+    @Override
+    @Transactional
+    public void updateProjectInfo(ControlProjectInfoDTO dto) {
+        ControlProjectInfo info = new ControlProjectInfo();
+        BeanUtils.copyProperties(dto,info);
+        infoMapper.updateById(info);
+        processService.updateProjectProcess(dto.getProjectProcessList());
+
+    }
+
+    /**
+     * 删除项目
+     * @param id
+     */
+    @Override
+    @Transactional
+    public void removeProjectInfo(Long id) {
+        baseMapper.deleteById(id);
+        processService.removeProjectProcess(id);
+    }
+
+    /**
+     * 根据id获取项目和流程信息
+     * @param id
+     * @return
+     */
+    @Override
+    public ControlProjectInfoVO getProjectInfoById(Long id) {
+        ControlProjectInfoVO vo = infoMapper.getProjectInfoById(id);
+        vo.setProjectProcessList(processService.getProjectProcess(id));
+        return vo;
+    }
+}

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/ProjectProcessServiceImpl.java

@@ -0,0 +1,93 @@
+package org.springblade.control.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.AllArgsConstructor;
+import org.springblade.common.utils.SnowFlakeUtil;
+import org.springblade.control.dto.ControlProjectInfoDTO;
+import org.springblade.control.entity.ProjectProcess;
+import org.springblade.control.mapper.ProjectProcessMapper;
+import org.springblade.control.service.IProjectProcessService;
+import org.springblade.control.vo.ProjectProcessVO;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @Param
+ * @Author wangwl
+ * @Date 2023/5/12 13:41
+ **/
+@Service
+@AllArgsConstructor
+public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessMapper, ProjectProcess> implements IProjectProcessService {
+    private final ProjectProcessMapper processMapper;
+    /**
+     * 新增项目时保存进程
+     * @param dto
+     */
+    @Override
+    public void addProjectProcess(ControlProjectInfoDTO dto) {
+        List<ProjectProcess> list = dto.getProjectProcessList();
+        for (ProjectProcess process : list) {
+            process.setProjectId(dto.getId());
+            process.setId(SnowFlakeUtil.getId());
+        }
+        this.saveBatch(list);
+    }
+
+    /**
+     * 修改项目时保存进程
+     * @param list
+     */
+    @Override
+    public void updateProjectProcess(List<ProjectProcess> list) {
+        if (list != null && list.size() > 0) {
+            this.updateBatchById(list);
+        }
+    }
+
+    /**
+     * 删除项目下的进程
+     * @param projectId
+     */
+    @Override
+    public void removeProjectProcess(Long projectId) {
+        this.remove(new LambdaQueryWrapper<ProjectProcess>().eq(ProjectProcess::getProjectId,projectId));
+    }
+
+    /**
+     * 创建项目时获取项目基础流程
+     * @return
+     */
+    @Override
+    public List<ProjectProcessVO> getBaseProcess() {
+        List<ProjectProcessVO> list = processMapper.getBaseProcess();
+        list.stream().forEach(l->l.setStatusValue("未开始"));
+        return list;
+    }
+
+    /**
+     * 根基项目id获取项目的进程
+     * @return
+     */
+    @Override
+    public List<ProjectProcessVO> getProjectProcess(Long id) {
+        List<ProjectProcessVO> list = processMapper.getProjectProcess(id);
+        list.stream().forEach(l->{
+            //是否开始时间，在当前时间之前
+            if (l.getProcessStartTime().isBefore(LocalDate.now())){
+                if (l.getProcessEndTime().isBefore(LocalDate.now())){
+                    l.setStatusValue("已闭环");
+                }else {
+                    l.setStatusValue("进行中");
+                }
+            }else {
+                l.setStatusValue("未开始");
+            }
+        });
+        return list;
+    }
+}

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/TaskInfoServiceImpl.java

@@ -43,12 +43,12 @@ public class TaskInfoServiceImpl extends BaseServiceImpl<TaskInfoMapper, TaskInf
     public List<TaskInfo> taskList(String id) {
         if (StringUtils.isNotEmpty(id)) {
             List<Long> taskIds = jdbcTemplate.queryForList("select task_id from c_control_plan_task_record where plan_id = " + id, Long.class);
-            List<TaskInfo> taskInfos = baseMapper.selectBatchIds(taskIds);
+            //List<TaskInfo> taskInfos = baseMapper.selectBatchIds(taskIds);
 
             //TODO 项目名称、进度等，返回VO
-            for (TaskInfo taskInfo : taskInfos) {
-
-            }
+//            for (TaskInfo taskInfo : taskInfos) {
+//
+//            }
             return null;
         }
         return null;