zjh
2024-06-26 33de5e90c14e44e1639c961a48e338c1da3d5624
zjh 本地 2024/06/26 --2
2个文件已修改
24 ■■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjZhxmController.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjZhxm.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjZhxmController.java
@@ -54,19 +54,20 @@
                    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));
                                allName.append(project.getProName()).append(";");
                                projectList.add(project);
//                                allName.append(project.getProName()).append(";");
                                money=money.add(project.getProPrice());
                            }
                        }
                        zhxm.setPrice(money);
                        zhxm.setAllProName(allName.toString());
//                        zhxm.setAllProName(allName.toString());
                        zhxm.setZhxmglpros(list);
                        zhxm.setTjProjectList(projectList);
                    }
                }
                return AjaxResult.success(lists);
@@ -140,22 +141,23 @@
                LambdaQueryWrapper<TjZhxmglpro> wq = new LambdaQueryWrapper<>();
                wq.eq(TjZhxmglpro::getZhId, zhxm.getId());
                List<TjZhxmglpro> list = tjZhxmglproService.list(wq);
                StringBuilder allName = new StringBuilder();
//                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));
                            allName.append(project.getProName()).append(";");
                            projectList.add(project);
//                            allName.append(project.getProName()).append(";");
                            money=money.add(project.getProPrice());
                        }
                    }
                    zhxm.setAllProName(allName.toString());
//                    zhxm.setAllProName(allName.toString());
                    zhxm.setPrice(money);
                    zhxm.setZhxmglpros(list);
                    zhxm.setTjProjectList(projectList);
                    return AjaxResult.success(zhxm);
                }
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjZhxm.java
@@ -46,4 +46,8 @@
    @ApiModelProperty(value = "父项目名称字符串")
    @TableField(exist = false)
    private String allProName;
    @ApiModelProperty(value = "组合中的项目集合")
    @TableField(exist = false)
    private List<TjProject> tjProjectList;
}