开启，暂停计划，基础表

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

@@ -0,0 +1,93 @@
+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.util.Date;
+
+/**
+ * @Param
+ * @Author wangwl
+ * @Date 2023/6/15 11:42
+ **/
+@Data
+@TableName("c_department_plan_log")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "部门计划日志表", description = "部门计划日志表")
+public class DepartmentPlanLog extends BaseEntity {
+    @ApiModelProperty(value = "计划id")
+    private Long planId;
+
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @ApiModelProperty(value = "原计划开始时间")
+    private LocalDate planStartTime;
+
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @ApiModelProperty(value = "原计划结束时间")
+    private LocalDate planEndTime;
+
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @ApiModelProperty(value = "实际计划开启时间")
+    private LocalDate realPlanStartTime;
+
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @ApiModelProperty(value = "中途暂停时间")
+    private LocalDate timeOut;
+
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @ApiModelProperty(value = "中途开启计划-开始时间")
+    private LocalDate openPlanStartTime;
+
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @ApiModelProperty(value = "中途开启计划-结束时间")
+    private LocalDate openPlanEndTime;
+
+    @ApiModelProperty(value = "实际工作时间")
+    private Integer realWorkDays;
+
+    @ApiModelProperty(value = "计划执行顺序")
+    private Integer sort;
+
+    @ApiModelProperty(value = "中途开启计划起止天数")
+    private Integer openPlanStartEndDays;
+
+    @ApiModelProperty(value = "上一次中途开启计划起止天数")
+    private Integer lastOpenPlanStartEndDays;
+}

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

@@ -86,6 +86,9 @@ public class ProjectCostBudget extends BaseEntity {
     @ApiModelProperty(value = "计划完成指标")
     private String planTarget;
 
+    @ApiModelProperty(value = "任务人")
+    private Long taskUser;
+
     @DateTimeFormat(
             pattern = "yyyy-MM-dd"
     )
@@ -93,7 +96,7 @@ public class ProjectCostBudget extends BaseEntity {
             pattern = "yyyy-MM-dd"
     )
     @ApiModelProperty(value = "计划开始日期")
-    private Date planStartDate;
+    private LocalDate planStartTime;
 
     @DateTimeFormat(
             pattern = "yyyy-MM-dd"
@@ -102,7 +105,7 @@ public class ProjectCostBudget extends BaseEntity {
             pattern = "yyyy-MM-dd"
     )
     @ApiModelProperty(value = "计划结束日期")
-    private Date planEndDate;
+    private LocalDate planEndTime;
 
     @ApiModelProperty(value = "计划天数")
     private BigDecimal planDays;

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

@@ -2,6 +2,8 @@ package org.springblade.control.controller;
 
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.control.entity.DepartmentMonthPlan;
@@ -32,6 +34,20 @@ public class DepartmentMonthPlanController {
         return R.data(planService.addDepartmentPlan(plan));
     }
 
+    /**
+     * 查询部门月计划
+     */
+    @PostMapping("/getDepartmentPlan")
+    @ApiOperationSupport(order = 2)
+    @ApiOperation(value = "查询部门月计划")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "departmentType", value = "部门名称", required = true),
+            @ApiImplicitParam(name = "planDate", value = "计划日期", required = true),
+    })
+    public R getDepartmentPlan(@RequestBody DepartmentMonthPlan plan) {
+        return R.data(planService.getDepartmentPlan(plan));
+    }
+
     /**
      * 获取前5个部门列表
      */

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

@@ -0,0 +1,28 @@
+package org.springblade.control.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springblade.control.dto.AnnualBudgetDTO;
+import org.springblade.control.service.IAnnualBudgetService;
+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/6/12 15:45
+ **/
+@RestController
+@AllArgsConstructor
+@RequestMapping("/departmentPlanLog")
+@Api(value = "部门计划日志接口", tags = "部门计划日志接口")
+public class DepartmentPlanLogController {
+
+
+}

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

