zjh20250218

zjh

2025-02-18 0ebcb0aae7ebe897bfbf81a239d3c702f041c533

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

@@ -49,6 +49,7 @@

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.text.Collator;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -1538,7 +1539,9 @@
                                tjOrderDetail.setProResult(tjOrderDetail.getProResult());
                            }

                            dels.add(tjOrderDetail);
                            if(remark.getOrgType().equals(tjOrderDetail.getOrgType())){
                                dels.add(tjOrderDetail);
                            }
                        }
                    }
                    String summary = remark.getSummary();
@@ -1551,6 +1554,12 @@
                    if (dels.isEmpty()) {
                        continue;
                    }
                    dels=dels.stream().sorted(Comparator.comparing(TjOrderDetail::getProName, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
                    dels = dels.stream()
                                .sorted(Comparator.comparingInt(
                                        tjPdfVO -> tjPdfVO.getProName().length() // 根据名字的长度排序
                                ))
                                .collect(Collectors.toList());
                    parent.put("sons", dels);
                    parent.put("remark", remark.getRemark());
                    parent.put("jgbx", remark.getJgbx());
@@ -1685,21 +1694,26 @@
            }
            List<Map<String, Object>> mapList = zongjianyishengchakanyichangxiangmu(tjNum);

            List<Map<String, Object>> collect = maps.stream()
                    .filter(a -> mapList.stream()
                            .allMatch(b -> a.get("jyjc").equals(b.get("jyjc"))))
                    .collect(Collectors.toList());

            List<Map<String, Object>> collect = mapList.stream()
                    .filter(b -> maps.stream()
                            .noneMatch(a -> a.get("proName").equals(b.get("proName"))))  // 过滤掉在 maps 中存在的相同元素
                    .collect(Collectors.toList());
            if(!collect.isEmpty()){
                mapList.addAll(collect);
//                return AjaxResult.success(result);
                maps.addAll(collect);
            }
            if(!maps.isEmpty()){
                List<Map<String, Object>> collect1 = maps.stream()
                        .sorted((map1, map2) -> map2.get("proName").toString().compareTo(map1.get("proName").toString()))
                        .collect(Collectors.toList());
                return AjaxResult.success(collect1);
            }
           return AjaxResult.success(maps);
        }else {
            List<Map<String, Object>> mapList = zongjianyishengchakanyichangxiangmu(tjNum);
            if(mapList.isEmpty()){
                return AjaxResult.error("暂无数据");
            }
//            if(mapList.isEmpty()){
//                return AjaxResult.success("暂无数据");
//            }
            return AjaxResult.success(mapList);
        }

@@ -1796,7 +1810,7 @@
                return AjaxResult.success();
            }
        }
        return AjaxResult.error();
        return AjaxResult.success();
    }