From 8dc28c815eb0acdb5af82c2667eec45efd0507c5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 18 三月 2025 09:34:46 +0800
Subject: [PATCH] 车间绑定调整
---
inspect-server/src/main/java/com/ruoyi/inspect/pojo/WorkShopFile.java | 3 +--
basic-server/src/main/java/com/ruoyi/basic/dto/ProductDto.java | 4 ++++
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/WorkShopFileServiceImpl.java | 20 ++++++++++++++++++++
inspect-server/src/main/java/com/ruoyi/inspect/pojo/WorkShop.java | 2 +-
basic-server/src/main/resources/mapper/ProductMapper.xml | 6 +++++-
inspect-server/src/main/java/com/ruoyi/inspect/service/WorkShopFileService.java | 6 +++---
6 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/ProductDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/ProductDto.java
index efd5d2e..d6cbc57 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/ProductDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/ProductDto.java
@@ -8,4 +8,8 @@
private Integer id;
private String name;
+
+ private Integer workShopId;
+
+ private String workShopName;
}
diff --git a/basic-server/src/main/resources/mapper/ProductMapper.xml b/basic-server/src/main/resources/mapper/ProductMapper.xml
index a13b18d..823e5dc 100644
--- a/basic-server/src/main/resources/mapper/ProductMapper.xml
+++ b/basic-server/src/main/resources/mapper/ProductMapper.xml
@@ -13,6 +13,8 @@
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="objectId" column="object_id" jdbcType="INTEGER"/>
+ <result property="workShopId" column="work_shop_id" jdbcType="INTEGER"/>
+ <result property="workShopName" column="work_shop_name" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
@@ -29,7 +31,9 @@
p.update_user,
p.create_time,
p.update_time,
- p.object_id
+ p.object_id,
+ p.work_shop_id,
+ p.work_shop_name
from product p
WHERE 1=1
<if test="partNo != null and partNo != ''">
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/WorkShop.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/WorkShop.java
index 9d8f950..ef0c08d 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/WorkShop.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/WorkShop.java
@@ -9,7 +9,7 @@
import java.io.Serializable;
/**
- * 杞﹂棿鍚嶇О
+ * 杞﹂棿 鍚嶇О
* @TableName work_shop
*/
@Data
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/WorkShopFile.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/WorkShopFile.java
index 3d4e4be..645b391 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/WorkShopFile.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/WorkShopFile.java
@@ -16,7 +16,7 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty("鍏宠仈 妫�楠屽崟澶栭敭id")
+ @ApiModelProperty("鍏宠仈id")
private Integer workShopId;
@ApiModelProperty("绫诲瀷")
@@ -32,7 +32,6 @@
private Integer createUser;
@ApiModelProperty("涓婁紶浜�")
- @TableField(exist = false, select = false)
private String name;
@TableField(fill = FieldFill.INSERT)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/WorkShopFileService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/WorkShopFileService.java
index 322dab6..e382d5f 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/WorkShopFileService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/WorkShopFileService.java
@@ -1,12 +1,12 @@
package com.ruoyi.inspect.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.inspect.pojo.WorkShop;
+import com.ruoyi.inspect.pojo.WorkShopFile;
/**
- * @description 閽堝琛ㄣ�恮ork_shop(杞﹂棿鍚嶇О)銆戠殑鏁版嵁搴撴搷浣淪ervice
+ * @description 閽堝琛ㄣ�恮ork_shop_file(杞﹂棿鍚嶇О)銆戠殑鏁版嵁搴撴搷浣淪ervice
* @createDate 2024-03-17
*/
-public interface WorkShopFileService extends IService<WorkShop> {
+public interface WorkShopFileService extends IService<WorkShopFile> {
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/WorkShopFileServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/WorkShopFileServiceImpl.java
new file mode 100644
index 0000000..c9a0f96
--- /dev/null
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/WorkShopFileServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.inspect.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.inspect.mapper.WorkShopFileMapper;
+import com.ruoyi.inspect.pojo.WorkShopFile;
+import com.ruoyi.inspect.service.WorkShopFileService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @description 閽堝琛ㄣ�恮ork_shop_file(杞﹂棿闄勪欢鍚嶇О)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+ * @createDate 2024-03-12 16:17:55
+ */
+@Service
+public class WorkShopFileServiceImpl extends ServiceImpl<WorkShopFileMapper, WorkShopFile> implements WorkShopFileService {
+
+}
+
+
+
+
--
Gitblit v1.9.3