From 942d2f163a5b18ac71e9f8171fa81d5b0a03b46c Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 16 May 2024 15:11:53 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=9B=9B=E5=BC=A0=E4=B8=8E=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E8=A1=A8=E5=8D=95=E7=9B=B8=E5=85=B3=E7=9A=84=E5=BA=9F?= =?UTF-8?q?=E5=BC=83=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1157856512933888]删除数据库四张与工单表单相关的废弃表 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1157856512933888 --- .../processtask/ExportProcessTaskDataApi.java | 24 +++++---- .../api/processtask/ProcessTaskDeleteApi.java | 4 +- .../dao/mapper/process/ProcessMapper.xml | 54 ------------------- .../mapper/processtask/ProcessTaskMapper.xml | 14 ----- .../changelog/2024-05-16/neatlogic_tenant.sql | 4 ++ .../process/changelog/2024-05-16/version.json | 10 ++++ .../resources/process/sqlscript/ddl.sql | 25 --------- 7 files changed, 31 insertions(+), 104 deletions(-) create mode 100644 src/main/resources/neatlogic/resources/process/changelog/2024-05-16/neatlogic_tenant.sql create mode 100644 src/main/resources/neatlogic/resources/process/changelog/2024-05-16/version.json diff --git a/src/main/java/neatlogic/module/process/api/processtask/ExportProcessTaskDataApi.java b/src/main/java/neatlogic/module/process/api/processtask/ExportProcessTaskDataApi.java index 8d48e3f85..fe37081b8 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ExportProcessTaskDataApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ExportProcessTaskDataApi.java @@ -161,9 +161,21 @@ public class ExportProcessTaskDataApi extends PrivateBinaryStreamApiComponentBas } { // 工单表单数据 - String sql = "SELECT * FROM `processtask_formattribute_data` WHERE `processtask_id` = " + processTaskId; - List> processtask_formattribute_data = processTaskDataMapper.getList(sql); - put(resultObj, "processtask_formattribute_data", processtask_formattribute_data); + String sql = "SELECT * FROM `processtask_formattribute` WHERE `processtask_id` = " + processTaskId; + List> processtask_formattribute = processTaskDataMapper.getList(sql); + put(resultObj, "processtask_formattribute", processtask_formattribute); + + sql = "SELECT * FROM `processtask_extend_formattribute` WHERE `processtask_id` = " + processTaskId; + List> processtask_extend_formattribute = processTaskDataMapper.getList(sql); + put(resultObj, "processtask_extend_formattribute", processtask_extend_formattribute); + + sql = "SELECT a.* FROM `form_attribute_data` a JOIN `processtask_formattribute` b ON b.`form_attribute_data_id` = a.`id` WHERE b.`processtask_id` = " + processTaskId; + List> form_attribute_data = processTaskDataMapper.getList(sql); + put(resultObj, "form_attribute_data", form_attribute_data); + + sql = "SELECT a.* FROM `form_extend_attribute_data` a JOIN `processtask_extend_formattribute` b ON b.`form_attribute_data_id` = a.`id` WHERE b.`processtask_id` = " + processTaskId; + List> form_extend_attribute_data = processTaskDataMapper.getList(sql); + put(resultObj, "form_extend_attribute_data", form_extend_attribute_data); } { // 工单关联 @@ -391,12 +403,6 @@ public class ExportProcessTaskDataApi extends PrivateBinaryStreamApiComponentBas put(resultObj, "event_solution", event_solution); } } - { - // 步骤表单权限 - String sql = "SELECT * FROM `processtask_step_formattribute` WHERE `processtask_id` = " + processTaskId; - List> processtask_step_formattribute = processTaskDataMapper.getList(sql); - put(resultObj, "processtask_step_formattribute", processtask_step_formattribute); - } { // 正在后台进行处理操作的步骤列表 String sql = "SELECT * FROM `processtask_step_in_operation` WHERE `processtask_id` = " + processTaskId; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDeleteApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDeleteApi.java index 2f1dd763c..64768c8a3 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDeleteApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDeleteApi.java @@ -123,7 +123,7 @@ public class ProcessTaskDeleteApi extends PrivateApiComponentBase { for (ProcessTaskRelationVo relation : relationList) { taskMapper.deleteProcessTaskRelationById(relation.getId()); } - // 表单 processtask_form processtask_formattribute_data + // 表单 processtask_form processtask_formattribute processtask_extend_formattribute form_attribute_data form_extend_attribute_data taskMapper.deleteProcessTaskFormByProcessTaskId(processTaskId); processTaskService.deleteProcessTaskFormAttributeDataByProcessTaskId(processTaskId); // 关注人 processtask_focus @@ -139,7 +139,7 @@ public class ProcessTaskDeleteApi extends PrivateApiComponentBase { // processtask_step_remind // processtask_step processtask_step_agent processtask_step_notify_policy processtask_step_comment // processtask_step_content - // processtask_step_data processtask_step_formattribute processtask_step_sla + // processtask_step_data processtask_step_sla // processtask_step_rel // processtask_step_timeaudit processtask_step_timeout_policy // processtask_step_worker_policy diff --git a/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessMapper.xml index a83f6eaed..eeb5d14d5 100644 --- a/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessMapper.xml +++ b/src/main/java/neatlogic/module/process/dao/mapper/process/ProcessMapper.xml @@ -118,33 +118,6 @@ LEFT JOIN `process_step_worker_policy` h ON a.`uuid` = h.`process_step_uuid` WHERE a.`process_uuid` = #{value} -