From 191a4bb404614a3952147f1cb65f4451f182b045 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 31 十二月 2025 09:51:38 +0800
Subject: [PATCH] refactor(production): 优化工艺路线实体映射和查询逻辑
---
src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java | 5 ++---
src/main/resources/mapper/production/ProcessRouteMapper.xml | 5 +++--
src/main/java/com/ruoyi/production/pojo/ProcessRoute.java | 2 ++
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java b/src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java
index 11c658e..5689dae 100644
--- a/src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java
@@ -7,11 +7,10 @@
@Data
public class ProcessRouteDto extends ProcessRoute {
- @ApiModelProperty(value = "鐢熶骇鐐掓満")
- private String speculativeTradingName;
-
private Long productId;
+ private String productName;
+
@ApiModelProperty("瑙勬牸")
private String model;
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java b/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java
index 8ad74fc..3ac8bb1 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java
@@ -2,11 +2,13 @@
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
+@TableName("process_route")
@Data
public class ProcessRoute {
diff --git a/src/main/resources/mapper/production/ProcessRouteMapper.xml b/src/main/resources/mapper/production/ProcessRouteMapper.xml
index cd9d931..c5e09fc 100644
--- a/src/main/resources/mapper/production/ProcessRouteMapper.xml
+++ b/src/main/resources/mapper/production/ProcessRouteMapper.xml
@@ -13,9 +13,10 @@
</resultMap>
<select id="pageProcessRouteDto" resultType="com.ruoyi.production.dto.ProcessRouteDto">
- select ps.*, pm.speculative_trading_name,pm.product_id,pm.model
+ select ps.*, p.product_name,pm.product_id,pm.model
from process_route ps
- left join product_model pm on ps.product_model_id = pm.id
+ left join product_model pm on ps.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
<where>
<if test="c.model != null and c.model != ''">
and pm.model like concat('%',#{c.model},'%')
--
Gitblit v1.9.3