bug修改

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/CompanyController.java

@@ -206,6 +206,12 @@ public class CompanyController {
         return Result.success(companyService.getCompanyStatisticsList(map));
     }
 
+    @ApiOperation(value = "供应商选择审批组织（所有企业）", notes = "供应商选择审批组织（所有企业）")
+    @PostMapping("/getComapnyStatisticsListBySupplier")
+    public Result<Map<String, Object>> getComapnyStatisticsListBySupplier(@RequestBody Map<String, Object> map) {
+        return Result.success(companyService.getComapnyStatisticsListBySupplier(map));
+    }
+
     @ApiOperation(value = "查询企业下项目视频列表统计", notes = "查询企业下项目视频列表统计")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "sn", value = "公司sn", paramType = "body", required = true, dataType = "String"),

src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/CompanyMapper.xml

@@ -50,10 +50,6 @@
     </select>
 
     <select id="getChildCompanyList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap" parameterType="map">
-        <!-- SELECT a.*,a.company_name `name`
-         FROM company a
-         WHERE a.parent_id in (SELECT company_id FROM company WHERE company_sn=#{sn})
-           AND a.company_type=#{companyType}-->
         SELECT a.*, a.company_name `name`, b.range_addr parent_range_addr
         FROM company a
         INNER JOIN company b ON a.parent_id = b.company_id

src/main/java/com/zhgd/xmgl/modules/basicdata/service/ICompanyService.java

@@ -45,6 +45,8 @@ public interface ICompanyService extends IService<Company> {
 
     Map<String, Object> getCompanyStatisticsList(Map<String, Object> map);
 
+    Map<String, Object> getComapnyStatisticsListBySupplier(Map<String, Object> map);
+
     void editCompanyBySn(Company company);
 
     Map<String, Object> getComapnyVideoList(Map<String, Object> map);

src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java

@@ -1,5 +1,6 @@
 package com.zhgd.xmgl.modules.basicdata.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUnit;
@@ -396,6 +397,65 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         return data;
     }
 
+    @Override
+    public Map<String, Object> getComapnyStatisticsListBySupplier(Map<String, Object> map) {
+        List<Company> headList = companyMapper.selectList(new LambdaQueryWrapper<Company>()
+                .eq(Company::getCompanyType, 1));
+        if (CollUtil.isEmpty(headList)) {
+            throw new OpenAlertException("没有总部企业");
+        }
+        Map<String, Object> data = new HashMap<>();
+        List<EntityMap> comapnyList = new ArrayList<>();
+        for (Company company : headList) {
+            map.put("sn", company.getCompanySn());
+            Map<String, Object> data1 = getCompanyTreeByHead(map);
+            EntityMap entityMap = BeanUtil.toBean(company, EntityMap.class);
+            entityMap.put("list", data1.get("companyList"));
+            comapnyList.add(entityMap);
+        }
+        data.put("companyList", comapnyList);
+        return data;
+    }
+
+    private Map<String, Object> getCompanyTreeByHead(Map<String, Object> map) {
+        Map<String, Object> data = new HashMap<>();
+        QueryWrapper<Company> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(Company::getCompanySn, MapUtils.getString(map, "sn"));
+        Company tempCompany = companyMapper.selectOne(queryWrapper);
+        Integer type = MapUtils.getInteger(map, "videoType", 0);
+        Integer standardType = MapUtils.getInteger(map, "standardType", 0);
+        Integer projectType = 1;
+        if (tempCompany != null && tempCompany.getCompanyType() == 1) {
+            //总部
+            map.put("headquartersSn", MapUtils.getString(map, "sn"));
+            map.put("companyType", "2");
+            List<EntityMap> fistComapnyList = companyMapper.getFirstCompanyList(map);
+            map.put("companyType", "3");
+            List<EntityMap> secondComapnyList = companyMapper.getFirstCompanyList(map);
+            map.put("companyType", "4");
+            List<EntityMap> childComapnyList = companyMapper.getFirstCompanyList(map);
+            map.put("companyType", "1");
+            if (1 == projectType) {
+                List<EntityMap> projectList = projectMapper.selectProjectStatisticsList(map);
+                if (1 == type) {
+                    List<EntityMap> videoList = projectMapper.selectVideoList(map);
+                    projectList = getGroupProjectVideo(projectList, videoList);
+                }
+                if (standardType == 1) {
+                    List<Map<String, Object>> standardList = standardDevMapper.selectProjecDevAlarmCount(map);
+                    projectList = addProjectStandardData(projectList, standardList);
+                }
+                childComapnyList = getGroupStatisticsProject(childComapnyList, projectList);
+            }
+            secondComapnyList = getGroupStatisticsCompany(secondComapnyList, childComapnyList);
+            fistComapnyList = getGroupStatisticsCompany(fistComapnyList, secondComapnyList);
+            fistComapnyList = filterCompanyByProject(fistComapnyList, map);
+            data.put("companyList", fistComapnyList);
+            addSnForTree(data);
+        }
+        return data;
+    }
+
     /**
      * 增加sn属性，如果有projectSn则加到sn，没有的话就加companySn到sn
      *