Почетна Преглед Помоћ
Регистрација Пријавите Се
depot-shanxi
/
depot-keeper-house-shanxi
Прати 7
Волим 0
Креирај огранак 0
Files Дискусије 0 Захтеви за спајање 0 Вики
Преглед изворни кода

油罐维修

jidj пре 5 година
родитељ
7b6fa4a4f8
комит
93db600d55
8 измењених фајлова са 404 додато и 256 уклоњено
Подељен поглед Покажи статистику Diff
  1. 1 1
      src/main/java/com/chinaitop/depot/storage/controller/StorageKeeperTransferController.java
  2. 0 1
      src/main/java/com/chinaitop/depot/storage/controller/StorageKeeperTransferDetailsController.java
  3. 123 103
      src/main/java/com/chinaitop/depot/storage/mapper/StorageKeeperTransferMapper.xml
  4. 130 114
      src/main/java/com/chinaitop/depot/storage/mapper/StorageKeepertransferDetailsMapper.xml
  5. 23 11
      src/main/java/com/chinaitop/depot/storage/model/StorageKeeperTransfer.java
  6. 20 10
      src/main/java/com/chinaitop/depot/storage/model/StorageKeeperTransferExample.java
  7. 24 4
      src/main/java/com/chinaitop/depot/storage/model/StorageKeepertransferDetails.java
  8. 83 12
      src/main/java/com/chinaitop/depot/storage/model/StorageKeepertransferDetailsExample.java

+ 1 - 1
src/main/java/com/chinaitop/depot/storage/controller/StorageKeeperTransferController.java
Прегледај датотеку 

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

+ 0 - 1
src/main/java/com/chinaitop/depot/storage/controller/StorageKeeperTransferDetailsController.java
Прегледај датотеку 

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

+ 123 - 103
src/main/java/com/chinaitop/depot/storage/mapper/StorageKeeperTransferMapper.xml
Прегледај датотеку 

@@ -2,34 +2,35 @@
2 2 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 3 
 <mapper namespace="com.chinaitop.depot.storage.mapper.StorageKeeperTransferMapper">
4 4 
   <resultMap id="BaseResultMap" type="com.chinaitop.depot.storage.model.StorageKeeperTransfer">
5 
-    <id column="id" jdbcType="INTEGER" property="id" />
6 
-    <result column="house_id" jdbcType="INTEGER" property="houseId" />
7 
-    <result column="trans_time" jdbcType="TIMESTAMP" property="transTime" />
8 
-    <result column="trans_user" jdbcType="INTEGER" property="transUser" />
9 
-    <result column="receive_user" jdbcType="INTEGER" property="receiveUser" />
10 
-    <result column="superior_user" jdbcType="INTEGER" property="superiorUser" />
11 
-    <result column="remark" jdbcType="VARCHAR" property="remark" />
12 
-    <result column="org_id" jdbcType="INTEGER" property="orgId" />
5 
+    <id column="id" property="id" jdbcType="INTEGER" />
6 
+    <result column="house_id" property="houseId" jdbcType="VARCHAR" />
7 
+    <result column="trans_time" property="transTime" jdbcType="TIMESTAMP" />
8 
+    <result column="trans_user" property="transUser" jdbcType="INTEGER" />
9 
+    <result column="receive_user" property="receiveUser" jdbcType="INTEGER" />
10 
+    <result column="superior_user" property="superiorUser" jdbcType="INTEGER" />
11 
+    <result column="remark" property="remark" jdbcType="VARCHAR" />
12 
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
13 
+    <result column="updatetime" property="updatetime" jdbcType="TIMESTAMP" />
13 14 
   </resultMap>
14 
-  <sql id="Example_Where_Clause">
15 
-    <where>
16 
-      <foreach collection="oredCriteria" item="criteria" separator="or">
17 
-        <if test="criteria.valid">
18 
-          <trim prefix="(" prefixOverrides="and" suffix=")">
19 
-            <foreach collection="criteria.criteria" item="criterion">
20 
-              <choose>
21 
-                <when test="criterion.noValue">
15 
+  <sql id="Example_Where_Clause" >
16 
+    <where >
17 
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
18 
+        <if test="criteria.valid" >
19 
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
20 
+            <foreach collection="criteria.criteria" item="criterion" >
21 
+              <choose >
22 
+                <when test="criterion.noValue" >
22 23 
                   and ${criterion.condition}
23 24 
                 </when>
24 
-                <when test="criterion.singleValue">
25 
+                <when test="criterion.singleValue" >
25 26 
                   and ${criterion.condition} #{criterion.value}
26 27 
                 </when>
27 
-                <when test="criterion.betweenValue">
28 
+                <when test="criterion.betweenValue" >
28 29 
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
29 30 
                 </when>
30 
-                <when test="criterion.listValue">
31 
+                <when test="criterion.listValue" >
31 32 
                   and ${criterion.condition}
32 
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
33 
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
33 34 
                     #{listItem}
34 35 
                   </foreach>
35 36 
                 </when>
 
@@ -40,25 +41,25 @@
40 41 
       </foreach>
41 42 
     </where>
42 43 
   </sql>
43 
-  <sql id="Update_By_Example_Where_Clause">
44 
-    <where>
45 
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
46 
-        <if test="criteria.valid">
47 
-          <trim prefix="(" prefixOverrides="and" suffix=")">
48 
-            <foreach collection="criteria.criteria" item="criterion">
49 
-              <choose>
50 
-                <when test="criterion.noValue">
44 
+  <sql id="Update_By_Example_Where_Clause" >
45 
+    <where >
46 
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
47 
+        <if test="criteria.valid" >
48 
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
49 
+            <foreach collection="criteria.criteria" item="criterion" >
50 
+              <choose >
51 
+                <when test="criterion.noValue" >
51 52 
                   and ${criterion.condition}
52 53 
                 </when>
53 
-                <when test="criterion.singleValue">
54 
+                <when test="criterion.singleValue" >
54 55 
                   and ${criterion.condition} #{criterion.value}
55 56 
                 </when>
56 
-                <when test="criterion.betweenValue">
57 
+                <when test="criterion.betweenValue" >
57 58 
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
58 59 
                 </when>
59 
-                <when test="criterion.listValue">
60 
+                <when test="criterion.listValue" >
60 61 
                   and ${criterion.condition}
61 
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
62 
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
62 63 
                     #{listItem}
63 64 
                   </foreach>
64 65 
                 </when>
 
@@ -69,190 +70,207 @@
69 70 
       </foreach>
70 71 
     </where>
71 72 
   </sql>
72 
-  <sql id="Base_Column_List">
73 
-    id, house_id, trans_time, trans_user, receive_user, superior_user, remark, org_id
73 
+  <sql id="Base_Column_List" >
74 
+    id, house_id, trans_time, trans_user, receive_user, superior_user, remark, org_id,
75 
+    updatetime
74 76 
   </sql>
75 
-  <select id="selectByExample" parameterType="com.chinaitop.depot.storage.model.StorageKeeperTransferExample" resultMap="BaseResultMap">
77 
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageKeeperTransferExample" >
76 78 
     select
