From 4c8e8c7de7e3435610190d63132784ee6162f8a0 Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Tue, 30 Mar 2021 09:45:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=96=87=E6=A1=A3=E7=9A=84?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/tall/bean/dto/InputDocDto.java | 25 +- .../java/com/ccsens/tall/bean/po/File.java | 106 +++ .../com/ccsens/tall/bean/po/FileExample.java | 711 ++++++++++++++++++ .../tall/bean/po/ProTaskInputRecord.java | 19 +- .../bean/po/ProTaskInputRecordExample.java | 100 ++- .../com/ccsens/tall/bean/vo/InputDocVo.java | 24 +- .../tall/persist/mapper/FileMapper.java | 30 + .../ccsens/tall/service/IInputDocService.java | 12 + .../ccsens/tall/service/InputDocService.java | 157 +++- .../ccsens/tall/web/InputDocController.java | 20 + tall/src/main/resources/application.yml | 4 +- .../resources/mapper_dao/IInputDocDao.xml | 53 +- .../main/resources/mapper_raw/FileMapper.xml | 258 +++++++ .../mapper_raw/ProTaskInputRecordMapper.xml | 41 +- 14 files changed, 1478 insertions(+), 82 deletions(-) create mode 100644 tall/src/main/java/com/ccsens/tall/bean/po/File.java create mode 100644 tall/src/main/java/com/ccsens/tall/bean/po/FileExample.java create mode 100644 tall/src/main/java/com/ccsens/tall/persist/mapper/FileMapper.java create mode 100644 tall/src/main/resources/mapper_raw/FileMapper.xml 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 fe8f2a25..4380626c 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 @@ -38,9 +38,10 @@ public class InputDocDto { @NotNull(message = "请选择输入文档") @ApiModelProperty("输入文档Id") private Long docId; - @NotNull(message = "上传文件不能为空") @ApiModelProperty("文件Id,数组") - private Long[] fileIds; + private String[] fileIds; + @ApiModelProperty("备注信息") + private String remark; } @Data @@ -80,4 +81,24 @@ public class InputDocDto { @ApiModelProperty("文档id") private Long docId; } + + @Data + @ApiModel("删除输入文档中的文件") + public static class DeleteDocOfFile{ + @NotNull(message = "请选择要删除的文件") + @ApiModelProperty("文档上传记录id") + private Long recordId; + } + + @Data + @ApiModel("修改上传文件的备注信息") + public static class UpdateDocOfRemark{ + @NotNull(message = "请选择要删除的备注信息") + @ApiModelProperty("文档上传记录id") + private Long recordId; + @ApiModelProperty("备注信息") + private String remark; + } + + } diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/File.java b/tall/src/main/java/com/ccsens/tall/bean/po/File.java new file mode 100644 index 00000000..19176241 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/bean/po/File.java @@ -0,0 +1,106 @@ +package com.ccsens.tall.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class File implements Serializable { + private Long id; + + private Long userId; + + private String fileName; + + private String location; + + private String visitLocation; + + 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 getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName == null ? null : fileName.trim(); + } + + public String getLocation() { + return location; + } + + public void setLocation(String location) { + this.location = location == null ? null : location.trim(); + } + + public String getVisitLocation() { + return visitLocation; + } + + public void setVisitLocation(String visitLocation) { + this.visitLocation = visitLocation == null ? null : visitLocation.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; + } + + @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(", userId=").append(userId); + sb.append(", fileName=").append(fileName); + sb.append(", location=").append(location); + sb.append(", visitLocation=").append(visitLocation); + 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/tall/src/main/java/com/ccsens/tall/bean/po/FileExample.java b/tall/src/main/java/com/ccsens/tall/bean/po/FileExample.java new file mode 100644 index 00000000..8855f850 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/bean/po/FileExample.java @@ -0,0 +1,711 @@ +package com.ccsens.tall.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class FileExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public FileExample() { + 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 andUserIdIsNull() { + addCriterion("user_id is null"); + return (Criteria) this; + } + + public Criteria andUserIdIsNotNull() { + addCriterion("user_id is not null"); + return (Criteria) this; + } + + public Criteria andUserIdEqualTo(Long value) { + addCriterion("user_id =", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotEqualTo(Long value) { + addCriterion("user_id <>", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThan(Long value) { + addCriterion("user_id >", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThanOrEqualTo(Long value) { + addCriterion("user_id >=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThan(Long value) { + addCriterion("user_id <", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThanOrEqualTo(Long value) { + addCriterion("user_id <=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdIn(List values) { + addCriterion("user_id in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotIn(List values) { + addCriterion("user_id not in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdBetween(Long value1, Long value2) { + addCriterion("user_id between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotBetween(Long value1, Long value2) { + addCriterion("user_id not between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andFileNameIsNull() { + addCriterion("file_name is null"); + return (Criteria) this; + } + + public Criteria andFileNameIsNotNull() { + addCriterion("file_name is not null"); + return (Criteria) this; + } + + public Criteria andFileNameEqualTo(String value) { + addCriterion("file_name =", value, "fileName"); + return (Criteria) this; + } + + public Criteria andFileNameNotEqualTo(String value) { + addCriterion("file_name <>", value, "fileName"); + return (Criteria) this; + } + + public Criteria andFileNameGreaterThan(String value) { + addCriterion("file_name >", value, "fileName"); + return (Criteria) this; + } + + public Criteria andFileNameGreaterThanOrEqualTo(String value) { + addCriterion("file_name >=", value, "fileName"); + return (Criteria) this; + } + + public Criteria andFileNameLessThan(String value) { + addCriterion("file_name <", value, "fileName"); + return (Criteria) this; + } + + public Criteria andFileNameLessThanOrEqualTo(String value) { + addCriterion("file_name <=", value, "fileName"); + return (Criteria) this; + } + + public Criteria andFileNameLike(String value) { + addCriterion("file_name like", value, "fileName"); + return (Criteria) this; + } + + public Criteria andFileNameNotLike(String value) { + addCriterion("file_name not like", value, "fileName"); + return (Criteria) this; + } + + public Criteria andFileNameIn(List values) { + addCriterion("file_name in", values, "fileName"); + return (Criteria) this; + } + + public Criteria andFileNameNotIn(List values) { + addCriterion("file_name not in", values, "fileName"); + return (Criteria) this; + } + + public Criteria andFileNameBetween(String value1, String value2) { + addCriterion("file_name between", value1, value2, "fileName"); + return (Criteria) this; + } + + public Criteria andFileNameNotBetween(String value1, String value2) { + addCriterion("file_name not between", value1, value2, "fileName"); + return (Criteria) this; + } + + public Criteria andLocationIsNull() { + addCriterion("location is null"); + return (Criteria) this; + } + + public Criteria andLocationIsNotNull() { + addCriterion("location is not null"); + return (Criteria) this; + } + + public Criteria andLocationEqualTo(String value) { + addCriterion("location =", value, "location"); + return (Criteria) this; + } + + public Criteria andLocationNotEqualTo(String value) { + addCriterion("location <>", value, "location"); + return (Criteria) this; + } + + public Criteria andLocationGreaterThan(String value) { + addCriterion("location >", value, "location"); + return (Criteria) this; + } + + public Criteria andLocationGreaterThanOrEqualTo(String value) { + addCriterion("location >=", value, "location"); + return (Criteria) this; + } + + public Criteria andLocationLessThan(String value) { + addCriterion("location <", value, "location"); + return (Criteria) this; + } + + public Criteria andLocationLessThanOrEqualTo(String value) { + addCriterion("location <=", value, "location"); + return (Criteria) this; + } + + public Criteria andLocationLike(String value) { + addCriterion("location like", value, "location"); + return (Criteria) this; + } + + public Criteria andLocationNotLike(String value) { + addCriterion("location not like", value, "location"); + return (Criteria) this; + } + + public Criteria andLocationIn(List values) { + addCriterion("location in", values, "location"); + return (Criteria) this; + } + + public Criteria andLocationNotIn(List values) { + addCriterion("location not in", values, "location"); + return (Criteria) this; + } + + public Criteria andLocationBetween(String value1, String value2) { + addCriterion("location between", value1, value2, "location"); + return (Criteria) this; + } + + public Criteria andLocationNotBetween(String value1, String value2) { + addCriterion("location not between", value1, value2, "location"); + return (Criteria) this; + } + + public Criteria andVisitLocationIsNull() { + addCriterion("visit_location is null"); + return (Criteria) this; + } + + public Criteria andVisitLocationIsNotNull() { + addCriterion("visit_location is not null"); + return (Criteria) this; + } + + public Criteria andVisitLocationEqualTo(String value) { + addCriterion("visit_location =", value, "visitLocation"); + return (Criteria) this; + } + + public Criteria andVisitLocationNotEqualTo(String value) { + addCriterion("visit_location <>", value, "visitLocation"); + return (Criteria) this; + } + + public Criteria andVisitLocationGreaterThan(String value) { + addCriterion("visit_location >", value, "visitLocation"); + return (Criteria) this; + } + + public Criteria andVisitLocationGreaterThanOrEqualTo(String value) { + addCriterion("visit_location >=", value, "visitLocation"); + return (Criteria) this; + } + + public Criteria andVisitLocationLessThan(String value) { + addCriterion("visit_location <", value, "visitLocation"); + return (Criteria) this; + } + + public Criteria andVisitLocationLessThanOrEqualTo(String value) { + addCriterion("visit_location <=", value, "visitLocation"); + return (Criteria) this; + } + + public Criteria andVisitLocationLike(String value) { + addCriterion("visit_location like", value, "visitLocation"); + return (Criteria) this; + } + + public Criteria andVisitLocationNotLike(String value) { + addCriterion("visit_location not like", value, "visitLocation"); + return (Criteria) this; + } + + public Criteria andVisitLocationIn(List values) { + addCriterion("visit_location in", values, "visitLocation"); + return (Criteria) this; + } + + public Criteria andVisitLocationNotIn(List values) { + addCriterion("visit_location not in", values, "visitLocation"); + return (Criteria) this; + } + + public Criteria andVisitLocationBetween(String value1, String value2) { + addCriterion("visit_location between", value1, value2, "visitLocation"); + return (Criteria) this; + } + + public Criteria andVisitLocationNotBetween(String value1, String value2) { + addCriterion("visit_location not between", value1, value2, "visitLocation"); + 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/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskInputRecord.java b/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskInputRecord.java index c4427ade..39d69e55 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskInputRecord.java +++ b/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskInputRecord.java @@ -8,7 +8,7 @@ public class ProTaskInputRecord implements Serializable { private Long inputDocId; - private Long fileId; + private String fileId; private Long userId; @@ -20,6 +20,8 @@ public class ProTaskInputRecord implements Serializable { private Byte recStatus; + private String remark; + private static final long serialVersionUID = 1L; public Long getId() { @@ -38,12 +40,12 @@ public class ProTaskInputRecord implements Serializable { this.inputDocId = inputDocId; } - public Long getFileId() { + public String getFileId() { return fileId; } - public void setFileId(Long fileId) { - this.fileId = fileId; + public void setFileId(String fileId) { + this.fileId = fileId == null ? null : fileId.trim(); } public Long getUserId() { @@ -86,6 +88,14 @@ public class ProTaskInputRecord implements Serializable { this.recStatus = recStatus; } + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark == null ? null : remark.trim(); + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -100,6 +110,7 @@ public class ProTaskInputRecord implements Serializable { sb.append(", createdAt=").append(createdAt); sb.append(", updatedAt=").append(updatedAt); sb.append(", recStatus=").append(recStatus); + sb.append(", remark=").append(remark); sb.append("]"); return sb.toString(); } diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskInputRecordExample.java b/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskInputRecordExample.java index 6beae3a7..27cd29c9 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskInputRecordExample.java +++ b/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskInputRecordExample.java @@ -235,52 +235,62 @@ public class ProTaskInputRecordExample { return (Criteria) this; } - public Criteria andFileIdEqualTo(Long value) { + public Criteria andFileIdEqualTo(String value) { addCriterion("file_id =", value, "fileId"); return (Criteria) this; } - public Criteria andFileIdNotEqualTo(Long value) { + public Criteria andFileIdNotEqualTo(String value) { addCriterion("file_id <>", value, "fileId"); return (Criteria) this; } - public Criteria andFileIdGreaterThan(Long value) { + public Criteria andFileIdGreaterThan(String value) { addCriterion("file_id >", value, "fileId"); return (Criteria) this; } - public Criteria andFileIdGreaterThanOrEqualTo(Long value) { + public Criteria andFileIdGreaterThanOrEqualTo(String value) { addCriterion("file_id >=", value, "fileId"); return (Criteria) this; } - public Criteria andFileIdLessThan(Long value) { + public Criteria andFileIdLessThan(String value) { addCriterion("file_id <", value, "fileId"); return (Criteria) this; } - public Criteria andFileIdLessThanOrEqualTo(Long value) { + public Criteria andFileIdLessThanOrEqualTo(String value) { addCriterion("file_id <=", value, "fileId"); return (Criteria) this; } - public Criteria andFileIdIn(List values) { + public Criteria andFileIdLike(String value) { + addCriterion("file_id like", value, "fileId"); + return (Criteria) this; + } + + public Criteria andFileIdNotLike(String value) { + addCriterion("file_id not like", value, "fileId"); + return (Criteria) this; + } + + public Criteria andFileIdIn(List values) { addCriterion("file_id in", values, "fileId"); return (Criteria) this; } - public Criteria andFileIdNotIn(List values) { + public Criteria andFileIdNotIn(List values) { addCriterion("file_id not in", values, "fileId"); return (Criteria) this; } - public Criteria andFileIdBetween(Long value1, Long value2) { + public Criteria andFileIdBetween(String value1, String value2) { addCriterion("file_id between", value1, value2, "fileId"); return (Criteria) this; } - public Criteria andFileIdNotBetween(Long value1, Long value2) { + public Criteria andFileIdNotBetween(String value1, String value2) { addCriterion("file_id not between", value1, value2, "fileId"); return (Criteria) this; } @@ -584,6 +594,76 @@ public class ProTaskInputRecordExample { addCriterion("rec_status not between", value1, value2, "recStatus"); 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 static class Criteria extends GeneratedCriteria { 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 55f49605..2db98de8 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 @@ -1,9 +1,11 @@ package com.ccsens.tall.bean.vo; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; /** @@ -23,19 +25,33 @@ public class InputDocVo { private String docName; @ApiModelProperty("是否上传 0否 1是") private Byte isUpload; - List files; +// @ApiModelProperty("文档中的文件id") + @ApiModelProperty("文档中的文件") + private List records = new ArrayList<>(); } @Data - @ApiModel("文档下的文件") + @ApiModel("该记录中的文件") public static class File{ - @ApiModelProperty("上传记录id") - private Long recordId; @ApiModelProperty("文件名称") private String fileName; @ApiModelProperty("文件访问路径") private String fileUrl; } + @Data + @ApiModel("该文档下的记录列表") + public static class Record{ + //文件id集合 + @JsonIgnore + private String fileIds; + @ApiModelProperty("上传记录id") + private Long recordId; + @ApiModelProperty("备注") + private String remark; + @ApiModelProperty("文件列表") + private List fileList = new ArrayList<>(); + } + @Data @ApiModel("查看文档历史记录") public static class HistoryRecord{ diff --git a/tall/src/main/java/com/ccsens/tall/persist/mapper/FileMapper.java b/tall/src/main/java/com/ccsens/tall/persist/mapper/FileMapper.java new file mode 100644 index 00000000..d2e00c80 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/persist/mapper/FileMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.tall.persist.mapper; + +import com.ccsens.tall.bean.po.File; +import com.ccsens.tall.bean.po.FileExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface FileMapper { + long countByExample(FileExample example); + + int deleteByExample(FileExample example); + + int deleteByPrimaryKey(Long id); + + int insert(File record); + + int insertSelective(File record); + + List selectByExample(FileExample example); + + File selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") File record, @Param("example") FileExample example); + + int updateByExample(@Param("record") File record, @Param("example") FileExample example); + + int updateByPrimaryKeySelective(File record); + + int updateByPrimaryKey(File 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 1ad98303..c9c0dddc 100644 --- a/tall/src/main/java/com/ccsens/tall/service/IInputDocService.java +++ b/tall/src/main/java/com/ccsens/tall/service/IInputDocService.java @@ -71,4 +71,16 @@ public interface IInputDocService { * @param param */ void delDoc(InputDocDto.DeleteDoc param); + + /** + * 删除输入文档中的文件 + * @param param + */ + void delDocOfFile(InputDocDto.DeleteDocOfFile param); + + /** + * 修改上传文件的备注信息 + * @param param + */ + void updateDocOfRemark(InputDocDto.UpdateDocOfRemark param); } 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 48791975..7cf8822c 100644 --- a/tall/src/main/java/com/ccsens/tall/service/InputDocService.java +++ b/tall/src/main/java/com/ccsens/tall/service/InputDocService.java @@ -5,6 +5,8 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Snowflake; +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.util.StrUtil; import com.ccsens.tall.bean.dto.InputDocDto; import com.ccsens.tall.bean.dto.LwbsDto; @@ -13,10 +15,7 @@ import com.ccsens.tall.bean.vo.InputDocVo; import com.ccsens.tall.bean.vo.LwbsVo; import com.ccsens.tall.bean.vo.TaskVo; import com.ccsens.tall.persist.dao.IInputDocDao; -import com.ccsens.tall.persist.mapper.ProMemberMapper; -import com.ccsens.tall.persist.mapper.ProTaskInputDocMapper; -import com.ccsens.tall.persist.mapper.ProTaskInputRecordMapper; -import com.ccsens.tall.persist.mapper.SysProjectMapper; +import com.ccsens.tall.persist.mapper.*; import com.ccsens.tall.util.TaskUtil; @@ -41,6 +40,9 @@ public class InputDocService implements IInputDocService { private ProTaskInputDocMapper proTaskInputDocMapper; @Resource private Snowflake snowflake; + @Resource + private FileMapper fileMapper; + @Override @@ -160,8 +162,30 @@ public class InputDocService implements IInputDocService { */ @Override public List findDocByTask(InputDocDto.FindDocByTask param) { - List docByTask = iInputDocDao.findDocByTask(param.getTaskId()); - return docByTask; + List docByTasks = iInputDocDao.findDocByTask(param.getTaskId()); + for (InputDocVo.DocOfTask docs:docByTasks){ + for (InputDocVo.Record record:docs.getRecords()){ + if (record.getFileIds().contains(",")){ + String[] split = record.getFileIds().split(","); + for (int i = 0; i < split.length; i++) { + File file = fileMapper.selectByPrimaryKey(Long.valueOf(split[i])); + InputDocVo.File nowFile = new InputDocVo.File(); + nowFile.setFileName(file.getFileName()); + nowFile.setFileUrl(file.getVisitLocation()); + record.getFileList().add(nowFile); + } + }else{ + if (StrUtil.isNotBlank(record.getFileIds())){ + File file = fileMapper.selectByPrimaryKey(Long.valueOf(record.getFileIds())); + InputDocVo.File nowFile = new InputDocVo.File(); + nowFile.setFileName(file.getFileName()); + nowFile.setFileUrl(file.getVisitLocation()); + record.getFileList().add(nowFile); + } + } + } + } + return docByTasks; } /** @@ -171,28 +195,56 @@ public class InputDocService implements IInputDocService { @Override public void uploadForDoc(InputDocDto.UploadForDoc param,Long userId) { //将之前的文件设置为不使用 - ProTaskInputRecordExample proTaskInputRecordExample = new ProTaskInputRecordExample(); - proTaskInputRecordExample.createCriteria().andInputDocIdEqualTo(param.getDocId()); - ProTaskInputRecord newProTaskInputRecord = new ProTaskInputRecord(); - newProTaskInputRecord.setStatus((byte)0); - proTaskInputRecordMapper.updateByExampleSelective(newProTaskInputRecord,proTaskInputRecordExample); - +// ProTaskInputRecordExample proTaskInputRecordExample = new ProTaskInputRecordExample(); +// proTaskInputRecordExample.createCriteria().andInputDocIdEqualTo(param.getDocId()); +// ProTaskInputRecord newProTaskInputRecord = new ProTaskInputRecord(); +// newProTaskInputRecord.setStatus((byte)0); +// proTaskInputRecordMapper.updateByExampleSelective(newProTaskInputRecord,proTaskInputRecordExample); + if (ArrayUtil.isEmpty(param.getFileIds()) && StrUtil.isBlank(param.getRemark())){ + throw new BaseException("请上传文件或填写备注信息"); + } //多文件添加 - for (int i = 0; i < param.getFileIds().length; i++) { + if (!ArrayUtil.isEmpty(param.getFileIds())){ + String fileIds = ""; + for (int i = 0; i < param.getFileIds().length; i++) { + fileIds = fileIds + param.getFileIds()[i]+","; + } + fileIds = fileIds.substring(0,fileIds.length()-1); ProTaskInputRecord proTaskInputRecord = new ProTaskInputRecord(); + proTaskInputRecord.setFileId(fileIds); proTaskInputRecord.setInputDocId(param.getDocId()); - proTaskInputRecord.setFileId(param.getFileIds()[i]); proTaskInputRecord.setStatus((byte)1); proTaskInputRecord.setId(snowflake.nextId()); proTaskInputRecord.setUserId(userId); + proTaskInputRecord.setRemark(param.getRemark()); proTaskInputRecordMapper.insertSelective(proTaskInputRecord); + + //通过输入文档id将输入文档表中的状态更改为已上传 + ProTaskInputDoc proTaskInputDoc = new ProTaskInputDoc(); + proTaskInputDoc.setId(param.getDocId()); + proTaskInputDoc.setIsUpload(1); + proTaskInputDocMapper.updateByPrimaryKeySelective(proTaskInputDoc); } - //通过输入文档id将输入文档表中的状态更改为已上传 - ProTaskInputDoc proTaskInputDoc = new ProTaskInputDoc(); - proTaskInputDoc.setId(param.getDocId()); - proTaskInputDoc.setIsUpload(1); - proTaskInputDocMapper.updateByPrimaryKeySelective(proTaskInputDoc); + //如果备注信息不为空 + if (!StrUtil.isBlank(param.getRemark())){ + ProTaskInputRecord proTaskInputRecord = new ProTaskInputRecord(); + proTaskInputRecord.setInputDocId(param.getDocId()); + proTaskInputRecord.setStatus((byte)1); + proTaskInputRecord.setId(snowflake.nextId()); + proTaskInputRecord.setUserId(userId); + proTaskInputRecord.setRemark(param.getRemark()); + proTaskInputRecordMapper.insertSelective(proTaskInputRecord); + + //通过输入文档id将输入文档表中的状态更改为已上传 + ProTaskInputDoc proTaskInputDoc = new ProTaskInputDoc(); + proTaskInputDoc.setId(param.getDocId()); + proTaskInputDoc.setIsUpload(1); + proTaskInputDocMapper.updateByPrimaryKeySelective(proTaskInputDoc); + } + + + } /** @@ -258,18 +310,18 @@ public class InputDocService implements IInputDocService { } //删除记录表中已上传的文档 - if (1 == proTaskInputDoc.getIsUpload()){ - ProTaskInputRecordExample proTaskInputRecordExample = new ProTaskInputRecordExample(); - proTaskInputRecordExample.createCriteria().andInputDocIdEqualTo(param.getDocId()); - List proTaskInputRecords = proTaskInputRecordMapper.selectByExample(proTaskInputRecordExample); - for (ProTaskInputRecord record:proTaskInputRecords){ - ProTaskInputRecord inputRecord = new ProTaskInputRecord(); - inputRecord.setId(record.getId()); - inputRecord.setStatus((byte)0); - inputRecord.setRecStatus((byte)2); - proTaskInputRecordMapper.updateByPrimaryKeySelective(inputRecord); - } - } +// if (1 == proTaskInputDoc.getIsUpload()){ +// ProTaskInputRecordExample proTaskInputRecordExample = new ProTaskInputRecordExample(); +// proTaskInputRecordExample.createCriteria().andInputDocIdEqualTo(param.getDocId()); +// List proTaskInputRecords = proTaskInputRecordMapper.selectByExample(proTaskInputRecordExample); +// for (ProTaskInputRecord record:proTaskInputRecords){ +// ProTaskInputRecord inputRecord = new ProTaskInputRecord(); +// inputRecord.setId(record.getId()); +// inputRecord.setStatus((byte)0); +// inputRecord.setRecStatus((byte)2); +// proTaskInputRecordMapper.updateByPrimaryKeySelective(inputRecord); +// } +// } //修改数据 ProTaskInputDoc newDoc = new ProTaskInputDoc(); @@ -305,4 +357,47 @@ public class InputDocService implements IInputDocService { proTaskInputDocMapper.updateByPrimaryKeySelective(proTaskInputDoc); } + /** + * 删除输入文档中的文件 + * @param param + */ + @Override + public void delDocOfFile(InputDocDto.DeleteDocOfFile param) { + //查看该输入文档下是否还有正在使用的文件 + ProTaskInputRecord proTaskInputRecord = proTaskInputRecordMapper.selectByPrimaryKey(param.getRecordId()); + + //删除输入文档中的文件 + ProTaskInputRecord record = new ProTaskInputRecord(); + record.setId(param.getRecordId()); + record.setRecStatus((byte)2); + proTaskInputRecordMapper.updateByPrimaryKeySelective(record); + + ProTaskInputRecordExample proTaskInputRecordExample = new ProTaskInputRecordExample(); + proTaskInputRecordExample.createCriteria().andRecStatusEqualTo((byte)1) + .andInputDocIdEqualTo(proTaskInputRecord.getInputDocId()); + List proTaskInputRecords = proTaskInputRecordMapper.selectByExample(proTaskInputRecordExample); + //如果没有将输入文档状态改为未上传 + if (CollectionUtil.isEmpty(proTaskInputRecords)){ + ProTaskInputDoc proTaskInputDoc = new ProTaskInputDoc(); + proTaskInputDoc.setId(proTaskInputRecord.getInputDocId()); + proTaskInputDoc.setIsUpload(0); + proTaskInputDocMapper.updateByPrimaryKeySelective(proTaskInputDoc); + } + + } + + /** + * 修改上传文件的备注信息 + * @param param + */ + @Override + public void updateDocOfRemark(InputDocDto.UpdateDocOfRemark param) { + ProTaskInputRecord record = new ProTaskInputRecord(); + record.setId(param.getRecordId()); + if (StrUtil.isNotBlank(param.getRemark())){ + record.setRemark(param.getRemark()); + } + proTaskInputRecordMapper.updateByPrimaryKeySelective(record); + } + } 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 d8a755d7..633673e5 100644 --- a/tall/src/main/java/com/ccsens/tall/web/InputDocController.java +++ b/tall/src/main/java/com/ccsens/tall/web/InputDocController.java @@ -102,4 +102,24 @@ public class InputDocController { return JsonResponse.newInstance().ok(); } + @MustLogin + @ApiOperation(value = "删除输入文档中的文件", notes = "1007:删除输入文档中的文件") + @RequestMapping(value = "/delDocOfFile", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse delDocOfFile(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("删除输入文档中的文件：{}",params); + iInputDocService.delDocOfFile(params.getParam()); + log.info("删除输入文档中的文件"); + return JsonResponse.newInstance().ok(); + } + + @MustLogin + @ApiOperation(value = "修改上传文件的备注信息", notes = "1007:修改上传文件的备注信息") + @RequestMapping(value = "/updateDocOfRemark", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse updateDocOfRemark(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("修改上传文件的备注信息：{}",params); + iInputDocService.updateDocOfRemark(params.getParam()); + log.info("修改上传文件的备注信息"); + return JsonResponse.newInstance().ok(); + } + } diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index e75cc2c3..b5408a3a 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: prod - include: util-prod,common + active: dev + include: util-dev,common diff --git a/tall/src/main/resources/mapper_dao/IInputDocDao.xml b/tall/src/main/resources/mapper_dao/IInputDocDao.xml index 61914175..b70ebda6 100644 --- a/tall/src/main/resources/mapper_dao/IInputDocDao.xml +++ b/tall/src/main/resources/mapper_dao/IInputDocDao.xml @@ -22,16 +22,7 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select + + distinct + + + from t_file + + + + + order by ${orderByClause} + + + + + delete from t_file + where id = #{id,jdbcType=BIGINT} + + + delete from t_file + + + + + + insert into t_file (id, user_id, file_name, + location, visit_location, created_at, + updated_at, rec_status) + values (#{id,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{fileName,jdbcType=VARCHAR}, + #{location,jdbcType=VARCHAR}, #{visitLocation,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, + #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) + + + insert into t_file + + + id, + + + user_id, + + + file_name, + + + location, + + + visit_location, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{userId,jdbcType=BIGINT}, + + + #{fileName,jdbcType=VARCHAR}, + + + #{location,jdbcType=VARCHAR}, + + + #{visitLocation,jdbcType=VARCHAR}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_file + + + id = #{record.id,jdbcType=BIGINT}, + + + user_id = #{record.userId,jdbcType=BIGINT}, + + + file_name = #{record.fileName,jdbcType=VARCHAR}, + + + location = #{record.location,jdbcType=VARCHAR}, + + + visit_location = #{record.visitLocation,jdbcType=VARCHAR}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_file + set id = #{record.id,jdbcType=BIGINT}, + user_id = #{record.userId,jdbcType=BIGINT}, + file_name = #{record.fileName,jdbcType=VARCHAR}, + location = #{record.location,jdbcType=VARCHAR}, + visit_location = #{record.visitLocation,jdbcType=VARCHAR}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_file + + + user_id = #{userId,jdbcType=BIGINT}, + + + file_name = #{fileName,jdbcType=VARCHAR}, + + + location = #{location,jdbcType=VARCHAR}, + + + visit_location = #{visitLocation,jdbcType=VARCHAR}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_file + set user_id = #{userId,jdbcType=BIGINT}, + file_name = #{fileName,jdbcType=VARCHAR}, + location = #{location,jdbcType=VARCHAR}, + visit_location = #{visitLocation,jdbcType=VARCHAR}, + 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/tall/src/main/resources/mapper_raw/ProTaskInputRecordMapper.xml b/tall/src/main/resources/mapper_raw/ProTaskInputRecordMapper.xml index 83da7fb1..a1f098a7 100644 --- a/tall/src/main/resources/mapper_raw/ProTaskInputRecordMapper.xml +++ b/tall/src/main/resources/mapper_raw/ProTaskInputRecordMapper.xml @@ -4,12 +4,13 @@ - + + @@ -70,7 +71,7 @@ - id, input_doc_id, file_id, user_id, status, created_at, updated_at, rec_status + id, input_doc_id, file_id, user_id, status, created_at, updated_at, rec_status, remark @@ -181,7 +190,7 @@ input_doc_id = #{record.inputDocId,jdbcType=BIGINT}, - file_id = #{record.fileId,jdbcType=BIGINT}, + file_id = #{record.fileId,jdbcType=VARCHAR}, user_id = #{record.userId,jdbcType=BIGINT}, @@ -198,6 +207,9 @@ rec_status = #{record.recStatus,jdbcType=TINYINT}, + + remark = #{record.remark,jdbcType=VARCHAR}, + @@ -207,12 +219,13 @@ update t_pro_task_input_record set id = #{record.id,jdbcType=BIGINT}, input_doc_id = #{record.inputDocId,jdbcType=BIGINT}, - file_id = #{record.fileId,jdbcType=BIGINT}, + file_id = #{record.fileId,jdbcType=VARCHAR}, user_id = #{record.userId,jdbcType=BIGINT}, status = #{record.status,jdbcType=TINYINT}, created_at = #{record.createdAt,jdbcType=TIMESTAMP}, updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, - rec_status = #{record.recStatus,jdbcType=TINYINT} + rec_status = #{record.recStatus,jdbcType=TINYINT}, + remark = #{record.remark,jdbcType=VARCHAR} @@ -224,7 +237,7 @@ input_doc_id = #{inputDocId,jdbcType=BIGINT}, - file_id = #{fileId,jdbcType=BIGINT}, + file_id = #{fileId,jdbcType=VARCHAR}, user_id = #{userId,jdbcType=BIGINT}, @@ -241,18 +254,22 @@ rec_status = #{recStatus,jdbcType=TINYINT}, + + remark = #{remark,jdbcType=VARCHAR}, + where id = #{id,jdbcType=BIGINT} update t_pro_task_input_record set input_doc_id = #{inputDocId,jdbcType=BIGINT}, - file_id = #{fileId,jdbcType=BIGINT}, + file_id = #{fileId,jdbcType=VARCHAR}, user_id = #{userId,jdbcType=BIGINT}, status = #{status,jdbcType=TINYINT}, created_at = #{createdAt,jdbcType=TIMESTAMP}, updated_at = #{updatedAt,jdbcType=TIMESTAMP}, - rec_status = #{recStatus,jdbcType=TINYINT} + rec_status = #{recStatus,jdbcType=TINYINT}, + remark = #{remark,jdbcType=VARCHAR} where id = #{id,jdbcType=BIGINT} \ No newline at end of file