@@ -0,0 +1,15 @@
+package org.springblade.control.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.control.entity.AnnualBudgetDisburse;
+import org.springblade.control.entity.DepartmentPlanLog;
+
+/**
+ * @Param
+ * @Author wangwl
+ * @Date 2023/5/12 9:38
+ **/
+public interface DepartmentPlanLogMapper extends BaseMapper<DepartmentPlanLog> {
+
+}

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

@@ -0,0 +1,6 @@
+<?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.DepartmentPlanLogMapper">
+
+
+</mapper>

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

@@ -20,4 +20,6 @@ public interface IDepartmentMonthPlanService extends BaseService<DepartmentMonth
     List<ProjectCostBudgetVO> addDepartmentPlan(DepartmentMonthPlan plan);
 
     List<DictInfo> getDepartmentDict();
+
+    List<ProjectCostBudgetVO> getDepartmentPlan(DepartmentMonthPlan plan);
 }

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

@@ -0,0 +1,18 @@
+package org.springblade.control.service;
+
+import org.springblade.control.entity.DepartmentMonthPlan;
+import org.springblade.control.entity.DepartmentPlanLog;
+import org.springblade.control.entity.DictInfo;
+import org.springblade.control.vo.ProjectCostBudgetVO;
+import org.springblade.core.mp.base.BaseService;
+
+import java.util.List;
+
+/**
+ * @Param
+ * @Author wangwl
+ * @Date 2023/5/12 13:41
+ **/
+public interface IDepartmentPlanLogService extends BaseService<DepartmentPlanLog> {
+
+}

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

@@ -53,14 +53,7 @@ public class DepartmentMonthPlanServiceImpl extends BaseServiceImpl<DepartmentMo
         plan.setPlanName(date[0]+"年"+date[1]+"月"+departmentName+"预算计划");
         this.save(plan);
         //查询出部门当月的项目计划，返回
-        List<ProjectCostBudgetVO> voList = new ArrayList<>();
-        if (plan.getDepartmentType() != 5){
-            voList = budgetService.getDepartmentPlan(plan.getDepartmentType(),planDate);
-        }else {
-            voList.addAll(budgetService.getDepartmentPlan(5,planDate));
-            voList.addAll(budgetService.getDepartmentPlan(6,planDate));
-        }
-        return voList;
+        return getDepartmentPlan(plan);
     }
 
     /**
@@ -71,4 +64,20 @@ public class DepartmentMonthPlanServiceImpl extends BaseServiceImpl<DepartmentMo
     public List<DictInfo> getDepartmentDict() {
         return baseMapper.getDepartmentDict();
     }
+
+    /**
+     * 获取部门月计划
+     */
+    @Override
+    public List<ProjectCostBudgetVO> getDepartmentPlan(DepartmentMonthPlan plan) {
+        //查询出部门当月的项目计划，返回
+        List<ProjectCostBudgetVO> voList = new ArrayList<>();
+        if (plan.getDepartmentType() != 5){
+            voList = budgetService.getDepartmentPlan(plan.getDepartmentType(),plan.getPlanDate());
+        }else {
+            voList.addAll(budgetService.getDepartmentPlan(5,plan.getPlanDate()));
+            voList.addAll(budgetService.getDepartmentPlan(6,plan.getPlanDate()));
+        }
+        return voList;
+    }
 }

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

@@ -0,0 +1,38 @@
+package org.springblade.control.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.ControlContractInfo;
+import org.springblade.control.entity.ControlProjectInfo;
+import org.springblade.control.entity.DepartmentPlanLog;
+import org.springblade.control.entity.DictInfo;
+import org.springblade.control.mapper.DepartmentPlanLogMapper;
+import org.springblade.control.mapper.ProjectInfoMapper;
+import org.springblade.control.service.IContractInfoService;
+import org.springblade.control.service.IDepartmentPlanLogService;
+import org.springblade.control.service.IProjectInfoService;
+import org.springblade.control.service.IProjectProcessService;
+import org.springblade.control.vo.ControlProjectInfoVO;
+import org.springblade.core.log.exception.ServiceException;
+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 DepartmentPlanLogImpl extends BaseServiceImpl<DepartmentPlanLogMapper, DepartmentPlanLog> implements IDepartmentPlanLogService {
+
+}