zhaowenxuan
2025-01-02 4761f2bc70814bde9929f1081a213a9ab38a7393
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjZhxmController.java
@@ -55,17 +55,19 @@
                    StringBuilder allName = new StringBuilder();
                    if (null != list && list.size() > 0) {
                        List<TjProject> projectList = new ArrayList<>();
                        BigDecimal money = new BigDecimal("0.00");
                        for (TjZhxmglpro zhxmglpro : list) {
                            LambdaQueryWrapper<TjProject> wq1 = new LambdaQueryWrapper<>();
                            wq1.eq(TjProject::getProId, zhxmglpro.getProId());
                            wq1.eq(TjProject::getProParentId, 0);
                            if (null != tjProjectService.getOne(wq1)) {
                                projectList.add(tjProjectService.getOne(wq1));
                                allName.append(tjProjectService.getOne(wq1).getProName()).append(";");
                            TjProject project = tjProjectService.getById(zhxmglpro.getProId());
                            if (null != project) {
                                projectList.add(project);
                                allName.append(project.getProName()).append(";");
                                money=money.add(project.getProPrice());
                            }
                        }
                        zhxm.setPrice(money);
                        zhxm.setAllProName(allName.toString());
                        zhxm.setZhxmglpros(list);
                        zhxm.setTjProjectList(projectList);
                    }
                }
                return AjaxResult.success(lists);
@@ -143,26 +145,19 @@
//                StringBuilder allSonName = new StringBuilder();
                if (null != list && list.size() > 0) {
                    List<TjProject> projectList = new ArrayList<>();
                    BigDecimal money = new BigDecimal("0.00");
                    for (TjZhxmglpro zhxmglpro : list) {
                        LambdaQueryWrapper<TjProject> wq1 = new LambdaQueryWrapper<>();
                        wq1.eq(TjProject::getProId, zhxmglpro.getProId());
                        wq1.eq(TjProject::getProParentId, 0);
                        if (null != tjProjectService.getOne(wq1)) {
                            projectList.add(tjProjectService.getOne(wq1));
                            allName.append(tjProjectService.getOne(wq1).getProName()).append(";");
                        TjProject project = tjProjectService.getById(zhxmglpro.getProId());
                        if (null != project) {
                            projectList.add(project);
                            allName.append(project.getProName()).append(";");
                            money=money.add(project.getProPrice());
                        }
                    }
                    zhxm.setAllProName(allName.toString());
//                    for (TjProject tjProject : projectList) {
//                        LambdaQueryWrapper<TjProject> wq2 = new LambdaQueryWrapper<>();
//                        wq2.eq(TjProject::getProParentId, tjProject.getProId());
//                        tjProject.setTjProjectList(tjProjectService.list(wq2));
//                        for (TjProject project : tjProjectService.list(wq2)) {
//                            allSonName.append(project.getProName()).append(";");
//                        }
//                        tjProject.setAllSonProName(allSonName.toString());
//                    }
                    zhxm.setPrice(money);
                    zhxm.setZhxmglpros(list);
                    zhxm.setTjProjectList(projectList);
                    return AjaxResult.success(zhxm);
                }