From d9011266a0af3c288f2c3d32252f9c0f5e427b1b Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Tue, 10 Sep 2024 21:26:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E6=9C=AC=E7=A7=91=E7=9B=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90=E4=BF=AE=E6=94=B9bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/cost/controller/CostBudgetController.java | 9 +++++---- .../xmgl/modules/cost/service/ICostBudgetService.java | 2 +- .../modules/cost/service/impl/CostBudgetServiceImpl.java | 5 +++-- .../cost/service/impl/CostSubjectServiceImpl.java | 6 +++--- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/cost/controller/CostBudgetController.java b/src/main/java/com/zhgd/xmgl/modules/cost/controller/CostBudgetController.java index 3f1c0b26f..1126b4f4c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/cost/controller/CostBudgetController.java +++ b/src/main/java/com/zhgd/xmgl/modules/cost/controller/CostBudgetController.java @@ -95,13 +95,14 @@ public class CostBudgetController { @PostMapping(value = "/tree") public Result> tree(@ApiIgnore @RequestBody Map map) { String projectSn = MapUtils.getString(map, "projectSn"); + String version = MapUtils.getString(map, "version"); map.put("sn", projectSn); // ProjectInfoExtVo projectInfoBySn = projectService.getProjectInfoBySn(projectSn); // Company company = companyService.getOne(Wrappers.lambdaQuery().eq(Company::getCompanySn, projectInfoBySn.getCompanySn())); // map.put("companySn", company.getHeadquartersSn()); QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(CostSubject.class, map); // queryWrapper.lambda().eq(CostSubject::getType, projectInfoBySn.getProjectLx()); - List list = costBudgetService.tree(queryWrapper, projectSn); + List list = costBudgetService.tree(queryWrapper, projectSn, version); return Result.success(list); } @@ -414,10 +415,10 @@ public class CostBudgetController { String basePath = fileStorageProperties.getLocal().get(0).getBasePath(); MultipartFile multipartFile = FileUtil.getMulFileByPath(basePath + fileName); ProjectInfoExtVo projectInfoBySn = projectService.getProjectInfoBySn(projectSn); - Company company = companyService.getOne(Wrappers.lambdaQuery().eq(Company::getCompanySn, projectInfoBySn.getCompanySn())); +// Company company = companyService.getOne(Wrappers.lambdaQuery().eq(Company::getCompanySn, projectInfoBySn.getCompanySn())); LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() - .eq(CostSubject::getSn, company.getHeadquartersSn()) - .eq(CostSubject::getType, projectInfoBySn.getProjectLx()); + .eq(CostSubject::getSn, projectSn) + .eq(CostSubject::getLevelType, 3); List subjectList = costSubjectService.list(wrapper); ImportParams params = new ImportParams(); params.setTitleRows(2); diff --git a/src/main/java/com/zhgd/xmgl/modules/cost/service/ICostBudgetService.java b/src/main/java/com/zhgd/xmgl/modules/cost/service/ICostBudgetService.java index db7d15d85..4c8ce7e5d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/cost/service/ICostBudgetService.java +++ b/src/main/java/com/zhgd/xmgl/modules/cost/service/ICostBudgetService.java @@ -18,7 +18,7 @@ import java.util.List; */ public interface ICostBudgetService extends IService { - List tree(QueryWrapper wrapper, String projectSn); + List tree(QueryWrapper wrapper, String projectSn, String version); List exportList(QueryWrapper wrapper, ProjectInfoExtVo projectInfoBySn, boolean flag, String level); diff --git a/src/main/java/com/zhgd/xmgl/modules/cost/service/impl/CostBudgetServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/cost/service/impl/CostBudgetServiceImpl.java index 543b1a91c..838152468 100644 --- a/src/main/java/com/zhgd/xmgl/modules/cost/service/impl/CostBudgetServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/cost/service/impl/CostBudgetServiceImpl.java @@ -45,7 +45,7 @@ public class CostBudgetServiceImpl extends ServiceImpl tree(QueryWrapper wrapper, String projectSn) { + public List tree(QueryWrapper wrapper, String projectSn, String version) { wrapper.lambda().eq(CostSubject::getParentId, 0); List list = costSubjectService.list(wrapper); List filter = list.stream().filter(l -> StringUtils.isNotBlank(l.getName())).collect(Collectors.toList()); @@ -56,7 +56,8 @@ public class CostBudgetServiceImpl extends ServiceImpl allList = costSubjectService.list(); List allDtoList = convert(allList); List budgetList = this.list(Wrappers.lambdaQuery() - .eq(CostBudget::getProjectSn, projectSn)); + .eq(CostBudget::getProjectSn, projectSn) + .eq(CostBudget::getVersion, version)); List contractList = costContractService.list(Wrappers.lambdaQuery() .eq(CostContract::getProjectSn, projectSn)); List costContractPayList = new ArrayList<>(); diff --git a/src/main/java/com/zhgd/xmgl/modules/cost/service/impl/CostSubjectServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/cost/service/impl/CostSubjectServiceImpl.java index de3cd6148..4c34d54b9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/cost/service/impl/CostSubjectServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/cost/service/impl/CostSubjectServiceImpl.java @@ -68,7 +68,7 @@ public class CostSubjectServiceImpl extends ServiceImpl toOrganizationJobs = toOrganizationJobService.list(new LambdaQueryWrapper().eq(CostSubjectToOrganizationJob::getOrganizationJobId, jobId)); Set hasSubjectIds = toOrganizationJobs.stream().map(CostSubjectToOrganizationJob::getCostSubjectId).collect(Collectors.toSet()); List records = pageList.getRecords(); - Map typeMap = dictionaryItemService.getDictList("project_lx", projectSn).stream().collect(Collectors.toMap(DictionaryItem::getData, DictionaryItem::getName, (s, s2) -> s)); + Map typeMap = dictionaryItemService.getDictList("cost_subject_type", projectSn).stream().collect(Collectors.toMap(DictionaryItem::getData, DictionaryItem::getName, (s, s2) -> s)); Map subjectAttributionMap = dictionaryItemService.getDictList("cost_subject_attribution", projectSn).stream().collect(Collectors.toMap(DictionaryItem::getData, DictionaryItem::getName, (s, s2) -> s)); Map subjectConcreteCategoryMap = dictionaryItemService.getDictList("cost_subject_concrete_category", projectSn).stream().collect(Collectors.toMap(DictionaryItem::getData, DictionaryItem::getName, (s, s2) -> s)); getChildren(records, allList, hasSubjectIds, typeMap, subjectAttributionMap, subjectConcreteCategoryMap); @@ -152,8 +152,8 @@ public class CostSubjectServiceImpl extends ServiceImpl