From 29d84ef8feb899919fa3c1279053c11b21b987da Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Tue, 10 Sep 2024 19:40:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E6=9C=AC=E9=A2=84=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cost/controller/CostBudgetController.java       | 13 ++++++++-----
 .../modules/cost/service/ICostBudgetService.java    |  2 +-
 .../cost/service/impl/CostBudgetServiceImpl.java    |  9 ++++++---
 3 files changed, 15 insertions(+), 9 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 2feb3870f..3f1c0b26f 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
@@ -281,14 +281,17 @@ public class CostBudgetController {
     public ModelAndView exportXls(@RequestBody Map<String, Object> map) {
         // Step.1 组装查询条件
         String projectSn = MapUtils.getString(map, "projectSn");
+        String level = MapUtils.getString(map, "level");
         ProjectInfoExtVo projectInfoBySn = projectService.getProjectInfoBySn(projectSn);
-        Company company = companyService.getOne(Wrappers.<Company>lambdaQuery().eq(Company::getCompanySn, projectInfoBySn.getCompanySn()));
-        map.put("companySn", company.getHeadquartersSn());
-        map.put("type", projectInfoBySn.getProjectLx());
+//        Company company = companyService.getOne(Wrappers.<Company>lambdaQuery().eq(Company::getCompanySn, projectInfoBySn.getCompanySn()));
+//        map.put("companySn", company.getHeadquartersSn());
+//        map.put("type", projectInfoBySn.getProjectLx());
+        map.put("sn", projectSn);
+        map.put("level_type", 3);
         QueryWrapper<CostSubject> queryWrapper = QueryGenerator.initPageQueryWrapper(CostSubject.class, map);
         //Step.2 AutoPoi 导出Excel
         ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<CostBudgetDto> list = costBudgetService.exportList(queryWrapper, projectInfoBySn, true);
+        List<CostBudgetDto> list = costBudgetService.exportList(queryWrapper, projectInfoBySn, true, level);
         //导出文件名称
         mv.addObject(NormalExcelConstants.FILE_NAME, "成本科目预算");
         mv.addObject(NormalExcelConstants.CLASS, CostBudgetDto.class);
@@ -407,7 +410,7 @@ public class CostBudgetController {
         String startUser = object.getString("startUser");
         String projectSn = object.getJSONArray("projectSn").get(0).toString();
         String fileName = object.getJSONArray("file").getJSONObject(0).getString("url");
-        Integer version = object.getJSONArray("version").getJSONObject(0).getInteger("url");
+        Integer version = object.getJSONArray("version").getInteger(0);
         String basePath = fileStorageProperties.getLocal().get(0).getBasePath();
         MultipartFile multipartFile = FileUtil.getMulFileByPath(basePath + fileName);
         ProjectInfoExtVo projectInfoBySn = projectService.getProjectInfoBySn(projectSn);
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 bfc29cf85..db7d15d85 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
@@ -20,7 +20,7 @@ public interface ICostBudgetService extends IService<CostBudget> {
 
     List<CostBudgetDto> tree(QueryWrapper<CostSubject> wrapper, String projectSn);
 
-    List<CostBudgetDto> exportList(QueryWrapper<CostSubject> wrapper, ProjectInfoExtVo projectInfoBySn, boolean flag);
+    List<CostBudgetDto> exportList(QueryWrapper<CostSubject> wrapper, ProjectInfoExtVo projectInfoBySn, boolean flag, String level);
 
     boolean updateInfo(CostBudget costBudget);
 }
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 b01467299..543b1a91c 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
@@ -80,15 +80,18 @@ public class CostBudgetServiceImpl extends ServiceImpl<CostBudgetMapper, CostBud
     }
 
     @Override
-    public List<CostBudgetDto> exportList(QueryWrapper<CostSubject> wrapper, ProjectInfoExtVo projectInfoBySn, boolean flag) {
+    public List<CostBudgetDto> exportList(QueryWrapper<CostSubject> wrapper, ProjectInfoExtVo projectInfoBySn, boolean flag, String level) {
         wrapper.lambda().eq(CostSubject::getParentId, 0);
         List<CostSubject> list = costSubjectService.list(wrapper);
         List<CostBudgetDto> dtoList = convert(list);
         if (dtoList.size() > 0) {
-            List<CostSubject> allList = costSubjectService.list();
+            List<CostSubject> allList = costSubjectService.list(Wrappers.<CostSubject>lambdaQuery()
+                    .eq(CostSubject::getSn, projectInfoBySn.getProjectSn())
+                    .eq(CostSubject::getLevelType, 3));
             List<CostBudgetDto> allDtoList = convert(allList);
             List<CostBudget> budgetList = this.list(Wrappers.<CostBudget>lambdaQuery()
-                    .eq(CostBudget::getProjectSn, projectInfoBySn.getProjectSn()));
+                    .eq(CostBudget::getProjectSn, projectInfoBySn.getProjectSn())
+                    .eq(CostBudget::getVersion, level));
             getChildren(dtoList, allDtoList, budgetList, flag);
         }
         List<CostBudgetDto> resultList = new ArrayList<>();