添加对比page_vo

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

@@ -2,6 +2,7 @@ package com.patzn.cloud.service.lims.hmhj.controller;
 
 import com.patzn.cloud.service.hmhj.dto.SlotQueryDTO;
 import com.patzn.cloud.service.hmhj.entity.ItemComparison;
+import com.patzn.cloud.service.hmhj.vo.ItemComparisonVO;
 import com.patzn.cloud.service.lims.hmhj.service.IItemComparisonService;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -50,6 +51,17 @@ public class ItemComparisonController extends ServiceController {
         return success(itemComparisonService.page(getPage(), queryDTO));
     }
 
+    @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("/pageVO")
+    public RestResult<Page<ItemComparisonVO>> getPageVO(SlotQueryDTO queryDTO) {
+
+        return success(itemComparisonService.pageVO(getPage(), queryDTO));
+    }
+
     @ApiOperation("查询 id 信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),

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

@@ -5,6 +5,7 @@ import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.commons.service.IBaseService;
 import com.patzn.cloud.service.hmhj.dto.SlotQueryDTO;
 import com.patzn.cloud.service.hmhj.entity.ItemComparison;
+import com.patzn.cloud.service.hmhj.vo.ItemComparisonVO;
 
 import java.util.List;
 
@@ -33,13 +34,29 @@ public interface IItemComparisonService extends IBaseService<ItemComparison> {
      */
     boolean removeByIds(List<Long> ids);
 
+    /**
+     * List compare items list.
+     *
+     * @param queryDTO the query dto
+     * @return the list
+     */
     List<ItemComparison> listCompareItems(SlotQueryDTO queryDTO);
 
     /**
      * Save data batch boolean.
      *
      * @param queryDTO the comparison queryDTO
+     * @param account  the account
      * @return the boolean
      */
     boolean saveCompareDataBatch(SlotQueryDTO queryDTO, Account account);
+
+    /**
+     * Page vo page.
+     *
+     * @param page     the page
+     * @param queryDTO the query dto
+     * @return the page
+     */
+    Page<ItemComparisonVO> pageVO(Page<ItemComparisonVO> page, SlotQueryDTO queryDTO);
 }

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

@@ -1454,8 +1454,8 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
             handleSampleBrand(ids, finalSampleBrandMap, true);
 
             // 针对铝成品和原铝进行发送ERP数据处理
-            logger.error("{}开始执行发送ERP请求:---->ERP---", DateUtils.toYearMonthDayTime(new Date()));
-            sendTestDataToErp(Arrays.asList(ids), finalSampleBrandMap);
+            // logger.error("{}开始执行发送ERP请求:---->ERP---", DateUtils.toYearMonthDayTime(new Date()));
+            // sendTestDataToErp(Arrays.asList(ids), finalSampleBrandMap);
         });
 
         logger.error("======================质量判定结束========================");

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

@@ -10,6 +10,7 @@ import com.patzn.cloud.commons.toolkit.JacksonUtils;
 import com.patzn.cloud.commons.toolkit.MapMergeUtils;
 import com.patzn.cloud.service.hmhj.dto.SlotQueryDTO;
 import com.patzn.cloud.service.hmhj.entity.ItemComparison;
+import com.patzn.cloud.service.hmhj.vo.ItemComparisonVO;
 import com.patzn.cloud.service.lims.hmhj.mapper.ItemComparisonMapper;
 import com.patzn.cloud.service.lims.hmhj.service.IItemComparisonService;
 import com.patzn.cloud.service.lims.hmhj.service.IMaterialItemService;
@@ -39,9 +40,51 @@ public class ItemComparisonServiceImpl extends BaseServiceImpl<ItemComparisonMap
 
     @Override
     public Page<ItemComparison> page(Page<ItemComparison> page, SlotQueryDTO slotQueryDTO) {
+        fillPeriod(slotQueryDTO);
+        return page.setRecords(baseMapper.selectDataPage(page, slotQueryDTO));
+    }
+
+    private void fillPeriod(SlotQueryDTO slotQueryDTO) {
         Account account = LoginHelper.getAccount();
         slotQueryDTO.setPeriod(userInfoService.getUserPeriod(account));
-        return page.setRecords(baseMapper.selectDataPage(page, slotQueryDTO));
+    }
+
+    @Override
+    public Page<ItemComparisonVO> pageVO(Page<ItemComparisonVO> page, SlotQueryDTO queryDTO) {
+        fillPeriod(queryDTO);
+        List<ItemComparison> comparisonList = baseMapper.selectDataPage(page, queryDTO);
+        List<ItemComparisonVO> comparisonVOList = new ArrayList<>();
+        // 不为空时，先根据比较日期和槽号来过滤数据，组成Map<String,List>数据，
+        // 再进行处理成同样条数的不同形式，由原来的单项目多检测值，变成多项目单检测值
+        if (CollectionUtils.isNotEmpty(comparisonList)) {
+            Map<String, List<ItemComparison>> comparisonMap = new HashMap<>(16);
+            for (ItemComparison comp : comparisonList) {
+                MapMergeUtils.getorCreateMapArrayList(comp.getCompareDate() + comp.getSlotNo(), comparisonMap, comp);
+            }
+
+            for (Map.Entry<String, List<ItemComparison>> entry : comparisonMap.entrySet()) {
+                List<ItemComparison> comparisons = entry.getValue();
+                if (2 != comparisons.size()) {
+                    continue;
+                }
+                ItemComparison one = comparisons.get(0), two = comparisons.get(1);
+                ItemComparisonVO curr = new ItemComparisonVO(), prev = new ItemComparisonVO();
+                curr.setCompareDate(one.getCompareDate()).setSlotNo(one.getSlotNo()).setSampleName(one.getSampleName()).setSampleCode(one.getSampleCode());
+                prev.setCompareDate(one.getCompareDate()).setSlotNo(one.getSlotNo()).setSampleName(curr.getSampleName()).setSampleCode(one.getPrevSampleCode());
+                // 具体值
+                if (Objects.equals(one.getName(), "原铝Fe")) {
+                    curr.setFeVal(one.getTestValue()).setSiVal(two.getTestValue());
+                    prev.setFeVal(one.getPrevTestValue()).setSiVal(two.getPrevTestValue());
+                } else {
+                    curr.setFeVal(two.getTestValue()).setSiVal(one.getTestValue());
+                    prev.setFeVal(two.getPrevTestValue()).setSiVal(one.getPrevTestValue());
+                }
+                // 先后顺序，先当前值，再之前值
+                comparisonVOList.add(curr);
+                comparisonVOList.add(prev);
+            }
+        }
+        return page.setRecords(comparisonVOList);
     }
 
     @Override

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.name
+        order by ic.compare_date desc,ic.slot_no, ic.name
     </select>
 
     <!--查询某个日期的比对检测项目数据-->