zjh20250424

zjh

2025-04-24 672ce84d5ce6545a0e81709ea736c69cbbef8c1a

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

@@ -94,32 +94,19 @@
    public AjaxResult getPacInFo(@ApiParam(value = "体检套餐对象id") String pacId) {
        TjPackage aPackage = tjPackageService.getById(pacId);
        if (null != aPackage) {
                List<TjProject> tjProjectList = new ArrayList<>();
                List<TjPackageProject> pplist = ppservice.getTjPackageProjectListByPacId(String.valueOf(aPackage.getPacId()));
                if (null != pplist) {
                    for (TjPackageProject packageProject : pplist) {
//                        StringBuilder allSonProName = new StringBuilder();   //2023.2.7 套餐内每一父项目的子项目字符串
                        TjProject tjProject = tjProjectService.getById(packageProject.getProId());
                        if (null != tjProject) {
//                            List<TjProject> listBySoneId = tjProjectService.getTjProjectListBySoneId(String.valueOf(packageProject.getProId()));
//                            for (TjProject project : listBySoneId) {
//                                allSonProName.append(project.getProName()).append(";");  //2023.2.7 套餐内每一父项目的子项目字符串
//                            }
                            tjProject.setAllSonProName(tjProjectService.getAllSonNames(String.valueOf(packageProject.getProId())));   //2023.2.7 套餐内每一父项目的子项目字符串
                            tjProjectList.add(tjProject);
                            //现价赋值判断null赋原价  2023.2.8
                            if (packageProject.getPriceNow() != null) {
                                tjProject.setPriceNow(packageProject.getPriceNow());
                            } else {
                                tjProject.setPriceNow(tjProject.getProPrice());
                            }

                            packageProject.setProName(tjProject.getProName());
                        }
                    }
                }
                aPackage.setTjProjectList(tjProjectList);
                aPackage.setPackageProjects(pplist);
            return AjaxResult.success(aPackage);
        }
        return AjaxResult.success(aPackage);
        return AjaxResult.error();
    }


@@ -289,7 +276,7 @@
    }

    private void getTjPackageList(List<TjPackage> tjPackageList) {
        if (null != tjPackageList && tjPackageList.size() > 0) {
        if (null != tjPackageList && !tjPackageList.isEmpty()) {
            for (TjPackage aPackage : tjPackageList) {
                List<TjProject> tjProjectList = new ArrayList<>();
                List<TjPackageProject> pplist = ppservice.getTjPackageProjectListByPacId(String.valueOf(aPackage.getPacId()));
@@ -661,12 +648,10 @@
            List<TjPackageProject> projectList = tjPackage.getPackageProjects();
            if (null != projectList && !projectList.isEmpty()) {
                if(StringUtil.isNotBlank(tjPackage.getPacId())){
                    if (ppservice.deleteTjPackageProjectByPacId(tjPackage.getPacId())) {
                        for (TjPackageProject project : projectList) {
                            project.setPacId(tjPackage.getPacId());
                            ppservice.save(project);
                        }

                    ppservice.deleteTjPackageProjectByPacId(tjPackage.getPacId());
                    for (TjPackageProject project : projectList) {
                        project.setPacId(tjPackage.getPacId());
                        ppservice.save(project);
                    }
                }
            }