77 
-    <if test="distinct">
79 
+    <if test="distinct" >
78 80 
       distinct
79 81 
     </if>
80 82 
     <include refid="Base_Column_List" />
81 83 
     from storage_keepertransfer
82 
-    <if test="_parameter != null">
84 
+    <if test="_parameter != null" >
83 85 
       <include refid="Example_Where_Clause" />
84 86 
     </if>
85 
-    <if test="orderByClause != null">
87 
+    <if test="orderByClause != null" >
86 88 
       order by ${orderByClause}
87 89 
     </if>
88 90 
   </select>
89 
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
90 
-    select
91 
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
92 
+    select
91 93 
     <include refid="Base_Column_List" />
92 94 
     from storage_keepertransfer
93 95 
     where id = #{id,jdbcType=INTEGER}
94 96 
   </select>
95 
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
97 
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
96 98 
     delete from storage_keepertransfer
97 99 
     where id = #{id,jdbcType=INTEGER}
98 100 
   </delete>
99 
-  <delete id="deleteByExample" parameterType="com.chinaitop.depot.storage.model.StorageKeeperTransferExample">
101 
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.storage.model.StorageKeeperTransferExample" >
100 102 
     delete from storage_keepertransfer
101 
-    <if test="_parameter != null">
103 
+    <if test="_parameter != null" >
102 104 
       <include refid="Example_Where_Clause" />
103 105 
     </if>
104 106 
   </delete>
105 
-  <insert id="insert" useGeneratedKeys="true" keyProperty="id" parameterType="com.chinaitop.depot.storage.model.StorageKeeperTransfer">
107 
+  <insert id="insert" parameterType="com.chinaitop.depot.storage.model.StorageKeeperTransfer" >
106 108 
     insert into storage_keepertransfer (id, house_id, trans_time,
107 109 
       trans_user, receive_user, superior_user,
108 
-      remark, org_id)
109 
-    values (#{id,jdbcType=INTEGER}, #{houseId,jdbcType=INTEGER}, #{transTime,jdbcType=TIMESTAMP},
110 
+      remark, org_id, updatetime
111 
+      )
112 
+    values (#{id,jdbcType=INTEGER}, #{houseId,jdbcType=VARCHAR}, #{transTime,jdbcType=TIMESTAMP},
110 113 
       #{transUser,jdbcType=INTEGER}, #{receiveUser,jdbcType=INTEGER}, #{superiorUser,jdbcType=INTEGER},
111 
-      #{remark,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER})
114 
+      #{remark,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, #{updatetime,jdbcType=TIMESTAMP}
115 
+      )
112 116 
   </insert>
113 
-  <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id" parameterType="com.chinaitop.depot.storage.model.StorageKeeperTransfer">
117 
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageKeeperTransfer" >
114 118 
     insert into storage_keepertransfer
115 
-    <trim prefix="(" suffix=")" suffixOverrides=",">
116 
-      <if test="id != null">
119 
+    <trim prefix="(" suffix=")" suffixOverrides="," >
120 
+      <if test="id != null" >
117 121 
         id,
118 122 
       </if>
119 
-      <if test="houseId != null">
123 
+      <if test="houseId != null" >
120 124 
         house_id,
121 125 
       </if>
122 
-      <if test="transTime != null">
126 
+      <if test="transTime != null" >
123 127 
         trans_time,
124 128 
       </if>
125 
-      <if test="transUser != null">
129 
+      <if test="transUser != null" >
126 130 
         trans_user,
127 131 
       </if>
128 
-      <if test="receiveUser != null">
132 
+      <if test="receiveUser != null" >
129 133 
         receive_user,
130 134 
       </if>
131 
-      <if test="superiorUser != null">
135 
+      <if test="superiorUser != null" >
132 136 
         superior_user,
133 137 
       </if>
134 
-      <if test="remark != null">
138 
+      <if test="remark != null" >
135 139 
         remark,
136 140 
       </if>
137 
-      <if test="orgId != null">
141 
+      <if test="orgId != null" >
138 142 
         org_id,
139 143 
       </if>
144 
+      <if test="updatetime != null" >
145 
+        updatetime,
146 
+      </if>
140 147 
     </trim>
141 
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
142 
-      <if test="id != null">
148 
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
149 
+      <if test="id != null" >
143 150 
         #{id,jdbcType=INTEGER},
144 151 
       </if>
145 
-      <if test="houseId != null">
146 
-        #{houseId,jdbcType=INTEGER},
152 
+      <if test="houseId != null" >
153 
+        #{houseId,jdbcType=VARCHAR},
147 154 
       </if>
148 
-      <if test="transTime != null">
155 
+      <if test="transTime != null" >
149 156 
         #{transTime,jdbcType=TIMESTAMP},
150 157 
       </if>
151 
-      <if test="transUser != null">
158 
+      <if test="transUser != null" >
152 159 
         #{transUser,jdbcType=INTEGER},
153 160 
       </if>
154 
-      <if test="receiveUser != null">
161 
+      <if test="receiveUser != null" >
155 162 
         #{receiveUser,jdbcType=INTEGER},
156 163 
       </if>
157 
-      <if test="superiorUser != null">
164 
+      <if test="superiorUser != null" >
158 165 
         #{superiorUser,jdbcType=INTEGER},
159 166 
       </if>
160 
-      <if test="remark != null">
167 
+      <if test="remark != null" >
161 168 
         #{remark,jdbcType=VARCHAR},
162 169 
       </if>
163 
-      <if test="orgId != null">
170 
+      <if test="orgId != null" >
164 171 
         #{orgId,jdbcType=INTEGER},
165 172 
       </if>
173 
+      <if test="updatetime != null" >
174 
+        #{updatetime,jdbcType=TIMESTAMP},
175 
+      </if>
166 176 
     </trim>
167 177 
   </insert>
168 
-  <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageKeeperTransferExample" resultType="java.lang.Integer">
178 
+  <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageKeeperTransferExample" resultType="java.lang.Integer" >
169 179 
     select count(*) from storage_keepertransfer
170 
-    <if test="_parameter != null">
180 
+    <if test="_parameter != null" >
171 181 
       <include refid="Example_Where_Clause" />
172 182 
     </if>
173 183 
   </select>
174 
-  <update id="updateByExampleSelective" parameterType="map">
184 
+  <update id="updateByExampleSelective" parameterType="map" >
175 185 
     update storage_keepertransfer
176 
-    <set>
177 
-      <if test="record.id != null">
186 
+    <set >
187 
+      <if test="record.id != null" >
178 188 
         id = #{record.id,jdbcType=INTEGER},
179 189 
       </if>
180 
-      <if test="record.houseId != null">
181 
-        house_id = #{record.houseId,jdbcType=INTEGER},
190 
+      <if test="record.houseId != null" >
191 
+        house_id = #{record.houseId,jdbcType=VARCHAR},
182 192 
       </if>
183 
-      <if test="record.transTime != null">
193 
+      <if test="record.transTime != null" >
184 194 
         trans_time = #{record.transTime,jdbcType=TIMESTAMP},
185 195 
       </if>
186 
-      <if test="record.transUser != null">
196 
+      <if test="record.transUser != null" >
187 197 
         trans_user = #{record.transUser,jdbcType=INTEGER},
