Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

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;
+    }
 
 }

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();
+    }
+}

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<Criteria> oredCriteria;
+
+    public ProDeliverHistoryRecordExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    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<Criteria> 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<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> 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<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> 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<Long> values) {
+            addCriterion("deliver_id in", values, "deliverId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliverIdNotIn(List<Long> 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<Byte> values) {
+            addCriterion("deliver_type in", values, "deliverType");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliverTypeNotIn(List<Byte> 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<Long> values) {
+            addCriterion("deliver_record_id in", values, "deliverRecordId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliverRecordIdNotIn(List<Long> 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<Byte> values) {
+            addCriterion("do_type in", values, "doType");
+            return (Criteria) this;
+        }
+
+        public Criteria andDoTypeNotIn(List<Byte> 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<Long> values) {
+            addCriterion("role_id in", values, "roleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoleIdNotIn(List<Long> 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<String> values) {
+            addCriterion("content in", values, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentNotIn(List<String> 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<Date> values) {
+            addCriterion("created_at in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotIn(List<Date> 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<Date> values) {
+            addCriterion("updated_at in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotIn(List<Date> 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<Byte> values) {
+            addCriterion("rec_status in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotIn(List<Byte> 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<Long> values) {
+            addCriterion("member_id in", values, "memberId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemberIdNotIn(List<Long> 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);
+        }
+    }
+}

tall/src/main/java/com/ccsens/tall/bean/vo/InputDocVo.java

@@ -88,5 +88,34 @@ public class InputDocVo {
         List<MessageVo.Message> 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<FileVo.FilePosition> 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;
+    }
+
 
 }

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<InputDocVo.DeliverHistory> findInputHistory(Long deliverId);
+
+    /**
+     * 查询输出文档下的所有记录
+     * @param deliverId
+     * @return
+     */
+    List<InputDocVo.DeliverHistory> finOutPutHistory(Long deliverId);
+}

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<ProDeliverHistoryRecord> 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);
+}

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<InputDocVo.DeliverHistory> viewDeliverHistory(InputDocDto.DeliverHistory param);
 }

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);
 
     /**
      * 修改输出文档下的备注信息

tall/src/main/java/com/ccsens/tall/service/InputDocService.java

@@ -63,6 +63,10 @@ public class InputDocService implements IInputDocService {
     private SysOperationDao sysOperationDao;
     @Resource
     private SysOperationMessageDao sysOperationMessageDao;
+    @Resource
+    private ProDeliverHistoryRecordDao deliverHistoryRecordDao;
+    @Resource
+    private IProMemberService iProMemberService;
 
 
 
@@ -237,6 +241,7 @@ public class InputDocService implements IInputDocService {
         if (ObjectUtil.isNull(doc)){
             throw new BaseException("输入文档不存在或已删除");
         }
+        ProTaskInputRecord proTaskInputRecord = new ProTaskInputRecord();
         //多文件添加
         if (!ArrayUtil.isEmpty(param.getFileIds())){
             String fileIds = "";
@@ -244,7 +249,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);
@@ -262,7 +267,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());
@@ -276,9 +280,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());
         }
@@ -453,8 +468,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());
         }
@@ -484,6 +513,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);
+
     }
 
     /**
@@ -509,7 +552,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<ProTaskInputRecord> records = proTaskInputRecordMapper.selectByExample(example);
@@ -525,7 +568,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<InputDocVo.DeliverHistory> viewDeliverHistory(InputDocDto.DeliverHistory param) {
+        //0为输出文档
+        if (0 == param.getDeliverType())
+        {
+            PageHelper.startPage(param.getPageNum(), param.getPageSize());
+            List<InputDocVo.DeliverHistory> 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<String> splits = new ArrayList<>(Arrays.asList(split));
+                        if (split.length != 0) {
+                            //获取文件项目的路径
+                            String requestUrl = PropUtil.filedeal;
+                            //通过文件id查询文件信息
+                            String c = RestTemplateUtil.postBody1(requestUrl, splits);
+                            JsonResponse<List<FileVo.FilePosition>> a = JSONObject.parseObject(c, JsonResponse.class);
+                            if (ObjectUtil.isNotNull(a) && ObjectUtil.isNotNull(a.getData())) {
+                                List<FileVo.FilePosition> fileList = a.getData();
+                                deliverHistory.setFileList(fileList);
+                            }
+                        }
+                }
+                }else{
+                    if (StrUtil.isNotBlank(deliverHistory.getFileIds())){
+                        List<String> idList = new ArrayList<>();
+                        idList.add(deliverHistory.getFileIds());
+                        //获取文件项目的路径
+                        String requestUrl = PropUtil.filedeal;
+                        //通过文件id查询文件信息
+                        String c = RestTemplateUtil.postBody1(requestUrl, idList);
+                        JsonResponse<List<FileVo.FilePosition>> a = JSONObject.parseObject(c, JsonResponse.class);
+                        if (ObjectUtil.isNotNull(a) && ObjectUtil.isNotNull(a.getData())) {
+                            List<FileVo.FilePosition> fileList = a.getData();
+                            deliverHistory.setFileList(fileList);
+                        }
+                    }
+                }
+            }
+            return new PageInfo<>(historyList);
+        }
+
+        //1为输出文档
+        if (1 == param.getDeliverType())
+        {
+            List<InputDocVo.DeliverHistory> 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<String> splits = new ArrayList<>(Arrays.asList(split));
+                        if (split.length != 0) {
+                            //获取文件项目的路径
+                            String requestUrl = PropUtil.filedeal;
+                            //通过文件id查询文件信息
+                            String c = RestTemplateUtil.postBody1(requestUrl, splits);
+                            JsonResponse<List<FileVo.FilePosition>> a = JSONObject.parseObject(c, JsonResponse.class);
+                            if (ObjectUtil.isNotNull(a) && ObjectUtil.isNotNull(a.getData())) {
+                                List<FileVo.FilePosition> fileList = a.getData();
+                                deliverHistory.setFileList(fileList);
+                            }
+                        }
+                }
+                }else{
+                    if (StrUtil.isNotBlank(deliverHistory.getFileIds())){
+                        List<String> idList = new ArrayList<>();
+                        idList.add(deliverHistory.getFileIds());
+                        //获取文件项目的路径
+                        String requestUrl = PropUtil.filedeal;
+                        //通过文件id查询文件信息
+                        String c = RestTemplateUtil.postBody1(requestUrl, idList);
+                        JsonResponse<List<FileVo.FilePosition>> a = JSONObject.parseObject(c, JsonResponse.class);
+                        if (ObjectUtil.isNotNull(a) && ObjectUtil.isNotNull(a.getData())) {
+                            List<FileVo.FilePosition> fileList = a.getData();
+                            deliverHistory.setFileList(fileList);
+                        }
+                    }
+                }
+                return  new PageInfo<>(historyList);
+            }
         }
+        return null;
     }
 
 }

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<ProjectVo.DeliverInfo> 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<ProTaskDeliverPostLog> 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);
+            }
         }
+
     }
 
     /**

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<DeliverDto.DelAllFileOfDeliver> params) {
         log.info("删除输出文档下所有的文件：{}",params);
-        deliverService.delAllFileOfDeliver(params.getParam());
+        deliverService.delAllFileOfDeliver(params.getParam(),params.getUserId());
         log.info("删除输出文档下所有的文件");
         return JsonResponse.newInstance().ok();
     }

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<InputDocDto.DelAllRecordOfTask> 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<PageInfo<InputDocVo.DeliverHistory>> viewDeliverHistory(@ApiParam @Validated @RequestBody QueryDto<InputDocDto.DeliverHistory> params) {
+        log.info("查看交付物的历史记录：{}",params);
+        PageInfo<InputDocVo.DeliverHistory> deliverHistory = iInputDocService.viewDeliverHistory(params.getParam());
+        log.info("查看交付物的历史记录");
+        return JsonResponse.newInstance().ok(deliverHistory);
+    }
+
 }

tall/src/main/resources/mapper_dao/ProDeliverHistoryRecordDao.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ccsens.tall.persist.dao.ProDeliverHistoryRecordDao">
+
+    <select id="findInputHistory" resultType="com.ccsens.tall.bean.vo.InputDocVo$DeliverHistory">
+        SELECT
+            pdhr.id AS id,
+            pdhr.role_id AS roleId,
+            pr.`name` AS roleName,
+            ptir.file_id AS fileIds,
+            ptir.remark AS remark,
+            pdhr.do_type AS doType,
+            pdhr.created_at AS createAt,
+            pdhr.content AS content,
+            pm.id AS memberId,
+            pm.nickname AS memberName
+        FROM
+            t_pro_deliver_history_record AS pdhr
+        LEFT JOIN t_pro_role AS pr ON pdhr.role_id = pr.id
+        LEFT JOIN t_pro_task_input_record AS ptir ON ptir.id = pdhr.deliver_record_id
+        LEFT JOIN t_pro_member AS pm ON pm.id = pdhr.member_id
+        WHERE
+            pdhr.deliver_id = #{deliverId}
+    </select>
+
+    <select id="finOutPutHistory" resultType="com.ccsens.tall.bean.vo.InputDocVo$DeliverHistory">
+        SELECT
+            pdhr.id,
+            pdhr.role_id AS roleId,
+            pr. NAME AS roleName,
+            ptdpl.files_id AS fileIds,
+            ptdpl.description AS remark,
+            pdhr.do_type AS doType,
+            pdhr.created_at AS createAt,
+            pdhr.content AS content,
+             pm.id AS memberId,
+            pm.nickname AS memberName
+        FROM
+            t_pro_deliver_history_record AS pdhr
+        LEFT JOIN t_pro_role AS pr ON pdhr.role_id = pr.id
+        LEFT JOIN t_pro_task_deliver_post_log AS ptdpl ON ptdpl.id = pdhr.deliver_record_id
+        LEFT JOIN t_pro_member AS pm ON pm.id = pdhr.member_id
+        WHERE
+            pdhr.deliver_id = #{deliverId}
+    </select>
+
+</mapper>

tall/src/main/resources/mapper_raw/ProDeliverHistoryRecordMapper.xml

@@ -0,0 +1,306 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ccsens.tall.persist.mapper.ProDeliverHistoryRecordMapper">
+  <resultMap id="BaseResultMap" type="com.ccsens.tall.bean.po.ProDeliverHistoryRecord">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="deliver_id" jdbcType="BIGINT" property="deliverId" />
+    <result column="deliver_type" jdbcType="TINYINT" property="deliverType" />
+    <result column="deliver_record_id" jdbcType="BIGINT" property="deliverRecordId" />
+    <result column="do_type" jdbcType="TINYINT" property="doType" />
+    <result column="role_id" jdbcType="BIGINT" property="roleId" />
+    <result column="content" jdbcType="VARCHAR" property="content" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+    <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
+    <result column="member_id" jdbcType="BIGINT" property="memberId" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, deliver_id, deliver_type, deliver_record_id, do_type, role_id, content, created_at, 
+    updated_at, rec_status, member_id
+  </sql>
+  <select id="selectByExample" parameterType="com.ccsens.tall.bean.po.ProDeliverHistoryRecordExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_pro_deliver_history_record
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_pro_deliver_history_record
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from t_pro_deliver_history_record
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ccsens.tall.bean.po.ProDeliverHistoryRecordExample">
+    delete from t_pro_deliver_history_record
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ccsens.tall.bean.po.ProDeliverHistoryRecord">
+    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>
+  <insert id="insertSelective" parameterType="com.ccsens.tall.bean.po.ProDeliverHistoryRecord">
+    insert into t_pro_deliver_history_record
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="deliverId != null">
+        deliver_id,
+      </if>
+      <if test="deliverType != null">
+        deliver_type,
+      </if>
+      <if test="deliverRecordId != null">
+        deliver_record_id,
+      </if>
+      <if test="doType != null">
+        do_type,
+      </if>
+      <if test="roleId != null">
+        role_id,
+      </if>
+      <if test="content != null">
+        content,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="recStatus != null">
+        rec_status,
+      </if>
+      <if test="memberId != null">
+        member_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="deliverId != null">
+        #{deliverId,jdbcType=BIGINT},
+      </if>
+      <if test="deliverType != null">
+        #{deliverType,jdbcType=TINYINT},
+      </if>
+      <if test="deliverRecordId != null">
+        #{deliverRecordId,jdbcType=BIGINT},
+      </if>
+      <if test="doType != null">
+        #{doType,jdbcType=TINYINT},
+      </if>
+      <if test="roleId != null">
+        #{roleId,jdbcType=BIGINT},
+      </if>
+      <if test="content != null">
+        #{content,jdbcType=VARCHAR},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        #{recStatus,jdbcType=TINYINT},
+      </if>
+      <if test="memberId != null">
+        #{memberId,jdbcType=BIGINT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ccsens.tall.bean.po.ProDeliverHistoryRecordExample" resultType="java.lang.Long">
+    select count(*) from t_pro_deliver_history_record
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update t_pro_deliver_history_record
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.deliverId != null">
+        deliver_id = #{record.deliverId,jdbcType=BIGINT},
+      </if>
+      <if test="record.deliverType != null">
+        deliver_type = #{record.deliverType,jdbcType=TINYINT},
+      </if>
+      <if test="record.deliverRecordId != null">
+        deliver_record_id = #{record.deliverRecordId,jdbcType=BIGINT},
+      </if>
+      <if test="record.doType != null">
+        do_type = #{record.doType,jdbcType=TINYINT},
+      </if>
+      <if test="record.roleId != null">
+        role_id = #{record.roleId,jdbcType=BIGINT},
+      </if>
+      <if test="record.content != null">
+        content = #{record.content,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createdAt != null">
+        created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedAt != null">
+        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.recStatus != null">
+        rec_status = #{record.recStatus,jdbcType=TINYINT},
+      </if>
+      <if test="record.memberId != null">
+        member_id = #{record.memberId,jdbcType=BIGINT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    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}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.tall.bean.po.ProDeliverHistoryRecord">
+    update t_pro_deliver_history_record
+    <set>
+      <if test="deliverId != null">
+        deliver_id = #{deliverId,jdbcType=BIGINT},
+      </if>
+      <if test="deliverType != null">
+        deliver_type = #{deliverType,jdbcType=TINYINT},
+      </if>
+      <if test="deliverRecordId != null">
+        deliver_record_id = #{deliverRecordId,jdbcType=BIGINT},
+      </if>
+      <if test="doType != null">
+        do_type = #{doType,jdbcType=TINYINT},
+      </if>
+      <if test="roleId != null">
+        role_id = #{roleId,jdbcType=BIGINT},
+      </if>
+      <if test="content != null">
+        content = #{content,jdbcType=VARCHAR},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        rec_status = #{recStatus,jdbcType=TINYINT},
+      </if>
+      <if test="memberId != null">
+        member_id = #{memberId,jdbcType=BIGINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ccsens.tall.bean.po.ProDeliverHistoryRecord">
+    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}
+  </update>
+</mapper>