合并数据

zhaowenxuan

2024-12-04 1f7a2b7352d3155e3b716751ccca94ef253fd399

合并数据

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java

@@ -1,9 +1,6 @@
package com.ltkj.web.controller.system;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.ServletSecurityElement;
@@ -272,6 +269,28 @@
            if(null !=order)sampling.setCardId(order.getCardId());
            sampling.setCustomer(customer);
        }

        if (list.size() >= 2) {
            // 进行合并
            List<String> stringList = list.stream().map(TjSampling::getId).collect(Collectors.toList());
            log.info("提取id ->{}",stringList);
            for (String s : stringList) {
                if (tjSamplingService.isMergeItem(s) != 0) {
                    list.removeIf(item -> Objects.equals(item.getId(), s));
                }
            }
            Map<String, List<TjSampling>> map = list.stream().collect(Collectors.groupingBy(item -> item.getSpecimenTypeCode()));
            for (Map.Entry<String, List<TjSampling>> entry : map.entrySet()) {
                List<TjSampling> entryValue = entry.getValue();
                tjSamplingService.mergeCaiYangTran(entryValue.stream().map(TjSampling::getId).collect(Collectors.toList()));
            }
        }
        wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(TjSampling::getCusId, cusId);
        wrapper.eq(TjSampling::getIsSignFor,isSignFor);
        wrapper.and(i -> i.isNull(TjSampling::getParentId).or().eq(TjSampling::getIsMerge,1));
        wrapper.orderByDesc(TjSampling::getIsMerge);
        list = tjSamplingService.list(wrapper);
        return AjaxResult.success(list);
    }