项目进度控制

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaProgressDetail.java

@@ -11,6 +11,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 进度扩展对象 oa_progress_detail
@@ -41,6 +42,8 @@ public class OaProgressDetail extends BaseEntity {
     /**
      * 计划开始日期(项目进度)
      */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date planStartDate;
     /**
      * 计划结束日期(项目进度)

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaProjectSchedule.java

@@ -0,0 +1,66 @@
+package com.ruoyi.oa.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 项目进度对象 oa_project_schedule
+ *
+ * @author haka
+ * @date 2025-05-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("oa_project_schedule")
+public class OaProjectSchedule extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 项目进度主键
+     */
+    @TableId(value = "schedule_id")
+    private Long scheduleId;
+    /**
+     * 项目ID
+     */
+    private Long projectId;
+    /**
+     * 引用的进度模板ID
+     */
+    private Long templateId;
+    /**
+     * 当前进行到的步骤序号
+     */
+    private Long currentStep;
+    /**
+     * 进度开始时间
+     */
+    private Date startTime;
+    /**
+     * 进度完成时间
+     */
+    private Date endTime;
+    /**
+     * 状态
+     */
+    private Long status;
+    /**
+     *
+     */
+    @TableLogic
+    private String delFlag;
+    /**
+     *
+     */
+    private String remark;
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaProjectScheduleStep.java

@@ -0,0 +1,79 @@
+package com.ruoyi.oa.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 项目进度步骤跟踪对象 oa_project_schedule_step
+ *
+ * @author hdka
+ * @date 2025-05-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("oa_project_schedule_step")
+public class OaProjectScheduleStep extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 跟踪记录主键
+     */
+    @TableId(value = "track_id")
+    private Long trackId;
+    /**
+     * 文件列表
+     */
+    private String accessory;
+    /**
+     * 所属项目进度ID
+     */
+    private Long scheduleId;
+    /**
+     * 步骤序号
+     */
+    private Long stepOrder;
+    /**
+     * 步骤名称(冗余存储模板名称)
+     */
+    private String stepName;
+    /**
+     * 计划开始
+     */
+    private Date planStart;
+    /**
+     * 计划完成
+     */
+    private Date planEnd;
+    /**
+     *
+     */
+    private Date actualStart;
+    /**
+     *
+     */
+    private Date actualEnd;
+    /**
+     * 0未开始 1进行中 2完成 3暂停
+     */
+    private Long status;
+
+    /**
+     * 进度负责人
+     */
+    private String header;
+    /**
+     *
+     */
+    @TableLogic
+    private String delFlag;
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaScheduleTemplate.java

@@ -0,0 +1,48 @@
+package com.ruoyi.oa.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 进度模板主对象 oa_schedule_template
+ *
+ * @author hdka
+ * @date 2025-05-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("oa_schedule_template")
+public class OaScheduleTemplate extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 模板主键
+     */
+    @TableId(value = "template_id")
+    private Long templateId;
+    /**
+     * 模板名称
+     */
+    private String templateName;
+    /**
+     * 状态(1启用 0停用)
+     */
+    private Long status;
+    /**
+     * 删除标识
+     */
+    @TableLogic
+    private String delFlag;
+    /**
+     *
+     */
+    private String remark;
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaScheduleTemplateStep.java

@@ -0,0 +1,60 @@
+package com.ruoyi.oa.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 进度模板步骤对象 oa_schedule_template_step
+ *
+ * @author hdka
+ * @date 2025-05-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("oa_schedule_template_step")
+public class OaScheduleTemplateStep extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 步骤主键
+     */
+    @TableId(value = "step_id")
+    private Long stepId;
+    /**
+     * 所属模板ID
+     */
+    private Long templateId;
+    /**
+     * 步骤顺序
+     */
+    private Long stepOrder;
+    /**
+     * 步骤名称
+     */
+    private String stepName;
+    /**
+     * 预期耗时(天)
+     */
+    private Long expectedDays;
+    /**
+     * 负责人
+     */
+    private String header;
+    /**
+     *
+     */
+    @TableLogic
+    private String delFlag;
+    /**
+     * 详细描述
+     */
+    private String description;
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaProject.java

@@ -134,4 +134,14 @@ public class SysOaProject extends BaseEntity {
      * 项目代表色
      */
     private String color;
+
+    /**
+     * 交易类型
+     */
+    private Long tradeType;
+
+    /**
+     * 预付款
+     */
+    private Double prePay;
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaProjectScheduleBo.java

@@ -0,0 +1,75 @@
+package com.ruoyi.oa.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.oa.domain.OaProjectScheduleStep;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 项目进度业务对象 oa_project_schedule
+ *
+ * @author haka
+ * @date 2025-05-08
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class OaProjectScheduleBo extends BaseEntity {
+
+    /**
+     * 项目进度主键
+     */
+    @NotNull(message = "项目进度主键不能为空", groups = { EditGroup.class })
+    private Long scheduleId;
+
+    /**
+     * 项目ID
+     */
+    private Long projectId;
+
+    /**
+     * 引用的进度模板ID
+     */
+    private Long templateId;
+
+    /**
+     * 当前进行到的步骤序号
+     */
+    private Long currentStep;
+
+    /**
+     * 进度开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 进度完成时间
+     */
+    private Date endTime;
+
+    /**
+     * 状态
+     */
+    private Long status;
+
+    /**
+     *
+     */
+    private String remark;
+
+    private Double prePay;
+
+    private String mode;
+
+    private List<OaProjectScheduleStepBo> steps;
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaProjectScheduleStepBo.java

@@ -0,0 +1,94 @@
+package com.ruoyi.oa.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 项目进度步骤跟踪业务对象 oa_project_schedule_step
+ *
+ * @author hdka
+ * @date 2025-05-08
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class OaProjectScheduleStepBo extends BaseEntity {
+
+    /**
+     * 跟踪记录主键
+     */
+    private Long trackId;
+
+    /**
+     * 文件列表
+     */
+    private String accessory;
+
+    /**
+     * 所属项目进度ID
+     */
+    private Long scheduleId;
+
+    /**
+     * 步骤序号
+     */
+    private Long stepOrder;
+
+    /**
+     * 步骤名称(冗余存储模板名称)
+     */
+    private String stepName;
+
+    /**
+     * 计划开始
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date planStart;
+
+    /**
+     * 计划完成
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date planEnd;
+
+    /**
+     *
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date actualStart;
+
+    /**
+     *
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date actualEnd;
+
+    /**
+     * 0未开始 1进行中 2完成 3暂停
+     */
+    private Long status;
+
+
+    private String description;
+
+    private Long expectedDays;
+    /**
+     * 进度负责人
+     */
+    private String header;
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaScheduleTemplateBo.java

@@ -0,0 +1,40 @@
+package com.ruoyi.oa.domain.bo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 进度模板主业务对象 oa_schedule_template
+ *
+ * @author hdka
+ * @date 2025-05-08
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class OaScheduleTemplateBo extends BaseEntity {
+
+    /**
+     * 模板主键
+     */
+    private Long templateId;
+
+    /**
+     * 模板名称
+     */
+    private String templateName;
+
+    /**
+     * 状态(1启用 0停用)
+     */
+    private Long status;
+
+    /**
+     *
+     */
+    private String remark;
+
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaScheduleTemplateStepBo.java

@@ -0,0 +1,60 @@
+package com.ruoyi.oa.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 进度模板步骤业务对象 oa_schedule_template_step
+ *
+ * @author hdka
+ * @date 2025-05-08
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class OaScheduleTemplateStepBo extends BaseEntity {
+
+    /**
+     * 步骤主键
+     */
+    private Long stepId;
+
+    /**
+     * 所属模板ID
+     */
+    private Long templateId;
+
+    /**
+     * 步骤顺序
+     */
+    private Long stepOrder;
+
+    /**
+     * 步骤名称
+     */
+    private String stepName;
+
+    /**
+     * 预期耗时(天)
+     */
+    private Long expectedDays;
+
+    /**
+     * 负责人
+     */
+    private String header;
+
+    /**
+     * 详细描述
+     */
+    private String description;
+
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaProjectBo.java

@@ -165,4 +165,16 @@ public class SysOaProjectBo extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date date;
+
+    /**
+     * 交易类型
+     * 0内贸 1外贸
+     */
+    private Long tradeType;
+
+    /**
+     * 预付款
+     */
+    private Double prePay;
 }
+

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaProjectScheduleStepVo.java

@@ -0,0 +1,100 @@
+package com.ruoyi.oa.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.system.domain.SysOss;
+import lombok.Data;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 项目进度步骤跟踪视图对象 oa_project_schedule_step
+ *
+ * @author hdka
+ * @date 2025-05-08
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class OaProjectScheduleStepVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 跟踪记录主键
+     */
+    @ExcelProperty(value = "跟踪记录主键")
+    private Long trackId;
+
+    /**
+     * 文件列表
+     */
+    @ExcelProperty(value = "文件列表")
+    private String accessory;
+
+    /**
+     * 所属项目进度ID
+     */
+    @ExcelProperty(value = "所属项目进度ID")
+    private Long scheduleId;
+
+    /**
+     * 步骤序号
+     */
+    @ExcelProperty(value = "步骤序号")
+    private Long stepOrder;
+
+    /**
+     * 步骤名称(冗余存储模板名称)
+     */
+    @ExcelProperty(value = "步骤名称(冗余存储模板名称)")
+    private String stepName;
+
+    /**
+     * 计划开始
+     */
+    @ExcelProperty(value = "计划开始")
+    private Date planStart;
+
+    /**
+     * 计划完成
+     */
+    @ExcelProperty(value = "计划完成")
+    private Date planEnd;
+
+    /**
+     *
+     */
+    @ExcelProperty(value = "")
+    private Date actualStart;
+
+    /**
+     *
+     */
+    @ExcelProperty(value = "")
+    private Date actualEnd;
+
+    /**
+     * 0未开始 1进行中 2完成 3暂停
+     */
+    @ExcelProperty(value = "0未开始 1进行中 2完成 3暂停")
+    private Long status;
+
+    /**
+     * 进度负责人
+     */
+    private String header;
+
+
+    private String description;
+
+    private Long expectedDays;
+
+    /** 附件列表（1 步骤可多附件） */
+    private List<SysOss> fileList;   // 建议用 List
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaProjectScheduleVo.java

@@ -0,0 +1,90 @@
+package com.ruoyi.oa.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 项目进度视图对象 oa_project_schedule
+ *
+ * @author haka
+ * @date 2025-05-08
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class OaProjectScheduleVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 项目进度主键
+     */
+    @ExcelProperty(value = "项目进度主键")
+    private Long scheduleId;
+
+    /**
+     * 项目ID
+     */
+    @ExcelProperty(value = "项目ID")
+    private Long projectId;
+
+    /**
+     * 引用的进度模板ID
+     */
+    @ExcelProperty(value = "引用的进度模板ID")
+    private Long templateId;
+
+    /**
+     * 当前进行到的步骤序号
+     */
+    @ExcelProperty(value = "当前进行到的步骤序号")
+    private Long currentStep;
+
+    /**
+     * 进度开始时间
+     */
+    @ExcelProperty(value = "进度开始时间")
+    private Date startTime;
+
+    /**
+     * 进度完成时间
+     */
+    @ExcelProperty(value = "进度完成时间")
+    private Date endTime;
+
+    /**
+     * 状态
+     */
+    @ExcelProperty(value = "状态")
+    private Long status;
+
+    /**
+     *
+     */
+    @ExcelProperty(value = "")
+    private String remark;
+
+    private String currentStepName;
+
+    private String projectName;
+
+    private String header;
+
+    private Long remainTime;
+
+    private Double schedulePercentage;
+
+    private String functionary;
+
+    private Long expectedDays;
+
+    private String description;
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaScheduleTemplateStepVo.java

@@ -0,0 +1,67 @@
+package com.ruoyi.oa.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 进度模板步骤视图对象 oa_schedule_template_step
+ *
+ * @author hdka
+ * @date 2025-05-08
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class OaScheduleTemplateStepVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 步骤主键
+     */
+    @ExcelProperty(value = "步骤主键")
+    private Long stepId;
+
+    /**
+     * 所属模板ID
+     */
+    @ExcelProperty(value = "所属模板ID")
+    private Long templateId;
+
+    /**
+     * 步骤顺序
+     */
+    @ExcelProperty(value = "步骤顺序")
+    private Long stepOrder;
+
+    /**
+     * 步骤名称
+     */
+    @ExcelProperty(value = "步骤名称")
+    private String stepName;
+
+    /**
+     * 预期耗时(天)
+     */
+    @ExcelProperty(value = "预期耗时(天)")
+    private Long expectedDays;
+
+    /**
+     * 负责人
+     */
+    @ExcelProperty(value = "负责人")
+    private String header;
+
+    /**
+     * 详细描述
+     */
+    @ExcelProperty(value = "详细描述")
+    private String description;
+
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaScheduleTemplateVo.java

@@ -0,0 +1,49 @@
+package com.ruoyi.oa.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 进度模板主视图对象 oa_schedule_template
+ *
+ * @author hdka
+ * @date 2025-05-08
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class OaScheduleTemplateVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 模板主键
+     */
+    @ExcelProperty(value = "模板主键")
+    private Long templateId;
+
+    /**
+     * 模板名称
+     */
+    @ExcelProperty(value = "模板名称")
+    private String templateName;
+
+    /**
+     * 状态(1启用 0停用)
+     */
+    @ExcelProperty(value = "状态(1启用 0停用)")
+    private Long status;
+
+    /**
+     *
+     */
+    @ExcelProperty(value = "")
+    private String remark;
+
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaProjectVo.java

@@ -224,4 +224,14 @@ public class SysOaProjectVo {
     private Date updateTime;
 
     private List<OaProgressVo> progressList;
+
+    /**
+     * 交易类型
+     */
+    private Long tradeType;
+
+    /**
+     * 预付款
+     */
+    private Double prePay;
 }