数据录入 - 样品查询优化；

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleServiceImpl.java

@@ -1333,37 +1333,36 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
         if (null == sampleVO.getEntrustId()) {
             return page;
         }
-        List<EntrustSampleItem> itemList = entrustSampleItemService.list(Condition.create().eq("status", sampleVO.getItemStatus()));
-        if (CollectionUtils.isEmpty(itemList)) {
-            return page;
-        }
-        List<Long> sampleIds = new ArrayList<>();
-        for (EntrustSampleItem item : itemList) {
-            sampleIds.add(item.getEntrustSampleId());
-        }
-
-
-        sampleVO.setIds(sampleIds);
+        // 去除查询样品编号，改为关联查询
+        //  List<EntrustSampleItem> itemList = entrustSampleItemService.list(Condition.create().eq("status", sampleVO.getItemStatus()));
+        //  if (CollectionUtils.isEmpty(itemList)) {
+        //      return page;
+        //  }
+        //  List<Long> sampleIds = new ArrayList<>();
+        //  for (EntrustSampleItem item : itemList) {
+        //      sampleIds.add(item.getEntrustSampleId());
+        //  }
+        //  sampleVO.setIds(sampleIds);
         return page.setRecords(baseMapper.selectVOList(page, sampleVO));
     }
 
 
     @Override
     public Page<EntrustSampleVO> pageBySampleLeftHis(Page<EntrustSampleVO> page, EntrustSampleVO sampleVO) {
-        if (null == sampleVO.getEntrustId()) {
-            return page;
-        }
-        List<EntrustSampleItem> itemList = entrustSampleItemService.list(Condition.create().in("status", sampleVO.getItemStatusList()));
-        if (CollectionUtils.isEmpty(itemList)) {
+        //
+        if (null == sampleVO.getEntrustId() || CollectionUtils.isEmpty(sampleVO.getItemStatusList())) {
             return page;
         }
-        List<Long> sampleIds = new ArrayList<>();
-        for (EntrustSampleItem item : itemList) {
-            sampleIds.add(item.getEntrustSampleId());
-        }
-
-
-        sampleVO.setIds(sampleIds);
+        // 去除查询样品编号，改为关联查询
+        // List<EntrustSampleItem> itemList = entrustSampleItemService.list(Condition.create().in("status", sampleVO.getItemStatusList()));
+        // if (CollectionUtils.isEmpty(itemList)) {
+        //     return page;
+        // }
+        // List<Long> sampleIds = new ArrayList<>();
+        // for (EntrustSampleItem item : itemList) {
+        //     sampleIds.add(item.getEntrustSampleId());
+        // }
+        // sampleVO.setIds(sampleIds);
         return page.setRecords(baseMapper.selectVOList(page, sampleVO));
     }
 

src/main/resources/mapper/hmhj/EntrustSampleMapper.xml

@@ -27,41 +27,56 @@
         <if test="null!=vo.entrustId">
             AND s.entrust_id = #{vo.entrustId}
         </if>
-
     </select>
 
-
-
     <select id="selectVOList" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleVO">
+        SELECT
+            s.*
+        FROM entrust_sample s WHERE deleted = 0
+        <if test="null != vo.entrustId">
+            AND s.entrust_id = #{vo.entrustId}
+        </if>
 
-        SELECT *  FROM entrust_sample WHERE deleted = 0
-        <if test="null!=vo.entrustId">
-            AND  entrust_id = #{vo.entrustId}
+        <if test="null != vo.status">
+            AND s.status = #{vo.status}
         </if>
 
-        <if test="null!=vo.status">
-            AND  status = #{vo.status}
+        <if test="null != vo.code">
+            AND s.code LIKE CONCAT('%',#{vo.code},'%')
         </if>
 
-        <if test="null!=vo.code">
-            AND  code LIKE CONCAT('%',#{vo.code},'%')
+        <if test="null != vo.notStatus">
+            AND s.status != #{vo.notStatus}
         </if>
 
-        <if test="null!=vo.notStatus">
-            AND  status != #{vo.notStatus}
+        <if test="null != vo.itemStatus">
+            AND exists (
+                select 1 from entrust_sample_item i where i.deleted = 0
+                and i.entrust_sample_id = s.id
+                and i.status = #{vo.itemStatus}
+            )
+        </if>
+
+        <if test="null != vo.itemStatusList">
+            AND exists (
+                select 1 from entrust_sample_item i where i.deleted = 0
+                and i.entrust_sample_id = s.id
+                and i.status IN
+                <foreach collection="vo.itemStatusList" index="index" item="itemStatus" open="(" separator="," close=")">
+                    #{itemStatus}
+                </foreach>
+            )
         </if>
 
         <if test="null!=vo.ids">
-            AND  id IN
+            AND s.id IN
             <foreach collection="vo.ids" index="index" item="sampleId" open="(" separator="," close=")">
                 #{sampleId}
             </foreach>
         </if>
-        order by order_by asc, code ,ctime desc
+        order by s.order_by asc, s.code ,s.ctime desc
     </select>
 
-
-
     <select id="selectMinStatusByEntrustIds" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleVO">
 
         WITH summary AS (