From 59b611601cab9c58cde3e27a4fa52e27a9f526e0 Mon Sep 17 00:00:00 2001 From: hansha Date: Mon, 1 Jul 2024 10:10:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AE=B0=E5=BD=95=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/da/dangan/domain/DaTask.java | 171 +++++++++--------- .../resources/mapper/dangan/DaTaskMapper.xml | 29 +-- 2 files changed, 105 insertions(+), 95 deletions(-) diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaTask.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaTask.java index c4a31e5..36ce9ce 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaTask.java +++ b/dangan-dangan/src/main/java/com/da/dangan/domain/DaTask.java @@ -9,76 +9,59 @@ import com.da.common.core.domain.BaseEntity; * 识别任务记录对象 da_task * * @author hs - * @date 2024-06-20 + * @date 2024-07-01 */ -public class DaTask extends BaseEntity { +public class DaTask extends BaseEntity +{ private static final long serialVersionUID = 1L; - /** - * 任务id - */ + /** 任务id */ private Long id; - /** - * 目录id - */ + /** 目录id */ @Excel(name = "目录id") private Long muId; - /** - * 业务类型 - */ + /** 业务类型 */ @Excel(name = "业务类型") private String ywType; - /** - * 任务图片ids - */ - @Excel(name = "任务图片ids") - private String picIds; + /** 档案目录路径 */ + @Excel(name = "档案目录路径") + private String muPath; - /** - * 任务数量 - */ - @Excel(name = "任务数量") + /** 处理图片数量 */ + @Excel(name = "处理图片数量") private Long num; - /** - * 档案目录路径 - */ - @Excel(name = "档案目录路径") - private String muPath; + /** 任务图片ids */ + @Excel(name = "任务图片ids") + private String picIds; - /** - * 任务状态(字典) - */ + /** 任务状态(字典) */ @Excel(name = "任务状态(字典)") private String status; - /** - * 成功 - */ - @Excel(name = "成功") + /** 成功数 */ + @Excel(name = "成功数") private Long successNum; - /** - * 任务图片ids - */ - @Excel(name = "任务图片ids") + /** 成功图片ids */ + @Excel(name = "成功图片ids") private String successIds; - /** - * 失败 - */ - @Excel(name = "失败") + /** 失败数 */ + @Excel(name = "失败数") private Long failNum; - /** - * 任务图片ids - */ - @Excel(name = "任务图片ids") + /** 失败图片ids */ + @Excel(name = "失败图片ids") private String failIds; + /** 返回结果 */ + @Excel(name = "返回结果") + private String resultStr; + /** * 当前用户id */ @@ -92,108 +75,130 @@ public class DaTask extends BaseEntity { this.userId = userId; } - public void setId(Long id) { + public void setId(Long id) + { this.id = id; } - public Long getId() { + public Long getId() + { return id; } - - public void setMuId(Long muId) { + public void setMuId(Long muId) + { this.muId = muId; } - public Long getMuId() { + public Long getMuId() + { return muId; } - - public void setYwType(String ywType) { + public void setYwType(String ywType) + { this.ywType = ywType; } - public String getYwType() { + public String getYwType() + { return ywType; } - - public void setPicIds(String picIds) { - this.picIds = picIds; + public void setMuPath(String muPath) + { + this.muPath = muPath; } - public String getPicIds() { - return picIds; + public String getMuPath() + { + return muPath; } - - public void setNum(Long num) { + public void setNum(Long num) + { this.num = num; } - public Long getNum() { + public Long getNum() + { return num; } - - public void setMuPath(String muPath) { - this.muPath = muPath; + public void setPicIds(String picIds) + { + this.picIds = picIds; } - public String getMuPath() { - return muPath; + public String getPicIds() + { + return picIds; } - - public void setStatus(String status) { + public void setStatus(String status) + { this.status = status; } - public String getStatus() { + public String getStatus() + { return status; } - - public void setSuccessNum(Long successNum) { + public void setSuccessNum(Long successNum) + { this.successNum = successNum; } - public Long getSuccessNum() { + public Long getSuccessNum() + { return successNum; } - - public void setSuccessIds(String successIds) { + public void setSuccessIds(String successIds) + { this.successIds = successIds; } - public String getSuccessIds() { + public String getSuccessIds() + { return successIds; } - - public void setFailNum(Long failNum) { + public void setFailNum(Long failNum) + { this.failNum = failNum; } - public Long getFailNum() { + public Long getFailNum() + { return failNum; } - - public void setFailIds(String failIds) { + public void setFailIds(String failIds) + { this.failIds = failIds; } - public String getFailIds() { + public String getFailIds() + { return failIds; } + public void setResultStr(String resultStr) + { + this.resultStr = resultStr; + } + + public String getResultStr() + { + return resultStr; + } @Override public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("id", getId()) .append("muId", getMuId()) .append("ywType", getYwType()) - .append("picIds", getPicIds()) - .append("num", getNum()) .append("muPath", getMuPath()) + .append("num", getNum()) + .append("picIds", getPicIds()) .append("status", getStatus()) .append("successNum", getSuccessNum()) .append("successIds", getSuccessIds()) .append("failNum", getFailNum()) .append("failIds", getFailIds()) + .append("resultStr", getResultStr()) .append("remark", getRemark()) .append("createBy", getCreateBy()) .append("createTime", getCreateTime()) diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaTaskMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaTaskMapper.xml index 8d69342..1268e57 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaTaskMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaTaskMapper.xml @@ -8,14 +8,15 @@ - - + + + @@ -24,7 +25,7 @@ - select id, mu_id, yw_type, pic_ids, num, mu_path, status, success_num, success_ids, fail_num, fail_ids, remark, create_by, create_time, update_by, update_time from da_task + select id, mu_id, yw_type, mu_path, num, pic_ids, status, success_num, success_ids, fail_num, fail_ids, result_str, remark, create_by, create_time, update_by, update_time from da_task @@ -55,14 +57,15 @@ mu_id, yw_type, - pic_ids, - num, mu_path, + num, + pic_ids, status, success_num, success_ids, fail_num, fail_ids, + result_str, remark, create_by, create_time, @@ -72,14 +75,15 @@ #{muId}, #{ywType}, - #{picIds}, - #{num}, #{muPath}, + #{num}, + #{picIds}, #{status}, #{successNum}, #{successIds}, #{failNum}, #{failIds}, + #{resultStr}, #{remark}, #{createBy}, #{createTime}, @@ -93,14 +97,15 @@ mu_id = #{muId}, yw_type = #{ywType}, - pic_ids = #{picIds}, - num = #{num}, mu_path = #{muPath}, + num = #{num}, + pic_ids = #{picIds}, status = #{status}, success_num = #{successNum}, success_ids = #{successIds}, fail_num = #{failNum}, fail_ids = #{failIds}, + result_str = #{resultStr}, remark = #{remark}, create_by = #{createBy}, create_time = #{createTime},