188 198 
       </if>
189 
-      <if test="record.receiveUser != null">
199 
+      <if test="record.receiveUser != null" >
190 200 
         receive_user = #{record.receiveUser,jdbcType=INTEGER},
191 201 
       </if>
192 
-      <if test="record.superiorUser != null">
202 
+      <if test="record.superiorUser != null" >
193 203 
         superior_user = #{record.superiorUser,jdbcType=INTEGER},
194 204 
       </if>
195 
-      <if test="record.remark != null">
205 
+      <if test="record.remark != null" >
196 206 
         remark = #{record.remark,jdbcType=VARCHAR},
197 207 
       </if>
198 
-      <if test="record.orgId != null">
208 
+      <if test="record.orgId != null" >
199 209 
         org_id = #{record.orgId,jdbcType=INTEGER},
200 210 
       </if>
211 
+      <if test="record.updatetime != null" >
212 
+        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
213 
+      </if>
201 214 
     </set>
202 
-    <if test="_parameter != null">
215 
+    <if test="_parameter != null" >
203 216 
       <include refid="Update_By_Example_Where_Clause" />
204 217 
     </if>
205 218 
   </update>
206 
-  <update id="updateByExample" parameterType="map">
219 
+  <update id="updateByExample" parameterType="map" >
207 220 
     update storage_keepertransfer
208 221 
     set id = #{record.id,jdbcType=INTEGER},
209 
-      house_id = #{record.houseId,jdbcType=INTEGER},
210 
-      trans_time = #{record.transTime,jdbcType=TIMESTAMP},
211 
-      trans_user = #{record.transUser,jdbcType=INTEGER},
212 
-      receive_user = #{record.receiveUser,jdbcType=INTEGER},
213 
-      superior_user = #{record.superiorUser,jdbcType=INTEGER},
214 
-      remark = #{record.remark,jdbcType=VARCHAR},
215 
-      org_id = #{record.orgId,jdbcType=INTEGER}
216 
-    <if test="_parameter != null">
222 
+    house_id = #{record.houseId,jdbcType=VARCHAR},
223 
+    trans_time = #{record.transTime,jdbcType=TIMESTAMP},
224 
+    trans_user = #{record.transUser,jdbcType=INTEGER},
225 
+    receive_user = #{record.receiveUser,jdbcType=INTEGER},
226 
+    superior_user = #{record.superiorUser,jdbcType=INTEGER},
227 
+    remark = #{record.remark,jdbcType=VARCHAR},
228 
+    org_id = #{record.orgId,jdbcType=INTEGER},
229 
+    updatetime = #{record.updatetime,jdbcType=TIMESTAMP}
230 
+    <if test="_parameter != null" >
217 231 
       <include refid="Update_By_Example_Where_Clause" />
218 232 
     </if>
219 233 
   </update>
220 
-  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.storage.model.StorageKeeperTransfer">
234 
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.storage.model.StorageKeeperTransfer" >
221 235 
     update storage_keepertransfer
222 
-    <set>
223 
-      <if test="houseId != null">
224 
-        house_id = #{houseId,jdbcType=INTEGER},
236 
+    <set >
237 
+      <if test="houseId != null" >
238 
+        house_id = #{houseId,jdbcType=VARCHAR},
225 239 
       </if>
226 
-      <if test="transTime != null">
240 
+      <if test="transTime != null" >
227 241 
         trans_time = #{transTime,jdbcType=TIMESTAMP},
228 242 
       </if>
229 
-      <if test="transUser != null">
243 
+      <if test="transUser != null" >
230 244 
         trans_user = #{transUser,jdbcType=INTEGER},
231 245 
       </if>
232 
-      <if test="receiveUser != null">
246 
+      <if test="receiveUser != null" >
233 247 
         receive_user = #{receiveUser,jdbcType=INTEGER},
234 248 
       </if>
235 
-      <if test="superiorUser != null">
249 
+      <if test="superiorUser != null" >
236 250 
         superior_user = #{superiorUser,jdbcType=INTEGER},
237 251 
       </if>
238 
-      <if test="remark != null">
252 
+      <if test="remark != null" >
239 253 
         remark = #{remark,jdbcType=VARCHAR},
240 254 
       </if>
241 
-      <if test="orgId != null">
255 
+      <if test="orgId != null" >
242 256 
         org_id = #{orgId,jdbcType=INTEGER},
243 257 
       </if>
258 
+      <if test="updatetime != null" >
259 
+        updatetime = #{updatetime,jdbcType=TIMESTAMP},
260 
+      </if>
244 261 
     </set>
245 262 
     where id = #{id,jdbcType=INTEGER}
246 263 
   </update>
247 
-  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.storage.model.StorageKeeperTransfer">
264 
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.storage.model.StorageKeeperTransfer" >
248 265 
     update storage_keepertransfer
249 
-    set house_id = #{houseId,jdbcType=INTEGER},
266 
+    set house_id = #{houseId,jdbcType=VARCHAR},
250 267 
       trans_time = #{transTime,jdbcType=TIMESTAMP},
251 268 
       trans_user = #{transUser,jdbcType=INTEGER},
252 269 
       receive_user = #{receiveUser,jdbcType=INTEGER},
253 270 
       superior_user = #{superiorUser,jdbcType=INTEGER},
254 271 
       remark = #{remark,jdbcType=VARCHAR},
255 
-      org_id = #{orgId,jdbcType=INTEGER}
272 
+      org_id = #{orgId,jdbcType=INTEGER},
273 
+      updatetime = #{updatetime,jdbcType=TIMESTAMP}
256 274 
     where id = #{id,jdbcType=INTEGER}
257 275 
   </update>
258 276 
 
@@ -266,12 +284,14 @@
266 284 
     <include refid="Ext_Base_Column_List" />
267 285 
         , bk.`name` AS transUserName,
268 286 
         bs.storehouse_name AS storehouseName,
287 
+        bt.storageTank_name AS tankName,
269 288 
         uio.real_name AS superiorUserName,
270 289 
         sk_temp. NAME AS receiveUserName
271 290 
         FROM
272 291 
         storage_keepertransfer skr
273 292 
         LEFT JOIN basic_keeper bk ON skr.trans_user = bk.user_Id
274 293 
         LEFT JOIN basic_storehouse bs ON bs.storehouse_id = skr.house_id
294 
+        LEFT JOIN basic_tank bt ON bt.id = skr.house_id
275 295 
         LEFT JOIN user_info uio ON uio.user_id = skr.superior_user
