添加新粮情分析功能

src/main/java/com/chinaitop/depot/agent/basic/mapper/BusinessAgentTankMapper.xml

@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.chinaitop.depot.agent.basic.mapper.BusinessAgentTankMapper">
   <resultMap id="BaseResultMap" type="com.chinaitop.depot.agent.basic.model.BusinessAgentTank">
     <id column="id" jdbcType="VARCHAR" property="id" />
@@ -394,7 +394,7 @@ LEFT JOIN basic_tank t ON t.id = e.tank_id
         treasury_bonds treasuryBonds,
         enable_date enableDate,
         state,
-        keeper,
+        keeper keepNames,
         '0' third
     FROM
         business_agent_tank agTank
@@ -414,11 +414,13 @@ LEFT JOIN basic_tank t ON t.id = e.tank_id
         '' treasuryBonds,
         bt.createDate enableDate,
         bt.tank_status state,
-        '' keeper,
-        '1' third
+        group_concat(bk. NAME) keepNames,
+        '1' third,
     FROM
         basic_tank bt
     LEFT JOIN business_agent_tank_exist exis ON exis.tank_id = bt.id
+    LEFT JOIN basic_keeper_house bkh ON bkh.house_Id = bt.id
+    LEFT JOIN basic_keeper bk ON bk.id = bkh.keeper_Id
     WHERE
         exis.org_id = #{orgId,jdbcType=INTEGER}
     AND exis.del_flag = 1
@@ -426,15 +428,17 @@ LEFT JOIN basic_tank t ON t.id = e.tank_id
     <if test="tankNumber != null">
       AND bt.storageTank_code like #{tankNumber,jdbcType=VARCHAR}
     </if>
-  </select>
-  
-  <select id="getAgentTankId" resultType="java.lang.String" parameterType="java.lang.Integer">
-	SELECT
-		tank_id
-	FROM
-		business_agent_tank_exist
-	WHERE
-		agent_depot_id in (select id from business_agent_depot where depot_id=#{orgId,jdbcType=INTEGER} and del_flag=1 )
-    and del_flag=1
+    GROUP BY
+    bt.id
+  </select>
+  
+  <select id="getAgentTankId" resultType="java.lang.String" parameterType="java.lang.Integer">
+	SELECT
+		tank_id
+	FROM
+		business_agent_tank_exist
+	WHERE
+		agent_depot_id in (select id from business_agent_depot where depot_id=#{orgId,jdbcType=INTEGER} and del_flag=1 )
+    and del_flag=1
   </select>
 </mapper>