From 7c060a33ae9399a86db97ad18da965e7a848dfc3 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期三, 25 三月 2026 17:24:10 +0800
Subject: [PATCH] feat(production): 添加生产订单完成功能
---
src/main/resources/mapper/basic/ProductModelMapper.xml | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index e12b63c..e4bbefa 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -13,6 +13,9 @@
<result column="tenant_id" property="tenantId" />
<result column="product_name" property="productName" />
<result column="product_id" property="productId" />
+ <result column="validity_period" property="validityPeriod" />
+ <result column="filing_certificate_no" property="filingCertificateNo" />
+ <result column="uid_no" property="uidNo" />
</resultMap>
<select id="listPageProductModel" resultType="com.ruoyi.basic.pojo.ProductModel">
select pm.*,p.product_name
@@ -97,5 +100,14 @@
ORDER BY pm.id DESC
</select>
+ <select id="getProductAndModelList" resultType="java.util.Map">
+ select p.id as id,
+ pm.id as modelId,
+ p.product_name as productName ,
+ pm.model as model
+ from product_model pm
+ left join product p on p.id = pm.product_id
+ order by p.id,pm.id desc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3