From 4583b87bf5615f2678dedf378f18749bad54fe51 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 22 Jan 2020 09:13:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=BF=9B=E5=BA=A6=E6=98=8E=E7=BB=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java | 6 ++++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java index b8563c0..8183437 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java @@ -38,6 +38,12 @@ public class ExportProject extends BaseAPS { @FieldAnnotation(relation = "Link", notEmpty = true) private Long linkId; + @ApiParam(value ="当前执行的明细序号") + private transient Integer curDetailNumber; + + @ApiParam(value ="当前执行的明细名称") + private transient String curDetailName; + public DataLink getLink() { return BeanRelation.get(this, EExportProject.Link); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java index 7d8f02d..6cc2b67 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java @@ -37,6 +37,12 @@ public class ImportProject extends BaseAPS { @FieldAnnotation(relation = "Link", notEmpty = true) private Long linkId; + @ApiParam(value ="当前执行的明细序号") + private transient Integer curDetailNumber; + + @ApiParam(value ="当前执行的明细名称") + private transient String curDetailName; + public DataLink getLink() { return BeanRelation.get(this, EImportProject.Link); } From 03de37cf7cf82f66ce79b1358b94fe8c292f3b63 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 22 Jan 2020 10:41:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=BF=9B=E5=BA=A6=E6=98=8E=E7=BB=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java index c6e4ba3..6a67f59 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java @@ -12,5 +12,5 @@ import lombok.Data; @Data public class RuleGroupProgress { private String message; - private String progress; + private Long progress; }