From 2748e2d70970fc577e8621aad44a498ba8b7ef2c Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 23 十一月 2023 09:38:36 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderDao.xml | 11 +++++++++++
modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java | 4 ++++
modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/dao/ItemCirculatOrderDao.java | 3 +++
3 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/dao/ItemCirculatOrderDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/dao/ItemCirculatOrderDao.java
index f214240..ded9dfb 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/dao/ItemCirculatOrderDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/dao/ItemCirculatOrderDao.java
@@ -1,7 +1,9 @@
package com.zt.life.modules.itemCirculatOrder.dao;
import com.zt.common.dao.BaseDao;
+import com.zt.core.sys.dto.DictIstance;
import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrder;
+import com.zt.life.modules.project.model.Project;
import org.apache.ibatis.annotations.Mapper;
@@ -20,4 +22,5 @@
List<ItemCirculatOrder> getList(Map<String, Object> params);
+ List<DictIstance> itemList(Long projectId);
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java
index 5a53691..54ded60 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java
@@ -130,6 +130,10 @@
} else {
ItemCirculatOrder itemCirculatOrder =new ItemCirculatOrder();
data.setCirculatOrder(itemCirculatOrder);
+ List<?> resultList = baseDao.itemList(projectId);
+ List<?> technicalList = resultList;
+ data.setTechnicalList((List<ItemCirculatOrderTechnical>) technicalList);
+
}
if (projectId != null) {
diff --git a/modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderDao.xml b/modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderDao.xml
index f4ce68d..0944e7b 100644
--- a/modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderDao.xml
@@ -17,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