剩下的除了智能仓房的查询

src/main/java/com/chinaitop/depot/grainAnalysis/mapper/StorageGrainAnalysisMapper.xml

@@ -562,18 +562,25 @@
   </select>
   <!-- 查询粮情专卡的数据 -->
   <select id="queryLqzkData" resultType="java.util.Map" parameterType="java.util.Map">
-    SELECT house_type "houseType",sub_type "subType" ,recorder "recorder" FROM storage_foodbasicinfo 
-    WHERE 1=1 AND seal_status=1 AND history_status=0 
+    SELECT
+      foods.house_type "houseType",
+      foods.sub_type "subType",
+      keeper.`name` "recorder"
+    FROM
+      storage_foodbasicinfo foods
+      LEFT JOIN basic_keeper_house house ON house.house_Id = foods.house_id
+      LEFT JOIN basic_keeper keeper ON house.keeper_Id = keeper.id
+    WHERE 1=1 AND seal_status=1 AND history_status=0
     <if test="orgId != null">
-     and org_id=#{orgId}
+     and foods.org_id=#{orgId}
     </if>
     <if test="houseId != null">
-     and house_id=#{houseId}
+     and foods.house_id=#{houseId}
     </if>
     <if test="wareId != null">
-     and warehouse_id=#{wareId}
+     and foods.warehouse_id=#{wareId}
     </if>
-    ORDER BY id DESC
+    ORDER BY foods.id DESC
   </select>
   <!-- 查询周粮情分析数据 -->
   <select id="getThreeTempData" parameterType="java.util.Map" resultType="java.util.Map">

src/main/java/com/chinaitop/depot/grainAnalysis/service/impl/StorageGrainAnalysisServiceImpl.java

@@ -291,7 +291,7 @@ public class StorageGrainAnalysisServiceImpl implements StorageGrainAnalysisServ
         	param_map.put("wareId", wareId);
         }
         if(null != orgId){
-        	param_map.put("wareId", wareId);
+        	param_map.put("orgId", orgId);
         }
 
         List<Map<String, Object>> basicInfo = analysisMapper.queryLqzkData(param_map);