代储点下分仓保管账油罐 业务修改

src/main/java/com/chinaitop/depot/agent/bgz/mapper/BusinessAgentBgmxzMapper.xml

@@ -430,7 +430,9 @@
 
   <!-- 查询分仓保管账列表 -->
   <select id="selectFcbgzList" parameterType="java.util.Map" resultType="java.util.Map">
-  	select
+  	SELECT datas.* FROM (
+	    select
+	    a.org_id orgId,
 		DATE_FORMAT(a.fssj,'%Y-%m-%d') as fssj,
 		a.agent_id agentId, 
 		b.agent_name agentName,
@@ -446,38 +448,87 @@
 		sum(a.srsl) as srsl, 
 		sum(a.zcsl) as zcsl, 
 		a.kcsl 
-	from (SELECT * from business_agent_bgmxz WHERE 1=1 ORDER BY fssj DESC) a 
-	LEFT JOIN business_agent b ON b.id=agent_id 
-	LEFT JOIN business_agent_depot c ON c.id=szlk_org_id 
-	LEFT JOIN basic_storehouse d ON d.storehouse_id=house_id 
-	LEFT JOIN basic_warehouse e ON e.warehouse_id=ware_id 
-	where 1=1 
+	    from (SELECT * from business_agent_bgmxz WHERE 1=1 AND SUBSTR(house_id,1,2)!='YG' ORDER BY fssj DESC) a 
+	    LEFT JOIN business_agent b ON b.id=a.agent_id 
+	    LEFT JOIN business_agent_depot c ON c.id=a.szlk_org_id 
+	    LEFT JOIN basic_storehouse d ON d.storehouse_id=a.house_id 
+	    LEFT JOIN basic_warehouse e ON e.warehouse_id=a.ware_id 
+	    where 1=1 
+	    group by a.agent_id, a.szlk_org_id, a.house_id, a.ware_id, a.lsxz, a.lspz, DATE_FORMAT(a.fssj,'%Y-%m-%d') 
+	  UNION
+  		select
+  		a.org_id orgId,
+		DATE_FORMAT(a.fssj,'%Y-%m-%d') as fssj,
+		a.agent_id agentId, 
+		b.agent_name agentName,
+		a.szlk_org_id dckId, 
+		c.agent_depot_name agentDepotName,
+		a.house_id houseId, 
+		d.storageTank_name houseName,
+		a.house_id wareId, 
+		'' wareName,
+		a.lsxz, 
+		a.lspz, 
+		a.lsdj, 
+		sum(a.srsl) as srsl, 
+		sum(a.zcsl) as zcsl, 
+		a.kcsl 
+		from (SELECT * from business_agent_bgmxz WHERE 1=1 AND SUBSTR(house_id,1,2)='YG' AND sjly=1 ORDER BY fssj DESC) a 
+		LEFT JOIN business_agent b ON b.id=a.agent_id 
+		LEFT JOIN business_agent_depot c ON c.id=a.szlk_org_id 
+		LEFT JOIN basic_tank d ON d.id=a.house_id 
+		where 1=1 
+		group by a.agent_id, a.szlk_org_id, a.house_id, a.ware_id, a.lsxz, a.lspz, DATE_FORMAT(a.fssj,'%Y-%m-%d') 
+	  UNION
+  		select
+  		a.org_id orgId,
+		DATE_FORMAT(a.fssj,'%Y-%m-%d') as fssj,
+		a.agent_id agentId, 
+		b.agent_name agentName,
+		a.szlk_org_id dckId, 
+		c.agent_depot_name agentDepotName,
+		a.house_id houseId, 
+		d.tank_name houseName,
+		a.house_id wareId, 
+		'' wareName,
+		a.lsxz, 
+		a.lspz, 
+		a.lsdj, 
+		sum(a.srsl) as srsl, 
+		sum(a.zcsl) as zcsl, 
+		a.kcsl 
+		from (SELECT * from business_agent_bgmxz WHERE 1=1 AND SUBSTR(house_id,1,2)='YG' AND sjly=0 ORDER BY fssj DESC) a 
+		LEFT JOIN business_agent b ON b.id=a.agent_id 
+		LEFT JOIN business_agent_depot c ON c.id=a.szlk_org_id 
+		LEFT JOIN business_agent_tank d ON d.id=a.house_id 
+		where 1=1 
+		group by a.agent_id, a.szlk_org_id, a.house_id, a.ware_id, a.lsxz, a.lspz, DATE_FORMAT(a.fssj,'%Y-%m-%d') 
+	) datas WHERE 1=1
 	<if test="orgId != null">
-        AND a.org_id = #{orgId,jdbcType=INTEGER}
+        AND datas.orgId = #{orgId,jdbcType=INTEGER}
     </if>
 	<if test="agentId != null">
-        AND a.agent_id = #{agentId,jdbcType=INTEGER}
+        AND datas.agentId = #{agentId,jdbcType=INTEGER}
     </if>
     <if test="szlkOrgId != null">
-        AND a.szlk_org_id = #{szlkOrgId,jdbcType=INTEGER}
+        AND datas.dckId = #{szlkOrgId,jdbcType=INTEGER}
     </if>
     <if test="houseId != null">
-        AND a.house_id = #{houseId,jdbcType=VARCHAR}
+        AND datas.houseId = #{houseId,jdbcType=VARCHAR}
     </if>
     <if test="wareId != null">
-        AND a.ware_id = #{wareId,jdbcType=VARCHAR}
+        AND datas.wareId = #{wareId,jdbcType=VARCHAR}
     </if>
     <if test="lspz != null">
-        AND a.lspz = #{lspz,jdbcType=INTEGER}
+        AND datas.lspz = #{lspz,jdbcType=INTEGER}
     </if>
     <if test="lsxz != null">
-        AND a.lsxz = #{lsxz,jdbcType=INTEGER}
+        AND datas.lsxz = #{lsxz,jdbcType=INTEGER}
     </if>
     <if test="fssj != null">
-        AND a.fssj = #{fssj}
+        AND datas.fssj = #{fssj}
     </if>
-	group by a.agent_id, a.szlk_org_id, a.house_id, a.ware_id, a.lsxz, a.lspz, DATE_FORMAT(a.fssj,'%Y-%m-%d') 
-	ORDER BY fssj DESC
+	ORDER BY datas.fssj DESC
   </select>
 
   <select id="selectByExampleNew" parameterType="java.util.Map" resultMap="BaseResultMap">