Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/TjServiceImpl.java

@@ -254,20 +254,48 @@ if (!req.getOrgId().equals("1369509498032808905"))
 
     @Override
     public FinalTjOrgEqsDto TjOrgEqsSum(TjOrgEqsReq req) {
-        //将前端传递的值进行处理并且执行存储过程
-        String sql="and (org_id="+req.getOrgId()+" or org_parent_id = "+req.getOrgId()+")";
-        String sql1 = setSql(req);
-//        System.out.println("sql = " + sql);
-        //执行存储过程
-        inventorySummaryMapper.useViewOrgeqs(sql,req.getOrgId(),sql1);
-        //在内存foreach还是去数据库再去查询一次
-        FinalTjOrgEqsDto finalTjOrgEqsDto=inventorySummaryMapper.getSumByViewOrgeqsSum();
-        if (ObjectUtil.isNotNull(finalTjOrgEqsDto)) {
-            return finalTjOrgEqsDto;
-        }else {
-            return new FinalTjOrgEqsDto();
+        //先拿到符合条件的组织机构，再遍历组织机构组成数据
+        List<String> orgList= inventorySummaryMapper.getTotalData(String.valueOf(req.getOrgId()));
+        List<TjOrgEqsDto> allData=new ArrayList<>();
+        for (String orgId:orgList) {
+
+            TjOrgEqsDto OrgData=inventorySummaryMapper.GetInvSum( orgId,
+                    req.getTypeIdsList().isEmpty() ? null : req.getTypeIdsAsString(),
+                    req.getSizeNameList().isEmpty() ? null : req.getSizesAsString());
+            allData.add(OrgData);
+        }
+        if (!req.getOrgId().equals("1369509498032808905"))
+        {
+            TjOrgEqsDto OrgData = inventorySummaryMapper.GetSumLeve4(String.valueOf(req.getOrgId()),
+                    req.getTypeIdsList().isEmpty() ? null : req.getTypeIdsAsString(),
+                    req.getSizeNameList().isEmpty() ? null : req.getSizesAsString());
+            allData.add(OrgData);//把本级数据加进去
+        }
+        FinalTjOrgEqsDto dto=new FinalTjOrgEqsDto();
+        Integer totalNumber = 0;
+        Integer ckStockNumber = 0;
+        Integer djgStockNumber = 0;
+        Integer ckOutboundNumber = 0;
+        Integer djgOutboundNumber = 0;
+        Integer destructionNumber = 0;
+
+        for (TjOrgEqsDto dtodata :allData) {
+            totalNumber += dtodata.getTotalNumber();
+            ckStockNumber += dtodata.getCkStockNumber();
+            djgStockNumber += dtodata.getDjgStockNumber();
+            ckOutboundNumber += dtodata.getCkOutboundNumber();
+            djgOutboundNumber += dtodata.getDjgOutboundNumber();
+            destructionNumber += dtodata.getDestructionNumber();
         }
 
+        // 将累加后的值设置到 FinalTjOrgEqsDto
+        dto.setTotalNumber(totalNumber);
+        dto.setCkStockNumber(ckStockNumber);
+        dto.setDjgStockNumber(djgStockNumber);
+        dto.setCkOutboundNumber(ckOutboundNumber);
+        dto.setDjgOutboundNumber(djgOutboundNumber);
+        dto.setDestructionNumber(destructionNumber);
+        return  dto;
     }
 
     @Override