霍煤多委托项目分配；

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

@@ -681,6 +681,19 @@ public class EntrustSampleItemController extends ServiceController {
         return success(entrustSampleItemService.getItemFillProgressQuery(getPage(), itemVO));
     }
 
+    @ApiOperation(value = "按项目分配左侧列表", notes = "按项目分配左侧列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataType = "String"),
+    })
+    @PostMapping("/page_allot_item_left")
+    public RestResult<Page<ItemVO>> pageAllotItemLeft(ItemVO vo) {
+        vo.setCompanyId(currentCompanyId());
+        return success(entrustSampleItemService.pageAllotItemLeft(getPage(), vo));
+    }
+
     @ApiOperation(value = "按项目录入左侧列表", notes = "按项目录入左侧列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataType = "int"),

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

@@ -81,8 +81,8 @@ public interface EntrustSampleItemMapper extends BatchMapper<EntrustSampleItem>
     List<EntrustSampleItemIndexVO> selectItemTestByEntrustId(@Param("entrustId") Long entrustId);
 
     @SqlParser(filter = true)
-    List<ItemVO> pageInputItemLeft(RowBounds rowBounds, @Param("vo") ItemVO vo);
+    List<ItemVO> pageItemDataLeft(RowBounds rowBounds, @Param("vo") ItemVO vo);
 
     @SqlParser(filter = true)
-    List<ItemVO> pageInputItemRight(RowBounds rowBounds, @Param("vo") ItemVO vo);
+    List<ItemVO> pageItemDataRight(RowBounds rowBounds, @Param("vo") ItemVO vo);
 }

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

@@ -124,9 +124,14 @@ public interface IEntrustSampleItemService extends IBaseService<EntrustSampleIte
 
     EntrustSampleItem getItemModelBySampleId(Long sampleId);
 
+    Page<ItemVO> pageAllotItemLeft(Page<ItemVO> page, ItemVO vo);
+
+    Page<ItemVO> pageAllotItemRight(Page<ItemVO> page, ItemVO vo);
+
     Page<ItemVO> pageInputItemLeft(Page<ItemVO> page, ItemVO vo);
 
     Page<ItemVO> pageInputItemRight(Page<ItemVO> page, ItemVO vo);
 
     Boolean checkCanWriteOriginal(Long[] ids);
+
 }

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

@@ -1384,12 +1384,32 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
     }
 
     @Override
+    public Page<ItemVO> pageAllotItemLeft(Page<ItemVO> page, ItemVO vo) {
+        vo.setStatus(EntrustSampleItemStatusEnum.ALLOT);
+        if (StringUtils.isNotBlank(vo.getName())) {
+            vo.setNameList(Arrays.asList(vo.getName().split(",|，")));
+        }
+        return page.setRecords(baseMapper.pageItemDataLeft(page, vo));
+    }
+
+    @Override
+    public Page<ItemVO> pageAllotItemRight(Page<ItemVO> page, ItemVO vo) {
+        vo.setStatus(EntrustSampleItemStatusEnum.ALLOT);
+        if (StringUtils.isNotBlank(vo.getName())) {
+            vo.setNameList(Arrays.asList(vo.getName().split(",|，")));
+        }
+        List<ItemVO> list = baseMapper.pageItemDataRight(page, vo);
+        return page.setRecords(list);
+
+    }
+
+    @Override
     public Page<ItemVO> pageInputItemLeft(Page<ItemVO> page, ItemVO vo) {
         vo.setStatus(EntrustSampleItemStatusEnum.TEST);
         if (StringUtils.isNotBlank(vo.getName())) {
             vo.setNameList(Arrays.asList(vo.getName().split(",|，")));
         }
-        return page.setRecords(baseMapper.pageInputItemLeft(page, vo));
+        return page.setRecords(baseMapper.pageItemDataLeft(page, vo));
     }
 
     @Override
@@ -1398,7 +1418,7 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
         if (StringUtils.isNotBlank(vo.getName())) {
             vo.setNameList(Arrays.asList(vo.getName().split(",|，")));
         }
-        List<ItemVO> list = baseMapper.pageInputItemRight(page, vo);
+        List<ItemVO> list = baseMapper.pageItemDataRight(page, vo);
         return page.setRecords(list);
     }
 

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

@@ -726,13 +726,16 @@
     </select>
 
     <!--获取数据录入 - 检测项目列表-->
-    <select id="pageInputItemLeft" resultType="com.patzn.cloud.service.hmhj.vo.ItemVO">
+    <select id="pageItemDataLeft" resultType="com.patzn.cloud.service.hmhj.vo.ItemVO">
         SELECT DISTINCT ON
             ( NAME, standard ) NAME, standard
         FROM
             entrust_sample_item i
-        where i.deleted = 0 and i.status = #{vo.status} and i.company_id = #{vo.companyId}
+        where i.deleted = 0 and i.company_id = #{vo.companyId}
 
+        <if test="null != vo.status">
+            and i.status = #{vo.status}
+        </if>
         <if test="null != vo.personal and vo.personal == 1">
             AND i.tester_id = #{vo.uid}
         </if>
@@ -752,7 +755,7 @@
         order by i.name
     </select>
     <!-- 查询数据录入- 按项目录入 - 右侧检测项目数据列表 -->
-    <select id="pageInputItemRight" resultType="com.patzn.cloud.service.hmhj.vo.ItemVO">
+    <select id="pageItemDataRight" resultType="com.patzn.cloud.service.hmhj.vo.ItemVO">
         SELECT
             i.id,i.entrust_sample_id,i.name,i.status,i.company_id,i.standard,i.group_name,i.test_value,i.group_id,i.tester,i.tester_id,i.test_time,i.in_report,i.entrust_id,
             s.name "sampleName",s.code "sampleCode",s.compliance_test,s.sample_from,sample_shape,s.first_code,s.second_code,s.third_code,