1

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/InventorySummaryMapper.java

@@ -47,7 +47,7 @@ public interface InventorySummaryMapper  extends BaseMapper<InventorySummary> {
 
     List<TjOrgEqsDto> test(@Param("req") InventoryReq req);
     TjOrgEqsDto GetInvSum(@Param("orgId") String orgId,@Param("typeId") String typeId,@Param("sizeName") String sizeName);
-    TjOrgEqsDto GetSumLeve4(@Param("orgId") String orgId,@Param("typeId") String typeId,@Param("sizeName") String sizeName,@Param("sql") String sql);
+    TjOrgEqsDto GetSumLeve4(@Param("orgId") String orgId,@Param("typeId") String typeId,@Param("sizeName") String sizeName);
 
     List<TjOrgEqsDto> selectDynamicView();
 

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

@@ -141,7 +141,7 @@ if (req.getOrgId()!=1369509498032808905L)
 {
     TjOrgEqsDto OrgData = inventorySummaryMapper.GetSumLeve4(String.valueOf(req.getOrgId()),
             req.getTypeIdsList().isEmpty() ? null : req.getTypeIdsAsString(),
-            req.getSizeNameList().isEmpty() ? null : req.getSizesAsString(),sql);
+            req.getSizeNameList().isEmpty() ? null : req.getSizesAsString());
     allData.add(OrgData);//把本级数据加进去
 }
         //查询出来的组织机构进行判断，如果该组织机构下的装备装备总数为0，那么将该组织机构从list中移除
@@ -191,7 +191,7 @@ if (req.getOrgId()!=1369509498032808905L)
         {
             TjOrgEqsDto OrgData = inventorySummaryMapper.GetSumLeve4(String.valueOf(req.getOrgId()),
                     req.getTypeIdsList().isEmpty() ? null : req.getTypeIdsAsString(),
-                    req.getSizeNameList().isEmpty() ? null : req.getSizesAsString(),sql);
+                    req.getSizeNameList().isEmpty() ? null : req.getSizesAsString());
             allData.add(OrgData);//把本级数据加进去
         }
         for (TjOrgEqsDto tj:allData) {

jyzb-biz/src/main/resources/mapper/InventorySummaryMapper.xml

@@ -338,7 +338,7 @@
             {CALL GetInventorySummary(#{orgId,mode=IN},#{typeId,mode=IN},#{sizeName,mode=IN})}
     </select>
     <select id="GetSumLeve4" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgEqsDto" statementType="CALLABLE">
-        {CALL GetSumLeve4(#{orgId,mode=IN},#{typeId,mode=IN},#{sizeName,mode=IN},#{sql,mode=IN})}
+        {CALL GetSumLeve4(#{orgId,mode=IN},#{typeId,mode=IN},#{sizeName,mode=IN})}
     </select>
     <select id="selectDynamicView" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgEqsDto">
         SELECT * FROM dynamic_view