diff --git a/tall/src/main/java/com/ccsens/tall/bean/dto/DeliverDto.java b/tall/src/main/java/com/ccsens/tall/bean/dto/DeliverDto.java index 4c1e5281..0536102a 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/dto/DeliverDto.java +++ b/tall/src/main/java/com/ccsens/tall/bean/dto/DeliverDto.java @@ -8,6 +8,7 @@ import lombok.Setter; import javax.validation.constraints.Max; import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; import java.util.List; public class DeliverDto { @@ -54,4 +55,13 @@ public class DeliverDto { @ApiModelProperty("wps文件Id,可以为空") private Long wpsFileId; } + + @Data + @ApiModel("根据任务id查找输出文档") + public static class FindDocByTask{ + @NotNull(message = "请选择任务") + @ApiModelProperty("任务id") + private Long taskId; + } + } diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDeliverPostLog.java b/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDeliverPostLog.java index 884c1617..c5dfa486 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDeliverPostLog.java +++ b/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDeliverPostLog.java @@ -1,150 +1,161 @@ -package com.ccsens.tall.bean.po; - -import java.io.Serializable; -import java.util.Date; - -public class ProTaskDeliverPostLog implements Serializable { - private Long id; - - private Long deliverId; - - private Long taskSubTimeId; - - private Long fileId; - - private Long userId; - - private String version; - - private String description; - - private Long time; - - private Integer isHistory; - - private Date createdAt; - - private Date updatedAt; - - private Byte recStatus; - - private static final long serialVersionUID = 1L; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Long getDeliverId() { - return deliverId; - } - - public void setDeliverId(Long deliverId) { - this.deliverId = deliverId; - } - - public Long getTaskSubTimeId() { - return taskSubTimeId; - } - - public void setTaskSubTimeId(Long taskSubTimeId) { - this.taskSubTimeId = taskSubTimeId; - } - - public Long getFileId() { - return fileId; - } - - public void setFileId(Long fileId) { - this.fileId = fileId; - } - - public Long getUserId() { - return userId; - } - - public void setUserId(Long userId) { - this.userId = userId; - } - - public String getVersion() { - return version; - } - - public void setVersion(String version) { - this.version = version == null ? null : version.trim(); - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description == null ? null : description.trim(); - } - - public Long getTime() { - return time; - } - - public void setTime(Long time) { - this.time = time; - } - - public Integer getIsHistory() { - return isHistory; - } - - public void setIsHistory(Integer isHistory) { - this.isHistory = isHistory; - } - - public Date getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(Date createdAt) { - this.createdAt = createdAt; - } - - public Date getUpdatedAt() { - return updatedAt; - } - - public void setUpdatedAt(Date updatedAt) { - this.updatedAt = updatedAt; - } - - public Byte getRecStatus() { - return recStatus; - } - - public void setRecStatus(Byte recStatus) { - this.recStatus = recStatus; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", deliverId=").append(deliverId); - sb.append(", taskSubTimeId=").append(taskSubTimeId); - sb.append(", fileId=").append(fileId); - sb.append(", userId=").append(userId); - sb.append(", version=").append(version); - sb.append(", description=").append(description); - sb.append(", time=").append(time); - sb.append(", isHistory=").append(isHistory); - sb.append(", createdAt=").append(createdAt); - sb.append(", updatedAt=").append(updatedAt); - sb.append(", recStatus=").append(recStatus); - sb.append("]"); - return sb.toString(); - } +package com.ccsens.tall.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class ProTaskDeliverPostLog implements Serializable { + private Long id; + + private Long deliverId; + + private Long taskSubTimeId; + + private Long fileId; + + private Long userId; + + private String version; + + private String description; + + private Long time; + + private Integer isHistory; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private String filesId; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getDeliverId() { + return deliverId; + } + + public void setDeliverId(Long deliverId) { + this.deliverId = deliverId; + } + + public Long getTaskSubTimeId() { + return taskSubTimeId; + } + + public void setTaskSubTimeId(Long taskSubTimeId) { + this.taskSubTimeId = taskSubTimeId; + } + + public Long getFileId() { + return fileId; + } + + public void setFileId(Long fileId) { + this.fileId = fileId; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version == null ? null : version.trim(); + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description == null ? null : description.trim(); + } + + public Long getTime() { + return time; + } + + public void setTime(Long time) { + this.time = time; + } + + public Integer getIsHistory() { + return isHistory; + } + + public void setIsHistory(Integer isHistory) { + this.isHistory = isHistory; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + public String getFilesId() { + return filesId; + } + + public void setFilesId(String filesId) { + this.filesId = filesId == null ? null : filesId.trim(); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", deliverId=").append(deliverId); + sb.append(", taskSubTimeId=").append(taskSubTimeId); + sb.append(", fileId=").append(fileId); + sb.append(", userId=").append(userId); + sb.append(", version=").append(version); + sb.append(", description=").append(description); + sb.append(", time=").append(time); + sb.append(", isHistory=").append(isHistory); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append(", filesId=").append(filesId); + sb.append("]"); + return sb.toString(); + } } \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDeliverPostLogExample.java b/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDeliverPostLogExample.java index 474f1b38..d6ea1212 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDeliverPostLogExample.java +++ b/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDeliverPostLogExample.java @@ -1,941 +1,1011 @@ -package com.ccsens.tall.bean.po; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class ProTaskDeliverPostLogExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public ProTaskDeliverPostLogExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Long value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Long value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Long value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Long value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andDeliverIdIsNull() { - addCriterion("deliver_id is null"); - return (Criteria) this; - } - - public Criteria andDeliverIdIsNotNull() { - addCriterion("deliver_id is not null"); - return (Criteria) this; - } - - public Criteria andDeliverIdEqualTo(Long value) { - addCriterion("deliver_id =", value, "deliverId"); - return (Criteria) this; - } - - public Criteria andDeliverIdNotEqualTo(Long value) { - addCriterion("deliver_id <>", value, "deliverId"); - return (Criteria) this; - } - - public Criteria andDeliverIdGreaterThan(Long value) { - addCriterion("deliver_id >", value, "deliverId"); - return (Criteria) this; - } - - public Criteria andDeliverIdGreaterThanOrEqualTo(Long value) { - addCriterion("deliver_id >=", value, "deliverId"); - return (Criteria) this; - } - - public Criteria andDeliverIdLessThan(Long value) { - addCriterion("deliver_id <", value, "deliverId"); - return (Criteria) this; - } - - public Criteria andDeliverIdLessThanOrEqualTo(Long value) { - addCriterion("deliver_id <=", value, "deliverId"); - return (Criteria) this; - } - - public Criteria andDeliverIdIn(List values) { - addCriterion("deliver_id in", values, "deliverId"); - return (Criteria) this; - } - - public Criteria andDeliverIdNotIn(List values) { - addCriterion("deliver_id not in", values, "deliverId"); - return (Criteria) this; - } - - public Criteria andDeliverIdBetween(Long value1, Long value2) { - addCriterion("deliver_id between", value1, value2, "deliverId"); - return (Criteria) this; - } - - public Criteria andDeliverIdNotBetween(Long value1, Long value2) { - addCriterion("deliver_id not between", value1, value2, "deliverId"); - return (Criteria) this; - } - - public Criteria andTaskSubTimeIdIsNull() { - addCriterion("task_sub_time_id is null"); - return (Criteria) this; - } - - public Criteria andTaskSubTimeIdIsNotNull() { - addCriterion("task_sub_time_id is not null"); - return (Criteria) this; - } - - public Criteria andTaskSubTimeIdEqualTo(Long value) { - addCriterion("task_sub_time_id =", value, "taskSubTimeId"); - return (Criteria) this; - } - - public Criteria andTaskSubTimeIdNotEqualTo(Long value) { - addCriterion("task_sub_time_id <>", value, "taskSubTimeId"); - return (Criteria) this; - } - - public Criteria andTaskSubTimeIdGreaterThan(Long value) { - addCriterion("task_sub_time_id >", value, "taskSubTimeId"); - return (Criteria) this; - } - - public Criteria andTaskSubTimeIdGreaterThanOrEqualTo(Long value) { - addCriterion("task_sub_time_id >=", value, "taskSubTimeId"); - return (Criteria) this; - } - - public Criteria andTaskSubTimeIdLessThan(Long value) { - addCriterion("task_sub_time_id <", value, "taskSubTimeId"); - return (Criteria) this; - } - - public Criteria andTaskSubTimeIdLessThanOrEqualTo(Long value) { - addCriterion("task_sub_time_id <=", value, "taskSubTimeId"); - return (Criteria) this; - } - - public Criteria andTaskSubTimeIdIn(List values) { - addCriterion("task_sub_time_id in", values, "taskSubTimeId"); - return (Criteria) this; - } - - public Criteria andTaskSubTimeIdNotIn(List values) { - addCriterion("task_sub_time_id not in", values, "taskSubTimeId"); - return (Criteria) this; - } - - public Criteria andTaskSubTimeIdBetween(Long value1, Long value2) { - addCriterion("task_sub_time_id between", value1, value2, "taskSubTimeId"); - return (Criteria) this; - } - - public Criteria andTaskSubTimeIdNotBetween(Long value1, Long value2) { - addCriterion("task_sub_time_id not between", value1, value2, "taskSubTimeId"); - return (Criteria) this; - } - - public Criteria andFileIdIsNull() { - addCriterion("file_id is null"); - return (Criteria) this; - } - - public Criteria andFileIdIsNotNull() { - addCriterion("file_id is not null"); - return (Criteria) this; - } - - public Criteria andFileIdEqualTo(Long value) { - addCriterion("file_id =", value, "fileId"); - return (Criteria) this; - } - - public Criteria andFileIdNotEqualTo(Long value) { - addCriterion("file_id <>", value, "fileId"); - return (Criteria) this; - } - - public Criteria andFileIdGreaterThan(Long value) { - addCriterion("file_id >", value, "fileId"); - return (Criteria) this; - } - - public Criteria andFileIdGreaterThanOrEqualTo(Long value) { - addCriterion("file_id >=", value, "fileId"); - return (Criteria) this; - } - - public Criteria andFileIdLessThan(Long value) { - addCriterion("file_id <", value, "fileId"); - return (Criteria) this; - } - - public Criteria andFileIdLessThanOrEqualTo(Long value) { - addCriterion("file_id <=", value, "fileId"); - return (Criteria) this; - } - - public Criteria andFileIdIn(List values) { - addCriterion("file_id in", values, "fileId"); - return (Criteria) this; - } - - public Criteria andFileIdNotIn(List values) { - addCriterion("file_id not in", values, "fileId"); - return (Criteria) this; - } - - public Criteria andFileIdBetween(Long value1, Long value2) { - addCriterion("file_id between", value1, value2, "fileId"); - return (Criteria) this; - } - - public Criteria andFileIdNotBetween(Long value1, Long value2) { - addCriterion("file_id not between", value1, value2, "fileId"); - return (Criteria) this; - } - - public Criteria andUserIdIsNull() { - addCriterion("user_id is null"); - return (Criteria) this; - } - - public Criteria andUserIdIsNotNull() { - addCriterion("user_id is not null"); - return (Criteria) this; - } - - public Criteria andUserIdEqualTo(Long value) { - addCriterion("user_id =", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdNotEqualTo(Long value) { - addCriterion("user_id <>", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdGreaterThan(Long value) { - addCriterion("user_id >", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdGreaterThanOrEqualTo(Long value) { - addCriterion("user_id >=", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdLessThan(Long value) { - addCriterion("user_id <", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdLessThanOrEqualTo(Long value) { - addCriterion("user_id <=", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdIn(List values) { - addCriterion("user_id in", values, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdNotIn(List values) { - addCriterion("user_id not in", values, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdBetween(Long value1, Long value2) { - addCriterion("user_id between", value1, value2, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdNotBetween(Long value1, Long value2) { - addCriterion("user_id not between", value1, value2, "userId"); - return (Criteria) this; - } - - public Criteria andVersionIsNull() { - addCriterion("version is null"); - return (Criteria) this; - } - - public Criteria andVersionIsNotNull() { - addCriterion("version is not null"); - return (Criteria) this; - } - - public Criteria andVersionEqualTo(String value) { - addCriterion("version =", value, "version"); - return (Criteria) this; - } - - public Criteria andVersionNotEqualTo(String value) { - addCriterion("version <>", value, "version"); - return (Criteria) this; - } - - public Criteria andVersionGreaterThan(String value) { - addCriterion("version >", value, "version"); - return (Criteria) this; - } - - public Criteria andVersionGreaterThanOrEqualTo(String value) { - addCriterion("version >=", value, "version"); - return (Criteria) this; - } - - public Criteria andVersionLessThan(String value) { - addCriterion("version <", value, "version"); - return (Criteria) this; - } - - public Criteria andVersionLessThanOrEqualTo(String value) { - addCriterion("version <=", value, "version"); - return (Criteria) this; - } - - public Criteria andVersionLike(String value) { - addCriterion("version like", value, "version"); - return (Criteria) this; - } - - public Criteria andVersionNotLike(String value) { - addCriterion("version not like", value, "version"); - return (Criteria) this; - } - - public Criteria andVersionIn(List values) { - addCriterion("version in", values, "version"); - return (Criteria) this; - } - - public Criteria andVersionNotIn(List values) { - addCriterion("version not in", values, "version"); - return (Criteria) this; - } - - public Criteria andVersionBetween(String value1, String value2) { - addCriterion("version between", value1, value2, "version"); - return (Criteria) this; - } - - public Criteria andVersionNotBetween(String value1, String value2) { - addCriterion("version not between", value1, value2, "version"); - return (Criteria) this; - } - - public Criteria andDescriptionIsNull() { - addCriterion("description is null"); - return (Criteria) this; - } - - public Criteria andDescriptionIsNotNull() { - addCriterion("description is not null"); - return (Criteria) this; - } - - public Criteria andDescriptionEqualTo(String value) { - addCriterion("description =", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotEqualTo(String value) { - addCriterion("description <>", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionGreaterThan(String value) { - addCriterion("description >", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionGreaterThanOrEqualTo(String value) { - addCriterion("description >=", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionLessThan(String value) { - addCriterion("description <", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionLessThanOrEqualTo(String value) { - addCriterion("description <=", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionLike(String value) { - addCriterion("description like", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotLike(String value) { - addCriterion("description not like", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionIn(List values) { - addCriterion("description in", values, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotIn(List values) { - addCriterion("description not in", values, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionBetween(String value1, String value2) { - addCriterion("description between", value1, value2, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotBetween(String value1, String value2) { - addCriterion("description not between", value1, value2, "description"); - return (Criteria) this; - } - - public Criteria andTimeIsNull() { - addCriterion("time is null"); - return (Criteria) this; - } - - public Criteria andTimeIsNotNull() { - addCriterion("time is not null"); - return (Criteria) this; - } - - public Criteria andTimeEqualTo(Long value) { - addCriterion("time =", value, "time"); - return (Criteria) this; - } - - public Criteria andTimeNotEqualTo(Long value) { - addCriterion("time <>", value, "time"); - return (Criteria) this; - } - - public Criteria andTimeGreaterThan(Long value) { - addCriterion("time >", value, "time"); - return (Criteria) this; - } - - public Criteria andTimeGreaterThanOrEqualTo(Long value) { - addCriterion("time >=", value, "time"); - return (Criteria) this; - } - - public Criteria andTimeLessThan(Long value) { - addCriterion("time <", value, "time"); - return (Criteria) this; - } - - public Criteria andTimeLessThanOrEqualTo(Long value) { - addCriterion("time <=", value, "time"); - return (Criteria) this; - } - - public Criteria andTimeIn(List values) { - addCriterion("time in", values, "time"); - return (Criteria) this; - } - - public Criteria andTimeNotIn(List values) { - addCriterion("time not in", values, "time"); - return (Criteria) this; - } - - public Criteria andTimeBetween(Long value1, Long value2) { - addCriterion("time between", value1, value2, "time"); - return (Criteria) this; - } - - public Criteria andTimeNotBetween(Long value1, Long value2) { - addCriterion("time not between", value1, value2, "time"); - return (Criteria) this; - } - - public Criteria andIsHistoryIsNull() { - addCriterion("is_history is null"); - return (Criteria) this; - } - - public Criteria andIsHistoryIsNotNull() { - addCriterion("is_history is not null"); - return (Criteria) this; - } - - public Criteria andIsHistoryEqualTo(Integer value) { - addCriterion("is_history =", value, "isHistory"); - return (Criteria) this; - } - - public Criteria andIsHistoryNotEqualTo(Integer value) { - addCriterion("is_history <>", value, "isHistory"); - return (Criteria) this; - } - - public Criteria andIsHistoryGreaterThan(Integer value) { - addCriterion("is_history >", value, "isHistory"); - return (Criteria) this; - } - - public Criteria andIsHistoryGreaterThanOrEqualTo(Integer value) { - addCriterion("is_history >=", value, "isHistory"); - return (Criteria) this; - } - - public Criteria andIsHistoryLessThan(Integer value) { - addCriterion("is_history <", value, "isHistory"); - return (Criteria) this; - } - - public Criteria andIsHistoryLessThanOrEqualTo(Integer value) { - addCriterion("is_history <=", value, "isHistory"); - return (Criteria) this; - } - - public Criteria andIsHistoryIn(List values) { - addCriterion("is_history in", values, "isHistory"); - return (Criteria) this; - } - - public Criteria andIsHistoryNotIn(List values) { - addCriterion("is_history not in", values, "isHistory"); - return (Criteria) this; - } - - public Criteria andIsHistoryBetween(Integer value1, Integer value2) { - addCriterion("is_history between", value1, value2, "isHistory"); - return (Criteria) this; - } - - public Criteria andIsHistoryNotBetween(Integer value1, Integer value2) { - addCriterion("is_history not between", value1, value2, "isHistory"); - return (Criteria) this; - } - - public Criteria andCreatedAtIsNull() { - addCriterion("created_at is null"); - return (Criteria) this; - } - - public Criteria andCreatedAtIsNotNull() { - addCriterion("created_at is not null"); - return (Criteria) this; - } - - public Criteria andCreatedAtEqualTo(Date value) { - addCriterion("created_at =", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtNotEqualTo(Date value) { - addCriterion("created_at <>", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtGreaterThan(Date value) { - addCriterion("created_at >", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { - addCriterion("created_at >=", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtLessThan(Date value) { - addCriterion("created_at <", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtLessThanOrEqualTo(Date value) { - addCriterion("created_at <=", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtIn(List values) { - addCriterion("created_at in", values, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtNotIn(List values) { - addCriterion("created_at not in", values, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtBetween(Date value1, Date value2) { - addCriterion("created_at between", value1, value2, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtNotBetween(Date value1, Date value2) { - addCriterion("created_at not between", value1, value2, "createdAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtIsNull() { - addCriterion("updated_at is null"); - return (Criteria) this; - } - - public Criteria andUpdatedAtIsNotNull() { - addCriterion("updated_at is not null"); - return (Criteria) this; - } - - public Criteria andUpdatedAtEqualTo(Date value) { - addCriterion("updated_at =", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtNotEqualTo(Date value) { - addCriterion("updated_at <>", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtGreaterThan(Date value) { - addCriterion("updated_at >", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { - addCriterion("updated_at >=", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtLessThan(Date value) { - addCriterion("updated_at <", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { - addCriterion("updated_at <=", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtIn(List values) { - addCriterion("updated_at in", values, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtNotIn(List values) { - addCriterion("updated_at not in", values, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtBetween(Date value1, Date value2) { - addCriterion("updated_at between", value1, value2, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { - addCriterion("updated_at not between", value1, value2, "updatedAt"); - return (Criteria) this; - } - - public Criteria andRecStatusIsNull() { - addCriterion("rec_status is null"); - return (Criteria) this; - } - - public Criteria andRecStatusIsNotNull() { - addCriterion("rec_status is not null"); - return (Criteria) this; - } - - public Criteria andRecStatusEqualTo(Byte value) { - addCriterion("rec_status =", value, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusNotEqualTo(Byte value) { - addCriterion("rec_status <>", value, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusGreaterThan(Byte value) { - addCriterion("rec_status >", value, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { - addCriterion("rec_status >=", value, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusLessThan(Byte value) { - addCriterion("rec_status <", value, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusLessThanOrEqualTo(Byte value) { - addCriterion("rec_status <=", value, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusIn(List values) { - addCriterion("rec_status in", values, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusNotIn(List values) { - addCriterion("rec_status not in", values, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusBetween(Byte value1, Byte value2) { - addCriterion("rec_status between", value1, value2, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { - addCriterion("rec_status not between", value1, value2, "recStatus"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } +package com.ccsens.tall.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ProTaskDeliverPostLogExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public ProTaskDeliverPostLogExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andDeliverIdIsNull() { + addCriterion("deliver_id is null"); + return (Criteria) this; + } + + public Criteria andDeliverIdIsNotNull() { + addCriterion("deliver_id is not null"); + return (Criteria) this; + } + + public Criteria andDeliverIdEqualTo(Long value) { + addCriterion("deliver_id =", value, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdNotEqualTo(Long value) { + addCriterion("deliver_id <>", value, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdGreaterThan(Long value) { + addCriterion("deliver_id >", value, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdGreaterThanOrEqualTo(Long value) { + addCriterion("deliver_id >=", value, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdLessThan(Long value) { + addCriterion("deliver_id <", value, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdLessThanOrEqualTo(Long value) { + addCriterion("deliver_id <=", value, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdIn(List values) { + addCriterion("deliver_id in", values, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdNotIn(List values) { + addCriterion("deliver_id not in", values, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdBetween(Long value1, Long value2) { + addCriterion("deliver_id between", value1, value2, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdNotBetween(Long value1, Long value2) { + addCriterion("deliver_id not between", value1, value2, "deliverId"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdIsNull() { + addCriterion("task_sub_time_id is null"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdIsNotNull() { + addCriterion("task_sub_time_id is not null"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdEqualTo(Long value) { + addCriterion("task_sub_time_id =", value, "taskSubTimeId"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdNotEqualTo(Long value) { + addCriterion("task_sub_time_id <>", value, "taskSubTimeId"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdGreaterThan(Long value) { + addCriterion("task_sub_time_id >", value, "taskSubTimeId"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdGreaterThanOrEqualTo(Long value) { + addCriterion("task_sub_time_id >=", value, "taskSubTimeId"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdLessThan(Long value) { + addCriterion("task_sub_time_id <", value, "taskSubTimeId"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdLessThanOrEqualTo(Long value) { + addCriterion("task_sub_time_id <=", value, "taskSubTimeId"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdIn(List values) { + addCriterion("task_sub_time_id in", values, "taskSubTimeId"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdNotIn(List values) { + addCriterion("task_sub_time_id not in", values, "taskSubTimeId"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdBetween(Long value1, Long value2) { + addCriterion("task_sub_time_id between", value1, value2, "taskSubTimeId"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdNotBetween(Long value1, Long value2) { + addCriterion("task_sub_time_id not between", value1, value2, "taskSubTimeId"); + return (Criteria) this; + } + + public Criteria andFileIdIsNull() { + addCriterion("file_id is null"); + return (Criteria) this; + } + + public Criteria andFileIdIsNotNull() { + addCriterion("file_id is not null"); + return (Criteria) this; + } + + public Criteria andFileIdEqualTo(Long value) { + addCriterion("file_id =", value, "fileId"); + return (Criteria) this; + } + + public Criteria andFileIdNotEqualTo(Long value) { + addCriterion("file_id <>", value, "fileId"); + return (Criteria) this; + } + + public Criteria andFileIdGreaterThan(Long value) { + addCriterion("file_id >", value, "fileId"); + return (Criteria) this; + } + + public Criteria andFileIdGreaterThanOrEqualTo(Long value) { + addCriterion("file_id >=", value, "fileId"); + return (Criteria) this; + } + + public Criteria andFileIdLessThan(Long value) { + addCriterion("file_id <", value, "fileId"); + return (Criteria) this; + } + + public Criteria andFileIdLessThanOrEqualTo(Long value) { + addCriterion("file_id <=", value, "fileId"); + return (Criteria) this; + } + + public Criteria andFileIdIn(List values) { + addCriterion("file_id in", values, "fileId"); + return (Criteria) this; + } + + public Criteria andFileIdNotIn(List values) { + addCriterion("file_id not in", values, "fileId"); + return (Criteria) this; + } + + public Criteria andFileIdBetween(Long value1, Long value2) { + addCriterion("file_id between", value1, value2, "fileId"); + return (Criteria) this; + } + + public Criteria andFileIdNotBetween(Long value1, Long value2) { + addCriterion("file_id not between", value1, value2, "fileId"); + return (Criteria) this; + } + + public Criteria andUserIdIsNull() { + addCriterion("user_id is null"); + return (Criteria) this; + } + + public Criteria andUserIdIsNotNull() { + addCriterion("user_id is not null"); + return (Criteria) this; + } + + public Criteria andUserIdEqualTo(Long value) { + addCriterion("user_id =", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotEqualTo(Long value) { + addCriterion("user_id <>", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThan(Long value) { + addCriterion("user_id >", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThanOrEqualTo(Long value) { + addCriterion("user_id >=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThan(Long value) { + addCriterion("user_id <", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThanOrEqualTo(Long value) { + addCriterion("user_id <=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdIn(List values) { + addCriterion("user_id in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotIn(List values) { + addCriterion("user_id not in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdBetween(Long value1, Long value2) { + addCriterion("user_id between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotBetween(Long value1, Long value2) { + addCriterion("user_id not between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andVersionIsNull() { + addCriterion("version is null"); + return (Criteria) this; + } + + public Criteria andVersionIsNotNull() { + addCriterion("version is not null"); + return (Criteria) this; + } + + public Criteria andVersionEqualTo(String value) { + addCriterion("version =", value, "version"); + return (Criteria) this; + } + + public Criteria andVersionNotEqualTo(String value) { + addCriterion("version <>", value, "version"); + return (Criteria) this; + } + + public Criteria andVersionGreaterThan(String value) { + addCriterion("version >", value, "version"); + return (Criteria) this; + } + + public Criteria andVersionGreaterThanOrEqualTo(String value) { + addCriterion("version >=", value, "version"); + return (Criteria) this; + } + + public Criteria andVersionLessThan(String value) { + addCriterion("version <", value, "version"); + return (Criteria) this; + } + + public Criteria andVersionLessThanOrEqualTo(String value) { + addCriterion("version <=", value, "version"); + return (Criteria) this; + } + + public Criteria andVersionLike(String value) { + addCriterion("version like", value, "version"); + return (Criteria) this; + } + + public Criteria andVersionNotLike(String value) { + addCriterion("version not like", value, "version"); + return (Criteria) this; + } + + public Criteria andVersionIn(List values) { + addCriterion("version in", values, "version"); + return (Criteria) this; + } + + public Criteria andVersionNotIn(List values) { + addCriterion("version not in", values, "version"); + return (Criteria) this; + } + + public Criteria andVersionBetween(String value1, String value2) { + addCriterion("version between", value1, value2, "version"); + return (Criteria) this; + } + + public Criteria andVersionNotBetween(String value1, String value2) { + addCriterion("version not between", value1, value2, "version"); + return (Criteria) this; + } + + public Criteria andDescriptionIsNull() { + addCriterion("description is null"); + return (Criteria) this; + } + + public Criteria andDescriptionIsNotNull() { + addCriterion("description is not null"); + return (Criteria) this; + } + + public Criteria andDescriptionEqualTo(String value) { + addCriterion("description =", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotEqualTo(String value) { + addCriterion("description <>", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionGreaterThan(String value) { + addCriterion("description >", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionGreaterThanOrEqualTo(String value) { + addCriterion("description >=", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLessThan(String value) { + addCriterion("description <", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLessThanOrEqualTo(String value) { + addCriterion("description <=", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLike(String value) { + addCriterion("description like", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotLike(String value) { + addCriterion("description not like", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionIn(List values) { + addCriterion("description in", values, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotIn(List values) { + addCriterion("description not in", values, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionBetween(String value1, String value2) { + addCriterion("description between", value1, value2, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotBetween(String value1, String value2) { + addCriterion("description not between", value1, value2, "description"); + return (Criteria) this; + } + + public Criteria andTimeIsNull() { + addCriterion("time is null"); + return (Criteria) this; + } + + public Criteria andTimeIsNotNull() { + addCriterion("time is not null"); + return (Criteria) this; + } + + public Criteria andTimeEqualTo(Long value) { + addCriterion("time =", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeNotEqualTo(Long value) { + addCriterion("time <>", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeGreaterThan(Long value) { + addCriterion("time >", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeGreaterThanOrEqualTo(Long value) { + addCriterion("time >=", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeLessThan(Long value) { + addCriterion("time <", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeLessThanOrEqualTo(Long value) { + addCriterion("time <=", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeIn(List values) { + addCriterion("time in", values, "time"); + return (Criteria) this; + } + + public Criteria andTimeNotIn(List values) { + addCriterion("time not in", values, "time"); + return (Criteria) this; + } + + public Criteria andTimeBetween(Long value1, Long value2) { + addCriterion("time between", value1, value2, "time"); + return (Criteria) this; + } + + public Criteria andTimeNotBetween(Long value1, Long value2) { + addCriterion("time not between", value1, value2, "time"); + return (Criteria) this; + } + + public Criteria andIsHistoryIsNull() { + addCriterion("is_history is null"); + return (Criteria) this; + } + + public Criteria andIsHistoryIsNotNull() { + addCriterion("is_history is not null"); + return (Criteria) this; + } + + public Criteria andIsHistoryEqualTo(Integer value) { + addCriterion("is_history =", value, "isHistory"); + return (Criteria) this; + } + + public Criteria andIsHistoryNotEqualTo(Integer value) { + addCriterion("is_history <>", value, "isHistory"); + return (Criteria) this; + } + + public Criteria andIsHistoryGreaterThan(Integer value) { + addCriterion("is_history >", value, "isHistory"); + return (Criteria) this; + } + + public Criteria andIsHistoryGreaterThanOrEqualTo(Integer value) { + addCriterion("is_history >=", value, "isHistory"); + return (Criteria) this; + } + + public Criteria andIsHistoryLessThan(Integer value) { + addCriterion("is_history <", value, "isHistory"); + return (Criteria) this; + } + + public Criteria andIsHistoryLessThanOrEqualTo(Integer value) { + addCriterion("is_history <=", value, "isHistory"); + return (Criteria) this; + } + + public Criteria andIsHistoryIn(List values) { + addCriterion("is_history in", values, "isHistory"); + return (Criteria) this; + } + + public Criteria andIsHistoryNotIn(List values) { + addCriterion("is_history not in", values, "isHistory"); + return (Criteria) this; + } + + public Criteria andIsHistoryBetween(Integer value1, Integer value2) { + addCriterion("is_history between", value1, value2, "isHistory"); + return (Criteria) this; + } + + public Criteria andIsHistoryNotBetween(Integer value1, Integer value2) { + addCriterion("is_history not between", value1, value2, "isHistory"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andFilesIdIsNull() { + addCriterion("files_id is null"); + return (Criteria) this; + } + + public Criteria andFilesIdIsNotNull() { + addCriterion("files_id is not null"); + return (Criteria) this; + } + + public Criteria andFilesIdEqualTo(String value) { + addCriterion("files_id =", value, "filesId"); + return (Criteria) this; + } + + public Criteria andFilesIdNotEqualTo(String value) { + addCriterion("files_id <>", value, "filesId"); + return (Criteria) this; + } + + public Criteria andFilesIdGreaterThan(String value) { + addCriterion("files_id >", value, "filesId"); + return (Criteria) this; + } + + public Criteria andFilesIdGreaterThanOrEqualTo(String value) { + addCriterion("files_id >=", value, "filesId"); + return (Criteria) this; + } + + public Criteria andFilesIdLessThan(String value) { + addCriterion("files_id <", value, "filesId"); + return (Criteria) this; + } + + public Criteria andFilesIdLessThanOrEqualTo(String value) { + addCriterion("files_id <=", value, "filesId"); + return (Criteria) this; + } + + public Criteria andFilesIdLike(String value) { + addCriterion("files_id like", value, "filesId"); + return (Criteria) this; + } + + public Criteria andFilesIdNotLike(String value) { + addCriterion("files_id not like", value, "filesId"); + return (Criteria) this; + } + + public Criteria andFilesIdIn(List values) { + addCriterion("files_id in", values, "filesId"); + return (Criteria) this; + } + + public Criteria andFilesIdNotIn(List values) { + addCriterion("files_id not in", values, "filesId"); + return (Criteria) this; + } + + public Criteria andFilesIdBetween(String value1, String value2) { + addCriterion("files_id between", value1, value2, "filesId"); + return (Criteria) this; + } + + public Criteria andFilesIdNotBetween(String value1, String value2) { + addCriterion("files_id not between", value1, value2, "filesId"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } } \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/DeliverVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/DeliverVo.java index 794ed709..3201f185 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/DeliverVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/DeliverVo.java @@ -7,8 +7,12 @@ import lombok.Data; import lombok.Getter; import lombok.Setter; +import java.util.ArrayList; import java.util.Date; import java.util.List; +/** + * @author 逗 + */ @Data public class DeliverVo { @@ -37,7 +41,7 @@ public class DeliverVo { private String description; @ApiModelProperty("上传交付物的时间") private Long time; - @ApiModelProperty("上传交付物的时间") + @ApiModelProperty("删除交付物的时间") private Long deleteTime; @ApiModelProperty("交付物访问路径") private String url; @@ -61,9 +65,9 @@ public class DeliverVo { @ApiModel @Data public static class Checker { - @ApiModelProperty("检查人") + @ApiModelProperty("检查人(角色)") private Long checkerId; - @ApiModelProperty("检查人姓名") + @ApiModelProperty("检查人姓名(角色)") private String checkerName; @ApiModelProperty("检查情况 0未检查,1合格,2不合格") private int checkerStatus; @@ -71,6 +75,8 @@ public class DeliverVo { private int score; @ApiModelProperty("检查人备注") private String remark; + @ApiModelProperty("该用户自身是否是此交付物的检查人") + private Boolean isChecker; } //交付物清单 @@ -148,4 +154,39 @@ public class DeliverVo { } + + + @ApiModel("通过任务id查找输出文档") + @Data + public static class QueryDeliverByTaskId { + @ApiModelProperty("交付物Id") + private Long deliverId; + @ApiModelProperty("交付物名") + private String deliverName; + @ApiModelProperty("上传记录") + private List deliverRecodes; + } + + @ApiModel("输出文档的上传记录") + @Data + public static class DeliverRecode { + @ApiModelProperty("交付物上传的记录id") + private Long deliverLogId; + @ApiModelProperty("备注信息") + private String description; + @ApiModelProperty("上传交付物的时间") + private Long time; + //所有文件id + @JsonIgnore + private String filesId; +// @ApiModelProperty("上传者id") +// private Long role; +// @ApiModelProperty("上传者名") +// private List role; + @ApiModelProperty("检查状况") + private List checkerList; + @ApiModelProperty("文件列表") + private List fileList = new ArrayList<>(); + } + } diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/TaskDeliverDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/TaskDeliverDao.java index 22d78e29..4675a2fb 100644 --- a/tall/src/main/java/com/ccsens/tall/persist/dao/TaskDeliverDao.java +++ b/tall/src/main/java/com/ccsens/tall/persist/dao/TaskDeliverDao.java @@ -24,4 +24,13 @@ public interface TaskDeliverDao extends ProTaskDeliverMapper{ List getDeliverAllByProject(@Param("projectId")Long projectId); List selectFileInfoByDeliverId(@Param("deliverId")Long deliverId); + + /** + * 通过任务id查询交付物详情 + * @param userId userId + * @param subTimeId 分解后的任务id + * @param taskDetailId 任务详情id + * @return 返回交付物详情 + */ + List queryDeliverByTaskId(@Param("userId")Long userId, @Param("subTimeId")Long subTimeId, @Param("taskDetailId")Long taskDetailId); } diff --git a/tall/src/main/java/com/ccsens/tall/persist/mapper/ProTaskDeliverPostLogMapper.java b/tall/src/main/java/com/ccsens/tall/persist/mapper/ProTaskDeliverPostLogMapper.java index 92d179c9..2ffc4b47 100644 --- a/tall/src/main/java/com/ccsens/tall/persist/mapper/ProTaskDeliverPostLogMapper.java +++ b/tall/src/main/java/com/ccsens/tall/persist/mapper/ProTaskDeliverPostLogMapper.java @@ -1,31 +1,30 @@ -package com.ccsens.tall.persist.mapper; - -import com.ccsens.tall.bean.po.ProTaskDeliverPostLog; -import com.ccsens.tall.bean.po.ProTaskDeliverPostLogExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface ProTaskDeliverPostLogMapper { - long countByExample(ProTaskDeliverPostLogExample example); - - int deleteByExample(ProTaskDeliverPostLogExample example); - - int deleteByPrimaryKey(Long id); - - int insert(ProTaskDeliverPostLog record); - - int insertSelective(ProTaskDeliverPostLog record); - - List selectByExample(ProTaskDeliverPostLogExample example); - - ProTaskDeliverPostLog selectByPrimaryKey(Long id); - - int updateByExampleSelective(@Param("record") ProTaskDeliverPostLog record, @Param("example") ProTaskDeliverPostLogExample example); - - int updateByExample(@Param("record") ProTaskDeliverPostLog record, @Param("example") ProTaskDeliverPostLogExample example); - - int updateByPrimaryKeySelective(ProTaskDeliverPostLog record); - - int updateByPrimaryKey(ProTaskDeliverPostLog record); +package com.ccsens.tall.persist.mapper; + +import com.ccsens.tall.bean.po.ProTaskDeliverPostLog; +import com.ccsens.tall.bean.po.ProTaskDeliverPostLogExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface ProTaskDeliverPostLogMapper { + long countByExample(ProTaskDeliverPostLogExample example); + + int deleteByExample(ProTaskDeliverPostLogExample example); + + int deleteByPrimaryKey(Long id); + + int insert(ProTaskDeliverPostLog record); + + int insertSelective(ProTaskDeliverPostLog record); + + List selectByExample(ProTaskDeliverPostLogExample example); + + ProTaskDeliverPostLog selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") ProTaskDeliverPostLog record, @Param("example") ProTaskDeliverPostLogExample example); + + int updateByExample(@Param("record") ProTaskDeliverPostLog record, @Param("example") ProTaskDeliverPostLogExample example); + + int updateByPrimaryKeySelective(ProTaskDeliverPostLog record); + + int updateByPrimaryKey(ProTaskDeliverPostLog record); } \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/service/ITaskDeliverService.java b/tall/src/main/java/com/ccsens/tall/service/ITaskDeliverService.java index c93e9db5..3d693079 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ITaskDeliverService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ITaskDeliverService.java @@ -34,4 +34,12 @@ public interface ITaskDeliverService { void deleteDeliver(Long userId, Long deliverId, Long taskId) throws Exception; Long isTaskOrSubTime(Long id)throws Exception; + + /** + * 通过任务id查询输出文档信息 + * @param currentUserId userID + * @param taskId 分解后的任务id + * @return 返回输出文档信息 + */ + List queryDeliverByTaskId(Long currentUserId, Long taskId); } diff --git a/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java b/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java index b9521a91..55cc96ef 100644 --- a/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java +++ b/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java @@ -206,74 +206,43 @@ public class TaskDeliverService implements ITaskDeliverService { if (!role.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.AllMember.phase) && !isBelongRole){ throw new BaseException(CodeEnum.IS_NOT_EXECUTOR); } -// //查找以前上传的不为历史信息的文件。改为历史信息 -// ProTaskDeliverPostLogExample logExample = new ProTaskDeliverPostLogExample(); -// logExample.createCriteria().andTaskSubTimeIdEqualTo(subTimeId).andDeliverIdEqualTo(uploadDeliver.getDeliverId()) -// .andUserIdEqualTo(currentUserId).andIsHistoryEqualTo(0); -// List deliverPostLogList = deliverPostLogDao.selectByExample(logExample); -// if (CollectionUtil.isNotEmpty(deliverPostLogList)) { -// for (ProTaskDeliverPostLog deliverPostLog : deliverPostLogList) { -// deliverPostLog.setIsHistory(1); -// deliverPostLogDao.updateByPrimaryKeySelective(deliverPostLog); -// } -// } + //将文件信息与交付物绑定,添加记录deliverPostLog if (CollectionUtil.isNotEmpty(uploadDeliver.getFileInfo()) || StrUtil.isNotEmpty(uploadDeliver.getDescription())) { - if(CollectionUtil.isEmpty(uploadDeliver.getFileInfo())){ - ProTaskDeliverPostLog deliverPostLog = new ProTaskDeliverPostLog(); - deliverPostLog.setId(snowflake.nextId()); - deliverPostLog.setDeliverId(uploadDeliver.getDeliverId()); - deliverPostLog.setTaskSubTimeId(subTimeId); - deliverPostLog.setUserId(currentUserId); - deliverPostLog.setDescription(uploadDeliver.getDescription()); - deliverPostLog.setTime(now); - deliverPostLog.setIsHistory(0); - deliverPostLogDao.insertSelective(deliverPostLog); - //添加交付物检查人表 - if (CollectionUtil.isNotEmpty(uploadDeliver.getCheckerIdList())) { - ProTaskDeliverPostLogChecker postLogChecker; - for (Long checkerId : uploadDeliver.getCheckerIdList()) { - postLogChecker = new ProTaskDeliverPostLogChecker(); - postLogChecker.setId(snowflake.nextId()); - postLogChecker.setDeliverPostLogId(deliverPostLog.getId()); - postLogChecker.setCheckerId(checkerId); - postLogCheckerDao.insertSelective(postLogChecker); + //拼接文件id + StringBuilder filesId = new StringBuilder(); + if(CollectionUtil.isNotEmpty(uploadDeliver.getFileInfo())){ + for (int i = 0; i < uploadDeliver.getFileInfo().size(); i++) { + DeliverDto.FileInfo fileInfo = uploadDeliver.getFileInfo().get(i); + if(i == 0){ + filesId.append(fileInfo.getId()); + }else { + filesId.append(",").append(fileInfo.getId()); } - } else { - throw new BaseException(CodeEnum.NOT_CHECKER); } - }else { - for (DeliverDto.FileInfo fileInfo : uploadDeliver.getFileInfo()) { -// SysCommitedFile file = commitedFileDao.selectByPrimaryKey(fileInfo.getId()); -// if(ObjectUtil.isNull(file)){ -// throw new BaseException(CodeEnum.NOT_DELIVER_FILE); -// } - ProTaskDeliverPostLog deliverPostLog = new ProTaskDeliverPostLog(); - deliverPostLog.setId(snowflake.nextId()); - deliverPostLog.setDeliverId(uploadDeliver.getDeliverId()); - deliverPostLog.setTaskSubTimeId(subTimeId); - deliverPostLog.setFileId(fileInfo.getId()); - deliverPostLog.setUserId(currentUserId); - deliverPostLog.setDescription(uploadDeliver.getDescription()); - deliverPostLog.setTime(now); - deliverPostLog.setIsHistory(0); - deliverPostLogDao.insertSelective(deliverPostLog); - //添加交付物检查人表 - if (CollectionUtil.isNotEmpty(uploadDeliver.getCheckerIdList())) { - ProTaskDeliverPostLogChecker postLogChecker; - for (Long checkerId : uploadDeliver.getCheckerIdList()) { - postLogChecker = new ProTaskDeliverPostLogChecker(); - postLogChecker.setId(snowflake.nextId()); - postLogChecker.setDeliverPostLogId(deliverPostLog.getId()); - postLogChecker.setCheckerId(checkerId); - postLogCheckerDao.insertSelective(postLogChecker); - } - } else { - throw new BaseException(CodeEnum.NOT_CHECKER); - } - //保存wps的文件消息 - saveWpsFile(currentUserId, deliverPostLog.getId(), fileInfo); + } + ProTaskDeliverPostLog deliverPostLog = new ProTaskDeliverPostLog(); + deliverPostLog.setId(snowflake.nextId()); + deliverPostLog.setDeliverId(uploadDeliver.getDeliverId()); + deliverPostLog.setTaskSubTimeId(subTimeId); + deliverPostLog.setUserId(currentUserId); + deliverPostLog.setDescription(uploadDeliver.getDescription()); + deliverPostLog.setTime(now); + deliverPostLog.setIsHistory(0); + deliverPostLog.setFilesId(filesId.toString()); + deliverPostLogDao.insertSelective(deliverPostLog); + //添加交付物检查人表 + if (CollectionUtil.isNotEmpty(uploadDeliver.getCheckerIdList())) { + ProTaskDeliverPostLogChecker postLogChecker; + for (Long checkerId : uploadDeliver.getCheckerIdList()) { + postLogChecker = new ProTaskDeliverPostLogChecker(); + postLogChecker.setId(snowflake.nextId()); + postLogChecker.setDeliverPostLogId(deliverPostLog.getId()); + postLogChecker.setCheckerId(checkerId); + postLogCheckerDao.insertSelective(postLogChecker); } + } else { + throw new BaseException(CodeEnum.NOT_CHECKER); } //修改交付物状态 ProTaskDeliver deliver = new ProTaskDeliver(); @@ -282,8 +251,6 @@ public class TaskDeliverService implements ITaskDeliverService { taskDeliverDao.updateByPrimaryKeySelective(deliver); } - //发送WS信息 - //获取所有接收者的id List messageUserList = new ArrayList<>(); BaseMessageDto.MessageUser messageUser; @@ -344,6 +311,168 @@ public class TaskDeliverService implements ITaskDeliverService { return deliverInfo; } + +// /** +// * 将文件绑定交付物 +// */ +// @Override +// public ProjectVo.DeliverInfo addDeliver(Long currentUserId, DeliverDto.UploadDeliver uploadDeliver) throws Exception { +// Long now = System.currentTimeMillis(); +// Long subTimeId = isTaskOrSubTime(uploadDeliver.getTaskId()); +// if (ObjectUtil.isNull(subTimeId)) { +// throw new BaseException(CodeEnum.NOT_TASK); +// } +// ProjectVo.DeliverInfo deliverInfo = null; +// //查找交付 +// ProTaskDeliver taskDeliver = taskDeliverDao.selectByPrimaryKey(uploadDeliver.getDeliverId()); +// if (ObjectUtil.isNull(taskDeliver)) { +// throw new BaseException(CodeEnum.NOT_DELIVER); +// } +// +// ProTaskDetail taskDetail = taskDetailDao.selectByPrimaryKey(taskDeliver.getTaskDetailId()); +// ProRole role = proRoleDao.selectByPrimaryKey(taskDetail.getExecutorRole()); +// Boolean isBelongRole = proMemberService.userIsBelongRole(currentUserId, role.getId(),null); +// if (!role.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.AllMember.phase) && !isBelongRole){ +// throw new BaseException(CodeEnum.IS_NOT_EXECUTOR); +// } +//// //查找以前上传的不为历史信息的文件。改为历史信息 +//// ProTaskDeliverPostLogExample logExample = new ProTaskDeliverPostLogExample(); +//// logExample.createCriteria().andTaskSubTimeIdEqualTo(subTimeId).andDeliverIdEqualTo(uploadDeliver.getDeliverId()) +//// .andUserIdEqualTo(currentUserId).andIsHistoryEqualTo(0); +//// List deliverPostLogList = deliverPostLogDao.selectByExample(logExample); +//// if (CollectionUtil.isNotEmpty(deliverPostLogList)) { +//// for (ProTaskDeliverPostLog deliverPostLog : deliverPostLogList) { +//// deliverPostLog.setIsHistory(1); +//// deliverPostLogDao.updateByPrimaryKeySelective(deliverPostLog); +//// } +//// } +// //将文件信息与交付物绑定,添加记录deliverPostLog +// if (CollectionUtil.isNotEmpty(uploadDeliver.getFileInfo()) || StrUtil.isNotEmpty(uploadDeliver.getDescription())) { +// if(CollectionUtil.isEmpty(uploadDeliver.getFileInfo())){ +// ProTaskDeliverPostLog deliverPostLog = new ProTaskDeliverPostLog(); +// deliverPostLog.setId(snowflake.nextId()); +// deliverPostLog.setDeliverId(uploadDeliver.getDeliverId()); +// deliverPostLog.setTaskSubTimeId(subTimeId); +// deliverPostLog.setUserId(currentUserId); +// deliverPostLog.setDescription(uploadDeliver.getDescription()); +// deliverPostLog.setTime(now); +// deliverPostLog.setIsHistory(0); +// deliverPostLogDao.insertSelective(deliverPostLog); +// //添加交付物检查人表 +// if (CollectionUtil.isNotEmpty(uploadDeliver.getCheckerIdList())) { +// ProTaskDeliverPostLogChecker postLogChecker; +// for (Long checkerId : uploadDeliver.getCheckerIdList()) { +// postLogChecker = new ProTaskDeliverPostLogChecker(); +// postLogChecker.setId(snowflake.nextId()); +// postLogChecker.setDeliverPostLogId(deliverPostLog.getId()); +// postLogChecker.setCheckerId(checkerId); +// postLogCheckerDao.insertSelective(postLogChecker); +// } +// } else { +// throw new BaseException(CodeEnum.NOT_CHECKER); +// } +// }else { +// for (DeliverDto.FileInfo fileInfo : uploadDeliver.getFileInfo()) { +//// SysCommitedFile file = commitedFileDao.selectByPrimaryKey(fileInfo.getId()); +//// if(ObjectUtil.isNull(file)){ +//// throw new BaseException(CodeEnum.NOT_DELIVER_FILE); +//// } +// ProTaskDeliverPostLog deliverPostLog = new ProTaskDeliverPostLog(); +// deliverPostLog.setId(snowflake.nextId()); +// deliverPostLog.setDeliverId(uploadDeliver.getDeliverId()); +// deliverPostLog.setTaskSubTimeId(subTimeId); +// deliverPostLog.setFileId(fileInfo.getId()); +// deliverPostLog.setUserId(currentUserId); +// deliverPostLog.setDescription(uploadDeliver.getDescription()); +// deliverPostLog.setTime(now); +// deliverPostLog.setIsHistory(0); +// deliverPostLogDao.insertSelective(deliverPostLog); +// //添加交付物检查人表 +// if (CollectionUtil.isNotEmpty(uploadDeliver.getCheckerIdList())) { +// ProTaskDeliverPostLogChecker postLogChecker; +// for (Long checkerId : uploadDeliver.getCheckerIdList()) { +// postLogChecker = new ProTaskDeliverPostLogChecker(); +// postLogChecker.setId(snowflake.nextId()); +// postLogChecker.setDeliverPostLogId(deliverPostLog.getId()); +// postLogChecker.setCheckerId(checkerId); +// postLogCheckerDao.insertSelective(postLogChecker); +// } +// } else { +// throw new BaseException(CodeEnum.NOT_CHECKER); +// } +// //保存wps的文件消息 +// saveWpsFile(currentUserId, deliverPostLog.getId(), fileInfo); +// } +// } +// //修改交付物状态 +// ProTaskDeliver deliver = new ProTaskDeliver(); +// deliver.setId(uploadDeliver.getDeliverId()); +// deliver.setIsUpload(1); +// taskDeliverDao.updateByPrimaryKeySelective(deliver); +// } +// +// //发送WS信息 +// +// //获取所有接收者的id +// List messageUserList = new ArrayList<>(); +// BaseMessageDto.MessageUser messageUser; +// HashSet userIdSet = new HashSet<>(); +// HashSet userIdStr = new HashSet<>(); +// if (CollectionUtil.isNotEmpty(uploadDeliver.getCheckerIdList())) { +// for (Long postLogCheckerId : uploadDeliver.getCheckerIdList()) { +// userIdSet.addAll(userService.selectUserIdByRoleId(postLogCheckerId)); +// } +// } +// // ws 发送消息 +// Set userIds = new HashSet<>(); +// for (Long userId : userIdSet) { +// messageUser = new BaseMessageDto.MessageUser(); +// messageUser.setUserId(userId); +// messageUserList.add(messageUser); +// userIds.add(userId.toString()); +// } +// Long roleId; +// if (role.getName().equals(WebConstant.ROLE_NAME.AllMember.phase)) { +// List roleList = proMemberService.selectRolesByUserIdAndProjectId(currentUserId, taskDetail.getProjectId(),null); +// roleId = roleList.get(0).getId(); +// } else { +// roleId = taskDetail.getExecutorRole(); +// } +//// DeliverMessageWithUploadDto uploadMessage = new DeliverMessageWithUploadDto(taskDetail.getProjectId(),roleId,taskDetail.getId(), +//// taskDeliver.getId(),taskDeliver.getName(),currentUserId,now,uploadDeliver.getFileInfo(),messageUserList); +//// log.info("上传交付物:{}",JacksonUtil.beanToJson(uploadMessage)); +// DeliverMessageWithUploadDto.Data data = new DeliverMessageWithUploadDto.Data(); +// data.setProjectId(taskDetail.getProjectId()); +// data.setDeliverId(taskDeliver.getId()); +// data.setDeliverName(taskDeliver.getName()); +// data.setRoleId(roleId); +// data.setTaskId(taskDetail.getId()); +// data.setUploader(currentUserId); +// data.setUploadTime(now); +// data.setFile(uploadDeliver.getFileInfo()); +// DeliverMessageWithUploadDto uploadMessage = new DeliverMessageWithUploadDto(); +// uploadMessage.setData(data); +// +// InMessage inMessage = new InMessage(); +// inMessage.setToDomain(MessageConstant.DomainType.User); +// inMessage.setTos(userIds); +// inMessage.setData(JacksonUtil.beanToJson(uploadMessage)); +// rabbitTemplate.convertAndSend(RabbitMQConfig.MESSAGE_QUEUE_NAME, +// JacksonUtil.beanToJson(inMessage) ); +// //用智能助手发送消息 +// SysProject project = sysProjectDao.selectByPrimaryKey(taskDetail.getProjectId()); +// robotService.addDeliverRobotSend(currentUserId,taskDeliver.getName(),subTimeId, project); +// +// //返回 +// List deliverInfoList = taskDeliverDao.selectByDeliverId(uploadDeliver.getDeliverId()); +// if (CollectionUtil.isNotEmpty(deliverInfoList)) { +// deliverInfo = deliverInfoList.get(0); +//// deliverInfo.setUrl(WebConstant.TEST_URL_BASE + deliverInfo.getUrl()); +// deliverInfo.setUrl(PropUtil.imgDomain + "/" + deliverInfo.getUrl()); +// } +// return deliverInfo; +// } + private void saveWpsFile(Long currentUserId, Long deliverLogId, DeliverDto.FileInfo fileInfo) { File file = new File(WebConstant.UPLOAD_PATH_BASE + File.separator + fileInfo.getUrl()); if(file.exists()) { @@ -916,4 +1045,51 @@ public class TaskDeliverService implements ITaskDeliverService { file.delete(); } } + + /** + * 根据任务id查询输出文档的信息 + */ + @Override + public List queryDeliverByTaskId(Long currentUserId, Long taskId) { + //查询分解后的任务 + ProTaskSubTime taskSubTime = taskSubTimeDao.selectByPrimaryKey(taskId); + if(ObjectUtil.isNull(taskSubTime)){ + throw new BaseException(CodeEnum.NOT_TASK); + } + //查询任务详情 + ProTaskDetail taskDetail = taskDetailDao.selectByPrimaryKey(taskSubTime.getTaskDetailId()); + if(ObjectUtil.isNull(taskDetail)){ + throw new BaseException(CodeEnum.NOT_TASK); + } + List queryDeliverByTaskIds = taskDeliverDao.queryDeliverByTaskId(currentUserId, taskSubTime.getId(), taskDetail.getId()); + if(CollectionUtil.isNotEmpty(queryDeliverByTaskIds)){ + queryDeliverByTaskIds.forEach(deliver -> { + if(CollectionUtil.isNotEmpty(deliver.getDeliverRecodes())){ + deliver.getDeliverRecodes().forEach(deliverRecode -> { + if(StrUtil.isNotEmpty(deliverRecode.getFilesId())){ + try { + //拆分文件id + String[] split = deliverRecode.getFilesId().split(","); + List splits =new ArrayList<>(Arrays.asList(split)); + if(split.length != 0){ + //获取文件项目的路径 + String requestUrl = PropUtil.filedeal; + //通过文件id查询文件信息 + String c = RestTemplateUtil.postBody1(requestUrl,splits); + JsonResponse> a = JSONObject.parseObject(c,JsonResponse.class); + if(ObjectUtil.isNotNull(a) && ObjectUtil.isNotNull(a.getData())){ + List fileList = a.getData(); + deliverRecode.setFileList(fileList); + } + } + }catch (Exception e){ + log.info("查询文件信息失败:{}", e); + } + } + }); + } + }); + } + return queryDeliverByTaskIds; + } } diff --git a/tall/src/main/java/com/ccsens/tall/web/DeliverController.java b/tall/src/main/java/com/ccsens/tall/web/DeliverController.java index 265bb901..ba7f1774 100644 --- a/tall/src/main/java/com/ccsens/tall/web/DeliverController.java +++ b/tall/src/main/java/com/ccsens/tall/web/DeliverController.java @@ -156,4 +156,28 @@ public class DeliverController { return JsonResponse.newInstance().ok(); } +// @OperateType(value = 8) +// @ApiOperation(value = "修改交付物的备注",notes = "") +// @ApiImplicitParams({ +// @ApiImplicitParam(name="deliverId",value = "交付物上传Id",required = true,paramType = "query",dataType="String"), +// @ApiImplicitParam(name="taskId",value = "任务Id",required = true,paramType = "query",dataType="String") +// }) +// @RequestMapping(value = "", method = RequestMethod.DELETE, produces = {"application/json;charset=UTF-8"}) +// public JsonResponse deleteDeliver(HttpServletRequest request, +// @RequestParam(required = true)Long deliverLogId, Long taskId) throws Exception { +// Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); +// deliverService.deleteDeliver(currentUserId,deliverLogId,taskId); +// return JsonResponse.newInstance().ok(); +// } + + @ApiOperation(value = "通过任务id查看交付物信息",notes = "") + @ApiImplicitParams({ + }) + @RequestMapping(value = "queryByTaskId", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> queryDeliverByTaskId(HttpServletRequest request, + @Validated @ApiParam @RequestBody DeliverDto.FindDocByTask findDocByTask) throws Exception { + Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); + List queryDeliverByTaskIds = deliverService.queryDeliverByTaskId(currentUserId,findDocByTask.getTaskId()); + return JsonResponse.newInstance().ok(queryDeliverByTaskIds); + } } diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index ebc544af..b5408a3a 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: util-test,common + active: dev + include: util-dev,common diff --git a/tall/src/main/resources/mapper_dao/DeliverDao.xml b/tall/src/main/resources/mapper_dao/DeliverDao.xml index 144997ab..863e6411 100644 --- a/tall/src/main/resources/mapper_dao/DeliverDao.xml +++ b/tall/src/main/resources/mapper_dao/DeliverDao.xml @@ -215,4 +215,71 @@ AND d.id = #{deliverId} + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tall/src/main/resources/mapper_raw/ProTaskDeliverPostLogMapper.xml b/tall/src/main/resources/mapper_raw/ProTaskDeliverPostLogMapper.xml index c24773bc..99be89ee 100644 --- a/tall/src/main/resources/mapper_raw/ProTaskDeliverPostLogMapper.xml +++ b/tall/src/main/resources/mapper_raw/ProTaskDeliverPostLogMapper.xml @@ -1,323 +1,338 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, deliver_id, task_sub_time_id, file_id, user_id, version, description, time, is_history, - created_at, updated_at, rec_status - - - - - delete from t_pro_task_deliver_post_log - where id = #{id,jdbcType=BIGINT} - - - delete from t_pro_task_deliver_post_log - - - - - - insert into t_pro_task_deliver_post_log (id, deliver_id, task_sub_time_id, - file_id, user_id, version, - description, time, is_history, - created_at, updated_at, rec_status - ) - values (#{id,jdbcType=BIGINT}, #{deliverId,jdbcType=BIGINT}, #{taskSubTimeId,jdbcType=BIGINT}, - #{fileId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{version,jdbcType=VARCHAR}, - #{description,jdbcType=VARCHAR}, #{time,jdbcType=BIGINT}, #{isHistory,jdbcType=INTEGER}, - #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} - ) - - - insert into t_pro_task_deliver_post_log - - - id, - - - deliver_id, - - - task_sub_time_id, - - - file_id, - - - user_id, - - - version, - - - description, - - - time, - - - is_history, - - - created_at, - - - updated_at, - - - rec_status, - - - - - #{id,jdbcType=BIGINT}, - - - #{deliverId,jdbcType=BIGINT}, - - - #{taskSubTimeId,jdbcType=BIGINT}, - - - #{fileId,jdbcType=BIGINT}, - - - #{userId,jdbcType=BIGINT}, - - - #{version,jdbcType=VARCHAR}, - - - #{description,jdbcType=VARCHAR}, - - - #{time,jdbcType=BIGINT}, - - - #{isHistory,jdbcType=INTEGER}, - - - #{createdAt,jdbcType=TIMESTAMP}, - - - #{updatedAt,jdbcType=TIMESTAMP}, - - - #{recStatus,jdbcType=TINYINT}, - - - - - - update t_pro_task_deliver_post_log - - - id = #{record.id,jdbcType=BIGINT}, - - - deliver_id = #{record.deliverId,jdbcType=BIGINT}, - - - task_sub_time_id = #{record.taskSubTimeId,jdbcType=BIGINT}, - - - file_id = #{record.fileId,jdbcType=BIGINT}, - - - user_id = #{record.userId,jdbcType=BIGINT}, - - - version = #{record.version,jdbcType=VARCHAR}, - - - description = #{record.description,jdbcType=VARCHAR}, - - - time = #{record.time,jdbcType=BIGINT}, - - - is_history = #{record.isHistory,jdbcType=INTEGER}, - - - created_at = #{record.createdAt,jdbcType=TIMESTAMP}, - - - updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, - - - rec_status = #{record.recStatus,jdbcType=TINYINT}, - - - - - - - - update t_pro_task_deliver_post_log - set id = #{record.id,jdbcType=BIGINT}, - deliver_id = #{record.deliverId,jdbcType=BIGINT}, - task_sub_time_id = #{record.taskSubTimeId,jdbcType=BIGINT}, - file_id = #{record.fileId,jdbcType=BIGINT}, - user_id = #{record.userId,jdbcType=BIGINT}, - version = #{record.version,jdbcType=VARCHAR}, - description = #{record.description,jdbcType=VARCHAR}, - time = #{record.time,jdbcType=BIGINT}, - is_history = #{record.isHistory,jdbcType=INTEGER}, - created_at = #{record.createdAt,jdbcType=TIMESTAMP}, - updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, - rec_status = #{record.recStatus,jdbcType=TINYINT} - - - - - - update t_pro_task_deliver_post_log - - - deliver_id = #{deliverId,jdbcType=BIGINT}, - - - task_sub_time_id = #{taskSubTimeId,jdbcType=BIGINT}, - - - file_id = #{fileId,jdbcType=BIGINT}, - - - user_id = #{userId,jdbcType=BIGINT}, - - - version = #{version,jdbcType=VARCHAR}, - - - description = #{description,jdbcType=VARCHAR}, - - - time = #{time,jdbcType=BIGINT}, - - - is_history = #{isHistory,jdbcType=INTEGER}, - - - created_at = #{createdAt,jdbcType=TIMESTAMP}, - - - updated_at = #{updatedAt,jdbcType=TIMESTAMP}, - - - rec_status = #{recStatus,jdbcType=TINYINT}, - - - where id = #{id,jdbcType=BIGINT} - - - update t_pro_task_deliver_post_log - set deliver_id = #{deliverId,jdbcType=BIGINT}, - task_sub_time_id = #{taskSubTimeId,jdbcType=BIGINT}, - file_id = #{fileId,jdbcType=BIGINT}, - user_id = #{userId,jdbcType=BIGINT}, - version = #{version,jdbcType=VARCHAR}, - description = #{description,jdbcType=VARCHAR}, - time = #{time,jdbcType=BIGINT}, - is_history = #{isHistory,jdbcType=INTEGER}, - created_at = #{createdAt,jdbcType=TIMESTAMP}, - updated_at = #{updatedAt,jdbcType=TIMESTAMP}, - rec_status = #{recStatus,jdbcType=TINYINT} - where id = #{id,jdbcType=BIGINT} - + + + + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, deliver_id, task_sub_time_id, file_id, user_id, version, description, time, is_history, + created_at, updated_at, rec_status, files_id + + + + + delete from t_pro_task_deliver_post_log + where id = #{id,jdbcType=BIGINT} + + + delete from t_pro_task_deliver_post_log + + + + + + insert into t_pro_task_deliver_post_log (id, deliver_id, task_sub_time_id, + file_id, user_id, version, + description, time, is_history, + created_at, updated_at, rec_status, + files_id) + values (#{id,jdbcType=BIGINT}, #{deliverId,jdbcType=BIGINT}, #{taskSubTimeId,jdbcType=BIGINT}, + #{fileId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{version,jdbcType=VARCHAR}, + #{description,jdbcType=VARCHAR}, #{time,jdbcType=BIGINT}, #{isHistory,jdbcType=INTEGER}, + #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, + #{filesId,jdbcType=VARCHAR}) + + + insert into t_pro_task_deliver_post_log + + + id, + + + deliver_id, + + + task_sub_time_id, + + + file_id, + + + user_id, + + + version, + + + description, + + + time, + + + is_history, + + + created_at, + + + updated_at, + + + rec_status, + + + files_id, + + + + + #{id,jdbcType=BIGINT}, + + + #{deliverId,jdbcType=BIGINT}, + + + #{taskSubTimeId,jdbcType=BIGINT}, + + + #{fileId,jdbcType=BIGINT}, + + + #{userId,jdbcType=BIGINT}, + + + #{version,jdbcType=VARCHAR}, + + + #{description,jdbcType=VARCHAR}, + + + #{time,jdbcType=BIGINT}, + + + #{isHistory,jdbcType=INTEGER}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + #{filesId,jdbcType=VARCHAR}, + + + + + + update t_pro_task_deliver_post_log + + + id = #{record.id,jdbcType=BIGINT}, + + + deliver_id = #{record.deliverId,jdbcType=BIGINT}, + + + task_sub_time_id = #{record.taskSubTimeId,jdbcType=BIGINT}, + + + file_id = #{record.fileId,jdbcType=BIGINT}, + + + user_id = #{record.userId,jdbcType=BIGINT}, + + + version = #{record.version,jdbcType=VARCHAR}, + + + description = #{record.description,jdbcType=VARCHAR}, + + + time = #{record.time,jdbcType=BIGINT}, + + + is_history = #{record.isHistory,jdbcType=INTEGER}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + files_id = #{record.filesId,jdbcType=VARCHAR}, + + + + + + + + update t_pro_task_deliver_post_log + set id = #{record.id,jdbcType=BIGINT}, + deliver_id = #{record.deliverId,jdbcType=BIGINT}, + task_sub_time_id = #{record.taskSubTimeId,jdbcType=BIGINT}, + file_id = #{record.fileId,jdbcType=BIGINT}, + user_id = #{record.userId,jdbcType=BIGINT}, + version = #{record.version,jdbcType=VARCHAR}, + description = #{record.description,jdbcType=VARCHAR}, + time = #{record.time,jdbcType=BIGINT}, + is_history = #{record.isHistory,jdbcType=INTEGER}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT}, + files_id = #{record.filesId,jdbcType=VARCHAR} + + + + + + update t_pro_task_deliver_post_log + + + deliver_id = #{deliverId,jdbcType=BIGINT}, + + + task_sub_time_id = #{taskSubTimeId,jdbcType=BIGINT}, + + + file_id = #{fileId,jdbcType=BIGINT}, + + + user_id = #{userId,jdbcType=BIGINT}, + + + version = #{version,jdbcType=VARCHAR}, + + + description = #{description,jdbcType=VARCHAR}, + + + time = #{time,jdbcType=BIGINT}, + + + is_history = #{isHistory,jdbcType=INTEGER}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + files_id = #{filesId,jdbcType=VARCHAR}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_pro_task_deliver_post_log + set deliver_id = #{deliverId,jdbcType=BIGINT}, + task_sub_time_id = #{taskSubTimeId,jdbcType=BIGINT}, + file_id = #{fileId,jdbcType=BIGINT}, + user_id = #{userId,jdbcType=BIGINT}, + version = #{version,jdbcType=VARCHAR}, + description = #{description,jdbcType=VARCHAR}, + time = #{time,jdbcType=BIGINT}, + is_history = #{isHistory,jdbcType=INTEGER}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT}, + files_id = #{filesId,jdbcType=VARCHAR} + where id = #{id,jdbcType=BIGINT} + \ No newline at end of file