代储点

src/main/java/com/chinaitop/depot/agent/basic/controller/AgentStorehouseController.java

@@ -86,7 +86,7 @@ public class AgentStorehouseController {
             @ApiImplicitParam(name = "orgId", value = "组织id", paramType = "query"),
             @ApiImplicitParam(name = "depotId", value = "代储库id", paramType = "query"),
             @ApiImplicitParam(name = "is_three", value = "是否需要第三方的仓房 和油罐信息,1是需要,空值是不需要", paramType = "query"),
-            @ApiImplicitParam(name = "is_lq", value = "是否需要油罐信息,1是需要,空值是不需要", paramType = "query")
+            @ApiImplicitParam(name = "is_lq", value = "是否需要油罐信息,1是不需要,空值是需要", paramType = "query")
     })
     public List<Map<String,Object>> getDepotToStoreList(String orgId, String depotId, String is_three, String is_lq){
         Map<String,Object> map = new HashMap<>();
@@ -113,7 +113,7 @@ public class AgentStorehouseController {
         	}
         }
         //如果是粮情数据，那就不要油罐的信息
-        if (null == is_lq || "".equals(is_lq)) {
+        if (ParameterUtil.isequal(is_lq,"1")) {
         	if (null != new_list && new_list.size() > 0) {
         		List<Map<String,Object>> list2 = new ArrayList<Map<String, Object>>();
         		Iterator<Map<String,Object>> ite = list.iterator();

src/main/java/com/chinaitop/depot/agent/quality/mapper/BusinessAgentQualityMapper.xml

@@ -260,7 +260,7 @@
       #{totalArsenic,jdbcType=VARCHAR}, #{aflatoxin,jdbcType=VARCHAR}, #{butylPhenol,jdbcType=VARCHAR}, 
       #{updatetime,jdbcType=TIMESTAMP})
   </insert>
-  <insert id="insertSelective" parameterType="com.chinaitop.depot.agent.quality.model.BusinessAgentQuality" >
+  <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id" parameterType="com.chinaitop.depot.agent.quality.model.BusinessAgentQuality" >
     insert into business_agent_quality
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -1661,14 +1661,14 @@
     depot.agent_depot_name agentDepotName,
     '0' AS stateType
     FROM business_agent_quality sqk
-    LEFT JOIN basic_storehouse store ON store.storehouse_id = sqk.storehouse_id
-    LEFT JOIN basic_warehouse ware ON ware.warehouse_id = sqk.warehouse_id
+    LEFT JOIN basic_storehouse store ON store.storehouse_id = sqk.storehouse_id AND store.library_type = 1
+    LEFT JOIN basic_warehouse ware ON ware.warehouse_id = sqk.warehouse_id AND ware.library_type = 1
     LEFT JOIN basic_tank bb on bb.id = sqk.tank_id
     LEFT JOIN storage_foodbasicinfo sfo on sfo.house_id = sqk.storehouse_id and sfo.warehouse_id = sqk.warehouse_id
     LEFT JOIN business_agent agent ON agent.id = sqk.agent_id
     LEFT JOIN business_agent_depot depot ON depot.id = sqk.agent_depot_id
     <where>
-      ware.library_type = 1 AND store.library_type = 1
+      sqk.org_id = #{orgId}
       <if test="agentId !=null">
         and sqk.agent_id = #{agentId}
       </if>
@@ -1702,7 +1702,6 @@
       <if test="checkResult !=null">
         and sqk.check_result = #{checkResult}
       </if>
-      AND sqk.org_id = #{orgId}
     </where>
     GROUP BY sqk.id
     UNION ALL

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

@@ -682,6 +682,7 @@
     INNER JOIN basic_storehouse store ON store.storehouse_id = agentStore.storehouse_id
     AND store.del_flag = 1
     LEFT JOIN t_testdata 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
     WHERE