代储点粮情

src/main/java/com/chinaitop/depot/agent/temperature/mapper/BusinessAgentTemperatureMapper.xml

@@ -652,8 +652,8 @@
     depot.depot_id agentOrgId,
     depot.depot_id agentStoreOrgId,
     '0' sign,
-    depot.agent_depot_name agentName,
-    store.depot_name agentDepotName,
+    agent.agent_name agentName,
+    depot.agent_depot_name agentDepotName,
     store.storehouse_name storehouseName,
     tt.storehouse lspz,
     tt.time detectionTime,
@@ -676,11 +676,14 @@
     tt.updatetime updatetime
     FROM
     business_agent_depot depot
-    LEFT JOIN business_agent_storehouse agentStore ON depot.id = agentStore.agent_depot_id
-    AND agentStore.org_id = #{orgId,jdbcType=INTEGER}
-    LEFT JOIN basic_storehouse store ON store.storehouse_id = agentStore.storehouse_id
-    AND store.org_id = #{orgId,jdbcType=INTEGER}
+    LEFT JOIN business_agent agent ON depot.agent_id = agent.id
+    AND agent.org_id = #{orgId,jdbcType=INTEGER}
+    INNER JOIN business_agent_storehouse agentStore ON depot.id = agentStore.agent_depot_id
+    INNER JOIN basic_storehouse store ON store.storehouse_id = agentStore.storehouse_id
+    AND store.del_flag = 1
     LEFT JOIN t_testdata tt ON depot.depot_id = tt.org_id
+    AND tt.storehouse = store.storehouse_code
+    AND tt.org_id != #{orgId,jdbcType=INTEGER}
     AND tt.updatetime >= depot.updatetime
     WHERE
     tt.iLq_yq = '0'