添加项目指标列表接口；

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

 package com.patzn.cloud.service.lims.hmhj.controller;
 
-import com.patzn.cloud.commons.api.RestAssert;
-import com.patzn.cloud.service.hmhj.entity.EntrustSampleItemIndex;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.baomidou.mybatisplus.plugins.Page;
 import com.patzn.cloud.commons.api.RestConstants;
 import com.patzn.cloud.commons.api.RestResult;
 import com.patzn.cloud.commons.controller.ServiceController;
+import com.patzn.cloud.service.hmhj.entity.EntrustSampleItemIndex;
+import com.patzn.cloud.service.hmhj.vo.EntrustSampleItemIndexVO;
 import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleItemIndexService;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -94,4 +85,14 @@ public class EntrustSampleItemIndexController extends ServiceController {
     public RestResult<Boolean> saveOrUpdate(EntrustSampleItemIndex entrustSampleItemIndex) {
         return success(entrustSampleItemIndexService.saveOrUpdateData(entrustSampleItemIndex));
     }
+
+    @ApiOperation("分页获取检测项目带指标信息列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
+    })
+    @PostMapping("/page_index_with_item")
+    public RestResult<Page<EntrustSampleItemIndexVO>> pageIndexWithItem(EntrustSampleItemIndexVO entrustSampleItemIndexVO) {
+        return success(entrustSampleItemIndexService.pageIndexWithItem(getPage(), entrustSampleItemIndexVO));
+    }
 }

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

 package com.patzn.cloud.service.lims.hmhj.mapper;
 
 import com.baomidou.mybatisplus.annotations.SqlParser;
-import com.patzn.cloud.service.hmhj.entity.EntrustSampleItemIndex;
 import com.patzn.cloud.commons.mapper.BatchMapper;
+import com.patzn.cloud.service.hmhj.entity.EntrustSampleItemIndex;
 import com.patzn.cloud.service.hmhj.vo.EntrustSampleItemIndexVO;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.session.RowBounds;
 
 import java.util.List;
 
@@ -24,4 +25,6 @@ public interface EntrustSampleItemIndexMapper extends BatchMapper<EntrustSampleI
 
     @SqlParser(filter = true)
     List<EntrustSampleItemIndex> getInReportItemIndex(@Param("sampleId") Long sampleId);
+
+    List<EntrustSampleItemIndexVO> selectIndexWithItem(RowBounds rowBounds, @Param("vo") EntrustSampleItemIndexVO entrustSampleItemIndexVO);
 }

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

@@ -35,4 +35,6 @@ public interface IEntrustSampleItemIndexService extends IBaseService<EntrustSamp
 
     /* 获取所有在报告中显示的指标 */
     List<EntrustSampleItemIndex> getInReportItemIndex(Long sampleId);
+
+    Page<EntrustSampleItemIndexVO> pageIndexWithItem(Page<EntrustSampleItemIndexVO> page, EntrustSampleItemIndexVO entrustSampleItemIndexVO);
 }

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

 package com.patzn.cloud.service.lims.hmhj.service.impl;
 
 import com.baomidou.mybatisplus.mapper.Condition;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.toolkit.CollectionUtils;
 import com.patzn.cloud.commons.api.RestAssert;
+import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
 import com.patzn.cloud.service.hmhj.entity.EntrustSampleItem;
 import com.patzn.cloud.service.hmhj.entity.EntrustSampleItemIndex;
 import com.patzn.cloud.service.hmhj.vo.EntrustSampleItemIndexVO;
 import com.patzn.cloud.service.lims.common.BeanUtils;
 import com.patzn.cloud.service.lims.hmhj.mapper.EntrustSampleItemIndexMapper;
 import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleItemIndexService;
-import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
 import com.patzn.cloud.service.lims.hmhj.service.IEntrustSampleItemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -41,6 +41,11 @@ public class EntrustSampleItemIndexServiceImpl extends BaseServiceImpl<EntrustSa
     }
 
     @Override
+    public Page<EntrustSampleItemIndexVO> pageIndexWithItem(Page<EntrustSampleItemIndexVO> page, EntrustSampleItemIndexVO entrustSampleItemIndexVO) {
+        return page.setRecords(baseMapper.selectIndexWithItem(page, entrustSampleItemIndexVO));
+    }
+
+    @Override
     public boolean removeByIds(List<Long> ids) {
         return baseMapper.deleteBatchIds(ids) > 0;
     }

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

@@ -43,4 +43,25 @@
             join entrust_sample s on s.id = i.entrust_sample_id
             where ii.deleted = 0 and s.id = #{sampleId}
     </select>
+
+    <select id="selectIndexWithItem" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemIndexVO">
+        select
+            i.id "itemId",i.name "itemName",i.standard,
+            ii.*
+        from entrust_sample_item_index ii
+        join entrust_sample_item i on i.id = ii.entrust_sample_item_id
+        where i.deleted = 0 and ii.deleted = 0
+        <if test="null != vo.sampleId">
+            and i.entrust_sample_id = #{vo.sampleId}
+        </if>
+        <if test="null != vo.entrustId">
+            and exists (
+                select 1 from entrust_sample s
+                where s.deleted = 0 and s.id = i.entrust_sample_id and s.entrust_id = #{vo.entrustId}
+            )
+        </if>
+        <if test="null != vo.itemId">
+            and i.id = #{vo.itemId}
+        </if>
+    </select>
 </mapper>