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); } 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) { 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>
