From f34a0ddd5ddb24035e846be9f1f2dde7545e2fcc Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 09 三月 2026 17:56:20 +0800
Subject: [PATCH] fix: 使用父类id关联
---
src/main/java/com/ruoyi/prodDemand/pojo/ProdDemandMain.java | 2 +-
doc/宁夏-中盛建材.sql | 10 +++++-----
src/main/java/com/ruoyi/prodDemand/pojo/ProdDemandDetail.java | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git "a/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql" "b/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
index 78cf397..16572ba 100644
--- "a/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
+++ "b/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
@@ -1,7 +1,7 @@
CREATE TABLE `prod_demand_main`
(
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '鑷涓婚敭',
- `tenant_id` varchar(20) DEFAULT '000000' COMMENT '绉熸埛缂栧彿',
+ `tenant_id` bigint(20) NOT NULL COMMENT '绉熸埛缂栧彿',
`dept_id` bigint(20) DEFAULT NULL COMMENT '閮ㄩ棬ID (鐢ㄤ簬鏁版嵁鏉冮檺闅旂)',
`form_instance_id` varchar(64) NOT NULL COMMENT '琛ㄥ崟瀹炰緥鍞竴ID (鍏宠仈瀛愯〃鐢�)',
`serial_no` varchar(64) DEFAULT NULL COMMENT '鍗曟嵁娴佹按鍙� (serialNo)',
@@ -27,9 +27,9 @@
CREATE TABLE `prod_demand_detail`
(
- `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '鑷涓婚敭',
- `tenant_id` varchar(20) DEFAULT '000000' COMMENT '绉熸埛缂栧彿',
- `form_instance_id` varchar(64) NOT NULL COMMENT '涓昏〃鍗曞疄渚婭D (澶栭敭锛屽叧鑱斾富琛�)',
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '鑷涓婚敭',
+ `tenant_id` bigint(20) NOT NULL COMMENT '绉熸埛缂栧彿',
+ `prod_demand_main_id` bigint(20) NOT NULL COMMENT '鐖剁被鍏宠仈ID',
`material_code` varchar(64) DEFAULT NULL COMMENT '鐗╂枡缂栫爜 (textField_l9xo62q5)',
`material_category` varchar(64) DEFAULT NULL COMMENT '鐗╂枡鍒嗙被 (textField_l9xo62q7)',
`spec_desc` varchar(128) DEFAULT NULL COMMENT '瑙勬牸鎻忚堪 (textField_l9xo62q8)',
@@ -48,6 +48,6 @@
`remark` varchar(500) DEFAULT NULL COMMENT '澶囨敞',
PRIMARY KEY (`id`),
- KEY `idx_form_instance_id` (`form_instance_id`)
+ KEY `idx_prod_demand_main_id` (`prod_demand_main_id`)
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4 COMMENT ='閿�鍞敓浜ч渶姹俖鏄庣粏琛�';
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/prodDemand/pojo/ProdDemandDetail.java b/src/main/java/com/ruoyi/prodDemand/pojo/ProdDemandDetail.java
index f6a4169..107c78d 100644
--- a/src/main/java/com/ruoyi/prodDemand/pojo/ProdDemandDetail.java
+++ b/src/main/java/com/ruoyi/prodDemand/pojo/ProdDemandDetail.java
@@ -27,12 +27,12 @@
/**
* 绉熸埛缂栧彿
*/
- private String tenantId;
+ private Long tenantId;
/**
- * 涓昏〃鍗曞疄渚婭D
+ * 鐖剁被鍏宠仈ID
*/
- private String formInstanceId;
+ private String prodDemandMainId;
/**
* 鐗╂枡缂栫爜
diff --git a/src/main/java/com/ruoyi/prodDemand/pojo/ProdDemandMain.java b/src/main/java/com/ruoyi/prodDemand/pojo/ProdDemandMain.java
index 1d916f9..cdac6a4 100644
--- a/src/main/java/com/ruoyi/prodDemand/pojo/ProdDemandMain.java
+++ b/src/main/java/com/ruoyi/prodDemand/pojo/ProdDemandMain.java
@@ -26,7 +26,7 @@
/**
* 绉熸埛缂栧彿
*/
- private String tenantId;
+ private Long tenantId;
/**
* 閮ㄩ棬ID
--
Gitblit v1.9.3