霍煤鸿骏优化

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

@@ -432,4 +432,19 @@ public class EntrustSampleController extends ServiceController {
         return success(entrustSampleService.pageBySampleLeftHis(getPage(), sampleVO));
     }
 
+
+
+
+    @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),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page_test_result_query")
+    public RestResult<Page<EntrustSampleVO>> getPageTestResultQuery(EntrustSampleVO entrustSample) {
+        return success(entrustSampleService.pageTestResultQuery(getPage(), entrustSample));
+    }
+
 }

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

@@ -24,4 +24,6 @@ public interface EntrustSampleMapper extends BatchMapper<EntrustSample> {
     List<EntrustSampleVO> selectVOList(RowBounds rowBounds, @Param("vo") EntrustSampleVO entrustSample);
 
     List<EntrustSampleVO> selectMinStatusByEntrustIds(@Param("entrustIds") List<Long> entrustIds);
+
+    List<EntrustSampleVO> selectTestResultQuery(RowBounds rowBounds,@Param("vo") EntrustSampleVO entrustSample);
 }

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

@@ -22,4 +22,6 @@ public interface IEntrustSampleItemIndexService extends IBaseService<EntrustSamp
     List<EntrustSampleItemIndexVO> listVOByExpIds(List<Long> expIdsList);
 
     List<EntrustSampleItemIndex> listBySampleId(Long id);
+
+    List<EntrustSampleItemIndex> listBySampleIds(List<Long> sampleIds);
 }

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

@@ -49,4 +49,8 @@ public interface IEntrustSampleService extends IBaseService<EntrustSample> {
     boolean submitToAcceptanceResultInput(Long[] ids, Account account);
 
     List<EntrustSampleVO> listMinStatusByEntrustIds(List<Long> entrustIds);
+
+    Page<EntrustSampleVO> pageTestResultQuery(Page<EntrustSampleVO> page, EntrustSampleVO entrustSample);
+
+    int countByEntrustId(Long id);
 }

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

@@ -60,4 +60,17 @@ public class EntrustSampleItemIndexServiceImpl extends BaseServiceImpl<EntrustSa
         }).collect(Collectors.toList());
         return list(Condition.create().in("entrust_sample_item_id",itemIds));
     }
+
+    @Override
+    public List<EntrustSampleItemIndex> listBySampleIds(List<Long> sampleIds) {
+        List<EntrustSampleItem> itemList =  entrustSampleItemService.list(Condition.create().in("entrust_sample_id",sampleIds));
+        if (CollectionUtils.isEmpty(itemList)){
+            return null;
+        }
+        List<Long> itemIds= itemList.stream().map(s->{
+            return s.getId();
+        }).collect(Collectors.toList());
+        return list(Condition.create().in("entrust_sample_item_id",itemIds));
+    }
+
 }

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

@@ -6,6 +6,7 @@ import com.google.common.collect.Lists;
 import com.patzn.cloud.commons.api.RestAssert;
 import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.commons.controller.LoginHelper;
+import com.patzn.cloud.commons.toolkit.DateUtils;
 import com.patzn.cloud.commons.toolkit.FileUtils;
 import com.patzn.cloud.oss.starter.OssClient;
 import com.patzn.cloud.service.hmhj.entity.*;
@@ -15,6 +16,7 @@ import com.patzn.cloud.service.hmhj.enums.EntrustStatusEnum;
 import com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO;
 import com.patzn.cloud.service.hmhj.vo.EntrustSampleVO;
 import com.patzn.cloud.service.lims.common.CompareUtils;
+import com.patzn.cloud.service.lims.hmhj.common.HSSFWorkbookUtil;
 import com.patzn.cloud.service.lims.hmhj.mapper.EntrustSampleItemMapper;
 import com.patzn.cloud.service.lims.hmhj.original.*;
 import com.patzn.cloud.service.lims.hmhj.service.*;
@@ -34,6 +36,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -399,6 +402,12 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
         }
 
 
+
+        Map<String, String> mapReplace = new HashMap<>();
+        mapReplace.put("#{nowDate}", DateUtils.toYearMonthDay(new Date()));
+        mapReplace.put("#{sampleNum}", entrustSampleService.countByEntrustId(entrust.getId())+"");
+        HSSFWorkbookUtil.replaceModel(mapReplace,xssfWorkbook,0);
+
         FileOutputStream os = null;
         File file = null;
         String generated = "原始记录";

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

