diff --git a/common/src/main/java/com/ccsens/common/bean/dto/CDeliverDto.java b/common/src/main/java/com/ccsens/common/bean/dto/CDeliverDto.java new file mode 100644 index 00000000..2805d952 --- /dev/null +++ b/common/src/main/java/com/ccsens/common/bean/dto/CDeliverDto.java @@ -0,0 +1,71 @@ +package com.ccsens.common.bean.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +@Data +public class CDeliverDto { + + @Data + @ApiModel("查询所有检查人") + public static class QueryChecker{ + @NotNull(message = "请选择项目") + @ApiModelProperty("项目id") + private Long projectId; + } + + @Data + @ApiModel("检查交付物") + public static class CheckDeliver{ + @NotNull(message = "检查信息错误") + @ApiModelProperty("检查记录id") + private Long checkId; + @NotNull(message = "项目信息错误") + @ApiModelProperty("项目id") + private Long projectId; + @ApiModelProperty("检查状态(1-通过,2-驳回)") + private Byte status; + @ApiModelProperty("分数") + private String score; + @ApiModelProperty("评论") + private String remark; + } + + @Data + @ApiModel("提交交付物") + public static class SaveDeliver{ + @NotNull(message = "请选择项目") + @ApiModelProperty("项目id") + private Long projectId; + @NotNull(message = "请选择任务") + @ApiModelProperty("分解任务id") + private Long taskSubId; + @ApiModelProperty("文本内容") + private String content; + @ApiModelProperty("检查人列表") + private List checkerList; + } + + @Data + @ApiModel("查询任务的交付物历史") + public static class QueryDeliverOfTask{ + @NotNull(message = "请选择项目信息") + @ApiModelProperty("项目id") + private Long projectId; + @NotNull(message = "请选择任务") + @ApiModelProperty("任务分解id") + private Long taskSubId; + } + + @Data + @ApiModel("查询项目的交付物历史") + public static class QueryDeliverOfProject { + @NotNull(message = "请选择项目信息") + @ApiModelProperty("项目id") + private Long projectId; + } +} diff --git a/common/src/main/java/com/ccsens/common/bean/po/ProDeliver.java b/common/src/main/java/com/ccsens/common/bean/po/ProDeliver.java new file mode 100644 index 00000000..06520391 --- /dev/null +++ b/common/src/main/java/com/ccsens/common/bean/po/ProDeliver.java @@ -0,0 +1,139 @@ +package com.ccsens.common.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class ProDeliver implements Serializable { + private Long id; + + private Long taskSubId; + + private Long memberId; + + private Long fileId; + + private String filePath; + + private String content; + + private Long projectId; + + private Long time; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getTaskSubId() { + return taskSubId; + } + + public void setTaskSubId(Long taskSubId) { + this.taskSubId = taskSubId; + } + + public Long getMemberId() { + return memberId; + } + + public void setMemberId(Long memberId) { + this.memberId = memberId; + } + + public Long getFileId() { + return fileId; + } + + public void setFileId(Long fileId) { + this.fileId = fileId; + } + + public String getFilePath() { + return filePath; + } + + public void setFilePath(String filePath) { + this.filePath = filePath == null ? null : filePath.trim(); + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content == null ? null : content.trim(); + } + + public Long getProjectId() { + return projectId; + } + + public void setProjectId(Long projectId) { + this.projectId = projectId; + } + + public Long getTime() { + return time; + } + + public void setTime(Long time) { + this.time = time; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", taskSubId=").append(taskSubId); + sb.append(", memberId=").append(memberId); + sb.append(", fileId=").append(fileId); + sb.append(", filePath=").append(filePath); + sb.append(", content=").append(content); + sb.append(", projectId=").append(projectId); + sb.append(", time=").append(time); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/common/src/main/java/com/ccsens/common/bean/po/ProDeliverChecker.java b/common/src/main/java/com/ccsens/common/bean/po/ProDeliverChecker.java new file mode 100644 index 00000000..366e54c4 --- /dev/null +++ b/common/src/main/java/com/ccsens/common/bean/po/ProDeliverChecker.java @@ -0,0 +1,117 @@ +package com.ccsens.common.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class ProDeliverChecker implements Serializable { + private Long id; + + private Long deliverId; + + private Long memberId; + + private String score; + + private String remark; + + private Byte status; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getDeliverId() { + return deliverId; + } + + public void setDeliverId(Long deliverId) { + this.deliverId = deliverId; + } + + public Long getMemberId() { + return memberId; + } + + public void setMemberId(Long memberId) { + this.memberId = memberId; + } + + public String getScore() { + return score; + } + + public void setScore(String score) { + this.score = score == null ? null : score.trim(); + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark == null ? null : remark.trim(); + } + + public Byte getStatus() { + return status; + } + + public void setStatus(Byte status) { + this.status = status; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", deliverId=").append(deliverId); + sb.append(", memberId=").append(memberId); + sb.append(", score=").append(score); + sb.append(", remark=").append(remark); + sb.append(", status=").append(status); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/common/src/main/java/com/ccsens/common/bean/po/ProDeliverCheckerExample.java b/common/src/main/java/com/ccsens/common/bean/po/ProDeliverCheckerExample.java new file mode 100644 index 00000000..56d8ade0 --- /dev/null +++ b/common/src/main/java/com/ccsens/common/bean/po/ProDeliverCheckerExample.java @@ -0,0 +1,761 @@ +package com.ccsens.common.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ProDeliverCheckerExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public ProDeliverCheckerExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andDeliverIdIsNull() { + addCriterion("deliver_id is null"); + return (Criteria) this; + } + + public Criteria andDeliverIdIsNotNull() { + addCriterion("deliver_id is not null"); + return (Criteria) this; + } + + public Criteria andDeliverIdEqualTo(Long value) { + addCriterion("deliver_id =", value, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdNotEqualTo(Long value) { + addCriterion("deliver_id <>", value, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdGreaterThan(Long value) { + addCriterion("deliver_id >", value, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdGreaterThanOrEqualTo(Long value) { + addCriterion("deliver_id >=", value, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdLessThan(Long value) { + addCriterion("deliver_id <", value, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdLessThanOrEqualTo(Long value) { + addCriterion("deliver_id <=", value, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdIn(List values) { + addCriterion("deliver_id in", values, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdNotIn(List values) { + addCriterion("deliver_id not in", values, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdBetween(Long value1, Long value2) { + addCriterion("deliver_id between", value1, value2, "deliverId"); + return (Criteria) this; + } + + public Criteria andDeliverIdNotBetween(Long value1, Long value2) { + addCriterion("deliver_id not between", value1, value2, "deliverId"); + return (Criteria) this; + } + + public Criteria andMemberIdIsNull() { + addCriterion("member_id is null"); + return (Criteria) this; + } + + public Criteria andMemberIdIsNotNull() { + addCriterion("member_id is not null"); + return (Criteria) this; + } + + public Criteria andMemberIdEqualTo(Long value) { + addCriterion("member_id =", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdNotEqualTo(Long value) { + addCriterion("member_id <>", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdGreaterThan(Long value) { + addCriterion("member_id >", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdGreaterThanOrEqualTo(Long value) { + addCriterion("member_id >=", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdLessThan(Long value) { + addCriterion("member_id <", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdLessThanOrEqualTo(Long value) { + addCriterion("member_id <=", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdIn(List values) { + addCriterion("member_id in", values, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdNotIn(List values) { + addCriterion("member_id not in", values, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdBetween(Long value1, Long value2) { + addCriterion("member_id between", value1, value2, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdNotBetween(Long value1, Long value2) { + addCriterion("member_id not between", value1, value2, "memberId"); + return (Criteria) this; + } + + public Criteria andScoreIsNull() { + addCriterion("score is null"); + return (Criteria) this; + } + + public Criteria andScoreIsNotNull() { + addCriterion("score is not null"); + return (Criteria) this; + } + + public Criteria andScoreEqualTo(String value) { + addCriterion("score =", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreNotEqualTo(String value) { + addCriterion("score <>", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreGreaterThan(String value) { + addCriterion("score >", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreGreaterThanOrEqualTo(String value) { + addCriterion("score >=", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreLessThan(String value) { + addCriterion("score <", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreLessThanOrEqualTo(String value) { + addCriterion("score <=", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreLike(String value) { + addCriterion("score like", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreNotLike(String value) { + addCriterion("score not like", value, "score"); + return (Criteria) this; + } + + public Criteria andScoreIn(List values) { + addCriterion("score in", values, "score"); + return (Criteria) this; + } + + public Criteria andScoreNotIn(List values) { + addCriterion("score not in", values, "score"); + return (Criteria) this; + } + + public Criteria andScoreBetween(String value1, String value2) { + addCriterion("score between", value1, value2, "score"); + return (Criteria) this; + } + + public Criteria andScoreNotBetween(String value1, String value2) { + addCriterion("score not between", value1, value2, "score"); + return (Criteria) this; + } + + public Criteria andRemarkIsNull() { + addCriterion("remark is null"); + return (Criteria) this; + } + + public Criteria andRemarkIsNotNull() { + addCriterion("remark is not null"); + return (Criteria) this; + } + + public Criteria andRemarkEqualTo(String value) { + addCriterion("remark =", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotEqualTo(String value) { + addCriterion("remark <>", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThan(String value) { + addCriterion("remark >", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThanOrEqualTo(String value) { + addCriterion("remark >=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThan(String value) { + addCriterion("remark <", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThanOrEqualTo(String value) { + addCriterion("remark <=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLike(String value) { + addCriterion("remark like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotLike(String value) { + addCriterion("remark not like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkIn(List values) { + addCriterion("remark in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotIn(List values) { + addCriterion("remark not in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkBetween(String value1, String value2) { + addCriterion("remark between", value1, value2, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotBetween(String value1, String value2) { + addCriterion("remark not between", value1, value2, "remark"); + return (Criteria) this; + } + + public Criteria andStatusIsNull() { + addCriterion("status is null"); + return (Criteria) this; + } + + public Criteria andStatusIsNotNull() { + addCriterion("status is not null"); + return (Criteria) this; + } + + public Criteria andStatusEqualTo(Byte value) { + addCriterion("status =", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotEqualTo(Byte value) { + addCriterion("status <>", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThan(Byte value) { + addCriterion("status >", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("status >=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThan(Byte value) { + addCriterion("status <", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThanOrEqualTo(Byte value) { + addCriterion("status <=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusIn(List values) { + addCriterion("status in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotIn(List values) { + addCriterion("status not in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusBetween(Byte value1, Byte value2) { + addCriterion("status between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotBetween(Byte value1, Byte value2) { + addCriterion("status not between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/common/src/main/java/com/ccsens/common/bean/po/ProDeliverExample.java b/common/src/main/java/com/ccsens/common/bean/po/ProDeliverExample.java new file mode 100644 index 00000000..dc42f328 --- /dev/null +++ b/common/src/main/java/com/ccsens/common/bean/po/ProDeliverExample.java @@ -0,0 +1,881 @@ +package com.ccsens.common.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ProDeliverExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public ProDeliverExample() { + 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 andTaskSubIdIsNull() { + addCriterion("task_sub_id is null"); + return (Criteria) this; + } + + public Criteria andTaskSubIdIsNotNull() { + addCriterion("task_sub_id is not null"); + return (Criteria) this; + } + + public Criteria andTaskSubIdEqualTo(Long value) { + addCriterion("task_sub_id =", value, "taskSubId"); + return (Criteria) this; + } + + public Criteria andTaskSubIdNotEqualTo(Long value) { + addCriterion("task_sub_id <>", value, "taskSubId"); + return (Criteria) this; + } + + public Criteria andTaskSubIdGreaterThan(Long value) { + addCriterion("task_sub_id >", value, "taskSubId"); + return (Criteria) this; + } + + public Criteria andTaskSubIdGreaterThanOrEqualTo(Long value) { + addCriterion("task_sub_id >=", value, "taskSubId"); + return (Criteria) this; + } + + public Criteria andTaskSubIdLessThan(Long value) { + addCriterion("task_sub_id <", value, "taskSubId"); + return (Criteria) this; + } + + public Criteria andTaskSubIdLessThanOrEqualTo(Long value) { + addCriterion("task_sub_id <=", value, "taskSubId"); + return (Criteria) this; + } + + public Criteria andTaskSubIdIn(List values) { + addCriterion("task_sub_id in", values, "taskSubId"); + return (Criteria) this; + } + + public Criteria andTaskSubIdNotIn(List values) { + addCriterion("task_sub_id not in", values, "taskSubId"); + return (Criteria) this; + } + + public Criteria andTaskSubIdBetween(Long value1, Long value2) { + addCriterion("task_sub_id between", value1, value2, "taskSubId"); + return (Criteria) this; + } + + public Criteria andTaskSubIdNotBetween(Long value1, Long value2) { + addCriterion("task_sub_id not between", value1, value2, "taskSubId"); + return (Criteria) this; + } + + public Criteria andMemberIdIsNull() { + addCriterion("member_id is null"); + return (Criteria) this; + } + + public Criteria andMemberIdIsNotNull() { + addCriterion("member_id is not null"); + return (Criteria) this; + } + + public Criteria andMemberIdEqualTo(Long value) { + addCriterion("member_id =", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdNotEqualTo(Long value) { + addCriterion("member_id <>", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdGreaterThan(Long value) { + addCriterion("member_id >", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdGreaterThanOrEqualTo(Long value) { + addCriterion("member_id >=", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdLessThan(Long value) { + addCriterion("member_id <", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdLessThanOrEqualTo(Long value) { + addCriterion("member_id <=", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdIn(List values) { + addCriterion("member_id in", values, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdNotIn(List values) { + addCriterion("member_id not in", values, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdBetween(Long value1, Long value2) { + addCriterion("member_id between", value1, value2, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdNotBetween(Long value1, Long value2) { + addCriterion("member_id not between", value1, value2, "memberId"); + 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 andFilePathIsNull() { + addCriterion("file_path is null"); + return (Criteria) this; + } + + public Criteria andFilePathIsNotNull() { + addCriterion("file_path is not null"); + return (Criteria) this; + } + + public Criteria andFilePathEqualTo(String value) { + addCriterion("file_path =", value, "filePath"); + return (Criteria) this; + } + + public Criteria andFilePathNotEqualTo(String value) { + addCriterion("file_path <>", value, "filePath"); + return (Criteria) this; + } + + public Criteria andFilePathGreaterThan(String value) { + addCriterion("file_path >", value, "filePath"); + return (Criteria) this; + } + + public Criteria andFilePathGreaterThanOrEqualTo(String value) { + addCriterion("file_path >=", value, "filePath"); + return (Criteria) this; + } + + public Criteria andFilePathLessThan(String value) { + addCriterion("file_path <", value, "filePath"); + return (Criteria) this; + } + + public Criteria andFilePathLessThanOrEqualTo(String value) { + addCriterion("file_path <=", value, "filePath"); + return (Criteria) this; + } + + public Criteria andFilePathLike(String value) { + addCriterion("file_path like", value, "filePath"); + return (Criteria) this; + } + + public Criteria andFilePathNotLike(String value) { + addCriterion("file_path not like", value, "filePath"); + return (Criteria) this; + } + + public Criteria andFilePathIn(List values) { + addCriterion("file_path in", values, "filePath"); + return (Criteria) this; + } + + public Criteria andFilePathNotIn(List values) { + addCriterion("file_path not in", values, "filePath"); + return (Criteria) this; + } + + public Criteria andFilePathBetween(String value1, String value2) { + addCriterion("file_path between", value1, value2, "filePath"); + return (Criteria) this; + } + + public Criteria andFilePathNotBetween(String value1, String value2) { + addCriterion("file_path not between", value1, value2, "filePath"); + return (Criteria) this; + } + + public Criteria andContentIsNull() { + addCriterion("content is null"); + return (Criteria) this; + } + + public Criteria andContentIsNotNull() { + addCriterion("content is not null"); + return (Criteria) this; + } + + public Criteria andContentEqualTo(String value) { + addCriterion("content =", value, "content"); + return (Criteria) this; + } + + public Criteria andContentNotEqualTo(String value) { + addCriterion("content <>", value, "content"); + return (Criteria) this; + } + + public Criteria andContentGreaterThan(String value) { + addCriterion("content >", value, "content"); + return (Criteria) this; + } + + public Criteria andContentGreaterThanOrEqualTo(String value) { + addCriterion("content >=", value, "content"); + return (Criteria) this; + } + + public Criteria andContentLessThan(String value) { + addCriterion("content <", value, "content"); + return (Criteria) this; + } + + public Criteria andContentLessThanOrEqualTo(String value) { + addCriterion("content <=", value, "content"); + return (Criteria) this; + } + + public Criteria andContentLike(String value) { + addCriterion("content like", value, "content"); + return (Criteria) this; + } + + public Criteria andContentNotLike(String value) { + addCriterion("content not like", value, "content"); + return (Criteria) this; + } + + public Criteria andContentIn(List values) { + addCriterion("content in", values, "content"); + return (Criteria) this; + } + + public Criteria andContentNotIn(List values) { + addCriterion("content not in", values, "content"); + return (Criteria) this; + } + + public Criteria andContentBetween(String value1, String value2) { + addCriterion("content between", value1, value2, "content"); + return (Criteria) this; + } + + public Criteria andContentNotBetween(String value1, String value2) { + addCriterion("content not between", value1, value2, "content"); + 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 andTimeIsNull() { + addCriterion("time is null"); + return (Criteria) this; + } + + public Criteria andTimeIsNotNull() { + addCriterion("time is not null"); + return (Criteria) this; + } + + public Criteria andTimeEqualTo(Long value) { + addCriterion("time =", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeNotEqualTo(Long value) { + addCriterion("time <>", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeGreaterThan(Long value) { + addCriterion("time >", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeGreaterThanOrEqualTo(Long value) { + addCriterion("time >=", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeLessThan(Long value) { + addCriterion("time <", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeLessThanOrEqualTo(Long value) { + addCriterion("time <=", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeIn(List values) { + addCriterion("time in", values, "time"); + return (Criteria) this; + } + + public Criteria andTimeNotIn(List values) { + addCriterion("time not in", values, "time"); + return (Criteria) this; + } + + public Criteria andTimeBetween(Long value1, Long value2) { + addCriterion("time between", value1, value2, "time"); + return (Criteria) this; + } + + public Criteria andTimeNotBetween(Long value1, Long value2) { + addCriterion("time not between", value1, value2, "time"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/common/src/main/java/com/ccsens/common/bean/vo/CDeliverVo.java b/common/src/main/java/com/ccsens/common/bean/vo/CDeliverVo.java new file mode 100644 index 00000000..f7e8d93f --- /dev/null +++ b/common/src/main/java/com/ccsens/common/bean/vo/CDeliverVo.java @@ -0,0 +1,68 @@ +package com.ccsens.common.bean.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class CDeliverVo { + + @Data + @ApiModel("所有检查人信息") + public static class Checker{ + @ApiModelProperty("检查人id") + private Long memberId; + @ApiModelProperty("检查人名字") + private String name; + } + + + @Data + @ApiModel("项目下的交付物记录") + public static class DeliverOfProject{ + @ApiModelProperty("项目名称") + private String projectName; + @ApiModelProperty("任务列表") + private List deliverOfTaskList; + } + + @Data + @ApiModel("任务的交付物历史") + public static class DeliverOfTask{ + @ApiModelProperty("交付物id") + private String id; + @ApiModelProperty("上传人名字") + private String name; + @ApiModelProperty("任务名称") + private String taskName; + @ApiModelProperty("上传时间") + private Long time; + @ApiModelProperty("文本内容") + private Long content; + @ApiModelProperty("检查人列表") + private List checkerList; + } + + + @Data + @ApiModel("检查人信息") + public static class CheckerInfo{ + @ApiModelProperty("检查记录id") + private String checkId; + @ApiModelProperty("检查人id") + private Long checkerId; + @ApiModelProperty("检查人名字") + private String checkerName; + @ApiModelProperty("检查状态(0-未审核,1-通过,2-驳回)") + private Byte status; + @ApiModelProperty("分数") + private String score; + @ApiModelProperty("备注") + private String remark; + @ApiModelProperty("是不是我(0-否,1-是)") + private Byte isMine; + + } +} diff --git a/common/src/main/java/com/ccsens/common/persist/dao/ProDeliverCheckerDao.java b/common/src/main/java/com/ccsens/common/persist/dao/ProDeliverCheckerDao.java new file mode 100644 index 00000000..4727d14d --- /dev/null +++ b/common/src/main/java/com/ccsens/common/persist/dao/ProDeliverCheckerDao.java @@ -0,0 +1,9 @@ +package com.ccsens.common.persist.dao; + +import com.ccsens.common.persist.mapper.ProDeliverCheckerMapper; +import org.springframework.stereotype.Repository; + +@Repository +public interface ProDeliverCheckerDao extends ProDeliverCheckerMapper { + +} diff --git a/common/src/main/java/com/ccsens/common/persist/dao/ProDeliverDao.java b/common/src/main/java/com/ccsens/common/persist/dao/ProDeliverDao.java new file mode 100644 index 00000000..a08cb2f0 --- /dev/null +++ b/common/src/main/java/com/ccsens/common/persist/dao/ProDeliverDao.java @@ -0,0 +1,26 @@ +package com.ccsens.common.persist.dao; + +import com.ccsens.common.bean.dto.CDeliverDto; +import com.ccsens.common.bean.vo.CDeliverVo; +import com.ccsens.common.persist.mapper.ProDeliverMapper; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface ProDeliverDao extends ProDeliverMapper { + + /** + * 根据任务id查询交付物记录 + * @param params 任务id + * @return 交付物记录列表 + */ + List queryDeliverOfTask(CDeliverDto.QueryDeliverOfTask params); + + /** + * 查询项目下的所有任务交付记录 + * @param params 项目id + * @return 所有项目及交付物 + */ + CDeliverVo.DeliverOfProject queryDeliverOfProject(CDeliverDto.QueryDeliverOfProject params); +} diff --git a/common/src/main/java/com/ccsens/common/persist/dao/ProMemberDao.java b/common/src/main/java/com/ccsens/common/persist/dao/ProMemberDao.java index c6e49250..3885dba1 100644 --- a/common/src/main/java/com/ccsens/common/persist/dao/ProMemberDao.java +++ b/common/src/main/java/com/ccsens/common/persist/dao/ProMemberDao.java @@ -1,5 +1,6 @@ package com.ccsens.common.persist.dao; +import com.ccsens.common.bean.vo.CDeliverVo; import com.ccsens.common.persist.mapper.ProMemberMapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -26,4 +27,11 @@ public interface ProMemberDao extends ProMemberMapper { * @return 列表 */ List queryMembersOfProject(@Param("projectId") Long projectId); + + /** + * 查询所有检查人 + * @param projectId 项目id + * @return 检查人列表 + */ + List queryChecker(@Param("projectId") Long projectId); } diff --git a/common/src/main/java/com/ccsens/common/persist/mapper/ProDeliverCheckerMapper.java b/common/src/main/java/com/ccsens/common/persist/mapper/ProDeliverCheckerMapper.java new file mode 100644 index 00000000..de12e57a --- /dev/null +++ b/common/src/main/java/com/ccsens/common/persist/mapper/ProDeliverCheckerMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.common.persist.mapper; + +import com.ccsens.common.bean.po.ProDeliverChecker; +import com.ccsens.common.bean.po.ProDeliverCheckerExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface ProDeliverCheckerMapper { + long countByExample(ProDeliverCheckerExample example); + + int deleteByExample(ProDeliverCheckerExample example); + + int deleteByPrimaryKey(Long id); + + int insert(ProDeliverChecker record); + + int insertSelective(ProDeliverChecker record); + + List selectByExample(ProDeliverCheckerExample example); + + ProDeliverChecker selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") ProDeliverChecker record, @Param("example") ProDeliverCheckerExample example); + + int updateByExample(@Param("record") ProDeliverChecker record, @Param("example") ProDeliverCheckerExample example); + + int updateByPrimaryKeySelective(ProDeliverChecker record); + + int updateByPrimaryKey(ProDeliverChecker record); +} \ No newline at end of file diff --git a/common/src/main/java/com/ccsens/common/persist/mapper/ProDeliverMapper.java b/common/src/main/java/com/ccsens/common/persist/mapper/ProDeliverMapper.java new file mode 100644 index 00000000..76de8b5b --- /dev/null +++ b/common/src/main/java/com/ccsens/common/persist/mapper/ProDeliverMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.common.persist.mapper; + +import com.ccsens.common.bean.po.ProDeliver; +import com.ccsens.common.bean.po.ProDeliverExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface ProDeliverMapper { + long countByExample(ProDeliverExample example); + + int deleteByExample(ProDeliverExample example); + + int deleteByPrimaryKey(Long id); + + int insert(ProDeliver record); + + int insertSelective(ProDeliver record); + + List selectByExample(ProDeliverExample example); + + ProDeliver selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") ProDeliver record, @Param("example") ProDeliverExample example); + + int updateByExample(@Param("record") ProDeliver record, @Param("example") ProDeliverExample example); + + int updateByPrimaryKeySelective(ProDeliver record); + + int updateByPrimaryKey(ProDeliver record); +} \ No newline at end of file diff --git a/common/src/main/java/com/ccsens/common/service/DeliverService.java b/common/src/main/java/com/ccsens/common/service/DeliverService.java new file mode 100644 index 00000000..5ae437c2 --- /dev/null +++ b/common/src/main/java/com/ccsens/common/service/DeliverService.java @@ -0,0 +1,135 @@ +package com.ccsens.common.service; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.lang.Snowflake; +import cn.hutool.core.util.ObjectUtil; +import com.ccsens.common.bean.dto.CDeliverDto; +import com.ccsens.common.bean.po.ProDeliver; +import com.ccsens.common.bean.po.ProDeliverChecker; +import com.ccsens.common.bean.po.ProTaskSub; +import com.ccsens.common.bean.vo.CDeliverVo; +import com.ccsens.common.bean.vo.CProjectVo; +import com.ccsens.common.persist.dao.*; +import com.ccsens.common.util.CommonCodeError; +import com.ccsens.util.CodeError; +import com.ccsens.util.exception.BaseException; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @author AUSU + */ +@Slf4j +@Service +@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class) +public class DeliverService implements IDeliverService{ + + @Resource + private ProMemberDao memberDao; + @Resource + private ProProjectDao projectDao; + @Resource + private ProTaskSubDao taskSubDao; + @Resource + private ProDeliverDao deliverDao; + @Resource + private ProDeliverCheckerDao deliverCheckerDao; + @Resource + private Snowflake snowflake; + + @Override + public List queryChecker(CDeliverDto.QueryChecker params, Long userId) { + return memberDao.queryChecker(params.getProjectId()); + } + + + @Override + public void saveDeliver(CDeliverDto.SaveDeliver params, Long userId) { + if (CollectionUtil.isEmpty(params.getCheckerList())) { + throw new BaseException(CommonCodeError.CHECKER_DONT_NULL); + } + CProjectVo.ProjectInfo projectById = projectDao.findProjectById(params.getProjectId()); + if (ObjectUtil.isNull(projectById)) { + throw new BaseException(CommonCodeError.PROJECT_NOT_FOUND); + } + ProTaskSub taskSub = taskSubDao.selectByPrimaryKey(params.getTaskSubId()); + if (ObjectUtil.isNull(taskSub)) { + throw new BaseException(CommonCodeError.NOT_TASK); + } + Long userOfMemberId = memberDao.findUserOfMemberId(params.getProjectId(), userId); + ProDeliver proDeliver = new ProDeliver(); + proDeliver.setId(snowflake.nextId()); + proDeliver.setTaskSubId(params.getTaskSubId()); + proDeliver.setMemberId(userOfMemberId); + proDeliver.setContent(params.getContent()); + proDeliver.setProjectId(params.getProjectId()); + proDeliver.setTime(System.currentTimeMillis()); + deliverDao.insertSelective(proDeliver); + for (Long checkerId : params.getCheckerList()) { + ProDeliverChecker deliverChecker = new ProDeliverChecker(); + deliverChecker.setId(snowflake.nextId()); + deliverChecker.setDeliverId(proDeliver.getId()); + deliverChecker.setMemberId(checkerId); + deliverChecker.setStatus((byte)0); + deliverCheckerDao.insertSelective(deliverChecker); + } + } + + + @Override + public List queryDeliverOfTask(CDeliverDto.QueryDeliverOfTask params, Long userId) { + ProTaskSub taskSub = taskSubDao.selectByPrimaryKey(params.getTaskSubId()); + if (ObjectUtil.isNull(taskSub)) { + throw new BaseException(CommonCodeError.NOT_TASK); + } + List deliverOfTask = deliverDao.queryDeliverOfTask(params); + if (CollectionUtil.isNotEmpty(deliverOfTask)) { + Long userOfMemberId = memberDao.findUserOfMemberId(params.getProjectId(), userId); + // 判断检查人是否是当前用户 + for (CDeliverVo.DeliverOfTask deliver : deliverOfTask) { + if (CollectionUtil.isNotEmpty(deliver.getCheckerList())) { + for (CDeliverVo.CheckerInfo checkerInfo : deliver.getCheckerList()) { + checkerInfo.setIsMine((byte)0); + if (checkerInfo.getCheckerId().equals(userOfMemberId)){ + checkerInfo.setIsMine((byte)1); + } + } + } + } + } + return deliverOfTask; + } + + + @Override + public void checkDeliver(CDeliverDto.CheckDeliver params, Long userId) { + Long userOfMemberId = memberDao.findUserOfMemberId(params.getProjectId(), userId); + ProDeliverChecker deliverChecker = deliverCheckerDao.selectByPrimaryKey(params.getCheckId()); + if (!userOfMemberId.equals(deliverChecker.getMemberId())) { + throw new BaseException(CommonCodeError.NO_POWER); + } + ProDeliverChecker deliverCheck = new ProDeliverChecker(); + deliverCheck.setId(params.getCheckId()); + deliverCheck.setStatus(params.getStatus()); + deliverCheck.setRemark(params.getRemark()); + deliverCheck.setScore(params.getScore()); + deliverCheckerDao.updateByPrimaryKeySelective(deliverCheck); + } + + + @Override + public CDeliverVo.DeliverOfProject queryDeliverOfProject(CDeliverDto.QueryDeliverOfProject params, Long userId) { + CProjectVo.ProjectInfo projectById = projectDao.findProjectById(params.getProjectId()); + if (ObjectUtil.isNull(projectById)) { + throw new BaseException(CommonCodeError.PROJECT_NOT_FOUND); + } + CDeliverVo.DeliverOfProject deliverOfProject = deliverDao.queryDeliverOfProject(params); + return null; + } + +} diff --git a/common/src/main/java/com/ccsens/common/service/IDeliverService.java b/common/src/main/java/com/ccsens/common/service/IDeliverService.java new file mode 100644 index 00000000..97045126 --- /dev/null +++ b/common/src/main/java/com/ccsens/common/service/IDeliverService.java @@ -0,0 +1,50 @@ +package com.ccsens.common.service; + +import com.ccsens.common.bean.dto.CDeliverDto; +import com.ccsens.common.bean.vo.CDeliverVo; + +import java.util.List; + +/** + * @author AUSU + */ +public interface IDeliverService { + + /** + * 查询所有检查人 + * @param params 项目id + * @param userId 用户id + * @return 检查人列表 + */ + List queryChecker(CDeliverDto.QueryChecker params, Long userId); + + /** + * 提交交付物 + * @param params 项目id + * @param userId 用户id + */ + void saveDeliver(CDeliverDto.SaveDeliver params, Long userId); + + /** + * 查询任务的交付物历史记录 + * @param params 任务分解id + * @param userId 用户id + * @return 检查人列表 + */ + List queryDeliverOfTask(CDeliverDto.QueryDeliverOfTask params, Long userId); + + /** + * 检查交付物 + * @param params 检查记录id + * @param userId 当前登录用户 + */ + void checkDeliver(CDeliverDto.CheckDeliver params, Long userId); + + /** + * 查询项目的交付物历史记录 + * @param params 项目id + * @param userId 用户id + * @return 检查人列表 + */ + CDeliverVo.DeliverOfProject queryDeliverOfProject(CDeliverDto.QueryDeliverOfProject params, Long userId); +} diff --git a/common/src/main/java/com/ccsens/common/util/CommonCodeError.java b/common/src/main/java/com/ccsens/common/util/CommonCodeError.java index 93463bca..48fd4b03 100644 --- a/common/src/main/java/com/ccsens/common/util/CommonCodeError.java +++ b/common/src/main/java/com/ccsens/common/util/CommonCodeError.java @@ -16,5 +16,7 @@ public class CommonCodeError extends CodeError { public static final Code TASK_SUB_NOT_FOUND = new Code(6,"分解任务不存在,请检查后再试!", true); public static final Code PLUGIN_NAME_ERROR = new Code(7,"请选择正确的插件", true); public static final Code SHARE_URL_ERROR = new Code(8,"分享链接错误", true); + public static final Code CHECKER_DONT_NULL = new Code(9,"检查人不能为空", true); + public static final Code NO_POWER = new Code(10,"没有权限", true); } diff --git a/common/src/main/resources/mapper_dao/ProDeliverCheckerDao.xml b/common/src/main/resources/mapper_dao/ProDeliverCheckerDao.xml new file mode 100644 index 00000000..74761ede --- /dev/null +++ b/common/src/main/resources/mapper_dao/ProDeliverCheckerDao.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/common/src/main/resources/mapper_dao/ProDeliverDao.xml b/common/src/main/resources/mapper_dao/ProDeliverDao.xml new file mode 100644 index 00000000..30731ed3 --- /dev/null +++ b/common/src/main/resources/mapper_dao/ProDeliverDao.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/common/src/main/resources/mapper_dao/ProMemberDao.xml b/common/src/main/resources/mapper_dao/ProMemberDao.xml index 118def98..64dc12f2 100644 --- a/common/src/main/resources/mapper_dao/ProMemberDao.xml +++ b/common/src/main/resources/mapper_dao/ProMemberDao.xml @@ -23,4 +23,15 @@ AND project_id = #{projectId} + + diff --git a/common/src/main/resources/mapper_raw/ProDeliverCheckerMapper.xml b/common/src/main/resources/mapper_raw/ProDeliverCheckerMapper.xml new file mode 100644 index 00000000..ff445b88 --- /dev/null +++ b/common/src/main/resources/mapper_raw/ProDeliverCheckerMapper.xml @@ -0,0 +1,275 @@ + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, deliver_id, member_id, score, remark, status, created_at, updated_at, rec_status + + + + + delete from t_pro_deliver_checker + where id = #{id,jdbcType=BIGINT} + + + delete from t_pro_deliver_checker + + + + + + insert into t_pro_deliver_checker (id, deliver_id, member_id, + score, remark, status, + created_at, updated_at, rec_status + ) + values (#{id,jdbcType=BIGINT}, #{deliverId,jdbcType=BIGINT}, #{memberId,jdbcType=BIGINT}, + #{score,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{status,jdbcType=TINYINT}, + #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} + ) + + + insert into t_pro_deliver_checker + + + id, + + + deliver_id, + + + member_id, + + + score, + + + remark, + + + status, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{deliverId,jdbcType=BIGINT}, + + + #{memberId,jdbcType=BIGINT}, + + + #{score,jdbcType=VARCHAR}, + + + #{remark,jdbcType=VARCHAR}, + + + #{status,jdbcType=TINYINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_pro_deliver_checker + + + id = #{record.id,jdbcType=BIGINT}, + + + deliver_id = #{record.deliverId,jdbcType=BIGINT}, + + + member_id = #{record.memberId,jdbcType=BIGINT}, + + + score = #{record.score,jdbcType=VARCHAR}, + + + remark = #{record.remark,jdbcType=VARCHAR}, + + + status = #{record.status,jdbcType=TINYINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_pro_deliver_checker + set id = #{record.id,jdbcType=BIGINT}, + deliver_id = #{record.deliverId,jdbcType=BIGINT}, + member_id = #{record.memberId,jdbcType=BIGINT}, + score = #{record.score,jdbcType=VARCHAR}, + remark = #{record.remark,jdbcType=VARCHAR}, + status = #{record.status,jdbcType=TINYINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_pro_deliver_checker + + + deliver_id = #{deliverId,jdbcType=BIGINT}, + + + member_id = #{memberId,jdbcType=BIGINT}, + + + score = #{score,jdbcType=VARCHAR}, + + + remark = #{remark,jdbcType=VARCHAR}, + + + status = #{status,jdbcType=TINYINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_pro_deliver_checker + set deliver_id = #{deliverId,jdbcType=BIGINT}, + member_id = #{memberId,jdbcType=BIGINT}, + score = #{score,jdbcType=VARCHAR}, + remark = #{remark,jdbcType=VARCHAR}, + status = #{status,jdbcType=TINYINT}, + 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/common/src/main/resources/mapper_raw/ProDeliverMapper.xml b/common/src/main/resources/mapper_raw/ProDeliverMapper.xml new file mode 100644 index 00000000..9f5facfb --- /dev/null +++ b/common/src/main/resources/mapper_raw/ProDeliverMapper.xml @@ -0,0 +1,306 @@ + + + + + + + + + + + + + + + + + + + + + + + + + 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, task_sub_id, member_id, file_id, file_path, content, project_id, time, created_at, + updated_at, rec_status + + + + + delete from t_pro_deliver + where id = #{id,jdbcType=BIGINT} + + + delete from t_pro_deliver + + + + + + insert into t_pro_deliver (id, task_sub_id, member_id, + file_id, file_path, content, + project_id, time, created_at, + updated_at, rec_status) + values (#{id,jdbcType=BIGINT}, #{taskSubId,jdbcType=BIGINT}, #{memberId,jdbcType=BIGINT}, + #{fileId,jdbcType=BIGINT}, #{filePath,jdbcType=VARCHAR}, #{content,jdbcType=VARCHAR}, + #{projectId,jdbcType=BIGINT}, #{time,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, + #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) + + + insert into t_pro_deliver + + + id, + + + task_sub_id, + + + member_id, + + + file_id, + + + file_path, + + + content, + + + project_id, + + + time, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{taskSubId,jdbcType=BIGINT}, + + + #{memberId,jdbcType=BIGINT}, + + + #{fileId,jdbcType=BIGINT}, + + + #{filePath,jdbcType=VARCHAR}, + + + #{content,jdbcType=VARCHAR}, + + + #{projectId,jdbcType=BIGINT}, + + + #{time,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_pro_deliver + + + id = #{record.id,jdbcType=BIGINT}, + + + task_sub_id = #{record.taskSubId,jdbcType=BIGINT}, + + + member_id = #{record.memberId,jdbcType=BIGINT}, + + + file_id = #{record.fileId,jdbcType=BIGINT}, + + + file_path = #{record.filePath,jdbcType=VARCHAR}, + + + content = #{record.content,jdbcType=VARCHAR}, + + + project_id = #{record.projectId,jdbcType=BIGINT}, + + + time = #{record.time,jdbcType=BIGINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_pro_deliver + set id = #{record.id,jdbcType=BIGINT}, + task_sub_id = #{record.taskSubId,jdbcType=BIGINT}, + member_id = #{record.memberId,jdbcType=BIGINT}, + file_id = #{record.fileId,jdbcType=BIGINT}, + file_path = #{record.filePath,jdbcType=VARCHAR}, + content = #{record.content,jdbcType=VARCHAR}, + project_id = #{record.projectId,jdbcType=BIGINT}, + time = #{record.time,jdbcType=BIGINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_pro_deliver + + + task_sub_id = #{taskSubId,jdbcType=BIGINT}, + + + member_id = #{memberId,jdbcType=BIGINT}, + + + file_id = #{fileId,jdbcType=BIGINT}, + + + file_path = #{filePath,jdbcType=VARCHAR}, + + + content = #{content,jdbcType=VARCHAR}, + + + project_id = #{projectId,jdbcType=BIGINT}, + + + time = #{time,jdbcType=BIGINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_pro_deliver + set task_sub_id = #{taskSubId,jdbcType=BIGINT}, + member_id = #{memberId,jdbcType=BIGINT}, + file_id = #{fileId,jdbcType=BIGINT}, + file_path = #{filePath,jdbcType=VARCHAR}, + content = #{content,jdbcType=VARCHAR}, + project_id = #{projectId,jdbcType=BIGINT}, + time = #{time,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/signin/src/main/resources/application.yml b/signin/src/main/resources/application.yml index ebc544af..b5408a3a 100644 --- a/signin/src/main/resources/application.yml +++ b/signin/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: util-test,common + active: dev + include: util-dev,common