DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增单个任务派送，缺少报功模式

Browse Source
This commit is contained in:
hdka
2025-03-26 17:34:13 +08:00
parent 6610dfefb9
commit 17a63b5e2a
24 changed files with 498 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaTask.java
View File

@@ -10,6 +10,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;
/**
* 任务管理对象 sys_oa_task
@@ -52,10 +53,14 @@ public class SysOaTask extends BaseEntity {
/**
* 开始时间
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date beginTime;
/**
* 结束时间
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date finishTime;
/**
* 详细描述
@@ -70,4 +75,63 @@ public class SysOaTask extends BaseEntity {
*/
private String remark;
/**
* 创建者
*/
private Long createUserId;
/**
* 被分配者
*/
private Long workerId;
/**
* 最初结束时间
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date originFinishTime;
/**
* 推迟次数
*/
private Long postponements;
/**
* 任务完成度评分
*/
private Long rankNumber;
/**
* 任务完成时间
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date completedTime;
/**
* 任务状态
*/
private Long state;
/**
* 是否置顶
*/
private Long taskRank;
/**
* 是否置顶
*/
private Long ownRank;
/**
* 任务模式
*/
private Long status;
/**
* 报工间隔
*/
private Long timeGap;
}

95
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaTaskBo.java
View File

@@ -13,6 +13,7 @@ import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
/**
* 任务管理业务对象 sys_oa_task
@@ -34,19 +35,16 @@ public class SysOaTaskBo extends BaseEntity {
/**
* 项目ID
*/
@NotNull(message = "项目ID不能为空", groups = { AddGroup.class, EditGroup.class })
private Long projectId;
/**
* 任务主题
*/
@NotBlank(message = "任务主题不能为空", groups = { AddGroup.class, EditGroup.class })
private String taskTitle;
/**
* 工作类型
*/
@NotBlank(message = "工作类型不能为空", groups = { AddGroup.class, EditGroup.class })
private String taskType;
/**
@@ -62,13 +60,15 @@ public class SysOaTaskBo extends BaseEntity {
/**
* 开始时间
*/
@NotNull(message = "开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date beginTime;
/**
* 结束时间
*/
@NotNull(message = "结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date finishTime;
/**
@@ -92,5 +92,90 @@ public class SysOaTaskBo extends BaseEntity {
*/
private String remark;
/**
* 创建者
*/
private Long createUserId;
/**
* 被分配者
*/
private Long workerId;
/**
* 最初结束时间
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date originFinishTime;
/**
* 推迟次数
*/
private Long postponements;
/**
* 任务完成度评分
*/
private Long rankNumber;
/**
* 任务完成时间
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date completedTime;
/**
* 任务完成时间
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date tempTime;
/**
* 创建人姓名
*/
private String createUserNickName;
/**
* 执行人姓名
*/
private String workerNickName;
/**
* 项目编号
*/
private String projectNum;
/**
* 首次提交可能会挂多个执行人
*/
private String workerIds;
/**
* 任务状态
*/
private Long state;
/**
* 是否置顶
*/
private Long taskRank;
/**
* 是否置顶
*/
private Long ownRank;
/**
* 任务模式
*/
private Long status;
/**
* 报工间隔
*/
private Long timeGap;
}

37
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaTaskUserBo.java
View File

@@ -1,37 +0,0 @@
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;
/**
* 任务工人业务对象 sys_oa_task_user
*
* @author hdka
* @date 2024-11-09
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class SysOaTaskUserBo extends BaseEntity {
/**
* 主键
*/
@NotNull(message = "主键不能为空", groups = { AddGroup.class, EditGroup.class })
private Long userId;
/**
* 任务键
*/
@NotNull(message = "任务键不能为空", groups = { EditGroup.class })
private Long taskId;
}

87
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaTaskVo.java
View File

@@ -8,6 +8,8 @@ import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.convert.ExcelDictConvert;
import com.ruoyi.common.core.domain.entity.SysUser;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.util.List;
@@ -113,4 +115,89 @@ public class SysOaTaskVo {
*/
private Double projectCostTotal;
/**
* 创建者
*/
private Long createUserId;
/**
* 被分配者
*/
private Long workerId;
/**
* 最初结束时间
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date originFinishTime;
/**
* 推迟次数
*/
private Long postponements;
/**
* 任务完成度评分
*/
private Long rankNumber;
/**
* 任务完成时间
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date completedTime;
/**
* 任务创建者
*/
private String createUserNickName;
/**
* 执行者
*/
private String workerNickName;
/**
* 逾期天数
*/
private Long overDays;
/**
* 项目名
*/
private String projectName;
/**
* 项目编号
*/
private String projectNum;
/**
* 任务状态
*/
private Long state;
/**
* 任务置顶
*/
private Long taskRank;
/**
* 是否置顶
*/
private Long ownRank;
/**
* 任务模式
*/
private Long status;
/**
* 报工间隔
*/
private Long timeGap;
}