添加委托vo部分样品字段

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

@@ -24,6 +24,7 @@ public class ElectrolyzerServiceImpl extends BaseServiceImpl<ElectrolyzerMapper,
     @Override
     public Page<Electrolyzer> page(Page<Electrolyzer> page, Electrolyzer electrolyzer) {
         Wrapper wrapper = new EntityWrapper<>(electrolyzer);
+        wrapper.orderBy("slot_no",true);
         return this.page(page, wrapper);
     }
 

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

@@ -60,7 +60,13 @@
 
 
     <select id="selectEntrustProgressList" resultType="com.patzn.cloud.service.hmhj.vo.EntrustVO">
-        SELECT id,code,client,client_tel,entrust_time,assignor,test_side,status,progress FROM entrust WHERE deleted = 0
+        SELECT id,code,client,client_tel,entrust_time,assignor,test_side,status,progress,
+        s.name "sample_name",s."sample_num"
+        FROM entrust e
+        left join (select s.entrust_id,s.name,count(1) "sample_num" from entrust_sample s
+            where s.deleted = 0 group by s.entrust_id, s.name
+        ) s on s.entrust_id = e.id
+        WHERE deleted = 0
         <if test="null!=vo.idsList">
             AND id IN
             <foreach collection="vo.idsList" index="index" item="id" open="(" separator="," close=")">
@@ -76,6 +82,11 @@
         <if test="null!=vo.testSide">
             AND test_side  LIKE CONCAT('%',#{vo.testSide},'%')
         </if>
+
+        <if test="null != vo.entrustTimeS and null != vo.entrustTimeE">
+            AND to_char(entrust_time, 'YYYY-MM-dd HH24:MI:SS') BETWEEN #{vo.entrustTimeS} AND #{vo.entrustTimeE}
+        </if>
+
         <if test="null!=vo.statusList">
             AND status IN
             <foreach collection="vo.statusList" index="index" item="status" open="(" separator="," close=")">