From e586e7619fa69bf1c9028e17ed25eb414d9c866c Mon Sep 17 00:00:00 2001 From: ulleo Date: Tue, 25 Feb 2025 17:35:54 +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]=E6=96=B0=E5=BB=BA=E8=A1=A8=E5=8D=95=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E7=BB=91=E5=AE=9A=E5=B7=B2=E6=9C=89=E8=A1=A8=20#12788?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db/desktop/V2.10.6__ddl.sql | 6 ++++++ .../src/main/resources/db/migration/V2.10.6__ddl.sql | 2 ++ .../io/dataease/api/xpack/dataFilling/DataFillingApi.java | 4 ++-- .../io/dataease/api/xpack/dataFilling/dto/RowDataDatum.java | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/core/core-backend/src/main/resources/db/desktop/V2.10.6__ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.10.6__ddl.sql index ac6b4f6858..883af71640 100644 --- a/core/core-backend/src/main/resources/db/desktop/V2.10.6__ddl.sql +++ b/core/core-backend/src/main/resources/db/desktop/V2.10.6__ddl.sql @@ -3,3 +3,9 @@ ALTER TABLE `core_dataset_table_field` ALTER TABLE `core_dataset_table_field` ADD COLUMN `other_group` longtext NULL; + + +alter table `per_data_filling_task_sub_instance` + modify `data_id` varchar(255) null comment '数据ID'; +alter table per_data_filling_commit_log + modify `data_id` varchar(255) not null comment '操作的数据ID'; diff --git a/core/core-backend/src/main/resources/db/migration/V2.10.6__ddl.sql b/core/core-backend/src/main/resources/db/migration/V2.10.6__ddl.sql index e995940a20..9fe7169e8b 100644 --- a/core/core-backend/src/main/resources/db/migration/V2.10.6__ddl.sql +++ b/core/core-backend/src/main/resources/db/migration/V2.10.6__ddl.sql @@ -10,3 +10,5 @@ DROP PRIMARY KEY; alter table `per_data_filling_task_sub_instance` modify `data_id` varchar(255) null comment '数据ID'; +alter table per_data_filling_commit_log + modify `data_id` varchar(255) not null comment '操作的数据ID'; 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 1252087ee6..e52b5c47b2 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 @@ -68,7 +68,7 @@ public interface DataFillingApi { @DePermit({"#p0+':manage'"}) @GetMapping("/form/{formId}/delete/{id}") - void deleteRowData(@PathVariable("formId") Long formId, @PathVariable("id") Long id) throws Exception; + void deleteRowData(@PathVariable("formId") Long formId, @PathVariable("id") String id) throws Exception; @DePermit({"#p0+':manage'"}) @GetMapping("/form/{formId}/truncate") @@ -76,7 +76,7 @@ public interface DataFillingApi { @DePermit({"#p0+':manage'"}) @PostMapping("/form/{formId}/batch-delete") - void batchDeleteRowData(@PathVariable("formId") Long formId, @RequestBody List ids) throws Exception; + void batchDeleteRowData(@PathVariable("formId") Long formId, @RequestBody List ids) throws Exception; @DePermit({"#p0+':manage'"}) @PostMapping("/form/{formId}/rowData/save") diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/RowDataDatum.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/RowDataDatum.java index 71954bf745..8bcbdfd0cb 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/RowDataDatum.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/RowDataDatum.java @@ -15,7 +15,7 @@ public class RowDataDatum implements Serializable { @Serial private static final long serialVersionUID = -2838784450721979776L; - private Long id; + private String id; private Map data;