。。。

src/main/java/com/chinaitop/depot/basic/controller/BasicStorehouseController.java

@@ -118,13 +118,13 @@ public class BasicStorehouseController {
 
 			list = basicStorehouseService.findBasicStorehouseNew(modelMap);
 			//获取当前仓房的保管员
-			if (null != list && list.size() > 0 && ParameterUtil.isequal("0",libraryType)) {
+			/*if (null != list && list.size() > 0 && ParameterUtil.isequal("0",libraryType)) {
 				String keeperNames = "";
 				for (BasicStorehouse storehouse : list) {
 					keeperNames = basicStorehouseService.getStorehouseKeeper(storehouse.getStorehouseId(), orgId, true);
 					storehouse.setDutystoreman(keeperNames);
 				}
-			}
+			}*/
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -149,11 +149,11 @@ public class BasicStorehouseController {
 		try {
 			if (id != null) {
 				basicStorehouse = basicStorehouseService.findByPrimary(id);
-				if(ParameterUtil.isequal(basicStorehouse.getLibraryType(),"0")){
+				/*if(ParameterUtil.isequal(basicStorehouse.getLibraryType(),"0")){
 					//获取当前仓房的保管员
 					String keeperNames = basicStorehouseService.getStorehouseKeeper(id, orgId, false);
 					basicStorehouse.setDutystoreman(keeperNames);
-				}
+				}*/
 			} else {
 				basicStorehouse = new BasicStorehouse();
 			}

src/main/java/com/chinaitop/depot/basic/mapper/BasicTankMapper.xml

@@ -1,198 +1,198 @@
 <?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.basic.mapper.BasicTankMapper">
-  <resultMap id="BaseResultMap" type="com.chinaitop.depot.basic.model.BasicTank">
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="storageTank_code" jdbcType="VARCHAR" property="storagetankCode" />
-    <result column="storageTank_name" jdbcType="VARCHAR" property="storagetankName" />
-    <result column="org_code" jdbcType="VARCHAR" property="orgCode" />
-    <result column="tank_capacity" jdbcType="DECIMAL" property="tankCapacity" />
-    <result column="createDate" jdbcType="TIMESTAMP" property="createdate" />
-    <result column="facilities_type" jdbcType="INTEGER" property="facilitiesType" />
-    <result column="heating_type" jdbcType="INTEGER" property="heatingType" />
-    <result column="tank_type" jdbcType="INTEGER" property="tankType" />
-    <result column="diameter" jdbcType="DECIMAL" property="diameter" />
+<mapper namespace="com.chinaitop.depot.basic.mapper.BasicTankMapper">
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.basic.model.BasicTank">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="storageTank_code" jdbcType="VARCHAR" property="storagetankCode" />
+    <result column="storageTank_name" jdbcType="VARCHAR" property="storagetankName" />
+    <result column="org_code" jdbcType="VARCHAR" property="orgCode" />
+    <result column="tank_capacity" jdbcType="DECIMAL" property="tankCapacity" />
+    <result column="createDate" jdbcType="TIMESTAMP" property="createdate" />
+    <result column="facilities_type" jdbcType="INTEGER" property="facilitiesType" />
+    <result column="heating_type" jdbcType="INTEGER" property="heatingType" />
+    <result column="tank_type" jdbcType="INTEGER" property="tankType" />
+    <result column="diameter" jdbcType="DECIMAL" property="diameter" />
     <result column="height" jdbcType="DECIMAL" property="height" />
-    <result column="buildDate" jdbcType="TIMESTAMP" property="builddate" />
-    <result column="check_way" jdbcType="INTEGER" property="checkWay" />
-    <result column="weld_way" jdbcType="INTEGER" property="weldWay" />
-    <result column="tank_apply" jdbcType="INTEGER" property="tankApply" />
-    <result column="tank_status" jdbcType="INTEGER" property="tankStatus" />
-    <result column="org_id" jdbcType="INTEGER" property="orgId" />
-    <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
+    <result column="buildDate" jdbcType="TIMESTAMP" property="builddate" />
+    <result column="check_way" jdbcType="INTEGER" property="checkWay" />
+    <result column="weld_way" jdbcType="INTEGER" property="weldWay" />
+    <result column="tank_apply" jdbcType="INTEGER" property="tankApply" />
+    <result column="tank_status" jdbcType="INTEGER" property="tankStatus" />
+    <result column="org_id" jdbcType="INTEGER" property="orgId" />
+    <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
     <result column="updatetime" jdbcType="TIMESTAMP" property="updatetime" />
     <result column="crk_status" jdbcType="VARCHAR" property="crkStatus" />
     <result column="ygdm" property="crkStatus" jdbcType="VARCHAR" />
-    <result column="ygajdm" property="crkStatus" jdbcType="VARCHAR" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, storageTank_code, storageTank_name, org_code, tank_capacity, createDate, facilities_type, 
-    heating_type, tank_type, diameter, height, buildDate, check_way, weld_way, tank_apply, tank_status, 
-    org_id, del_flag, updatetime, crk_status, ygdm, ygajdm
-  </sql>
-  <select id="selectByExample" parameterType="com.chinaitop.depot.basic.model.BasicTankExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from basic_tank
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from basic_tank
-    where id = #{id,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from basic_tank
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.chinaitop.depot.basic.model.BasicTankExample">
-    delete from basic_tank
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.chinaitop.depot.basic.model.BasicTank">
-    insert into basic_tank (id, storageTank_code, storageTank_name, 
-      org_code, tank_capacity, createDate, 
-      facilities_type, heating_type, tank_type, 
-      diameter, height, buildDate, check_way, 
-      weld_way, tank_apply, tank_status, 
-      org_id, del_flag, updatetime, crk_status, ygdm, ygajdm
-      )
-    values (#{id,jdbcType=INTEGER}, #{storagetankCode,jdbcType=VARCHAR}, #{storagetankName,jdbcType=VARCHAR}, 
-      #{orgCode,jdbcType=VARCHAR}, #{tankCapacity,jdbcType=DECIMAL}, #{createdate,jdbcType=TIMESTAMP}, 
-      #{facilitiesType,jdbcType=INTEGER}, #{heatingType,jdbcType=INTEGER}, #{tankType,jdbcType=INTEGER}, 
-      #{diameter,jdbcType=DECIMAL}, #{height,jdbcType=DECIMAL}, #{builddate,jdbcType=TIMESTAMP}, #{checkWay,jdbcType=INTEGER}, 
-      #{weldWay,jdbcType=INTEGER}, #{tankApply,jdbcType=INTEGER}, #{tankStatus,jdbcType=INTEGER}, 
-      #{orgId,jdbcType=INTEGER}, #{delFlag,jdbcType=INTEGER}, #{updatetime,jdbcType=TIMESTAMP}, #{crkStatus,jdbcType=VARCHAR},
-      #{ygdm,jdbcType=VARCHAR},#{ygajdm,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.chinaitop.depot.basic.model.BasicTank"  keyProperty="id" useGeneratedKeys="true">
-    insert into basic_tank
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="storagetankCode != null">
-        storageTank_code,
-      </if>
-      <if test="storagetankName != null">
-        storageTank_name,
-      </if>
-      <if test="orgCode != null">
-        org_code,
-      </if>
-      <if test="tankCapacity != null">
-        tank_capacity,
-      </if>
-      <if test="createdate != null">
-        createDate,
-      </if>
-      <if test="facilitiesType != null">
-        facilities_type,
-      </if>
-      <if test="heatingType != null">
-        heating_type,
-      </if>
-      <if test="tankType != null">
-        tank_type,
-      </if>
-      <if test="diameter != null">
-        diameter,
-      </if>
-      <if test="height != null">
-        height,
-      </if>
-      <if test="builddate != null">
-        buildDate,
-      </if>
-      <if test="checkWay != null">
-        check_way,
-      </if>
-      <if test="weldWay != null">
-        weld_way,
-      </if>
-      <if test="tankApply != null">
-        tank_apply,
-      </if>
-      <if test="tankStatus != null">
-        tank_status,
-      </if>
-      <if test="orgId != null">
-        org_id,
-      </if>
-      <if test="delFlag != null">
-        del_flag,
-      </if>
-      <if test="updatetime != null">
-        updatetime,
+    <result column="ygajdm" property="crkStatus" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, storageTank_code, storageTank_name, org_code, tank_capacity, createDate, facilities_type, 
+    heating_type, tank_type, diameter, height, buildDate, check_way, weld_way, tank_apply, tank_status, 
+    org_id, del_flag, updatetime, crk_status, ygdm, ygajdm
+  </sql>
+  <select id="selectByExample" parameterType="com.chinaitop.depot.basic.model.BasicTankExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from basic_tank
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from basic_tank
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from basic_tank
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.basic.model.BasicTankExample">
+    delete from basic_tank
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.basic.model.BasicTank">
+    insert into basic_tank (id, storageTank_code, storageTank_name, 
+      org_code, tank_capacity, createDate, 
+      facilities_type, heating_type, tank_type, 
+      diameter, height, buildDate, check_way, 
+      weld_way, tank_apply, tank_status, 
+      org_id, del_flag, updatetime, crk_status, ygdm, ygajdm
+      )
+    values (#{id,jdbcType=INTEGER}, #{storagetankCode,jdbcType=VARCHAR}, #{storagetankName,jdbcType=VARCHAR}, 
+      #{orgCode,jdbcType=VARCHAR}, #{tankCapacity,jdbcType=DECIMAL}, #{createdate,jdbcType=TIMESTAMP}, 
+      #{facilitiesType,jdbcType=INTEGER}, #{heatingType,jdbcType=INTEGER}, #{tankType,jdbcType=INTEGER}, 
+      #{diameter,jdbcType=DECIMAL}, #{height,jdbcType=DECIMAL}, #{builddate,jdbcType=TIMESTAMP}, #{checkWay,jdbcType=INTEGER}, 
+      #{weldWay,jdbcType=INTEGER}, #{tankApply,jdbcType=INTEGER}, #{tankStatus,jdbcType=INTEGER}, 
+      #{orgId,jdbcType=INTEGER}, #{delFlag,jdbcType=INTEGER}, #{updatetime,jdbcType=TIMESTAMP}, #{crkStatus,jdbcType=VARCHAR},
+      #{ygdm,jdbcType=VARCHAR},#{ygajdm,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.basic.model.BasicTank"  keyProperty="id" useGeneratedKeys="true">
+    insert into basic_tank
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="storagetankCode != null">
+        storageTank_code,
+      </if>
+      <if test="storagetankName != null">
+        storageTank_name,
+      </if>
+      <if test="orgCode != null">
+        org_code,
+      </if>
+      <if test="tankCapacity != null">
+        tank_capacity,
+      </if>
+      <if test="createdate != null">
+        createDate,
+      </if>
+      <if test="facilitiesType != null">
+        facilities_type,
+      </if>
+      <if test="heatingType != null">
+        heating_type,
+      </if>
+      <if test="tankType != null">
+        tank_type,
+      </if>
+      <if test="diameter != null">
+        diameter,
+      </if>
+      <if test="height != null">
+        height,
+      </if>
+      <if test="builddate != null">
+        buildDate,
+      </if>
+      <if test="checkWay != null">
+        check_way,
+      </if>
+      <if test="weldWay != null">
+        weld_way,
+      </if>
+      <if test="tankApply != null">
+        tank_apply,
+      </if>
+      <if test="tankStatus != null">
+        tank_status,
+      </if>
+      <if test="orgId != null">
+        org_id,
+      </if>
+      <if test="delFlag != null">
+        del_flag,
+      </if>
+      <if test="updatetime != null">
+        updatetime,
       </if>
       <if test="crkStatus != null">
         crk_status,
@@ -202,65 +202,65 @@
       </if>
       <if test="ygajdm != null">
       	ygajdm,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
-      <if test="storagetankCode != null">
-        #{storagetankCode,jdbcType=VARCHAR},
-      </if>
-      <if test="storagetankName != null">
-        #{storagetankName,jdbcType=VARCHAR},
-      </if>
-      <if test="orgCode != null">
-        #{orgCode,jdbcType=VARCHAR},
-      </if>
-      <if test="tankCapacity != null">
-        #{tankCapacity,jdbcType=DECIMAL},
-      </if>
-      <if test="createdate != null">
-        #{createdate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="facilitiesType != null">
-        #{facilitiesType,jdbcType=INTEGER},
-      </if>
-      <if test="heatingType != null">
-        #{heatingType,jdbcType=INTEGER},
-      </if>
-      <if test="tankType != null">
-        #{tankType,jdbcType=INTEGER},
-      </if>
-      <if test="diameter != null">
-        #{diameter,jdbcType=DECIMAL},
-      </if>
-      <if test="height != null">
-        #{height,jdbcType=DECIMAL},
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="storagetankCode != null">
+        #{storagetankCode,jdbcType=VARCHAR},
+      </if>
+      <if test="storagetankName != null">
+        #{storagetankName,jdbcType=VARCHAR},
+      </if>
+      <if test="orgCode != null">
+        #{orgCode,jdbcType=VARCHAR},
+      </if>
+      <if test="tankCapacity != null">
+        #{tankCapacity,jdbcType=DECIMAL},
+      </if>
+      <if test="createdate != null">
+        #{createdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="facilitiesType != null">
+        #{facilitiesType,jdbcType=INTEGER},
+      </if>
+      <if test="heatingType != null">
+        #{heatingType,jdbcType=INTEGER},
+      </if>
+      <if test="tankType != null">
+        #{tankType,jdbcType=INTEGER},
+      </if>
+      <if test="diameter != null">
+        #{diameter,jdbcType=DECIMAL},
+      </if>
+      <if test="height != null">
+        #{height,jdbcType=DECIMAL},
       </if>
       <if test="builddate != null">
         #{builddate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="checkWay != null">
-        #{checkWay,jdbcType=INTEGER},
-      </if>
-      <if test="weldWay != null">
-        #{weldWay,jdbcType=INTEGER},
-      </if>
-      <if test="tankApply != null">
-        #{tankApply,jdbcType=INTEGER},
-      </if>
-      <if test="tankStatus != null">
-        #{tankStatus,jdbcType=INTEGER},
-      </if>
-      <if test="orgId != null">
-        #{orgId,jdbcType=INTEGER},
-      </if>
-      <if test="delFlag != null">
-        #{delFlag,jdbcType=INTEGER},
-      </if>
-      <if test="updatetime != null">
-        #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="checkWay != null">
+        #{checkWay,jdbcType=INTEGER},
+      </if>
+      <if test="weldWay != null">
+        #{weldWay,jdbcType=INTEGER},
+      </if>
+      <if test="tankApply != null">
+        #{tankApply,jdbcType=INTEGER},
+      </if>
+      <if test="tankStatus != null">
+        #{tankStatus,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null">
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="delFlag != null">
+        #{delFlag,jdbcType=INTEGER},
+      </if>
+      <if test="updatetime != null">
+        #{updatetime,jdbcType=TIMESTAMP},
       </if>
       <if test="crkStatus != null">
         #{crkStatus,jdbcType=VARCHAR},
@@ -270,74 +270,74 @@
       </if>
       <if test="ygajdm != null">
         #{ygajdm,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.chinaitop.depot.basic.model.BasicTankExample" resultType="java.lang.Integer">
-    select count(*) from basic_tank
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update basic_tank
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=INTEGER},
-      </if>
-      <if test="record.storagetankCode != null">
-        storageTank_code = #{record.storagetankCode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.storagetankName != null">
-        storageTank_name = #{record.storagetankName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.orgCode != null">
-        org_code = #{record.orgCode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.tankCapacity != null">
-        tank_capacity = #{record.tankCapacity,jdbcType=DECIMAL},
-      </if>
-      <if test="record.createdate != null">
-        createDate = #{record.createdate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.facilitiesType != null">
-        facilities_type = #{record.facilitiesType,jdbcType=INTEGER},
-      </if>
-      <if test="record.heatingType != null">
-        heating_type = #{record.heatingType,jdbcType=INTEGER},
-      </if>
-      <if test="record.tankType != null">
-        tank_type = #{record.tankType,jdbcType=INTEGER},
-      </if>
-      <if test="record.diameter != null">
-        diameter = #{record.diameter,jdbcType=DECIMAL},
-      </if>
-      <if test="record.height != null">
-        height = #{record.height,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.basic.model.BasicTankExample" resultType="java.lang.Integer">
+    select count(*) from basic_tank
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update basic_tank
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.storagetankCode != null">
+        storageTank_code = #{record.storagetankCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.storagetankName != null">
+        storageTank_name = #{record.storagetankName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orgCode != null">
+        org_code = #{record.orgCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.tankCapacity != null">
+        tank_capacity = #{record.tankCapacity,jdbcType=DECIMAL},
+      </if>
+      <if test="record.createdate != null">
+        createDate = #{record.createdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.facilitiesType != null">
+        facilities_type = #{record.facilitiesType,jdbcType=INTEGER},
+      </if>
+      <if test="record.heatingType != null">
+        heating_type = #{record.heatingType,jdbcType=INTEGER},
+      </if>
+      <if test="record.tankType != null">
+        tank_type = #{record.tankType,jdbcType=INTEGER},
+      </if>
+      <if test="record.diameter != null">
+        diameter = #{record.diameter,jdbcType=DECIMAL},
+      </if>
+      <if test="record.height != null">
+        height = #{record.height,jdbcType=DECIMAL},
       </if>
       <if test="record.builddate != null">
         buildDate = #{record.builddate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.checkWay != null">
-        check_way = #{record.checkWay,jdbcType=INTEGER},
-      </if>
-      <if test="record.weldWay != null">
-        weld_way = #{record.weldWay,jdbcType=INTEGER},
-      </if>
-      <if test="record.tankApply != null">
-        tank_apply = #{record.tankApply,jdbcType=INTEGER},
-      </if>
-      <if test="record.tankStatus != null">
-        tank_status = #{record.tankStatus,jdbcType=INTEGER},
-      </if>
-      <if test="record.orgId != null">
-        org_id = #{record.orgId,jdbcType=INTEGER},
-      </if>
-      <if test="record.delFlag != null">
-        del_flag = #{record.delFlag,jdbcType=INTEGER},
-      </if>
-      <if test="record.updatetime != null">
-        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.checkWay != null">
+        check_way = #{record.checkWay,jdbcType=INTEGER},
+      </if>
+      <if test="record.weldWay != null">
+        weld_way = #{record.weldWay,jdbcType=INTEGER},
+      </if>
+      <if test="record.tankApply != null">
+        tank_apply = #{record.tankApply,jdbcType=INTEGER},
+      </if>
+      <if test="record.tankStatus != null">
+        tank_status = #{record.tankStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.orgId != null">
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.delFlag != null">
+        del_flag = #{record.delFlag,jdbcType=INTEGER},
+      </if>
+      <if test="record.updatetime != null">
+        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
       </if>
       <if test="record.crkStatus != null">
         crk_status = #{record.crkStatus,jdbcType=VARCHAR},
@@ -347,96 +347,96 @@
       </if>
       <if test="record.ygajdm != null">
         ygajdm = #{record.ygajdm,jdbcType=VARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update basic_tank
-    set id = #{record.id,jdbcType=INTEGER},
-      storageTank_code = #{record.storagetankCode,jdbcType=VARCHAR},
-      storageTank_name = #{record.storagetankName,jdbcType=VARCHAR},
-      org_code = #{record.orgCode,jdbcType=VARCHAR},
-      tank_capacity = #{record.tankCapacity,jdbcType=DECIMAL},
-      createDate = #{record.createdate,jdbcType=TIMESTAMP},
-      facilities_type = #{record.facilitiesType,jdbcType=INTEGER},
-      heating_type = #{record.heatingType,jdbcType=INTEGER},
-      tank_type = #{record.tankType,jdbcType=INTEGER},
-      diameter = #{record.diameter,jdbcType=DECIMAL},
-      height = #{record.height,jdbcType=DECIMAL},
-      buildDate = #{record.builddate,jdbcType=TIMESTAMP},
-      check_way = #{record.checkWay,jdbcType=INTEGER},
-      weld_way = #{record.weldWay,jdbcType=INTEGER},
-      tank_apply = #{record.tankApply,jdbcType=INTEGER},
-      tank_status = #{record.tankStatus,jdbcType=INTEGER},
-      org_id = #{record.orgId,jdbcType=INTEGER},
-      del_flag = #{record.delFlag,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update basic_tank
+    set id = #{record.id,jdbcType=INTEGER},
+      storageTank_code = #{record.storagetankCode,jdbcType=VARCHAR},
+      storageTank_name = #{record.storagetankName,jdbcType=VARCHAR},
+      org_code = #{record.orgCode,jdbcType=VARCHAR},
+      tank_capacity = #{record.tankCapacity,jdbcType=DECIMAL},
+      createDate = #{record.createdate,jdbcType=TIMESTAMP},
+      facilities_type = #{record.facilitiesType,jdbcType=INTEGER},
+      heating_type = #{record.heatingType,jdbcType=INTEGER},
+      tank_type = #{record.tankType,jdbcType=INTEGER},
+      diameter = #{record.diameter,jdbcType=DECIMAL},
+      height = #{record.height,jdbcType=DECIMAL},
+      buildDate = #{record.builddate,jdbcType=TIMESTAMP},
+      check_way = #{record.checkWay,jdbcType=INTEGER},
+      weld_way = #{record.weldWay,jdbcType=INTEGER},
+      tank_apply = #{record.tankApply,jdbcType=INTEGER},
+      tank_status = #{record.tankStatus,jdbcType=INTEGER},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      del_flag = #{record.delFlag,jdbcType=INTEGER},
       updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
       crk_status = #{record.crkStatus,jdbcType=VARCHAR},
       ygdm = #{record.ygdm,jdbcType=VARCHAR},
-      ygajdm = #{record.ygajdm,jdbcType=VARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.basic.model.BasicTank">
-    update basic_tank
-    <set>
-      <if test="storagetankCode != null">
-        storageTank_code = #{storagetankCode,jdbcType=VARCHAR},
-      </if>
-      <if test="storagetankName != null">
-        storageTank_name = #{storagetankName,jdbcType=VARCHAR},
-      </if>
-      <if test="orgCode != null">
-        org_code = #{orgCode,jdbcType=VARCHAR},
-      </if>
-      <if test="tankCapacity != null">
-        tank_capacity = #{tankCapacity,jdbcType=DECIMAL},
-      </if>
-      <if test="createdate != null">
-        createDate = #{createdate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="facilitiesType != null">
-        facilities_type = #{facilitiesType,jdbcType=INTEGER},
-      </if>
-      <if test="heatingType != null">
-        heating_type = #{heatingType,jdbcType=INTEGER},
-      </if>
-      <if test="tankType != null">
-        tank_type = #{tankType,jdbcType=INTEGER},
-      </if>
-      <if test="diameter != null">
-        diameter = #{diameter,jdbcType=DECIMAL},
-      </if>
-      <if test="height != null">
-        height = #{height,jdbcType=DECIMAL},
-      </if>
-      <if test="builddate != null">
-        buildDate = #{builddate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="checkWay != null">
-        check_way = #{checkWay,jdbcType=INTEGER},
-      </if>
-      <if test="weldWay != null">
-        weld_way = #{weldWay,jdbcType=INTEGER},
-      </if>
-      <if test="tankApply != null">
-        tank_apply = #{tankApply,jdbcType=INTEGER},
-      </if>
-      <if test="tankStatus != null">
-        tank_status = #{tankStatus,jdbcType=INTEGER},
-      </if>
-      <if test="orgId != null">
-        org_id = #{orgId,jdbcType=INTEGER},
-      </if>
-      <if test="delFlag != null">
-        del_flag = #{delFlag,jdbcType=INTEGER},
-      </if>
-      <if test="updatetime != null">
-        updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      ygajdm = #{record.ygajdm,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.basic.model.BasicTank">
+    update basic_tank
+    <set>
+      <if test="storagetankCode != null">
+        storageTank_code = #{storagetankCode,jdbcType=VARCHAR},
+      </if>
+      <if test="storagetankName != null">
+        storageTank_name = #{storagetankName,jdbcType=VARCHAR},
+      </if>
+      <if test="orgCode != null">
+        org_code = #{orgCode,jdbcType=VARCHAR},
+      </if>
+      <if test="tankCapacity != null">
+        tank_capacity = #{tankCapacity,jdbcType=DECIMAL},
+      </if>
+      <if test="createdate != null">
+        createDate = #{createdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="facilitiesType != null">
+        facilities_type = #{facilitiesType,jdbcType=INTEGER},
+      </if>
+      <if test="heatingType != null">
+        heating_type = #{heatingType,jdbcType=INTEGER},
+      </if>
+      <if test="tankType != null">
+        tank_type = #{tankType,jdbcType=INTEGER},
+      </if>
+      <if test="diameter != null">
+        diameter = #{diameter,jdbcType=DECIMAL},
+      </if>
+      <if test="height != null">
+        height = #{height,jdbcType=DECIMAL},
+      </if>
+      <if test="builddate != null">
+        buildDate = #{builddate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="checkWay != null">
+        check_way = #{checkWay,jdbcType=INTEGER},
+      </if>
+      <if test="weldWay != null">
+        weld_way = #{weldWay,jdbcType=INTEGER},
+      </if>
+      <if test="tankApply != null">
+        tank_apply = #{tankApply,jdbcType=INTEGER},
+      </if>
+      <if test="tankStatus != null">
+        tank_status = #{tankStatus,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null">
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="delFlag != null">
+        del_flag = #{delFlag,jdbcType=INTEGER},
+      </if>
+      <if test="updatetime != null">
+        updatetime = #{updatetime,jdbcType=TIMESTAMP},
       </if>
       <if test="crkStatus != null">
         crk_status = #{crkStatus,jdbcType=VARCHAR},
@@ -446,33 +446,33 @@
       </if>
       <if test="ygajdm != null">
         ygajdm = #{ygajdm,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.basic.model.BasicTank">
-    update basic_tank
-    set storageTank_code = #{storagetankCode,jdbcType=VARCHAR},
-      storageTank_name = #{storagetankName,jdbcType=VARCHAR},
-      org_code = #{orgCode,jdbcType=VARCHAR},
-      tank_capacity = #{tankCapacity,jdbcType=DECIMAL},
-      createDate = #{createdate,jdbcType=TIMESTAMP},
-      facilities_type = #{facilitiesType,jdbcType=INTEGER},
-      heating_type = #{heatingType,jdbcType=INTEGER},
-      tank_type = #{tankType,jdbcType=INTEGER},
-      diameter = #{diameter,jdbcType=DECIMAL},
-      height = #{height,jdbcType=DECIMAL},
-      buildDate = #{builddate,jdbcType=TIMESTAMP},
-      check_way = #{checkWay,jdbcType=INTEGER},
-      weld_way = #{weldWay,jdbcType=INTEGER},
-      tank_apply = #{tankApply,jdbcType=INTEGER},
-      tank_status = #{tankStatus,jdbcType=INTEGER},
-      org_id = #{orgId,jdbcType=INTEGER},
-      del_flag = #{delFlag,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.basic.model.BasicTank">
+    update basic_tank
+    set storageTank_code = #{storagetankCode,jdbcType=VARCHAR},
+      storageTank_name = #{storagetankName,jdbcType=VARCHAR},
+      org_code = #{orgCode,jdbcType=VARCHAR},
+      tank_capacity = #{tankCapacity,jdbcType=DECIMAL},
+      createDate = #{createdate,jdbcType=TIMESTAMP},
+      facilities_type = #{facilitiesType,jdbcType=INTEGER},
+      heating_type = #{heatingType,jdbcType=INTEGER},
+      tank_type = #{tankType,jdbcType=INTEGER},
+      diameter = #{diameter,jdbcType=DECIMAL},
+      height = #{height,jdbcType=DECIMAL},
+      buildDate = #{builddate,jdbcType=TIMESTAMP},
+      check_way = #{checkWay,jdbcType=INTEGER},
+      weld_way = #{weldWay,jdbcType=INTEGER},
+      tank_apply = #{tankApply,jdbcType=INTEGER},
+      tank_status = #{tankStatus,jdbcType=INTEGER},
+      org_id = #{orgId,jdbcType=INTEGER},
+      del_flag = #{delFlag,jdbcType=INTEGER},
       updatetime = #{updatetime,jdbcType=TIMESTAMP},
       crk_status = #{crkStatus,jdbcType=VARCHAR},
       ygdm = #{ygdm,jdbcType=VARCHAR},
-      ygajdm = #{ygajdm,jdbcType=VARCHAR}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
+      ygajdm = #{ygajdm,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
 </mapper>

src/main/java/com/chinaitop/depot/basic/service/BasicStorehouseService.java

@@ -87,15 +87,6 @@ public interface BasicStorehouseService {
 	 */
 	public String importData(List<List<String>> list, JSONObject userInfo);
 
-	/**
-	 * 根据仓房ID获取当前仓房的保管员名称
-	 * 
-	 * @param id 仓房ID
-	 * @param orgId 单位ID
-	 * @param flag 是否需要格式化省略
-	 * @return
-	 */
-	public String getStorehouseKeeper(Integer id, Integer orgId, boolean flag);
 	
 	/**
 	 * 查询三温检查列表最新数据所对应的仓房

src/main/java/com/chinaitop/depot/basic/service/impl/BasicStorehouseServiceImpl.java

@@ -0,0 +1,630 @@
+package com.chinaitop.depot.basic.service.impl;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import com.chinaitop.depot.basic.mapper.BasicEnumMapper;
+import com.chinaitop.depot.basic.model.*;
+import com.chinaitop.utils.ParameterUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import org.apache.commons.lang.ObjectUtils;
+import org.springframework.stereotype.Service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.chinaitop.depot.basic.mapper.BasicStorehouseMapper;
+import com.chinaitop.depot.basic.mapper.BasicTankMapper;
+import com.chinaitop.depot.basic.mapper.BasicWarehouseMapper;
+import com.chinaitop.depot.basic.model.BasicStorehouseExample.Criteria;
+import com.chinaitop.depot.basic.service.BasicStorehouseService;
+import com.chinaitop.depot.basic.service.BasicWarehouseService;
+import com.chinaitop.depot.utils.BusinessUtils;
+
+@Service
+@SuppressWarnings("all")
+public class BasicStorehouseServiceImpl implements BasicStorehouseService {
+
+	@Resource
+	private BasicStorehouseMapper basic;
+
+	@Resource
+	private BasicWarehouseMapper wareMapper;
+
+	@Resource
+	private BasicWarehouseService warehouseService;
+
+	@Resource
+	private BasicEnumMapper enumMapper;
+
+	@Resource
+	private BasicTankMapper basicTankMapper;
+
+	@Override
+	public void addBasicStorehouse(BasicStorehouse basicStorehouse) throws Exception {
+		basic.insertSelective(basicStorehouse);
+	}
+
+	@Override
+	public void removeBasicStorehouse(Integer id) throws Exception {
+		basic.deleteByPrimaryKey(id);
+	}
+
+	@Override
+	public void updateBasicStorehouse(BasicStorehouse basicStorehouse) throws Exception {
+		basic.updateByPrimaryKey(basicStorehouse);
+	}
+
+	@Override
+	public BasicStorehouse findByPrimary(Integer id) throws Exception {
+		return basic.selectByPrimaryKey(id);
+	}
+
+	@Override
+	public List<BasicStorehouse> findBasicStorehouse(BasicStorehouseExample basicStorehouseExample) throws Exception {
+		return basic.selectByExample(basicStorehouseExample);
+	}
+
+	@Override
+	public List<BasicStorehouse> findBasicStorehouseNew(Map<String, Object> map) throws Exception {
+		return basic.selectByExampleNew(map);
+	}
+
+	@Override
+	public int count(BasicStorehouseExample basicStorehouseExample) throws Exception {
+		return basic.countByExample(basicStorehouseExample);
+	}
+
+	@Override
+	public Map<String, Object> getStorehouseData(Integer orgId, String libraryType) {
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+		BasicStorehouseExample example = new BasicStorehouseExample();
+		Criteria criteria = example.createCriteria();
+		List<BasicStorehouse> houselist = null;
+		try {
+			example.setOrderByClause("storehouse_id asc");
+			if (ParameterUtil.isnotnull(orgId)) { 
+				criteria.andOrgIdEqualTo(orgId);
+			}
+			if (ParameterUtil.isnotnull(libraryType)) {
+				criteria.andLibraryTypeEqualTo(libraryType);
+			}else if(ParameterUtil.isnull(libraryType)){
+				criteria.andLibraryTypeEqualTo("0");//如果不传值则默认查询主库数据，不查询代储库数据
+			}
+			criteria.andDelFlagEqualTo(1); // 查询正常数据
+			houselist = basic.selectByExample(example); //获取当前单位下的所有有效数据
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		modelMap.put("houseList", houselist);
+		modelMap.put("houseObj", getStorehouseObj(orgId,libraryType));
+		modelMap.put("houseCodeObj", getStorehouseCodeObj(orgId,libraryType));
+		return modelMap;
+	}
+
+	/**
+	 * 获取当前单位下所有仓房数据(全局接口，不可随便修改)
+	 *
+	 * @param orgId
+	 * @return
+	 */
+	private Map<Integer, Object> getStorehouseObj(Integer orgId,String libraryType) {
+		BasicStorehouseExample example = new BasicStorehouseExample();
+		Criteria criteria = example.createCriteria();
+		List<BasicStorehouse> houseObj = null;
+		try {
+			example.setOrderByClause("storehouse_id asc");
+
+			if (ParameterUtil.isnotnull(libraryType)) {
+				criteria.andLibraryTypeEqualTo(libraryType);
+			}else if(ParameterUtil.isnull(libraryType)){
+				criteria.andLibraryTypeEqualTo("0");//如果不传值则默认查询主库数据，不查询代储库数据
+			}
+			if (ParameterUtil.isnotnull(orgId)) {
+				criteria.andOrgIdEqualTo(orgId);
+			}
+			
+			/*criteria.andDelFlagEqualTo(1); // 查询正常数据
+*/			houseObj = basic.selectByExample(example); //获取当前单位所有的仓房数据
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		Map<Integer, Object> objMap = new HashMap<Integer, Object>();
+		for (BasicStorehouse obj : houseObj) {
+			objMap.put(obj.getStorehouseId(), obj);
+		}
+		return objMap;
+	}
+
+	/**
+	 * 获取当前单位下所有仓房数据-仓房编码(全局接口，不可随便修改)
+	 *
+	 * @param depotId
+	 * @return
+	 */
+	private Map<String, Object> getStorehouseCodeObj(Integer orgId,String libraryType) {
+		BasicStorehouseExample example = new BasicStorehouseExample();
+		Criteria criteria = example.createCriteria();
+		List<BasicStorehouse> houseObj = null;
+		try {
+			example.setOrderByClause("storehouse_id asc");
+
+			if (ParameterUtil.isnotnull(libraryType)) {
+				criteria.andLibraryTypeEqualTo(libraryType);
+			}else if(ParameterUtil.isnull(libraryType)){
+				criteria.andLibraryTypeEqualTo("0");//如果不传值则默认查询主库数据，不查询代储库数据
+			}
+			if (ParameterUtil.isnotnull(orgId)) {
+				criteria.andOrgIdEqualTo(orgId);
+			}
+			criteria.andDelFlagEqualTo(1); // 查询正常数据
+			houseObj = basic.selectByExample(example); //获取当前单位所有的仓房数据
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		Map<String, Object> objMap = new HashMap<>();
+		for (BasicStorehouse obj : houseObj) {
+			objMap.put(obj.getStorehouseCode(), obj);
+		}
+		return objMap;
+	}
+
+	@Override
+	public String importData(List<List<String>> list, JSONObject user) {
+
+		Integer orgId = null;
+		String orgName = "";
+		if (null != user) {
+			orgId = Integer.parseInt(user.get("orgId") == null?"":user.get("orgId").toString());
+			orgName = user.get("orgName") == null?"":user.get("orgName").toString();
+		}
+
+		String uuid = null;
+		Date date = new Date();
+		Map<String, Integer> map = new HashMap<String, Integer>();
+		BasicStorehouse storehouse = null;
+		BasicWarehouse warehouse = null;
+		String msg = "";//消息
+		boolean value_flag = false;
+		int len = 0;//长度
+		//根据字典名字查询字典编号
+		BasicEnumExample enumExample = new BasicEnumExample();
+		BasicEnumExample.Criteria Criteria = enumExample.createCriteria();
+		List<BasicEnum> basicEnums;
+
+		for (int i = 0; i < list.size(); i++) {
+			List<String> revList = list.get(i);
+			uuid = UUID.randomUUID().toString();
+
+			for (int j = 0; j < revList.size(); j++) {
+				switch(j) {
+					case 0://仓房编号
+						if (ParameterUtil.isnotnull(revList.get(j))) {
+							len = revList.get(j).length();
+							if (len > 50) {
+								msg = "第 "+(i+1)+" 行第 1 列的值的长度不能超过50！";
+								return msg;
+							}
+
+							Integer mapKey = map.get(revList.get(j));
+							if (mapKey == null) {
+								storehouse = new BasicStorehouse();
+								map.put(revList.get(j), null);
+								storehouse.setStorehouseCode(revList.get(j));
+							}
+						}
+						break;
+					case 1://仓房名称
+						if (storehouse != null) {
+							len = revList.get(j).length();
+							if (len > 50) {
+								msg = "第 "+(i+1)+" 行第 2 列的值的长度不能超过50！";
+								return msg;
+							}
+							storehouse.setStorehouseName(revList.get(j));
+						}
+						break;
+					case 2://仓房类型
+						if (ParameterUtil.isnotnull(revList.get(j)) && storehouse != null) {
+							enumExample.clear();
+							Criteria = enumExample.createCriteria();
+							Criteria.andEnumnameEqualTo(revList.get(j));
+							basicEnums = enumMapper.selectByExample(enumExample);
+							if(basicEnums.size() == 0){
+								msg = "第 "+(i+1)+" 行第 3 列的值不正确，请查找后在导入！";
+								return msg;
+							}
+							len = revList.get(j).length();
+							if (len > 11) {
+								msg = "第 "+(i+1)+" 行第 3 列的值的长度不能超过11！";
+								return msg;
+							}
+							storehouse.setStorehouseType(basicEnums.get(0).getEnumid());
+						}
+						break;
+					case 3://设计仓容(吨)
+						if (ParameterUtil.isnotnull(revList.get(j)) && storehouse != null) {
+							value_flag = revList.get(j).matches("[0-9]+");
+							if (!value_flag) {
+								msg = "第 "+(i+1)+" 行的第 4 列的值只能是数字！";
+								return msg;
+							}
+							len = revList.get(j).length();
+							if (len > 30) {
+								msg = "第 "+(i+1)+" 行第 4 列的值的长度不能超过30！";
+								return msg;
+							}
+							storehouse.setDesignCapacity(BigDecimal.valueOf(Integer.parseInt(revList.get(j))));
+						}
+						break;
+					case 4://实际仓容(吨)
+						if (ParameterUtil.isnotnull(revList.get(j)) && storehouse != null) {
+							value_flag = revList.get(j).matches("[0-9]+");
+							if (!value_flag) {
+								msg = "第 "+(i+1)+" 行的第 5 列的值只能是数字！";
+								return msg;
+							}
+							len = revList.get(j).length();
+							if (len > 30) {
+								msg = "第 "+(i+1)+" 行第 5 列的值的长度不能超过30！";
+								return msg;
+							}
+							storehouse.setActualCapacity(BigDecimal.valueOf(Integer.parseInt(revList.get(j))));
+						}
+						break;
+					case 5://通风方式
+						if (ParameterUtil.isnotnull(revList.get(j)) && storehouse != null) {
+							enumExample.clear();
+							Criteria = enumExample.createCriteria();
+							Criteria.andEnumnameEqualTo(revList.get(j));
+							basicEnums = enumMapper.selectByExample(enumExample);
+							if(basicEnums.size() == 0){
+								msg = "第 "+(i+1)+" 行第 6 列的值不正确，请查找后在导入！";
+								return msg;
+							}
+							len = revList.get(j).length();
+							if (len > 100) {
+								msg = "第 "+(i+1)+" 行第 6 列的值的长度不能超过100！";
+								return msg;
+							}
+							storehouse.setDrafttype(basicEnums.get(0).getEnumid());
+						}
+						break;
+					case 6://保管方式
+						if (ParameterUtil.isnotnull(revList.get(j)) && storehouse != null) {
+							enumExample.clear();
+							Criteria = enumExample.createCriteria();
+							Criteria.andEnumnameEqualTo(revList.get(j));
+							basicEnums = enumMapper.selectByExample(enumExample);
+							if(basicEnums.size() == 0){
+								msg = "第 "+(i+1)+" 行第 7 列的值不正确，请查找后在导入！";
+								return msg;
+							}
+							len = revList.get(j).length();
+							if (len > 100) {
+								msg = "第 "+(i+1)+" 行第 7 列的值的长度不能超过100！";
+								return msg;
+							}
+							storehouse.setKeepingWay(basicEnums.get(0).getEnumid());
+						}
+						break;
+					case 7://装粮线高度(m)
+						if (ParameterUtil.isnotnull(revList.get(j)) && storehouse != null) {
+							value_flag = revList.get(j).matches("[0-9]+");
+							if (!value_flag) {
+								msg = "第 "+(i+1)+" 行的第 8 列的值只能是数字！";
+								return msg;
+							}
+							len = revList.get(j).length();
+							if (len > 30) {
+								msg = "第 "+(i+1)+" 行第 8 列的值的长度不能超过30！";
+								return msg;
+							}
+							storehouse.setGrainHeigth(new BigDecimal(revList.get(j)));
+						}
+						break;
+					/*case 8://保管员 注：liangs 2019/07/08 注掉保管员列
+						if (ParameterUtil.isnotnull(revList.get(j)) && storehouse != null) {
+							len = revList.get(j).length();
+							if (len > 50) {
+								msg = "第 "+(i+1)+" 行第 9 列的值的长度不能超过50！";
+								return msg;
+							}
+							storehouse.setDutystoreman(revList.get(j));
+						}
+						break;*/
+					case 8://仓房状态
+						if (ParameterUtil.isnotnull(revList.get(j)) && storehouse != null) {
+							enumExample.clear();
+							Criteria = enumExample.createCriteria();
+							Criteria.andEnumnameEqualTo(revList.get(j));
+							basicEnums = enumMapper.selectByExample(enumExample);
+							if(basicEnums.size() == 0){
+								msg = "第 "+(i+1)+" 行第 9 列的值不正确，请查找后在导入！";
+								return msg;
+							}
+							len = revList.get(j).length();
+							if (len > 11) {
+								msg = "第 "+(i+1)+" 行第 9 列的值的长度不能超过11！";
+								return msg;
+							}
+							storehouse.setStorehouseState(basicEnums.get(0).getEnumid());
+						}
+						break;
+					case 9://交付使用日期
+						if (ParameterUtil.isnotnull(revList.get(j)) && storehouse != null) {
+							if(!ParameterUtil.stringIsTime(revList.get(j))){
+								msg = "第 "+(i+1)+" 行第 10 列的值不属于时间，请确认后再提交！";
+								return msg;
+							}
+							storehouse.setUsedate(ParameterUtil.string2datetime(revList.get(j)));
+						}
+						if (storehouse != null) {
+							storehouse.setUuid(uuid);
+							storehouse.setDelFlag(1);
+							storehouse.setCreatedate(date);
+							storehouse.setOrgId(orgId);
+						}
+						break;
+					case 10://货位编号
+						if (ParameterUtil.isnotnull(revList.get(j))) {
+							len = revList.get(j).length();
+							if (len > 50) {
+								msg = "第 "+(i+1)+" 行第 11 列的值的长度不能超过50！";
+								return msg;
+							}
+
+							warehouse = new BasicWarehouse();
+							warehouse.setWarehouseCode(revList.get(j));
+						}
+						break;
+					case 11://货位名称
+						if (ParameterUtil.isnotnull(revList.get(j))) {
+							len = revList.get(j).length();
+							if (len > 50) {
+								msg = "第 "+(i+1)+" 行第 12 列的值的长度不能超过50！";
+								return msg;
+							}
+							if (warehouse != null) {
+								warehouse.setWarehouseName(revList.get(j));
+							}
+						}
+						break;
+					case 12://货位容量(吨)
+						if (ParameterUtil.isnotnull(revList.get(j))) {
+							len = revList.get(j).length();
+							if (len > 50) {
+								msg = "第 "+(i+1)+" 行第 13 列的值的长度不能超过50！";
+								return msg;
+							}
+							if (warehouse != null) {
+								warehouse.setWarehouseCapacity(new BigDecimal(revList.get(j)));
+							}
+						}
+						if (warehouse != null) {
+							warehouse.setDelFlag(1);
+							warehouse.setCreatedate(date);
+							warehouse.setOrgId(orgId);
+							warehouse.setWarehouseStatus(2963); //添加时默认货位状态为空仓
+						}
+						break;
+					case 13:
+						if (ParameterUtil.isnotnull(revList.get(j))) {
+							//插入仓房信息
+							if (storehouse != null) {
+								storehouse.setLibraryType(revList.get(j));
+							}
+							if (warehouse != null) {
+								if("1".equals(revList.get(j))){
+									warehouse.setLibraryType(revList.get(j));
+								}
+							}
+						}
+						break;
+					case 14:
+						//if (ParameterUtil.isnotnull(revList.get(j))) {
+							Map<String,Object> depotMap = new HashMap<String, Object>();
+
+							//插入仓房信息
+							if (storehouse != null) {
+
+								//判断是否有代储粮库
+								if ("1".equals(storehouse.getLibraryType())) {
+									depotMap.put("agentDepotName",revList.get(j));
+									depotMap = basic.getAgentDepotId(depotMap);
+									if(ParameterUtil.isnull(depotMap)){
+										msg = "第 "+(i+1)+" 行第 15 列的值的不正确，请查询后再添加！";
+										return msg;
+									}
+								}
+
+								if(ParameterUtil.isequal("1",storehouse.getLibraryType())){
+									storehouse.setDepotId(Integer.parseInt(depotMap.get("id").toString()));
+									storehouse.setDepotName(revList.get(j));
+									map.put(storehouse.getDepotName(), storehouse.getDepotId());
+								}else{
+									storehouse.setDepotId(orgId);
+									storehouse.setDepotName(orgName);
+								}
+								basic.insertSelective(storehouse);
+								map.put(storehouse.getStorehouseCode(), storehouse.getStorehouseId());
+							}
+							if (warehouse != null) {
+								if(ParameterUtil.isequal("1",warehouse.getLibraryType())){
+									warehouse.setDepotId(map.get(revList.get(j)));
+									warehouse.setDepotName(revList.get(j));
+								}else{
+									warehouse.setDepotId(orgId);
+									warehouse.setDepotName(orgName);
+								}
+								warehouse.setStorehouseId(map.get(revList.get(0)));
+								wareMapper.insertSelective(warehouse);
+							}
+						//}
+						storehouse = null;
+						warehouse = null;
+						break;
+					default :
+						break;
+
+				}
+
+			}
+
+		}
+		return msg;
+	}
+
+	/*@Override
+	public String getStorehouseKeeper(Integer id, Integer orgId, boolean flag) {
+		String keeperNames = "";
+
+		 获取这个仓房的所有保管员的员工ID 
+		List<Integer> keep_list = keeperHouseService.getKeeperId(orgId, id);
+
+		//2、然后把这些人的翻译过来，展示出来
+		if (null != keep_list && keep_list.size() > 0) {
+			keeperNames = keeperService.getKeeperNames(keep_list);
+			if (flag) {
+				if (keeperNames.length() > 7) {
+					keeperNames = keeperNames.substring(0, 7) + "...";
+				}
+			}
+		}
+
+		return keeperNames;
+	}*/
+	
+
+	@Override
+	public Map<String, Object> getThreeTempCheckList(Integer orgId) {
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+		Map<String, Object> map = new HashMap<String, Object>();
+		List<BasicStorehouse> houselist = null;
+		try {
+			if (ParameterUtil.isnotnull(orgId)) {
+				map.put("orgId", orgId);
+			}
+			map.put("libraryType", 0);//默认查询主库数据，不查询代储库数据
+			map.put("delFlag", 1);//查询正常数据
+			houselist = basic.getThreeTempCheckList(map); //获取当前单位下的所有有效数据
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		modelMap.put("houseList", houselist);
+		return modelMap;
+	}
+
+	@Override
+	public Map<String, Object> saveOrUpdate(HttpServletRequest request, String storehouseJson, String warehouseJson, String userInfo) throws Exception {
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+		JSONObject user = null;
+		Integer orgId = null;
+		String userName = "";
+		if (null != userInfo && !"".equals(userInfo)) {
+			user = JSONObject.parseObject(userInfo);
+			orgId = Integer.parseInt(user.get("orgId") == null?"":user.get("orgId").toString());
+			userName = user.get("username") == null?"":user.get("username").toString();
+		}
+		//获取单位信息
+		String orgInfo = ObjectUtils.toString(request.getSession().getAttribute("orgInfo"),"");
+		String dwbm = "";
+		JSONObject org = null;
+		if (null != orgInfo && !"".equals(orgInfo)) {
+			org = JSONObject.parseObject(orgInfo);
+			dwbm = org.get("creditCode") == null?"":org.get("creditCode").toString();
+		}
+		Date date = new Date();
+
+		// JSON字符串转对象
+		ObjectMapper mapper = new ObjectMapper();
+		BasicStorehouse basicStorehouse = (BasicStorehouse) mapper.readValue(storehouseJson, BasicStorehouse.class);
+		basicStorehouse.setDelFlag(1);
+
+		String cfbm = "";//仓房编码
+		String ajbm = "";//廒间编码
+
+		if (!"".equals(basicStorehouse.getStorehouseCode())) {
+			cfbm = BusinessUtils.setBZcfandygbm(dwbm, basicStorehouse.getStorehouseCode(), "0", orgId+"");
+			ajbm = BusinessUtils.setBZajbm(cfbm, basicStorehouse.getStorehouseType()+"", "0");
+			basicStorehouse.setCfbm(cfbm);
+			basicStorehouse.setAjbm(ajbm);
+		}
+		if (basicStorehouse.getStorehouseId() == null) {
+			String uuid = UUID.randomUUID().toString();
+			//String uuid = UUID.randomUUID().toString().replaceAll("-", "");
+			basicStorehouse.setUuid(uuid);
+			
+			if(!ParameterUtil.isequal(basicStorehouse.getLibraryType(),"1")){
+				basicStorehouse.setDepotId(orgId);
+			}
+			basicStorehouse.setOrgId(orgId);
+			basicStorehouse.setCreatename(userName);
+			basicStorehouse.setCreatedate(date);
+			basic.insertSelective(basicStorehouse);
+
+		} else {
+			if(!ParameterUtil.isequal(basicStorehouse.getLibraryType(),"1")){
+				basicStorehouse.setDutystoreman(null);
+			}
+			basicStorehouse.setUpdatename(userName);
+			basicStorehouse.setUpdatedate(date);
+			basic.updateByPrimaryKey(basicStorehouse);
+		}
+
+		//更新货位数据
+		warehouseService.saveOrUpdate(basicStorehouse, warehouseJson);
+
+		//更新单位表仓房数、油罐数、有效仓容、有效罐容
+		editOrgChNum(orgId);
+
+		modelMap.put("status", "success");
+
+		return modelMap;
+	}
+
+	/**
+	 * 更新单位表中仓房数、油罐数、有效仓容、有效罐容
+	 * @param orgId
+	 */
+	@Override
+	public void editOrgChNum(Integer orgId) throws Exception {
+		//查询当前单位仓房数
+		BasicStorehouseExample cf_example = new BasicStorehouseExample();
+		BasicStorehouseExample.Criteria cf_criteria = cf_example.createCriteria();
+		cf_criteria.andOrgIdEqualTo(orgId);
+		cf_criteria.andLibraryTypeEqualTo("0");
+		cf_criteria.andDelFlagEqualTo(1);
+		int ch_count = basic.countByExample(cf_example);
+		
+		//查询当前单位的油罐数
+		BasicTankExample yg_example = new BasicTankExample();
+		BasicTankExample.Criteria yg_criteria = yg_example.createCriteria();
+		yg_criteria.andOrgIdEqualTo(orgId);
+		//yg_criteria.andLibraryTypeEqualTo("0");
+		yg_criteria.andDelFlagEqualTo(1);
+		int yg_count = basicTankMapper.countByExample(yg_example);
+
+		//查询当前单位仓房总实际容量和油罐总实际容量
+		Map<String, Object> rl_map = basic.queryCrAndgw(orgId);
+		
+
+		//更新当前单位下仓房数、油罐数数、有效仓房、有效罐容
+		Map<String, Object> map = new HashMap<String, Object>();
+		map.put("orgId", orgId);
+		map.put("cf_count", ch_count);
+		map.put("yg_count", yg_count);
+		map.put("cr_count", rl_map.get("cr_count"));
+		map.put("gr_count", rl_map.get("gr_count"));
+
+		basic.editOrgCfAndHwNum(map);
+	}
+
+}