From c2a72c3ab45dd349f9793277fa73e9c7f94f9def Mon Sep 17 00:00:00 2001 From: ulleo Date: Mon, 27 Oct 2025 17:20:17 +0800 Subject: [PATCH] =?UTF-8?q?feat(X-Pack):=20[=E6=95=B0=E6=8D=AE=E5=A1=AB?= =?UTF-8?q?=E6=8A=A5]=E7=94=A8=E6=88=B7=E8=BF=BD=E5=8A=A0=E5=A1=AB?= =?UTF-8?q?=E6=8A=A5=E9=A1=B5=E9=9D=A2=E6=94=AF=E6=8C=81=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=A4=9A=E6=9D=A1=E6=95=B0=E6=8D=AE/=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/api/xpack/dataFilling/DataFillingApi.java | 10 ++++++++-- .../api/xpack/dataFilling/dto/DfSubTaskVo.java | 1 + .../api/xpack/dataFilling/dto/DfUserTaskData.java | 1 + .../api/xpack/dataFilling/dto/DfUserTaskVo.java | 2 ++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/DataFillingApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/DataFillingApi.java index d4f4f9124d..dfdb6783d7 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/DataFillingApi.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/DataFillingApi.java @@ -164,6 +164,10 @@ public interface DataFillingApi { @PostMapping("/user-task/saveData/{id}") DataFillFormTableDataResponse saveFormRowData(@PathVariable("id") Long id, @RequestBody Map data) throws Exception; + @Operation(summary = "用户新增填报数据") + @PostMapping("/user-task/appendData/{id}") + DataFillFormTableDataResponse appendFormRowData(@PathVariable("id") Long id, @RequestBody Map data) throws Exception; + @Operation(summary = "数据填报操作日志") @DePermit({"#p0.formId+':read'"}) @PostMapping("/log/page/{goPage}/{pageSize}") @@ -175,12 +179,10 @@ public interface DataFillingApi { void clearLog(@RequestBody DfClearCommitLogRequest request) throws Exception; @Operation(summary = "上传Excel") - @DePermit({"#p0+':manage'"}) @PostMapping("/form/{formId}/uploadFile") DfExcelData excelUpload(@PathVariable("formId") Long formId, @RequestParam("file") MultipartFile file) throws Exception; @Operation(summary = "下载Excel模板") - @DePermit({"#p0+':manage'"}) @GetMapping("/form/{formId}/excelTemplate") void excelTemplate(@PathVariable("formId") Long formId); @@ -189,6 +191,10 @@ public interface DataFillingApi { @PostMapping("/form/{formId}/confirmUpload") void confirmUpload(@PathVariable("formId") Long formId, @RequestBody Map data); + @Operation(summary = "用户确认上传Excel") + @PostMapping("/user-task/appendData/{id}/form/{formId}/confirmUpload") + void appendDataConfirmUpload(@PathVariable("id") Long id, @PathVariable("formId") Long formId, @RequestBody Map data); + @Operation(summary = "获取表单模版配置") @GetMapping("/template/{itemId}") String getTemplateByUserTaskItemId(@PathVariable("itemId") Long itemId); diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfSubTaskVo.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfSubTaskVo.java index 17c17cc84b..e8908b5a9b 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfSubTaskVo.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfSubTaskVo.java @@ -52,5 +52,6 @@ public class DfSubTaskVo implements Serializable { private int totalUserCount; private int unfinishedUserCount; + private Integer fillType; } diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfUserTaskData.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfUserTaskData.java index f1f98b774e..5786e4da3f 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfUserTaskData.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfUserTaskData.java @@ -52,5 +52,6 @@ public class DfUserTaskData implements Serializable { private String formExtSetting; + private Integer fillType; } diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfUserTaskVo.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfUserTaskVo.java index 77c9d59601..10d4ec21e5 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfUserTaskVo.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfUserTaskVo.java @@ -47,4 +47,6 @@ public class DfUserTaskVo implements Serializable { private boolean expired; + private Integer fillType; + }