zjh20241021

zjh

2024-10-21 a807cfe099406b061afafd53219bbacf71fcc9d9

zjh20241021

 ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java

@@ -805,6 +805,12 @@

            } else {
//                wqq.in(TbTransition::getProId, Arrays.asList(tjProIds));

                //如果该项目存在 则 不保存

                TjOrderDetail orderDetail = tjOrderDetailService.getTjOrderDetailByOrderId(String.valueOf(tjFlowingWater.getOrderId()), tjProId);
                if(null !=orderDetail) continue;

                TjProject projects = projectService.selectTjProjectByProId(Long.valueOf(tjProId));
                if (null != projects) {
                    TjProject projectss = projectService.getById(projects.getProParentId());
@@ -844,11 +850,14 @@
            }

        }
        List<TjOrderDetail> collect = tjOrderDetails.stream().filter(item -> {
            TjProject project = projectService.getById(item.getProId());
            return project != null && project.getProParentId() == 0;
        }).collect(Collectors.toList());
//        addCaiYangDengJi(collect, !collect.isEmpty(), order, sysUser,jxbz);
//        List<TjOrderDetail> collect = tjOrderDetails.stream().filter(item -> {
//            TjProject project = projectService.getById(item.getProId());
//            return project != null && project.getProParentId() == 0;
//        }).collect(Collectors.toList());
////        addCaiYangDengJi(collect, !collect.isEmpty(), order, sysUser,jxbz);
        List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
        addCaiYangDengJi(detailList,!detailList.isEmpty(), order, sysUser,jxbz);

        tjOrderDetails = new ArrayList<>();

        ArrayList<TjProject> jianChaProjects = new ArrayList<>();
@@ -1022,11 +1031,13 @@
                    }
                }
            }
            collect = tjOrderDetails.stream().filter(item -> {
                TjProject project = projectService.getById(item.getProId());
                return project != null && project.getProParentId() == 0;
            }).collect(Collectors.toList());
//            addCaiYangDengJi(collect, !collect.isEmpty(), order, sysUser,jxbz);
//            collect = tjOrderDetails.stream().filter(item -> {
//                TjProject project = projectService.getById(item.getProId());
//                return project != null && project.getProParentId() == 0;
//            }).collect(Collectors.toList());
////            addCaiYangDengJi(collect, !collect.isEmpty(), order, sysUser,jxbz);
            List<TjOrderDetail> detailLists = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
            addCaiYangDengJi(detailLists,!detailLists.isEmpty(), order, sysUser,jxbz);
        }

        Boolean useLisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order);
@@ -1097,9 +1108,8 @@
                            ltkjJianchajianyanTreeService.save(tree);
                        }

                        List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());

                        addCaiYangDengJi(detailList,!detailList.isEmpty(), order, sysUser,jxbz);
//                        List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
//                        addCaiYangDengJi(detailList,!detailList.isEmpty(), order, sysUser,jxbz);

                    }
                }