diff --git a/tall/src/main/java/com/ccsens/tall/bean/dto/InputDocDto.java b/tall/src/main/java/com/ccsens/tall/bean/dto/InputDocDto.java index 4380626c..2d44b92c 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/dto/InputDocDto.java +++ b/tall/src/main/java/com/ccsens/tall/bean/dto/InputDocDto.java @@ -59,7 +59,7 @@ public class InputDocDto { @ApiModelProperty("任务id") private Long taskId; @NotEmpty(message = "文档名称不能为空") - @ApiModelProperty("文件名称") + @ApiModelProperty("文档名称") private String[] fileName; } @@ -93,8 +93,8 @@ public class InputDocDto { @Data @ApiModel("修改上传文件的备注信息") public static class UpdateDocOfRemark{ - @NotNull(message = "请选择要删除的备注信息") - @ApiModelProperty("文档上传记录id") + @NotNull(message = "请选择要修改输入文件上传id") + @ApiModelProperty("输入文件上传id") private Long recordId; @ApiModelProperty("备注信息") private String remark; diff --git a/tall/src/main/java/com/ccsens/tall/bean/dto/PluginDto.java b/tall/src/main/java/com/ccsens/tall/bean/dto/PluginDto.java index 7d909550..670aec7a 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/dto/PluginDto.java +++ b/tall/src/main/java/com/ccsens/tall/bean/dto/PluginDto.java @@ -5,9 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.NonNull; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import javax.validation.constraints.*; import java.util.List; /** @@ -18,14 +16,94 @@ public class PluginDto { @Data @ApiModel("添加插件") public static class SaveSysPlugin { - @NotEmpty + @NotEmpty(message = "请输入插件名") @ApiModelProperty("插件名（英文的code）") private String name; - @NotEmpty - @ApiModelProperty("插件描述") + @Size(max = 100,message = "详情不能超过一百字") + @NotEmpty(message = "请输入插件详情") + @ApiModelProperty("插件详情") private String description; @ApiModelProperty("插件展示位置 默认2：0不显示，1任务头上右侧图标，2任务详情显示按钮，3任务展开面板显示(特殊形式)") private byte showType = 2; + @ApiModelProperty("插件图标") + private Long pluginIcon; + @ApiModelProperty("插件作者") + private Long pluginAuthor; + @ApiModelProperty("插件类型(0-公共,1-会务,2-医疗,3-pims)") + private Byte pluginClass; + @ApiModelProperty("预览图片") + private List previewImgs; + } + @Data + @ApiModel("添加插件预览图") + public static class PreviewImg { + @ApiModelProperty("预览图id") + private Long previewId; + @Size(max = 100,message = "详情不能超过一百字") + @ApiModelProperty("预览图描述") + private String previewDescription; + } + + @Data + @ApiModel("根据任务id查询插件列表(已添加的)") + public static class FindPluginByTask { + @NotNull(message = "请选择任务") + @ApiModelProperty("任务id") + private Long taskId; + @NotNull(message = "获取角色信息失败") + @ApiModelProperty("角色id") + private Long roleId; + @ApiModelProperty("插件名称") + private String pluginName; + @ApiModelProperty("插件类型(0-公共,1-会务,2-医疗,3-pims)单选") + private Byte pluginType; + } + + @Data + @ApiModel("根据任务id查询插件列表(该任务未添加的的)") + public static class FindPluginByTaskNo { + @NotNull(message = "请选择任务") + @ApiModelProperty("任务id") + private Long taskId; + @NotNull(message = "获取角色信息失败") + @ApiModelProperty("角色id") + private Long roleId; + @ApiModelProperty("插件名称") + private String pluginName; + @ApiModelProperty("插件类型(0-公共,1-会务,2-医疗,3-pims)单选") + private Byte pluginType; + @ApiModelProperty("页数") + private Integer pageNum = 1; + @ApiModelProperty("每页多少条") + private Integer pageSize = 10; + } + + @Data + @ApiModel("给任务添加插件") + public static class AddPluginForTask { + @NotNull(message = "请选择任务") + @ApiModelProperty("任务id") + private Long taskId; + @NotNull(message = "获取角色信息失败") + @ApiModelProperty("角色id") + private Long roleId; + @NotNull(message = "请选择插件") + @ApiModelProperty("插件id") + private Long pluginId; + } + + @Data + @ApiModel("给任务删除插件") + public static class DeletePluginForTask { + @NotNull(message = "请选择任务") + @ApiModelProperty("任务id") + private Long taskId; + @NotNull(message = "获取角色信息失败") + @ApiModelProperty("角色id") + private Long roleId; + @NotNull(message = "请选择插件") + @ApiModelProperty("插件id") + private Long pluginId; } diff --git a/tall/src/main/java/com/ccsens/tall/bean/dto/RoleDto.java b/tall/src/main/java/com/ccsens/tall/bean/dto/RoleDto.java index 7a14081d..0573485a 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/dto/RoleDto.java +++ b/tall/src/main/java/com/ccsens/tall/bean/dto/RoleDto.java @@ -79,4 +79,22 @@ public class RoleDto { @ApiModelProperty("项目id") private Long projectId; } + @Data + @ApiModel("修改角色是否展示") + public static class QueryRoleIsShows { + @ApiModelProperty("项目id") + private Long projectId; + @ApiModelProperty("角色id") + private List roleIds; + @ApiModelProperty("是否展示 true是展示，false是删除不展示") + private Boolean isShow; + } + @Data + @ApiModel("为角色排序得集合") + public static class UpRoleShowsOrder { + @ApiModelProperty("项目id") + private Long projectId; + @ApiModelProperty("按照展示的排序进行排序号") + private List roleIds; + } } diff --git a/tall/src/main/java/com/ccsens/tall/bean/dto/TaskDto.java b/tall/src/main/java/com/ccsens/tall/bean/dto/TaskDto.java index 09bb5d1c..c4474a31 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/dto/TaskDto.java +++ b/tall/src/main/java/com/ccsens/tall/bean/dto/TaskDto.java @@ -44,6 +44,8 @@ public class TaskDto { private List pluginList; @ApiModelProperty("优先级 3,紧急重要 2,紧急不重要 1,重要不紧急 0,不重要不紧急 默认0") private Byte priority; + @ApiModelProperty("标签") + private String milestone; @ApiModelProperty("任务提醒消息") private TaskRemindByAdd taskRemind; } @@ -209,8 +211,8 @@ public class TaskDto { private Long delayTime; @ApiModelProperty("优先级 3,紧急重要 2,紧急不重要 1,重要不紧急 0,不重要不紧急 默认0") private Byte priority; - @ApiModelProperty("是否是里程碑 0否 1是 2普通任务 3关键任务") - private Byte milestone; + @ApiModelProperty("标签") + private String milestone; @ApiModelProperty("交付物id和修改后的名字") private List deliverList; @ApiModelProperty("输入文档的id和修改后的名字") diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/ProPluginPreviewFile.java b/tall/src/main/java/com/ccsens/tall/bean/po/ProPluginPreviewFile.java new file mode 100644 index 00000000..f2cdd59c --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/bean/po/ProPluginPreviewFile.java @@ -0,0 +1,95 @@ +package com.ccsens.tall.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class ProPluginPreviewFile implements Serializable { + private Long id; + + private Long pluginId; + + private Long fileId; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private String previewDescription; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getPluginId() { + return pluginId; + } + + public void setPluginId(Long pluginId) { + this.pluginId = pluginId; + } + + public Long getFileId() { + return fileId; + } + + public void setFileId(Long fileId) { + this.fileId = fileId; + } + + 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 getPreviewDescription() { + return previewDescription; + } + + public void setPreviewDescription(String previewDescription) { + this.previewDescription = previewDescription == null ? null : previewDescription.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(", pluginId=").append(pluginId); + sb.append(", fileId=").append(fileId); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append(", previewDescription=").append(previewDescription); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/ProPluginPreviewFileExample.java b/tall/src/main/java/com/ccsens/tall/bean/po/ProPluginPreviewFileExample.java new file mode 100644 index 00000000..cfa71850 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/bean/po/ProPluginPreviewFileExample.java @@ -0,0 +1,631 @@ +package com.ccsens.tall.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ProPluginPreviewFileExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public ProPluginPreviewFileExample() { + 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 andPluginIdIsNull() { + addCriterion("plugin_id is null"); + return (Criteria) this; + } + + public Criteria andPluginIdIsNotNull() { + addCriterion("plugin_id is not null"); + return (Criteria) this; + } + + public Criteria andPluginIdEqualTo(Long value) { + addCriterion("plugin_id =", value, "pluginId"); + return (Criteria) this; + } + + public Criteria andPluginIdNotEqualTo(Long value) { + addCriterion("plugin_id <>", value, "pluginId"); + return (Criteria) this; + } + + public Criteria andPluginIdGreaterThan(Long value) { + addCriterion("plugin_id >", value, "pluginId"); + return (Criteria) this; + } + + public Criteria andPluginIdGreaterThanOrEqualTo(Long value) { + addCriterion("plugin_id >=", value, "pluginId"); + return (Criteria) this; + } + + public Criteria andPluginIdLessThan(Long value) { + addCriterion("plugin_id <", value, "pluginId"); + return (Criteria) this; + } + + public Criteria andPluginIdLessThanOrEqualTo(Long value) { + addCriterion("plugin_id <=", value, "pluginId"); + return (Criteria) this; + } + + public Criteria andPluginIdIn(List values) { + addCriterion("plugin_id in", values, "pluginId"); + return (Criteria) this; + } + + public Criteria andPluginIdNotIn(List values) { + addCriterion("plugin_id not in", values, "pluginId"); + return (Criteria) this; + } + + public Criteria andPluginIdBetween(Long value1, Long value2) { + addCriterion("plugin_id between", value1, value2, "pluginId"); + return (Criteria) this; + } + + public Criteria andPluginIdNotBetween(Long value1, Long value2) { + addCriterion("plugin_id not between", value1, value2, "pluginId"); + 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 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 andPreviewDescriptionIsNull() { + addCriterion("preview_description is null"); + return (Criteria) this; + } + + public Criteria andPreviewDescriptionIsNotNull() { + addCriterion("preview_description is not null"); + return (Criteria) this; + } + + public Criteria andPreviewDescriptionEqualTo(String value) { + addCriterion("preview_description =", value, "previewDescription"); + return (Criteria) this; + } + + public Criteria andPreviewDescriptionNotEqualTo(String value) { + addCriterion("preview_description <>", value, "previewDescription"); + return (Criteria) this; + } + + public Criteria andPreviewDescriptionGreaterThan(String value) { + addCriterion("preview_description >", value, "previewDescription"); + return (Criteria) this; + } + + public Criteria andPreviewDescriptionGreaterThanOrEqualTo(String value) { + addCriterion("preview_description >=", value, "previewDescription"); + return (Criteria) this; + } + + public Criteria andPreviewDescriptionLessThan(String value) { + addCriterion("preview_description <", value, "previewDescription"); + return (Criteria) this; + } + + public Criteria andPreviewDescriptionLessThanOrEqualTo(String value) { + addCriterion("preview_description <=", value, "previewDescription"); + return (Criteria) this; + } + + public Criteria andPreviewDescriptionLike(String value) { + addCriterion("preview_description like", value, "previewDescription"); + return (Criteria) this; + } + + public Criteria andPreviewDescriptionNotLike(String value) { + addCriterion("preview_description not like", value, "previewDescription"); + return (Criteria) this; + } + + public Criteria andPreviewDescriptionIn(List values) { + addCriterion("preview_description in", values, "previewDescription"); + return (Criteria) this; + } + + public Criteria andPreviewDescriptionNotIn(List values) { + addCriterion("preview_description not in", values, "previewDescription"); + return (Criteria) this; + } + + public Criteria andPreviewDescriptionBetween(String value1, String value2) { + addCriterion("preview_description between", value1, value2, "previewDescription"); + return (Criteria) this; + } + + public Criteria andPreviewDescriptionNotBetween(String value1, String value2) { + addCriterion("preview_description not between", value1, value2, "previewDescription"); + 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/po/ProTaskDetail.java b/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDetail.java index e6be23b9..7fe7fd1b 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDetail.java +++ b/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDetail.java @@ -58,7 +58,7 @@ public class ProTaskDetail implements Serializable { private Byte priority; - private Byte milestone; + private String milestone; private static final long serialVersionUID = 1L; @@ -278,12 +278,12 @@ public class ProTaskDetail implements Serializable { this.priority = priority; } - public Byte getMilestone() { + public String getMilestone() { return milestone; } - public void setMilestone(Byte milestone) { - this.milestone = milestone; + public void setMilestone(String milestone) { + this.milestone = milestone == null ? null : milestone.trim(); } @Override diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDetailExample.java b/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDetailExample.java index 203675e3..82303f41 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDetailExample.java +++ b/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDetailExample.java @@ -1785,52 +1785,62 @@ public class ProTaskDetailExample { return (Criteria) this; } - public Criteria andMilestoneEqualTo(Byte value) { + public Criteria andMilestoneEqualTo(String value) { addCriterion("milestone =", value, "milestone"); return (Criteria) this; } - public Criteria andMilestoneNotEqualTo(Byte value) { + public Criteria andMilestoneNotEqualTo(String value) { addCriterion("milestone <>", value, "milestone"); return (Criteria) this; } - public Criteria andMilestoneGreaterThan(Byte value) { + public Criteria andMilestoneGreaterThan(String value) { addCriterion("milestone >", value, "milestone"); return (Criteria) this; } - public Criteria andMilestoneGreaterThanOrEqualTo(Byte value) { + public Criteria andMilestoneGreaterThanOrEqualTo(String value) { addCriterion("milestone >=", value, "milestone"); return (Criteria) this; } - public Criteria andMilestoneLessThan(Byte value) { + public Criteria andMilestoneLessThan(String value) { addCriterion("milestone <", value, "milestone"); return (Criteria) this; } - public Criteria andMilestoneLessThanOrEqualTo(Byte value) { + public Criteria andMilestoneLessThanOrEqualTo(String value) { addCriterion("milestone <=", value, "milestone"); return (Criteria) this; } - public Criteria andMilestoneIn(List values) { + public Criteria andMilestoneLike(String value) { + addCriterion("milestone like", value, "milestone"); + return (Criteria) this; + } + + public Criteria andMilestoneNotLike(String value) { + addCriterion("milestone not like", value, "milestone"); + return (Criteria) this; + } + + public Criteria andMilestoneIn(List values) { addCriterion("milestone in", values, "milestone"); return (Criteria) this; } - public Criteria andMilestoneNotIn(List values) { + public Criteria andMilestoneNotIn(List values) { addCriterion("milestone not in", values, "milestone"); return (Criteria) this; } - public Criteria andMilestoneBetween(Byte value1, Byte value2) { + public Criteria andMilestoneBetween(String value1, String value2) { addCriterion("milestone between", value1, value2, "milestone"); return (Criteria) this; } - public Criteria andMilestoneNotBetween(Byte value1, Byte value2) { + public Criteria andMilestoneNotBetween(String value1, String value2) { addCriterion("milestone not between", value1, value2, "milestone"); return (Criteria) this; } diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/ProTasketail.java b/tall/src/main/java/com/ccsens/tall/bean/po/ProTasketail.java new file mode 100644 index 00000000..410e1bd7 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/bean/po/ProTasketail.java @@ -0,0 +1,326 @@ +package com.ccsens.tall.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class ProTasketail implements Serializable { + private Long id; + + private Long projectId; + + private String name; + + private String description; + + private Long beginTime; + + private Long endTime; + + private String cycle; + + private Long parentId; + + private String subTask; + + private Long subProjectId; + + private String subProject; + + private Long executorRole; + + private Long checkerRole; + + private Long money; + + private Byte delay; + + private Long delayTime; + + private Long loopTo; + + private Integer loopTimes; + + private Byte virtual; + + private Byte level; + + private Byte hasGroup; + + private Byte finishNeedAll; + + private Byte allMember; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private Byte priority; + + private String milestone; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getProjectId() { + return projectId; + } + + public void setProjectId(Long projectId) { + this.projectId = projectId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name == null ? null : name.trim(); + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description == null ? null : description.trim(); + } + + public Long getBeginTime() { + return beginTime; + } + + public void setBeginTime(Long beginTime) { + this.beginTime = beginTime; + } + + public Long getEndTime() { + return endTime; + } + + public void setEndTime(Long endTime) { + this.endTime = endTime; + } + + public String getCycle() { + return cycle; + } + + public void setCycle(String cycle) { + this.cycle = cycle == null ? null : cycle.trim(); + } + + public Long getParentId() { + return parentId; + } + + public void setParentId(Long parentId) { + this.parentId = parentId; + } + + public String getSubTask() { + return subTask; + } + + public void setSubTask(String subTask) { + this.subTask = subTask == null ? null : subTask.trim(); + } + + public Long getSubProjectId() { + return subProjectId; + } + + public void setSubProjectId(Long subProjectId) { + this.subProjectId = subProjectId; + } + + public String getSubProject() { + return subProject; + } + + public void setSubProject(String subProject) { + this.subProject = subProject == null ? null : subProject.trim(); + } + + public Long getExecutorRole() { + return executorRole; + } + + public void setExecutorRole(Long executorRole) { + this.executorRole = executorRole; + } + + public Long getCheckerRole() { + return checkerRole; + } + + public void setCheckerRole(Long checkerRole) { + this.checkerRole = checkerRole; + } + + public Long getMoney() { + return money; + } + + public void setMoney(Long money) { + this.money = money; + } + + public Byte getDelay() { + return delay; + } + + public void setDelay(Byte delay) { + this.delay = delay; + } + + public Long getDelayTime() { + return delayTime; + } + + public void setDelayTime(Long delayTime) { + this.delayTime = delayTime; + } + + public Long getLoopTo() { + return loopTo; + } + + public void setLoopTo(Long loopTo) { + this.loopTo = loopTo; + } + + public Integer getLoopTimes() { + return loopTimes; + } + + public void setLoopTimes(Integer loopTimes) { + this.loopTimes = loopTimes; + } + + public Byte getVirtual() { + return virtual; + } + + public void setVirtual(Byte virtual) { + this.virtual = virtual; + } + + public Byte getLevel() { + return level; + } + + public void setLevel(Byte level) { + this.level = level; + } + + public Byte getHasGroup() { + return hasGroup; + } + + public void setHasGroup(Byte hasGroup) { + this.hasGroup = hasGroup; + } + + public Byte getFinishNeedAll() { + return finishNeedAll; + } + + public void setFinishNeedAll(Byte finishNeedAll) { + this.finishNeedAll = finishNeedAll; + } + + public Byte getAllMember() { + return allMember; + } + + public void setAllMember(Byte allMember) { + this.allMember = allMember; + } + + 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 Byte getPriority() { + return priority; + } + + public void setPriority(Byte priority) { + this.priority = priority; + } + + public String getMilestone() { + return milestone; + } + + public void setMilestone(String milestone) { + this.milestone = milestone == null ? null : milestone.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(", projectId=").append(projectId); + sb.append(", name=").append(name); + sb.append(", description=").append(description); + sb.append(", beginTime=").append(beginTime); + sb.append(", endTime=").append(endTime); + sb.append(", cycle=").append(cycle); + sb.append(", parentId=").append(parentId); + sb.append(", subTask=").append(subTask); + sb.append(", subProjectId=").append(subProjectId); + sb.append(", subProject=").append(subProject); + sb.append(", executorRole=").append(executorRole); + sb.append(", checkerRole=").append(checkerRole); + sb.append(", money=").append(money); + sb.append(", delay=").append(delay); + sb.append(", delayTime=").append(delayTime); + sb.append(", loopTo=").append(loopTo); + sb.append(", loopTimes=").append(loopTimes); + sb.append(", virtual=").append(virtual); + sb.append(", level=").append(level); + sb.append(", hasGroup=").append(hasGroup); + sb.append(", finishNeedAll=").append(finishNeedAll); + sb.append(", allMember=").append(allMember); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append(", priority=").append(priority); + sb.append(", milestone=").append(milestone); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/ProTasketailExample.java b/tall/src/main/java/com/ccsens/tall/bean/po/ProTasketailExample.java new file mode 100644 index 00000000..53e1e116 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/bean/po/ProTasketailExample.java @@ -0,0 +1,1941 @@ +package com.ccsens.tall.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ProTasketailExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public ProTasketailExample() { + 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 andProjectIdIsNull() { + addCriterion("project_id is null"); + return (Criteria) this; + } + + public Criteria andProjectIdIsNotNull() { + addCriterion("project_id is not null"); + return (Criteria) this; + } + + public Criteria andProjectIdEqualTo(Long value) { + addCriterion("project_id =", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotEqualTo(Long value) { + addCriterion("project_id <>", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdGreaterThan(Long value) { + addCriterion("project_id >", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdGreaterThanOrEqualTo(Long value) { + addCriterion("project_id >=", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdLessThan(Long value) { + addCriterion("project_id <", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdLessThanOrEqualTo(Long value) { + addCriterion("project_id <=", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdIn(List values) { + addCriterion("project_id in", values, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotIn(List values) { + addCriterion("project_id not in", values, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdBetween(Long value1, Long value2) { + addCriterion("project_id between", value1, value2, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotBetween(Long value1, Long value2) { + addCriterion("project_id not between", value1, value2, "projectId"); + return (Criteria) this; + } + + public Criteria andNameIsNull() { + addCriterion("name is null"); + return (Criteria) this; + } + + public Criteria andNameIsNotNull() { + addCriterion("name is not null"); + return (Criteria) this; + } + + public Criteria andNameEqualTo(String value) { + addCriterion("name =", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotEqualTo(String value) { + addCriterion("name <>", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThan(String value) { + addCriterion("name >", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThanOrEqualTo(String value) { + addCriterion("name >=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThan(String value) { + addCriterion("name <", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThanOrEqualTo(String value) { + addCriterion("name <=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLike(String value) { + addCriterion("name like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotLike(String value) { + addCriterion("name not like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameIn(List values) { + addCriterion("name in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameNotIn(List values) { + addCriterion("name not in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameBetween(String value1, String value2) { + addCriterion("name between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andNameNotBetween(String value1, String value2) { + addCriterion("name not between", value1, value2, "name"); + 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 andBeginTimeIsNull() { + addCriterion("begin_time is null"); + return (Criteria) this; + } + + public Criteria andBeginTimeIsNotNull() { + addCriterion("begin_time is not null"); + return (Criteria) this; + } + + public Criteria andBeginTimeEqualTo(Long value) { + addCriterion("begin_time =", value, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeNotEqualTo(Long value) { + addCriterion("begin_time <>", value, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeGreaterThan(Long value) { + addCriterion("begin_time >", value, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeGreaterThanOrEqualTo(Long value) { + addCriterion("begin_time >=", value, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeLessThan(Long value) { + addCriterion("begin_time <", value, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeLessThanOrEqualTo(Long value) { + addCriterion("begin_time <=", value, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeIn(List values) { + addCriterion("begin_time in", values, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeNotIn(List values) { + addCriterion("begin_time not in", values, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeBetween(Long value1, Long value2) { + addCriterion("begin_time between", value1, value2, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeNotBetween(Long value1, Long value2) { + addCriterion("begin_time not between", value1, value2, "beginTime"); + return (Criteria) this; + } + + public Criteria andEndTimeIsNull() { + addCriterion("end_time is null"); + return (Criteria) this; + } + + public Criteria andEndTimeIsNotNull() { + addCriterion("end_time is not null"); + return (Criteria) this; + } + + public Criteria andEndTimeEqualTo(Long value) { + addCriterion("end_time =", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeNotEqualTo(Long value) { + addCriterion("end_time <>", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeGreaterThan(Long value) { + addCriterion("end_time >", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeGreaterThanOrEqualTo(Long value) { + addCriterion("end_time >=", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeLessThan(Long value) { + addCriterion("end_time <", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeLessThanOrEqualTo(Long value) { + addCriterion("end_time <=", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeIn(List values) { + addCriterion("end_time in", values, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeNotIn(List values) { + addCriterion("end_time not in", values, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeBetween(Long value1, Long value2) { + addCriterion("end_time between", value1, value2, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeNotBetween(Long value1, Long value2) { + addCriterion("end_time not between", value1, value2, "endTime"); + return (Criteria) this; + } + + public Criteria andCycleIsNull() { + addCriterion("cycle is null"); + return (Criteria) this; + } + + public Criteria andCycleIsNotNull() { + addCriterion("cycle is not null"); + return (Criteria) this; + } + + public Criteria andCycleEqualTo(String value) { + addCriterion("cycle =", value, "cycle"); + return (Criteria) this; + } + + public Criteria andCycleNotEqualTo(String value) { + addCriterion("cycle <>", value, "cycle"); + return (Criteria) this; + } + + public Criteria andCycleGreaterThan(String value) { + addCriterion("cycle >", value, "cycle"); + return (Criteria) this; + } + + public Criteria andCycleGreaterThanOrEqualTo(String value) { + addCriterion("cycle >=", value, "cycle"); + return (Criteria) this; + } + + public Criteria andCycleLessThan(String value) { + addCriterion("cycle <", value, "cycle"); + return (Criteria) this; + } + + public Criteria andCycleLessThanOrEqualTo(String value) { + addCriterion("cycle <=", value, "cycle"); + return (Criteria) this; + } + + public Criteria andCycleLike(String value) { + addCriterion("cycle like", value, "cycle"); + return (Criteria) this; + } + + public Criteria andCycleNotLike(String value) { + addCriterion("cycle not like", value, "cycle"); + return (Criteria) this; + } + + public Criteria andCycleIn(List values) { + addCriterion("cycle in", values, "cycle"); + return (Criteria) this; + } + + public Criteria andCycleNotIn(List values) { + addCriterion("cycle not in", values, "cycle"); + return (Criteria) this; + } + + public Criteria andCycleBetween(String value1, String value2) { + addCriterion("cycle between", value1, value2, "cycle"); + return (Criteria) this; + } + + public Criteria andCycleNotBetween(String value1, String value2) { + addCriterion("cycle not between", value1, value2, "cycle"); + return (Criteria) this; + } + + public Criteria andParentIdIsNull() { + addCriterion("parent_id is null"); + return (Criteria) this; + } + + public Criteria andParentIdIsNotNull() { + addCriterion("parent_id is not null"); + return (Criteria) this; + } + + public Criteria andParentIdEqualTo(Long value) { + addCriterion("parent_id =", value, "parentId"); + return (Criteria) this; + } + + public Criteria andParentIdNotEqualTo(Long value) { + addCriterion("parent_id <>", value, "parentId"); + return (Criteria) this; + } + + public Criteria andParentIdGreaterThan(Long value) { + addCriterion("parent_id >", value, "parentId"); + return (Criteria) this; + } + + public Criteria andParentIdGreaterThanOrEqualTo(Long value) { + addCriterion("parent_id >=", value, "parentId"); + return (Criteria) this; + } + + public Criteria andParentIdLessThan(Long value) { + addCriterion("parent_id <", value, "parentId"); + return (Criteria) this; + } + + public Criteria andParentIdLessThanOrEqualTo(Long value) { + addCriterion("parent_id <=", value, "parentId"); + return (Criteria) this; + } + + public Criteria andParentIdIn(List values) { + addCriterion("parent_id in", values, "parentId"); + return (Criteria) this; + } + + public Criteria andParentIdNotIn(List values) { + addCriterion("parent_id not in", values, "parentId"); + return (Criteria) this; + } + + public Criteria andParentIdBetween(Long value1, Long value2) { + addCriterion("parent_id between", value1, value2, "parentId"); + return (Criteria) this; + } + + public Criteria andParentIdNotBetween(Long value1, Long value2) { + addCriterion("parent_id not between", value1, value2, "parentId"); + return (Criteria) this; + } + + public Criteria andSubTaskIsNull() { + addCriterion("sub_task is null"); + return (Criteria) this; + } + + public Criteria andSubTaskIsNotNull() { + addCriterion("sub_task is not null"); + return (Criteria) this; + } + + public Criteria andSubTaskEqualTo(String value) { + addCriterion("sub_task =", value, "subTask"); + return (Criteria) this; + } + + public Criteria andSubTaskNotEqualTo(String value) { + addCriterion("sub_task <>", value, "subTask"); + return (Criteria) this; + } + + public Criteria andSubTaskGreaterThan(String value) { + addCriterion("sub_task >", value, "subTask"); + return (Criteria) this; + } + + public Criteria andSubTaskGreaterThanOrEqualTo(String value) { + addCriterion("sub_task >=", value, "subTask"); + return (Criteria) this; + } + + public Criteria andSubTaskLessThan(String value) { + addCriterion("sub_task <", value, "subTask"); + return (Criteria) this; + } + + public Criteria andSubTaskLessThanOrEqualTo(String value) { + addCriterion("sub_task <=", value, "subTask"); + return (Criteria) this; + } + + public Criteria andSubTaskLike(String value) { + addCriterion("sub_task like", value, "subTask"); + return (Criteria) this; + } + + public Criteria andSubTaskNotLike(String value) { + addCriterion("sub_task not like", value, "subTask"); + return (Criteria) this; + } + + public Criteria andSubTaskIn(List values) { + addCriterion("sub_task in", values, "subTask"); + return (Criteria) this; + } + + public Criteria andSubTaskNotIn(List values) { + addCriterion("sub_task not in", values, "subTask"); + return (Criteria) this; + } + + public Criteria andSubTaskBetween(String value1, String value2) { + addCriterion("sub_task between", value1, value2, "subTask"); + return (Criteria) this; + } + + public Criteria andSubTaskNotBetween(String value1, String value2) { + addCriterion("sub_task not between", value1, value2, "subTask"); + return (Criteria) this; + } + + public Criteria andSubProjectIdIsNull() { + addCriterion("sub_project_id is null"); + return (Criteria) this; + } + + public Criteria andSubProjectIdIsNotNull() { + addCriterion("sub_project_id is not null"); + return (Criteria) this; + } + + public Criteria andSubProjectIdEqualTo(Long value) { + addCriterion("sub_project_id =", value, "subProjectId"); + return (Criteria) this; + } + + public Criteria andSubProjectIdNotEqualTo(Long value) { + addCriterion("sub_project_id <>", value, "subProjectId"); + return (Criteria) this; + } + + public Criteria andSubProjectIdGreaterThan(Long value) { + addCriterion("sub_project_id >", value, "subProjectId"); + return (Criteria) this; + } + + public Criteria andSubProjectIdGreaterThanOrEqualTo(Long value) { + addCriterion("sub_project_id >=", value, "subProjectId"); + return (Criteria) this; + } + + public Criteria andSubProjectIdLessThan(Long value) { + addCriterion("sub_project_id <", value, "subProjectId"); + return (Criteria) this; + } + + public Criteria andSubProjectIdLessThanOrEqualTo(Long value) { + addCriterion("sub_project_id <=", value, "subProjectId"); + return (Criteria) this; + } + + public Criteria andSubProjectIdIn(List values) { + addCriterion("sub_project_id in", values, "subProjectId"); + return (Criteria) this; + } + + public Criteria andSubProjectIdNotIn(List values) { + addCriterion("sub_project_id not in", values, "subProjectId"); + return (Criteria) this; + } + + public Criteria andSubProjectIdBetween(Long value1, Long value2) { + addCriterion("sub_project_id between", value1, value2, "subProjectId"); + return (Criteria) this; + } + + public Criteria andSubProjectIdNotBetween(Long value1, Long value2) { + addCriterion("sub_project_id not between", value1, value2, "subProjectId"); + return (Criteria) this; + } + + public Criteria andSubProjectIsNull() { + addCriterion("sub_project is null"); + return (Criteria) this; + } + + public Criteria andSubProjectIsNotNull() { + addCriterion("sub_project is not null"); + return (Criteria) this; + } + + public Criteria andSubProjectEqualTo(String value) { + addCriterion("sub_project =", value, "subProject"); + return (Criteria) this; + } + + public Criteria andSubProjectNotEqualTo(String value) { + addCriterion("sub_project <>", value, "subProject"); + return (Criteria) this; + } + + public Criteria andSubProjectGreaterThan(String value) { + addCriterion("sub_project >", value, "subProject"); + return (Criteria) this; + } + + public Criteria andSubProjectGreaterThanOrEqualTo(String value) { + addCriterion("sub_project >=", value, "subProject"); + return (Criteria) this; + } + + public Criteria andSubProjectLessThan(String value) { + addCriterion("sub_project <", value, "subProject"); + return (Criteria) this; + } + + public Criteria andSubProjectLessThanOrEqualTo(String value) { + addCriterion("sub_project <=", value, "subProject"); + return (Criteria) this; + } + + public Criteria andSubProjectLike(String value) { + addCriterion("sub_project like", value, "subProject"); + return (Criteria) this; + } + + public Criteria andSubProjectNotLike(String value) { + addCriterion("sub_project not like", value, "subProject"); + return (Criteria) this; + } + + public Criteria andSubProjectIn(List values) { + addCriterion("sub_project in", values, "subProject"); + return (Criteria) this; + } + + public Criteria andSubProjectNotIn(List values) { + addCriterion("sub_project not in", values, "subProject"); + return (Criteria) this; + } + + public Criteria andSubProjectBetween(String value1, String value2) { + addCriterion("sub_project between", value1, value2, "subProject"); + return (Criteria) this; + } + + public Criteria andSubProjectNotBetween(String value1, String value2) { + addCriterion("sub_project not between", value1, value2, "subProject"); + return (Criteria) this; + } + + public Criteria andExecutorRoleIsNull() { + addCriterion("executor_role is null"); + return (Criteria) this; + } + + public Criteria andExecutorRoleIsNotNull() { + addCriterion("executor_role is not null"); + return (Criteria) this; + } + + public Criteria andExecutorRoleEqualTo(Long value) { + addCriterion("executor_role =", value, "executorRole"); + return (Criteria) this; + } + + public Criteria andExecutorRoleNotEqualTo(Long value) { + addCriterion("executor_role <>", value, "executorRole"); + return (Criteria) this; + } + + public Criteria andExecutorRoleGreaterThan(Long value) { + addCriterion("executor_role >", value, "executorRole"); + return (Criteria) this; + } + + public Criteria andExecutorRoleGreaterThanOrEqualTo(Long value) { + addCriterion("executor_role >=", value, "executorRole"); + return (Criteria) this; + } + + public Criteria andExecutorRoleLessThan(Long value) { + addCriterion("executor_role <", value, "executorRole"); + return (Criteria) this; + } + + public Criteria andExecutorRoleLessThanOrEqualTo(Long value) { + addCriterion("executor_role <=", value, "executorRole"); + return (Criteria) this; + } + + public Criteria andExecutorRoleIn(List values) { + addCriterion("executor_role in", values, "executorRole"); + return (Criteria) this; + } + + public Criteria andExecutorRoleNotIn(List values) { + addCriterion("executor_role not in", values, "executorRole"); + return (Criteria) this; + } + + public Criteria andExecutorRoleBetween(Long value1, Long value2) { + addCriterion("executor_role between", value1, value2, "executorRole"); + return (Criteria) this; + } + + public Criteria andExecutorRoleNotBetween(Long value1, Long value2) { + addCriterion("executor_role not between", value1, value2, "executorRole"); + return (Criteria) this; + } + + public Criteria andCheckerRoleIsNull() { + addCriterion("checker_role is null"); + return (Criteria) this; + } + + public Criteria andCheckerRoleIsNotNull() { + addCriterion("checker_role is not null"); + return (Criteria) this; + } + + public Criteria andCheckerRoleEqualTo(Long value) { + addCriterion("checker_role =", value, "checkerRole"); + return (Criteria) this; + } + + public Criteria andCheckerRoleNotEqualTo(Long value) { + addCriterion("checker_role <>", value, "checkerRole"); + return (Criteria) this; + } + + public Criteria andCheckerRoleGreaterThan(Long value) { + addCriterion("checker_role >", value, "checkerRole"); + return (Criteria) this; + } + + public Criteria andCheckerRoleGreaterThanOrEqualTo(Long value) { + addCriterion("checker_role >=", value, "checkerRole"); + return (Criteria) this; + } + + public Criteria andCheckerRoleLessThan(Long value) { + addCriterion("checker_role <", value, "checkerRole"); + return (Criteria) this; + } + + public Criteria andCheckerRoleLessThanOrEqualTo(Long value) { + addCriterion("checker_role <=", value, "checkerRole"); + return (Criteria) this; + } + + public Criteria andCheckerRoleIn(List values) { + addCriterion("checker_role in", values, "checkerRole"); + return (Criteria) this; + } + + public Criteria andCheckerRoleNotIn(List values) { + addCriterion("checker_role not in", values, "checkerRole"); + return (Criteria) this; + } + + public Criteria andCheckerRoleBetween(Long value1, Long value2) { + addCriterion("checker_role between", value1, value2, "checkerRole"); + return (Criteria) this; + } + + public Criteria andCheckerRoleNotBetween(Long value1, Long value2) { + addCriterion("checker_role not between", value1, value2, "checkerRole"); + return (Criteria) this; + } + + public Criteria andMoneyIsNull() { + addCriterion("money is null"); + return (Criteria) this; + } + + public Criteria andMoneyIsNotNull() { + addCriterion("money is not null"); + return (Criteria) this; + } + + public Criteria andMoneyEqualTo(Long value) { + addCriterion("money =", value, "money"); + return (Criteria) this; + } + + public Criteria andMoneyNotEqualTo(Long value) { + addCriterion("money <>", value, "money"); + return (Criteria) this; + } + + public Criteria andMoneyGreaterThan(Long value) { + addCriterion("money >", value, "money"); + return (Criteria) this; + } + + public Criteria andMoneyGreaterThanOrEqualTo(Long value) { + addCriterion("money >=", value, "money"); + return (Criteria) this; + } + + public Criteria andMoneyLessThan(Long value) { + addCriterion("money <", value, "money"); + return (Criteria) this; + } + + public Criteria andMoneyLessThanOrEqualTo(Long value) { + addCriterion("money <=", value, "money"); + return (Criteria) this; + } + + public Criteria andMoneyIn(List values) { + addCriterion("money in", values, "money"); + return (Criteria) this; + } + + public Criteria andMoneyNotIn(List values) { + addCriterion("money not in", values, "money"); + return (Criteria) this; + } + + public Criteria andMoneyBetween(Long value1, Long value2) { + addCriterion("money between", value1, value2, "money"); + return (Criteria) this; + } + + public Criteria andMoneyNotBetween(Long value1, Long value2) { + addCriterion("money not between", value1, value2, "money"); + return (Criteria) this; + } + + public Criteria andDelayIsNull() { + addCriterion("delay is null"); + return (Criteria) this; + } + + public Criteria andDelayIsNotNull() { + addCriterion("delay is not null"); + return (Criteria) this; + } + + public Criteria andDelayEqualTo(Byte value) { + addCriterion("delay =", value, "delay"); + return (Criteria) this; + } + + public Criteria andDelayNotEqualTo(Byte value) { + addCriterion("delay <>", value, "delay"); + return (Criteria) this; + } + + public Criteria andDelayGreaterThan(Byte value) { + addCriterion("delay >", value, "delay"); + return (Criteria) this; + } + + public Criteria andDelayGreaterThanOrEqualTo(Byte value) { + addCriterion("delay >=", value, "delay"); + return (Criteria) this; + } + + public Criteria andDelayLessThan(Byte value) { + addCriterion("delay <", value, "delay"); + return (Criteria) this; + } + + public Criteria andDelayLessThanOrEqualTo(Byte value) { + addCriterion("delay <=", value, "delay"); + return (Criteria) this; + } + + public Criteria andDelayIn(List values) { + addCriterion("delay in", values, "delay"); + return (Criteria) this; + } + + public Criteria andDelayNotIn(List values) { + addCriterion("delay not in", values, "delay"); + return (Criteria) this; + } + + public Criteria andDelayBetween(Byte value1, Byte value2) { + addCriterion("delay between", value1, value2, "delay"); + return (Criteria) this; + } + + public Criteria andDelayNotBetween(Byte value1, Byte value2) { + addCriterion("delay not between", value1, value2, "delay"); + return (Criteria) this; + } + + public Criteria andDelayTimeIsNull() { + addCriterion("delay_time is null"); + return (Criteria) this; + } + + public Criteria andDelayTimeIsNotNull() { + addCriterion("delay_time is not null"); + return (Criteria) this; + } + + public Criteria andDelayTimeEqualTo(Long value) { + addCriterion("delay_time =", value, "delayTime"); + return (Criteria) this; + } + + public Criteria andDelayTimeNotEqualTo(Long value) { + addCriterion("delay_time <>", value, "delayTime"); + return (Criteria) this; + } + + public Criteria andDelayTimeGreaterThan(Long value) { + addCriterion("delay_time >", value, "delayTime"); + return (Criteria) this; + } + + public Criteria andDelayTimeGreaterThanOrEqualTo(Long value) { + addCriterion("delay_time >=", value, "delayTime"); + return (Criteria) this; + } + + public Criteria andDelayTimeLessThan(Long value) { + addCriterion("delay_time <", value, "delayTime"); + return (Criteria) this; + } + + public Criteria andDelayTimeLessThanOrEqualTo(Long value) { + addCriterion("delay_time <=", value, "delayTime"); + return (Criteria) this; + } + + public Criteria andDelayTimeIn(List values) { + addCriterion("delay_time in", values, "delayTime"); + return (Criteria) this; + } + + public Criteria andDelayTimeNotIn(List values) { + addCriterion("delay_time not in", values, "delayTime"); + return (Criteria) this; + } + + public Criteria andDelayTimeBetween(Long value1, Long value2) { + addCriterion("delay_time between", value1, value2, "delayTime"); + return (Criteria) this; + } + + public Criteria andDelayTimeNotBetween(Long value1, Long value2) { + addCriterion("delay_time not between", value1, value2, "delayTime"); + return (Criteria) this; + } + + public Criteria andLoopToIsNull() { + addCriterion("loop_to is null"); + return (Criteria) this; + } + + public Criteria andLoopToIsNotNull() { + addCriterion("loop_to is not null"); + return (Criteria) this; + } + + public Criteria andLoopToEqualTo(Long value) { + addCriterion("loop_to =", value, "loopTo"); + return (Criteria) this; + } + + public Criteria andLoopToNotEqualTo(Long value) { + addCriterion("loop_to <>", value, "loopTo"); + return (Criteria) this; + } + + public Criteria andLoopToGreaterThan(Long value) { + addCriterion("loop_to >", value, "loopTo"); + return (Criteria) this; + } + + public Criteria andLoopToGreaterThanOrEqualTo(Long value) { + addCriterion("loop_to >=", value, "loopTo"); + return (Criteria) this; + } + + public Criteria andLoopToLessThan(Long value) { + addCriterion("loop_to <", value, "loopTo"); + return (Criteria) this; + } + + public Criteria andLoopToLessThanOrEqualTo(Long value) { + addCriterion("loop_to <=", value, "loopTo"); + return (Criteria) this; + } + + public Criteria andLoopToIn(List values) { + addCriterion("loop_to in", values, "loopTo"); + return (Criteria) this; + } + + public Criteria andLoopToNotIn(List values) { + addCriterion("loop_to not in", values, "loopTo"); + return (Criteria) this; + } + + public Criteria andLoopToBetween(Long value1, Long value2) { + addCriterion("loop_to between", value1, value2, "loopTo"); + return (Criteria) this; + } + + public Criteria andLoopToNotBetween(Long value1, Long value2) { + addCriterion("loop_to not between", value1, value2, "loopTo"); + return (Criteria) this; + } + + public Criteria andLoopTimesIsNull() { + addCriterion("loop_times is null"); + return (Criteria) this; + } + + public Criteria andLoopTimesIsNotNull() { + addCriterion("loop_times is not null"); + return (Criteria) this; + } + + public Criteria andLoopTimesEqualTo(Integer value) { + addCriterion("loop_times =", value, "loopTimes"); + return (Criteria) this; + } + + public Criteria andLoopTimesNotEqualTo(Integer value) { + addCriterion("loop_times <>", value, "loopTimes"); + return (Criteria) this; + } + + public Criteria andLoopTimesGreaterThan(Integer value) { + addCriterion("loop_times >", value, "loopTimes"); + return (Criteria) this; + } + + public Criteria andLoopTimesGreaterThanOrEqualTo(Integer value) { + addCriterion("loop_times >=", value, "loopTimes"); + return (Criteria) this; + } + + public Criteria andLoopTimesLessThan(Integer value) { + addCriterion("loop_times <", value, "loopTimes"); + return (Criteria) this; + } + + public Criteria andLoopTimesLessThanOrEqualTo(Integer value) { + addCriterion("loop_times <=", value, "loopTimes"); + return (Criteria) this; + } + + public Criteria andLoopTimesIn(List values) { + addCriterion("loop_times in", values, "loopTimes"); + return (Criteria) this; + } + + public Criteria andLoopTimesNotIn(List values) { + addCriterion("loop_times not in", values, "loopTimes"); + return (Criteria) this; + } + + public Criteria andLoopTimesBetween(Integer value1, Integer value2) { + addCriterion("loop_times between", value1, value2, "loopTimes"); + return (Criteria) this; + } + + public Criteria andLoopTimesNotBetween(Integer value1, Integer value2) { + addCriterion("loop_times not between", value1, value2, "loopTimes"); + return (Criteria) this; + } + + public Criteria andVirtualIsNull() { + addCriterion("virtual is null"); + return (Criteria) this; + } + + public Criteria andVirtualIsNotNull() { + addCriterion("virtual is not null"); + return (Criteria) this; + } + + public Criteria andVirtualEqualTo(Byte value) { + addCriterion("virtual =", value, "virtual"); + return (Criteria) this; + } + + public Criteria andVirtualNotEqualTo(Byte value) { + addCriterion("virtual <>", value, "virtual"); + return (Criteria) this; + } + + public Criteria andVirtualGreaterThan(Byte value) { + addCriterion("virtual >", value, "virtual"); + return (Criteria) this; + } + + public Criteria andVirtualGreaterThanOrEqualTo(Byte value) { + addCriterion("virtual >=", value, "virtual"); + return (Criteria) this; + } + + public Criteria andVirtualLessThan(Byte value) { + addCriterion("virtual <", value, "virtual"); + return (Criteria) this; + } + + public Criteria andVirtualLessThanOrEqualTo(Byte value) { + addCriterion("virtual <=", value, "virtual"); + return (Criteria) this; + } + + public Criteria andVirtualIn(List values) { + addCriterion("virtual in", values, "virtual"); + return (Criteria) this; + } + + public Criteria andVirtualNotIn(List values) { + addCriterion("virtual not in", values, "virtual"); + return (Criteria) this; + } + + public Criteria andVirtualBetween(Byte value1, Byte value2) { + addCriterion("virtual between", value1, value2, "virtual"); + return (Criteria) this; + } + + public Criteria andVirtualNotBetween(Byte value1, Byte value2) { + addCriterion("virtual not between", value1, value2, "virtual"); + return (Criteria) this; + } + + public Criteria andLevelIsNull() { + addCriterion("level is null"); + return (Criteria) this; + } + + public Criteria andLevelIsNotNull() { + addCriterion("level is not null"); + return (Criteria) this; + } + + public Criteria andLevelEqualTo(Byte value) { + addCriterion("level =", value, "level"); + return (Criteria) this; + } + + public Criteria andLevelNotEqualTo(Byte value) { + addCriterion("level <>", value, "level"); + return (Criteria) this; + } + + public Criteria andLevelGreaterThan(Byte value) { + addCriterion("level >", value, "level"); + return (Criteria) this; + } + + public Criteria andLevelGreaterThanOrEqualTo(Byte value) { + addCriterion("level >=", value, "level"); + return (Criteria) this; + } + + public Criteria andLevelLessThan(Byte value) { + addCriterion("level <", value, "level"); + return (Criteria) this; + } + + public Criteria andLevelLessThanOrEqualTo(Byte value) { + addCriterion("level <=", value, "level"); + return (Criteria) this; + } + + public Criteria andLevelIn(List values) { + addCriterion("level in", values, "level"); + return (Criteria) this; + } + + public Criteria andLevelNotIn(List values) { + addCriterion("level not in", values, "level"); + return (Criteria) this; + } + + public Criteria andLevelBetween(Byte value1, Byte value2) { + addCriterion("level between", value1, value2, "level"); + return (Criteria) this; + } + + public Criteria andLevelNotBetween(Byte value1, Byte value2) { + addCriterion("level not between", value1, value2, "level"); + return (Criteria) this; + } + + public Criteria andHasGroupIsNull() { + addCriterion("has_group is null"); + return (Criteria) this; + } + + public Criteria andHasGroupIsNotNull() { + addCriterion("has_group is not null"); + return (Criteria) this; + } + + public Criteria andHasGroupEqualTo(Byte value) { + addCriterion("has_group =", value, "hasGroup"); + return (Criteria) this; + } + + public Criteria andHasGroupNotEqualTo(Byte value) { + addCriterion("has_group <>", value, "hasGroup"); + return (Criteria) this; + } + + public Criteria andHasGroupGreaterThan(Byte value) { + addCriterion("has_group >", value, "hasGroup"); + return (Criteria) this; + } + + public Criteria andHasGroupGreaterThanOrEqualTo(Byte value) { + addCriterion("has_group >=", value, "hasGroup"); + return (Criteria) this; + } + + public Criteria andHasGroupLessThan(Byte value) { + addCriterion("has_group <", value, "hasGroup"); + return (Criteria) this; + } + + public Criteria andHasGroupLessThanOrEqualTo(Byte value) { + addCriterion("has_group <=", value, "hasGroup"); + return (Criteria) this; + } + + public Criteria andHasGroupIn(List values) { + addCriterion("has_group in", values, "hasGroup"); + return (Criteria) this; + } + + public Criteria andHasGroupNotIn(List values) { + addCriterion("has_group not in", values, "hasGroup"); + return (Criteria) this; + } + + public Criteria andHasGroupBetween(Byte value1, Byte value2) { + addCriterion("has_group between", value1, value2, "hasGroup"); + return (Criteria) this; + } + + public Criteria andHasGroupNotBetween(Byte value1, Byte value2) { + addCriterion("has_group not between", value1, value2, "hasGroup"); + return (Criteria) this; + } + + public Criteria andFinishNeedAllIsNull() { + addCriterion("finish_need_all is null"); + return (Criteria) this; + } + + public Criteria andFinishNeedAllIsNotNull() { + addCriterion("finish_need_all is not null"); + return (Criteria) this; + } + + public Criteria andFinishNeedAllEqualTo(Byte value) { + addCriterion("finish_need_all =", value, "finishNeedAll"); + return (Criteria) this; + } + + public Criteria andFinishNeedAllNotEqualTo(Byte value) { + addCriterion("finish_need_all <>", value, "finishNeedAll"); + return (Criteria) this; + } + + public Criteria andFinishNeedAllGreaterThan(Byte value) { + addCriterion("finish_need_all >", value, "finishNeedAll"); + return (Criteria) this; + } + + public Criteria andFinishNeedAllGreaterThanOrEqualTo(Byte value) { + addCriterion("finish_need_all >=", value, "finishNeedAll"); + return (Criteria) this; + } + + public Criteria andFinishNeedAllLessThan(Byte value) { + addCriterion("finish_need_all <", value, "finishNeedAll"); + return (Criteria) this; + } + + public Criteria andFinishNeedAllLessThanOrEqualTo(Byte value) { + addCriterion("finish_need_all <=", value, "finishNeedAll"); + return (Criteria) this; + } + + public Criteria andFinishNeedAllIn(List values) { + addCriterion("finish_need_all in", values, "finishNeedAll"); + return (Criteria) this; + } + + public Criteria andFinishNeedAllNotIn(List values) { + addCriterion("finish_need_all not in", values, "finishNeedAll"); + return (Criteria) this; + } + + public Criteria andFinishNeedAllBetween(Byte value1, Byte value2) { + addCriterion("finish_need_all between", value1, value2, "finishNeedAll"); + return (Criteria) this; + } + + public Criteria andFinishNeedAllNotBetween(Byte value1, Byte value2) { + addCriterion("finish_need_all not between", value1, value2, "finishNeedAll"); + return (Criteria) this; + } + + public Criteria andAllMemberIsNull() { + addCriterion("all_member is null"); + return (Criteria) this; + } + + public Criteria andAllMemberIsNotNull() { + addCriterion("all_member is not null"); + return (Criteria) this; + } + + public Criteria andAllMemberEqualTo(Byte value) { + addCriterion("all_member =", value, "allMember"); + return (Criteria) this; + } + + public Criteria andAllMemberNotEqualTo(Byte value) { + addCriterion("all_member <>", value, "allMember"); + return (Criteria) this; + } + + public Criteria andAllMemberGreaterThan(Byte value) { + addCriterion("all_member >", value, "allMember"); + return (Criteria) this; + } + + public Criteria andAllMemberGreaterThanOrEqualTo(Byte value) { + addCriterion("all_member >=", value, "allMember"); + return (Criteria) this; + } + + public Criteria andAllMemberLessThan(Byte value) { + addCriterion("all_member <", value, "allMember"); + return (Criteria) this; + } + + public Criteria andAllMemberLessThanOrEqualTo(Byte value) { + addCriterion("all_member <=", value, "allMember"); + return (Criteria) this; + } + + public Criteria andAllMemberIn(List values) { + addCriterion("all_member in", values, "allMember"); + return (Criteria) this; + } + + public Criteria andAllMemberNotIn(List values) { + addCriterion("all_member not in", values, "allMember"); + return (Criteria) this; + } + + public Criteria andAllMemberBetween(Byte value1, Byte value2) { + addCriterion("all_member between", value1, value2, "allMember"); + return (Criteria) this; + } + + public Criteria andAllMemberNotBetween(Byte value1, Byte value2) { + addCriterion("all_member not between", value1, value2, "allMember"); + 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 andPriorityIsNull() { + addCriterion("priority is null"); + return (Criteria) this; + } + + public Criteria andPriorityIsNotNull() { + addCriterion("priority is not null"); + return (Criteria) this; + } + + public Criteria andPriorityEqualTo(Byte value) { + addCriterion("priority =", value, "priority"); + return (Criteria) this; + } + + public Criteria andPriorityNotEqualTo(Byte value) { + addCriterion("priority <>", value, "priority"); + return (Criteria) this; + } + + public Criteria andPriorityGreaterThan(Byte value) { + addCriterion("priority >", value, "priority"); + return (Criteria) this; + } + + public Criteria andPriorityGreaterThanOrEqualTo(Byte value) { + addCriterion("priority >=", value, "priority"); + return (Criteria) this; + } + + public Criteria andPriorityLessThan(Byte value) { + addCriterion("priority <", value, "priority"); + return (Criteria) this; + } + + public Criteria andPriorityLessThanOrEqualTo(Byte value) { + addCriterion("priority <=", value, "priority"); + return (Criteria) this; + } + + public Criteria andPriorityIn(List values) { + addCriterion("priority in", values, "priority"); + return (Criteria) this; + } + + public Criteria andPriorityNotIn(List values) { + addCriterion("priority not in", values, "priority"); + return (Criteria) this; + } + + public Criteria andPriorityBetween(Byte value1, Byte value2) { + addCriterion("priority between", value1, value2, "priority"); + return (Criteria) this; + } + + public Criteria andPriorityNotBetween(Byte value1, Byte value2) { + addCriterion("priority not between", value1, value2, "priority"); + return (Criteria) this; + } + + public Criteria andMilestoneIsNull() { + addCriterion("milestone is null"); + return (Criteria) this; + } + + public Criteria andMilestoneIsNotNull() { + addCriterion("milestone is not null"); + return (Criteria) this; + } + + public Criteria andMilestoneEqualTo(String value) { + addCriterion("milestone =", value, "milestone"); + return (Criteria) this; + } + + public Criteria andMilestoneNotEqualTo(String value) { + addCriterion("milestone <>", value, "milestone"); + return (Criteria) this; + } + + public Criteria andMilestoneGreaterThan(String value) { + addCriterion("milestone >", value, "milestone"); + return (Criteria) this; + } + + public Criteria andMilestoneGreaterThanOrEqualTo(String value) { + addCriterion("milestone >=", value, "milestone"); + return (Criteria) this; + } + + public Criteria andMilestoneLessThan(String value) { + addCriterion("milestone <", value, "milestone"); + return (Criteria) this; + } + + public Criteria andMilestoneLessThanOrEqualTo(String value) { + addCriterion("milestone <=", value, "milestone"); + return (Criteria) this; + } + + public Criteria andMilestoneLike(String value) { + addCriterion("milestone like", value, "milestone"); + return (Criteria) this; + } + + public Criteria andMilestoneNotLike(String value) { + addCriterion("milestone not like", value, "milestone"); + return (Criteria) this; + } + + public Criteria andMilestoneIn(List values) { + addCriterion("milestone in", values, "milestone"); + return (Criteria) this; + } + + public Criteria andMilestoneNotIn(List values) { + addCriterion("milestone not in", values, "milestone"); + return (Criteria) this; + } + + public Criteria andMilestoneBetween(String value1, String value2) { + addCriterion("milestone between", value1, value2, "milestone"); + return (Criteria) this; + } + + public Criteria andMilestoneNotBetween(String value1, String value2) { + addCriterion("milestone not between", value1, value2, "milestone"); + 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/po/SysPlugin.java b/tall/src/main/java/com/ccsens/tall/bean/po/SysPlugin.java index bc03deca..2ea36184 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/po/SysPlugin.java +++ b/tall/src/main/java/com/ccsens/tall/bean/po/SysPlugin.java @@ -12,13 +12,19 @@ public class SysPlugin implements Serializable { private Byte scene; + private Byte showType; + private Date createdAt; private Date updatedAt; private Byte recStatus; - private Byte showType; + private Long pluginIcon; + + private Long pluginAuthor; + + private Byte pluginClass; private static final long serialVersionUID = 1L; @@ -54,6 +60,14 @@ public class SysPlugin implements Serializable { this.scene = scene; } + public Byte getShowType() { + return showType; + } + + public void setShowType(Byte showType) { + this.showType = showType; + } + public Date getCreatedAt() { return createdAt; } @@ -78,12 +92,28 @@ public class SysPlugin implements Serializable { this.recStatus = recStatus; } - public Byte getShowType() { - return showType; + public Long getPluginIcon() { + return pluginIcon; } - public void setShowType(Byte showType) { - this.showType = showType; + public void setPluginIcon(Long pluginIcon) { + this.pluginIcon = pluginIcon; + } + + public Long getPluginAuthor() { + return pluginAuthor; + } + + public void setPluginAuthor(Long pluginAuthor) { + this.pluginAuthor = pluginAuthor; + } + + public Byte getPluginClass() { + return pluginClass; + } + + public void setPluginClass(Byte pluginClass) { + this.pluginClass = pluginClass; } @Override @@ -96,10 +126,13 @@ public class SysPlugin implements Serializable { sb.append(", name=").append(name); sb.append(", description=").append(description); sb.append(", scene=").append(scene); + sb.append(", showType=").append(showType); sb.append(", createdAt=").append(createdAt); sb.append(", updatedAt=").append(updatedAt); sb.append(", recStatus=").append(recStatus); - sb.append(", showType=").append(showType); + sb.append(", pluginIcon=").append(pluginIcon); + sb.append(", pluginAuthor=").append(pluginAuthor); + sb.append(", pluginClass=").append(pluginClass); sb.append("]"); return sb.toString(); } diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/SysPluginExample.java b/tall/src/main/java/com/ccsens/tall/bean/po/SysPluginExample.java index 21985a1d..15bb9464 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/po/SysPluginExample.java +++ b/tall/src/main/java/com/ccsens/tall/bean/po/SysPluginExample.java @@ -365,6 +365,66 @@ public class SysPluginExample { return (Criteria) this; } + public Criteria andShowTypeIsNull() { + addCriterion("show_type is null"); + return (Criteria) this; + } + + public Criteria andShowTypeIsNotNull() { + addCriterion("show_type is not null"); + return (Criteria) this; + } + + public Criteria andShowTypeEqualTo(Byte value) { + addCriterion("show_type =", value, "showType"); + return (Criteria) this; + } + + public Criteria andShowTypeNotEqualTo(Byte value) { + addCriterion("show_type <>", value, "showType"); + return (Criteria) this; + } + + public Criteria andShowTypeGreaterThan(Byte value) { + addCriterion("show_type >", value, "showType"); + return (Criteria) this; + } + + public Criteria andShowTypeGreaterThanOrEqualTo(Byte value) { + addCriterion("show_type >=", value, "showType"); + return (Criteria) this; + } + + public Criteria andShowTypeLessThan(Byte value) { + addCriterion("show_type <", value, "showType"); + return (Criteria) this; + } + + public Criteria andShowTypeLessThanOrEqualTo(Byte value) { + addCriterion("show_type <=", value, "showType"); + return (Criteria) this; + } + + public Criteria andShowTypeIn(List values) { + addCriterion("show_type in", values, "showType"); + return (Criteria) this; + } + + public Criteria andShowTypeNotIn(List values) { + addCriterion("show_type not in", values, "showType"); + return (Criteria) this; + } + + public Criteria andShowTypeBetween(Byte value1, Byte value2) { + addCriterion("show_type between", value1, value2, "showType"); + return (Criteria) this; + } + + public Criteria andShowTypeNotBetween(Byte value1, Byte value2) { + addCriterion("show_type not between", value1, value2, "showType"); + return (Criteria) this; + } + public Criteria andCreatedAtIsNull() { addCriterion("created_at is null"); return (Criteria) this; @@ -545,63 +605,183 @@ public class SysPluginExample { return (Criteria) this; } - public Criteria andShowTypeIsNull() { - addCriterion("show_type is null"); + public Criteria andPluginIconIsNull() { + addCriterion("plugin_icon is null"); return (Criteria) this; } - public Criteria andShowTypeIsNotNull() { - addCriterion("show_type is not null"); + public Criteria andPluginIconIsNotNull() { + addCriterion("plugin_icon is not null"); return (Criteria) this; } - public Criteria andShowTypeEqualTo(Byte value) { - addCriterion("show_type =", value, "showType"); + public Criteria andPluginIconEqualTo(Long value) { + addCriterion("plugin_icon =", value, "pluginIcon"); return (Criteria) this; } - public Criteria andShowTypeNotEqualTo(Byte value) { - addCriterion("show_type <>", value, "showType"); + public Criteria andPluginIconNotEqualTo(Long value) { + addCriterion("plugin_icon <>", value, "pluginIcon"); return (Criteria) this; } - public Criteria andShowTypeGreaterThan(Byte value) { - addCriterion("show_type >", value, "showType"); + public Criteria andPluginIconGreaterThan(Long value) { + addCriterion("plugin_icon >", value, "pluginIcon"); return (Criteria) this; } - public Criteria andShowTypeGreaterThanOrEqualTo(Byte value) { - addCriterion("show_type >=", value, "showType"); + public Criteria andPluginIconGreaterThanOrEqualTo(Long value) { + addCriterion("plugin_icon >=", value, "pluginIcon"); return (Criteria) this; } - public Criteria andShowTypeLessThan(Byte value) { - addCriterion("show_type <", value, "showType"); + public Criteria andPluginIconLessThan(Long value) { + addCriterion("plugin_icon <", value, "pluginIcon"); return (Criteria) this; } - public Criteria andShowTypeLessThanOrEqualTo(Byte value) { - addCriterion("show_type <=", value, "showType"); + public Criteria andPluginIconLessThanOrEqualTo(Long value) { + addCriterion("plugin_icon <=", value, "pluginIcon"); return (Criteria) this; } - public Criteria andShowTypeIn(List values) { - addCriterion("show_type in", values, "showType"); + public Criteria andPluginIconIn(List values) { + addCriterion("plugin_icon in", values, "pluginIcon"); return (Criteria) this; } - public Criteria andShowTypeNotIn(List values) { - addCriterion("show_type not in", values, "showType"); + public Criteria andPluginIconNotIn(List values) { + addCriterion("plugin_icon not in", values, "pluginIcon"); return (Criteria) this; } - public Criteria andShowTypeBetween(Byte value1, Byte value2) { - addCriterion("show_type between", value1, value2, "showType"); + public Criteria andPluginIconBetween(Long value1, Long value2) { + addCriterion("plugin_icon between", value1, value2, "pluginIcon"); return (Criteria) this; } - public Criteria andShowTypeNotBetween(Byte value1, Byte value2) { - addCriterion("show_type not between", value1, value2, "showType"); + public Criteria andPluginIconNotBetween(Long value1, Long value2) { + addCriterion("plugin_icon not between", value1, value2, "pluginIcon"); + return (Criteria) this; + } + + public Criteria andPluginAuthorIsNull() { + addCriterion("plugin_author is null"); + return (Criteria) this; + } + + public Criteria andPluginAuthorIsNotNull() { + addCriterion("plugin_author is not null"); + return (Criteria) this; + } + + public Criteria andPluginAuthorEqualTo(Long value) { + addCriterion("plugin_author =", value, "pluginAuthor"); + return (Criteria) this; + } + + public Criteria andPluginAuthorNotEqualTo(Long value) { + addCriterion("plugin_author <>", value, "pluginAuthor"); + return (Criteria) this; + } + + public Criteria andPluginAuthorGreaterThan(Long value) { + addCriterion("plugin_author >", value, "pluginAuthor"); + return (Criteria) this; + } + + public Criteria andPluginAuthorGreaterThanOrEqualTo(Long value) { + addCriterion("plugin_author >=", value, "pluginAuthor"); + return (Criteria) this; + } + + public Criteria andPluginAuthorLessThan(Long value) { + addCriterion("plugin_author <", value, "pluginAuthor"); + return (Criteria) this; + } + + public Criteria andPluginAuthorLessThanOrEqualTo(Long value) { + addCriterion("plugin_author <=", value, "pluginAuthor"); + return (Criteria) this; + } + + public Criteria andPluginAuthorIn(List values) { + addCriterion("plugin_author in", values, "pluginAuthor"); + return (Criteria) this; + } + + public Criteria andPluginAuthorNotIn(List values) { + addCriterion("plugin_author not in", values, "pluginAuthor"); + return (Criteria) this; + } + + public Criteria andPluginAuthorBetween(Long value1, Long value2) { + addCriterion("plugin_author between", value1, value2, "pluginAuthor"); + return (Criteria) this; + } + + public Criteria andPluginAuthorNotBetween(Long value1, Long value2) { + addCriterion("plugin_author not between", value1, value2, "pluginAuthor"); + return (Criteria) this; + } + + public Criteria andPluginClassIsNull() { + addCriterion("plugin_class is null"); + return (Criteria) this; + } + + public Criteria andPluginClassIsNotNull() { + addCriterion("plugin_class is not null"); + return (Criteria) this; + } + + public Criteria andPluginClassEqualTo(Byte value) { + addCriterion("plugin_class =", value, "pluginClass"); + return (Criteria) this; + } + + public Criteria andPluginClassNotEqualTo(Byte value) { + addCriterion("plugin_class <>", value, "pluginClass"); + return (Criteria) this; + } + + public Criteria andPluginClassGreaterThan(Byte value) { + addCriterion("plugin_class >", value, "pluginClass"); + return (Criteria) this; + } + + public Criteria andPluginClassGreaterThanOrEqualTo(Byte value) { + addCriterion("plugin_class >=", value, "pluginClass"); + return (Criteria) this; + } + + public Criteria andPluginClassLessThan(Byte value) { + addCriterion("plugin_class <", value, "pluginClass"); + return (Criteria) this; + } + + public Criteria andPluginClassLessThanOrEqualTo(Byte value) { + addCriterion("plugin_class <=", value, "pluginClass"); + return (Criteria) this; + } + + public Criteria andPluginClassIn(List values) { + addCriterion("plugin_class in", values, "pluginClass"); + return (Criteria) this; + } + + public Criteria andPluginClassNotIn(List values) { + addCriterion("plugin_class not in", values, "pluginClass"); + return (Criteria) this; + } + + public Criteria andPluginClassBetween(Byte value1, Byte value2) { + addCriterion("plugin_class between", value1, value2, "pluginClass"); + return (Criteria) this; + } + + public Criteria andPluginClassNotBetween(Byte value1, Byte value2) { + addCriterion("plugin_class not between", value1, value2, "pluginClass"); return (Criteria) this; } } diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/PluginVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/PluginVo.java index 9ab4ceca..1f7597df 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/PluginVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/PluginVo.java @@ -1,9 +1,11 @@ package com.ccsens.tall.bean.vo; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; @Data @@ -121,6 +123,46 @@ public class PluginVo { private String projectName; } + @Data + @ApiModel("根据任务id查找插件列表(已添加)") + public static class PluginByTaskAdded { + @ApiModelProperty("插件名称") + private String pluginName; + @ApiModelProperty("插件图标") + private Long pluginIcon; + @ApiModelProperty("插件图标") + private FileVo.FilePosition iconUrl; + @ApiModelProperty("插件id") + private Long pluginId; + @ApiModelProperty("插件描述") + private String description; + @ApiModelProperty("插件作者") + private Long pluginAuthor; + @ApiModelProperty("插件预览图片") + private List previewImgs = new ArrayList<>(); + @JsonIgnore + private String fileIdList; + + } + @Data + @ApiModel("插件预览图信息(已添加)") + public static class ImgByTaskAdded { + @ApiModelProperty("预览图id") + private Long previewId; + @ApiModelProperty("预览图描述") + private String previewDescription; + } + @Data + @ApiModel("根据任务id查找插件列表(已添加)") + public static class PluginByTaskAdded1 { + @ApiModelProperty("插件名称") + private String pluginName; + @ApiModelProperty("插件id") + private Long pluginId; + @ApiModelProperty("插件描述") + private String description; + + } } diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/RoleVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/RoleVo.java index f92d163a..e28a5382 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/RoleVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/RoleVo.java @@ -1,5 +1,6 @@ package com.ccsens.tall.bean.vo; +import com.sun.org.apache.xpath.internal.operations.Bool; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -36,6 +37,8 @@ public class RoleVo { private String name; @ApiModelProperty("角色排序") private Integer sequence; + @ApiModelProperty("是否是pm 是pm；true 不是pm； false ") + private Boolean isPM; } @Data @ApiModel("添加时返回成员信息") diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java index b6f975e4..4f7a0c79 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java @@ -156,7 +156,7 @@ public class TaskVo { @ApiModelProperty("优先级 默认0 3,紧急重要 2,紧急不重要 1,重要不紧急 0,不重要不紧急") private Byte priority; @ApiModelProperty("是否是里程碑 0否 1里程碑 2普通任务 3关键任务") - private Byte milestone; + private String milestone; @ApiModelProperty("提醒的信息") private List remindInfoList; public Long getDuration(){ @@ -500,7 +500,7 @@ public class TaskVo { @ApiModelProperty("优先级 默认0 3,紧急重要 2,紧急不重要 1,重要不紧急 0,不重要不紧急") private Byte priority; @ApiModelProperty("是否是里程碑 0否 1是") - private Byte milestone; + private String milestone; @ApiModelProperty("二级任务") private List secondTasks; } diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/ProPluginPreviewFileDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/ProPluginPreviewFileDao.java new file mode 100644 index 00000000..75a126be --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/persist/dao/ProPluginPreviewFileDao.java @@ -0,0 +1,9 @@ +package com.ccsens.tall.persist.dao; + +import com.ccsens.tall.persist.mapper.ProPluginPreviewFileMapper; + +/** + * @author mz + */ +public interface ProPluginPreviewFileDao extends ProPluginPreviewFileMapper { +} diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/ProRoleDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/ProRoleDao.java index b9e509f7..ca3fe9e5 100644 --- a/tall/src/main/java/com/ccsens/tall/persist/dao/ProRoleDao.java +++ b/tall/src/main/java/com/ccsens/tall/persist/dao/ProRoleDao.java @@ -72,18 +72,18 @@ public interface ProRoleDao extends ProRoleMapper{ /** * 查询已经存在的角色 - * @param projectId + * @param memberId * @return */ - List queryRoleShowslistAfter(Long projectId); + List queryRoleShowslistAfter(Long memberId); /** * 查询未添加的角色 - * @param memberId + * @param projectId * @param listBeforeId * @return */ - List queryRoleShowslistBefore(Long memberId, List listBeforeId); + List queryRoleShowslistBefore(Long projectId, List listBeforeId); // /** // * 查找项目下的所有成员的名字用“，”分隔 diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/TaskPluginDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/TaskPluginDao.java index cfcc2da2..827ba286 100644 --- a/tall/src/main/java/com/ccsens/tall/persist/dao/TaskPluginDao.java +++ b/tall/src/main/java/com/ccsens/tall/persist/dao/TaskPluginDao.java @@ -1,8 +1,34 @@ package com.ccsens.tall.persist.dao; +import com.ccsens.tall.bean.vo.PluginVo; import com.ccsens.tall.persist.mapper.ProTaskPluginMapper; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.List; + +/** + * @author mz + */ @Repository public interface TaskPluginDao extends ProTaskPluginMapper{ + /** + * 根据任务id查询插件列表(该任务已添加的) + * @param taskId 任务id + * @param roleId 角色id + * @param pluginName 插件名称 + * @param pluginType 插件类型 + * @return + */ + List findPluginOfAdded(@Param("taskId") Long taskId,@Param("roleId") Long roleId,@Param("pluginName") String pluginName,@Param("pluginType") Byte pluginType); + + /** + * 根据任务id查询插件列表(该任务未添加的) + * @param taskId 任务id + * @param roleId 角色id + * @param pluginName 插件名称 + * @param pluginType 插件类型 + * @return + */ + List findPluginOfNoAdded(@Param("taskId") Long taskId,@Param("roleId") Long roleId,@Param("pluginName") String pluginName,@Param("pluginType") Byte pluginType); } diff --git a/tall/src/main/java/com/ccsens/tall/persist/mapper/ProPluginPreviewFileMapper.java b/tall/src/main/java/com/ccsens/tall/persist/mapper/ProPluginPreviewFileMapper.java new file mode 100644 index 00000000..f82ca886 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/persist/mapper/ProPluginPreviewFileMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.tall.persist.mapper; + +import com.ccsens.tall.bean.po.ProPluginPreviewFile; +import com.ccsens.tall.bean.po.ProPluginPreviewFileExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface ProPluginPreviewFileMapper { + long countByExample(ProPluginPreviewFileExample example); + + int deleteByExample(ProPluginPreviewFileExample example); + + int deleteByPrimaryKey(Long id); + + int insert(ProPluginPreviewFile record); + + int insertSelective(ProPluginPreviewFile record); + + List selectByExample(ProPluginPreviewFileExample example); + + ProPluginPreviewFile selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") ProPluginPreviewFile record, @Param("example") ProPluginPreviewFileExample example); + + int updateByExample(@Param("record") ProPluginPreviewFile record, @Param("example") ProPluginPreviewFileExample example); + + int updateByPrimaryKeySelective(ProPluginPreviewFile record); + + int updateByPrimaryKey(ProPluginPreviewFile record); +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/persist/mapper/ProTasketailMapper.java b/tall/src/main/java/com/ccsens/tall/persist/mapper/ProTasketailMapper.java new file mode 100644 index 00000000..99f24010 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/persist/mapper/ProTasketailMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.tall.persist.mapper; + +import com.ccsens.tall.bean.po.ProTasketail; +import com.ccsens.tall.bean.po.ProTasketailExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface ProTasketailMapper { + long countByExample(ProTasketailExample example); + + int deleteByExample(ProTasketailExample example); + + int deleteByPrimaryKey(Long id); + + int insert(ProTasketail record); + + int insertSelective(ProTasketail record); + + List selectByExample(ProTasketailExample example); + + ProTasketail selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") ProTasketail record, @Param("example") ProTasketailExample example); + + int updateByExample(@Param("record") ProTasketail record, @Param("example") ProTasketailExample example); + + int updateByPrimaryKeySelective(ProTasketail record); + + int updateByPrimaryKey(ProTasketail record); +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java index e2e122ad..be9cfa37 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java @@ -8,6 +8,7 @@ import com.ccsens.tall.bean.dto.WpsDto; import com.ccsens.tall.bean.po.*; import com.ccsens.tall.bean.vo.ProjectVo; import com.ccsens.tall.persist.dao.*; +import com.ccsens.tall.persist.mapper.ProTaskDeliverMapper; import com.ccsens.util.*; import com.ccsens.util.cron.CronConstant; import com.ccsens.util.cron.NatureToDate; @@ -82,6 +83,8 @@ public class ExcelService implements IExcelService { private ProRoleDao proRoleDao; @Resource private ProPluginConfigDao proPluginConfigDao; + @Resource + private ProTaskDeliverMapper proTaskDeliverMapper; @Override @@ -848,15 +851,7 @@ public class ExcelService implements IExcelService { taskDetail.setLevel((byte) WebConstant.TASK_LEVEL.SecondTask.value); taskDetail.setHasGroup((byte) 0); taskDetail.setAllMember((byte) 1); - - if("关键任务".equals(label)){ - taskDetail.setMilestone((byte) 3); - }else if("里程碑".equals(label)){ - taskDetail.setMilestone((byte) 1); - }else { - //设置成默认的普通任务 - taskDetail.setMilestone((byte) 2); - } + taskDetail.setMilestone(label); //子项目 if (StrUtil.isNotEmpty(subProject)) { subProject = StringUtil.replaceComma(subProject); @@ -1001,6 +996,7 @@ public class ExcelService implements IExcelService { // else { // //不是分组任务，直接添加交付物 readDeliverSheet(deliver, xssfWorkbook, taskDetail.getId()); + // } //添加任务 proTaskDetailService.saveTaskDetail(taskDetail); @@ -1178,45 +1174,60 @@ public class ExcelService implements IExcelService { */ @Override public void readDeliverSheet(String deliverCell, XSSFWorkbook xssfWorkbook, Long taskId) { - if (StrUtil.isNotEmpty(deliverCell)) { - String str = ""; - if (deliverCell.length() > 4) { - str = deliverCell.substring(0, 3); - } - if ("关联表".equalsIgnoreCase(str)) { - String subStr = deliverCell.substring(4); - XSSFSheet subSheet = xssfWorkbook.getSheet(subStr); - if(ObjectUtil.isNull(subSheet)){ - throw new BaseException(CodeEnum.WBS_NOT_SUB_TASK); - } - for (int i = 2; i <= subSheet.getLastRowNum(); i++) { - XSSFRow row = subSheet.getRow(i); - if(ObjectUtil.isNull(row)){ - continue; - } - String deliver = ExcelUtil.getCellValue(row.getCell(1)); - if (StrUtil.isNotEmpty(deliver)) { - ProTaskDeliver taskDeliver = new ProTaskDeliver(); - taskDeliver.setId(snowflake.nextId()); - taskDeliver.setName(deliver); - taskDeliver.setTaskDetailId(taskId); - taskDeliver.setIsInput(0); - taskDeliver.setIsFinal(0); - if (i == subSheet.getLastRowNum()) { - taskDeliver.setIsFinal(1); - } - taskDeliverService.saveDeliver(taskDeliver); - } +// if (StrUtil.isNotEmpty(deliverCell)) { +// String str = ""; +// if (deliverCell.length() > 4) { +// str = deliverCell.substring(0, 3); +// } +// if ("关联表".equalsIgnoreCase(str)) { +// String subStr = deliverCell.substring(4); +// XSSFSheet subSheet = xssfWorkbook.getSheet(subStr); +// if(ObjectUtil.isNull(subSheet)){ +// throw new BaseException(CodeEnum.WBS_NOT_SUB_TASK); +// } +// for (int i = 2; i <= subSheet.getLastRowNum(); i++) { +// XSSFRow row = subSheet.getRow(i); +// if(ObjectUtil.isNull(row)){ +// continue; +// } +// String deliver = ExcelUtil.getCellValue(row.getCell(1)); +// if (StrUtil.isNotEmpty(deliver)) { +// ProTaskDeliver taskDeliver = new ProTaskDeliver(); +// taskDeliver.setId(snowflake.nextId()); +// taskDeliver.setName(deliver); +// taskDeliver.setTaskDetailId(taskId); +// taskDeliver.setIsInput(0); +// taskDeliver.setIsFinal(0); +// if (i == subSheet.getLastRowNum()) { +// taskDeliver.setIsFinal(1); +// } +// taskDeliverService.saveDeliver(taskDeliver); +// } +// } +// } else { +// ProTaskDeliver taskDeliver = new ProTaskDeliver(); +// taskDeliver.setId(snowflake.nextId()); +// taskDeliver.setTaskDetailId(taskId); +// taskDeliver.setName(deliverCell); +// taskDeliver.setIsInput(0); +// taskDeliver.setIsFinal(1); +// taskDeliverService.saveDeliver(taskDeliver); +// } +// } + String regex="，|,|；|：|;|:|、|。"; + deliverCell= deliverCell.replace("\n","").replace("\r",""); + String[] fileNames= deliverCell.split(regex); + if(fileNames.length>0){ + for (int i = 0; i < fileNames.length; i++) { + if(StringUtils.isNotBlank(fileNames[i])){ + ProTaskDeliver proTaskDeliver=new ProTaskDeliver(); + proTaskDeliver.setName(fileNames[i].trim()); + proTaskDeliver.setId(snowflake.nextId()); + proTaskDeliver.setTaskDetailId(taskId); + proTaskDeliverMapper.insertSelective(proTaskDeliver); } - } else { - ProTaskDeliver taskDeliver = new ProTaskDeliver(); - taskDeliver.setId(snowflake.nextId()); - taskDeliver.setTaskDetailId(taskId); - taskDeliver.setName(deliverCell); - taskDeliver.setIsInput(0); - taskDeliver.setIsFinal(1); - taskDeliverService.saveDeliver(taskDeliver); } + } } diff --git a/tall/src/main/java/com/ccsens/tall/service/IProRoleService.java b/tall/src/main/java/com/ccsens/tall/service/IProRoleService.java index 18d1299a..3c9df8fd 100644 --- a/tall/src/main/java/com/ccsens/tall/service/IProRoleService.java +++ b/tall/src/main/java/com/ccsens/tall/service/IProRoleService.java @@ -66,4 +66,8 @@ public interface IProRoleService { * @return */ RoleVo.JueSeByProIdLists queryRoleShows(QueryDto param); + + void queryRoleIsShows(QueryDto param); + + void upRoleShowsOrder(QueryDto param); } diff --git a/tall/src/main/java/com/ccsens/tall/service/ISysPluginService.java b/tall/src/main/java/com/ccsens/tall/service/ISysPluginService.java index f0e27b76..0f9748c8 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ISysPluginService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ISysPluginService.java @@ -2,12 +2,18 @@ package com.ccsens.tall.service; import com.ccsens.tall.bean.dto.PluginDto; import com.ccsens.tall.bean.vo.PluginVo; +import com.github.pagehelper.PageInfo; import java.util.List; public interface ISysPluginService { - void saveSysPlugin(PluginDto.SaveSysPlugin saveSysPlugin); + /** + * 添加插件(插件总表) + * @param param + * @param userId + */ + void saveSysPlugin(PluginDto.SaveSysPlugin param,Long userId); List getPluginAll(); @@ -17,4 +23,30 @@ public interface ISysPluginService { Long getTaskDetailIdByPlugin(Long taskPluginId); + /** + * 根据任务id查询插件列表(该任务已添加的) + * @param param + * @return + */ + List findPluginOfAdded(PluginDto.FindPluginByTask param); + + /** + * 根据任务id查询插件列表(该任务未添加的的) + * @param param + * @return + */ + PageInfo findPluginOfNoAdded(PluginDto.FindPluginByTaskNo param); + + /** + * 给任务添加插件 + * @param param + */ + void addPluginForTask(PluginDto.AddPluginForTask param,Long userId); + + /** + * 给任务删除插件 + * @param param + * @param userId + */ + void deletePluginForTask(PluginDto.DeletePluginForTask param, Long userId); } diff --git a/tall/src/main/java/com/ccsens/tall/service/InputDocService.java b/tall/src/main/java/com/ccsens/tall/service/InputDocService.java index 37e99a99..e27f4d0c 100644 --- a/tall/src/main/java/com/ccsens/tall/service/InputDocService.java +++ b/tall/src/main/java/com/ccsens/tall/service/InputDocService.java @@ -238,6 +238,9 @@ public class InputDocService implements IInputDocService { if (ArrayUtil.isEmpty(param.getFileIds()) && StrUtil.isBlank(param.getRemark())){ throw new BaseException("请上传文件或填写备注信息"); } + if (ObjectUtil.isNull(proTaskInputDocMapper.selectByPrimaryKey(param.getDocId()))){ + throw new BaseException("输入文档不存在或已删除"); + } //多文件添加 if (!ArrayUtil.isEmpty(param.getFileIds())){ String fileIds = ""; @@ -333,6 +336,9 @@ public class InputDocService implements IInputDocService { public void updateDoc(InputDocDto.UpdateDoc param) { //判断是否有重复 ProTaskInputDoc proTaskInputDoc = proTaskInputDocMapper.selectByPrimaryKey(param.getDocId()); + if (ObjectUtil.isNull(proTaskInputDoc)){ + throw new BaseException(CodeEnum.DOC_NONE); + } ProTaskInputDocExample proTaskInputDocExample = new ProTaskInputDocExample(); proTaskInputDocExample.createCriteria().andTaskDetailIdEqualTo(proTaskInputDoc.getTaskDetailId()); List proTaskInputDocs = proTaskInputDocMapper.selectByExample(proTaskInputDocExample); diff --git a/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java b/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java index 6e7a55be..008bf71a 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java @@ -12,16 +12,14 @@ import com.ccsens.tall.bean.vo.ProjectVo; import com.ccsens.tall.bean.vo.RoleVo; import com.ccsens.tall.bean.vo.TaskVo; import com.ccsens.tall.persist.dao.*; -import com.ccsens.tall.persist.mapper.ProMemberMapper; -import com.ccsens.tall.persist.mapper.ProMemberRoleMapper; -import com.ccsens.tall.persist.mapper.ProMemberRoleShowMapper; -import com.ccsens.tall.persist.mapper.ProUserAttentionRoleMapper; +import com.ccsens.tall.persist.mapper.*; import com.ccsens.util.CodeEnum; import com.ccsens.util.WebConstant; import com.ccsens.util.bean.dto.QueryDto; import com.ccsens.util.exception.BaseException; import io.swagger.models.auth.In; import lombok.extern.slf4j.Slf4j; +import org.aspectj.apache.bcel.classfile.Code; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -29,6 +27,7 @@ import org.w3c.dom.ls.LSInput; import javax.annotation.Resource; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -71,6 +70,10 @@ public class ProRoleService implements IProRoleService { private ProMemberMapper proMemberMapper; @Resource private ProMemberRoleMapper proMemberRoleMapper; + @Resource + private ProRoleMapper proRoleMapper; + @Resource + private ProRoleExcludeMapper proRoleExcludeMapper; @Override public void saveProRole(ProRole proRole) { proRoleDao.insertSelective(proRole); @@ -265,6 +268,7 @@ public class ProRoleService implements IProRoleService { proMemberRoleShowExample.createCriteria().andMemberIdEqualTo(memberId).andRecStatusEqualTo((byte)0); List proMemberRoleShows = proMemberRoleShowMapper.selectByExample(proMemberRoleShowExample); if(CollectionUtil.isEmpty(proMemberRoleShows)){ + Integer[] seq=new Integer[]{0}; //需要从原表中导入数据 ProMemberRoleExample proMemberRoleExample=new ProMemberRoleExample(); proMemberRoleExample.createCriteria().andMemberIdEqualTo(memberId).andRecStatusEqualTo((byte)0); @@ -272,7 +276,7 @@ public class ProRoleService implements IProRoleService { if(CollectionUtil.isNotEmpty(proMemberRoles)){ ProMemberRoleShow proMemberRoleShow=new ProMemberRoleShow(); Long finalMemberId = memberId; - Integer[] seq=new Integer[]{0}; + proMemberRoles.forEach(action->{ proMemberRoleShow.setId(action.getId()); proMemberRoleShow.setMemberId(finalMemberId); @@ -281,6 +285,68 @@ public class ProRoleService implements IProRoleService { proMemberRoleShowMapper.insertSelective(proMemberRoleShow); }); } + //这里插入项目经理 + + + //查一下项目经理的角色id， + ProRoleExample proRoleExample=new ProRoleExample(); + proRoleExample.createCriteria().andRecStatusEqualTo((byte)0).andNameEqualTo(WebConstant.ROLE_NAME.PM.value).andParentIdEqualTo(0L).andProjectIdEqualTo(projectId); + //一级角色项目经理 + List jili=proRoleMapper.selectByExample(proRoleExample).stream().map(action->action.getId()).collect(Collectors.toList()); + //二级角色项目经理 + ProRoleExample proRoleExample1=new ProRoleExample(); + proRoleExample1.createCriteria().andRecStatusEqualTo((byte)0).andParentIdIn(jili); + List proRoles = proRoleMapper.selectByExample(proRoleExample1); + List jili1=proRoles.stream().map(action->action.getId()).collect(Collectors.toList()); + //是否是pm true是经理 false不是经理 + boolean[] isPm = new boolean[]{false}; + //经理是否对他不可见 true不可见 false可见 + boolean[] isshow=new boolean[]{false}; + + //查询已经添加的角色 + List listBefor=proRoleDao.queryRoleShowslistAfter(memberId); + List listBeforeId= listBefor.stream().map(action ->{return action.getId();}).collect(Collectors.toList()); + + //判断该成员是不是项目经理 + ProMemberRoleExample proMemberRoleExample1=new ProMemberRoleExample(); + proMemberRoleExample.createCriteria().andRecStatusEqualTo((byte)0).andMemberIdEqualTo(memberId).andRoleIdEqualTo(jili1.get(0)); + List proMemberRoles1 = proMemberRoleMapper.selectByExample(proMemberRoleExample1); + if(CollectionUtil.isEmpty(proMemberRoles1)){ + isPm[0]=false; + }else { + isPm[0]=true; + } + + if(!isPm[0]){ + //先按照一个经理的算 + ProRoleExcludeExample proRoleExcludeExample=new ProRoleExcludeExample(); + proRoleExcludeExample.createCriteria().andRecStatusEqualTo((byte)0).andRoleIdEqualTo(jili1.get(0)); + List proRoleExcludes = proRoleExcludeMapper.selectByExample(proRoleExcludeExample); + proRoleExcludes.forEach(action->{ + //查看查询出的不可见角色id是否在角色id里面 + if(listBeforeId.contains(action.getOtherRoleId())) + { + isshow[0]=true; + } + }); + } + if(!isPm[0]&&!isshow[0]){ + //添加经理 + if(!listBeforeId.contains(jili1.get(0))) { + RoleVo.JueSeByProId jueSeByProId = new RoleVo.JueSeByProId(); + jueSeByProId.setId(proRoles.get(0).getId()); + jueSeByProId.setName(proRoles.get(0).getName()); + jueSeByProId.setSequence(proRoles.get(0).getSequence()); + listBefor.add(jueSeByProId); + //顺道插入到show表里面 + ProMemberRoleShow proMemberRoleShow=new ProMemberRoleShow(); + proMemberRoleShow.setId(snowflake.nextId()); + proMemberRoleShow.setRoleId(proRoles.get(0).getId()); + proMemberRoleShow.setMemberId(memberId); + proMemberRoleShow.setSequence(0); + proMemberRoleShowMapper.insertSelective(proMemberRoleShow); + } + } } //查询二级角色 List memberRoleList; @@ -313,6 +379,9 @@ public class ProRoleService implements IProRoleService { @Override public int selectPowerByRoleName(Long userId, Long projectId) { int power = 0; + if (null == userId || null == projectId){ + return power; + } SysProject project = projectDao.selectByPrimaryKey(projectId); if (ObjectUtil.isNotNull(project)) { if (project.getCreatorId().longValue() == userId) { @@ -646,9 +715,177 @@ public class ProRoleService implements IProRoleService { @Override public RoleVo.JueSeByProIdLists queryRoleShows(QueryDto param) { + RoleVo.JueSeByProIdLists jueSeByProIdLists=new RoleVo.JueSeByProIdLists(); + //获取成员id + Long memberId = queryMemberId(param.getParam().getProjectId(), param.getUserId()); + //获取经理角色id + ProRoleExample proRoleExample=new ProRoleExample(); + proRoleExample.createCriteria().andRecStatusEqualTo((byte)0).andNameEqualTo(WebConstant.ROLE_NAME.PM.value).andParentIdEqualTo(0L).andProjectIdEqualTo(param.getParam().getProjectId()); + //一级角色项目经理 + List jili=proRoleMapper.selectByExample(proRoleExample).stream().map(action->action.getId()).collect(Collectors.toList()); + //二级角色项目经理 + ProRoleExample proRoleExample1=new ProRoleExample(); + proRoleExample1.createCriteria().andRecStatusEqualTo((byte)0).andParentIdIn(jili); + List proRoles = proRoleMapper.selectByExample(proRoleExample1); + List jili1=proRoles.stream().map(action->action.getId()).collect(Collectors.toList()); + + //查询已经添加的角色 + List listBefor=proRoleDao.queryRoleShowslistAfter(memberId); + List listBeforeId= listBefor.stream().map(action ->{return action.getId();}).collect(Collectors.toList()); + for (int i = 0; i < listBefor.size(); i++) { + if(jili1.contains(listBefor.get(i).getId())){ + listBefor.get(i).setIsPM(true); + }else { + listBefor.get(i).setIsPM(false); + } + } + //查询未添加的角色 + List listAfter=proRoleDao.queryRoleShowslistBefore(param.getParam().getProjectId(),listBeforeId); + jueSeByProIdLists.setListAfter(listAfter); + jueSeByProIdLists.setListBefore(listBefor); + return jueSeByProIdLists; + } + + /** + * 修改角色是否展示 + * @param param + */ + @Override + public void queryRoleIsShows(QueryDto param) { //获取成员id + Long memberId=queryMemberId(param.getParam().getProjectId(),param.getUserId()); + //获取经理得id + ProRoleExample proRoleExample=new ProRoleExample(); + proRoleExample.createCriteria().andRecStatusEqualTo((byte)0).andNameEqualTo(WebConstant.ROLE_NAME.PM.value).andParentIdEqualTo(0L).andProjectIdEqualTo(param.getParam().getProjectId()); + //一级角色项目经理 + List jili=proRoleMapper.selectByExample(proRoleExample).stream().map(action->action.getId()).collect(Collectors.toList()); + //二级角色项目经理 + ProRoleExample proRoleExample1=new ProRoleExample(); + proRoleExample1.createCriteria().andRecStatusEqualTo((byte)0).andParentIdIn(jili); + List proRoles = proRoleMapper.selectByExample(proRoleExample1); + List jili1=proRoles.stream().map(action->action.getId()).collect(Collectors.toList()); + + if(param.getParam().getIsShow()){ + //展示的 增加的 不需要考虑是否为经理 + ProMemberRoleShowExample proMemberRoleShowExample=new ProMemberRoleShowExample(); + proMemberRoleShowExample.createCriteria().andRecStatusEqualTo((byte) 0).andMemberIdEqualTo(memberId); + List proMemberRoleShows = proMemberRoleShowMapper.selectByExample(proMemberRoleShowExample); + if((proMemberRoleShows.size()+param.getParam().getRoleIds().size())>10){ + throw new BaseException(CodeEnum.CHAOGUOSHI); + }else { + + if(param.getParam().getRoleIds().size()>0){ + //查一下目前最大得排序是多少 + Integer[] seq=new Integer[]{proMemberRoleShows.stream().mapToInt(action->action.getSequence()).max().getAsInt()}; + ProMemberRoleShowExample proMemberRoleShowExample1=new ProMemberRoleShowExample(); + proMemberRoleShowExample1.createCriteria().andMemberIdEqualTo(memberId).andRoleIdIn(param.getParam().getRoleIds()).andRecStatusEqualTo((byte)0); + List proMemberRoleShows1 = proMemberRoleShowMapper.selectByExample(proMemberRoleShowExample1); + if(proMemberRoleShows1.size()>0){ + throw new BaseException(CodeEnum.CHONGFUTIJIAO); + } + param.getParam().getRoleIds().forEach(ac->{ + + ProMemberRoleShow proMemberRoleShow=new ProMemberRoleShow(); + proMemberRoleShow.setId(snowflake.nextId()); + proMemberRoleShow.setRoleId(ac); + proMemberRoleShow.setMemberId(memberId); + if(jili1.contains(ac)){ + proMemberRoleShow.setSequence(0); + }else { + proMemberRoleShow.setSequence(++seq[0]); + } + proMemberRoleShowMapper.insertSelective(proMemberRoleShow); + }); + } + } + }else { + //不展示的，删除的 + if(param.getParam().getRoleIds().size()>0){ + //先判断是不是经理了 + if(param.getParam().getRoleIds().contains(jili1.get(0))){ + throw new BaseException(CodeEnum.BAOHANJINLI); + } + for (int i = 0; i param) { + if(param.getParam().getRoleIds().size()<=1){ + throw new BaseException(CodeEnum.ZUISHAOCHUANLIANGE); + } + Long memberId=queryMemberId(param.getParam().getProjectId(),param.getUserId()); + ProRoleExample proRoleExample=new ProRoleExample(); + proRoleExample.createCriteria().andRecStatusEqualTo((byte)0).andNameEqualTo(WebConstant.ROLE_NAME.PM.value).andParentIdEqualTo(0L).andProjectIdEqualTo(param.getParam().getProjectId()); + //一级角色项目经理 + List jili=proRoleMapper.selectByExample(proRoleExample).stream().map(action->action.getId()).collect(Collectors.toList()); + //二级角色项目经理 + ProRoleExample proRoleExample1=new ProRoleExample(); + proRoleExample1.createCriteria().andRecStatusEqualTo((byte)0).andParentIdIn(jili); + List proRoles = proRoleMapper.selectByExample(proRoleExample1); + List jili1=proRoles.stream().map(action->action.getId()).collect(Collectors.toList()); + for (int i = param.getParam().getRoleIds().size() - 1; i >= 0; i--) { + if(jili1.get(0).equals(param.getParam().getRoleIds().get(i))){ + param.getParam().getRoleIds().remove(i); + } + } + //先查出来在数据库中这几个数据中最大的序号是多少，然后再最大的上面进行加加操作 + ProMemberRoleShowExample proMemberRoleShowExample=new ProMemberRoleShowExample(); + proMemberRoleShowExample.createCriteria().andRoleIdIn(param.getParam().getRoleIds()).andRecStatusEqualTo((byte)0); + List proMemberRoleShows = proMemberRoleShowMapper.selectByExample(proMemberRoleShowExample); + Integer[] seq=new Integer[]{ proMemberRoleShows.stream().mapToInt(action->action.getSequence()).max().getAsInt()}; + param.getParam().getRoleIds().forEach(action->{ + ProMemberRoleShowExample proMemberRoleShowExample1=new ProMemberRoleShowExample(); + proMemberRoleShowExample1.createCriteria().andRecStatusEqualTo((byte)0).andMemberIdEqualTo(memberId).andRoleIdEqualTo(action); + ProMemberRoleShow proMemberRoleShow=new ProMemberRoleShow(); + proMemberRoleShow.setSequence(++seq[0]); + proMemberRoleShowMapper.updateByExampleSelective(proMemberRoleShow,proMemberRoleShowExample1); + }); + } + + /** + * 是否是pm + * @return + */ + public boolean queryIsPm(Long projectId,Long memberId){ + ProRoleExample proRoleExample=new ProRoleExample(); + proRoleExample.createCriteria().andRecStatusEqualTo((byte)0).andNameEqualTo(WebConstant.ROLE_NAME.PM.value).andParentIdEqualTo(0L).andProjectIdEqualTo(projectId); + //一级角色项目经理 + List jili=proRoleMapper.selectByExample(proRoleExample).stream().map(action->action.getId()).collect(Collectors.toList()); + //二级角色项目经理 + ProRoleExample proRoleExample1=new ProRoleExample(); + proRoleExample1.createCriteria().andRecStatusEqualTo((byte)0).andParentIdIn(jili); + List proRoles = proRoleMapper.selectByExample(proRoleExample1); + List jili1=proRoles.stream().map(action->action.getId()).collect(Collectors.toList()); + //目前考虑的是只有一个经理 + ProMemberRoleExample proMemberRoleExample=new ProMemberRoleExample(); + proMemberRoleExample.createCriteria().andRecStatusEqualTo((byte)0).andMemberIdEqualTo(memberId).andRoleIdEqualTo(jili1.get(0)); + List proMemberRoles = proMemberRoleMapper.selectByExample(proMemberRoleExample); + if(CollectionUtil.isEmpty(proMemberRoles)){ + return false; + } + return true; + } + + /** + * 查询成员id + * @return + */ + public Long queryMemberId(Long projectId,Long userId){ ProMemberExample proMemberExample=new ProMemberExample(); - proMemberExample.createCriteria().andUserIdEqualTo(param.getUserId()).andProjectIdEqualTo(param.getParam().getProjectId()).andRecStatusEqualTo((byte)0); + proMemberExample.createCriteria().andUserIdEqualTo(userId).andProjectIdEqualTo(projectId).andRecStatusEqualTo((byte)0); List proMembers = proMemberMapper.selectByExample(proMemberExample); Long memberId=0L; if(CollectionUtil.isNotEmpty(proMembers)&&proMembers.size()==1){ @@ -656,13 +893,6 @@ public class ProRoleService implements IProRoleService { }else { throw new BaseException(CodeEnum.CHONGFU); } - RoleVo.JueSeByProIdLists jueSeByProIdLists=new RoleVo.JueSeByProIdLists(); - //查询已经添加的角色 - List listAfter=proRoleDao.queryRoleShowslistAfter(param.getParam().getProjectId()); - List listBeforeId= listAfter.stream().map(action ->{ - return action.getId(); - }).collect(Collectors.toList()); - List listBefor=proRoleDao.queryRoleShowslistBefore(memberId,listBeforeId); - return null; + return memberId; } } diff --git a/tall/src/main/java/com/ccsens/tall/service/SysPluginService.java b/tall/src/main/java/com/ccsens/tall/service/SysPluginService.java index 20482654..820249d2 100644 --- a/tall/src/main/java/com/ccsens/tall/service/SysPluginService.java +++ b/tall/src/main/java/com/ccsens/tall/service/SysPluginService.java @@ -2,11 +2,22 @@ package com.ccsens.tall.service; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Snowflake; +import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.ccsens.tall.bean.dto.PluginDto; import com.ccsens.tall.bean.po.*; +import com.ccsens.tall.bean.vo.FileVo; import com.ccsens.tall.bean.vo.PluginVo; import com.ccsens.tall.persist.dao.*; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.PropUtil; +import com.ccsens.util.RestTemplateUtil; +import com.ccsens.util.WebConstant; +import com.ccsens.util.exception.BaseException; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -16,6 +27,7 @@ import org.springframework.web.context.ContextLoaderListener; import javax.annotation.Resource; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; @Slf4j @@ -34,19 +46,242 @@ public class SysPluginService implements ISysPluginService{ private SigninFieldDao signinFieldDao; @Resource private Snowflake snowflake; + @Resource + private ProPluginPreviewFileDao proPluginPreviewFileDao; + @Resource + private ProRoleService proRoleService; + @Resource + private ProRoleDao proRoleDao; + @Resource + private ProMemberDao proMemberDao; + @Resource + private ProMemberRoleDao proMemberRoleDao; + @Resource + private TaskSubTimeDao taskSubTimeDao; /** * 添加插件 - * @param saveSysPlugin + * @param param */ @Override - public void saveSysPlugin(PluginDto.SaveSysPlugin saveSysPlugin) { + public void saveSysPlugin(PluginDto.SaveSysPlugin param,Long userId) { SysPlugin sysPlugin = new SysPlugin(); sysPlugin.setId(snowflake.nextId()); - sysPlugin.setName(saveSysPlugin.getName()); - sysPlugin.setDescription(saveSysPlugin.getDescription()); - sysPlugin.setShowType(saveSysPlugin.getShowType()); + sysPlugin.setName(param.getName()); + sysPlugin.setDescription(param.getDescription()); + sysPlugin.setShowType(param.getShowType()); + sysPlugin.setPluginIcon(param.getPluginIcon()); + sysPlugin.setPluginAuthor(param.getPluginAuthor()); + sysPlugin.setPluginClass(param.getPluginClass()); sysPluginDao.insertSelective(sysPlugin); + + //预览表中添加数据 + if (CollectionUtil.isNotEmpty(param.getPreviewImgs())){ + param.getPreviewImgs().forEach(previewImg -> { + ProPluginPreviewFile previewFile = new ProPluginPreviewFile(); + previewFile.setId(snowflake.nextId()); + previewFile.setPluginId(sysPlugin.getId()); + previewFile.setFileId(previewImg.getPreviewId()); + previewFile.setPreviewDescription(previewImg.getPreviewDescription()); + proPluginPreviewFileDao.insertSelective(previewFile); + }); + } + } + + /** + * 根据任务id查询插件列表(该任务已添加的) + * @param param + * @return + */ + @Override + public List findPluginOfAdded(PluginDto.FindPluginByTask param) { + List plugins = taskPluginDao.findPluginOfAdded(param.getTaskId(),param.getRoleId(),param.getPluginName(),param.getPluginType()); + plugins.forEach(plugin -> { + if (plugin.getFileIdList().contains(",")){ + String[] split = plugin.getFileIdList().split(","); + List splits =new ArrayList<>(Arrays.asList(split)); + //获取文件项目的路径 + String requestUrl = PropUtil.filedeal; + //通过文件id查询文件信息 + String c = RestTemplateUtil.postBody1(requestUrl,splits); + JsonResponse a = JSONObject.parseObject(c, JsonResponse.class); + //遍历区分是图标还是预览图 + List filePositions = JSONArray.parseArray(a.getData().toString(), FileVo.FilePosition.class); + if(ObjectUtil.isNotNull(filePositions) && ObjectUtil.isNotNull(filePositions)){ + for (int i = 0; i < filePositions.size(); i++) { + if (filePositions.get(i).getId().equals(plugin.getPluginIcon())){ + plugin.setIconUrl(filePositions.get(i)); + filePositions.remove(filePositions.get(i)); + } + } + plugin.setPreviewImgs(filePositions); + } + }else{ + //不包含逗号说明没有预览图,只有图标 + List id = new ArrayList<>(); + id.add(plugin.getFileIdList()); + //获取文件项目的路径 + String requestUrl = PropUtil.filedeal; + //通过文件id查询文件信息 + String c = RestTemplateUtil.postBody1(requestUrl,id); + JsonResponse a = JSONObject.parseObject(c, JsonResponse.class); + + List filePositions = JSONArray.parseArray(a.getData().toString(), FileVo.FilePosition.class); + if(ObjectUtil.isNotNull(filePositions) && ObjectUtil.isNotNull(filePositions) && !filePositions.isEmpty()){ + plugin.setIconUrl(filePositions.get(0)); + } + + } + }); + return plugins; + } + + /** + * 根据任务id查询插件列表(该任务未添加的的) + * @param param + * @return + */ + @Override + public PageInfo findPluginOfNoAdded(PluginDto.FindPluginByTaskNo param) { + PageHelper.startPage(param.getPageNum(),param.getPageSize()); + List plugins = taskPluginDao.findPluginOfNoAdded(param.getTaskId(),param.getRoleId(),param.getPluginName(),param.getPluginType()); + plugins.forEach(plugin -> { + if (plugin.getFileIdList().contains(",")){ + String[] split = plugin.getFileIdList().split(","); + List splits =new ArrayList<>(Arrays.asList(split)); + //获取文件项目的路径 + String requestUrl = PropUtil.filedeal; + //通过文件id查询文件信息 + String c = RestTemplateUtil.postBody1(requestUrl,splits); + JsonResponse a = JSONObject.parseObject(c, JsonResponse.class); + //遍历区分是图标还是预览图 + List filePositions = JSONArray.parseArray(a.getData().toString(), FileVo.FilePosition.class); + if(ObjectUtil.isNotNull(filePositions) && ObjectUtil.isNotNull(filePositions)){ + for (int i = 0; i < filePositions.size(); i++) { + if (filePositions.get(i).getId().equals(plugin.getPluginIcon())){ + plugin.setIconUrl(filePositions.get(i)); + filePositions.remove(filePositions.get(i)); + } + } + plugin.setPreviewImgs(filePositions); + } + }else{ + //不包含逗号说明没有预览图,只有图标 + List id = new ArrayList<>(); + id.add(plugin.getFileIdList()); + //获取文件项目的路径 + String requestUrl = PropUtil.filedeal; + //通过文件id查询文件信息 + String c = RestTemplateUtil.postBody1(requestUrl,id); + JsonResponse a = JSONObject.parseObject(c, JsonResponse.class); + + List filePositions = JSONArray.parseArray(a.getData().toString(), FileVo.FilePosition.class); + if(ObjectUtil.isNotNull(filePositions) && ObjectUtil.isNotNull(filePositions) && !filePositions.isEmpty()){ + plugin.setIconUrl(filePositions.get(0)); + } + + } + }); + return new PageInfo<>(plugins); + } + + /** + * 给任务添加插件 + */ + @Override + public void addPluginForTask(PluginDto.AddPluginForTask param,Long currentUserId) { + //查找分解任务,通过分级任务找到任务详情 + ProTaskSubTime proTaskSubTime = taskSubTimeDao.selectByPrimaryKey(param.getTaskId()); + if (ObjectUtil.isNull(proTaskSubTime)){ + throw new BaseException("获取任务信息错误"); + } + ProTaskDetail taskDetail = taskDetailDao.selectByPrimaryKey(proTaskSubTime.getTaskDetailId()); + if (ObjectUtil.isNull(taskDetail)){ + throw new BaseException("获取任务信息错误"); + } + //查找权限 + int power = proRoleService.selectPowerByRoleName(currentUserId, taskDetail.getProjectId()); + //当前用户是否是此任务的负责人 + boolean flag = false; + ProRole executorRole = proRoleDao.selectByPrimaryKey(taskDetail.getExecutorRole()); + if (executorRole.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.AllMember.phase)) { + flag = true; + } else { + ProMemberExample memberExample = new ProMemberExample(); + memberExample.createCriteria().andUserIdEqualTo(currentUserId).andProjectIdEqualTo(taskDetail.getProjectId()); + List memberList = proMemberDao.selectByExample(memberExample); + if (CollectionUtil.isNotEmpty(memberList)) { + if (ObjectUtil.isNotNull(executorRole)) { + ProMemberRoleExample memberRoleExample = new ProMemberRoleExample(); + memberRoleExample.createCriteria().andRoleIdEqualTo(executorRole.getId()).andMemberIdEqualTo(memberList.get(0).getId()); + if (proMemberRoleDao.countByExample(memberRoleExample) != 0) { + flag = true; + } + } + } + } + + //给任务添加插件 + if (1 < power || flag){ + ProTaskPlugin taskPlugin = new ProTaskPlugin(); + taskPlugin.setId(snowflake.nextId()); + taskPlugin.setPluginId(param.getPluginId()); + taskPlugin.setTaskDetailId(taskDetail.getId()); + taskPlugin.setMemberRoleId(param.getRoleId()); + taskPluginDao.insertSelective(taskPlugin); + }else { + throw new BaseException("权限不足"); + } + } + + /** + * 给任务删除插件 + * @param param + * @param currentUserId + */ + @Override + public void deletePluginForTask(PluginDto.DeletePluginForTask param, Long currentUserId) { + //查找分解任务,通过分级任务找到任务详情 + ProTaskSubTime proTaskSubTime = taskSubTimeDao.selectByPrimaryKey(param.getTaskId()); + if (ObjectUtil.isNull(proTaskSubTime)){ + throw new BaseException("获取任务信息错误"); + } + ProTaskDetail taskDetail = taskDetailDao.selectByPrimaryKey(proTaskSubTime.getTaskDetailId()); + if (ObjectUtil.isNull(taskDetail)){ + throw new BaseException("获取任务信息错误"); + } + //查找权限 + int power = proRoleService.selectPowerByRoleName(currentUserId, taskDetail.getProjectId()); + //当前用户是否是此任务的负责人 + boolean flag = false; + ProRole executorRole = proRoleDao.selectByPrimaryKey(taskDetail.getExecutorRole()); + if (executorRole.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.AllMember.phase)) { + flag = true; + } else { + ProMemberExample memberExample = new ProMemberExample(); + memberExample.createCriteria().andUserIdEqualTo(currentUserId).andProjectIdEqualTo(taskDetail.getProjectId()); + List memberList = proMemberDao.selectByExample(memberExample); + if (CollectionUtil.isNotEmpty(memberList)) { + if (ObjectUtil.isNotNull(executorRole)) { + ProMemberRoleExample memberRoleExample = new ProMemberRoleExample(); + memberRoleExample.createCriteria().andRoleIdEqualTo(executorRole.getId()).andMemberIdEqualTo(memberList.get(0).getId()); + if (proMemberRoleDao.countByExample(memberRoleExample) != 0) { + flag = true; + } + } + } + } + + //给任务删除插件 + if (1 < power || flag){ + ProTaskPluginExample taskPluginExample = new ProTaskPluginExample(); + taskPluginExample.createCriteria().andPluginIdEqualTo(param.getPluginId()) + .andTaskDetailIdEqualTo(taskDetail.getId()) + .andMemberRoleIdNotEqualTo(param.getRoleId()); + taskPluginDao.deleteByExample(taskPluginExample); + }else { + throw new BaseException("权限不足"); + } } @Override @@ -55,6 +290,7 @@ public class SysPluginService implements ISysPluginService{ return pluginInfoList; } + /** * 透过插件id查询签到的信息 */ @@ -135,4 +371,6 @@ public class SysPluginService implements ISysPluginService{ } return taskDetailId; } + + } 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 d05580a0..6f8ca570 100644 --- a/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java +++ b/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java @@ -83,6 +83,7 @@ public class TaskDeliverService implements ITaskDeliverService { public void saveProTaskInputDoc(String[] inputs,Long taskId){ for (int i = 0; i < inputs.length; i++) { if(StringUtils.isNotBlank(inputs[i])){ + inputs[i]=inputs[i].replace("\r","").replace("\n",""); ProTaskInputDoc proTaskInputDoc = new ProTaskInputDoc(); proTaskInputDoc.setId(snowflake.nextId()); proTaskInputDoc.setTaskDetailId(taskId); diff --git a/tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java b/tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java index 0cee7209..0931b39a 100644 --- a/tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java +++ b/tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java @@ -362,6 +362,7 @@ public class TaskSubTimeService implements ITaskSubTimeService { detail.setCycle(addTask.getCycle()); detail.setParentId(addTask.getParentTaskId()); detail.setExecutorRole(addTask.getExecutorId()); + detail.setMilestone(addTask.getMilestone()); //添加任务优先级 if(ObjectUtil.isNotNull(addTask.getPriority())){ detail.setPriority(addTask.getPriority()); diff --git a/tall/src/main/java/com/ccsens/tall/web/InputDocController.java b/tall/src/main/java/com/ccsens/tall/web/InputDocController.java index 633673e5..c44a22f4 100644 --- a/tall/src/main/java/com/ccsens/tall/web/InputDocController.java +++ b/tall/src/main/java/com/ccsens/tall/web/InputDocController.java @@ -30,9 +30,11 @@ import java.util.List; @RestController @RequestMapping("/inputDoc") public class InputDocController { + @Autowired private IInputDocService iInputDocService; - @MustLogin + + /*@MustLogin @ApiOperation(value = "添加输入文档", notes = "1007:添加输入文档") @RequestMapping(value = "/addInputDoc", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse addInputDoc(@ApiParam @Validated @RequestBody QueryDto params) { @@ -40,7 +42,7 @@ public class InputDocController { //iInputDocService.addInputDoc(params.getParam(),params.getUserId()); log.info("添加输入文档"); return JsonResponse.newInstance().ok(); - } + }*/ @MustLogin @ApiOperation(value = "通过任务id查询输入文档", notes = "1007:通过任务id查询输入文档") diff --git a/tall/src/main/java/com/ccsens/tall/web/PluginController.java b/tall/src/main/java/com/ccsens/tall/web/PluginController.java index 51c54e2f..686554c2 100644 --- a/tall/src/main/java/com/ccsens/tall/web/PluginController.java +++ b/tall/src/main/java/com/ccsens/tall/web/PluginController.java @@ -1,5 +1,6 @@ package com.ccsens.tall.web; +import com.ccsens.tall.annotation.MustLoginTall; import com.ccsens.tall.bean.dto.PluginDto; import com.ccsens.tall.bean.dto.TaskDto; import com.ccsens.tall.bean.dto.WeekMeetingDto; @@ -11,6 +12,7 @@ import com.ccsens.util.JsonResponse; import com.ccsens.util.WebConstant; import com.ccsens.util.annotation.OperateType; import com.ccsens.util.bean.dto.QueryDto; +import com.github.pagehelper.PageInfo; import io.jsonwebtoken.Claims; import io.swagger.annotations.*; import lombok.extern.slf4j.Slf4j; @@ -30,13 +32,56 @@ public class PluginController { @Autowired private ISysPluginService sysPluginService; - @ApiOperation(value = "添加插件", notes = "") + @MustLoginTall + @ApiOperation(value = "添加插件(插件总表)", notes = "") @ApiImplicitParams({ }) @RequestMapping(value = "/save", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse saveSysPlugin(HttpServletRequest request, @ApiParam @Validated @RequestBody PluginDto.SaveSysPlugin saveSysPlugin) throws Exception { - log.info("添加一个插件：{}",saveSysPlugin); - sysPluginService.saveSysPlugin(saveSysPlugin); + public JsonResponse saveSysPlugin(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { + log.info("添加一个插件：{}",params); + sysPluginService.saveSysPlugin(params.getParam(),params.getUserId()); + return JsonResponse.newInstance().ok(); + } + + @ApiOperation(value = "根据任务id查询插件列表(该任务已添加的)", notes = "") + @ApiImplicitParams({ + }) + @RequestMapping(value = "/findPluginOfAdded", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> findPluginOfAdded(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { + log.info("根据任务id查询已添加插件列表：{}",params); + List pluginByTaskAddedList = sysPluginService.findPluginOfAdded(params.getParam()); + return JsonResponse.newInstance().ok(pluginByTaskAddedList); + } + + @ApiOperation(value = "根据任务id查询插件列表(该任务未添加的的)", notes = "") + @ApiImplicitParams({ + }) + @RequestMapping(value = "/findPluginOfNoAdded", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> findPluginOfNoAdded(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { + log.info("根据任务id查询未添加插件列表：{}",params); + PageInfo pluginByTaskNoAddedList = sysPluginService.findPluginOfNoAdded(params.getParam()); + return JsonResponse.newInstance().ok(pluginByTaskNoAddedList); + } + + @MustLoginTall + @ApiOperation(value = "给任务添加插件", notes = "") + @ApiImplicitParams({ + }) + @RequestMapping(value = "/addPluginForTask", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse addPluginForTask(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { + log.info("给任务添加插件：{}",params); + sysPluginService.addPluginForTask(params.getParam(),params.getUserId()); + return JsonResponse.newInstance().ok(); + } + + @MustLoginTall + @ApiOperation(value = "给任务删除插件", notes = "") + @ApiImplicitParams({ + }) + @RequestMapping(value = "/deletePluginForTask", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse deletePluginForTask(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { + log.info("给任务删除插件：{}",params); + sysPluginService.deletePluginForTask(params.getParam(),params.getUserId()); return JsonResponse.newInstance().ok(); } diff --git a/tall/src/main/java/com/ccsens/tall/web/RoleController.java b/tall/src/main/java/com/ccsens/tall/web/RoleController.java index 426d55d9..2930ab70 100644 --- a/tall/src/main/java/com/ccsens/tall/web/RoleController.java +++ b/tall/src/main/java/com/ccsens/tall/web/RoleController.java @@ -128,4 +128,20 @@ public class RoleController { RoleVo.JueSeByProIdLists jueSeByProIdLists=proRoleService.queryRoleShows(param); return JsonResponse.newInstance().ok(jueSeByProIdLists); } + @MustLoginTall + @ApiOperation(value = "修改角色是否展示",notes = "") + @RequestMapping(value = "/queryRoleIsShows", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse queryRoleIsShows(@ApiParam @Validated @RequestBody QueryDto param){ + log.info("传入参数：{}", param); + proRoleService.queryRoleIsShows(param); + return JsonResponse.newInstance().ok(); + } + @MustLoginTall + @ApiOperation(value = "给角色排序",notes = "") + @RequestMapping(value = "/upRoleShowsOrder", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse upRoleShowsOrder(@ApiParam @Validated @RequestBody QueryDto param){ + log.info("传入参数：{}", param); + proRoleService.upRoleShowsOrder(param); + return JsonResponse.newInstance().ok(); + } } diff --git a/tall/src/main/resources/application-prod.yml b/tall/src/main/resources/application-prod.yml index c8697ed1..8191aeae 100644 --- a/tall/src/main/resources/application-prod.yml +++ b/tall/src/main/resources/application-prod.yml @@ -46,4 +46,4 @@ file: path: /home/cloud/tall/uploads/ domain: https://www.tall.wiki/gateway/tall/v1.0/ imgDomain: https://www.tall.wiki/gateway/tall/v1.0/uploads -filedeal: https://www.tall.wiki/file/query \ No newline at end of file +filedeal: https://www.tall.wiki/filedeal/file/query \ No newline at end of file diff --git a/tall/src/main/resources/application-test.yml b/tall/src/main/resources/application-test.yml index bc6800cf..ab378fb7 100644 --- a/tall/src/main/resources/application-test.yml +++ b/tall/src/main/resources/application-test.yml @@ -46,7 +46,7 @@ file: path: /home/cloud/tall/uploads/ domain: https://test.tall.wiki/gateway/tall/v1.0/ imgDomain: https://test.tall.wiki/gateway/tall/v1.0/uploads -filedeal: https://test.tall.wiki/file/query +filedeal: https://test.tall.wiki/filedeal/file/query #file: # domain: http://192.168.0.99/gateway/tall/v1.0/ # imgDomain: http://192.168.0.99/gateway/tall/v1.0/uploads \ No newline at end of file diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index b5408a3a..ebc544af 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: dev - include: util-dev,common + active: test + include: util-test,common diff --git a/tall/src/main/resources/mapper_dao/ProRoleDao.xml b/tall/src/main/resources/mapper_dao/ProRoleDao.xml index 04618218..3624e021 100644 --- a/tall/src/main/resources/mapper_dao/ProRoleDao.xml +++ b/tall/src/main/resources/mapper_dao/ProRoleDao.xml @@ -311,14 +311,25 @@ \ No newline at end of file diff --git a/tall/src/main/resources/mapper_dao/TaskDetailDao.xml b/tall/src/main/resources/mapper_dao/TaskDetailDao.xml index c89eac67..0712033c 100644 --- a/tall/src/main/resources/mapper_dao/TaskDetailDao.xml +++ b/tall/src/main/resources/mapper_dao/TaskDetailDao.xml @@ -529,6 +529,7 @@ t.cycle as cycle, t.money as money, t.project_id as projectId, + t.milestone, (SELECT `name` FROM t_sys_project WHERE id = t.project_id) as projectName, t.executor_role as executorRole, (SELECT `name` FROM t_pro_role WHERE id = t.executor_role) as executorRoleName, diff --git a/tall/src/main/resources/mapper_dao/TaskPluginDao.xml b/tall/src/main/resources/mapper_dao/TaskPluginDao.xml new file mode 100644 index 00000000..b75acc90 --- /dev/null +++ b/tall/src/main/resources/mapper_dao/TaskPluginDao.xml @@ -0,0 +1,68 @@ + + + + + + + + + \ No newline at end of file diff --git a/tall/src/main/resources/mapper_raw/ProPluginPreviewFileMapper.xml b/tall/src/main/resources/mapper_raw/ProPluginPreviewFileMapper.xml new file mode 100644 index 00000000..71400d6d --- /dev/null +++ b/tall/src/main/resources/mapper_raw/ProPluginPreviewFileMapper.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + 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, plugin_id, file_id, created_at, updated_at, rec_status, preview_description + + + + + delete from t_pro_plugin_preview_file + where id = #{id,jdbcType=BIGINT} + + + delete from t_pro_plugin_preview_file + + + + + + insert into t_pro_plugin_preview_file (id, plugin_id, file_id, + created_at, updated_at, rec_status, + preview_description) + values (#{id,jdbcType=BIGINT}, #{pluginId,jdbcType=BIGINT}, #{fileId,jdbcType=BIGINT}, + #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, + #{previewDescription,jdbcType=VARCHAR}) + + + insert into t_pro_plugin_preview_file + + + id, + + + plugin_id, + + + file_id, + + + created_at, + + + updated_at, + + + rec_status, + + + preview_description, + + + + + #{id,jdbcType=BIGINT}, + + + #{pluginId,jdbcType=BIGINT}, + + + #{fileId,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + #{previewDescription,jdbcType=VARCHAR}, + + + + + + update t_pro_plugin_preview_file + + + id = #{record.id,jdbcType=BIGINT}, + + + plugin_id = #{record.pluginId,jdbcType=BIGINT}, + + + file_id = #{record.fileId,jdbcType=BIGINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + preview_description = #{record.previewDescription,jdbcType=VARCHAR}, + + + + + + + + update t_pro_plugin_preview_file + set id = #{record.id,jdbcType=BIGINT}, + plugin_id = #{record.pluginId,jdbcType=BIGINT}, + file_id = #{record.fileId,jdbcType=BIGINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT}, + preview_description = #{record.previewDescription,jdbcType=VARCHAR} + + + + + + update t_pro_plugin_preview_file + + + plugin_id = #{pluginId,jdbcType=BIGINT}, + + + file_id = #{fileId,jdbcType=BIGINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + preview_description = #{previewDescription,jdbcType=VARCHAR}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_pro_plugin_preview_file + set plugin_id = #{pluginId,jdbcType=BIGINT}, + file_id = #{fileId,jdbcType=BIGINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT}, + preview_description = #{previewDescription,jdbcType=VARCHAR} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/src/main/resources/mapper_raw/ProTaskDetailMapper.xml b/tall/src/main/resources/mapper_raw/ProTaskDetailMapper.xml index c22d2b95..2aa7ca77 100644 --- a/tall/src/main/resources/mapper_raw/ProTaskDetailMapper.xml +++ b/tall/src/main/resources/mapper_raw/ProTaskDetailMapper.xml @@ -29,7 +29,7 @@ - + @@ -145,7 +145,7 @@ #{virtual,jdbcType=TINYINT}, #{level,jdbcType=TINYINT}, #{hasGroup,jdbcType=TINYINT}, #{finishNeedAll,jdbcType=TINYINT}, #{allMember,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, #{priority,jdbcType=TINYINT}, - #{milestone,jdbcType=TINYINT}) + #{milestone,jdbcType=VARCHAR}) insert into t_pro_task_detail @@ -318,7 +318,7 @@ #{priority,jdbcType=TINYINT}, - #{milestone,jdbcType=TINYINT}, + #{milestone,jdbcType=VARCHAR}, @@ -413,7 +413,7 @@ priority = #{record.priority,jdbcType=TINYINT}, - milestone = #{record.milestone,jdbcType=TINYINT}, + milestone = #{record.milestone,jdbcType=VARCHAR}, @@ -449,7 +449,7 @@ updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, rec_status = #{record.recStatus,jdbcType=TINYINT}, priority = #{record.priority,jdbcType=TINYINT}, - milestone = #{record.milestone,jdbcType=TINYINT} + milestone = #{record.milestone,jdbcType=VARCHAR} @@ -536,7 +536,7 @@ priority = #{priority,jdbcType=TINYINT}, - milestone = #{milestone,jdbcType=TINYINT}, + milestone = #{milestone,jdbcType=VARCHAR}, where id = #{id,jdbcType=BIGINT} @@ -569,7 +569,7 @@ updated_at = #{updatedAt,jdbcType=TIMESTAMP}, rec_status = #{recStatus,jdbcType=TINYINT}, priority = #{priority,jdbcType=TINYINT}, - milestone = #{milestone,jdbcType=TINYINT} + milestone = #{milestone,jdbcType=VARCHAR} where id = #{id,jdbcType=BIGINT} \ No newline at end of file diff --git a/tall/src/main/resources/mapper_raw/ProTasketailMapper.xml b/tall/src/main/resources/mapper_raw/ProTasketailMapper.xml new file mode 100644 index 00000000..59fb60a2 --- /dev/null +++ b/tall/src/main/resources/mapper_raw/ProTasketailMapper.xml @@ -0,0 +1,575 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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, project_id, name, description, begin_time, end_time, cycle, parent_id, sub_task, + sub_project_id, sub_project, executor_role, checker_role, money, delay, delay_time, + loop_to, loop_times, virtual, level, has_group, finish_need_all, all_member, created_at, + updated_at, rec_status, priority, milestone + + + + + delete from t_pro_task_detail + where id = #{id,jdbcType=BIGINT} + + + delete from t_pro_task_detail + + + + + + insert into t_pro_task_detail (id, project_id, name, + description, begin_time, end_time, + cycle, parent_id, sub_task, + sub_project_id, sub_project, executor_role, + checker_role, money, delay, + delay_time, loop_to, loop_times, + virtual, level, has_group, + finish_need_all, all_member, created_at, + updated_at, rec_status, priority, + milestone) + values (#{id,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, + #{description,jdbcType=VARCHAR}, #{beginTime,jdbcType=BIGINT}, #{endTime,jdbcType=BIGINT}, + #{cycle,jdbcType=VARCHAR}, #{parentId,jdbcType=BIGINT}, #{subTask,jdbcType=VARCHAR}, + #{subProjectId,jdbcType=BIGINT}, #{subProject,jdbcType=VARCHAR}, #{executorRole,jdbcType=BIGINT}, + #{checkerRole,jdbcType=BIGINT}, #{money,jdbcType=BIGINT}, #{delay,jdbcType=TINYINT}, + #{delayTime,jdbcType=BIGINT}, #{loopTo,jdbcType=BIGINT}, #{loopTimes,jdbcType=INTEGER}, + #{virtual,jdbcType=TINYINT}, #{level,jdbcType=TINYINT}, #{hasGroup,jdbcType=TINYINT}, + #{finishNeedAll,jdbcType=TINYINT}, #{allMember,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, + #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, #{priority,jdbcType=TINYINT}, + #{milestone,jdbcType=VARCHAR}) + + + insert into t_pro_task_detail + + + id, + + + project_id, + + + name, + + + description, + + + begin_time, + + + end_time, + + + cycle, + + + parent_id, + + + sub_task, + + + sub_project_id, + + + sub_project, + + + executor_role, + + + checker_role, + + + money, + + + delay, + + + delay_time, + + + loop_to, + + + loop_times, + + + virtual, + + + level, + + + has_group, + + + finish_need_all, + + + all_member, + + + created_at, + + + updated_at, + + + rec_status, + + + priority, + + + milestone, + + + + + #{id,jdbcType=BIGINT}, + + + #{projectId,jdbcType=BIGINT}, + + + #{name,jdbcType=VARCHAR}, + + + #{description,jdbcType=VARCHAR}, + + + #{beginTime,jdbcType=BIGINT}, + + + #{endTime,jdbcType=BIGINT}, + + + #{cycle,jdbcType=VARCHAR}, + + + #{parentId,jdbcType=BIGINT}, + + + #{subTask,jdbcType=VARCHAR}, + + + #{subProjectId,jdbcType=BIGINT}, + + + #{subProject,jdbcType=VARCHAR}, + + + #{executorRole,jdbcType=BIGINT}, + + + #{checkerRole,jdbcType=BIGINT}, + + + #{money,jdbcType=BIGINT}, + + + #{delay,jdbcType=TINYINT}, + + + #{delayTime,jdbcType=BIGINT}, + + + #{loopTo,jdbcType=BIGINT}, + + + #{loopTimes,jdbcType=INTEGER}, + + + #{virtual,jdbcType=TINYINT}, + + + #{level,jdbcType=TINYINT}, + + + #{hasGroup,jdbcType=TINYINT}, + + + #{finishNeedAll,jdbcType=TINYINT}, + + + #{allMember,jdbcType=TINYINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + #{priority,jdbcType=TINYINT}, + + + #{milestone,jdbcType=VARCHAR}, + + + + + + update t_pro_task_detail + + + id = #{record.id,jdbcType=BIGINT}, + + + project_id = #{record.projectId,jdbcType=BIGINT}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + description = #{record.description,jdbcType=VARCHAR}, + + + begin_time = #{record.beginTime,jdbcType=BIGINT}, + + + end_time = #{record.endTime,jdbcType=BIGINT}, + + + cycle = #{record.cycle,jdbcType=VARCHAR}, + + + parent_id = #{record.parentId,jdbcType=BIGINT}, + + + sub_task = #{record.subTask,jdbcType=VARCHAR}, + + + sub_project_id = #{record.subProjectId,jdbcType=BIGINT}, + + + sub_project = #{record.subProject,jdbcType=VARCHAR}, + + + executor_role = #{record.executorRole,jdbcType=BIGINT}, + + + checker_role = #{record.checkerRole,jdbcType=BIGINT}, + + + money = #{record.money,jdbcType=BIGINT}, + + + delay = #{record.delay,jdbcType=TINYINT}, + + + delay_time = #{record.delayTime,jdbcType=BIGINT}, + + + loop_to = #{record.loopTo,jdbcType=BIGINT}, + + + loop_times = #{record.loopTimes,jdbcType=INTEGER}, + + + virtual = #{record.virtual,jdbcType=TINYINT}, + + + level = #{record.level,jdbcType=TINYINT}, + + + has_group = #{record.hasGroup,jdbcType=TINYINT}, + + + finish_need_all = #{record.finishNeedAll,jdbcType=TINYINT}, + + + all_member = #{record.allMember,jdbcType=TINYINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + priority = #{record.priority,jdbcType=TINYINT}, + + + milestone = #{record.milestone,jdbcType=VARCHAR}, + + + + + + + + update t_pro_task_detail + set id = #{record.id,jdbcType=BIGINT}, + project_id = #{record.projectId,jdbcType=BIGINT}, + name = #{record.name,jdbcType=VARCHAR}, + description = #{record.description,jdbcType=VARCHAR}, + begin_time = #{record.beginTime,jdbcType=BIGINT}, + end_time = #{record.endTime,jdbcType=BIGINT}, + cycle = #{record.cycle,jdbcType=VARCHAR}, + parent_id = #{record.parentId,jdbcType=BIGINT}, + sub_task = #{record.subTask,jdbcType=VARCHAR}, + sub_project_id = #{record.subProjectId,jdbcType=BIGINT}, + sub_project = #{record.subProject,jdbcType=VARCHAR}, + executor_role = #{record.executorRole,jdbcType=BIGINT}, + checker_role = #{record.checkerRole,jdbcType=BIGINT}, + money = #{record.money,jdbcType=BIGINT}, + delay = #{record.delay,jdbcType=TINYINT}, + delay_time = #{record.delayTime,jdbcType=BIGINT}, + loop_to = #{record.loopTo,jdbcType=BIGINT}, + loop_times = #{record.loopTimes,jdbcType=INTEGER}, + virtual = #{record.virtual,jdbcType=TINYINT}, + level = #{record.level,jdbcType=TINYINT}, + has_group = #{record.hasGroup,jdbcType=TINYINT}, + finish_need_all = #{record.finishNeedAll,jdbcType=TINYINT}, + all_member = #{record.allMember,jdbcType=TINYINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT}, + priority = #{record.priority,jdbcType=TINYINT}, + milestone = #{record.milestone,jdbcType=VARCHAR} + + + + + + update t_pro_task_detail + + + project_id = #{projectId,jdbcType=BIGINT}, + + + name = #{name,jdbcType=VARCHAR}, + + + description = #{description,jdbcType=VARCHAR}, + + + begin_time = #{beginTime,jdbcType=BIGINT}, + + + end_time = #{endTime,jdbcType=BIGINT}, + + + cycle = #{cycle,jdbcType=VARCHAR}, + + + parent_id = #{parentId,jdbcType=BIGINT}, + + + sub_task = #{subTask,jdbcType=VARCHAR}, + + + sub_project_id = #{subProjectId,jdbcType=BIGINT}, + + + sub_project = #{subProject,jdbcType=VARCHAR}, + + + executor_role = #{executorRole,jdbcType=BIGINT}, + + + checker_role = #{checkerRole,jdbcType=BIGINT}, + + + money = #{money,jdbcType=BIGINT}, + + + delay = #{delay,jdbcType=TINYINT}, + + + delay_time = #{delayTime,jdbcType=BIGINT}, + + + loop_to = #{loopTo,jdbcType=BIGINT}, + + + loop_times = #{loopTimes,jdbcType=INTEGER}, + + + virtual = #{virtual,jdbcType=TINYINT}, + + + level = #{level,jdbcType=TINYINT}, + + + has_group = #{hasGroup,jdbcType=TINYINT}, + + + finish_need_all = #{finishNeedAll,jdbcType=TINYINT}, + + + all_member = #{allMember,jdbcType=TINYINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + priority = #{priority,jdbcType=TINYINT}, + + + milestone = #{milestone,jdbcType=VARCHAR}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_pro_task_detail + set project_id = #{projectId,jdbcType=BIGINT}, + name = #{name,jdbcType=VARCHAR}, + description = #{description,jdbcType=VARCHAR}, + begin_time = #{beginTime,jdbcType=BIGINT}, + end_time = #{endTime,jdbcType=BIGINT}, + cycle = #{cycle,jdbcType=VARCHAR}, + parent_id = #{parentId,jdbcType=BIGINT}, + sub_task = #{subTask,jdbcType=VARCHAR}, + sub_project_id = #{subProjectId,jdbcType=BIGINT}, + sub_project = #{subProject,jdbcType=VARCHAR}, + executor_role = #{executorRole,jdbcType=BIGINT}, + checker_role = #{checkerRole,jdbcType=BIGINT}, + money = #{money,jdbcType=BIGINT}, + delay = #{delay,jdbcType=TINYINT}, + delay_time = #{delayTime,jdbcType=BIGINT}, + loop_to = #{loopTo,jdbcType=BIGINT}, + loop_times = #{loopTimes,jdbcType=INTEGER}, + virtual = #{virtual,jdbcType=TINYINT}, + level = #{level,jdbcType=TINYINT}, + has_group = #{hasGroup,jdbcType=TINYINT}, + finish_need_all = #{finishNeedAll,jdbcType=TINYINT}, + all_member = #{allMember,jdbcType=TINYINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT}, + priority = #{priority,jdbcType=TINYINT}, + milestone = #{milestone,jdbcType=VARCHAR} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/src/main/resources/mapper_raw/SysPluginMapper.xml b/tall/src/main/resources/mapper_raw/SysPluginMapper.xml index d9e9f440..0756b261 100644 --- a/tall/src/main/resources/mapper_raw/SysPluginMapper.xml +++ b/tall/src/main/resources/mapper_raw/SysPluginMapper.xml @@ -6,10 +6,13 @@ + - + + + @@ -70,7 +73,8 @@ - id, name, description, scene, created_at, updated_at, rec_status, show_type + id, name, description, scene, show_type, created_at, updated_at, rec_status, plugin_icon, + plugin_author, plugin_class + SELECT + q.id AS questionId, + o.id, + o.CODE, + o.sort, + o.hospital, + o.START, + o.END + FROM + t_question_ocr o, + t_question q + WHERE + o.CODE = q.CODE + AND o.sort = q.sort + AND o.CODE = #{code} + AND o.hospital = #{hospitalId} + AND o.rec_status = 0 + AND q.rec_status = 0 + + \ No newline at end of file diff --git a/tcm/src/main/resources/mapper_dao/ReportCodeDao.xml b/tcm/src/main/resources/mapper_dao/ReportCodeDao.xml index 0e86b75b..7d68c55b 100644 --- a/tcm/src/main/resources/mapper_dao/ReportCodeDao.xml +++ b/tcm/src/main/resources/mapper_dao/ReportCodeDao.xml @@ -96,12 +96,14 @@ + + @@ -116,13 +118,15 @@ c1.sort as fSort, c1.remark as fRemark, c1.report_type as fReportType, + c1.record_type as fRecordType, c2.id as sId, c2.code as sCode, c2.`name` as sName, c2.must as sMust, c2.sort as sSort, c2.remark as sRemark, - c2.report_type as sReportType + c2.report_type as sReportType, + c2.record_type as sRecordType FROM t_report_code c1 LEFT JOIN ( diff --git a/tcm/src/main/resources/mapper_raw/QuestionOcrMapper.xml b/tcm/src/main/resources/mapper_raw/QuestionOcrMapper.xml new file mode 100644 index 00000000..234718b9 --- /dev/null +++ b/tcm/src/main/resources/mapper_raw/QuestionOcrMapper.xml @@ -0,0 +1,305 @@ + + + + + + + + + + + + + + + + + + + + + + + + + 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, code, sort, hospital, start, end, remark, operator, created_at, updated_at, rec_status + + + + + delete from t_question_ocr + where id = #{id,jdbcType=BIGINT} + + + delete from t_question_ocr + + + + + + insert into t_question_ocr (id, code, sort, + hospital, start, end, + remark, operator, created_at, + updated_at, rec_status) + values (#{id,jdbcType=BIGINT}, #{code,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}, + #{hospital,jdbcType=BIGINT}, #{start,jdbcType=VARCHAR}, #{end,jdbcType=VARCHAR}, + #{remark,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, + #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) + + + insert into t_question_ocr + + + id, + + + code, + + + sort, + + + hospital, + + + start, + + + end, + + + remark, + + + operator, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{code,jdbcType=VARCHAR}, + + + #{sort,jdbcType=INTEGER}, + + + #{hospital,jdbcType=BIGINT}, + + + #{start,jdbcType=VARCHAR}, + + + #{end,jdbcType=VARCHAR}, + + + #{remark,jdbcType=VARCHAR}, + + + #{operator,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_question_ocr + + + id = #{record.id,jdbcType=BIGINT}, + + + code = #{record.code,jdbcType=VARCHAR}, + + + sort = #{record.sort,jdbcType=INTEGER}, + + + hospital = #{record.hospital,jdbcType=BIGINT}, + + + start = #{record.start,jdbcType=VARCHAR}, + + + end = #{record.end,jdbcType=VARCHAR}, + + + remark = #{record.remark,jdbcType=VARCHAR}, + + + operator = #{record.operator,jdbcType=BIGINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_question_ocr + set id = #{record.id,jdbcType=BIGINT}, + code = #{record.code,jdbcType=VARCHAR}, + sort = #{record.sort,jdbcType=INTEGER}, + hospital = #{record.hospital,jdbcType=BIGINT}, + start = #{record.start,jdbcType=VARCHAR}, + end = #{record.end,jdbcType=VARCHAR}, + remark = #{record.remark,jdbcType=VARCHAR}, + operator = #{record.operator,jdbcType=BIGINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_question_ocr + + + code = #{code,jdbcType=VARCHAR}, + + + sort = #{sort,jdbcType=INTEGER}, + + + hospital = #{hospital,jdbcType=BIGINT}, + + + start = #{start,jdbcType=VARCHAR}, + + + end = #{end,jdbcType=VARCHAR}, + + + remark = #{remark,jdbcType=VARCHAR}, + + + operator = #{operator,jdbcType=BIGINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_question_ocr + set code = #{code,jdbcType=VARCHAR}, + sort = #{sort,jdbcType=INTEGER}, + hospital = #{hospital,jdbcType=BIGINT}, + start = #{start,jdbcType=VARCHAR}, + end = #{end,jdbcType=VARCHAR}, + remark = #{remark,jdbcType=VARCHAR}, + operator = #{operator,jdbcType=BIGINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/util/src/main/java/com/ccsens/util/CodeEnum.java b/util/src/main/java/com/ccsens/util/CodeEnum.java index b7817af2..39531c53 100644 --- a/util/src/main/java/com/ccsens/util/CodeEnum.java +++ b/util/src/main/java/com/ccsens/util/CodeEnum.java @@ -9,6 +9,8 @@ public enum CodeEnum { */ SUCCESS(200, "ok", true), SYS_ERROR(500, "网络繁忙，请您稍后重试", false), + THIRD_ERROR(-1, "调用第三方刚接口异常", false), + FILE_FORMAT_ERROR(1, "文件格式错误", true), AUDITED(2, "已经审核通过，不重复提交。", true), POSITION_NO_FOUND(3, "未找到对应职务，请重新选择职务。", true), @@ -187,8 +189,13 @@ public enum CodeEnum { MEIYOUGAIYISHENG(156,"该医生信息查询不正确",true), QINGTIJIAOSHITI(157,"未做出修改答案，修改后再提交",true), DOC_REPEAT(158,"输入文档已存在",true), + DOC_NONE(161,"输入文档不存在",true), NOTNAME(159,"未找到该列",true), CHONGFU(160,"该成员在项目下有多个成员角色",true), + CHAOGUOSHI(161,"角色展示不能超过10个",true), + BAOHANJINLI(162,"不能删除包含经理得角色",true), + CHONGFUTIJIAO(163,"不要重复提交",true), + ZUISHAOCHUANLIANGE(164,"排序最少需要传入两个",true), ; @@ -241,5 +248,9 @@ public enum CodeEnum { private Integer code; private String msg; private boolean success; + + public void setMsg(String msg) { + this.msg = msg; + } } diff --git a/util/src/main/java/com/ccsens/util/RestTemplateUtil.java b/util/src/main/java/com/ccsens/util/RestTemplateUtil.java index 06e7a4d5..82452479 100644 --- a/util/src/main/java/com/ccsens/util/RestTemplateUtil.java +++ b/util/src/main/java/com/ccsens/util/RestTemplateUtil.java @@ -106,8 +106,14 @@ public class RestTemplateUtil { } public static String postUrlEncode(String url, Object params) { log.info("请求路径：{}，请求参数：{}", url, params); - JSONObject json = JSON.parseObject(JSON.toJSONString(params)); - MultiValueMap paramMap = transMultiValueMap(json); + MultiValueMap paramMap; + if (params == null) { + paramMap = new LinkedMultiValueMap<>(); + } else { + JSONObject json = JSON.parseObject(JSON.toJSONString(params)); + paramMap = transMultiValueMap(json); + } + HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED); HttpEntity formEntity = new HttpEntity<>(paramMap, headers); diff --git a/util/src/main/java/com/ccsens/util/baidu/BaiDuDto.java b/util/src/main/java/com/ccsens/util/baidu/BaiDuDto.java new file mode 100644 index 00000000..e336a488 --- /dev/null +++ b/util/src/main/java/com/ccsens/util/baidu/BaiDuDto.java @@ -0,0 +1,19 @@ +package com.ccsens.util.baidu; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @description: + * @author: whj + * @time: 2021/3/31 16:39 + */ +public class BaiDuDto { + + @ApiModel("通用文字识别（标准版）-请求参数") + @Data + public static class GeneralBasic{ + private String image; + private String url; + } +} diff --git a/util/src/main/java/com/ccsens/util/baidu/BaiDuUtil.java b/util/src/main/java/com/ccsens/util/baidu/BaiDuUtil.java new file mode 100644 index 00000000..1dc4b127 --- /dev/null +++ b/util/src/main/java/com/ccsens/util/baidu/BaiDuUtil.java @@ -0,0 +1,95 @@ +package com.ccsens.util.baidu; + +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; +import com.ccsens.util.CodeEnum; +import com.ccsens.util.RedisUtil; +import com.ccsens.util.RestTemplateUtil; +import com.ccsens.util.exception.BaseException; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; +import javax.annotation.Resource; + +/** + * @description: 百度API + * @author: whj + * @time: 2021/3/31 15:30 + */ +@Component +@Slf4j +public class BaiDuUtil { + + @Resource + private RedisUtil redisUtil; + private static BaiDuUtil util; + /**token_appKey*/ + private static final String tokenKey = "baidu_token_"; + + private static final String authUrl = "https://aip.baidubce.com/oauth/2.0/token?grant_type=client_credentials&client_id={}&client_secret={}"; + private static final String generalBasicUrl = "https://aip.baidubce.com/rest/2.0/ocr/v1/general_basic?access_token={}"; + + @PostConstruct + public void init(){ + util = this; + util.redisUtil = this.redisUtil; + } + + /** + * 获取token + * @param appKey appKey + * @param secretKey secretKey + * @return token + */ + public static String getToken(String appKey, String secretKey){ + log.info("获取百度认证：{}，{}", appKey, secretKey); + String key = tokenKey + appKey; + String token = (String) util.redisUtil.get(key); + log.info("缓存token:{}", token); + if (StrUtil.isNotEmpty(token)) { + return token; + } + String url = StrUtil.format(authUrl, appKey, secretKey); + String result = RestTemplateUtil.postUrlEncode(url, null); + log.info("获取百度认证：{}", result); + JSONObject json = JSONObject.parseObject(result); + if (json.containsKey(Code.ERROR)) { + log.info("获取token失败"); + CodeEnum thirdError = CodeEnum.THIRD_ERROR; + thirdError.setMsg(result); + throw new BaseException(thirdError); + } + token = json.getString(Code.ACCESS_TOKEN); + // 有效期，减10分钟 + int expiresTime = json.getIntValue(Code.EXPIRES_TIME) - 10*60; + util.redisUtil.set(key, token, expiresTime); + return token; + } + + + public static BaiDuVo.GeneralBasic generalBasic(String appKey, String secretKey, BaiDuDto.GeneralBasic basic) { + String token = getToken(appKey, secretKey); + String url = StrUtil.format(generalBasicUrl, token); +// String result = RestTemplateUtil.postBody(url, basic); + String result = RestTemplateUtil.postUrlEncode(url, basic); + log.info("调用通用文字识别（标准版）结果：{}", result); + if (result.contains(Code.GENERAL_BASIC_ERROR)) { + CodeEnum thirdError = CodeEnum.THIRD_ERROR; + thirdError.setMsg(result); + throw new BaseException(thirdError); + } + BaiDuVo.GeneralBasic basicVo = JSONObject.parseObject(result, BaiDuVo.GeneralBasic.class); + return basicVo; + } + + private static class Code{ + private final static String ERROR = "error"; + private final static String GENERAL_BASIC_ERROR = "error_code"; + private final static String ERROR_DESC = "error_description"; + private final static String ACCESS_TOKEN = "access_token"; + private final static String EXPIRES_TIME = "expires_in"; + + } + +} diff --git a/util/src/main/java/com/ccsens/util/baidu/BaiDuVo.java b/util/src/main/java/com/ccsens/util/baidu/BaiDuVo.java new file mode 100644 index 00000000..4c722df6 --- /dev/null +++ b/util/src/main/java/com/ccsens/util/baidu/BaiDuVo.java @@ -0,0 +1,33 @@ +package com.ccsens.util.baidu; + +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.util.List; + +/** + * @description: + * @author: whj + * @time: 2021/3/31 16:11 + */ +public class BaiDuVo { + + @ApiModel("通用文字识别（标准版）") + @Data + public static class GeneralBasic{ + @JSONField(name="log_id") + private String logId; + @JSONField(name="words_result") + private List wordsResult; + @JSONField(name="words_result_num") + private int wordsResultNum; + } + + @Data + @ApiModel("文字识别-文字") + public static class GeneralWord{ + private String words; + } +}