云南bug修改

src/main/java/com/chinaitop/depot/agent/number/mapper/BusinessAgentNumberMapper.xml

@@ -355,7 +355,7 @@
     SELECT
     num.id,num.agent_id agentId,num.agent_depot_id agentDepotId,num.lspz,num.nature,num.level,
     num.harvest_year harvestYear,num.inventory,num.storehouse_id storehouseId,
-    num.warehouse_id warehouseId,num.create_time createTime,num.org_id orgId,
+    num.warehouse_id warehouseId,num.create_time createTime,num.org_id orgId,num.sjly,
     ware.warehouse_name warehouseName,store.storehouse_name storehouseName,agent.agent_name agentName,
     depot.agent_depot_name agentDepotName
     FROM

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

@@ -608,7 +608,6 @@
     temper.max max,
     temper.min min,
     temper.avg avg,
-    temper.t_points tPoints,
     store.storehouse_type storehouseType,
     store.design_capacity designCapacity,
     temper.enter_time enterTime,
@@ -662,7 +661,6 @@
     tt.max max,
     tt.min min,
     tt.avg avg,
-    tt.t_points tPoints,
     store.storehouse_type storehouseType,
     store.design_capacity designCapacity,
     tt.storehouse enterTime,
@@ -684,7 +682,10 @@
     LEFT JOIN basic_keeper_house keepHouse ON keepHouse.house_Id = agentStore.storehouse_id
     AND depot.depot_id = keepHouse.org_id
     LEFT JOIN basic_keeper keeper ON keeper.id = keepHouse.keeper_Id
-    LEFT JOIN t_testdata tt ON depot.depot_id = tt.org_id
+    LEFT JOIN (SELECT A.id,A.storehouse,A.org_id,A.time,A.updatetime,A.iLq_yq,A.inTemp, A.inH,A.max, A.min, A.avg,A.t_points ,A.outTemp,A.outH FROM t_testdata A INNER JOIN (
+    SELECT storehouse,MAX(updatetime) updatetime,inTemp, inH, max, min, avg ,outTemp,outH
+    FROM t_testdata WHERE org_id = 160 GROUP BY storehouse,DATE_FORMAT(updatetime, '%Y-%m-%d')
+    ) B ON A.storehouse = B.storehouse AND A.updatetime = B.updatetime) 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