油罐维修

src/main/java/com/chinaitop/depot/storage/controller/StorageKeeperTransferController.java

@@ -54,7 +54,7 @@ public class StorageKeeperTransferController {
             @ApiImplicitParam(name = "searchEndDate", value = "结束日期", paramType = "query"),
             @ApiImplicitParam(name = "roleId", value = "保管员id", paramType = "query")
     })
-    public PageInfo<StorageKeeperTransfer> listPage(Integer pageNum, Integer pageSize, Integer houseId,
+    public PageInfo<StorageKeeperTransfer> listPage(Integer pageNum, Integer pageSize, String houseId,
                                                     String searchStartDate, String searchEndDate,Integer roleId){
 
         StorageKeeperTransfer storageKeeperTransfer = new StorageKeeperTransfer();

src/main/java/com/chinaitop/depot/storage/controller/StorageKeeperTransferDetailsController.java

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.List;
 
 /**

src/main/java/com/chinaitop/depot/storage/mapper/StorageKeeperTransferMapper.xml

@@ -2,34 +2,35 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.chinaitop.depot.storage.mapper.StorageKeeperTransferMapper">
   <resultMap id="BaseResultMap" type="com.chinaitop.depot.storage.model.StorageKeeperTransfer">
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="house_id" jdbcType="INTEGER" property="houseId" />
-    <result column="trans_time" jdbcType="TIMESTAMP" property="transTime" />
-    <result column="trans_user" jdbcType="INTEGER" property="transUser" />
-    <result column="receive_user" jdbcType="INTEGER" property="receiveUser" />
-    <result column="superior_user" jdbcType="INTEGER" property="superiorUser" />
-    <result column="remark" jdbcType="VARCHAR" property="remark" />
-    <result column="org_id" jdbcType="INTEGER" property="orgId" />
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="house_id" property="houseId" jdbcType="VARCHAR" />
+    <result column="trans_time" property="transTime" jdbcType="TIMESTAMP" />
+    <result column="trans_user" property="transUser" jdbcType="INTEGER" />
+    <result column="receive_user" property="receiveUser" jdbcType="INTEGER" />
+    <result column="superior_user" property="superiorUser" jdbcType="INTEGER" />
+    <result column="remark" property="remark" jdbcType="VARCHAR" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="updatetime" property="updatetime" jdbcType="TIMESTAMP" />
   </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">
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
                   and ${criterion.condition}
                 </when>
-                <when test="criterion.singleValue">
+                <when test="criterion.singleValue" >
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue">
+                <when test="criterion.betweenValue" >
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue">
+                <when test="criterion.listValue" >
                   and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
                     #{listItem}
                   </foreach>
                 </when>
@@ -40,25 +41,25 @@
       </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">
+  <sql id="Update_By_Example_Where_Clause" >
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
                   and ${criterion.condition}
                 </when>
-                <when test="criterion.singleValue">
+                <when test="criterion.singleValue" >
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue">
+                <when test="criterion.betweenValue" >
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue">
+                <when test="criterion.listValue" >
                   and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
                     #{listItem}
                   </foreach>
                 </when>
@@ -69,190 +70,207 @@
       </foreach>
     </where>
   </sql>
-  <sql id="Base_Column_List">
-    id, house_id, trans_time, trans_user, receive_user, superior_user, remark, org_id
+  <sql id="Base_Column_List" >
+    id, house_id, trans_time, trans_user, receive_user, superior_user, remark, org_id, 
+    updatetime
   </sql>
-  <select id="selectByExample" parameterType="com.chinaitop.depot.storage.model.StorageKeeperTransferExample" resultMap="BaseResultMap">
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageKeeperTransferExample" >
     select
-    <if test="distinct">
+    <if test="distinct" >
       distinct
     </if>
     <include refid="Base_Column_List" />
     from storage_keepertransfer
-    <if test="_parameter != null">
+    <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
-    <if test="orderByClause != null">
+    <if test="orderByClause != null" >
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select 
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select
     <include refid="Base_Column_List" />
     from storage_keepertransfer
     where id = #{id,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from storage_keepertransfer
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="com.chinaitop.depot.storage.model.StorageKeeperTransferExample">
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.storage.model.StorageKeeperTransferExample" >
     delete from storage_keepertransfer
-    <if test="_parameter != null">
+    <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" useGeneratedKeys="true" keyProperty="id" parameterType="com.chinaitop.depot.storage.model.StorageKeeperTransfer">
+  <insert id="insert" parameterType="com.chinaitop.depot.storage.model.StorageKeeperTransfer" >
     insert into storage_keepertransfer (id, house_id, trans_time, 
       trans_user, receive_user, superior_user, 
-      remark, org_id)
-    values (#{id,jdbcType=INTEGER}, #{houseId,jdbcType=INTEGER}, #{transTime,jdbcType=TIMESTAMP}, 
+      remark, org_id, updatetime
+      )
+    values (#{id,jdbcType=INTEGER}, #{houseId,jdbcType=VARCHAR}, #{transTime,jdbcType=TIMESTAMP}, 
       #{transUser,jdbcType=INTEGER}, #{receiveUser,jdbcType=INTEGER}, #{superiorUser,jdbcType=INTEGER}, 
-      #{remark,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER})
+      #{remark,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, #{updatetime,jdbcType=TIMESTAMP}
+      )
   </insert>
-  <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id" parameterType="com.chinaitop.depot.storage.model.StorageKeeperTransfer">
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageKeeperTransfer" >
     insert into storage_keepertransfer
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
         id,
       </if>
-      <if test="houseId != null">
+      <if test="houseId != null" >
         house_id,
       </if>
-      <if test="transTime != null">
+      <if test="transTime != null" >
         trans_time,
       </if>
-      <if test="transUser != null">
+      <if test="transUser != null" >
         trans_user,
       </if>
-      <if test="receiveUser != null">
+      <if test="receiveUser != null" >
         receive_user,
       </if>
-      <if test="superiorUser != null">
+      <if test="superiorUser != null" >
         superior_user,
       </if>
-      <if test="remark != null">
+      <if test="remark != null" >
         remark,
       </if>
-      <if test="orgId != null">
+      <if test="orgId != null" >
         org_id,
       </if>
+      <if test="updatetime != null" >
+        updatetime,
+      </if>
     </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
         #{id,jdbcType=INTEGER},
       </if>
-      <if test="houseId != null">
-        #{houseId,jdbcType=INTEGER},
+      <if test="houseId != null" >
+        #{houseId,jdbcType=VARCHAR},
       </if>
-      <if test="transTime != null">
+      <if test="transTime != null" >
         #{transTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="transUser != null">
+      <if test="transUser != null" >
         #{transUser,jdbcType=INTEGER},
       </if>
-      <if test="receiveUser != null">
+      <if test="receiveUser != null" >
         #{receiveUser,jdbcType=INTEGER},
       </if>
-      <if test="superiorUser != null">
+      <if test="superiorUser != null" >
         #{superiorUser,jdbcType=INTEGER},
       </if>
-      <if test="remark != null">
+      <if test="remark != null" >
         #{remark,jdbcType=VARCHAR},
       </if>
-      <if test="orgId != null">
+      <if test="orgId != null" >
         #{orgId,jdbcType=INTEGER},
       </if>
+      <if test="updatetime != null" >
+        #{updatetime,jdbcType=TIMESTAMP},
+      </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageKeeperTransferExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageKeeperTransferExample" resultType="java.lang.Integer" >
     select count(*) from storage_keepertransfer
-    <if test="_parameter != null">
+    <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
   </select>
-  <update id="updateByExampleSelective" parameterType="map">
+  <update id="updateByExampleSelective" parameterType="map" >
     update storage_keepertransfer
-    <set>
-      <if test="record.id != null">
+    <set >
+      <if test="record.id != null" >
         id = #{record.id,jdbcType=INTEGER},
       </if>
-      <if test="record.houseId != null">
-        house_id = #{record.houseId,jdbcType=INTEGER},
+      <if test="record.houseId != null" >
+        house_id = #{record.houseId,jdbcType=VARCHAR},
       </if>
-      <if test="record.transTime != null">
+      <if test="record.transTime != null" >
         trans_time = #{record.transTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="record.transUser != null">
+      <if test="record.transUser != null" >
         trans_user = #{record.transUser,jdbcType=INTEGER},
       </if>
-      <if test="record.receiveUser != null">
+      <if test="record.receiveUser != null" >
         receive_user = #{record.receiveUser,jdbcType=INTEGER},
       </if>
-      <if test="record.superiorUser != null">
+      <if test="record.superiorUser != null" >
         superior_user = #{record.superiorUser,jdbcType=INTEGER},
       </if>
-      <if test="record.remark != null">
+      <if test="record.remark != null" >
         remark = #{record.remark,jdbcType=VARCHAR},
       </if>
-      <if test="record.orgId != null">
+      <if test="record.orgId != null" >
         org_id = #{record.orgId,jdbcType=INTEGER},
       </if>
+      <if test="record.updatetime != null" >
+        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      </if>
     </set>
-    <if test="_parameter != null">
+    <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByExample" parameterType="map">
+  <update id="updateByExample" parameterType="map" >
     update storage_keepertransfer
     set id = #{record.id,jdbcType=INTEGER},
-      house_id = #{record.houseId,jdbcType=INTEGER},
-      trans_time = #{record.transTime,jdbcType=TIMESTAMP},
-      trans_user = #{record.transUser,jdbcType=INTEGER},
-      receive_user = #{record.receiveUser,jdbcType=INTEGER},
-      superior_user = #{record.superiorUser,jdbcType=INTEGER},
-      remark = #{record.remark,jdbcType=VARCHAR},
-      org_id = #{record.orgId,jdbcType=INTEGER}
-    <if test="_parameter != null">
+    house_id = #{record.houseId,jdbcType=VARCHAR},
+    trans_time = #{record.transTime,jdbcType=TIMESTAMP},
+    trans_user = #{record.transUser,jdbcType=INTEGER},
+    receive_user = #{record.receiveUser,jdbcType=INTEGER},
+    superior_user = #{record.superiorUser,jdbcType=INTEGER},
+    remark = #{record.remark,jdbcType=VARCHAR},
+    org_id = #{record.orgId,jdbcType=INTEGER},
+    updatetime = #{record.updatetime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.storage.model.StorageKeeperTransfer">
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.storage.model.StorageKeeperTransfer" >
     update storage_keepertransfer
-    <set>
-      <if test="houseId != null">
-        house_id = #{houseId,jdbcType=INTEGER},
+    <set >
+      <if test="houseId != null" >
+        house_id = #{houseId,jdbcType=VARCHAR},
       </if>
-      <if test="transTime != null">
+      <if test="transTime != null" >
         trans_time = #{transTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="transUser != null">
+      <if test="transUser != null" >
         trans_user = #{transUser,jdbcType=INTEGER},
       </if>
-      <if test="receiveUser != null">
+      <if test="receiveUser != null" >
         receive_user = #{receiveUser,jdbcType=INTEGER},
       </if>
-      <if test="superiorUser != null">
+      <if test="superiorUser != null" >
         superior_user = #{superiorUser,jdbcType=INTEGER},
       </if>
-      <if test="remark != null">
+      <if test="remark != null" >
         remark = #{remark,jdbcType=VARCHAR},
       </if>
-      <if test="orgId != null">
+      <if test="orgId != null" >
         org_id = #{orgId,jdbcType=INTEGER},
       </if>
+      <if test="updatetime != null" >
+        updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.storage.model.StorageKeeperTransfer">
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.storage.model.StorageKeeperTransfer" >
     update storage_keepertransfer
-    set house_id = #{houseId,jdbcType=INTEGER},
+    set house_id = #{houseId,jdbcType=VARCHAR},
       trans_time = #{transTime,jdbcType=TIMESTAMP},
       trans_user = #{transUser,jdbcType=INTEGER},
       receive_user = #{receiveUser,jdbcType=INTEGER},
       superior_user = #{superiorUser,jdbcType=INTEGER},
       remark = #{remark,jdbcType=VARCHAR},
-      org_id = #{orgId,jdbcType=INTEGER}
+      org_id = #{orgId,jdbcType=INTEGER},
+      updatetime = #{updatetime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
@@ -266,12 +284,14 @@
     <include refid="Ext_Base_Column_List" />
         , bk.`name` AS transUserName,
         bs.storehouse_name AS storehouseName,
+        bt.storageTank_name AS tankName,
         uio.real_name AS superiorUserName,
         sk_temp. NAME AS receiveUserName
         FROM
         storage_keepertransfer skr
         LEFT JOIN basic_keeper bk ON skr.trans_user = bk.user_Id
         LEFT JOIN basic_storehouse bs ON bs.storehouse_id = skr.house_id
+        LEFT JOIN basic_tank bt ON bt.id = skr.house_id
         LEFT JOIN user_info uio ON uio.user_id = skr.superior_user
         LEFT JOIN (
                   SELECT

src/main/java/com/chinaitop/depot/storage/mapper/StorageKeepertransferDetailsMapper.xml

@@ -2,35 +2,36 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.chinaitop.depot.storage.mapper.StorageKeepertransferDetailsMapper">
   <resultMap id="BaseResultMap" type="com.chinaitop.depot.storage.model.StorageKeepertransferDetails">
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="kt_id" jdbcType="INTEGER" property="ktId" />
-    <result column="storehouse_id" jdbcType="INTEGER" property="storehouseId" />
-    <result column="warehouse_id" jdbcType="INTEGER" property="warehouseId" />
-    <result column="pz" jdbcType="INTEGER" property="pz" />
-    <result column="kcsl" jdbcType="DOUBLE" property="kcsl" />
-    <result column="quality" jdbcType="INTEGER" property="quality" />
-    <result column="food_status" jdbcType="INTEGER" property="foodStatus" />
-    <result column="warehouse_name" jdbcType="VARCHAR" property="warehouseName" />
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="kt_id" property="ktId" jdbcType="INTEGER" />
+    <result column="storehouse_id" property="storehouseId" jdbcType="VARCHAR" />
+    <result column="warehouse_id" property="warehouseId" jdbcType="INTEGER" />
+    <result column="pz" property="pz" jdbcType="INTEGER" />
+    <result column="kcsl" property="kcsl" jdbcType="DOUBLE" />
+    <result column="quality" property="quality" jdbcType="INTEGER" />
+    <result column="food_status" property="foodStatus" jdbcType="INTEGER" />
+    <result column="warehouse_name" property="warehouseName" jdbcType="VARCHAR" />
+    <result column="updatetime" property="updatetime" jdbcType="TIMESTAMP" />
   </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">
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
                   and ${criterion.condition}
                 </when>
-                <when test="criterion.singleValue">
+                <when test="criterion.singleValue" >
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue">
+                <when test="criterion.betweenValue" >
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue">
+                <when test="criterion.listValue" >
                   and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
                     #{listItem}
                   </foreach>
                 </when>
@@ -41,25 +42,25 @@
       </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">
+  <sql id="Update_By_Example_Where_Clause" >
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
                   and ${criterion.condition}
                 </when>
-                <when test="criterion.singleValue">
+                <when test="criterion.singleValue" >
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue">
+                <when test="criterion.betweenValue" >
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue">
+                <when test="criterion.listValue" >
                   and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
                     #{listItem}
                   </foreach>
                 </when>
@@ -70,206 +71,221 @@
       </foreach>
     </where>
   </sql>
-  <sql id="Base_Column_List">
-    id, kt_id, storehouse_id, warehouse_id, pz, kcsl, quality, food_status, warehouse_name
+  <sql id="Base_Column_List" >
+    id, kt_id, storehouse_id, warehouse_id, pz, kcsl, quality, food_status, warehouse_name,
+    updatetime
   </sql>
-  <select id="selectByExample" parameterType="com.chinaitop.depot.storage.model.StorageKeepertransferDetailsExample" resultMap="BaseResultMap">
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageKeepertransferDetailsExample" >
     select
-    <if test="distinct">
+    <if test="distinct" >
       distinct
     </if>
     <include refid="Base_Column_List" />
     from storage_keepertransfer_details
-    <if test="_parameter != null">
+    <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
-    <if test="orderByClause != null">
+    <if test="orderByClause != null" >
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select 
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select
     <include refid="Base_Column_List" />
     from storage_keepertransfer_details
     where id = #{id,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from storage_keepertransfer_details
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="com.chinaitop.depot.storage.model.StorageKeepertransferDetailsExample">
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.storage.model.StorageKeepertransferDetailsExample" >
     delete from storage_keepertransfer_details
-    <if test="_parameter != null">
+    <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.chinaitop.depot.storage.model.StorageKeepertransferDetails">
-    insert into storage_keepertransfer_details (id, kt_id, storehouse_id, 
-      warehouse_id, pz, kcsl, 
-      quality, food_status, warehouse_name
-      )
-    values (#{id,jdbcType=INTEGER}, #{ktId,jdbcType=INTEGER}, #{storehouseId,jdbcType=INTEGER}, 
-      #{warehouseId,jdbcType=INTEGER}, #{pz,jdbcType=INTEGER}, #{kcsl,jdbcType=DOUBLE}, 
-      #{quality,jdbcType=INTEGER}, #{foodStatus,jdbcType=INTEGER}, #{warehouseName,jdbcType=VARCHAR}
-      )
+  <insert id="insert" parameterType="com.chinaitop.depot.storage.model.StorageKeepertransferDetails" >
+    insert into storage_keepertransfer_details (id, kt_id, storehouse_id,
+      warehouse_id, pz, kcsl,
+      quality, food_status, warehouse_name,
+      updatetime)
+    values (#{id,jdbcType=INTEGER}, #{ktId,jdbcType=INTEGER}, #{storehouseId,jdbcType=VARCHAR},
+      #{warehouseId,jdbcType=INTEGER}, #{pz,jdbcType=INTEGER}, #{kcsl,jdbcType=DOUBLE},
+      #{quality,jdbcType=INTEGER}, #{foodStatus,jdbcType=INTEGER}, #{warehouseName,jdbcType=VARCHAR},
+      #{updatetime,jdbcType=TIMESTAMP})
   </insert>
-  <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageKeepertransferDetails">
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageKeepertransferDetails" >
     insert into storage_keepertransfer_details
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
         id,
       </if>
-      <if test="ktId != null">
+      <if test="ktId != null" >
         kt_id,
       </if>
-      <if test="storehouseId != null">
+      <if test="storehouseId != null" >
         storehouse_id,
       </if>
-      <if test="warehouseId != null">
+      <if test="warehouseId != null" >
         warehouse_id,
       </if>
-      <if test="pz != null">
+      <if test="pz != null" >
         pz,
       </if>
-      <if test="kcsl != null">
+      <if test="kcsl != null" >
         kcsl,
       </if>
-      <if test="quality != null">
+      <if test="quality != null" >
         quality,
       </if>
-      <if test="foodStatus != null">
+      <if test="foodStatus != null" >
         food_status,
       </if>
-      <if test="warehouseName != null">
+      <if test="warehouseName != null" >
         warehouse_name,
       </if>
+      <if test="updatetime != null" >
+        updatetime,
+      </if>
     </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
         #{id,jdbcType=INTEGER},
       </if>
-      <if test="ktId != null">
+      <if test="ktId != null" >
         #{ktId,jdbcType=INTEGER},
       </if>
-      <if test="storehouseId != null">
-        #{storehouseId,jdbcType=INTEGER},
+      <if test="storehouseId != null" >
+        #{storehouseId,jdbcType=VARCHAR},
       </if>
-      <if test="warehouseId != null">
+      <if test="warehouseId != null" >
         #{warehouseId,jdbcType=INTEGER},
       </if>
-      <if test="pz != null">
+      <if test="pz != null" >
         #{pz,jdbcType=INTEGER},
       </if>
-      <if test="kcsl != null">
+      <if test="kcsl != null" >
         #{kcsl,jdbcType=DOUBLE},
       </if>
-      <if test="quality != null">
+      <if test="quality != null" >
         #{quality,jdbcType=INTEGER},
       </if>
-      <if test="foodStatus != null">
+      <if test="foodStatus != null" >
         #{foodStatus,jdbcType=INTEGER},
       </if>
-      <if test="warehouseName != null">
+      <if test="warehouseName != null" >
         #{warehouseName,jdbcType=VARCHAR},
       </if>
+      <if test="updatetime != null" >
+        #{updatetime,jdbcType=TIMESTAMP},
+      </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageKeepertransferDetailsExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageKeepertransferDetailsExample" resultType="java.lang.Integer" >
     select count(*) from storage_keepertransfer_details
-    <if test="_parameter != null">
+    <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
   </select>
-  <update id="updateByExampleSelective" parameterType="map">
+  <update id="updateByExampleSelective" parameterType="map" >
     update storage_keepertransfer_details
-    <set>
-      <if test="record.id != null">
+    <set >
+      <if test="record.id != null" >
         id = #{record.id,jdbcType=INTEGER},
       </if>
-      <if test="record.ktId != null">
+      <if test="record.ktId != null" >
         kt_id = #{record.ktId,jdbcType=INTEGER},
       </if>
-      <if test="record.storehouseId != null">
-        storehouse_id = #{record.storehouseId,jdbcType=INTEGER},
+      <if test="record.storehouseId != null" >
+        storehouse_id = #{record.storehouseId,jdbcType=VARCHAR},
       </if>
-      <if test="record.warehouseId != null">
+      <if test="record.warehouseId != null" >
         warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
       </if>
-      <if test="record.pz != null">
+      <if test="record.pz != null" >
         pz = #{record.pz,jdbcType=INTEGER},
       </if>
-      <if test="record.kcsl != null">
+      <if test="record.kcsl != null" >
         kcsl = #{record.kcsl,jdbcType=DOUBLE},
       </if>
-      <if test="record.quality != null">
+      <if test="record.quality != null" >
         quality = #{record.quality,jdbcType=INTEGER},
       </if>
-      <if test="record.foodStatus != null">
+      <if test="record.foodStatus != null" >
         food_status = #{record.foodStatus,jdbcType=INTEGER},
       </if>
-      <if test="record.warehouseName != null">
+      <if test="record.warehouseName != null" >
         warehouse_name = #{record.warehouseName,jdbcType=VARCHAR},
       </if>
+      <if test="record.updatetime != null" >
+        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      </if>
     </set>
-    <if test="_parameter != null">
+    <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByExample" parameterType="map">
+  <update id="updateByExample" parameterType="map" >
     update storage_keepertransfer_details
     set id = #{record.id,jdbcType=INTEGER},
-      kt_id = #{record.ktId,jdbcType=INTEGER},
-      storehouse_id = #{record.storehouseId,jdbcType=INTEGER},
-      warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
-      pz = #{record.pz,jdbcType=INTEGER},
-      kcsl = #{record.kcsl,jdbcType=DOUBLE},
-      quality = #{record.quality,jdbcType=INTEGER},
-      food_status = #{record.foodStatus,jdbcType=INTEGER},
-      warehouse_name = #{record.warehouseName,jdbcType=VARCHAR}
-    <if test="_parameter != null">
+    kt_id = #{record.ktId,jdbcType=INTEGER},
+    storehouse_id = #{record.storehouseId,jdbcType=VARCHAR},
+    warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
+    pz = #{record.pz,jdbcType=INTEGER},
+    kcsl = #{record.kcsl,jdbcType=DOUBLE},
+    quality = #{record.quality,jdbcType=INTEGER},
+    food_status = #{record.foodStatus,jdbcType=INTEGER},
+    warehouse_name = #{record.warehouseName,jdbcType=VARCHAR},
+    updatetime = #{record.updatetime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.storage.model.StorageKeepertransferDetails">
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.storage.model.StorageKeepertransferDetails" >
     update storage_keepertransfer_details
-    <set>
-      <if test="ktId != null">
+    <set >
+      <if test="ktId != null" >
         kt_id = #{ktId,jdbcType=INTEGER},
       </if>
-      <if test="storehouseId != null">
-        storehouse_id = #{storehouseId,jdbcType=INTEGER},
+      <if test="storehouseId != null" >
+        storehouse_id = #{storehouseId,jdbcType=VARCHAR},
       </if>
-      <if test="warehouseId != null">
+      <if test="warehouseId != null" >
         warehouse_id = #{warehouseId,jdbcType=INTEGER},
       </if>
-      <if test="pz != null">
+      <if test="pz != null" >
         pz = #{pz,jdbcType=INTEGER},
       </if>
-      <if test="kcsl != null">
+      <if test="kcsl != null" >
         kcsl = #{kcsl,jdbcType=DOUBLE},
       </if>
-      <if test="quality != null">
+      <if test="quality != null" >
         quality = #{quality,jdbcType=INTEGER},
       </if>
-      <if test="foodStatus != null">
+      <if test="foodStatus != null" >
         food_status = #{foodStatus,jdbcType=INTEGER},
       </if>
-      <if test="warehouseName != null">
+      <if test="warehouseName != null" >
         warehouse_name = #{warehouseName,jdbcType=VARCHAR},
       </if>
+      <if test="updatetime != null" >
+        updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.storage.model.StorageKeepertransferDetails">
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.storage.model.StorageKeepertransferDetails" >
     update storage_keepertransfer_details
     set kt_id = #{ktId,jdbcType=INTEGER},
-      storehouse_id = #{storehouseId,jdbcType=INTEGER},
+      storehouse_id = #{storehouseId,jdbcType=VARCHAR},
       warehouse_id = #{warehouseId,jdbcType=INTEGER},
       pz = #{pz,jdbcType=INTEGER},
       kcsl = #{kcsl,jdbcType=DOUBLE},
       quality = #{quality,jdbcType=INTEGER},
       food_status = #{foodStatus,jdbcType=INTEGER},
-      warehouse_name = #{warehouseName,jdbcType=VARCHAR}
+      warehouse_name = #{warehouseName,jdbcType=VARCHAR},
+      updatetime = #{updatetime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>

src/main/java/com/chinaitop/depot/storage/model/StorageKeeperTransfer.java

@@ -5,7 +5,7 @@ import java.util.Date;
 public class StorageKeeperTransfer {
     private Integer id;
 
-    private Integer houseId;
+    private String houseId;
 
     private Date transTime;
 
@@ -19,6 +19,8 @@ public class StorageKeeperTransfer {
 
     private Integer orgId;
 
+    private Date updatetime;
+
     //业务字段
     private String transUserName;
     private String receiveUserName;
@@ -29,6 +31,8 @@ public class StorageKeeperTransfer {
     private String searchStartDate;
     private String searchEndDate;
     private Integer roleId;
+    private String tankName;
+
 
     /**
      * 保管员移交档案
@@ -46,19 +50,11 @@ public class StorageKeeperTransfer {
         this.id = id;
     }
 
-    /**
-     * 仓房id
-     * @return house_id 仓房id
-     */
-    public Integer getHouseId() {
+    public String getHouseId() {
         return houseId;
     }
 
-    /**
-     * 仓房id
-     * @param houseId 仓房id
-     */
-    public void setHouseId(Integer houseId) {
+    public void setHouseId(String houseId) {
         this.houseId = houseId;
     }
 
@@ -213,4 +209,20 @@ public class StorageKeeperTransfer {
     public void setRoleId(Integer roleId) {
         this.roleId = roleId;
     }
+
+    public Date getUpdatetime() {
+        return updatetime;
+    }
+
+    public void setUpdatetime(Date updatetime) {
+        this.updatetime = updatetime;
+    }
+
+    public String getTankName() {
+        return tankName;
+    }
+
+    public void setTankName(String tankName) {
+        this.tankName = tankName;
+    }
 }

src/main/java/com/chinaitop/depot/storage/model/StorageKeeperTransferExample.java

@@ -187,52 +187,62 @@ public class StorageKeeperTransferExample {
             return (Criteria) this;
         }
 
-        public Criteria andHouseIdEqualTo(Integer value) {
+        public Criteria andHouseIdEqualTo(String value) {
             addCriterion("house_id =", value, "houseId");
             return (Criteria) this;
         }
 
-        public Criteria andHouseIdNotEqualTo(Integer value) {
+        public Criteria andHouseIdNotEqualTo(String value) {
             addCriterion("house_id <>", value, "houseId");
             return (Criteria) this;
         }
 
-        public Criteria andHouseIdGreaterThan(Integer value) {
+        public Criteria andHouseIdGreaterThan(String value) {
             addCriterion("house_id >", value, "houseId");
             return (Criteria) this;
         }
 
-        public Criteria andHouseIdGreaterThanOrEqualTo(Integer value) {
+        public Criteria andHouseIdGreaterThanOrEqualTo(String value) {
             addCriterion("house_id >=", value, "houseId");
             return (Criteria) this;
         }
 
-        public Criteria andHouseIdLessThan(Integer value) {
+        public Criteria andHouseIdLessThan(String value) {
             addCriterion("house_id <", value, "houseId");
             return (Criteria) this;
         }
 
-        public Criteria andHouseIdLessThanOrEqualTo(Integer value) {
+        public Criteria andHouseIdLessThanOrEqualTo(String value) {
             addCriterion("house_id <=", value, "houseId");
             return (Criteria) this;
         }
 
-        public Criteria andHouseIdIn(List<Integer> values) {
+        public Criteria andHouseIdLike(String value) {
+            addCriterion("house_id like", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdNotLike(String value) {
+            addCriterion("house_id not like", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdIn(List<String> values) {
             addCriterion("house_id in", values, "houseId");
             return (Criteria) this;
         }
 
-        public Criteria andHouseIdNotIn(List<Integer> values) {
+        public Criteria andHouseIdNotIn(List<String> values) {
             addCriterion("house_id not in", values, "houseId");
             return (Criteria) this;
         }
 
-        public Criteria andHouseIdBetween(Integer value1, Integer value2) {
+        public Criteria andHouseIdBetween(String value1, String value2) {
             addCriterion("house_id between", value1, value2, "houseId");
             return (Criteria) this;
         }
 
-        public Criteria andHouseIdNotBetween(Integer value1, Integer value2) {
+        public Criteria andHouseIdNotBetween(String value1, String value2) {
             addCriterion("house_id not between", value1, value2, "houseId");
             return (Criteria) this;
         }

src/main/java/com/chinaitop/depot/storage/model/StorageKeepertransferDetails.java

@@ -1,11 +1,13 @@
 package com.chinaitop.depot.storage.model;
 
+import java.util.Date;
+
 public class StorageKeepertransferDetails {
     private Integer id;
 
     private Integer ktId;
 
-    private Integer storehouseId;
+    private String storehouseId;
 
     private Integer warehouseId;
 
@@ -19,6 +21,8 @@ public class StorageKeepertransferDetails {
 
     private String warehouseName;
 
+    private Date updatetime;
+
     /**
      * 主键
      * @return id 主键
@@ -55,7 +59,7 @@ public class StorageKeepertransferDetails {
      * 仓房id
      * @return storehouse_id 仓房id
      */
-    public Integer getStorehouseId() {
+    public String getStorehouseId() {
         return storehouseId;
     }
 
@@ -63,8 +67,8 @@ public class StorageKeepertransferDetails {
      * 仓房id
      * @param storehouseId 仓房id
      */
-    public void setStorehouseId(Integer storehouseId) {
-        this.storehouseId = storehouseId;
+    public void setStorehouseId(String storehouseId) {
+        this.storehouseId = storehouseId == null ? null : storehouseId.trim();
     }
 
     /**
@@ -162,4 +166,20 @@ public class StorageKeepertransferDetails {
     public void setWarehouseName(String warehouseName) {
         this.warehouseName = warehouseName == null ? null : warehouseName.trim();
     }
+
+    /**
+     * 
+     * @return updatetime 
+     */
+    public Date getUpdatetime() {
+        return updatetime;
+    }
+
+    /**
+     * 
+     * @param updatetime 
+     */
+    public void setUpdatetime(Date updatetime) {
+        this.updatetime = updatetime;
+    }
 }

src/main/java/com/chinaitop/depot/storage/model/StorageKeepertransferDetailsExample.java

@@ -1,6 +1,7 @@
 package com.chinaitop.depot.storage.model;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 public class StorageKeepertransferDetailsExample {
@@ -73,7 +74,7 @@ public class StorageKeepertransferDetailsExample {
     }
 
     /**
-     * storage_keepertransfer_details 2017-11-14
+     * storage_keepertransfer_details 2020-04-17
      */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
@@ -246,52 +247,62 @@ public class StorageKeepertransferDetailsExample {
             return (Criteria) this;
         }
 
-        public Criteria andStorehouseIdEqualTo(Integer value) {
+        public Criteria andStorehouseIdEqualTo(String value) {
             addCriterion("storehouse_id =", value, "storehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andStorehouseIdNotEqualTo(Integer value) {
+        public Criteria andStorehouseIdNotEqualTo(String value) {
             addCriterion("storehouse_id <>", value, "storehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andStorehouseIdGreaterThan(Integer value) {
+        public Criteria andStorehouseIdGreaterThan(String value) {
             addCriterion("storehouse_id >", value, "storehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andStorehouseIdGreaterThanOrEqualTo(Integer value) {
+        public Criteria andStorehouseIdGreaterThanOrEqualTo(String value) {
             addCriterion("storehouse_id >=", value, "storehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andStorehouseIdLessThan(Integer value) {
+        public Criteria andStorehouseIdLessThan(String value) {
             addCriterion("storehouse_id <", value, "storehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andStorehouseIdLessThanOrEqualTo(Integer value) {
+        public Criteria andStorehouseIdLessThanOrEqualTo(String value) {
             addCriterion("storehouse_id <=", value, "storehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andStorehouseIdIn(List<Integer> values) {
+        public Criteria andStorehouseIdLike(String value) {
+            addCriterion("storehouse_id like", value, "storehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStorehouseIdNotLike(String value) {
+            addCriterion("storehouse_id not like", value, "storehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStorehouseIdIn(List<String> values) {
             addCriterion("storehouse_id in", values, "storehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andStorehouseIdNotIn(List<Integer> values) {
+        public Criteria andStorehouseIdNotIn(List<String> values) {
             addCriterion("storehouse_id not in", values, "storehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andStorehouseIdBetween(Integer value1, Integer value2) {
+        public Criteria andStorehouseIdBetween(String value1, String value2) {
             addCriterion("storehouse_id between", value1, value2, "storehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andStorehouseIdNotBetween(Integer value1, Integer value2) {
+        public Criteria andStorehouseIdNotBetween(String value1, String value2) {
             addCriterion("storehouse_id not between", value1, value2, "storehouseId");
             return (Criteria) this;
         }
@@ -665,6 +676,66 @@ public class StorageKeepertransferDetailsExample {
             addCriterion("warehouse_name not between", value1, value2, "warehouseName");
             return (Criteria) this;
         }
+
+        public Criteria andUpdatetimeIsNull() {
+            addCriterion("updatetime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIsNotNull() {
+            addCriterion("updatetime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeEqualTo(Date value) {
+            addCriterion("updatetime =", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotEqualTo(Date value) {
+            addCriterion("updatetime <>", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeGreaterThan(Date value) {
+            addCriterion("updatetime >", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("updatetime >=", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeLessThan(Date value) {
+            addCriterion("updatetime <", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeLessThanOrEqualTo(Date value) {
+            addCriterion("updatetime <=", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIn(List<Date> values) {
+            addCriterion("updatetime in", values, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotIn(List<Date> values) {
+            addCriterion("updatetime not in", values, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeBetween(Date value1, Date value2) {
+            addCriterion("updatetime between", value1, value2, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotBetween(Date value1, Date value2) {
+            addCriterion("updatetime not between", value1, value2, "updatetime");
+            return (Criteria) this;
+        }
     }
 
     /**
@@ -678,7 +749,7 @@ public class StorageKeepertransferDetailsExample {
     }
 
     /**
-     * storage_keepertransfer_details 2017-11-14
+     * storage_keepertransfer_details 2020-04-17
      */
     public static class Criterion {
         private String condition;