|
@@ -672,7 +672,7 @@
|
|
672
|
tt.storehouse harvestYear,
|
672
|
tt.storehouse harvestYear,
|
|
673
|
tt.outTemp gasTemperature,
|
673
|
tt.outTemp gasTemperature,
|
|
674
|
tt.outH gasHumidity,
|
674
|
tt.outH gasHumidity,
|
|
675
|
- tt.storehouse keeper,
|
|
|
|
|
|
675
|
+ keeper.name keeper,
|
|
676
|
tt.updatetime updatetime
|
676
|
tt.updatetime updatetime
|
|
677
|
FROM
|
677
|
FROM
|
|
678
|
business_agent_depot depot
|
678
|
business_agent_depot depot
|
|
@@ -681,6 +681,9 @@
|
|
681
|
INNER JOIN business_agent_storehouse agentStore ON depot.id = agentStore.agent_depot_id
|
681
|
INNER JOIN business_agent_storehouse agentStore ON depot.id = agentStore.agent_depot_id
|
|
682
|
INNER JOIN basic_storehouse store ON store.storehouse_id = agentStore.storehouse_id
|
682
|
INNER JOIN basic_storehouse store ON store.storehouse_id = agentStore.storehouse_id
|
|
683
|
AND store.del_flag = 1
|
683
|
AND store.del_flag = 1
|
|
|
|
684
|
+ LEFT JOIN basic_keeper_house keepHouse ON keepHouse.house_Id = agentStore.storehouse_id
|
|
|
|
685
|
+ AND depot.depot_id = keepHouse.org_id
|
|
|
|
686
|
+ LEFT JOIN basic_keeper keeper ON keeper.id = keepHouse.keeper_Id
|
|
684
|
LEFT JOIN t_testdata tt ON depot.depot_id = tt.org_id
|
687
|
LEFT JOIN t_testdata tt ON depot.depot_id = tt.org_id
|
|
685
|
AND tt.storehouse = store.storehouse_code
|
688
|
AND tt.storehouse = store.storehouse_code
|
|
686
|
AND tt.org_id != #{orgId,jdbcType=INTEGER}
|
689
|
AND tt.org_id != #{orgId,jdbcType=INTEGER}
|