zjh 2024/02/18--1

zjh

2024-02-18 16bf2151e55c07717bb18a1eb3340aeff18ecf67

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

@@ -98,14 +98,6 @@
                            }
                            tjProject.setAllSonProName(allSonProName.toString());   //2023.2.7 套餐内每一父项目的子项目字符串
                            tjProjectList.add(tjProject);
//                            LambdaQueryWrapper<TjProConsumables> wrapper1 = new LambdaQueryWrapper<>();
//                            wrapper1.eq(TjProConsumables::getProId, packageProject.getProId());
//                            List<TjProConsumables> list0 = tjProConsumablesService.list(wrapper1);
//                            List<TjConsumables> list1 = new ArrayList<>();
//                            for (TjProConsumables tjProConsumables : list0) {
//                                list1.add(tjConsumablesService.getById(tjProConsumables.getConsumablesId()));
//                            }
//                            tjProject.setConsumablesList(list1);
                            //现价赋值判断null赋原价  2023.2.8
                            if (packageProject.getPriceNow() != null) {
                                tjProject.setPriceNow(packageProject.getPriceNow());
@@ -118,7 +110,7 @@
                }
                aPackage.setTjProjectList(tjProjectList);
                aPackage.setAllProName(allProName.toString());
                aPackage.setAllSonName(allSonName.toString());
//                aPackage.setAllSonName(allSonName.toString());

                StringBuffer a = new StringBuffer();
                List<String> b = new ArrayList<>();
@@ -183,14 +175,61 @@
//            return getDataTable(tjPackageList);
//        }
        String pacName="";
        if (cusSex.equals("2")) {
            return getDataTable(tjPackageService.getPacListBySqlAndAll(pacName));

        if (cusSex==null || cusSex.equals("2")) {
            final List<TjPackage> pacListBySqlAndAll = tjPackageService.getPacListBySqlAndAll(pacName);
            if (pacListBySqlAndAll!=null){
                for (TjPackage tjPackage : pacListBySqlAndAll) {
                    List<TjProject> res=new ArrayList<>();
                    LambdaQueryWrapper<TjPackageProject> wqq=new LambdaQueryWrapper<>();
                    wqq.eq(TjPackageProject::getPacId,tjPackage.getPacId());
                    final List<TjPackageProject> list = ppservice.list(wqq);
                    if (list!=null){
                        for (TjPackageProject tjPackageProject : list) {
                            final TjProject byId = tjProjectService.getById(tjPackageProject.getProId());
                            res.add(byId);
                        }
                        tjPackage.setTjProjectList(res);
                    }
                }
            }
            return getDataTable(pacListBySqlAndAll);
        } else {
            if (cusSex.equals("0")) {
                return getDataTable(tjPackageService.getPacListBySqlAndMan(pacName));
                final List<TjPackage> pacListBySqlAndMan = tjPackageService.getPacListBySqlAndMan(pacName);
                if (pacListBySqlAndMan!=null){
                    for (TjPackage tjPackage : pacListBySqlAndMan) {
                        List<TjProject> res=new ArrayList<>();
                        LambdaQueryWrapper<TjPackageProject> wqq=new LambdaQueryWrapper<>();
                        wqq.eq(TjPackageProject::getPacId,tjPackage.getPacId());
                        final List<TjPackageProject> list = ppservice.list(wqq);
                        if (list!=null){
                            for (TjPackageProject tjPackageProject : list) {
                                final TjProject byId = tjProjectService.getById(tjPackageProject.getProId());
                                res.add(byId);
                            }
                            tjPackage.setTjProjectList(res);
                        }
                    }
                }
                return getDataTable(pacListBySqlAndMan);
            }else {
                return getDataTable(tjPackageService.getPacListBySqlAndWomen(pacName));
                final List<TjPackage> pacListBySqlAndWomen = tjPackageService.getPacListBySqlAndWomen(pacName);
                if (pacListBySqlAndWomen!=null){
                    for (TjPackage tjPackage : pacListBySqlAndWomen) {
                        List<TjProject> res=new ArrayList<>();
                        LambdaQueryWrapper<TjPackageProject> wqq=new LambdaQueryWrapper<>();
                        wqq.eq(TjPackageProject::getPacId,tjPackage.getPacId());
                        final List<TjPackageProject> list = ppservice.list(wqq);
                        if (list!=null){
                            for (TjPackageProject tjPackageProject : list) {
                                final TjProject byId = tjProjectService.getById(tjPackageProject.getProId());
                                res.add(byId);
                            }
                            tjPackage.setTjProjectList(res);
                        }
                    }
                }
                return getDataTable(pacListBySqlAndWomen);
            }
        }
    }
@@ -308,6 +347,14 @@
                    }
                    tjpp.setProId(tjProject.getProId());
                    tjpp.setPacId(tjPackage.getPacId());
                    //判断当前套餐下有没有这个项目  有的话跳过添加
                    LambdaQueryWrapper<TjPackageProject> wqq=new LambdaQueryWrapper<>();
                    wqq.eq(TjPackageProject::getPacId,tjPackage.getPacId());
                    wqq.eq(TjPackageProject::getProId,tjProject.getProId());
                    final TjPackageProject one = ppservice.getOne(wqq);
                    if (one!=null){
                        continue;
                    }
                    ppservice.save(tjpp);
                    if (null != tjProject.getPriceNow()) {
                        money = money.add(tjProject.getPriceNow());