代储点bug修改

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

@@ -16,6 +16,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 
 import org.apache.commons.collections.IteratorUtils;
+import org.apache.commons.lang.ObjectUtils;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -106,9 +107,9 @@ public class AgentStorehouseController {
         	Map<String,Object> list_map = null;
         	for (int i = 0; i < list.size(); i++) {
         		list_map = list.get(i);
-        		list_map.put("id", list_map.get("id").toString());
-        		list_map.put("storehouseId", list_map.get("storehouseId").toString());
-        		list_map.put("storehouseName", list_map.get("storehouseName").toString());
+        		list_map.put("id", ObjectUtils.toString(list_map.get("id")));
+        		list_map.put("storehouseId", ObjectUtils.toString(list_map.get("storehouseId")));
+        		list_map.put("storehouseName", ObjectUtils.toString(list_map.get("storehouseName")));
         		new_list.add(list_map);
         	}
         }

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

@@ -388,7 +388,7 @@
     <!-- 拼接第三方的油罐 -->
     UNION ALL
     SELECT
-        btank.storageTank_code,
+        btank.storageTank_code id,
         btank.id storehouseId,
         btank.storageTank_name storehouseName
     FROM basic_tank btank

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

@@ -1676,10 +1676,10 @@
     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 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 basic_storehouse store ON store.storehouse_id = sqk.storehouse_id
+    LEFT JOIN basic_warehouse ware ON ware.warehouse_id = sqk.warehouse_id
+    LEFT JOIN storage_foodbasicinfo sfo ON sfo.house_id = sqk.storehouse_id AND sfo.warehouse_id = sqk.warehouse_id
+    LEFT JOIN basic_tank bb ON bb.id = sqk.tank_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>
@@ -1722,63 +1722,6 @@
     UNION ALL
     select
     <include refid="ExtBase_Column_List"/>,
-    sqk.agent_id,sqk.agent_depot_id,sqk.storehouse_id,
-    bstore.storeHouse_name storehouseName,
-    bware.warehouse_name wareHouseName,
-    bb.storageTank_name tankName,
-    sfo.id foodbasicinfoId,
-    agent.agent_name agentName,
-    depot.agent_depot_name agentDepotName,
-    '0' AS stateType
-    FROM business_agent_quality sqk
-    INNER JOIN business_agent_storehouse aStore ON aStore.storehouse_id = sqk.storehouse_id
-    INNER JOIN business_agent_warehouse aWare ON aWare.warehouse_id = sqk.warehouse_id
-    LEFT JOIN basic_storehouse bstore ON bstore.storehouse_id = aStore.storehouse_id
-    LEFT JOIN basic_warehouse bware ON bware.warehouse_id = aWare.warehouse_id
-    LEFT JOIN basic_tank bb on bb.id = sqk.tank_id
-    LEFT JOIN storage_foodbasicinfo sfo on sfo.house_id = aStore.storehouse_id and sfo.warehouse_id = aWare.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>
-      <if test="agentId !=null">
-        and sqk.agent_id = #{agentId}
-      </if>
-      <if test="agentDepotId !=null">
-        and sqk.agent_depot_id = #{agentDepotId}
-      </if>
-      <if test="storehouseId !=null">
-        and sqk.storehouse_id = #{storehouseId}
-      </if>
-      <if test="warehouseId !=null">
-        and sqk.warehouse_id = #{warehouseId}
-      </if>
-      <if test="tankId !=null">
-        and sqk.tank_id = #{tankId}
-      </if>
-      <if test="type !=null">
-        and sqk.type = #{type}
-      </if>
-      <if test="subTypeDetailed !=null">
-        and sqk.sub_type_detailed = #{subTypeDetailed}
-      </if>
-      <if test="level !=null">
-        and sqk.level = #{level}
-      </if>
-      <if test="historyStatus !=null">
-        and sqk.history_status = #{historyStatus}
-      </if>
-      <if test="sealStatus !=null">
-        and sqk.seal_status = #{sealStatus}
-      </if>
-      <if test="checkResult !=null">
-        and sqk.check_result = #{checkResult}
-      </if>
-      AND sqk.org_id = #{orgId}
-    </where>
-    GROUP BY sqk.id
-    UNION ALL
-    select
-    <include refid="ExtBase_Column_List"/>,
     depot.agent_id ,depot.id agent_depot_id,sqk.house_id storehouse_id,
     store.storeHouse_name storehouseName,
     ware.warehouse_name wareHouseName,
@@ -1799,10 +1742,10 @@
     LEFT JOIN storage_foodbasicinfo sfo ON sfo.house_id = sqk.house_id AND sfo.warehouse_id = sqk.warehouse_id
     <where>
       <if test="agentId !=null">
-        and agent.agent_id = #{agentId}
+        and agent.id = #{agentId}
       </if>
       <if test="agentDepotId !=null">
-        and depot.agent_depot_id = #{agentDepotId}
+        and depot.id = #{agentDepotId}
       </if>
       <if test="storehouseId !=null">
         and sqk.house_id = #{storehouseId}

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

@@ -207,7 +207,7 @@ public class AgentTemperatureController {
     })
     public Map<String, Object> importFile(MultipartFile file, String fileType, HttpServletRequest request, Integer orgId) {
 
-        String[] titleArr = {"测温线缆列号(X)", "测温线缆行号(Y)", "测温点高度(Z)", "温度值"};//第一行的title
+        String[] titleArr = {"测温线缆层数(Y)", "测温点行号(Z)", "测温线缆列号(X)", "温度值"};//第一行的title
         boolean[] emptyArr = {false, false, false, false};//指定列可为空，不可为空值为false.
 
         List<List<String>> list = new ArrayList<List<String>>();//该list为数据返回的list

src/main/java/com/chinaitop/depot/agent/temperature/service/impl/AgentTemperatureServiceImpl.java

@@ -210,17 +210,17 @@ public class AgentTemperatureServiceImpl implements agentTemperatureService {
             for (int j = 0; j < revList.size(); j++) {
                 switch(j) {
                     case 0:
-                        //测温线缆列号(X)
+                        //测温线缆层数(Y)
                         pointMap = new HashMap<>();
-                        pointMap.put("x",revList.get(j));
+                        pointMap.put("y",revList.get(j));
                         break;
                     case 1:
-                        //测温线缆行号(Y)
-                        pointMap.put("y",revList.get(j));
+                        //测温点行号(Z)
+                        pointMap.put("z",revList.get(j));
                         break;
                     case 2:
-                        //测温点高度(Z)
-                        pointMap.put("z",revList.get(j));
+                        //测温线缆列号(X)
+                        pointMap.put("x",revList.get(j));
                         break;
                     case 3:
                         //温度值