276 296 
         LEFT JOIN (
277 297 
                   SELECT

+ 130 - 114
src/main/java/com/chinaitop/depot/storage/mapper/StorageKeepertransferDetailsMapper.xml
Прегледај датотеку 

@@ -2,35 +2,36 @@
2 2 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 3 
 <mapper namespace="com.chinaitop.depot.storage.mapper.StorageKeepertransferDetailsMapper">
4 4 
   <resultMap id="BaseResultMap" type="com.chinaitop.depot.storage.model.StorageKeepertransferDetails">
5 
-    <id column="id" jdbcType="INTEGER" property="id" />
6 
-    <result column="kt_id" jdbcType="INTEGER" property="ktId" />
7 
-    <result column="storehouse_id" jdbcType="INTEGER" property="storehouseId" />
8 
-    <result column="warehouse_id" jdbcType="INTEGER" property="warehouseId" />
9 
-    <result column="pz" jdbcType="INTEGER" property="pz" />
10 
-    <result column="kcsl" jdbcType="DOUBLE" property="kcsl" />
11 
-    <result column="quality" jdbcType="INTEGER" property="quality" />
12 
-    <result column="food_status" jdbcType="INTEGER" property="foodStatus" />
13 
-    <result column="warehouse_name" jdbcType="VARCHAR" property="warehouseName" />
5 
+    <id column="id" property="id" jdbcType="INTEGER" />
6 
+    <result column="kt_id" property="ktId" jdbcType="INTEGER" />
7 
+    <result column="storehouse_id" property="storehouseId" jdbcType="VARCHAR" />
8 
+    <result column="warehouse_id" property="warehouseId" jdbcType="INTEGER" />
9 
+    <result column="pz" property="pz" jdbcType="INTEGER" />
10 
+    <result column="kcsl" property="kcsl" jdbcType="DOUBLE" />
11 
+    <result column="quality" property="quality" jdbcType="INTEGER" />
12 
+    <result column="food_status" property="foodStatus" jdbcType="INTEGER" />
13 
+    <result column="warehouse_name" property="warehouseName" jdbcType="VARCHAR" />
14 
+    <result column="updatetime" property="updatetime" jdbcType="TIMESTAMP" />
14 15 
   </resultMap>
15 
-  <sql id="Example_Where_Clause">
16 
-    <where>
17 
-      <foreach collection="oredCriteria" item="criteria" separator="or">
18 
-        <if test="criteria.valid">
19 
-          <trim prefix="(" prefixOverrides="and" suffix=")">
20 
-            <foreach collection="criteria.criteria" item="criterion">
21 
-              <choose>
22 
-                <when test="criterion.noValue">
16 
+  <sql id="Example_Where_Clause" >
17 
+    <where >
18 
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
19 
+        <if test="criteria.valid" >
20 
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
21 
+            <foreach collection="criteria.criteria" item="criterion" >
22 
+              <choose >
23 
+                <when test="criterion.noValue" >
23 24 
                   and ${criterion.condition}
24 25 
                 </when>
25 
-                <when test="criterion.singleValue">
26 
+                <when test="criterion.singleValue" >
26 27 
                   and ${criterion.condition} #{criterion.value}
27 28 
                 </when>
28 
-                <when test="criterion.betweenValue">
29 
+                <when test="criterion.betweenValue" >
29 30 
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
30 31 
                 </when>
31 
-                <when test="criterion.listValue">
32 
+                <when test="criterion.listValue" >
32 33 
                   and ${criterion.condition}
33 
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
34 
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
34 35 
                     #{listItem}
35 36 
                   </foreach>
36 37 
                 </when>
 
@@ -41,25 +42,25 @@
41 42 
       </foreach>
42 43 
     </where>
43 44 
   </sql>
44 
-  <sql id="Update_By_Example_Where_Clause">
45 
-    <where>
46 
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
47 
-        <if test="criteria.valid">
48 
-          <trim prefix="(" prefixOverrides="and" suffix=")">
49 
-            <foreach collection="criteria.criteria" item="criterion">
50 
-              <choose>
51 
-                <when test="criterion.noValue">
45 
+  <sql id="Update_By_Example_Where_Clause" >
46 
+    <where >
47 
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
48 
+        <if test="criteria.valid" >
49 
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
50 
+            <foreach collection="criteria.criteria" item="criterion" >
51 
+              <choose >
52 
+                <when test="criterion.noValue" >
52 53 
                   and ${criterion.condition}
53 54 
                 </when>
54 
-                <when test="criterion.singleValue">
55 
+                <when test="criterion.singleValue" >
55 56 
                   and ${criterion.condition} #{criterion.value}
56 57 
                 </when>
57 
-                <when test="criterion.betweenValue">
58 
+                <when test="criterion.betweenValue" >
58 59 
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
59 60 
                 </when>
60 
-                <when test="criterion.listValue">
61 
+                <when test="criterion.listValue" >
61 62 
                   and ${criterion.condition}
62 
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
63 
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
63 64 
                     #{listItem}
64 65 
                   </foreach>
65 66 
                 </when>
 
@@ -70,206 +71,221 @@
70 71 
       </foreach>
71 72 
     </where>
72 73 
   </sql>
73 
-  <sql id="Base_Column_List">
74 
-    id, kt_id, storehouse_id, warehouse_id, pz, kcsl, quality, food_status, warehouse_name
74 
+  <sql id="Base_Column_List" >
75 
+    id, kt_id, storehouse_id, warehouse_id, pz, kcsl, quality, food_status, warehouse_name,
76 
+    updatetime
75 77 
   </sql>
76 
-  <select id="selectByExample" parameterType="com.chinaitop.depot.storage.model.StorageKeepertransferDetailsExample" resultMap="BaseResultMap">
78 
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageKeepertransferDetailsExample" >
77 79 
     select
78 
-    <if test="distinct">
80 
+    <if test="distinct" >
79 81 
       distinct
80 82 
     </if>
81 83 
     <include refid="Base_Column_List" />
82 84 
     from storage_keepertransfer_details
83 
-    <if test="_parameter != null">
85 
+    <if test="_parameter != null" >
84 86 
       <include refid="Example_Where_Clause" />
85 87 
     </if>
86 
-    <if test="orderByClause != null">
88 
+    <if test="orderByClause != null" >
87 89 
       order by ${orderByClause}
88 90 
     </if>
89 91 
   </select>
90 
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
91 
-    select
92 
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
93 
+    select
92 94 
     <include refid="Base_Column_List" />
93 95 
     from storage_keepertransfer_details
94 96 
     where id = #{id,jdbcType=INTEGER}
95 97 
   </select>
96 
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
98 
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
97 99 
     delete from storage_keepertransfer_details
98 100 
     where id = #{id,jdbcType=INTEGER}
99 101 
   </delete>
100 
-  <delete id="deleteByExample" parameterType="com.chinaitop.depot.storage.model.StorageKeepertransferDetailsExample">
102 
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.storage.model.StorageKeepertransferDetailsExample" >
101 103 
     delete from storage_keepertransfer_details
102 
-    <if test="_parameter != null">
104 
+    <if test="_parameter != null" >
103 105 
       <include refid="Example_Where_Clause" />
104 106 
     </if>
105 107 
   </delete>
106 
-  <insert id="insert" parameterType="com.chinaitop.depot.storage.model.StorageKeepertransferDetails">
107 
-    insert into storage_keepertransfer_details (id, kt_id, storehouse_id,
108 
-      warehouse_id, pz, kcsl,
109 
-      quality, food_status, warehouse_name
110 
-      )
111 
-    values (#{id,jdbcType=INTEGER}, #{ktId,jdbcType=INTEGER}, #{storehouseId,jdbcType=INTEGER},
112 
-      #{warehouseId,jdbcType=INTEGER}, #{pz,jdbcType=INTEGER}, #{kcsl,jdbcType=DOUBLE},
113 
-      #{quality,jdbcType=INTEGER}, #{foodStatus,jdbcType=INTEGER}, #{warehouseName,jdbcType=VARCHAR}
114 
-      )
108 
+  <insert id="insert" parameterType="com.chinaitop.depot.storage.model.StorageKeepertransferDetails" >
109 
+    insert into storage_keepertransfer_details (id, kt_id, storehouse_id,
110 
+      warehouse_id, pz, kcsl,
111 
+      quality, food_status, warehouse_name,
112 
+      updatetime)
113 
+    values (#{id,jdbcType=INTEGER}, #{ktId,jdbcType=INTEGER}, #{storehouseId,jdbcType=VARCHAR},
114 
+      #{warehouseId,jdbcType=INTEGER}, #{pz,jdbcType=INTEGER}, #{kcsl,jdbcType=DOUBLE},
115 
+      #{quality,jdbcType=INTEGER}, #{foodStatus,jdbcType=INTEGER}, #{warehouseName,jdbcType=VARCHAR},
116 
+      #{updatetime,jdbcType=TIMESTAMP})
115 117 
   </insert>
116 
-  <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageKeepertransferDetails">
118 
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageKeepertransferDetails" >
117 119 
     insert into storage_keepertransfer_details
118 
-    <trim prefix="(" suffix=")" suffixOverrides=",">
119 
-      <if test="id != null">
120 
+    <trim prefix="(" suffix=")" suffixOverrides="," >
121 
+      <if test="id != null" >
120 122 
         id,
121 123 
       </if>
122 
-      <if test="ktId != null">
124 
+      <if test="ktId != null" >
123 125 
         kt_id,
124 126 
       </if>
125 
-      <if test="storehouseId != null">
127 
+      <if test="storehouseId != null" >
126 128 
         storehouse_id,
127 129 
       </if>
128 
-      <if test="warehouseId != null">
130 
+      <if test="warehouseId != null" >
129 131 
         warehouse_id,
130 132 
       </if>
131 
-      <if test="pz != null">
133 
+      <if test="pz != null" >
132 134 
         pz,
133 135 
       </if>
134 
-      <if test="kcsl != null">
136 
+      <if test="kcsl != null" >
135 137 
         kcsl,
136 138 
       </if>
137 
-      <if test="quality != null">
139 
+      <if test="quality != null" >
138 140 
         quality,
139 141 
       </if>
140 
-      <if test="foodStatus != null">
142 
+      <if test="foodStatus != null" >
141 143 
         food_status,
142 144 
       </if>
143 
-      <if test="warehouseName != null">
145 
+      <if test="warehouseName != null" >
144 146 
         warehouse_name,
145 147 
       </if>
148 
+      <if test="updatetime != null" >
149 
+        updatetime,
150 
+      </if>
146 151 
     </trim>
147 
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
148 
-      <if test="id != null">
152 
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
153 
+      <if test="id != null" >
149 154 
         #{id,jdbcType=INTEGER},
150 155 
       </if>
151 
-      <if test="ktId != null">
156 
+      <if test="ktId != null" >
152 157 
         #{ktId,jdbcType=INTEGER},
153 158 
       </if>
154 
-      <if test="storehouseId != null">
155 
-        #{storehouseId,jdbcType=INTEGER},
159 
+      <if test="storehouseId != null" >
160 
+        #{storehouseId,jdbcType=VARCHAR},
156 161 
       </if>
157 
-      <if test="warehouseId != null">
162 
+      <if test="warehouseId != null" >
158 163 
         #{warehouseId,jdbcType=INTEGER},
159 164 
       </if>
160 
-      <if test="pz != null">
165 
+      <if test="pz != null" >
161 166 
         #{pz,jdbcType=INTEGER},
162 167 
       </if>
163 
-      <if test="kcsl != null">
168 
+      <if test="kcsl != null" >
164 169 
         #{kcsl,jdbcType=DOUBLE},
165 170 
       </if>
166 
-      <if test="quality != null">
171 
+      <if test="quality != null" >
167 172 
         #{quality,jdbcType=INTEGER},
168 173 
       </if>
169 
-      <if test="foodStatus != null">
174 
+      <if test="foodStatus != null" >
170 175 
         #{foodStatus,jdbcType=INTEGER},
171 176 
       </if>
172 
-      <if test="warehouseName != null">
177 
+      <if test="warehouseName != null" >
173 178 
         #{warehouseName,jdbcType=VARCHAR},
174 179 
       </if>
180 
+      <if test="updatetime != null" >
181 
+        #{updatetime,jdbcType=TIMESTAMP},
182 
+      </if>
175 183 
     </trim>
176 184 
   </insert>
177 
-  <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageKeepertransferDetailsExample" resultType="java.lang.Integer">
185 
+  <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageKeepertransferDetailsExample" resultType="java.lang.Integer" >
178 186 
     select count(*) from storage_keepertransfer_details
179 
-    <if test="_parameter != null">
187 
+    <if test="_parameter != null" >
180 188 
       <include refid="Example_Where_Clause" />
181 189 
     </if>
182 190 
   </select>
183 
-  <update id="updateByExampleSelective" parameterType="map">
191 
+  <update id="updateByExampleSelective" parameterType="map" >
184 192 
     update storage_keepertransfer_details
185 
-    <set>
186 
-      <if test="record.id != null">
193 
+    <set >
194 
+      <if test="record.id != null" >
187 195 
         id = #{record.id,jdbcType=INTEGER},
188 196 
       </if>
189 
-      <if test="record.ktId != null">
197 
+      <if test="record.ktId != null" >
190 198 
         kt_id = #{record.ktId,jdbcType=INTEGER},
191 199 
       </if>
192 
-      <if test="record.storehouseId != null">
193 
-        storehouse_id = #{record.storehouseId,jdbcType=INTEGER},
200 
+      <if test="record.storehouseId != null" >
201 
+        storehouse_id = #{record.storehouseId,jdbcType=VARCHAR},
194 202 
       </if>
195 
-      <if test="record.warehouseId != null">
203 
+      <if test="record.warehouseId != null" >
196 204 
         warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
197 205 
       </if>
198 
-      <if test="record.pz != null">
206 
+      <if test="record.pz != null" >
199 207 
         pz = #{record.pz,jdbcType=INTEGER},
200 208 
       </if>
201 
-      <if test="record.kcsl != null">
209 
+      <if test="record.kcsl != null" >
202 210 
         kcsl = #{record.kcsl,jdbcType=DOUBLE},
203 211 
       </if>
204 
-      <if test="record.quality != null">
212 
+      <if test="record.quality != null" >
205 213 
         quality = #{record.quality,jdbcType=INTEGER},
206 214 
       </if>
207 
-      <if test="record.foodStatus != null">
215 
+      <if test="record.foodStatus != null" >
208 216 
         food_status = #{record.foodStatus,jdbcType=INTEGER},
209 217 
       </if>
210 
-      <if test="record.warehouseName != null">
218 
+      <if test="record.warehouseName != null" >
211 219 
         warehouse_name = #{record.warehouseName,jdbcType=VARCHAR},
212 220 
       </if>
221 
+      <if test="record.updatetime != null" >
222 
+        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
223 
+      </if>
213 224 
     </set>
214 
-    <if test="_parameter != null">
225 
+    <if test="_parameter != null" >
215 226 
       <include refid="Update_By_Example_Where_Clause" />
216 227 
     </if>
217 228 
   </update>
218 
-  <update id="updateByExample" parameterType="map">
229 
+  <update id="updateByExample" parameterType="map" >
219 230 
     update storage_keepertransfer_details
220 231 
     set id = #{record.id,jdbcType=INTEGER},
221 
-      kt_id = #{record.ktId,jdbcType=INTEGER},
222 
-      storehouse_id = #{record.storehouseId,jdbcType=INTEGER},
223 
-      warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
224 
-      pz = #{record.pz,jdbcType=INTEGER},
225 
-      kcsl = #{record.kcsl,jdbcType=DOUBLE},
226 
-      quality = #{record.quality,jdbcType=INTEGER},
227 
-      food_status = #{record.foodStatus,jdbcType=INTEGER},
228 
-      warehouse_name = #{record.warehouseName,jdbcType=VARCHAR}
229 
-    <if test="_parameter != null">
232 
+    kt_id = #{record.ktId,jdbcType=INTEGER},
233 
+    storehouse_id = #{record.storehouseId,jdbcType=VARCHAR},
234 
+    warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
235 
+    pz = #{record.pz,jdbcType=INTEGER},
236 
+    kcsl = #{record.kcsl,jdbcType=DOUBLE},
237 
+    quality = #{record.quality,jdbcType=INTEGER},
238 
+    food_status = #{record.foodStatus,jdbcType=INTEGER},
239 
+    warehouse_name = #{record.warehouseName,jdbcType=VARCHAR},
240 
+    updatetime = #{record.updatetime,jdbcType=TIMESTAMP}
241 
+    <if test="_parameter != null" >
230 242 
       <include refid="Update_By_Example_Where_Clause" />
231 243 
     </if>
232 244 
   </update>
233 
-  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.storage.model.StorageKeepertransferDetails">
245 
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.storage.model.StorageKeepertransferDetails" >
234 246 
     update storage_keepertransfer_details
235 
-    <set>
236 
-      <if test="ktId != null">
247 
+    <set >
248 
+      <if test="ktId != null" >
237 249 
         kt_id = #{ktId,jdbcType=INTEGER},
238 250 
       </if>
239 
-      <if test="storehouseId != null">
240 
-        storehouse_id = #{storehouseId,jdbcType=INTEGER},
251 
+      <if test="storehouseId != null" >
252 
+        storehouse_id = #{storehouseId,jdbcType=VARCHAR},
241 253 
       </if>
242 
-      <if test="warehouseId != null">
254 
+      <if test="warehouseId != null" >
243 255 
         warehouse_id = #{warehouseId,jdbcType=INTEGER},
244 256 
       </if>
245 
-      <if test="pz != null">
257 
+      <if test="pz != null" >
246 258 
         pz = #{pz,jdbcType=INTEGER},
247 259 
       </if>
248 
-      <if test="kcsl != null">
260 
+      <if test="kcsl != null" >
249 261 
         kcsl = #{kcsl,jdbcType=DOUBLE},
250 262 
       </if>
251 
-      <if test="quality != null">
263 
+      <if test="quality != null" >
252 264 
         quality = #{quality,jdbcType=INTEGER},
253 265 
       </if>
254 
-      <if test="foodStatus != null">
266 
+      <if test="foodStatus != null" >
255 267 
         food_status = #{foodStatus,jdbcType=INTEGER},
256 268 
       </if>
257 
-      <if test="warehouseName != null">
269 
+      <if test="warehouseName != null" >
258 270 
         warehouse_name = #{warehouseName,jdbcType=VARCHAR},
259 271 
       </if>
272 
+      <if test="updatetime != null" >
273 
+        updatetime = #{updatetime,jdbcType=TIMESTAMP},
274 
+      </if>
260 275 
     </set>
261 276 
     where id = #{id,jdbcType=INTEGER}
262 277 
   </update>
263 
-  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.storage.model.StorageKeepertransferDetails">
278 
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.storage.model.StorageKeepertransferDetails" >
264 279 
     update storage_keepertransfer_details
265 280 
     set kt_id = #{ktId,jdbcType=INTEGER},
266 
-      storehouse_id = #{storehouseId,jdbcType=INTEGER},
281 
+      storehouse_id = #{storehouseId,jdbcType=VARCHAR},
267 282 
       warehouse_id = #{warehouseId,jdbcType=INTEGER},
268 283 
       pz = #{pz,jdbcType=INTEGER},
269 284 
       kcsl = #{kcsl,jdbcType=DOUBLE},
270 285 
       quality = #{quality,jdbcType=INTEGER},
271 286 
       food_status = #{foodStatus,jdbcType=INTEGER},
272 
-      warehouse_name = #{warehouseName,jdbcType=VARCHAR}
287 
+      warehouse_name = #{warehouseName,jdbcType=VARCHAR},
288 
+      updatetime = #{updatetime,jdbcType=TIMESTAMP}
273 289 
     where id = #{id,jdbcType=INTEGER}
274 290 
   </update>
275 291 
 </mapper>

+ 23 - 11
src/main/java/com/chinaitop/depot/storage/model/StorageKeeperTransfer.java
Прегледај датотеку 

@@ -5,7 +5,7 @@ import java.util.Date;
5 5 
 public class StorageKeeperTransfer {
6 6 
     private Integer id;
7 7
8 
-    private Integer houseId;
8 
+    private String houseId;
9 9
10 10 
     private Date transTime;
11 11 
 
@@ -19,6 +19,8 @@ public class StorageKeeperTransfer {
19 19
20 20 
     private Integer orgId;
21 21
22 
+    private Date updatetime;
23 
+
22 24 
     //业务字段
23 25 
     private String transUserName;
24 26 
     private String receiveUserName;
 
@@ -29,6 +31,8 @@ public class StorageKeeperTransfer {
29 31 
     private String searchStartDate;
30 32 
     private String searchEndDate;
31 33 
     private Integer roleId;
34 
+    private String tankName;
35 
+
32 36
33 37 
     /**
34 38 
      * 保管员移交档案
 
@@ -46,19 +50,11 @@ public class StorageKeeperTransfer {
46 50 
         this.id = id;
47 51 
     }
48 52
49 
-    /**
50 
-     * 仓房id
51 
-     * @return house_id 仓房id
52 
-     */
53 
-    public Integer getHouseId() {
53 
+    public String getHouseId() {
54 54 
         return houseId;
55 55 
     }
56 56
57 
-    /**
58 
-     * 仓房id
59 
-     * @param houseId 仓房id
60 
-     */
61 
-    public void setHouseId(Integer houseId) {
57 
+    public void setHouseId(String houseId) {
62 58 
         this.houseId = houseId;
63 59 
     }
64 60 
 
@@ -213,4 +209,20 @@ public class StorageKeeperTransfer {
213 209 
     public void setRoleId(Integer roleId) {
214 210 
         this.roleId = roleId;
215 211 
     }
212 
+
213 
+    public Date getUpdatetime() {
214 
+        return updatetime;
215 
+    }
216 
+
217 
+    public void setUpdatetime(Date updatetime) {
218 
+        this.updatetime = updatetime;
219 
+    }
220 
+
221 
+    public String getTankName() {
222 
+        return tankName;
223 
+    }
224 
+
225 
+    public void setTankName(String tankName) {
226 
+        this.tankName = tankName;
227 
+    }
216 228 
 }

+ 20 - 10
src/main/java/com/chinaitop/depot/storage/model/StorageKeeperTransferExample.java
Прегледај датотеку 

@@ -187,52 +187,62 @@ public class StorageKeeperTransferExample {
187 187 
             return (Criteria) this;
188 188 
         }
189 189
190 
-        public Criteria andHouseIdEqualTo(Integer value) {
190 
+        public Criteria andHouseIdEqualTo(String value) {
191 191 
             addCriterion("house_id =", value, "houseId");
192 192 
             return (Criteria) this;
193 193 
         }
194 194
195 
-        public Criteria andHouseIdNotEqualTo(Integer value) {
195 
+        public Criteria andHouseIdNotEqualTo(String value) {
196 196 
             addCriterion("house_id <>", value, "houseId");
197 197 
             return (Criteria) this;
198 198 
         }
199 199
200 
-        public Criteria andHouseIdGreaterThan(Integer value) {
200 
+        public Criteria andHouseIdGreaterThan(String value) {
201 201 
             addCriterion("house_id >", value, "houseId");
202 202 
             return (Criteria) this;
203 203 
         }
204 204
205 
-        public Criteria andHouseIdGreaterThanOrEqualTo(Integer value) {
205 
+        public Criteria andHouseIdGreaterThanOrEqualTo(String value) {
206 206 
             addCriterion("house_id >=", value, "houseId");
207 207 
             return (Criteria) this;
208 208 
         }
209 209
210 
-        public Criteria andHouseIdLessThan(Integer value) {
210 
+        public Criteria andHouseIdLessThan(String value) {
211 211 
             addCriterion("house_id <", value, "houseId");
212 212 
             return (Criteria) this;
213 213 
         }
214 214
215 
-        public Criteria andHouseIdLessThanOrEqualTo(Integer value) {
215 
+        public Criteria andHouseIdLessThanOrEqualTo(String value) {
216 216 
             addCriterion("house_id <=", value, "houseId");
217 217 
             return (Criteria) this;
218 218 
         }
219 219
220 
-        public Criteria andHouseIdIn(List<Integer> values) {
220 
+        public Criteria andHouseIdLike(String value) {
221 
+            addCriterion("house_id like", value, "houseId");
222 
+            return (Criteria) this;
223 
+        }
224 
+
225 
+        public Criteria andHouseIdNotLike(String value) {
226 
+            addCriterion("house_id not like", value, "houseId");
227 
+            return (Criteria) this;
228 
+        }
229 
+
230 
+        public Criteria andHouseIdIn(List<String> values) {
221 231 
             addCriterion("house_id in", values, "houseId");
222 232 
             return (Criteria) this;
223 233 
         }
224 234
225 
-        public Criteria andHouseIdNotIn(List<Integer> values) {
235 
+        public Criteria andHouseIdNotIn(List<String> values) {
226 236 
             addCriterion("house_id not in", values, "houseId");
227 237 
             return (Criteria) this;
228 238 
         }
229 239
230 
-        public Criteria andHouseIdBetween(Integer value1, Integer value2) {
240 
+        public Criteria andHouseIdBetween(String value1, String value2) {
231 241 
             addCriterion("house_id between", value1, value2, "houseId");
232 242 
             return (Criteria) this;
233 243 
         }
234 244
235 
-        public Criteria andHouseIdNotBetween(Integer value1, Integer value2) {
245 
+        public Criteria andHouseIdNotBetween(String value1, String value2) {
236 246 
             addCriterion("house_id not between", value1, value2, "houseId");
237 247 
             return (Criteria) this;
238 248 
         }

+ 24 - 4
src/main/java/com/chinaitop/depot/storage/model/StorageKeepertransferDetails.java
Прегледај датотеку 

@@ -1,11 +1,13 @@
1 1 
 package com.chinaitop.depot.storage.model;
2 2
3 
+import java.util.Date;
4 
+
3 5 
 public class StorageKeepertransferDetails {
4 6 
     private Integer id;
5 7
6 8 
     private Integer ktId;
7 9
8 
-    private Integer storehouseId;
10 
+    private String storehouseId;
9 11
10 12 
     private Integer warehouseId;
11 13 
 
@@ -19,6 +21,8 @@ public class StorageKeepertransferDetails {
19 21
20 22 
     private String warehouseName;
21 23
24 
+    private Date updatetime;
25 
+
22 26 
     /**
23 27 
      * 主键
24 28 
      * @return id 主键
 
@@ -55,7 +59,7 @@ public class StorageKeepertransferDetails {
55 59 
      * 仓房id
56 60 
      * @return storehouse_id 仓房id
57 61 
      */
58 
-    public Integer getStorehouseId() {
62 
+    public String getStorehouseId() {
59 63 
         return storehouseId;
60 64 
     }
61 65 
 
@@ -63,8 +67,8 @@ public class StorageKeepertransferDetails {
63 67 
      * 仓房id
64 68 
      * @param storehouseId 仓房id
65 69 
      */
66 
-    public void setStorehouseId(Integer storehouseId) {
67 
-        this.storehouseId = storehouseId;
70 
+    public void setStorehouseId(String storehouseId) {
71 
+        this.storehouseId = storehouseId == null ? null : storehouseId.trim();
68 72 
     }
69 73
70 74 
     /**
 
@@ -162,4 +166,20 @@ public class StorageKeepertransferDetails {
162 166 
     public void setWarehouseName(String warehouseName) {
163 167 
         this.warehouseName = warehouseName == null ? null : warehouseName.trim();
164 168 
     }
169 
+
170 
+    /**
171 
+     *
172 
+     * @return updatetime
173 
+     */
174 
+    public Date getUpdatetime() {
175 
+        return updatetime;
176 
+    }
177 
+
178 
+    /**
179 
+     *
180 
+     * @param updatetime
181 
+     */
182 
+    public void setUpdatetime(Date updatetime) {
183 
+        this.updatetime = updatetime;
184 
+    }
165 185 
 }

+ 83 - 12
src/main/java/com/chinaitop/depot/storage/model/StorageKeepertransferDetailsExample.java
Прегледај датотеку 

@@ -1,6 +1,7 @@
1 1 
 package com.chinaitop.depot.storage.model;
2 2
3 3 
 import java.util.ArrayList;
4 
+import java.util.Date;
4 5 
 import java.util.List;
5 6
6 7 
 public class StorageKeepertransferDetailsExample {
 
@@ -73,7 +74,7 @@ public class StorageKeepertransferDetailsExample {
73 74 
     }
74 75
75 76 
     /**
76 
-     * storage_keepertransfer_details 2017-11-14
77 
+     * storage_keepertransfer_details 2020-04-17
77 78 
      */
78 79 
     protected abstract static class GeneratedCriteria {
79 80 
         protected List<Criterion> criteria;
 
@@ -246,52 +247,62 @@ public class StorageKeepertransferDetailsExample {
246 247 
             return (Criteria) this;
247 248 
         }
248 249
249 
-        public Criteria andStorehouseIdEqualTo(Integer value) {
250 
+        public Criteria andStorehouseIdEqualTo(String value) {
250 251 
             addCriterion("storehouse_id =", value, "storehouseId");
251 252 
             return (Criteria) this;
252 253 
         }
253 254
254 
-        public Criteria andStorehouseIdNotEqualTo(Integer value) {
255 
+        public Criteria andStorehouseIdNotEqualTo(String value) {
255 256 
             addCriterion("storehouse_id <>", value, "storehouseId");
256 257 
             return (Criteria) this;
257 258 
         }
258 259
259 
-        public Criteria andStorehouseIdGreaterThan(Integer value) {
260 
+        public Criteria andStorehouseIdGreaterThan(String value) {
260 261 
             addCriterion("storehouse_id >", value, "storehouseId");
261 262 
             return (Criteria) this;
262 263 
         }
263 264
264 
-        public Criteria andStorehouseIdGreaterThanOrEqualTo(Integer value) {
265 
+        public Criteria andStorehouseIdGreaterThanOrEqualTo(String value) {
265 266 
             addCriterion("storehouse_id >=", value, "storehouseId");
266 267 
             return (Criteria) this;
267 268 
         }
268 269
269 
-        public Criteria andStorehouseIdLessThan(Integer value) {
270 
+        public Criteria andStorehouseIdLessThan(String value) {
270 271 
             addCriterion("storehouse_id <", value, "storehouseId");
271 272 
             return (Criteria) this;
272 273 
         }
273 274
274 
-        public Criteria andStorehouseIdLessThanOrEqualTo(Integer value) {
275 
+        public Criteria andStorehouseIdLessThanOrEqualTo(String value) {
275 276 
             addCriterion("storehouse_id <=", value, "storehouseId");
276 277 
             return (Criteria) this;
277 278 
         }
278 279
279 
-        public Criteria andStorehouseIdIn(List<Integer> values) {
280 
+        public Criteria andStorehouseIdLike(String value) {
281 
+            addCriterion("storehouse_id like", value, "storehouseId");
282 
+            return (Criteria) this;
283 
+        }
284 
+
285 
+        public Criteria andStorehouseIdNotLike(String value) {
286 
+            addCriterion("storehouse_id not like", value, "storehouseId");
287 
+            return (Criteria) this;
288 
+        }
289 
+
290 
+        public Criteria andStorehouseIdIn(List<String> values) {
280 291 
             addCriterion("storehouse_id in", values, "storehouseId");
281 292 
             return (Criteria) this;
282 293 
         }
283 294
284 
-        public Criteria andStorehouseIdNotIn(List<Integer> values) {
295 
+        public Criteria andStorehouseIdNotIn(List<String> values) {
285 296 
             addCriterion("storehouse_id not in", values, "storehouseId");
286 297 
             return (Criteria) this;
287 298 
         }
288 299
289 
-        public Criteria andStorehouseIdBetween(Integer value1, Integer value2) {
300 
+        public Criteria andStorehouseIdBetween(String value1, String value2) {
290 301 
             addCriterion("storehouse_id between", value1, value2, "storehouseId");
291 302 
             return (Criteria) this;
292 303 
         }
293 304
294 
-        public Criteria andStorehouseIdNotBetween(Integer value1, Integer value2) {
305 
+        public Criteria andStorehouseIdNotBetween(String value1, String value2) {
295 306 
             addCriterion("storehouse_id not between", value1, value2, "storehouseId");
296 307 
             return (Criteria) this;
297 308 
         }
 
@@ -665,6 +676,66 @@ public class StorageKeepertransferDetailsExample {
665 676 
             addCriterion("warehouse_name not between", value1, value2, "warehouseName");
666 677 
             return (Criteria) this;
667 678 
         }
679 
+
680 
+        public Criteria andUpdatetimeIsNull() {
681 
+            addCriterion("updatetime is null");
682 
+            return (Criteria) this;
683 
+        }
684 
+
685 
+        public Criteria andUpdatetimeIsNotNull() {
686 
+            addCriterion("updatetime is not null");
687 
+            return (Criteria) this;
688 
+        }
689 
+
690 
+        public Criteria andUpdatetimeEqualTo(Date value) {
691 
+            addCriterion("updatetime =", value, "updatetime");
692 
+            return (Criteria) this;
693 
+        }
694 
+
695 
+        public Criteria andUpdatetimeNotEqualTo(Date value) {
696 
+            addCriterion("updatetime <>", value, "updatetime");
697 
+            return (Criteria) this;
698 
+        }
699 
+
700 
+        public Criteria andUpdatetimeGreaterThan(Date value) {
701 
+            addCriterion("updatetime >", value, "updatetime");
702 
+            return (Criteria) this;
703 
+        }
704 
+
705 
+        public Criteria andUpdatetimeGreaterThanOrEqualTo(Date value) {
706 
+            addCriterion("updatetime >=", value, "updatetime");
707 
+            return (Criteria) this;
708 
+        }
709 
+
710 
+        public Criteria andUpdatetimeLessThan(Date value) {
711 
+            addCriterion("updatetime <", value, "updatetime");
712 
+            return (Criteria) this;
713 
+        }
714 
+
715 
+        public Criteria andUpdatetimeLessThanOrEqualTo(Date value) {
716 
+            addCriterion("updatetime <=", value, "updatetime");
717 
+            return (Criteria) this;
718 
+        }
719 
+
720 
+        public Criteria andUpdatetimeIn(List<Date> values) {
721 
+            addCriterion("updatetime in", values, "updatetime");
722 
+            return (Criteria) this;
723 
+        }
724 
+
725 
+        public Criteria andUpdatetimeNotIn(List<Date> values) {
726 
+            addCriterion("updatetime not in", values, "updatetime");
727 
+            return (Criteria) this;
728 
+        }
729 
+
730 
+        public Criteria andUpdatetimeBetween(Date value1, Date value2) {
731 
+            addCriterion("updatetime between", value1, value2, "updatetime");
732 
+            return (Criteria) this;
733 
+        }
734 
+
735 
+        public Criteria andUpdatetimeNotBetween(Date value1, Date value2) {
736 
+            addCriterion("updatetime not between", value1, value2, "updatetime");
737 
+            return (Criteria) this;
738 
+        }
668 739 
     }
669 740
670 741 
     /**
 
@@ -678,7 +749,7 @@ public class StorageKeepertransferDetailsExample {
678 749 
     }
679 750
680 751 
     /**
681 
-     * storage_keepertransfer_details 2017-11-14
752 
+     * storage_keepertransfer_details 2020-04-17
682 753 
      */
683 754 
     public static class Criterion {
684 755 
         private String condition;