@@ -2,6 +2,7 @@ package com.patzn.cloud.service.lims.hmhj.service.impl;
 
 import com.baomidou.mybatisplus.mapper.Condition;
 import com.baomidou.mybatisplus.toolkit.CollectionUtils;
+import com.google.common.collect.Lists;
 import com.patzn.cloud.commons.api.RestAssert;
 import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.commons.toolkit.DateUtils;
@@ -136,6 +137,44 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
     }
 
     @Override
+    public Page<EntrustSampleVO> pageTestResultQuery(Page<EntrustSampleVO> page, EntrustSampleVO entrustSample) {
+
+      List<EntrustSampleVO> voList =   baseMapper.selectTestResultQuery(page,entrustSample);
+        if (CollectionUtils.isEmpty(voList)){
+            return page;
+        }
+      List<Long> sampleIds =   voList.stream().map(s->{
+            return s.getId();
+        }).collect(Collectors.toList());
+
+      List<EntrustSampleItemIndex> indexList =  entrustSampleItemIndexService.listBySampleIds(sampleIds);
+      if (CollectionUtils.isEmpty(indexList)){
+          return page.setRecords(voList);
+      }
+      Map<Long,List<EntrustSampleItemIndex>> sampleIndexMap = new HashMap<>();
+        for (EntrustSampleItemIndex entrustSampleItemIndex : indexList) {
+           if (sampleIndexMap.containsKey(entrustSampleItemIndex.getEntrustSampleItemId())){
+               List<EntrustSampleItemIndex> itemIndexList =  sampleIndexMap.get(entrustSampleItemIndex.getEntrustSampleItemId());
+               itemIndexList.add(entrustSampleItemIndex);
+               sampleIndexMap.put(entrustSampleItemIndex.getEntrustSampleItemId(),itemIndexList);
+           }else {
+               List<EntrustSampleItemIndex> itemIndexList = Lists.newArrayList();
+               itemIndexList.add(entrustSampleItemIndex);
+               sampleIndexMap.put(entrustSampleItemIndex.getEntrustSampleItemId(),itemIndexList);
+           }
+        }
+        for (EntrustSampleVO vo : voList) {
+            vo.setIndexList(sampleIndexMap.get(vo.getId()));
+        }
+        return page.setRecords(voList);
+     }
+
+    @Override
+    public int countByEntrustId(Long id) {
+        return super.count(Condition.create().eq("entrust_id",id));
+    }
+
+    @Override
     public boolean removeByIds(List<Long> ids) {
         return baseMapper.deleteBatchIds(ids) > 0;
     }

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

@@ -95,4 +95,28 @@
     </select>
 
 
+
+
+    <select id="selectTestResultQuery" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleVO">
+
+        SELECT
+            s.id,s.name,s.code,e.code AS "entrustCode",e.client,e.entrust_time,e.test_side,s.supplier,s.manufacturer
+        FROM
+            entrust_sample s
+            JOIN entrust e ON s.entrust_id = e.ID
+
+            WHERE s.deleted = 0
+            AND e.deleted = 0
+            <if test="vo.name!=null">
+                AND s.name LIKE CONCAT('%',#{vo.name},'%')
+            </if>
+            <if test="vo.entrustTimeStart!=null">
+                AND e.entrust_time >= #{vo.entrustTimeStart}
+            </if>
+
+            <if test="vo.entrustTimeEnd!=null">
+                AND e.entrust_time <![CDATA[<=]]> #{vo.entrustTimeEnd}
+            </if>
+    </select>
+
 </mapper>

src/test/java/resources/db_sql/hmhj/v113/20210619新增样本库字段.sql

+ALTER TABLE "public"."material"
+ALTER TABLE "public"."material"
+  ADD COLUMN "manufacturer" varchar(150);
+
+
+COMMENT ON COLUMN "public"."material"."manufacturer" IS '制造厂商';
\ No newline at end of file

src/test/java/resources/db_sql/hmhj/v113/20210622新增样品制造厂商.sql

+ALTER TABLE "public"."entrust_sample"
+ALTER TABLE "public"."entrust_sample"
+  ADD COLUMN "manufacturer" varchar(255);
+
+COMMENT ON COLUMN "public"."entrust_sample"."manufacturer" IS '制造厂商';
\ No newline at end of file