修改优化

src/main/java/com/chinaitop/agile/controller/KcswController.java

@@ -523,13 +523,17 @@ public class KcswController {
 	@RequestMapping(value="/queryLKNewData",produces=MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
 	@ApiOperation(value="查询出入库信息", notes = "查询出入库最新粮库储粮信息")
 	@ApiImplicitParams({
-		@ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query")
+		@ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query"),
+		@ApiImplicitParam(name = "storeId", value = "仓房ID", paramType = "query")
 	})
-	public List<DataKcglKcswDefault> queryLKNewData(Integer orgId) {
+	public List<DataKcglKcswDefault> queryLKNewData(Integer orgId,String storeId) {
 		Map<String, Object> map = new HashMap<String, Object>();
 		if (null != orgId) {
 			map.put("orgId", orgId + "");
 		}
+		if (null != storeId) {
+			map.put("storeId", storeId);
+		}
 		return kcswService.queryLKNewData(map);
 	}
 	

src/main/java/com/chinaitop/agile/mapper/DataKcglKcswDefaultMapper.xml

@@ -455,6 +455,9 @@
             <if test="orgId != null">
             	AND UnitID=#{orgId} 
 		    </if>
+            <if test="storeId != null">
+            	AND ch=#{storeId}
+		    </if>
             GROUP BY
                 ch
         ) default2
@@ -610,16 +613,16 @@
     ware.warehouse_name warehouseName
     FROM
     lsreport_ts.data_kcgl_kcsw_default kcsw
-    LEFT JOIN depot_shanxi.org_info org ON org.org_id = kcsw.UnitID
-    LEFT JOIN depot_shanxi.basic_storehouse store ON store.storehouse_id = kcsw.ch
-    LEFT JOIN depot_shanxi.basic_warehouse ware ON ware.warehouse_id = kcsw.hwh
+    LEFT JOIN depot.org_info org ON org.org_id = kcsw.UnitID
+    LEFT JOIN depot.basic_storehouse store ON store.storehouse_id = kcsw.ch
+    LEFT JOIN depot.basic_warehouse ware ON ware.warehouse_id = kcsw.hwh
     INNER JOIN (
     SELECT
     warehouse.warehouse_id
     FROM
-    depot_shanxi.business_agent_depot depot
-    LEFT JOIN depot_shanxi.business_agent_storehouse storehouse ON depot.id = storehouse.agent_depot_id
-    LEFT JOIN depot_shanxi.business_agent_warehouse warehouse ON storehouse.id = warehouse.agent_storehouse_id
+    depot.business_agent_depot depot
+    LEFT JOIN depot.business_agent_storehouse storehouse ON depot.id = storehouse.agent_depot_id
+    LEFT JOIN depot.business_agent_warehouse warehouse ON storehouse.id = warehouse.agent_storehouse_id
     WHERE
     depot.org_id = #{unitid,jdbcType=CHAR}
     AND depot.depot_id != 0
@@ -629,8 +632,8 @@
     SELECT
     tank.tank_id warehouse_id
     FROM
-    depot_shanxi.business_agent_depot depot
-    LEFT JOIN depot_shanxi.business_agent_tank_exist tank ON depot.id = tank.agent_depot_id
+    depot.business_agent_depot depot
+    LEFT JOIN depot.business_agent_tank_exist tank ON depot.id = tank.agent_depot_id
     WHERE
     depot.org_id = #{unitid,jdbcType=CHAR}
     AND depot.depot_id != 0
@@ -658,16 +661,16 @@
     ware.warehouse_name warehouseName
     FROM
     lsreport_ts.data_kcgl_kcsw_default kcsw
-    LEFT JOIN depot_shanxi.org_info org ON org.org_id = kcsw.UnitID
-    LEFT JOIN depot_shanxi.basic_storehouse store ON store.storehouse_id = kcsw.ch
-    LEFT JOIN depot_shanxi.basic_warehouse ware ON ware.warehouse_id = kcsw.hwh
+    LEFT JOIN depot.org_info org ON org.org_id = kcsw.UnitID
+    LEFT JOIN depot.basic_storehouse store ON store.storehouse_id = kcsw.ch
+    LEFT JOIN depot.basic_warehouse ware ON ware.warehouse_id = kcsw.hwh
     WHERE
     kcsw.unitid = #{unitid,jdbcType=CHAR} AND
     kcsw.ch
     not in(
     select storehouse_id from
-    depot_shanxi.business_agent_storehouse agentHouse
-    LEFT JOIN depot_shanxi.business_agent_depot depot ON depot.id = agentHouse.agent_depot_id
+    depot.business_agent_storehouse agentHouse
+    LEFT JOIN depot.business_agent_depot depot ON depot.id = agentHouse.agent_depot_id
     WHERE
     agentHouse.del_flag = 1
     and depot.depot_id = #{unitid,jdbcType=CHAR}
@@ -697,16 +700,16 @@
     kcsl,UnitID
     FROM
     lsreport_ts.data_kcgl_kcsw_default kcsw
-    LEFT JOIN depot_shanxi.org_info org ON org.org_id = kcsw.UnitID
-    LEFT JOIN depot_shanxi.basic_storehouse store ON store.storehouse_id = kcsw.ch
-    LEFT JOIN depot_shanxi.basic_warehouse ware ON ware.warehouse_id = kcsw.hwh
+    LEFT JOIN depot.org_info org ON org.org_id = kcsw.UnitID
+    LEFT JOIN depot.basic_storehouse store ON store.storehouse_id = kcsw.ch
+    LEFT JOIN depot.basic_warehouse ware ON ware.warehouse_id = kcsw.hwh
     INNER JOIN (
     SELECT
     warehouse.warehouse_id
     FROM
-    depot_shanxi.business_agent_depot depot
-    LEFT JOIN depot_shanxi.business_agent_storehouse storehouse ON depot.id = storehouse.agent_depot_id
-    LEFT JOIN depot_shanxi.business_agent_warehouse warehouse ON storehouse.id = warehouse.agent_storehouse_id
+    depot.business_agent_depot depot
+    LEFT JOIN depot.business_agent_storehouse storehouse ON depot.id = storehouse.agent_depot_id
+    LEFT JOIN depot.business_agent_warehouse warehouse ON storehouse.id = warehouse.agent_storehouse_id
     WHERE
     depot.org_id = #{unitid,jdbcType=CHAR}
     AND depot.depot_id != 0
@@ -716,8 +719,8 @@
     SELECT
     tank.tank_id warehouse_id
     FROM
-    depot_shanxi.business_agent_depot depot
-    LEFT JOIN depot_shanxi.business_agent_tank_exist tank ON depot.id = tank.agent_depot_id
+    depot.business_agent_depot depot
+    LEFT JOIN depot.business_agent_tank_exist tank ON depot.id = tank.agent_depot_id
     WHERE
     depot.org_id = #{unitid,jdbcType=CHAR}
     AND depot.depot_id != 0
@@ -741,16 +744,16 @@
     kcsl,UnitID
     FROM
     lsreport_ts.data_kcgl_kcsw_default kcsw
-    LEFT JOIN depot_shanxi.org_info org ON org.org_id = kcsw.UnitID
-    LEFT JOIN depot_shanxi.basic_storehouse store ON store.storehouse_id = kcsw.ch
-    LEFT JOIN depot_shanxi.basic_warehouse ware ON ware.warehouse_id = kcsw.hwh
+    LEFT JOIN depot.org_info org ON org.org_id = kcsw.UnitID
+    LEFT JOIN depot.basic_storehouse store ON store.storehouse_id = kcsw.ch
+    LEFT JOIN depot.basic_warehouse ware ON ware.warehouse_id = kcsw.hwh
     WHERE
     kcsw.unitid = #{unitid,jdbcType=CHAR} AND
     kcsw.ch
     not in(
     select storehouse_id from
-    depot_shanxi.business_agent_storehouse agentHouse
-    LEFT JOIN depot_shanxi.business_agent_depot depot ON depot.id = agentHouse.agent_depot_id
+    depot.business_agent_storehouse agentHouse
+    LEFT JOIN depot.business_agent_depot depot ON depot.id = agentHouse.agent_depot_id
     WHERE
     agentHouse.del_flag = 1
     and depot.depot_id = #{unitid,jdbcType=CHAR}