代储点下粮情数据展示列表bug修改

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

@@ -14,6 +14,8 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+
+import org.apache.commons.collections.IteratorUtils;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -22,6 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -82,9 +85,10 @@ public class AgentStorehouseController {
     @ApiImplicitParams({
             @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_three", 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){
+    public List<Map<String,Object>> getDepotToStoreList(String orgId, String depotId, String is_three, String is_lq){
         Map<String,Object> map = new HashMap<>();
         if (null != orgId && !"".equals(orgId)) {
         	map.put("orgId",orgId);
@@ -108,6 +112,22 @@ public class AgentStorehouseController {
         		new_list.add(list_map);
         	}
         }
+        //如果是粮情数据，那就不要油罐的信息
+        if (null == is_lq || "".equals(is_lq)) {
+        	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();
+        		while (ite.hasNext()) {
+        			Map<String,Object> map2 = ite.next();
+        			if ("YG".equals(map2.get("storehouseId").toString().substring(0, 2))) {
+        				ite.remove();
+        			} else {
+        				list2.add(map2);
+        			}
+        		}
+        		new_list = list2;
+        	}
+        }
         return new_list;
     }
 

src/main/java/com/chinaitop/depot/agent/temperature/controller/AgentTemperatureController.java

@@ -1,8 +1,21 @@
 package com.chinaitop.depot.agent.temperature.controller;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.chinaitop.depot.agent.basic.model.BusinessAgentTank;
 import com.chinaitop.depot.agent.basic.service.agentService;
 import com.chinaitop.depot.agent.temperature.model.BusinessAgentTemperature;
 import com.chinaitop.depot.agent.temperature.model.TPoints;
@@ -12,20 +25,11 @@ import com.chinaitop.utils.ParameterUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.*;
 
 @RestController
 @RequestMapping(value = "/agentTemperature")
@@ -152,18 +156,20 @@ public class AgentTemperatureController {
     public Map<String, Object> getAgentTemperatureEdit(Integer id) {
         Map<String, Object> modelMap = new HashMap<>();
         List<TPoints> tPointsList = new ArrayList<TPoints>();
-        BusinessAgentTemperature agentTemper;
+        BusinessAgentTemperature agentTemper = null;
         if (id != null) {
             agentTemper = agentTemperatureService.findById(id);
-            modelMap.put("agentTemper", agentTemper);
             String[] points = agentTemper.gettPoints().substring(2, agentTemper.gettPoints().length() - 2).split("\\},\\{");
             ObjectMapper mapper = new ObjectMapper();
             for (String point : points) {
                 TPoints tPoints = JSON.parseObject(JSON.parse("{" + point + "}").toString(), TPoints.class);
                 tPointsList.add(tPoints);
             }
-            modelMap.put("tPoints", tPointsList);
+        } else {
+        	agentTemper = new BusinessAgentTemperature();
         }
+        modelMap.put("agentTemper", agentTemper);
+        modelMap.put("tPoints", tPointsList);
         return modelMap;
     }
 

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

@@ -627,8 +627,8 @@
     LEFT JOIN business_agent_depot depot ON depot.id = temper.agent_depot_id
     AND depot.org_id = #{orgId,jdbcType=INTEGER}
     LEFT JOIN basic_storehouse store ON store.storehouse_id = temper.storehouse_id
-    AND store.library_type = 1
-    AND store.org_id = #{orgId,jdbcType=INTEGER}
+<!--     AND store.library_type = 1 -->
+<!--     AND store.org_id = #{orgId,jdbcType=INTEGER} -->
     WHERE temper.org_id = #{orgId,jdbcType=INTEGER}
     <if test="agentId != null">
       AND temper.agent_id = #{agentId,jdbcType=INTEGER}