From cf65a7d789f8887a407ca1060da9f0810b40ac3b Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期四, 23 十一月 2023 11:06:58 +0800
Subject: [PATCH] 项目表
---
modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderDao.xml | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderDao.xml b/modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderDao.xml
index 99d2c51..0944e7b 100644
--- a/modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderDao.xml
@@ -4,10 +4,11 @@
<mapper namespace="com.zt.life.modules.itemCirculatOrder.dao.ItemCirculatOrderDao">
<select id="getList" resultType="com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrder">
- select a.*
+ select a.*, p.*
from item_circulat_order a
+ INNER JOIN project p ON p.id = a.project_id
<where>
- a.is_delete = 0
+ a.is_delete = 0 and p.is_delete = 0
<if test="whereSql!=null">
and ${whereSql}
</if>
@@ -16,5 +17,16 @@
ORDER BY ${orderBySql}
</if>
</select>
+ <select id="itemList" resultType="com.zt.core.sys.dto.DictIstance">
+ SELECT m.*
+ FROM software_test_order_measured m
+ JOIN software_test_order s ON s.id = m.order_id
+ <where>
+ s.is_delete = 0 and m.is_delete = 0
+ <if test="projectId!=null">
+ and s.project_id = ${projectId}
+ </if>
+ </where>
+ </select>
</mapper>
--
Gitblit v1.9.1