bug修改，外加替换时间插件

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

@@ -150,7 +150,9 @@ public class AgentStorehouseController {
             map.put("agentDepotName","%" + agentDepotName + "%");
         }
 
-        PageHelper.startPage(pageNum, pageSize);
+        if (pageNum != null && pageSize != null) {
+            PageHelper.startPage(pageNum, pageSize);
+        }
         List<Map<String,Object>> list = agentStorehouseService.getStoreList(map);
         PageInfo<Map<String,Object>> pageInfo = new PageInfo<Map<String,Object>>(list);
         return pageInfo;

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

@@ -221,8 +221,8 @@ public class AgentTankController {
     })
     public Map<String, Object> importFile(MultipartFile file, String fileType, HttpServletRequest request, Integer orgId){
 
-        String[] titleArr = {"代储粮库名称","油罐编号", "设计容量", "设计年限", "是否国债投资", "启用日期", "当前状态", "责任保管员"};//第一行的title
-        boolean[] emptyArr = {false, false, false, false, false, false, false, false};//指定列可为空，不可为空值为false.
+        String[] titleArr = {"代储粮库名称", "油罐编号", "油罐名称", "设计容量", "设计年限", "是否国债投资", "启用日期", "当前状态", "责任保管员"};//第一行的title
+        boolean[] emptyArr = {false, false, false, false, false, false, false, false, false};//指定列可为空，不可为空值为false.
 
         List<List<String>> list = new ArrayList<List<String>>();//该list为数据返回的list
         Map<String, Object> fileMap = new HashMap<>();

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

@@ -329,8 +329,8 @@
     <if test="warehouseName != null">
       AND bware.warehouse_name LIKE #{warehouseName,jdbcType=VARCHAR}
     </if>
-    <if test="agentDepotName != null">
-      AND bware.storehouse_id = #{agentDepotName,jdbcType=VARCHAR}
+    <if test="storehouseId != null">
+      AND bware.storehouse_id = #{storehouseId,jdbcType=VARCHAR}
     </if>
     UNION ALL
     SELECT

src/main/java/com/chinaitop/depot/agent/basic/service/impl/AgentTankServiceImpl.java

@@ -105,18 +105,18 @@ public class AgentTankServiceImpl implements agentTankService {
                         agent.setOrgId(orgId);
                         break;
                     case 2:
-                        //设计容量
+                        //油罐名称
                         if (revList.get(j) != null && !"".equals(revList.get(j))) {
                             len = revList.get(j).length();
                             if (len > 30) {
                                 msg = "第 "+(i+1)+" 行第 3 列的值的长度不能超过30！";
                                 return msg;
                             }
+                            agent.setTankName(revList.get(j));
                         }
-                        agent.setDesignStorage(revList.get(j));
                         break;
                     case 3:
-                        //设计年限
+                        //设计容量
                         if (revList.get(j) != null && !"".equals(revList.get(j))) {
                             len = revList.get(j).length();
                             if (len > 30) {
@@ -124,9 +124,20 @@ public class AgentTankServiceImpl implements agentTankService {
                                 return msg;
                             }
                         }
-                        agent.setDesignYear(revList.get(j));
+                        agent.setDesignStorage(revList.get(j));
                         break;
                     case 4:
+                        //设计年限
+                        if (revList.get(j) != null && !"".equals(revList.get(j))) {
+                            len = revList.get(j).length();
+                            if (len > 30) {
+                                msg = "第 "+(i+1)+" 行第 5 列的值的长度不能超过30！";
+                                return msg;
+                            }
+                        }
+                        agent.setDesignYear(revList.get(j));
+                        break;
+                    case 5:
                         //是否国债投资
                         String sf = revList.get(j);
                         if ("是".equals(sf) || "是" == sf) {
@@ -135,16 +146,16 @@ public class AgentTankServiceImpl implements agentTankService {
                             agent.setTreasuryBonds("false");
                         }
                         break;
-                    case 5:
+                    case 6:
                         //启用日期
                         len = revList.get(j).length();
                         if (len > 20) {
-                            msg = "第 "+(i+1)+" 行第 6 列的值的长度不能超过20！";
+                            msg = "第 "+(i+1)+" 行第 7 列的值的长度不能超过20！";
                             return msg;
                         }
                         agent.setEnableDate(revList.get(j));
                         break;
-                    case 6:
+                    case 7:
                         //当前状态
                         switch(revList.get(j)) {
                             case "完好":
@@ -169,15 +180,15 @@ public class AgentTankServiceImpl implements agentTankService {
                                 agent.setState("3017");
                                 break;
                             default:
-                                msg = "第 "+(i+1)+" 行第 7 列的值并没有在项目中存在请查询后再导入！";
+                                msg = "第 "+(i+1)+" 行第 8 列的值并没有在项目中存在请查询后再导入！";
                                 return msg;
                         }
                         break;
-                    case 7:
+                    case 8:
                         //责任保管员
                         len = revList.get(j).length();
                         if (len > 20) {
-                            msg = "第 "+(i+1)+" 行第 8 列的值的长度不能超过20！";
+                            msg = "第 "+(i+1)+" 行第 9 列的值的长度不能超过20！";
                             return msg;
                         }
                         agent.setKeeper(revList.get(j));