默认查询当天的数据；

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

@@ -20,7 +20,6 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -40,18 +39,21 @@ public class ItemComparisonServiceImpl extends BaseServiceImpl<ItemComparisonMap
 
     @Override
     public Page<ItemComparison> page(Page<ItemComparison> page, SlotQueryDTO slotQueryDTO) {
-        fillPeriod(slotQueryDTO);
+        fillQueryData(slotQueryDTO);
         return page.setRecords(baseMapper.selectDataPage(page, slotQueryDTO));
     }
 
-    private void fillPeriod(SlotQueryDTO slotQueryDTO) {
+    private void fillQueryData(SlotQueryDTO slotQueryDTO) {
         Account account = LoginHelper.getAccount();
         slotQueryDTO.setPeriod(userInfoService.getUserPeriod(account));
+        if (null == slotQueryDTO.getQueryDate()) {
+            slotQueryDTO.setQueryDate(new Date());
+        }
     }
 
     @Override
     public Page<ItemComparisonVO> pageVO(Page<ItemComparisonVO> page, SlotQueryDTO queryDTO) {
-        fillPeriod(queryDTO);
+        fillQueryData(queryDTO);
         List<ItemComparison> comparisonList = baseMapper.selectDataPage(page, queryDTO);
         List<ItemComparisonVO> comparisonVOList = new ArrayList<>();
         // 不为空时，先根据比较日期和槽号来过滤数据，组成Map<String,List>数据，
@@ -115,7 +117,7 @@ public class ItemComparisonServiceImpl extends BaseServiceImpl<ItemComparisonMap
             }
             item.setLimitValue(limitValueStr);
             item.setReclaim(false);
-            logger.error("compare item data: ", JacksonUtils.toJSONString(item));
+            logger.error("compare item data: {}", JacksonUtils.toJSONString(item));
             try {
                 BigDecimal newVal = new BigDecimal(item.getTestValue());
                 logger.error("newValue is :" + newVal.doubleValue());
@@ -144,16 +146,15 @@ public class ItemComparisonServiceImpl extends BaseServiceImpl<ItemComparisonMap
                 itemList.addAll(list);
             }
         });
-        logger.error(JacksonUtils.toJSONString(itemList));
+        logger.error("handler data for list is: {}", JacksonUtils.toJSONString(itemList));
         return itemList;
     }
 
     @Override
     public boolean saveCompareDataBatch(SlotQueryDTO queryDTO, Account account) {
         List<ItemComparison> comparisonList = listCompareItems(queryDTO);
-        logger.error("search data : {}", JacksonUtils.toJSONString(comparisonList));
+        logger.error("saveCompareDataBatch -- search data : {}", JacksonUtils.toJSONString(comparisonList));
         if (CollectionUtils.isEmpty(comparisonList)) {
-            logger.error("search data : empty list");
             return false;
         }
         // ==
@@ -164,14 +165,21 @@ public class ItemComparisonServiceImpl extends BaseServiceImpl<ItemComparisonMap
         ItemComparison comparison = comparisonList.get(0);
         queryDTO.setQueryDate(DateUtils.str2Date(comparison.getCompareDate()));
         queryDTO.setSampleName(comparison.getSampleName());
+        logger.error("saveCompareDataBatch condition is: {}", JacksonUtils.toJSONString(queryDTO));
         // 根据时间查询是否有存在的数据
         List<ItemComparison> itemComparisonList = baseMapper.selectDataPage(new Page(1, Integer.MAX_VALUE), queryDTO);
-        logger.info("search query item comparison list is : {}", JacksonUtils.toJSONString(itemComparisonList));
-        // 数据组Map，过滤重复数据
+        logger.error("saveCompareDataBatch compare data list is : {}", JacksonUtils.toJSONString(itemComparisonList));
+        // 组list,过滤重复数据
         if (CollectionUtils.isNotEmpty(itemComparisonList)) {
-            Map<String, ItemComparison> itemComparisonMap = itemComparisonList.stream().collect(Collectors.toMap(it -> it.getSampleCode(), Function.identity()));
-            comparisonList.removeIf(item -> itemComparisonMap.containsKey(item.getSampleCode()));
+            List<String> sampleCodeList = itemComparisonList.stream()
+                    .map(ItemComparison::getSampleCode)
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toList());
+            // ==
+            // comparisonList.removeIf(item -> sampleCodeList.contains(item.getSampleCode()));
+            comparisonList = comparisonList.stream().filter(item -> !sampleCodeList.contains(item.getSampleCode())).collect(Collectors.toList());
         }
+        logger.error("saveCompareDataBatch -- handler data is: {}", comparisonList);
         if (CollectionUtils.isEmpty(comparisonList)) {
             return true;
         }

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

@@ -30,7 +30,7 @@
                 and ic.compare_date = to_char(#{vo.queryDate}::timestamp,'yyyy-MM-dd')
             </if>
         </where>
-        order by ic.compare_date desc,ic.slot_no, ic.name
+        order by ic.sample_code desc,ic.name
     </select>
 
     <!--查询某个日期的比对检测项目数据-->