zjh202412012

zjh

2024-12-12 5f4847d23506f10f76bc5ba493880bb3b87df12c

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

@@ -346,7 +346,7 @@
            LambdaQueryWrapper<TjPackageProject> wq1 = new LambdaQueryWrapper<>();
            wq1.eq(TjPackageProject::getProId, tjProject.getProId());
            List<TjPackageProject> list1 = ppservice.list(wq1);
            if (null != list1 && list1.size() > 0) {
            if (null != list1 && !list1.isEmpty()) {
                return AjaxResult.error("该项目正在套餐中使用,暂时不能停用");
            }
        }
@@ -374,7 +374,7 @@
                    }
                }
                List<TjProject> list = tjProjectService.getTjProjectListBySoneId(String.valueOf(tjProject.getProId()));
                if (null != list && list.size() > 0) {
                if (null != list && !list.isEmpty()) {
                    for (TjProject project : list) {
                        project.setDeptId(tjProject.getDeptId());
                        project.setProType(tjProject.getProType());
@@ -385,7 +385,7 @@
                    }
                }
                List<TjConsumables> consumablesList = tjProject.getConsumablesList();
                if (null != consumablesList && consumablesList.size() > 0) {
                if (null != consumablesList && !consumablesList.isEmpty()) {
                    LambdaQueryWrapper<TjProConsumables> wq = new LambdaQueryWrapper<>();
                    wq.eq(TjProConsumables::getProId, tjProject.getProId());
                    proConsumablesService.remove(wq);
@@ -426,7 +426,7 @@
                }
            }
            List<TjStandard> tjStandardList = tjProject.getTjStandardList();
            if (null != tjStandardList && tjStandardList.size() > 0) {
            if (null != tjStandardList && !tjStandardList.isEmpty()) {
                for (TjStandard tjStandard : tjStandardList) {
                    if (null == tjStandard.getTjSex()) {
                        tjStandard.setTjSex(null);
@@ -442,8 +442,10 @@
            if (null != proParentId) {
                LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
                wq.eq(TjProject::getProParentId, proParentId);
                List<TjProject> projectList = tjProjectService.list(wq);
                if (null != projectList && projectList.size() > 0) {
                wq.eq(TjProject::getProStatus,0);
//                List<TjProject> projectList = tjProjectService.list(wq);
                List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(String.valueOf(proParentId));
                if (null != projectList && !projectList.isEmpty()) {
                    BigDecimal bigDecimal = new BigDecimal("0.00");
                    for (TjProject project : projectList) {
                        bigDecimal = bigDecimal.add(project.getProPrice());