模拟查询修改；

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/OriginalRecordInfoController.java

@@ -78,4 +78,10 @@ public class OriginalRecordInfoController extends ServiceController {
     public RestResult<Boolean> analysisOriginalData(@RequestParam("templateId") Long templateId, @RequestParam("itemIds") Long[] itemIds) {
         return success(lmsOriginalRecordInfoService.analysisOriginalData(templateId, itemIds, getAccount()));
     }
+
+    @ApiOperation("分页列表")
+    @PostMapping("/listData")
+    public RestResult<List<LmsOriginalRecordInfo>> getPage(@RequestBody List<LmsOriginalRecordInfo> lmsOriginalRecordInfos) {
+        return success(lmsOriginalRecordInfoService.listByInfos(lmsOriginalRecordInfos));
+    }
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/LmsOriginalRecordInfoMapper.java

@@ -18,4 +18,6 @@ import java.util.List;
 public interface LmsOriginalRecordInfoMapper extends BatchMapper<LmsOriginalRecordInfo> {
 
     List<OriginalRecordInfoVO> selectByItem(@Param("itemIds") Long[] itemIds);
+
+    List<LmsOriginalRecordInfo> selectByInfos(@Param("infoList") List<LmsOriginalRecordInfo> infoList);
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/service/ILmsOriginalRecordInfoService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.plugins.Page;
 import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.commons.service.IBaseService;
 import com.patzn.cloud.service.lims.collection.entity.LmsOriginalRecordInfo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -21,4 +22,6 @@ public interface ILmsOriginalRecordInfoService extends IBaseService<LmsOriginalR
 
     boolean analysisOriginalData(Long templateId, Long[] itemIds, Account account);
 
+    List<LmsOriginalRecordInfo> listByInfos(List<LmsOriginalRecordInfo> infoList);
+
 }

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

@@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -123,4 +124,12 @@ public class LmsOriginalRecordInfoServiceImpl extends BaseServiceImpl<LmsOrigina
 
         return true;
     }
+
+    @Override
+    public List<LmsOriginalRecordInfo> listByInfos(List<LmsOriginalRecordInfo> infoList) {
+        if (CollectionUtils.isEmpty(infoList)) {
+            return Collections.emptyList();
+        }
+        return baseMapper.selectByInfos(infoList);
+    }
 }

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

@@ -176,15 +176,15 @@
             MAX ( i.tester ) "tester",
             to_char( MAX ( i.test_time ), 'YYYY-MM-DD HH24:MI:SS' ) "test_time",
             MAX ( r.report_sender ) "report_sender",
-            MAX ( CASE WHEN ii.NAME = '原铝Fe' THEN TRIM ( ii.test_value ) END ) "fe",
-            MAX ( CASE WHEN ii.NAME = '原铝Si' THEN TRIM ( ii.test_value ) END ) "si",
-            MAX ( CASE WHEN ii.NAME = '原铝Cu' THEN TRIM ( ii.test_value ) END ) "cu",
-            MAX ( CASE WHEN ii.NAME = '原铝Ga' THEN TRIM ( ii.test_value ) END ) "ga",
-            MAX ( CASE WHEN ii.NAME = '原铝Mg' THEN TRIM ( ii.test_value ) END ) "mg",
-            MAX ( CASE WHEN ii.NAME = '原铝Zn' THEN TRIM ( ii.test_value ) END ) "zn",
-            MAX ( CASE WHEN ii.NAME = '原铝Mn' THEN TRIM ( ii.test_value ) END ) "mn",
-            MAX ( CASE WHEN ii.NAME = '原铝Ni' THEN TRIM ( ii.test_value ) END ) "ni",
-            MAX ( CASE WHEN ii.NAME = '原铝V' THEN TRIM ( ii.test_value ) END ) "v"
+            MAX ( CASE WHEN i.NAME = '原铝Fe' AND ii.NAME = '原铝Fe' THEN TRIM ( ii.test_value ) END ) "fe",
+            MAX ( CASE WHEN i.NAME = '原铝Si' AND ii.NAME = '原铝Si' THEN TRIM ( ii.test_value ) END ) "si",
+            MAX ( CASE WHEN i.NAME = '原铝Cu' AND ii.NAME = '原铝Cu' THEN TRIM ( ii.test_value ) END ) "cu",
+            MAX ( CASE WHEN i.NAME = '原铝Ga' AND ii.NAME = '原铝Ga' THEN TRIM ( ii.test_value ) END ) "ga",
+            MAX ( CASE WHEN i.NAME = '原铝Mg' AND ii.NAME = '原铝Mg' THEN TRIM ( ii.test_value ) END ) "mg",
+            MAX ( CASE WHEN i.NAME = '原铝Zn' AND ii.NAME = '原铝Zn' THEN TRIM ( ii.test_value ) END ) "zn",
+            MAX ( CASE WHEN i.NAME = '原铝Mn' AND ii.NAME = '原铝Mn' THEN TRIM ( ii.test_value ) END ) "mn",
+            MAX ( CASE WHEN i.NAME = '原铝Ni' AND ii.NAME = '原铝Ni' THEN TRIM ( ii.test_value ) END ) "ni",
+            MAX ( CASE WHEN i.NAME = '原铝V'  AND ii.NAME = '原铝V' THEN TRIM ( ii.test_value ) END ) "v"
         FROM entrust_sample_item_index  ii
         JOIN entrust_sample_item i on i.id = ii.entrust_sample_item_id and i.deleted = 0
         JOIN entrust_sample      s on s.id = i.entrust_sample_id and s.deleted = 0

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

@@ -25,4 +25,22 @@
           and o.sample_num = i.sample_code
           and o.data is not null
     </select>
+
+    <select id="selectByInfos"
+            resultType="com.patzn.cloud.service.lims.collection.entity.LmsOriginalRecordInfo">
+        select i.* from lms_original_record_info i where i.deleted = 0
+        <foreach collection="infoList" item="info" open="and ( " close=")" separator=" or ">
+            ( 1 = 1
+            <if test="null != info.contractCode">
+                and i.contract_code = #{info.contractCode}
+            </if>
+            <if test="null != info.sampleNum">
+                and i.sample_num = #{info.sampleNum}
+            </if>
+            <if test="null != info.itemName">
+                and i.item_name = #{info.itemName}
+            </if>
+            )
+        </foreach>
+    </select>
 </mapper>