zjh
2024-12-30 1b7ed7edb09aaecf68ddf3396ee007bc6eadf52a
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjZhxmController.java
@@ -54,12 +54,12 @@
                    List<TjZhxmglpro> list = tjZhxmglproService.list(wq);
                    StringBuilder allName = new StringBuilder();
                    if (null != list && list.size() > 0) {
//                        List<TjProject> projectList = new ArrayList<>();
                        List<TjProject> projectList = new ArrayList<>();
                        BigDecimal money = new BigDecimal("0.00");
                        for (TjZhxmglpro zhxmglpro : list) {
                            TjProject project = tjProjectService.getById(zhxmglpro.getProId());
                            if (null != project) {
//                                projectList.add(tjProjectService.getOne(wq1));
                                projectList.add(project);
                                allName.append(project.getProName()).append(";");
                                money=money.add(project.getProPrice());
                            }
@@ -67,6 +67,7 @@
                        zhxm.setPrice(money);
                        zhxm.setAllProName(allName.toString());
                        zhxm.setZhxmglpros(list);
                        zhxm.setTjProjectList(projectList);
                    }
                }
                return AjaxResult.success(lists);
@@ -143,12 +144,12 @@
                StringBuilder allName = new StringBuilder();
//                StringBuilder allSonName = new StringBuilder();
                if (null != list && list.size() > 0) {
//                    List<TjProject> projectList = new ArrayList<>();
                    List<TjProject> projectList = new ArrayList<>();
                    BigDecimal money = new BigDecimal("0.00");
                    for (TjZhxmglpro zhxmglpro : list) {
                        TjProject project = tjProjectService.getById(zhxmglpro.getProId());
                        if (null != project) {
//                            projectList.add(tjProjectService.getOne(wq1));
                            projectList.add(project);
                            allName.append(project.getProName()).append(";");
                            money=money.add(project.getProPrice());
                        }
@@ -156,6 +157,7 @@
                    zhxm.setAllProName(allName.toString());
                    zhxm.setPrice(money);
                    zhxm.setZhxmglpros(list);
                    zhxm.setTjProjectList(projectList);
                    return AjaxResult.success(zhxm);
                }