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 099f2890..779a7e9d 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 @@ -121,5 +121,19 @@ public class InputDocDto { private Long docId; } + @Data + @ApiModel + public static class DeliverHistory{ + @NotNull(message = "请选择要查看的交付物类型") + @ApiModelProperty("交付物类型(0-输入文档,1-输出文档)") + private Byte deliverType; + @NotNull(message = "请选择要查看的文档") + @ApiModelProperty("交付物id") + private Long deliverId; + @ApiModelProperty("页数") + private Integer pageNum = 1; + @ApiModelProperty("分页大小") + private Integer pageSize = 10; + } } 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 baa50ea8..204a9a18 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 @@ -224,6 +224,8 @@ public class TaskDto { private List plugins; @ApiModelProperty("任务提醒信息") private List taskRemindList; + @ApiModelProperty("父任务id") + private Long parentId; } @Data @ApiModel("修改任务时修改交付物名称") diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/ProDeliverHistoryRecord.java b/tall/src/main/java/com/ccsens/tall/bean/po/ProDeliverHistoryRecord.java new file mode 100644 index 00000000..8e417323 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/bean/po/ProDeliverHistoryRecord.java @@ -0,0 +1,139 @@ +package com.ccsens.tall.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class ProDeliverHistoryRecord implements Serializable { + private Long id; + + private Long deliverId; + + private Byte deliverType; + + private Long deliverRecordId; + + private Byte doType; + + private Long roleId; + + private String content; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private Long memberId; + + 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 Byte getDeliverType() { + return deliverType; + } + + public void setDeliverType(Byte deliverType) { + this.deliverType = deliverType; + } + + public Long getDeliverRecordId() { + return deliverRecordId; + } + + public void setDeliverRecordId(Long deliverRecordId) { + this.deliverRecordId = deliverRecordId; + } + + public Byte getDoType() { + return doType; + } + + public void setDoType(Byte doType) { + this.doType = doType; + } + + public Long getRoleId() { + return roleId; + } + + public void setRoleId(Long roleId) { + this.roleId = roleId; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content == null ? null : content.trim(); + } + + 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 Long getMemberId() { + return memberId; + } + + public void setMemberId(Long memberId) { + this.memberId = memberId; + } + + @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(", deliverType=").append(deliverType); + sb.append(", deliverRecordId=").append(deliverRecordId); + sb.append(", doType=").append(doType); + sb.append(", roleId=").append(roleId); + sb.append(", content=").append(content); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append(", memberId=").append(memberId); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/ProDeliverHistoryRecordExample.java b/tall/src/main/java/com/ccsens/tall/bean/po/ProDeliverHistoryRecordExample.java new file mode 100644 index 00000000..002bf7ec --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/bean/po/ProDeliverHistoryRecordExample.java @@ -0,0 +1,871 @@ +package com.ccsens.tall.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ProDeliverHistoryRecordExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public ProDeliverHistoryRecordExample() { + 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 andDeliverTypeIsNull() { + addCriterion("deliver_type is null"); + return (Criteria) this; + } + + public Criteria andDeliverTypeIsNotNull() { + addCriterion("deliver_type is not null"); + return (Criteria) this; + } + + public Criteria andDeliverTypeEqualTo(Byte value) { + addCriterion("deliver_type =", value, "deliverType"); + return (Criteria) this; + } + + public Criteria andDeliverTypeNotEqualTo(Byte value) { + addCriterion("deliver_type <>", value, "deliverType"); + return (Criteria) this; + } + + public Criteria andDeliverTypeGreaterThan(Byte value) { + addCriterion("deliver_type >", value, "deliverType"); + return (Criteria) this; + } + + public Criteria andDeliverTypeGreaterThanOrEqualTo(Byte value) { + addCriterion("deliver_type >=", value, "deliverType"); + return (Criteria) this; + } + + public Criteria andDeliverTypeLessThan(Byte value) { + addCriterion("deliver_type <", value, "deliverType"); + return (Criteria) this; + } + + public Criteria andDeliverTypeLessThanOrEqualTo(Byte value) { + addCriterion("deliver_type <=", value, "deliverType"); + return (Criteria) this; + } + + public Criteria andDeliverTypeIn(List values) { + addCriterion("deliver_type in", values, "deliverType"); + return (Criteria) this; + } + + public Criteria andDeliverTypeNotIn(List values) { + addCriterion("deliver_type not in", values, "deliverType"); + return (Criteria) this; + } + + public Criteria andDeliverTypeBetween(Byte value1, Byte value2) { + addCriterion("deliver_type between", value1, value2, "deliverType"); + return (Criteria) this; + } + + public Criteria andDeliverTypeNotBetween(Byte value1, Byte value2) { + addCriterion("deliver_type not between", value1, value2, "deliverType"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdIsNull() { + addCriterion("deliver_record_id is null"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdIsNotNull() { + addCriterion("deliver_record_id is not null"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdEqualTo(Long value) { + addCriterion("deliver_record_id =", value, "deliverRecordId"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdNotEqualTo(Long value) { + addCriterion("deliver_record_id <>", value, "deliverRecordId"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdGreaterThan(Long value) { + addCriterion("deliver_record_id >", value, "deliverRecordId"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdGreaterThanOrEqualTo(Long value) { + addCriterion("deliver_record_id >=", value, "deliverRecordId"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdLessThan(Long value) { + addCriterion("deliver_record_id <", value, "deliverRecordId"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdLessThanOrEqualTo(Long value) { + addCriterion("deliver_record_id <=", value, "deliverRecordId"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdIn(List values) { + addCriterion("deliver_record_id in", values, "deliverRecordId"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdNotIn(List values) { + addCriterion("deliver_record_id not in", values, "deliverRecordId"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdBetween(Long value1, Long value2) { + addCriterion("deliver_record_id between", value1, value2, "deliverRecordId"); + return (Criteria) this; + } + + public Criteria andDeliverRecordIdNotBetween(Long value1, Long value2) { + addCriterion("deliver_record_id not between", value1, value2, "deliverRecordId"); + return (Criteria) this; + } + + public Criteria andDoTypeIsNull() { + addCriterion("do_type is null"); + return (Criteria) this; + } + + public Criteria andDoTypeIsNotNull() { + addCriterion("do_type is not null"); + return (Criteria) this; + } + + public Criteria andDoTypeEqualTo(Byte value) { + addCriterion("do_type =", value, "doType"); + return (Criteria) this; + } + + public Criteria andDoTypeNotEqualTo(Byte value) { + addCriterion("do_type <>", value, "doType"); + return (Criteria) this; + } + + public Criteria andDoTypeGreaterThan(Byte value) { + addCriterion("do_type >", value, "doType"); + return (Criteria) this; + } + + public Criteria andDoTypeGreaterThanOrEqualTo(Byte value) { + addCriterion("do_type >=", value, "doType"); + return (Criteria) this; + } + + public Criteria andDoTypeLessThan(Byte value) { + addCriterion("do_type <", value, "doType"); + return (Criteria) this; + } + + public Criteria andDoTypeLessThanOrEqualTo(Byte value) { + addCriterion("do_type <=", value, "doType"); + return (Criteria) this; + } + + public Criteria andDoTypeIn(List values) { + addCriterion("do_type in", values, "doType"); + return (Criteria) this; + } + + public Criteria andDoTypeNotIn(List values) { + addCriterion("do_type not in", values, "doType"); + return (Criteria) this; + } + + public Criteria andDoTypeBetween(Byte value1, Byte value2) { + addCriterion("do_type between", value1, value2, "doType"); + return (Criteria) this; + } + + public Criteria andDoTypeNotBetween(Byte value1, Byte value2) { + addCriterion("do_type not between", value1, value2, "doType"); + return (Criteria) this; + } + + public Criteria andRoleIdIsNull() { + addCriterion("role_id is null"); + return (Criteria) this; + } + + public Criteria andRoleIdIsNotNull() { + addCriterion("role_id is not null"); + return (Criteria) this; + } + + public Criteria andRoleIdEqualTo(Long value) { + addCriterion("role_id =", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdNotEqualTo(Long value) { + addCriterion("role_id <>", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdGreaterThan(Long value) { + addCriterion("role_id >", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdGreaterThanOrEqualTo(Long value) { + addCriterion("role_id >=", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdLessThan(Long value) { + addCriterion("role_id <", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdLessThanOrEqualTo(Long value) { + addCriterion("role_id <=", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdIn(List values) { + addCriterion("role_id in", values, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdNotIn(List values) { + addCriterion("role_id not in", values, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdBetween(Long value1, Long value2) { + addCriterion("role_id between", value1, value2, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdNotBetween(Long value1, Long value2) { + addCriterion("role_id not between", value1, value2, "roleId"); + 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 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 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 static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/DeliverVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/DeliverVo.java index 3201f185..60b61e85 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/DeliverVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/DeliverVo.java @@ -189,4 +189,13 @@ public class DeliverVo { private List fileList = new ArrayList<>(); } + @ApiModel + @Data + public static class OutputDocInfo{ + @ApiModelProperty("输出文档id") + private Long id; + @ApiModelProperty("输出文档名称") + private String name; + } + } diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/InputDocVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/InputDocVo.java index 513c7114..dcee65f7 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/InputDocVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/InputDocVo.java @@ -88,5 +88,42 @@ public class InputDocVo { List messages; } + @Data + @ApiModel("交付物历史记录") + public static class DeliverHistory{ + @ApiModelProperty("交付物历史记录的id") + private Long id; + @ApiModelProperty("角色id") + private Long roleId; + @ApiModelProperty("角色名称") + private String roleName; + @ApiModelProperty("成员id") + private Long memberId; + @ApiModelProperty("成员名称") + private String memberName; + @ApiModelProperty("文件列表") + private List fileList; + @ApiModelProperty("备注") + private String remark; + @ApiModelProperty("操作类型(0-上传,1-修改,2-删除,3-通过,4-驳回,5-添加[添加备注])") + private Byte doType; + @JsonFormat(pattern="yyyy-MM-dd HH:mm") + @ApiModelProperty("记录创建时间") + private Date createAt; + @ApiModelProperty("内容") + private String content; + @JsonIgnore + @ApiModelProperty + private String fileIds; + } + + @Data + @ApiModel + public static class InputDocInfo{ + @ApiModelProperty("输入文档id") + private Long id; + @ApiModelProperty("输入文档名称") + private String name; + } } 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 4f7a0c79..0b6a770a 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 @@ -157,6 +157,10 @@ public class TaskVo { private Byte priority; @ApiModelProperty("是否是里程碑 0否 1里程碑 2普通任务 3关键任务") private String milestone; + @ApiModelProperty("输入文档的信息") + private List inputDoc; + @ApiModelProperty("输出文档的信息") + private List outputDoc; @ApiModelProperty("提醒的信息") private List remindInfoList; public Long getDuration(){ diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/ProDeliverHistoryRecordDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/ProDeliverHistoryRecordDao.java new file mode 100644 index 00000000..dade5177 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/persist/dao/ProDeliverHistoryRecordDao.java @@ -0,0 +1,25 @@ +package com.ccsens.tall.persist.dao; + +import com.ccsens.tall.bean.vo.InputDocVo; +import com.ccsens.tall.persist.mapper.ProDeliverHistoryRecordMapper; + +import java.util.List; + +/** + * @author mz + */ +public interface ProDeliverHistoryRecordDao extends ProDeliverHistoryRecordMapper { + /** + * 查询输入文档下的所有记录 + * @param deliverId 输入文档的id + * @return + */ + List findInputHistory(Long deliverId); + + /** + * 查询输出文档下的所有记录 + * @param deliverId + * @return + */ + List finOutPutHistory(Long deliverId); +} diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/ProTaskInputDocDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/ProTaskInputDocDao.java new file mode 100644 index 00000000..064e693b --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/persist/dao/ProTaskInputDocDao.java @@ -0,0 +1,21 @@ +package com.ccsens.tall.persist.dao; + +import com.ccsens.tall.bean.vo.InputDocVo; +import com.ccsens.tall.persist.mapper.ProTaskInputDocMapper; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * @author mz + */ +@Repository +public interface ProTaskInputDocDao extends ProTaskInputDocMapper { + + /** + * 根据任务详情id查询输入文档 + * @param taskId + * @return 输入文档 + */ + List selectDocByTaskId(Long taskId); +} diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/TaskDeliverDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/TaskDeliverDao.java index 4675a2fb..a453054a 100644 --- a/tall/src/main/java/com/ccsens/tall/persist/dao/TaskDeliverDao.java +++ b/tall/src/main/java/com/ccsens/tall/persist/dao/TaskDeliverDao.java @@ -33,4 +33,11 @@ public interface TaskDeliverDao extends ProTaskDeliverMapper{ * @return 返回交付物详情 */ List queryDeliverByTaskId(@Param("userId")Long userId, @Param("subTimeId")Long subTimeId, @Param("taskDetailId")Long taskDetailId); + + /** + * 根据任务详情id查询输出文档的列表 + * @param taskId + * @return + */ + List selectOutputDocByTaskId(Long taskId); } diff --git a/tall/src/main/java/com/ccsens/tall/persist/mapper/ProDeliverHistoryRecordMapper.java b/tall/src/main/java/com/ccsens/tall/persist/mapper/ProDeliverHistoryRecordMapper.java new file mode 100644 index 00000000..0eb88547 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/persist/mapper/ProDeliverHistoryRecordMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.tall.persist.mapper; + +import com.ccsens.tall.bean.po.ProDeliverHistoryRecord; +import com.ccsens.tall.bean.po.ProDeliverHistoryRecordExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface ProDeliverHistoryRecordMapper { + long countByExample(ProDeliverHistoryRecordExample example); + + int deleteByExample(ProDeliverHistoryRecordExample example); + + int deleteByPrimaryKey(Long id); + + int insert(ProDeliverHistoryRecord record); + + int insertSelective(ProDeliverHistoryRecord record); + + List selectByExample(ProDeliverHistoryRecordExample example); + + ProDeliverHistoryRecord selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") ProDeliverHistoryRecord record, @Param("example") ProDeliverHistoryRecordExample example); + + int updateByExample(@Param("record") ProDeliverHistoryRecord record, @Param("example") ProDeliverHistoryRecordExample example); + + int updateByPrimaryKeySelective(ProDeliverHistoryRecord record); + + int updateByPrimaryKey(ProDeliverHistoryRecord record); +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/service/IInputDocService.java b/tall/src/main/java/com/ccsens/tall/service/IInputDocService.java index 2d769a92..bd5733c5 100644 --- a/tall/src/main/java/com/ccsens/tall/service/IInputDocService.java +++ b/tall/src/main/java/com/ccsens/tall/service/IInputDocService.java @@ -97,5 +97,12 @@ public interface IInputDocService { * 删除输入文档下所有的文件 * @param param 输入文档id */ - void delAllRecordOfTask(InputDocDto.DelAllRecordOfTask param); + void delAllRecordOfTask(InputDocDto.DelAllRecordOfTask param,Long userId); + + /** + * 查看交付物的历史记录 + * @param param + * @return + */ + PageInfo viewDeliverHistory(InputDocDto.DeliverHistory param); } diff --git a/tall/src/main/java/com/ccsens/tall/service/ITaskDeliverService.java b/tall/src/main/java/com/ccsens/tall/service/ITaskDeliverService.java index 2971170a..1f79b9c7 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ITaskDeliverService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ITaskDeliverService.java @@ -45,7 +45,7 @@ public interface ITaskDeliverService { * 删除输出文档下所有的文件 * @param param */ - void delAllFileOfDeliver(DeliverDto.DelAllFileOfDeliver param); + void delAllFileOfDeliver(DeliverDto.DelAllFileOfDeliver 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 e272b963..de74c18c 100644 --- a/tall/src/main/java/com/ccsens/tall/service/InputDocService.java +++ b/tall/src/main/java/com/ccsens/tall/service/InputDocService.java @@ -63,6 +63,12 @@ public class InputDocService implements IInputDocService { private SysOperationDao sysOperationDao; @Resource private SysOperationMessageDao sysOperationMessageDao; + @Resource + private ProDeliverHistoryRecordDao deliverHistoryRecordDao; + @Resource + private IProMemberService iProMemberService; + @Resource + private ProPluginConfigDao pluginConfigDao; @@ -113,6 +119,7 @@ public class InputDocService implements IInputDocService { TaskVo.ProTaskInfo taskInfo=new TaskVo.ProTaskInfo(); //普通的任务和全局的 List normalTaskList1= iInputDocDao.selectByCompany(param,userId); + //给二级任务下添加子任务 //遍历项目 if(param.getId()!=null){ @@ -171,6 +178,19 @@ public class InputDocService implements IInputDocService { } taskInfo.setGlobalTaskList(globalTaskList); taskInfo.setNormalTaskList(normalTaskList); + for (TaskVo.NormalTask normalTask : taskInfo.getNormalTaskList()) { + if (null != normalTask.getDetailId()){ + ProPluginConfigExample configExample = new ProPluginConfigExample(); + configExample.createCriteria().andTaskIdEqualTo(normalTask.getDetailId()).andPlaceLocationEqualTo((byte) 0); + List proPluginConfigs = pluginConfigDao.selectByExample(configExample); + if (CollectionUtil.isNotEmpty(proPluginConfigs)){ + ProPluginConfig config = proPluginConfigs.get(0); + normalTask.setImportParam(config.getImportParam()); + normalTask.setRoutineLocation(config.getRoutineLocation()); + normalTask.setWebPath(config.getWebPath()); + } + } + } return taskInfo; } @@ -248,6 +268,7 @@ public class InputDocService implements IInputDocService { if (ObjectUtil.isNull(doc)){ throw new BaseException("输入文档不存在或已删除"); } + ProTaskInputRecord proTaskInputRecord = new ProTaskInputRecord(); //多文件添加 if (!ArrayUtil.isEmpty(param.getFileIds())){ String fileIds = ""; @@ -255,7 +276,7 @@ public class InputDocService implements IInputDocService { fileIds = fileIds + param.getFileIds()[i]+","; } fileIds = fileIds.substring(0,fileIds.length()-1); - ProTaskInputRecord proTaskInputRecord = new ProTaskInputRecord(); + proTaskInputRecord.setFileId(fileIds); proTaskInputRecord.setInputDocId(param.getDocId()); proTaskInputRecord.setStatus((byte)1); @@ -273,7 +294,6 @@ public class InputDocService implements IInputDocService { //如果备注信息不为空 if (!StrUtil.isBlank(param.getRemark()) && ArrayUtil.isEmpty(param.getFileIds())){ - ProTaskInputRecord proTaskInputRecord = new ProTaskInputRecord(); proTaskInputRecord.setInputDocId(param.getDocId()); proTaskInputRecord.setStatus((byte)1); proTaskInputRecord.setId(snowflake.nextId()); @@ -287,9 +307,20 @@ public class InputDocService implements IInputDocService { proTaskInputDoc.setIsUpload(1); proTaskInputDocMapper.updateByPrimaryKeySelective(proTaskInputDoc); } - - //TODO 发送消息 + //查找项目id ProTaskDetail taskDetail = proTaskDetailMapper.selectByPrimaryKey(doc.getTaskDetailId()); + ProMember proMember = iProMemberService.selectByUserId(userId, taskDetail.getProjectId()); + + //将操作记录添加到历史记录表中 + ProDeliverHistoryRecord historyRecord = new ProDeliverHistoryRecord(); + historyRecord.setId(snowflake.nextId()); + historyRecord.setDeliverId(param.getDocId()); + historyRecord.setDeliverType((byte)0); + historyRecord.setDeliverRecordId(proTaskInputRecord.getId()); + historyRecord.setDoType((byte)0); + historyRecord.setMemberId(proMember.getId()); + deliverHistoryRecordDao.insertSelective(historyRecord); + //发送消息 if (ObjectUtil.isNotNull(taskDetail)){ robotService.uploadForDocRobotSend(userId,taskDetail,doc.getName()); } @@ -464,8 +495,22 @@ public class InputDocService implements IInputDocService { proTaskInputDocMapper.updateByPrimaryKeySelective(proTaskInputDoc); } - //TODO 发送消息 + //将操作保存到历史信息记录表 + //查找项目id ProTaskDetail taskDetail = proTaskDetailMapper.selectByPrimaryKey(doc.getTaskDetailId()); + ProMember proMember = iProMemberService.selectByUserId(userId, taskDetail.getProjectId()); + + //将操作记录添加到历史记录表中 + ProDeliverHistoryRecord historyRecord = new ProDeliverHistoryRecord(); + historyRecord.setId(snowflake.nextId()); + historyRecord.setDeliverId(doc.getId()); + historyRecord.setDeliverType((byte)0); + historyRecord.setDeliverRecordId(proTaskInputRecord.getId()); + historyRecord.setDoType((byte)2); + historyRecord.setMemberId(proMember.getId()); + deliverHistoryRecordDao.insertSelective(historyRecord); + + //发送消息 if (ObjectUtil.isNotNull(taskDetail)){ robotService.delDocRobotSend(userId,taskDetail,doc.getName()); } @@ -495,6 +540,20 @@ public class InputDocService implements IInputDocService { if (ObjectUtil.isNotNull(taskDetail)){ robotService.updateRemarkRobotSend(userId,taskDetail,doc.getName()); } + + //将操作保存到历史信息记录表 + //查找项目id + ProMember proMember = iProMemberService.selectByUserId(userId, taskDetail.getProjectId()); + //将操作记录添加到历史记录表中 + ProDeliverHistoryRecord historyRecord = new ProDeliverHistoryRecord(); + historyRecord.setId(snowflake.nextId()); + historyRecord.setDeliverId(doc.getId()); + historyRecord.setDeliverType((byte)0); + historyRecord.setDeliverRecordId(doc.getId()); + historyRecord.setDoType((byte)1); + historyRecord.setMemberId(proMember.getId()); + deliverHistoryRecordDao.insertSelective(historyRecord); + } /** @@ -520,7 +579,7 @@ public class InputDocService implements IInputDocService { * @param param 输入文档id */ @Override - public void delAllRecordOfTask(InputDocDto.DelAllRecordOfTask param) { + public void delAllRecordOfTask(InputDocDto.DelAllRecordOfTask param,Long userId) { ProTaskInputRecordExample example = new ProTaskInputRecordExample(); example.createCriteria().andInputDocIdEqualTo(param.getDocId()).andRecStatusEqualTo((byte)0); List records = proTaskInputRecordMapper.selectByExample(example); @@ -536,7 +595,117 @@ public class InputDocService implements IInputDocService { doc.setId(param.getDocId()); doc.setIsUpload(0); proTaskInputDocMapper.updateByPrimaryKeySelective(doc); + + //将操作保存到历史信息记录表 + //查找项目id + try { + ProTaskDetail taskDetail = proTaskDetailMapper.selectByPrimaryKey(doc.getTaskDetailId()); + ProMember proMember = iProMemberService.selectByUserId(userId, taskDetail.getProjectId()); + + //将操作记录添加到历史记录表中 + ProDeliverHistoryRecord historyRecord = new ProDeliverHistoryRecord(); + historyRecord.setId(snowflake.nextId()); + historyRecord.setDeliverId(doc.getId()); + historyRecord.setDeliverType((byte)0); + + historyRecord.setDoType((byte)6); + historyRecord.setMemberId(proMember.getId()); + deliverHistoryRecordDao.insertSelective(historyRecord); + }catch (Exception e){ + log.info("删除输入文档下所有文件记录",e); + } } + + } + + /** + * 查看交付物的历史记录 + * @param param + * @return + */ + @Override + public PageInfo viewDeliverHistory(InputDocDto.DeliverHistory param) { + //0为输出文档 + if (0 == param.getDeliverType()) + { + PageHelper.startPage(param.getPageNum(), param.getPageSize()); + List historyList = deliverHistoryRecordDao.findInputHistory(param.getDeliverId()); + for (InputDocVo.DeliverHistory deliverHistory : historyList) { + if (StrUtil.isNotBlank(deliverHistory.getFileIds())){ + if (deliverHistory.getFileIds().contains(",")) { + String[] split = deliverHistory.getFileIds().split(","); + List splits = new ArrayList<>(Arrays.asList(split)); + if (split.length != 0) { + //获取文件项目的路径 + String requestUrl = PropUtil.filedeal; + //通过文件id查询文件信息 + String c = RestTemplateUtil.postBody1(requestUrl, splits); + JsonResponse> a = JSONObject.parseObject(c, JsonResponse.class); + if (ObjectUtil.isNotNull(a) && ObjectUtil.isNotNull(a.getData())) { + List fileList = a.getData(); + deliverHistory.setFileList(fileList); + } + } + } + }else{ + if (StrUtil.isNotBlank(deliverHistory.getFileIds())){ + List idList = new ArrayList<>(); + idList.add(deliverHistory.getFileIds()); + //获取文件项目的路径 + String requestUrl = PropUtil.filedeal; + //通过文件id查询文件信息 + String c = RestTemplateUtil.postBody1(requestUrl, idList); + JsonResponse> a = JSONObject.parseObject(c, JsonResponse.class); + if (ObjectUtil.isNotNull(a) && ObjectUtil.isNotNull(a.getData())) { + List fileList = a.getData(); + deliverHistory.setFileList(fileList); + } + } + } + } + return new PageInfo<>(historyList); + } + + //1为输出文档 + if (1 == param.getDeliverType()) + { + List historyList = deliverHistoryRecordDao.finOutPutHistory(param.getDeliverId()); + for (InputDocVo.DeliverHistory deliverHistory : historyList) { + if (StrUtil.isNotBlank(deliverHistory.getFileIds())){ + if (deliverHistory.getFileIds().contains(",")){ + String[] split = deliverHistory.getFileIds().split(","); + List splits = new ArrayList<>(Arrays.asList(split)); + if (split.length != 0) { + //获取文件项目的路径 + String requestUrl = PropUtil.filedeal; + //通过文件id查询文件信息 + String c = RestTemplateUtil.postBody1(requestUrl, splits); + JsonResponse> a = JSONObject.parseObject(c, JsonResponse.class); + if (ObjectUtil.isNotNull(a) && ObjectUtil.isNotNull(a.getData())) { + List fileList = a.getData(); + deliverHistory.setFileList(fileList); + } + } + } + }else{ + if (StrUtil.isNotBlank(deliverHistory.getFileIds())){ + List idList = new ArrayList<>(); + idList.add(deliverHistory.getFileIds()); + //获取文件项目的路径 + String requestUrl = PropUtil.filedeal; + //通过文件id查询文件信息 + String c = RestTemplateUtil.postBody1(requestUrl, idList); + JsonResponse> a = JSONObject.parseObject(c, JsonResponse.class); + if (ObjectUtil.isNotNull(a) && ObjectUtil.isNotNull(a.getData())) { + List fileList = a.getData(); + deliverHistory.setFileList(fileList); + } + } + } + return new PageInfo<>(historyList); + } + } + return null; } } diff --git a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java index 01910f3d..0cb77114 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java @@ -10,10 +10,7 @@ import com.ccsens.cloudutil.feign.MtFeignClient; import com.ccsens.tall.bean.dto.ProjectDto; import com.ccsens.tall.bean.dto.TaskDto; import com.ccsens.tall.bean.po.*; -import com.ccsens.tall.bean.vo.MemberVo; -import com.ccsens.tall.bean.vo.PluginVo; -import com.ccsens.tall.bean.vo.ProjectVo; -import com.ccsens.tall.bean.vo.TaskVo; +import com.ccsens.tall.bean.vo.*; import com.ccsens.tall.persist.dao.*; import com.ccsens.tall.persist.dao.ProTaskShowDao; import com.ccsens.tall.persist.mapper.ProPluginConfigMapper; @@ -95,7 +92,7 @@ public class ProTaskDetailService implements IProTaskDetailService { @Resource private ProTaskDeliverMapper proTaskDeliverMapper; @Resource - private ProTaskInputDocMapper proTaskInputDocMapper; + private ProTaskInputDocDao proTaskInputDocDao; @Override public void saveTaskDetail(ProTaskDetail taskDetail) { @@ -788,6 +785,16 @@ public class ProTaskDetailService implements IProTaskDetailService { taskDetail.getSecondTasks().addAll(groupTaskList); } } + //查询此任务下的输入文档 + List inputDocInfos = proTaskInputDocDao.selectDocByTaskId(taskDetail.getDetailId()); + if (CollectionUtil.isNotEmpty(inputDocInfos)){ + taskDetail.setInputDoc(inputDocInfos); + } + //查询此任务下的输出文档 + List outputDocInfos = taskDeliverDao.selectOutputDocByTaskId(taskDetail.getDetailId()); + if (CollectionUtil.isNotEmpty(outputDocInfos)){ + taskDetail.setOutputDoc(outputDocInfos); + } return taskDetail; } @@ -1339,6 +1346,10 @@ public class ProTaskDetailService implements IProTaskDetailService { if (ObjectUtil.isNotNull(updateTaskInfo.getMilestone())) { taskDetail.setMilestone(updateTaskInfo.getMilestone()); } + //父任务id + if(null != updateTaskInfo.getParentId()){ + taskDetail.setParentId(updateTaskInfo.getParentId()); + } //时间 if (ObjectUtil.isNotNull(updateTaskInfo.getBeginTime()) || ObjectUtil.isNotNull(updateTaskInfo.getEndTime()) || @@ -1416,10 +1427,10 @@ public class ProTaskDetailService implements IProTaskDetailService { updateTaskInfo.getInputList().forEach(taskDeliver -> { if (StrUtil.isNotEmpty(taskDeliver.getDeliverName())) { if (ObjectUtil.isNotNull(taskDeliver.getDeliverId())) { - ProTaskInputDoc deliver = proTaskInputDocMapper.selectByPrimaryKey(taskDeliver.getDeliverId()); + ProTaskInputDoc deliver = proTaskInputDocDao.selectByPrimaryKey(taskDeliver.getDeliverId()); if (ObjectUtil.isNotNull(deliver)) { deliver.setName(taskDeliver.getDeliverName()); - proTaskInputDocMapper.updateByPrimaryKeySelective(deliver); + proTaskInputDocDao.updateByPrimaryKeySelective(deliver); } } else { ProTaskInputDoc deliver = new ProTaskInputDoc(); @@ -1427,7 +1438,7 @@ public class ProTaskDetailService implements IProTaskDetailService { deliver.setTaskDetailId(taskDetail.getId()); deliver.setName(taskDeliver.getDeliverName()); deliver.setIsUpload(0); - proTaskInputDocMapper.insertSelective(deliver); + proTaskInputDocDao.insertSelective(deliver); } } }); @@ -1698,12 +1709,12 @@ public class ProTaskDetailService implements IProTaskDetailService { proTaskDeliver.setId(jiaoFuWu.getId()); proTaskDeliver.setName(jiaoFuWu.getNames()); proTaskDeliverExample.createCriteria().andIdEqualTo(jiaoFuWu.getId()).andRecStatusEqualTo((byte) 0); - proTaskInputDocMapper.updateByExampleSelective(proTaskDeliver,proTaskDeliverExample); + proTaskInputDocDao.updateByExampleSelective(proTaskDeliver,proTaskDeliverExample); }else if(jiaoFuWu.getId()==null && StringUtils.isNotBlank(jiaoFuWu.getNames())) { //新增 proTaskDeliver.setId(snowflake.nextId()); proTaskDeliver.setName(jiaoFuWu.getNames()); - proTaskInputDocMapper.insertSelective(proTaskDeliver); + proTaskInputDocDao.insertSelective(proTaskDeliver); } } } 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 f1fde1d3..e8064bb6 100644 --- a/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java +++ b/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java @@ -77,6 +77,10 @@ public class TaskDeliverService implements ITaskDeliverService { private IWpsService wpsService; @Resource private ProTaskInputDocMapper proTaskInputDocMapper; + @Resource + private IProMemberService iProMemberService; + @Resource + private ProDeliverHistoryRecordDao deliverHistoryRecordDao; @Override public void saveDeliver(ProTaskDeliver taskDeliver) { @@ -249,6 +253,19 @@ public class TaskDeliverService implements ITaskDeliverService { deliver.setId(uploadDeliver.getDeliverId()); deliver.setIsUpload(1); taskDeliverDao.updateByPrimaryKeySelective(deliver); + + //查找成员 + ProMember proMember = iProMemberService.selectByUserId(currentUserId, taskDetail.getProjectId()); + + //将操作记录添加到历史记录表中 + ProDeliverHistoryRecord historyRecord = new ProDeliverHistoryRecord(); + historyRecord.setId(snowflake.nextId()); + historyRecord.setDeliverId(uploadDeliver.getDeliverId()); + historyRecord.setDeliverType((byte)1); + historyRecord.setDeliverRecordId(deliverPostLog.getId()); + historyRecord.setDoType((byte)0); + historyRecord.setMemberId(proMember.getId()); + deliverHistoryRecordDao.insertSelective(historyRecord); } //获取所有接收者的id @@ -301,6 +318,8 @@ public class TaskDeliverService implements ITaskDeliverService { SysProject project = sysProjectDao.selectByPrimaryKey(taskDetail.getProjectId()); robotService.addDeliverRobotSend(currentUserId,taskDeliver.getName(),subTimeId, project); + + //返回 List deliverInfoList = taskDeliverDao.selectByDeliverId(uploadDeliver.getDeliverId()); if (CollectionUtil.isNotEmpty(deliverInfoList)) { @@ -797,6 +816,20 @@ public class TaskDeliverService implements ITaskDeliverService { InMessage inMessage = InMessage.newToUserMessage(currentUserId.toString(),userIdSet,null,messageRule,s); messageService.sendDeliverMessageWithChecker(inMessage); + //向交付物历史记录表中添加数据 + //查找成员 + ProMember proMember = iProMemberService.selectByUserId(currentUserId, task.getProjectId()); + //审核状态3为通过4为驳回 + Byte doType = checkDeliver.getCheckStatus() == true ? (byte) 3 :(byte)4; + //将操作记录添加到历史记录表中 + ProDeliverHistoryRecord historyRecord = new ProDeliverHistoryRecord(); + historyRecord.setId(snowflake.nextId()); + historyRecord.setDeliverId(deliverPostLog.getDeliverId()); + historyRecord.setDeliverType((byte)1); + historyRecord.setDeliverRecordId(deliverPostLog.getId()); + historyRecord.setDoType(doType); + historyRecord.setMemberId(proMember.getId()); + deliverHistoryRecordDao.insertSelective(historyRecord); //检查完,返回数据 DeliverVo.DeliverInfo deliverInfo = selectDeliverInfo(currentUserId, deliver.getId(), checkDeliver.getTaskId(),token); @@ -996,6 +1029,19 @@ public class TaskDeliverService implements ITaskDeliverService { rabbitTemplate.convertAndSend(RabbitMQConfig.MESSAGE_QUEUE_NAME, JacksonUtil.beanToJson(inMessage)); + //向交付物历史记录表中添加数据 + //查找成员 + ProMember proMember = iProMemberService.selectByUserId(currentUserId, task.getProjectId()); + //将操作记录添加到历史记录表中 + ProDeliverHistoryRecord historyRecord = new ProDeliverHistoryRecord(); + historyRecord.setId(snowflake.nextId()); + historyRecord.setDeliverId(deliverPostLog.getDeliverId()); + historyRecord.setDeliverType((byte)1); + historyRecord.setDeliverRecordId(deliverPostLog.getId()); + historyRecord.setDoType((byte)2); + historyRecord.setMemberId(proMember.getId()); + deliverHistoryRecordDao.insertSelective(historyRecord); + //用智能助手发送消息 robotService.deleteDeliverRobotSend(currentUserId,deliver.getName(),subTimeId); } @@ -1097,7 +1143,7 @@ public class TaskDeliverService implements ITaskDeliverService { * @param param */ @Override - public void delAllFileOfDeliver(DeliverDto.DelAllFileOfDeliver param) { + public void delAllFileOfDeliver(DeliverDto.DelAllFileOfDeliver param,Long userId) { ProTaskDeliverPostLogExample example = new ProTaskDeliverPostLogExample(); example.createCriteria().andDeliverIdEqualTo(param.getDeliverId()); List proTaskDeliverPostLogs = deliverPostLogDao.selectByExample(example); @@ -1111,7 +1157,27 @@ public class TaskDeliverService implements ITaskDeliverService { taskDeliver.setId(param.getDeliverId()); taskDeliver.setIsUpload(0); taskDeliverDao.updateByPrimaryKeySelective(taskDeliver); + + try { + //向交付物历史记录表中添加数据 + //查找成员 + ProTaskDeliver deliver = taskDeliverDao.selectByPrimaryKey(param.getDeliverId()); + ProTaskDetail taskDetail = taskDetailDao.selectByPrimaryKey(deliver.getTaskDetailId()); + ProMember proMember = iProMemberService.selectByUserId(userId, taskDetail.getProjectId()); + //将操作记录添加到历史记录表中 + ProDeliverHistoryRecord historyRecord = new ProDeliverHistoryRecord(); + historyRecord.setId(snowflake.nextId()); + historyRecord.setDeliverId(param.getDeliverId()); + historyRecord.setDeliverType((byte)1); + + historyRecord.setDoType((byte)6); + historyRecord.setMemberId(proMember.getId()); + deliverHistoryRecordDao.insertSelective(historyRecord); + }catch (Exception e){ + log.info("删除交付下所有文件",e); + } } + } /** diff --git a/tall/src/main/java/com/ccsens/tall/service/UserService.java b/tall/src/main/java/com/ccsens/tall/service/UserService.java index 7c9e57d1..2959b3c9 100644 --- a/tall/src/main/java/com/ccsens/tall/service/UserService.java +++ b/tall/src/main/java/com/ccsens/tall/service/UserService.java @@ -366,7 +366,7 @@ public class UserService implements IUserService { throw new BaseException(CodeEnum.PASSWORD_ERROR); } } else { - throw new BaseException(CodeEnum.NOT_ACCOUNT); + throw new BaseException(CodeEnum.PASSWORD_ERROR); } long end = System.currentTimeMillis(); log.info("查询并验证账号用时:{}",end - start); diff --git a/tall/src/main/java/com/ccsens/tall/web/DeliverController.java b/tall/src/main/java/com/ccsens/tall/web/DeliverController.java index 0fd85646..85c5008b 100644 --- a/tall/src/main/java/com/ccsens/tall/web/DeliverController.java +++ b/tall/src/main/java/com/ccsens/tall/web/DeliverController.java @@ -193,7 +193,7 @@ public class DeliverController { @RequestMapping(value = "/delAllFileOfDeliver", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse delAllFileOfDeliver(@ApiParam @Validated @RequestBody QueryDto params) { log.info("删除输出文档下所有的文件:{}",params); - deliverService.delAllFileOfDeliver(params.getParam()); + deliverService.delAllFileOfDeliver(params.getParam(),params.getUserId()); log.info("删除输出文档下所有的文件"); return JsonResponse.newInstance().ok(); } 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 519bae5f..2531173b 100644 --- a/tall/src/main/java/com/ccsens/tall/web/InputDocController.java +++ b/tall/src/main/java/com/ccsens/tall/web/InputDocController.java @@ -145,9 +145,19 @@ public class InputDocController { @RequestMapping(value = "/delAllRecordOfTask", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse delAllRecordOfTask(@ApiParam @Validated @RequestBody QueryDto params) { log.info("删除输入文档下所有的文件:{}",params); - iInputDocService.delAllRecordOfTask(params.getParam()); + iInputDocService.delAllRecordOfTask(params.getParam(),params.getUserId()); log.info("删除输入文档下所有的文件"); return JsonResponse.newInstance().ok(); } + @MustLoginTall + @ApiOperation(value = "查看交付物的历史记录4.10", notes = "mz:查看交付物的历史记录") + @RequestMapping(value = "/deliverHistory", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> viewDeliverHistory(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("查看交付物的历史记录:{}",params); + PageInfo deliverHistory = iInputDocService.viewDeliverHistory(params.getParam()); + log.info("查看交付物的历史记录"); + return JsonResponse.newInstance().ok(deliverHistory); + } + } diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index ebc544af..b5408a3a 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: util-test,common + active: dev + include: util-dev,common diff --git a/tall/src/main/resources/mapper_dao/DeliverDao.xml b/tall/src/main/resources/mapper_dao/DeliverDao.xml index acd9824d..f7aa0c79 100644 --- a/tall/src/main/resources/mapper_dao/DeliverDao.xml +++ b/tall/src/main/resources/mapper_dao/DeliverDao.xml @@ -290,4 +290,14 @@ d.task_detail_id = #{taskDetailId} and d.rec_status = 0 + + \ No newline at end of file diff --git a/tall/src/main/resources/mapper_dao/ProDeliverHistoryRecordDao.xml b/tall/src/main/resources/mapper_dao/ProDeliverHistoryRecordDao.xml new file mode 100644 index 00000000..f88ddb7e --- /dev/null +++ b/tall/src/main/resources/mapper_dao/ProDeliverHistoryRecordDao.xml @@ -0,0 +1,47 @@ + + + + + + + + + \ No newline at end of file diff --git a/tall/src/main/resources/mapper_dao/ProTaskInputDocDao.xml b/tall/src/main/resources/mapper_dao/ProTaskInputDocDao.xml new file mode 100644 index 00000000..b716eeea --- /dev/null +++ b/tall/src/main/resources/mapper_dao/ProTaskInputDocDao.xml @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/tall/src/main/resources/mapper_raw/ProDeliverHistoryRecordMapper.xml b/tall/src/main/resources/mapper_raw/ProDeliverHistoryRecordMapper.xml new file mode 100644 index 00000000..8ca20d68 --- /dev/null +++ b/tall/src/main/resources/mapper_raw/ProDeliverHistoryRecordMapper.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, deliver_id, deliver_type, deliver_record_id, do_type, role_id, content, created_at, + updated_at, rec_status, member_id + + + + + delete from t_pro_deliver_history_record + where id = #{id,jdbcType=BIGINT} + + + delete from t_pro_deliver_history_record + + + + + + insert into t_pro_deliver_history_record (id, deliver_id, deliver_type, + deliver_record_id, do_type, role_id, + content, created_at, updated_at, + rec_status, member_id) + values (#{id,jdbcType=BIGINT}, #{deliverId,jdbcType=BIGINT}, #{deliverType,jdbcType=TINYINT}, + #{deliverRecordId,jdbcType=BIGINT}, #{doType,jdbcType=TINYINT}, #{roleId,jdbcType=BIGINT}, + #{content,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, + #{recStatus,jdbcType=TINYINT}, #{memberId,jdbcType=BIGINT}) + + + insert into t_pro_deliver_history_record + + + id, + + + deliver_id, + + + deliver_type, + + + deliver_record_id, + + + do_type, + + + role_id, + + + content, + + + created_at, + + + updated_at, + + + rec_status, + + + member_id, + + + + + #{id,jdbcType=BIGINT}, + + + #{deliverId,jdbcType=BIGINT}, + + + #{deliverType,jdbcType=TINYINT}, + + + #{deliverRecordId,jdbcType=BIGINT}, + + + #{doType,jdbcType=TINYINT}, + + + #{roleId,jdbcType=BIGINT}, + + + #{content,jdbcType=VARCHAR}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + #{memberId,jdbcType=BIGINT}, + + + + + + update t_pro_deliver_history_record + + + id = #{record.id,jdbcType=BIGINT}, + + + deliver_id = #{record.deliverId,jdbcType=BIGINT}, + + + deliver_type = #{record.deliverType,jdbcType=TINYINT}, + + + deliver_record_id = #{record.deliverRecordId,jdbcType=BIGINT}, + + + do_type = #{record.doType,jdbcType=TINYINT}, + + + role_id = #{record.roleId,jdbcType=BIGINT}, + + + content = #{record.content,jdbcType=VARCHAR}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + member_id = #{record.memberId,jdbcType=BIGINT}, + + + + + + + + update t_pro_deliver_history_record + set id = #{record.id,jdbcType=BIGINT}, + deliver_id = #{record.deliverId,jdbcType=BIGINT}, + deliver_type = #{record.deliverType,jdbcType=TINYINT}, + deliver_record_id = #{record.deliverRecordId,jdbcType=BIGINT}, + do_type = #{record.doType,jdbcType=TINYINT}, + role_id = #{record.roleId,jdbcType=BIGINT}, + content = #{record.content,jdbcType=VARCHAR}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT}, + member_id = #{record.memberId,jdbcType=BIGINT} + + + + + + update t_pro_deliver_history_record + + + deliver_id = #{deliverId,jdbcType=BIGINT}, + + + deliver_type = #{deliverType,jdbcType=TINYINT}, + + + deliver_record_id = #{deliverRecordId,jdbcType=BIGINT}, + + + do_type = #{doType,jdbcType=TINYINT}, + + + role_id = #{roleId,jdbcType=BIGINT}, + + + content = #{content,jdbcType=VARCHAR}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + member_id = #{memberId,jdbcType=BIGINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_pro_deliver_history_record + set deliver_id = #{deliverId,jdbcType=BIGINT}, + deliver_type = #{deliverType,jdbcType=TINYINT}, + deliver_record_id = #{deliverRecordId,jdbcType=BIGINT}, + do_type = #{doType,jdbcType=TINYINT}, + role_id = #{roleId,jdbcType=BIGINT}, + content = #{content,jdbcType=VARCHAR}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT}, + member_id = #{memberId,jdbcType=BIGINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tcm/src/main/java/com/ccsens/tcm/api/QuestionController.java b/tcm/src/main/java/com/ccsens/tcm/api/QuestionController.java index 104226ff..68a8cfc9 100644 --- a/tcm/src/main/java/com/ccsens/tcm/api/QuestionController.java +++ b/tcm/src/main/java/com/ccsens/tcm/api/QuestionController.java @@ -2,7 +2,6 @@ package com.ccsens.tcm.api; import com.ccsens.tcm.bean.dto.CodeVo; import com.ccsens.tcm.bean.dto.QuestionDto; -import com.ccsens.tcm.bean.po.Question; import com.ccsens.tcm.bean.vo.QuestionVo; import com.ccsens.tcm.service.IImportService; import com.ccsens.tcm.service.IQuestionService; @@ -57,9 +56,9 @@ public class QuestionController { } @ApiOperation(value = "查询所有得题目的类型和题目相关信息",notes = "1007:查询所有试题") @RequestMapping(value="/queryQuestion",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"}) - public JsonResponse> queryQuestion() throws Exception { + public JsonResponse> queryQuestion() throws Exception { log.info("查询所有试题:{}"); - List subjectLists = questionService.queryQuestion(); + List subjectLists = questionService.queryQuestion(); log.info("查询所有试题"); return JsonResponse.newInstance().ok(subjectLists); } diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/dto/QuestionDto.java b/tcm/src/main/java/com/ccsens/tcm/bean/dto/QuestionDto.java index 998e51db..3959982a 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/dto/QuestionDto.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/dto/QuestionDto.java @@ -20,6 +20,6 @@ public class QuestionDto { @ApiModelProperty("试题code") private String code; @ApiModelProperty("第几次录入信息,默认为0查询第一次") - private Integer nums; + private Integer nums = 0; } } diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/po/Hospital.java b/tcm/src/main/java/com/ccsens/tcm/bean/po/Hospital.java index 8fb735a8..f0cf98c2 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/po/Hospital.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/po/Hospital.java @@ -6,6 +6,8 @@ import java.util.Date; public class Hospital implements Serializable { private Long id; + private String code; + private String name; private Long operator; @@ -18,6 +20,8 @@ public class Hospital implements Serializable { private Long projectId; + private Byte hospitalType; + private static final long serialVersionUID = 1L; public Long getId() { @@ -28,6 +32,14 @@ public class Hospital implements Serializable { this.id = id; } + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code == null ? null : code.trim(); + } + public String getName() { return name; } @@ -76,6 +88,14 @@ public class Hospital implements Serializable { this.projectId = projectId; } + public Byte getHospitalType() { + return hospitalType; + } + + public void setHospitalType(Byte hospitalType) { + this.hospitalType = hospitalType; + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -83,12 +103,14 @@ public class Hospital implements Serializable { sb.append(" ["); sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); + sb.append(", code=").append(code); sb.append(", name=").append(name); sb.append(", operator=").append(operator); sb.append(", createdAt=").append(createdAt); sb.append(", updatedAt=").append(updatedAt); sb.append(", recStatus=").append(recStatus); sb.append(", projectId=").append(projectId); + sb.append(", hospitalType=").append(hospitalType); sb.append("]"); return sb.toString(); } diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/po/HospitalExample.java b/tcm/src/main/java/com/ccsens/tcm/bean/po/HospitalExample.java index 40b244aa..c3b180a0 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/po/HospitalExample.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/po/HospitalExample.java @@ -165,6 +165,76 @@ public class HospitalExample { return (Criteria) this; } + public Criteria andCodeIsNull() { + addCriterion("code is null"); + return (Criteria) this; + } + + public Criteria andCodeIsNotNull() { + addCriterion("code is not null"); + return (Criteria) this; + } + + public Criteria andCodeEqualTo(String value) { + addCriterion("code =", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotEqualTo(String value) { + addCriterion("code <>", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeGreaterThan(String value) { + addCriterion("code >", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeGreaterThanOrEqualTo(String value) { + addCriterion("code >=", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLessThan(String value) { + addCriterion("code <", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLessThanOrEqualTo(String value) { + addCriterion("code <=", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLike(String value) { + addCriterion("code like", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotLike(String value) { + addCriterion("code not like", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeIn(List values) { + addCriterion("code in", values, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotIn(List values) { + addCriterion("code not in", values, "code"); + return (Criteria) this; + } + + public Criteria andCodeBetween(String value1, String value2) { + addCriterion("code between", value1, value2, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotBetween(String value1, String value2) { + addCriterion("code not between", value1, value2, "code"); + return (Criteria) this; + } + public Criteria andNameIsNull() { addCriterion("name is null"); return (Criteria) this; @@ -534,6 +604,66 @@ public class HospitalExample { addCriterion("project_id not between", value1, value2, "projectId"); return (Criteria) this; } + + public Criteria andHospitalTypeIsNull() { + addCriterion("hospital_type is null"); + return (Criteria) this; + } + + public Criteria andHospitalTypeIsNotNull() { + addCriterion("hospital_type is not null"); + return (Criteria) this; + } + + public Criteria andHospitalTypeEqualTo(Byte value) { + addCriterion("hospital_type =", value, "hospitalType"); + return (Criteria) this; + } + + public Criteria andHospitalTypeNotEqualTo(Byte value) { + addCriterion("hospital_type <>", value, "hospitalType"); + return (Criteria) this; + } + + public Criteria andHospitalTypeGreaterThan(Byte value) { + addCriterion("hospital_type >", value, "hospitalType"); + return (Criteria) this; + } + + public Criteria andHospitalTypeGreaterThanOrEqualTo(Byte value) { + addCriterion("hospital_type >=", value, "hospitalType"); + return (Criteria) this; + } + + public Criteria andHospitalTypeLessThan(Byte value) { + addCriterion("hospital_type <", value, "hospitalType"); + return (Criteria) this; + } + + public Criteria andHospitalTypeLessThanOrEqualTo(Byte value) { + addCriterion("hospital_type <=", value, "hospitalType"); + return (Criteria) this; + } + + public Criteria andHospitalTypeIn(List values) { + addCriterion("hospital_type in", values, "hospitalType"); + return (Criteria) this; + } + + public Criteria andHospitalTypeNotIn(List values) { + addCriterion("hospital_type not in", values, "hospitalType"); + return (Criteria) this; + } + + public Criteria andHospitalTypeBetween(Byte value1, Byte value2) { + addCriterion("hospital_type between", value1, value2, "hospitalType"); + return (Criteria) this; + } + + public Criteria andHospitalTypeNotBetween(Byte value1, Byte value2) { + addCriterion("hospital_type not between", value1, value2, "hospitalType"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/po/Inpatient.java b/tcm/src/main/java/com/ccsens/tcm/bean/po/Inpatient.java index 8460068e..755c197e 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/po/Inpatient.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/po/Inpatient.java @@ -20,6 +20,8 @@ public class Inpatient implements Serializable { private Byte recStatus; + private String code; + private static final long serialVersionUID = 1L; public Long getId() { @@ -86,6 +88,14 @@ public class Inpatient implements Serializable { this.recStatus = recStatus; } + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code == null ? null : code.trim(); + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -100,6 +110,7 @@ public class Inpatient implements Serializable { sb.append(", createdAt=").append(createdAt); sb.append(", updateAt=").append(updateAt); sb.append(", recStatus=").append(recStatus); + sb.append(", code=").append(code); sb.append("]"); return sb.toString(); } diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/po/InpatientExample.java b/tcm/src/main/java/com/ccsens/tcm/bean/po/InpatientExample.java index fece44fd..2a982752 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/po/InpatientExample.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/po/InpatientExample.java @@ -604,6 +604,76 @@ public class InpatientExample { addCriterion("rec_status not between", value1, value2, "recStatus"); return (Criteria) this; } + + public Criteria andCodeIsNull() { + addCriterion("code is null"); + return (Criteria) this; + } + + public Criteria andCodeIsNotNull() { + addCriterion("code is not null"); + return (Criteria) this; + } + + public Criteria andCodeEqualTo(String value) { + addCriterion("code =", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotEqualTo(String value) { + addCriterion("code <>", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeGreaterThan(String value) { + addCriterion("code >", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeGreaterThanOrEqualTo(String value) { + addCriterion("code >=", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLessThan(String value) { + addCriterion("code <", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLessThanOrEqualTo(String value) { + addCriterion("code <=", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLike(String value) { + addCriterion("code like", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotLike(String value) { + addCriterion("code not like", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeIn(List values) { + addCriterion("code in", values, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotIn(List values) { + addCriterion("code not in", values, "code"); + return (Criteria) this; + } + + public Criteria andCodeBetween(String value1, String value2) { + addCriterion("code between", value1, value2, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotBetween(String value1, String value2) { + addCriterion("code not between", value1, value2, "code"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/po/QuestionHospital.java b/tcm/src/main/java/com/ccsens/tcm/bean/po/QuestionHospital.java new file mode 100644 index 00000000..a7fec0b1 --- /dev/null +++ b/tcm/src/main/java/com/ccsens/tcm/bean/po/QuestionHospital.java @@ -0,0 +1,117 @@ +package com.ccsens.tcm.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class QuestionHospital implements Serializable { + private Long id; + + private Long questionId; + + private Long hospitalId; + + private Byte fillType; + + private String remark; + + private Long operator; + + 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 getQuestionId() { + return questionId; + } + + public void setQuestionId(Long questionId) { + this.questionId = questionId; + } + + public Long getHospitalId() { + return hospitalId; + } + + public void setHospitalId(Long hospitalId) { + this.hospitalId = hospitalId; + } + + public Byte getFillType() { + return fillType; + } + + public void setFillType(Byte fillType) { + this.fillType = fillType; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark == null ? null : remark.trim(); + } + + public Long getOperator() { + return operator; + } + + public void setOperator(Long operator) { + this.operator = operator; + } + + 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(", questionId=").append(questionId); + sb.append(", hospitalId=").append(hospitalId); + sb.append(", fillType=").append(fillType); + sb.append(", remark=").append(remark); + sb.append(", operator=").append(operator); + 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/tcm/src/main/java/com/ccsens/tcm/bean/po/QuestionHospitalExample.java b/tcm/src/main/java/com/ccsens/tcm/bean/po/QuestionHospitalExample.java new file mode 100644 index 00000000..cd9d5991 --- /dev/null +++ b/tcm/src/main/java/com/ccsens/tcm/bean/po/QuestionHospitalExample.java @@ -0,0 +1,751 @@ +package com.ccsens.tcm.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class QuestionHospitalExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public QuestionHospitalExample() { + 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 andQuestionIdIsNull() { + addCriterion("question_id is null"); + return (Criteria) this; + } + + public Criteria andQuestionIdIsNotNull() { + addCriterion("question_id is not null"); + return (Criteria) this; + } + + public Criteria andQuestionIdEqualTo(Long value) { + addCriterion("question_id =", value, "questionId"); + return (Criteria) this; + } + + public Criteria andQuestionIdNotEqualTo(Long value) { + addCriterion("question_id <>", value, "questionId"); + return (Criteria) this; + } + + public Criteria andQuestionIdGreaterThan(Long value) { + addCriterion("question_id >", value, "questionId"); + return (Criteria) this; + } + + public Criteria andQuestionIdGreaterThanOrEqualTo(Long value) { + addCriterion("question_id >=", value, "questionId"); + return (Criteria) this; + } + + public Criteria andQuestionIdLessThan(Long value) { + addCriterion("question_id <", value, "questionId"); + return (Criteria) this; + } + + public Criteria andQuestionIdLessThanOrEqualTo(Long value) { + addCriterion("question_id <=", value, "questionId"); + return (Criteria) this; + } + + public Criteria andQuestionIdIn(List values) { + addCriterion("question_id in", values, "questionId"); + return (Criteria) this; + } + + public Criteria andQuestionIdNotIn(List values) { + addCriterion("question_id not in", values, "questionId"); + return (Criteria) this; + } + + public Criteria andQuestionIdBetween(Long value1, Long value2) { + addCriterion("question_id between", value1, value2, "questionId"); + return (Criteria) this; + } + + public Criteria andQuestionIdNotBetween(Long value1, Long value2) { + addCriterion("question_id not between", value1, value2, "questionId"); + return (Criteria) this; + } + + public Criteria andHospitalIdIsNull() { + addCriterion("hospital_id is null"); + return (Criteria) this; + } + + public Criteria andHospitalIdIsNotNull() { + addCriterion("hospital_id is not null"); + return (Criteria) this; + } + + public Criteria andHospitalIdEqualTo(Long value) { + addCriterion("hospital_id =", value, "hospitalId"); + return (Criteria) this; + } + + public Criteria andHospitalIdNotEqualTo(Long value) { + addCriterion("hospital_id <>", value, "hospitalId"); + return (Criteria) this; + } + + public Criteria andHospitalIdGreaterThan(Long value) { + addCriterion("hospital_id >", value, "hospitalId"); + return (Criteria) this; + } + + public Criteria andHospitalIdGreaterThanOrEqualTo(Long value) { + addCriterion("hospital_id >=", value, "hospitalId"); + return (Criteria) this; + } + + public Criteria andHospitalIdLessThan(Long value) { + addCriterion("hospital_id <", value, "hospitalId"); + return (Criteria) this; + } + + public Criteria andHospitalIdLessThanOrEqualTo(Long value) { + addCriterion("hospital_id <=", value, "hospitalId"); + return (Criteria) this; + } + + public Criteria andHospitalIdIn(List values) { + addCriterion("hospital_id in", values, "hospitalId"); + return (Criteria) this; + } + + public Criteria andHospitalIdNotIn(List values) { + addCriterion("hospital_id not in", values, "hospitalId"); + return (Criteria) this; + } + + public Criteria andHospitalIdBetween(Long value1, Long value2) { + addCriterion("hospital_id between", value1, value2, "hospitalId"); + return (Criteria) this; + } + + public Criteria andHospitalIdNotBetween(Long value1, Long value2) { + addCriterion("hospital_id not between", value1, value2, "hospitalId"); + return (Criteria) this; + } + + public Criteria andFillTypeIsNull() { + addCriterion("fill_type is null"); + return (Criteria) this; + } + + public Criteria andFillTypeIsNotNull() { + addCriterion("fill_type is not null"); + return (Criteria) this; + } + + public Criteria andFillTypeEqualTo(Byte value) { + addCriterion("fill_type =", value, "fillType"); + return (Criteria) this; + } + + public Criteria andFillTypeNotEqualTo(Byte value) { + addCriterion("fill_type <>", value, "fillType"); + return (Criteria) this; + } + + public Criteria andFillTypeGreaterThan(Byte value) { + addCriterion("fill_type >", value, "fillType"); + return (Criteria) this; + } + + public Criteria andFillTypeGreaterThanOrEqualTo(Byte value) { + addCriterion("fill_type >=", value, "fillType"); + return (Criteria) this; + } + + public Criteria andFillTypeLessThan(Byte value) { + addCriterion("fill_type <", value, "fillType"); + return (Criteria) this; + } + + public Criteria andFillTypeLessThanOrEqualTo(Byte value) { + addCriterion("fill_type <=", value, "fillType"); + return (Criteria) this; + } + + public Criteria andFillTypeIn(List values) { + addCriterion("fill_type in", values, "fillType"); + return (Criteria) this; + } + + public Criteria andFillTypeNotIn(List values) { + addCriterion("fill_type not in", values, "fillType"); + return (Criteria) this; + } + + public Criteria andFillTypeBetween(Byte value1, Byte value2) { + addCriterion("fill_type between", value1, value2, "fillType"); + return (Criteria) this; + } + + public Criteria andFillTypeNotBetween(Byte value1, Byte value2) { + addCriterion("fill_type not between", value1, value2, "fillType"); + 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 andOperatorIsNull() { + addCriterion("operator is null"); + return (Criteria) this; + } + + public Criteria andOperatorIsNotNull() { + addCriterion("operator is not null"); + return (Criteria) this; + } + + public Criteria andOperatorEqualTo(Long value) { + addCriterion("operator =", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotEqualTo(Long value) { + addCriterion("operator <>", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorGreaterThan(Long value) { + addCriterion("operator >", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorGreaterThanOrEqualTo(Long value) { + addCriterion("operator >=", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorLessThan(Long value) { + addCriterion("operator <", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorLessThanOrEqualTo(Long value) { + addCriterion("operator <=", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorIn(List values) { + addCriterion("operator in", values, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotIn(List values) { + addCriterion("operator not in", values, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorBetween(Long value1, Long value2) { + addCriterion("operator between", value1, value2, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotBetween(Long value1, Long value2) { + addCriterion("operator not between", value1, value2, "operator"); + 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/tcm/src/main/java/com/ccsens/tcm/bean/po/QuestionOcr.java b/tcm/src/main/java/com/ccsens/tcm/bean/po/QuestionOcr.java index 821eaa44..6d7eb0db 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/po/QuestionOcr.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/po/QuestionOcr.java @@ -10,7 +10,7 @@ public class QuestionOcr implements Serializable { private Integer sort; - private Long hospital; + private Long hospitalId; private String start; @@ -52,12 +52,12 @@ public class QuestionOcr implements Serializable { this.sort = sort; } - public Long getHospital() { - return hospital; + public Long getHospitalId() { + return hospitalId; } - public void setHospital(Long hospital) { - this.hospital = hospital; + public void setHospitalId(Long hospitalId) { + this.hospitalId = hospitalId; } public String getStart() { @@ -125,7 +125,7 @@ public class QuestionOcr implements Serializable { sb.append(", id=").append(id); sb.append(", code=").append(code); sb.append(", sort=").append(sort); - sb.append(", hospital=").append(hospital); + sb.append(", hospitalId=").append(hospitalId); sb.append(", start=").append(start); sb.append(", end=").append(end); sb.append(", remark=").append(remark); diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/po/QuestionOcrExample.java b/tcm/src/main/java/com/ccsens/tcm/bean/po/QuestionOcrExample.java index d5383b79..99f9e6d8 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/po/QuestionOcrExample.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/po/QuestionOcrExample.java @@ -295,63 +295,63 @@ public class QuestionOcrExample { return (Criteria) this; } - public Criteria andHospitalIsNull() { - addCriterion("hospital is null"); + public Criteria andHospitalIdIsNull() { + addCriterion("hospital_id is null"); return (Criteria) this; } - public Criteria andHospitalIsNotNull() { - addCriterion("hospital is not null"); + public Criteria andHospitalIdIsNotNull() { + addCriterion("hospital_id is not null"); return (Criteria) this; } - public Criteria andHospitalEqualTo(Long value) { - addCriterion("hospital =", value, "hospital"); + public Criteria andHospitalIdEqualTo(Long value) { + addCriterion("hospital_id =", value, "hospitalId"); return (Criteria) this; } - public Criteria andHospitalNotEqualTo(Long value) { - addCriterion("hospital <>", value, "hospital"); + public Criteria andHospitalIdNotEqualTo(Long value) { + addCriterion("hospital_id <>", value, "hospitalId"); return (Criteria) this; } - public Criteria andHospitalGreaterThan(Long value) { - addCriterion("hospital >", value, "hospital"); + public Criteria andHospitalIdGreaterThan(Long value) { + addCriterion("hospital_id >", value, "hospitalId"); return (Criteria) this; } - public Criteria andHospitalGreaterThanOrEqualTo(Long value) { - addCriterion("hospital >=", value, "hospital"); + public Criteria andHospitalIdGreaterThanOrEqualTo(Long value) { + addCriterion("hospital_id >=", value, "hospitalId"); return (Criteria) this; } - public Criteria andHospitalLessThan(Long value) { - addCriterion("hospital <", value, "hospital"); + public Criteria andHospitalIdLessThan(Long value) { + addCriterion("hospital_id <", value, "hospitalId"); return (Criteria) this; } - public Criteria andHospitalLessThanOrEqualTo(Long value) { - addCriterion("hospital <=", value, "hospital"); + public Criteria andHospitalIdLessThanOrEqualTo(Long value) { + addCriterion("hospital_id <=", value, "hospitalId"); return (Criteria) this; } - public Criteria andHospitalIn(List values) { - addCriterion("hospital in", values, "hospital"); + public Criteria andHospitalIdIn(List values) { + addCriterion("hospital_id in", values, "hospitalId"); return (Criteria) this; } - public Criteria andHospitalNotIn(List values) { - addCriterion("hospital not in", values, "hospital"); + public Criteria andHospitalIdNotIn(List values) { + addCriterion("hospital_id not in", values, "hospitalId"); return (Criteria) this; } - public Criteria andHospitalBetween(Long value1, Long value2) { - addCriterion("hospital between", value1, value2, "hospital"); + public Criteria andHospitalIdBetween(Long value1, Long value2) { + addCriterion("hospital_id between", value1, value2, "hospitalId"); return (Criteria) this; } - public Criteria andHospitalNotBetween(Long value1, Long value2) { - addCriterion("hospital not between", value1, value2, "hospital"); + public Criteria andHospitalIdNotBetween(Long value1, Long value2) { + addCriterion("hospital_id not between", value1, value2, "hospitalId"); return (Criteria) this; } diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/po/QuestionRecordTime.java b/tcm/src/main/java/com/ccsens/tcm/bean/po/QuestionRecordTime.java new file mode 100644 index 00000000..53707eb6 --- /dev/null +++ b/tcm/src/main/java/com/ccsens/tcm/bean/po/QuestionRecordTime.java @@ -0,0 +1,117 @@ +package com.ccsens.tcm.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class QuestionRecordTime implements Serializable { + private Long id; + + private String code; + + private Integer recodeTime; + + private Long hospitalId; + + private String remark; + + private Long operator; + + 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 String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code == null ? null : code.trim(); + } + + public Integer getRecodeTime() { + return recodeTime; + } + + public void setRecodeTime(Integer recodeTime) { + this.recodeTime = recodeTime; + } + + public Long getHospitalId() { + return hospitalId; + } + + public void setHospitalId(Long hospitalId) { + this.hospitalId = hospitalId; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark == null ? null : remark.trim(); + } + + public Long getOperator() { + return operator; + } + + public void setOperator(Long operator) { + this.operator = operator; + } + + 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(", code=").append(code); + sb.append(", recodeTime=").append(recodeTime); + sb.append(", hospitalId=").append(hospitalId); + sb.append(", remark=").append(remark); + sb.append(", operator=").append(operator); + 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/tcm/src/main/java/com/ccsens/tcm/bean/po/QuestionRecordTimeExample.java b/tcm/src/main/java/com/ccsens/tcm/bean/po/QuestionRecordTimeExample.java new file mode 100644 index 00000000..42e4ca87 --- /dev/null +++ b/tcm/src/main/java/com/ccsens/tcm/bean/po/QuestionRecordTimeExample.java @@ -0,0 +1,761 @@ +package com.ccsens.tcm.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class QuestionRecordTimeExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public QuestionRecordTimeExample() { + 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 andCodeIsNull() { + addCriterion("code is null"); + return (Criteria) this; + } + + public Criteria andCodeIsNotNull() { + addCriterion("code is not null"); + return (Criteria) this; + } + + public Criteria andCodeEqualTo(String value) { + addCriterion("code =", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotEqualTo(String value) { + addCriterion("code <>", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeGreaterThan(String value) { + addCriterion("code >", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeGreaterThanOrEqualTo(String value) { + addCriterion("code >=", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLessThan(String value) { + addCriterion("code <", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLessThanOrEqualTo(String value) { + addCriterion("code <=", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLike(String value) { + addCriterion("code like", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotLike(String value) { + addCriterion("code not like", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeIn(List values) { + addCriterion("code in", values, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotIn(List values) { + addCriterion("code not in", values, "code"); + return (Criteria) this; + } + + public Criteria andCodeBetween(String value1, String value2) { + addCriterion("code between", value1, value2, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotBetween(String value1, String value2) { + addCriterion("code not between", value1, value2, "code"); + return (Criteria) this; + } + + public Criteria andRecodeTimeIsNull() { + addCriterion("recode_time is null"); + return (Criteria) this; + } + + public Criteria andRecodeTimeIsNotNull() { + addCriterion("recode_time is not null"); + return (Criteria) this; + } + + public Criteria andRecodeTimeEqualTo(Integer value) { + addCriterion("recode_time =", value, "recodeTime"); + return (Criteria) this; + } + + public Criteria andRecodeTimeNotEqualTo(Integer value) { + addCriterion("recode_time <>", value, "recodeTime"); + return (Criteria) this; + } + + public Criteria andRecodeTimeGreaterThan(Integer value) { + addCriterion("recode_time >", value, "recodeTime"); + return (Criteria) this; + } + + public Criteria andRecodeTimeGreaterThanOrEqualTo(Integer value) { + addCriterion("recode_time >=", value, "recodeTime"); + return (Criteria) this; + } + + public Criteria andRecodeTimeLessThan(Integer value) { + addCriterion("recode_time <", value, "recodeTime"); + return (Criteria) this; + } + + public Criteria andRecodeTimeLessThanOrEqualTo(Integer value) { + addCriterion("recode_time <=", value, "recodeTime"); + return (Criteria) this; + } + + public Criteria andRecodeTimeIn(List values) { + addCriterion("recode_time in", values, "recodeTime"); + return (Criteria) this; + } + + public Criteria andRecodeTimeNotIn(List values) { + addCriterion("recode_time not in", values, "recodeTime"); + return (Criteria) this; + } + + public Criteria andRecodeTimeBetween(Integer value1, Integer value2) { + addCriterion("recode_time between", value1, value2, "recodeTime"); + return (Criteria) this; + } + + public Criteria andRecodeTimeNotBetween(Integer value1, Integer value2) { + addCriterion("recode_time not between", value1, value2, "recodeTime"); + return (Criteria) this; + } + + public Criteria andHospitalIdIsNull() { + addCriterion("hospital_id is null"); + return (Criteria) this; + } + + public Criteria andHospitalIdIsNotNull() { + addCriterion("hospital_id is not null"); + return (Criteria) this; + } + + public Criteria andHospitalIdEqualTo(Long value) { + addCriterion("hospital_id =", value, "hospitalId"); + return (Criteria) this; + } + + public Criteria andHospitalIdNotEqualTo(Long value) { + addCriterion("hospital_id <>", value, "hospitalId"); + return (Criteria) this; + } + + public Criteria andHospitalIdGreaterThan(Long value) { + addCriterion("hospital_id >", value, "hospitalId"); + return (Criteria) this; + } + + public Criteria andHospitalIdGreaterThanOrEqualTo(Long value) { + addCriterion("hospital_id >=", value, "hospitalId"); + return (Criteria) this; + } + + public Criteria andHospitalIdLessThan(Long value) { + addCriterion("hospital_id <", value, "hospitalId"); + return (Criteria) this; + } + + public Criteria andHospitalIdLessThanOrEqualTo(Long value) { + addCriterion("hospital_id <=", value, "hospitalId"); + return (Criteria) this; + } + + public Criteria andHospitalIdIn(List values) { + addCriterion("hospital_id in", values, "hospitalId"); + return (Criteria) this; + } + + public Criteria andHospitalIdNotIn(List values) { + addCriterion("hospital_id not in", values, "hospitalId"); + return (Criteria) this; + } + + public Criteria andHospitalIdBetween(Long value1, Long value2) { + addCriterion("hospital_id between", value1, value2, "hospitalId"); + return (Criteria) this; + } + + public Criteria andHospitalIdNotBetween(Long value1, Long value2) { + addCriterion("hospital_id not between", value1, value2, "hospitalId"); + 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 andOperatorIsNull() { + addCriterion("operator is null"); + return (Criteria) this; + } + + public Criteria andOperatorIsNotNull() { + addCriterion("operator is not null"); + return (Criteria) this; + } + + public Criteria andOperatorEqualTo(Long value) { + addCriterion("operator =", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotEqualTo(Long value) { + addCriterion("operator <>", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorGreaterThan(Long value) { + addCriterion("operator >", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorGreaterThanOrEqualTo(Long value) { + addCriterion("operator >=", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorLessThan(Long value) { + addCriterion("operator <", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorLessThanOrEqualTo(Long value) { + addCriterion("operator <=", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorIn(List values) { + addCriterion("operator in", values, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotIn(List values) { + addCriterion("operator not in", values, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorBetween(Long value1, Long value2) { + addCriterion("operator between", value1, value2, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotBetween(Long value1, Long value2) { + addCriterion("operator not between", value1, value2, "operator"); + 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/tcm/src/main/java/com/ccsens/tcm/bean/vo/QuestionVo.java b/tcm/src/main/java/com/ccsens/tcm/bean/vo/QuestionVo.java index 30e49b09..e552ee1c 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/vo/QuestionVo.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/vo/QuestionVo.java @@ -1,5 +1,7 @@ package com.ccsens.tcm.bean.vo; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -88,7 +90,7 @@ public class QuestionVo { } @Data @ApiModel("所有试题类型的信息") - public static class subjectLists{ + public static class SubjectLists { @ApiModelProperty("id") private Long id; @ApiModelProperty("code") @@ -96,7 +98,7 @@ public class QuestionVo { @ApiModelProperty("名称") private String name; @ApiModelProperty("子类型") - private List optionVos; + private List optionVos; } @Data @ApiModel("患者信息的试题类型") @@ -146,6 +148,8 @@ public class QuestionVo { private String units; @ApiModelProperty("类型 1单行文本,2多行文本,3单选,4多选,5下拉菜单,6日期,7图片(文件),8单选+其他,9多选+其他,10下拉+其他,11多选+其他+说明,12单选+关联其他内容 13数字类型") private byte type; + @ApiModelProperty("填写状态 0:非必填 1:必填") + private byte fillType; @ApiModelProperty("参考范围 下限") private BigDecimal referenceLower; @ApiModelProperty("参考范围 上限") @@ -154,13 +158,22 @@ public class QuestionVo { private String remark; @ApiModelProperty("答题记录id") private Long recordId; - @ApiModelProperty("答案") + @ApiModelProperty("默认答案") private String answer; + @ApiModelProperty("答案数组,不包含默认答案") + private List domList; @ApiModelProperty("说明") private String explains; @ApiModelProperty("选项信息") private List optionVos; + public String getAnswer() { + if (StrUtil.isEmpty(answer) && CollectionUtil.isNotEmpty(domList)) { + this.answer = domList.get(0); + domList.remove(0); + } + return this.answer; + } } @Data diff --git a/tcm/src/main/java/com/ccsens/tcm/persist/dao/QuestionDao.java b/tcm/src/main/java/com/ccsens/tcm/persist/dao/QuestionDao.java index 0a919924..99536266 100644 --- a/tcm/src/main/java/com/ccsens/tcm/persist/dao/QuestionDao.java +++ b/tcm/src/main/java/com/ccsens/tcm/persist/dao/QuestionDao.java @@ -39,9 +39,10 @@ public interface QuestionDao extends QuestionMapper { * @param code 试题code * @param patientId 患者id * @param nums 采集次数 + * @param hospitalId 医院ID * @return 返回所有试题和答题记录 */ - List getQuestionByCodeAndPatientId(@Param("code")String code, @Param("patientId")Long patientId, @Param("nums")Integer nums); + List getQuestionByCodeAndPatientId(@Param("code") String code, @Param("patientId") Long patientId, @Param("nums") Integer nums, @Param("hospitalId") Long hospitalId); /** * 通过选项id和采集次数,查询选项关联试题信息和患者答题记录 * @param optionId 试题code @@ -55,7 +56,7 @@ public interface QuestionDao extends QuestionMapper { * 查询所有的试题的相关信息 * @return */ - List queryQuestion(); + List queryQuestion(); - List queryQuestion1(); + List queryQuestion1(); } diff --git a/tcm/src/main/java/com/ccsens/tcm/persist/dao/QuestionHospitalDao.java b/tcm/src/main/java/com/ccsens/tcm/persist/dao/QuestionHospitalDao.java new file mode 100644 index 00000000..2caecca5 --- /dev/null +++ b/tcm/src/main/java/com/ccsens/tcm/persist/dao/QuestionHospitalDao.java @@ -0,0 +1,17 @@ +package com.ccsens.tcm.persist.dao; + +import com.ccsens.tcm.bean.po.QuestionHospital; +import com.ccsens.tcm.persist.mapper.QuestionHospitalMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface QuestionHospitalDao extends QuestionHospitalMapper { + + /** + * 查询ID + * @param type 类型 0:项目 1:医院 null:全部 + * @return 医院ID + */ + List queryAll(@Param("type") Byte type); +} diff --git a/tcm/src/main/java/com/ccsens/tcm/persist/mapper/QuestionHospitalMapper.java b/tcm/src/main/java/com/ccsens/tcm/persist/mapper/QuestionHospitalMapper.java new file mode 100644 index 00000000..17d9e5b5 --- /dev/null +++ b/tcm/src/main/java/com/ccsens/tcm/persist/mapper/QuestionHospitalMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.tcm.persist.mapper; + +import com.ccsens.tcm.bean.po.QuestionHospital; +import com.ccsens.tcm.bean.po.QuestionHospitalExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface QuestionHospitalMapper { + long countByExample(QuestionHospitalExample example); + + int deleteByExample(QuestionHospitalExample example); + + int deleteByPrimaryKey(Long id); + + int insert(QuestionHospital record); + + int insertSelective(QuestionHospital record); + + List selectByExample(QuestionHospitalExample example); + + QuestionHospital selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") QuestionHospital record, @Param("example") QuestionHospitalExample example); + + int updateByExample(@Param("record") QuestionHospital record, @Param("example") QuestionHospitalExample example); + + int updateByPrimaryKeySelective(QuestionHospital record); + + int updateByPrimaryKey(QuestionHospital record); +} \ No newline at end of file diff --git a/tcm/src/main/java/com/ccsens/tcm/persist/mapper/QuestionRecordTimeMapper.java b/tcm/src/main/java/com/ccsens/tcm/persist/mapper/QuestionRecordTimeMapper.java new file mode 100644 index 00000000..09f531c8 --- /dev/null +++ b/tcm/src/main/java/com/ccsens/tcm/persist/mapper/QuestionRecordTimeMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.tcm.persist.mapper; + +import com.ccsens.tcm.bean.po.QuestionRecordTime; +import com.ccsens.tcm.bean.po.QuestionRecordTimeExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface QuestionRecordTimeMapper { + long countByExample(QuestionRecordTimeExample example); + + int deleteByExample(QuestionRecordTimeExample example); + + int deleteByPrimaryKey(Long id); + + int insert(QuestionRecordTime record); + + int insertSelective(QuestionRecordTime record); + + List selectByExample(QuestionRecordTimeExample example); + + QuestionRecordTime selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") QuestionRecordTime record, @Param("example") QuestionRecordTimeExample example); + + int updateByExample(@Param("record") QuestionRecordTime record, @Param("example") QuestionRecordTimeExample example); + + int updateByPrimaryKeySelective(QuestionRecordTime record); + + int updateByPrimaryKey(QuestionRecordTime record); +} \ No newline at end of file diff --git a/tcm/src/main/java/com/ccsens/tcm/service/IQuestionService.java b/tcm/src/main/java/com/ccsens/tcm/service/IQuestionService.java index bb4bdb92..c56aa831 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/IQuestionService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/IQuestionService.java @@ -16,5 +16,5 @@ public interface IQuestionService { */ List getQuestionAndAnswer(QuestionDto.QueryQuestionAndAnswer param); - List queryQuestion(); + List queryQuestion(); } diff --git a/tcm/src/main/java/com/ccsens/tcm/service/ImportService.java b/tcm/src/main/java/com/ccsens/tcm/service/ImportService.java index adafb7fe..4fc45e74 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/ImportService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/ImportService.java @@ -7,12 +7,14 @@ import com.ccsens.tcm.bean.dto.CodeVo; import com.ccsens.tcm.bean.po.*; import com.ccsens.tcm.bean.vo.QuestionVo; import com.ccsens.tcm.persist.dao.QuestionDao; +import com.ccsens.tcm.persist.dao.QuestionHospitalDao; import com.ccsens.tcm.persist.dao.QuestionOptionDao; import com.ccsens.tcm.persist.dao.ReportCodeDao; +import com.ccsens.tcm.persist.mapper.HospitalMapper; +import com.ccsens.tcm.persist.mapper.QuestionRecordTimeMapper; import com.ccsens.tcm.uitl.Constant; -import com.ccsens.util.PoiUtil; -import com.ccsens.util.RedisUtil; -import com.ccsens.util.StringUtil; +import com.ccsens.util.*; +import com.ccsens.util.exception.BaseException; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -40,6 +42,14 @@ public class ImportService implements IImportService { private QuestionDao questionDao; @Resource private QuestionOptionDao questionOptionDao; + @Resource + private QuestionRecordTimeMapper questionRecordTimeMapper; + @Resource + private QuestionHospitalDao questionHospitalDao; + @Resource + private HospitalMapper hospitalMapper; + + @Resource private RedisUtil redisUtil; @@ -88,6 +98,19 @@ public class ImportService implements IImportService { Long questionId = null; Long optionQuestionId = null; Long optionId = null; + HospitalExample hospitalExample = new HospitalExample(); + hospitalExample.createCriteria().andHospitalTypeEqualTo((byte)1); + List hospitals = hospitalMapper.selectByExample(hospitalExample); + if (CollectionUtil.isEmpty(hospitals)) { + throw new BaseException(CodeEnum.HOSPITAL_NOT_FOUND); + } + // 医院 + Map hospitalMap = new HashMap<>(); + hospitals.forEach(hospital -> { + hospitalMap.put(hospital.getCode(), hospital.getId()); + }); + + for(Object[] objs : questions) { if (objs == null || objs.length < 4 || StringUtils.isEmpty(objs[2])) { log.info("数据不足,跳转下一行"); @@ -98,7 +121,7 @@ public class ImportService implements IImportService { String type = String.valueOf(objs[0]); switch (type) { case "题目" : - Question question = initQuestion(objs, code, sort,null); + Question question = initQuestion(objs, code, sort,null, hospitalMap); questionId = question.getId(); questionList.add(question); break; @@ -114,7 +137,7 @@ public class ImportService implements IImportService { if (optionList.isEmpty()) { break; } - Question relevanceQuestion = initQuestion(objs, code, sort, optionId); + Question relevanceQuestion = initQuestion(objs, code, sort, optionId, hospitalMap); questionList.add(relevanceQuestion); optionQuestionId = relevanceQuestion.getId(); break; @@ -181,6 +204,11 @@ public class ImportService implements IImportService { ReportCode report; if (!CollectionUtils.isEmpty(list)) { report = list.get(0); + QuestionRecordTimeExample timeExample = new QuestionRecordTimeExample(); + timeExample.createCriteria().andCodeEqualTo(report.getCode()); + QuestionRecordTime time = new QuestionRecordTime(); + time.setRecStatus(WebConstant.REC_STATUS.Deleted.value); + questionRecordTimeMapper.updateByExampleSelective(time, timeExample); } else { report = new ReportCode(); report.setId(snowflake.nextId()); @@ -188,7 +216,25 @@ public class ImportService implements IImportService { report.setCode((String) objs[0]); report.setName((String) objs[1]); report.setParentCode(objs.length > 2 && !StringUtils.isEmpty(objs[2]) ? (String) objs[2] : Constant.STRING_DEFAULT); - report.setReportType(objs.length > 3 && StringUtil.checkNum(String.valueOf(objs[3]),false)? Byte.parseByte((String) objs[3]) : Constant.NUMBER_DEFAULT); + if (objs.length > 3 && objs[3] != null && ((String)objs[3]).length() > 0) { +// report.setReportType(objs.length > 3 && StringUtil.checkNum(String.valueOf(objs[3]),false)? Byte.parseByte((String) objs[3]) : Constant.NUMBER_DEFAULT); + String types = (String)objs[3]; + String[] split = types.split("[,,]"); + + for (String type: split) { + + if (StringUtil.checkNum(type, false)) { + QuestionRecordTime time = new QuestionRecordTime(); + time.setId(snowflake.nextId()); + time.setCode(report.getCode()); + time.setRecodeTime(Integer.parseInt(type)); + questionRecordTimeMapper.insertSelective(time); + } + } + + + } + report.setMust(objs.length > 4 && StringUtil.checkNum(String.valueOf(objs[4]), false) ? Byte.parseByte((String) (objs[4])) : Constant.NUMBER_DEFAULT); report.setSort(objs.length > 5 && StringUtil.checkNum(String.valueOf(objs[5]), false) ? Integer.parseInt((String) (objs[5])) : Constant.NUMBER_DEFAULT_SORT); report.setLevel(objs.length > 6 && StringUtil.checkNum(String.valueOf(objs[6]), false) ? Byte.parseByte((String)(objs[6])) : Constant.NUMBER_DEFAULT_SORT); @@ -201,9 +247,10 @@ public class ImportService implements IImportService { * @param objs 表格内读取的数据 * @param evaluationCode 试题类型 * @param sort 排序 + * @param hospitalMap * @return 返回试题 */ - private Question initQuestion(Object[] objs, String evaluationCode, int sort,Long optionId) { + private Question initQuestion(Object[] objs, String evaluationCode, int sort, Long optionId, Map hospitalMap) { QuestionExample example = new QuestionExample(); example.createCriteria().andCodeEqualTo(evaluationCode).andSortEqualTo(sort); List questions = questionDao.selectByExample(example); @@ -235,6 +282,28 @@ public class ImportService implements IImportService { } } question.setRelevanceOptionId(optionId == null ? 0 : optionId); + // 设置关联那个医院 + List hospitalIds = null; + int hospitalIndex = 10; + if (objs.length > hospitalIndex && !StringUtils.isEmpty(objs[hospitalIndex])) { + hospitalMap.forEach((key, value)->{ + hospitalIds.add(value); + + }); + } else { + String[] codes = ((String) objs[hospitalIndex]).split("[,,]"); + for (String code:codes) { + hospitalIds.add(hospitalMap.get(code)); + } + } + + hospitalIds.forEach(id->{ + QuestionHospital questionHospital = new QuestionHospital(); + questionHospital.setId(snowflake.nextId()); + questionHospital.setQuestionId(question.getId()); + questionHospital.setHospitalId(id); + questionHospitalDao.insert(questionHospital); + }); log.info("导入试题:{}", question); return question; diff --git a/tcm/src/main/java/com/ccsens/tcm/service/QuestionService.java b/tcm/src/main/java/com/ccsens/tcm/service/QuestionService.java index c0b7f1c5..7d97ad29 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/QuestionService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/QuestionService.java @@ -2,11 +2,14 @@ package com.ccsens.tcm.service; import cn.hutool.core.collection.CollectionUtil; import com.ccsens.tcm.bean.dto.QuestionDto; -import com.ccsens.tcm.bean.po.QuestionOption; +import com.ccsens.tcm.bean.po.PatientInformation; import com.ccsens.tcm.bean.vo.QuestionVo; import com.ccsens.tcm.persist.dao.QuestionDao; import com.ccsens.tcm.persist.dao.ReportCodeDao; +import com.ccsens.tcm.persist.mapper.PatientInformationMapper; +import com.ccsens.util.CodeEnum; import com.ccsens.util.RedisUtil; +import com.ccsens.util.exception.BaseException; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -25,9 +28,18 @@ public class QuestionService implements IQuestionService{ private ReportCodeDao reportCodeDao; @Resource private QuestionDao questionDao; + @Resource + private PatientInformationMapper patientInformationMapper; + @Override public List getQuestionAndAnswer(QuestionDto.QueryQuestionAndAnswer param) { + // 查询患者录入人ID + PatientInformation patient = patientInformationMapper.selectByPrimaryKey(param.getId()); + if (patient == null) { + throw new BaseException(CodeEnum.PARAM_ERROR); + } + List patientCodeList = reportCodeDao.selectCodeByCode(param.getCode(),param.getNums()); if(CollectionUtil.isNotEmpty(patientCodeList)){ //循环一级code @@ -37,7 +49,7 @@ public class QuestionService implements IQuestionService{ // param.setNums(0); // } //根据一级code查询试题及答案 - List patientQuestionNumList = questionDao.getQuestionByCodeAndPatientId(patientCode.getCode(),param.getId(),param.getNums()); + List patientQuestionNumList = questionDao.getQuestionByCodeAndPatientId(patientCode.getCode(),param.getId(),param.getNums(), patient.getHospitalId()); //查询选项关联的试题及答案 if(CollectionUtil.isNotEmpty(patientQuestionNumList)){ patientQuestionNumList.forEach(question -> { @@ -53,7 +65,7 @@ public class QuestionService implements IQuestionService{ if(CollectionUtil.isNotEmpty(patientCode.getSubReportCodes())){ patientCode.getSubReportCodes().forEach(subReportCode -> { //查询二级code下的试题和答案 - List subpatientQuestionNumList = questionDao.getQuestionByCodeAndPatientId(subReportCode.getCode(),param.getId(),param.getNums()); + List subpatientQuestionNumList = questionDao.getQuestionByCodeAndPatientId(subReportCode.getCode(),param.getId(),param.getNums(), patient.getHospitalId()); //查询选项关联的试题及答案 if(CollectionUtil.isNotEmpty(subpatientQuestionNumList)){ subpatientQuestionNumList.forEach(question -> { @@ -72,12 +84,12 @@ public class QuestionService implements IQuestionService{ } @Override - public List queryQuestion() { + public List queryQuestion() { // - List subjectLists= questionDao.queryQuestion(); + List subjectLists= questionDao.queryQuestion(); - List subjectLists1= questionDao.queryQuestion1(); + List subjectLists1= questionDao.queryQuestion1(); if(subjectLists1.size()>0){ subjectLists1.forEach(subject1 -> { for (int i = 0; i < subjectLists.size(); i++) { diff --git a/tcm/src/main/resources/application.yml b/tcm/src/main/resources/application.yml index 4ecd13fd..33b76558 100644 --- a/tcm/src/main/resources/application.yml +++ b/tcm/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: dev - include: common, util-dev + active: green + include: common, util-green diff --git a/tcm/src/main/resources/mapper_dao/QuestionDao.xml b/tcm/src/main/resources/mapper_dao/QuestionDao.xml index 7f2446a3..28a2a991 100644 --- a/tcm/src/main/resources/mapper_dao/QuestionDao.xml +++ b/tcm/src/main/resources/mapper_dao/QuestionDao.xml @@ -113,10 +113,14 @@ + - + + + + @@ -143,6 +147,7 @@ q.type as qtype, q.reference_lower as referenceLower, q.reference_upper as referenceUpper, + q.fillType, q.remark as qremark, o.id as oid, o.sort as osort, @@ -162,17 +167,23 @@ SUBSTRING(r.contents,char_length(o.submit_value)+2),null ) as otherInformation FROM - t_question q + + ( + select q.*, h.fill_type as fillType + from t_question q, t_question_hospital h + WHERE + q.id = h.question_id + q.`code` = #{code} + h.hospital_id = #{hospitalId} + and q.relevance_option_id = 0 + and q.rec_status = 0 + and h.rec_status = 0 + ) q LEFT JOIN t_question_option o on q.id = o.question_id and o.rec_status = 0 LEFT JOIN t_patient_record r on r.test_questions_id = q.id and r.rec_status = 0 and r.patient_id = #{patientId} and collect_time = #{nums} - WHERE - q.relevance_option_id = 0 - and q.rec_status = 0 - and q.`code` = #{code} - ) qq left join ( SELECT test_questions_id, @@ -251,15 +262,15 @@ )a ORDER BY a.qsort,a.osort,a.choose DESC,-a.otherInformation DESC - + - + - + @@ -287,11 +298,11 @@ AND trc.rec_status =0 order by trc.sort,trc1.sort,tq.sort - + - + diff --git a/tcm/src/main/resources/mapper_dao/QuestionHospitalDao.xml b/tcm/src/main/resources/mapper_dao/QuestionHospitalDao.xml new file mode 100644 index 00000000..27b59fb7 --- /dev/null +++ b/tcm/src/main/resources/mapper_dao/QuestionHospitalDao.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/tcm/src/main/resources/mapper_dao/QuestionOcrDao.xml b/tcm/src/main/resources/mapper_dao/QuestionOcrDao.xml index 770dc5ff..b928ace0 100644 --- a/tcm/src/main/resources/mapper_dao/QuestionOcrDao.xml +++ b/tcm/src/main/resources/mapper_dao/QuestionOcrDao.xml @@ -18,7 +18,7 @@ o.CODE = q.CODE AND o.sort = q.sort AND o.CODE = #{code} - AND o.hospital = #{hospitalId} + AND o.hospital_id = #{hospitalId} AND o.rec_status = 0 AND q.rec_status = 0 diff --git a/tcm/src/main/resources/mapper_dao/ReportCodeDao.xml b/tcm/src/main/resources/mapper_dao/ReportCodeDao.xml index 7d68c55b..0283429c 100644 --- a/tcm/src/main/resources/mapper_dao/ReportCodeDao.xml +++ b/tcm/src/main/resources/mapper_dao/ReportCodeDao.xml @@ -128,22 +128,31 @@ c2.report_type as sReportType, c2.record_type as sRecordType FROM - t_report_code c1 + ( + select c.* from t_report_code c, t_question_record_time t + WHERE + c.code = t.code + and c.`level` = 1 + + and (c.`code` = #{code}) + + and t.rec_status = 0 + and c.rec_status = 0 + ) c1 LEFT JOIN ( SELECT - * + c.* FROM - t_report_code + t_report_code c, + t_question_record_time t WHERE - `level` = 2 - and rec_status = 0 + c.code = t.code + and t.recode_time = #{nums} + and c.`level` = 2 + and crec_status = 0 + and t.rec_status = 0 ) c2 on c1.`code` = c2.parent_code - WHERE - c1.`level` = 1 - and c1.rec_status = 0 - - and (c1.`code` = #{code}) - + and (c1.`report_type`in (0,1)) diff --git a/tcm/src/main/resources/mapper_raw/HospitalMapper.xml b/tcm/src/main/resources/mapper_raw/HospitalMapper.xml index abf5142b..5c2d0db1 100644 --- a/tcm/src/main/resources/mapper_raw/HospitalMapper.xml +++ b/tcm/src/main/resources/mapper_raw/HospitalMapper.xml @@ -3,12 +3,14 @@ + + @@ -69,7 +71,7 @@ - id, name, operator, created_at, updated_at, rec_status, project_id + id, code, name, operator, created_at, updated_at, rec_status, project_id, hospital_type @@ -170,6 +186,9 @@ id = #{record.id,jdbcType=BIGINT}, + + code = #{record.code,jdbcType=VARCHAR}, + name = #{record.name,jdbcType=VARCHAR}, @@ -188,6 +207,9 @@ project_id = #{record.projectId,jdbcType=BIGINT}, + + hospital_type = #{record.hospitalType,jdbcType=TINYINT}, + @@ -196,12 +218,14 @@ update t_hospital set id = #{record.id,jdbcType=BIGINT}, + code = #{record.code,jdbcType=VARCHAR}, name = #{record.name,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}, - project_id = #{record.projectId,jdbcType=BIGINT} + project_id = #{record.projectId,jdbcType=BIGINT}, + hospital_type = #{record.hospitalType,jdbcType=TINYINT} @@ -209,6 +233,9 @@ update t_hospital + + code = #{code,jdbcType=VARCHAR}, + name = #{name,jdbcType=VARCHAR}, @@ -227,17 +254,22 @@ project_id = #{projectId,jdbcType=BIGINT}, + + hospital_type = #{hospitalType,jdbcType=TINYINT}, + where id = #{id,jdbcType=BIGINT} update t_hospital - set name = #{name,jdbcType=VARCHAR}, + set code = #{code,jdbcType=VARCHAR}, + name = #{name,jdbcType=VARCHAR}, operator = #{operator,jdbcType=BIGINT}, created_at = #{createdAt,jdbcType=TIMESTAMP}, updated_at = #{updatedAt,jdbcType=TIMESTAMP}, rec_status = #{recStatus,jdbcType=TINYINT}, - project_id = #{projectId,jdbcType=BIGINT} + project_id = #{projectId,jdbcType=BIGINT}, + hospital_type = #{hospitalType,jdbcType=TINYINT} where id = #{id,jdbcType=BIGINT} \ No newline at end of file diff --git a/tcm/src/main/resources/mapper_raw/InpatientMapper.xml b/tcm/src/main/resources/mapper_raw/InpatientMapper.xml index 5fb81f59..6e079771 100644 --- a/tcm/src/main/resources/mapper_raw/InpatientMapper.xml +++ b/tcm/src/main/resources/mapper_raw/InpatientMapper.xml @@ -10,6 +10,7 @@ + @@ -70,7 +71,7 @@ - id, name, remarks, collection_num, user_id, created_at, update_at, rec_status + id, name, remarks, collection_num, user_id, created_at, update_at, rec_status, code @@ -198,6 +207,9 @@ rec_status = #{record.recStatus,jdbcType=TINYINT}, + + code = #{record.code,jdbcType=VARCHAR}, + @@ -212,7 +224,8 @@ user_id = #{record.userId,jdbcType=BIGINT}, created_at = #{record.createdAt,jdbcType=TIMESTAMP}, update_at = #{record.updateAt,jdbcType=TIMESTAMP}, - rec_status = #{record.recStatus,jdbcType=TINYINT} + rec_status = #{record.recStatus,jdbcType=TINYINT}, + code = #{record.code,jdbcType=VARCHAR} @@ -241,6 +254,9 @@ rec_status = #{recStatus,jdbcType=TINYINT}, + + code = #{code,jdbcType=VARCHAR}, + where id = #{id,jdbcType=BIGINT} @@ -252,7 +268,8 @@ user_id = #{userId,jdbcType=BIGINT}, created_at = #{createdAt,jdbcType=TIMESTAMP}, update_at = #{updateAt,jdbcType=TIMESTAMP}, - rec_status = #{recStatus,jdbcType=TINYINT} + rec_status = #{recStatus,jdbcType=TINYINT}, + code = #{code,jdbcType=VARCHAR} where id = #{id,jdbcType=BIGINT} \ No newline at end of file diff --git a/tcm/src/main/resources/mapper_raw/QuestionHospitalMapper.xml b/tcm/src/main/resources/mapper_raw/QuestionHospitalMapper.xml new file mode 100644 index 00000000..43c2646e --- /dev/null +++ b/tcm/src/main/resources/mapper_raw/QuestionHospitalMapper.xml @@ -0,0 +1,276 @@ + + + + + + + + + + + + + + + + + + + + + + + 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, question_id, hospital_id, fill_type, remark, operator, created_at, updated_at, + rec_status + + + + + delete from t_question_hospital + where id = #{id,jdbcType=BIGINT} + + + delete from t_question_hospital + + + + + + insert into t_question_hospital (id, question_id, hospital_id, + fill_type, remark, operator, + created_at, updated_at, rec_status + ) + values (#{id,jdbcType=BIGINT}, #{questionId,jdbcType=BIGINT}, #{hospitalId,jdbcType=BIGINT}, + #{fillType,jdbcType=TINYINT}, #{remark,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT}, + #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} + ) + + + insert into t_question_hospital + + + id, + + + question_id, + + + hospital_id, + + + fill_type, + + + remark, + + + operator, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{questionId,jdbcType=BIGINT}, + + + #{hospitalId,jdbcType=BIGINT}, + + + #{fillType,jdbcType=TINYINT}, + + + #{remark,jdbcType=VARCHAR}, + + + #{operator,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_question_hospital + + + id = #{record.id,jdbcType=BIGINT}, + + + question_id = #{record.questionId,jdbcType=BIGINT}, + + + hospital_id = #{record.hospitalId,jdbcType=BIGINT}, + + + fill_type = #{record.fillType,jdbcType=TINYINT}, + + + 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_hospital + set id = #{record.id,jdbcType=BIGINT}, + question_id = #{record.questionId,jdbcType=BIGINT}, + hospital_id = #{record.hospitalId,jdbcType=BIGINT}, + fill_type = #{record.fillType,jdbcType=TINYINT}, + 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_hospital + + + question_id = #{questionId,jdbcType=BIGINT}, + + + hospital_id = #{hospitalId,jdbcType=BIGINT}, + + + fill_type = #{fillType,jdbcType=TINYINT}, + + + 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_hospital + set question_id = #{questionId,jdbcType=BIGINT}, + hospital_id = #{hospitalId,jdbcType=BIGINT}, + fill_type = #{fillType,jdbcType=TINYINT}, + 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/tcm/src/main/resources/mapper_raw/QuestionOcrMapper.xml b/tcm/src/main/resources/mapper_raw/QuestionOcrMapper.xml index 234718b9..990dd775 100644 --- a/tcm/src/main/resources/mapper_raw/QuestionOcrMapper.xml +++ b/tcm/src/main/resources/mapper_raw/QuestionOcrMapper.xml @@ -5,7 +5,7 @@ - + @@ -73,7 +73,8 @@ - id, code, sort, hospital, start, end, remark, operator, created_at, updated_at, rec_status + id, code, sort, hospital_id, start, end, remark, operator, created_at, updated_at, + rec_status + select + + distinct + + + from t_question_record_time + + + + + order by ${orderByClause} + + + + + delete from t_question_record_time + where id = #{id,jdbcType=BIGINT} + + + delete from t_question_record_time + + + + + + insert into t_question_record_time (id, code, recode_time, + hospital_id, remark, operator, + created_at, updated_at, rec_status + ) + values (#{id,jdbcType=BIGINT}, #{code,jdbcType=VARCHAR}, #{recodeTime,jdbcType=INTEGER}, + #{hospitalId,jdbcType=BIGINT}, #{remark,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT}, + #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} + ) + + + insert into t_question_record_time + + + id, + + + code, + + + recode_time, + + + hospital_id, + + + remark, + + + operator, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{code,jdbcType=VARCHAR}, + + + #{recodeTime,jdbcType=INTEGER}, + + + #{hospitalId,jdbcType=BIGINT}, + + + #{remark,jdbcType=VARCHAR}, + + + #{operator,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_question_record_time + + + id = #{record.id,jdbcType=BIGINT}, + + + code = #{record.code,jdbcType=VARCHAR}, + + + recode_time = #{record.recodeTime,jdbcType=INTEGER}, + + + hospital_id = #{record.hospitalId,jdbcType=BIGINT}, + + + 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_record_time + set id = #{record.id,jdbcType=BIGINT}, + code = #{record.code,jdbcType=VARCHAR}, + recode_time = #{record.recodeTime,jdbcType=INTEGER}, + hospital_id = #{record.hospitalId,jdbcType=BIGINT}, + 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_record_time + + + code = #{code,jdbcType=VARCHAR}, + + + recode_time = #{recodeTime,jdbcType=INTEGER}, + + + hospital_id = #{hospitalId,jdbcType=BIGINT}, + + + 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_record_time + set code = #{code,jdbcType=VARCHAR}, + recode_time = #{recodeTime,jdbcType=INTEGER}, + hospital_id = #{hospitalId,jdbcType=BIGINT}, + 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 39531c53..9a3045f6 100644 --- a/util/src/main/java/com/ccsens/util/CodeEnum.java +++ b/util/src/main/java/com/ccsens/util/CodeEnum.java @@ -124,7 +124,7 @@ public enum CodeEnum { NICKNAME_REPEAT(102,"该名字已经存在,请换一个再试",true), NEW_PASSWORD_REPEAT_OLD(103,"新密码不能和旧密码相同",true), - PASSWORD_ERROR(104,"密码错误",true), + PASSWORD_ERROR(104,"账号或密码错误",true), NOT_ACCOUNT(105,"未找到该账号",true), FILE_NOT_FOUND(106,"未找到对应的文件,请检查后操作",true), @@ -196,6 +196,7 @@ public enum CodeEnum { BAOHANJINLI(162,"不能删除包含经理得角色",true), CHONGFUTIJIAO(163,"不要重复提交",true), ZUISHAOCHUANLIANGE(164,"排序最少需要传入两个",true), + HOSPITAL_NOT_FOUND(165,"没有找到医院",true), ; diff --git a/util/src/main/java/com/ccsens/util/PoiUtil.java b/util/src/main/java/com/ccsens/util/PoiUtil.java index 09cabfc6..f005f921 100644 --- a/util/src/main/java/com/ccsens/util/PoiUtil.java +++ b/util/src/main/java/com/ccsens/util/PoiUtil.java @@ -328,9 +328,11 @@ public class PoiUtil { for (int i = 0; i < rows; i++) { Row row = getRow(sheet, i, dataIndex); - if (row == null) { + if (row == null || row.getLastCellNum() <= 0) { continue; } + System.out.println(row); + System.out.println(row.getLastCellNum()); Object[] objects = new Object[row.getLastCellNum()]; if (hasImg && imgMap != null) { for (String key : imgMap.keySet()) {