Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
zelong.shao
e474f9d4 1 parent 799fbb8e

dao|dao层重新生成

Inline Side-by-side
Showing 51 changed files with 1991 additions and 1645 deletions
...@@ -2,9 +2,8 @@ package com.fedex.connect.common.dao.bi; ...@@ -2,9 +2,8 @@ package com.fedex.connect.common.dao.bi;
2 2
3 import com.fedex.connect.common.model.bi.PortclearEmailMapping; 3 import com.fedex.connect.common.model.bi.PortclearEmailMapping;
4 import com.fedex.connect.common.model.bi.PortclearEmailMappingExample; 4 import com.fedex.connect.common.model.bi.PortclearEmailMappingExample;
5 -import org.apache.ibatis.annotations.Param;
6 -
7 import java.util.List; 5 import java.util.List;
6 +import org.apache.ibatis.annotations.Param;
8 7
9 public interface PortclearEmailMappingMapper { 8 public interface PortclearEmailMappingMapper {
10 long countByExample(PortclearEmailMappingExample example); 9 long countByExample(PortclearEmailMappingExample example);
......
...@@ -2,9 +2,8 @@ package com.fedex.connect.common.dao.log; ...@@ -2,9 +2,8 @@ package com.fedex.connect.common.dao.log;
2 2
3 import com.fedex.connect.common.model.log.EmailHistory; 3 import com.fedex.connect.common.model.log.EmailHistory;
4 import com.fedex.connect.common.model.log.EmailHistoryExample; 4 import com.fedex.connect.common.model.log.EmailHistoryExample;
5 -import org.apache.ibatis.annotations.Param;
6 -
7 import java.util.List; 5 import java.util.List;
6 +import org.apache.ibatis.annotations.Param;
8 7
9 public interface EmailHistoryMapper { 8 public interface EmailHistoryMapper {
10 long countByExample(EmailHistoryExample example); 9 long countByExample(EmailHistoryExample example);
......
...@@ -2,9 +2,8 @@ package com.fedex.connect.common.dao.log; ...@@ -2,9 +2,8 @@ package com.fedex.connect.common.dao.log;
2 2
3 import com.fedex.connect.common.model.log.UserLoginInfo; 3 import com.fedex.connect.common.model.log.UserLoginInfo;
4 import com.fedex.connect.common.model.log.UserLoginInfoExample; 4 import com.fedex.connect.common.model.log.UserLoginInfoExample;
5 -import org.apache.ibatis.annotations.Param;
6 -
7 import java.util.List; 5 import java.util.List;
6 +import org.apache.ibatis.annotations.Param;
8 7
9 public interface UserLoginInfoMapper { 8 public interface UserLoginInfoMapper {
10 long countByExample(UserLoginInfoExample example); 9 long countByExample(UserLoginInfoExample example);
......
...@@ -2,9 +2,8 @@ package com.fedex.connect.common.dao.sys; ...@@ -2,9 +2,8 @@ package com.fedex.connect.common.dao.sys;
2 2
3 import com.fedex.connect.common.model.sys.Privilege; 3 import com.fedex.connect.common.model.sys.Privilege;
4 import com.fedex.connect.common.model.sys.PrivilegeExample; 4 import com.fedex.connect.common.model.sys.PrivilegeExample;
5 -import org.apache.ibatis.annotations.Param;
6 -
7 import java.util.List; 5 import java.util.List;
6 +import org.apache.ibatis.annotations.Param;
8 7
9 public interface PrivilegeMapper { 8 public interface PrivilegeMapper {
10 long countByExample(PrivilegeExample example); 9 long countByExample(PrivilegeExample example);
......
1 -package com.fedex.connect.common.dao.sys;
2 -
3 -import com.fedex.connect.common.model.sys.RedisSlab;
4 -import com.fedex.connect.common.model.sys.RedisSlabExample;
5 -import org.apache.ibatis.annotations.Param;
6 -
7 -import java.util.List;
8 -
9 -public interface RedisSlabMapper {
10 - long countByExample(RedisSlabExample example);
11 -
12 - int deleteByExample(RedisSlabExample example);
13 -
14 - int deleteByPrimaryKey(Long id);
15 -
16 - int insert(RedisSlab record);
17 -
18 - int insertSelective(RedisSlab record);
19 -
20 - List<RedisSlab> selectByExample(RedisSlabExample example);
21 -
22 - RedisSlab selectByPrimaryKey(Long id);
23 -
24 - int updateByExampleSelective(@Param("record") RedisSlab record, @Param("example") RedisSlabExample example);
25 -
26 - int updateByExample(@Param("record") RedisSlab record, @Param("example") RedisSlabExample example);
27 -
28 - int updateByPrimaryKeySelective(RedisSlab record);
29 -
30 - int updateByPrimaryKey(RedisSlab record);
31 -}
...\ No newline at end of file ...\ No newline at end of file
...@@ -2,9 +2,8 @@ package com.fedex.connect.common.dao.sys; ...@@ -2,9 +2,8 @@ package com.fedex.connect.common.dao.sys;
2 2
3 import com.fedex.connect.common.model.sys.Role; 3 import com.fedex.connect.common.model.sys.Role;
4 import com.fedex.connect.common.model.sys.RoleExample; 4 import com.fedex.connect.common.model.sys.RoleExample;
5 -import org.apache.ibatis.annotations.Param;
6 -
7 import java.util.List; 5 import java.util.List;
6 +import org.apache.ibatis.annotations.Param;
8 7
9 public interface RoleMapper { 8 public interface RoleMapper {
10 long countByExample(RoleExample example); 9 long countByExample(RoleExample example);
......
1 +package com.fedex.connect.common.dao.sys;
2 +
3 +import com.fedex.connect.common.model.sys.redisSlab;
4 +import com.fedex.connect.common.model.sys.redisSlabExample;
5 +import java.util.List;
6 +import org.apache.ibatis.annotations.Param;
7 +
8 +public interface redisSlabMapper {
9 + long countByExample(redisSlabExample example);
10 +
11 + int deleteByExample(redisSlabExample example);
12 +
13 + int deleteByPrimaryKey(Long id);
14 +
15 + int insert(redisSlab record);
16 +
17 + int insertSelective(redisSlab record);
18 +
19 + List<redisSlab> selectByExample(redisSlabExample example);
20 +
21 + redisSlab selectByPrimaryKey(Long id);
22 +
23 + int updateByExampleSelective(@Param("record") redisSlab record, @Param("example") redisSlabExample example);
24 +
25 + int updateByExample(@Param("record") redisSlab record, @Param("example") redisSlabExample example);
26 +
27 + int updateByPrimaryKeySelective(redisSlab record);
28 +
29 + int updateByPrimaryKey(redisSlab record);
30 +}
...\ No newline at end of file ...\ No newline at end of file
...@@ -4,12 +4,12 @@ ...@@ -4,12 +4,12 @@
4 <resultMap id="BaseResultMap" type="com.fedex.connect.common.model.biz.Attachment"> 4 <resultMap id="BaseResultMap" type="com.fedex.connect.common.model.biz.Attachment">
5 <id column="ID" jdbcType="NUMERIC" property="id" /> 5 <id column="ID" jdbcType="NUMERIC" property="id" />
6 <result column="BIZ_ID" jdbcType="NUMERIC" property="bizId" /> 6 <result column="BIZ_ID" jdbcType="NUMERIC" property="bizId" />
7 - <result column="BIZ_TYPE_ID" jdbcType="NUMERIC" property="bizTypeId" /> 7 + <result column="BIZ_TYPE_CODE" jdbcType="VARCHAR" property="bizTypeCode" />
8 <result column="BIZ_TYPE_NAME" jdbcType="VARCHAR" property="bizTypeName" /> 8 <result column="BIZ_TYPE_NAME" jdbcType="VARCHAR" property="bizTypeName" />
9 <result column="SOURCE_FILE_NAME" jdbcType="VARCHAR" property="sourceFileName" /> 9 <result column="SOURCE_FILE_NAME" jdbcType="VARCHAR" property="sourceFileName" />
10 <result column="FILE_NAME" jdbcType="VARCHAR" property="fileName" /> 10 <result column="FILE_NAME" jdbcType="VARCHAR" property="fileName" />
11 <result column="FILE_PATH" jdbcType="VARCHAR" property="filePath" /> 11 <result column="FILE_PATH" jdbcType="VARCHAR" property="filePath" />
12 - <result column="FILE_TYPE_ID" jdbcType="NUMERIC" property="fileTypeId" /> 12 + <result column="FILE_TYPE_CODE" jdbcType="VARCHAR" property="fileTypeCode" />
13 <result column="FILE_TYPE_NAME" jdbcType="VARCHAR" property="fileTypeName" /> 13 <result column="FILE_TYPE_NAME" jdbcType="VARCHAR" property="fileTypeName" />
14 <result column="STATUS" jdbcType="NUMERIC" property="status" /> 14 <result column="STATUS" jdbcType="NUMERIC" property="status" />
15 <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" /> 15 <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
19 <result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" /> 19 <result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" />
20 <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" /> 20 <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" />
21 <result column="UPLOAD_RECORD_ID" jdbcType="NUMERIC" property="uploadRecordId" /> 21 <result column="UPLOAD_RECORD_ID" jdbcType="NUMERIC" property="uploadRecordId" />
22 + <result column="FILE_SIZE" jdbcType="NUMERIC" property="fileSize" />
22 </resultMap> 23 </resultMap>
23 <sql id="Example_Where_Clause"> 24 <sql id="Example_Where_Clause">
24 <where> 25 <where>
...@@ -79,9 +80,9 @@ ...@@ -79,9 +80,9 @@
79 </where> 80 </where>
80 </sql> 81 </sql>
81 <sql id="Base_Column_List"> 82 <sql id="Base_Column_List">
82 - ID, BIZ_ID, BIZ_TYPE_ID, BIZ_TYPE_NAME, SOURCE_FILE_NAME, FILE_NAME, FILE_PATH, FILE_TYPE_ID, 83 + ID, BIZ_ID, BIZ_TYPE_CODE, BIZ_TYPE_NAME, SOURCE_FILE_NAME, FILE_NAME, FILE_PATH,
83 - FILE_TYPE_NAME, STATUS, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, 84 + FILE_TYPE_CODE, FILE_TYPE_NAME, STATUS, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME,
84 - MODIFY_USER_ID, MODIFY_USER_NAME, UPLOAD_RECORD_ID 85 + MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME, UPLOAD_RECORD_ID, FILE_SIZE
85 </sql> 86 </sql>
86 <select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.AttachmentExample" resultMap="BaseResultMap"> 87 <select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.AttachmentExample" resultMap="BaseResultMap">
87 <include refid="OracleDialectPrefix" /> 88 <include refid="OracleDialectPrefix" />
...@@ -120,18 +121,20 @@ ...@@ -120,18 +121,20 @@
120 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 121 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
121 SELECT SEQ_T_BIZ_ATTACHMENT.NEXTVAL FROM DUAL 122 SELECT SEQ_T_BIZ_ATTACHMENT.NEXTVAL FROM DUAL
122 </selectKey> 123 </selectKey>
123 - insert into T_BIZ_ATTACHMENT (ID, BIZ_ID, BIZ_TYPE_ID, 124 + insert into T_BIZ_ATTACHMENT (ID, BIZ_ID, BIZ_TYPE_CODE,
124 BIZ_TYPE_NAME, SOURCE_FILE_NAME, FILE_NAME, 125 BIZ_TYPE_NAME, SOURCE_FILE_NAME, FILE_NAME,
125 - FILE_PATH, FILE_TYPE_ID, FILE_TYPE_NAME, 126 + FILE_PATH, FILE_TYPE_CODE, FILE_TYPE_NAME,
126 STATUS, CREATE_TIME, CREATE_USER_ID, 127 STATUS, CREATE_TIME, CREATE_USER_ID,
127 CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, 128 CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID,
128 - MODIFY_USER_NAME, UPLOAD_RECORD_ID) 129 + MODIFY_USER_NAME, UPLOAD_RECORD_ID, FILE_SIZE
129 - values (#{id,jdbcType=NUMERIC}, #{bizId,jdbcType=NUMERIC}, #{bizTypeId,jdbcType=NUMERIC}, 130 + )
131 + values (#{id,jdbcType=NUMERIC}, #{bizId,jdbcType=NUMERIC}, #{bizTypeCode,jdbcType=VARCHAR},
130 #{bizTypeName,jdbcType=VARCHAR}, #{sourceFileName,jdbcType=VARCHAR}, #{fileName,jdbcType=VARCHAR}, 132 #{bizTypeName,jdbcType=VARCHAR}, #{sourceFileName,jdbcType=VARCHAR}, #{fileName,jdbcType=VARCHAR},
131 - #{filePath,jdbcType=VARCHAR}, #{fileTypeId,jdbcType=NUMERIC}, #{fileTypeName,jdbcType=VARCHAR}, 133 + #{filePath,jdbcType=VARCHAR}, #{fileTypeCode,jdbcType=VARCHAR}, #{fileTypeName,jdbcType=VARCHAR},
132 #{status,jdbcType=NUMERIC}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, 134 #{status,jdbcType=NUMERIC}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC},
133 #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, 135 #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC},
134 - #{modifyUserName,jdbcType=VARCHAR}, #{uploadRecordId,jdbcType=NUMERIC}) 136 + #{modifyUserName,jdbcType=VARCHAR}, #{uploadRecordId,jdbcType=NUMERIC}, #{fileSize,jdbcType=NUMERIC}
137 + )
135 </insert> 138 </insert>
136 <insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.Attachment"> 139 <insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.Attachment">
137 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 140 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
...@@ -143,8 +146,8 @@ ...@@ -143,8 +146,8 @@
143 <if test="bizId != null"> 146 <if test="bizId != null">
144 BIZ_ID, 147 BIZ_ID,
145 </if> 148 </if>
146 - <if test="bizTypeId != null"> 149 + <if test="bizTypeCode != null">
147 - BIZ_TYPE_ID, 150 + BIZ_TYPE_CODE,
148 </if> 151 </if>
149 <if test="bizTypeName != null"> 152 <if test="bizTypeName != null">
150 BIZ_TYPE_NAME, 153 BIZ_TYPE_NAME,
...@@ -158,8 +161,8 @@ ...@@ -158,8 +161,8 @@
158 <if test="filePath != null"> 161 <if test="filePath != null">
159 FILE_PATH, 162 FILE_PATH,
160 </if> 163 </if>
161 - <if test="fileTypeId != null"> 164 + <if test="fileTypeCode != null">
162 - FILE_TYPE_ID, 165 + FILE_TYPE_CODE,
163 </if> 166 </if>
164 <if test="fileTypeName != null"> 167 <if test="fileTypeName != null">
165 FILE_TYPE_NAME, 168 FILE_TYPE_NAME,
...@@ -188,14 +191,17 @@ ...@@ -188,14 +191,17 @@
188 <if test="uploadRecordId != null"> 191 <if test="uploadRecordId != null">
189 UPLOAD_RECORD_ID, 192 UPLOAD_RECORD_ID,
190 </if> 193 </if>
194 + <if test="fileSize != null">
195 + FILE_SIZE,
196 + </if>
191 </trim> 197 </trim>
192 <trim prefix="values (" suffix=")" suffixOverrides=","> 198 <trim prefix="values (" suffix=")" suffixOverrides=",">
193 #{id,jdbcType=NUMERIC}, 199 #{id,jdbcType=NUMERIC},
194 <if test="bizId != null"> 200 <if test="bizId != null">
195 #{bizId,jdbcType=NUMERIC}, 201 #{bizId,jdbcType=NUMERIC},
196 </if> 202 </if>
197 - <if test="bizTypeId != null"> 203 + <if test="bizTypeCode != null">
198 - #{bizTypeId,jdbcType=NUMERIC}, 204 + #{bizTypeCode,jdbcType=VARCHAR},
199 </if> 205 </if>
200 <if test="bizTypeName != null"> 206 <if test="bizTypeName != null">
201 #{bizTypeName,jdbcType=VARCHAR}, 207 #{bizTypeName,jdbcType=VARCHAR},
...@@ -209,8 +215,8 @@ ...@@ -209,8 +215,8 @@
209 <if test="filePath != null"> 215 <if test="filePath != null">
210 #{filePath,jdbcType=VARCHAR}, 216 #{filePath,jdbcType=VARCHAR},
211 </if> 217 </if>
212 - <if test="fileTypeId != null"> 218 + <if test="fileTypeCode != null">
213 - #{fileTypeId,jdbcType=NUMERIC}, 219 + #{fileTypeCode,jdbcType=VARCHAR},
214 </if> 220 </if>
215 <if test="fileTypeName != null"> 221 <if test="fileTypeName != null">
216 #{fileTypeName,jdbcType=VARCHAR}, 222 #{fileTypeName,jdbcType=VARCHAR},
...@@ -239,6 +245,9 @@ ...@@ -239,6 +245,9 @@
239 <if test="uploadRecordId != null"> 245 <if test="uploadRecordId != null">
240 #{uploadRecordId,jdbcType=NUMERIC}, 246 #{uploadRecordId,jdbcType=NUMERIC},
241 </if> 247 </if>
248 + <if test="fileSize != null">
249 + #{fileSize,jdbcType=NUMERIC},
250 + </if>
242 </trim> 251 </trim>
243 </insert> 252 </insert>
244 <select id="countByExample" parameterType="com.fedex.connect.common.model.biz.AttachmentExample" resultType="java.lang.Long"> 253 <select id="countByExample" parameterType="com.fedex.connect.common.model.biz.AttachmentExample" resultType="java.lang.Long">
...@@ -256,8 +265,8 @@ ...@@ -256,8 +265,8 @@
256 <if test="record.bizId != null"> 265 <if test="record.bizId != null">
257 BIZ_ID = #{record.bizId,jdbcType=NUMERIC}, 266 BIZ_ID = #{record.bizId,jdbcType=NUMERIC},
258 </if> 267 </if>
259 - <if test="record.bizTypeId != null"> 268 + <if test="record.bizTypeCode != null">
260 - BIZ_TYPE_ID = #{record.bizTypeId,jdbcType=NUMERIC}, 269 + BIZ_TYPE_CODE = #{record.bizTypeCode,jdbcType=VARCHAR},
261 </if> 270 </if>
262 <if test="record.bizTypeName != null"> 271 <if test="record.bizTypeName != null">
263 BIZ_TYPE_NAME = #{record.bizTypeName,jdbcType=VARCHAR}, 272 BIZ_TYPE_NAME = #{record.bizTypeName,jdbcType=VARCHAR},
...@@ -271,8 +280,8 @@ ...@@ -271,8 +280,8 @@
271 <if test="record.filePath != null"> 280 <if test="record.filePath != null">
272 FILE_PATH = #{record.filePath,jdbcType=VARCHAR}, 281 FILE_PATH = #{record.filePath,jdbcType=VARCHAR},
273 </if> 282 </if>
274 - <if test="record.fileTypeId != null"> 283 + <if test="record.fileTypeCode != null">
275 - FILE_TYPE_ID = #{record.fileTypeId,jdbcType=NUMERIC}, 284 + FILE_TYPE_CODE = #{record.fileTypeCode,jdbcType=VARCHAR},
276 </if> 285 </if>
277 <if test="record.fileTypeName != null"> 286 <if test="record.fileTypeName != null">
278 FILE_TYPE_NAME = #{record.fileTypeName,jdbcType=VARCHAR}, 287 FILE_TYPE_NAME = #{record.fileTypeName,jdbcType=VARCHAR},
...@@ -301,6 +310,9 @@ ...@@ -301,6 +310,9 @@
301 <if test="record.uploadRecordId != null"> 310 <if test="record.uploadRecordId != null">
302 UPLOAD_RECORD_ID = #{record.uploadRecordId,jdbcType=NUMERIC}, 311 UPLOAD_RECORD_ID = #{record.uploadRecordId,jdbcType=NUMERIC},
303 </if> 312 </if>
313 + <if test="record.fileSize != null">
314 + FILE_SIZE = #{record.fileSize,jdbcType=NUMERIC},
315 + </if>
304 </set> 316 </set>
305 <if test="_parameter != null"> 317 <if test="_parameter != null">
306 <include refid="Update_By_Example_Where_Clause" /> 318 <include refid="Update_By_Example_Where_Clause" />
...@@ -310,12 +322,12 @@ ...@@ -310,12 +322,12 @@
310 update T_BIZ_ATTACHMENT 322 update T_BIZ_ATTACHMENT
311 set ID = #{record.id,jdbcType=NUMERIC}, 323 set ID = #{record.id,jdbcType=NUMERIC},
312 BIZ_ID = #{record.bizId,jdbcType=NUMERIC}, 324 BIZ_ID = #{record.bizId,jdbcType=NUMERIC},
313 - BIZ_TYPE_ID = #{record.bizTypeId,jdbcType=NUMERIC}, 325 + BIZ_TYPE_CODE = #{record.bizTypeCode,jdbcType=VARCHAR},
314 BIZ_TYPE_NAME = #{record.bizTypeName,jdbcType=VARCHAR}, 326 BIZ_TYPE_NAME = #{record.bizTypeName,jdbcType=VARCHAR},
315 SOURCE_FILE_NAME = #{record.sourceFileName,jdbcType=VARCHAR}, 327 SOURCE_FILE_NAME = #{record.sourceFileName,jdbcType=VARCHAR},
316 FILE_NAME = #{record.fileName,jdbcType=VARCHAR}, 328 FILE_NAME = #{record.fileName,jdbcType=VARCHAR},
317 FILE_PATH = #{record.filePath,jdbcType=VARCHAR}, 329 FILE_PATH = #{record.filePath,jdbcType=VARCHAR},
318 - FILE_TYPE_ID = #{record.fileTypeId,jdbcType=NUMERIC}, 330 + FILE_TYPE_CODE = #{record.fileTypeCode,jdbcType=VARCHAR},
319 FILE_TYPE_NAME = #{record.fileTypeName,jdbcType=VARCHAR}, 331 FILE_TYPE_NAME = #{record.fileTypeName,jdbcType=VARCHAR},
320 STATUS = #{record.status,jdbcType=NUMERIC}, 332 STATUS = #{record.status,jdbcType=NUMERIC},
321 CREATE_TIME = #{record.createTime,jdbcType=TIMESTAMP}, 333 CREATE_TIME = #{record.createTime,jdbcType=TIMESTAMP},
...@@ -324,7 +336,8 @@ ...@@ -324,7 +336,8 @@
324 MODIFY_TIME = #{record.modifyTime,jdbcType=TIMESTAMP}, 336 MODIFY_TIME = #{record.modifyTime,jdbcType=TIMESTAMP},
325 MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC}, 337 MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC},
326 MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR}, 338 MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
327 - UPLOAD_RECORD_ID = #{record.uploadRecordId,jdbcType=NUMERIC} 339 + UPLOAD_RECORD_ID = #{record.uploadRecordId,jdbcType=NUMERIC},
340 + FILE_SIZE = #{record.fileSize,jdbcType=NUMERIC}
328 <if test="_parameter != null"> 341 <if test="_parameter != null">
329 <include refid="Update_By_Example_Where_Clause" /> 342 <include refid="Update_By_Example_Where_Clause" />
330 </if> 343 </if>
...@@ -335,8 +348,8 @@ ...@@ -335,8 +348,8 @@
335 <if test="bizId != null"> 348 <if test="bizId != null">
336 BIZ_ID = #{bizId,jdbcType=NUMERIC}, 349 BIZ_ID = #{bizId,jdbcType=NUMERIC},
337 </if> 350 </if>
338 - <if test="bizTypeId != null"> 351 + <if test="bizTypeCode != null">
339 - BIZ_TYPE_ID = #{bizTypeId,jdbcType=NUMERIC}, 352 + BIZ_TYPE_CODE = #{bizTypeCode,jdbcType=VARCHAR},
340 </if> 353 </if>
341 <if test="bizTypeName != null"> 354 <if test="bizTypeName != null">
342 BIZ_TYPE_NAME = #{bizTypeName,jdbcType=VARCHAR}, 355 BIZ_TYPE_NAME = #{bizTypeName,jdbcType=VARCHAR},
...@@ -350,8 +363,8 @@ ...@@ -350,8 +363,8 @@
350 <if test="filePath != null"> 363 <if test="filePath != null">
351 FILE_PATH = #{filePath,jdbcType=VARCHAR}, 364 FILE_PATH = #{filePath,jdbcType=VARCHAR},
352 </if> 365 </if>
353 - <if test="fileTypeId != null"> 366 + <if test="fileTypeCode != null">
354 - FILE_TYPE_ID = #{fileTypeId,jdbcType=NUMERIC}, 367 + FILE_TYPE_CODE = #{fileTypeCode,jdbcType=VARCHAR},
355 </if> 368 </if>
356 <if test="fileTypeName != null"> 369 <if test="fileTypeName != null">
357 FILE_TYPE_NAME = #{fileTypeName,jdbcType=VARCHAR}, 370 FILE_TYPE_NAME = #{fileTypeName,jdbcType=VARCHAR},
...@@ -380,18 +393,21 @@ ...@@ -380,18 +393,21 @@
380 <if test="uploadRecordId != null"> 393 <if test="uploadRecordId != null">
381 UPLOAD_RECORD_ID = #{uploadRecordId,jdbcType=NUMERIC}, 394 UPLOAD_RECORD_ID = #{uploadRecordId,jdbcType=NUMERIC},
382 </if> 395 </if>
396 + <if test="fileSize != null">
397 + FILE_SIZE = #{fileSize,jdbcType=NUMERIC},
398 + </if>
383 </set> 399 </set>
384 where ID = #{id,jdbcType=NUMERIC} 400 where ID = #{id,jdbcType=NUMERIC}
385 </update> 401 </update>
386 <update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.biz.Attachment"> 402 <update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.biz.Attachment">
387 update T_BIZ_ATTACHMENT 403 update T_BIZ_ATTACHMENT
388 set BIZ_ID = #{bizId,jdbcType=NUMERIC}, 404 set BIZ_ID = #{bizId,jdbcType=NUMERIC},
389 - BIZ_TYPE_ID = #{bizTypeId,jdbcType=NUMERIC}, 405 + BIZ_TYPE_CODE = #{bizTypeCode,jdbcType=VARCHAR},
390 BIZ_TYPE_NAME = #{bizTypeName,jdbcType=VARCHAR}, 406 BIZ_TYPE_NAME = #{bizTypeName,jdbcType=VARCHAR},
391 SOURCE_FILE_NAME = #{sourceFileName,jdbcType=VARCHAR}, 407 SOURCE_FILE_NAME = #{sourceFileName,jdbcType=VARCHAR},
392 FILE_NAME = #{fileName,jdbcType=VARCHAR}, 408 FILE_NAME = #{fileName,jdbcType=VARCHAR},
393 FILE_PATH = #{filePath,jdbcType=VARCHAR}, 409 FILE_PATH = #{filePath,jdbcType=VARCHAR},
394 - FILE_TYPE_ID = #{fileTypeId,jdbcType=NUMERIC}, 410 + FILE_TYPE_CODE = #{fileTypeCode,jdbcType=VARCHAR},
395 FILE_TYPE_NAME = #{fileTypeName,jdbcType=VARCHAR}, 411 FILE_TYPE_NAME = #{fileTypeName,jdbcType=VARCHAR},
396 STATUS = #{status,jdbcType=NUMERIC}, 412 STATUS = #{status,jdbcType=NUMERIC},
397 CREATE_TIME = #{createTime,jdbcType=TIMESTAMP}, 413 CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
...@@ -400,7 +416,8 @@ ...@@ -400,7 +416,8 @@
400 MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP}, 416 MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP},
401 MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC}, 417 MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC},
402 MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR}, 418 MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
403 - UPLOAD_RECORD_ID = #{uploadRecordId,jdbcType=NUMERIC} 419 + UPLOAD_RECORD_ID = #{uploadRecordId,jdbcType=NUMERIC},
420 + FILE_SIZE = #{fileSize,jdbcType=NUMERIC}
404 where ID = #{id,jdbcType=NUMERIC} 421 where ID = #{id,jdbcType=NUMERIC}
405 </update> 422 </update>
406 <sql id="OracleDialectPrefix"> 423 <sql id="OracleDialectPrefix">
......
...@@ -6,8 +6,6 @@ ...@@ -6,8 +6,6 @@
6 <result column="CONSIGNMENT_CODE" jdbcType="VARCHAR" property="consignmentCode" /> 6 <result column="CONSIGNMENT_CODE" jdbcType="VARCHAR" property="consignmentCode" />
7 <result column="SEND_TIME" jdbcType="TIMESTAMP" property="sendTime" /> 7 <result column="SEND_TIME" jdbcType="TIMESTAMP" property="sendTime" />
8 <result column="SHIP_DATE" jdbcType="TIMESTAMP" property="shipDate" /> 8 <result column="SHIP_DATE" jdbcType="TIMESTAMP" property="shipDate" />
9 - <result column="SHIPPER_COUNTRY" jdbcType="VARCHAR" property="shipperCountry" />
10 - <result column="RECIPIENT_COUNTRY" jdbcType="VARCHAR" property="recipientCountry" />
11 <result column="DEST_IATA_CODE" jdbcType="VARCHAR" property="destIataCode" /> 9 <result column="DEST_IATA_CODE" jdbcType="VARCHAR" property="destIataCode" />
12 <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" /> 10 <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
13 <result column="CREATE_USER_ID" jdbcType="NUMERIC" property="createUserId" /> 11 <result column="CREATE_USER_ID" jdbcType="NUMERIC" property="createUserId" />
...@@ -15,8 +13,6 @@ ...@@ -15,8 +13,6 @@
15 <result column="MODIFY_TIME" jdbcType="TIMESTAMP" property="modifyTime" /> 13 <result column="MODIFY_TIME" jdbcType="TIMESTAMP" property="modifyTime" />
16 <result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" /> 14 <result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" />
17 <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" /> 15 <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" />
18 - <result column="ORIGIN_COUNTRY" jdbcType="VARCHAR" property="originCountry" />
19 - <result column="DESTINATION_COUNTRY" jdbcType="VARCHAR" property="destinationCountry" />
20 <result column="CUSTOMS_CURRENCY" jdbcType="VARCHAR" property="customsCurrency" /> 16 <result column="CUSTOMS_CURRENCY" jdbcType="VARCHAR" property="customsCurrency" />
21 <result column="CUSTOMS_VALUE" jdbcType="NUMERIC" property="customsValue" /> 17 <result column="CUSTOMS_VALUE" jdbcType="NUMERIC" property="customsValue" />
22 <result column="WEIGHT" jdbcType="NUMERIC" property="weight" /> 18 <result column="WEIGHT" jdbcType="NUMERIC" property="weight" />
...@@ -39,6 +35,10 @@ ...@@ -39,6 +35,10 @@
39 <result column="RECIPIENT_CITY" jdbcType="VARCHAR" property="recipientCity" /> 35 <result column="RECIPIENT_CITY" jdbcType="VARCHAR" property="recipientCity" />
40 <result column="RECIPIENT_POSTAL_CODE" jdbcType="VARCHAR" property="recipientPostalCode" /> 36 <result column="RECIPIENT_POSTAL_CODE" jdbcType="VARCHAR" property="recipientPostalCode" />
41 <result column="DOC_NONDOC_FLAG" jdbcType="VARCHAR" property="docNondocFlag" /> 37 <result column="DOC_NONDOC_FLAG" jdbcType="VARCHAR" property="docNondocFlag" />
38 + <result column="USER_UUID" jdbcType="VARCHAR" property="userUuid" />
39 + <result column="SHIPPER_EMAIL" jdbcType="VARCHAR" property="shipperEmail" />
40 + <result column="SHIPPER_COUNTRY" jdbcType="VARCHAR" property="shipperCountry" />
41 + <result column="RECIPIENT_COUNTRY" jdbcType="VARCHAR" property="recipientCountry" />
42 </resultMap> 42 </resultMap>
43 <sql id="Example_Where_Clause"> 43 <sql id="Example_Where_Clause">
44 <where> 44 <where>
...@@ -99,13 +99,14 @@ ...@@ -99,13 +99,14 @@
99 </where> 99 </where>
100 </sql> 100 </sql>
101 <sql id="Base_Column_List"> 101 <sql id="Base_Column_List">
102 - ID, CONSIGNMENT_CODE, SEND_TIME, SHIP_DATE, SHIPPER_COUNTRY, RECIPIENT_COUNTRY, DEST_IATA_CODE, 102 + ID, CONSIGNMENT_CODE, SEND_TIME, SHIP_DATE, DEST_IATA_CODE, CREATE_TIME, CREATE_USER_ID,
103 - CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME, 103 + CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME, CUSTOMS_CURRENCY,
104 - ORIGIN_COUNTRY, DESTINATION_COUNTRY, CUSTOMS_CURRENCY, CUSTOMS_VALUE, WEIGHT, WEIGHTUNIT, 104 + CUSTOMS_VALUE, WEIGHT, WEIGHTUNIT, SCANDATE, SHIPPER_CONTACT_NAME, SHIPPER_PHONE,
105 - SCANDATE, SHIPPER_CONTACT_NAME, SHIPPER_PHONE, SHIPPER_ACCOUNT, SHIPPER_COMPANY, 105 + SHIPPER_ACCOUNT, SHIPPER_COMPANY, SHIPPER_ADDR_LINE1, SHIPPER_ADDR_LINE2, SHIPPER_CITY,
106 - SHIPPER_ADDR_LINE1, SHIPPER_ADDR_LINE2, SHIPPER_CITY, SHIPPER_POSTAL_CODE, RECIPIENT_CONTACT_NAME, 106 + SHIPPER_POSTAL_CODE, RECIPIENT_CONTACT_NAME, RECIPIENT_PHONE, RECIPIENT_COMPANY,
107 - RECIPIENT_PHONE, RECIPIENT_COMPANY, RECIPIENT_ADDR_LINE1, RECIPIENT_ADDR_LINE2, RECIPIENT_ADDR_LINE3, 107 + RECIPIENT_ADDR_LINE1, RECIPIENT_ADDR_LINE2, RECIPIENT_ADDR_LINE3, RECIPIENT_CITY,
108 - RECIPIENT_CITY, RECIPIENT_POSTAL_CODE, DOC_NONDOC_FLAG 108 + RECIPIENT_POSTAL_CODE, DOC_NONDOC_FLAG, USER_UUID, SHIPPER_EMAIL, SHIPPER_COUNTRY,
109 + RECIPIENT_COUNTRY
109 </sql> 110 </sql>
110 <select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.CeInfoExample" resultMap="BaseResultMap"> 111 <select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.CeInfoExample" resultMap="BaseResultMap">
111 <include refid="OracleDialectPrefix" /> 112 <include refid="OracleDialectPrefix" />
...@@ -145,33 +146,31 @@ ...@@ -145,33 +146,31 @@
145 SELECT SEQ_T_BIZ_CE_INFO.NEXTVAL FROM DUAL 146 SELECT SEQ_T_BIZ_CE_INFO.NEXTVAL FROM DUAL
146 </selectKey> 147 </selectKey>
147 insert into ICLEARIMP.T_BIZ_CE_INFO (ID, CONSIGNMENT_CODE, SEND_TIME, 148 insert into ICLEARIMP.T_BIZ_CE_INFO (ID, CONSIGNMENT_CODE, SEND_TIME,
148 - SHIP_DATE, SHIPPER_COUNTRY, RECIPIENT_COUNTRY, 149 + SHIP_DATE, DEST_IATA_CODE, CREATE_TIME,
149 - DEST_IATA_CODE, CREATE_TIME, CREATE_USER_ID, 150 + CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME,
150 - CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, 151 + MODIFY_USER_ID, MODIFY_USER_NAME, CUSTOMS_CURRENCY,
151 - MODIFY_USER_NAME, ORIGIN_COUNTRY, DESTINATION_COUNTRY, 152 + CUSTOMS_VALUE, WEIGHT, WEIGHTUNIT,
152 - CUSTOMS_CURRENCY, CUSTOMS_VALUE, WEIGHT, 153 + SCANDATE, SHIPPER_CONTACT_NAME, SHIPPER_PHONE,
153 - WEIGHTUNIT, SCANDATE, SHIPPER_CONTACT_NAME, 154 + SHIPPER_ACCOUNT, SHIPPER_COMPANY, SHIPPER_ADDR_LINE1,
154 - SHIPPER_PHONE, SHIPPER_ACCOUNT, SHIPPER_COMPANY, 155 + SHIPPER_ADDR_LINE2, SHIPPER_CITY, SHIPPER_POSTAL_CODE,
155 - SHIPPER_ADDR_LINE1, SHIPPER_ADDR_LINE2, SHIPPER_CITY, 156 + RECIPIENT_CONTACT_NAME, RECIPIENT_PHONE, RECIPIENT_COMPANY,
156 - SHIPPER_POSTAL_CODE, RECIPIENT_CONTACT_NAME, 157 + RECIPIENT_ADDR_LINE1, RECIPIENT_ADDR_LINE2,
157 - RECIPIENT_PHONE, RECIPIENT_COMPANY, RECIPIENT_ADDR_LINE1, 158 + RECIPIENT_ADDR_LINE3, RECIPIENT_CITY, RECIPIENT_POSTAL_CODE,
158 - RECIPIENT_ADDR_LINE2, RECIPIENT_ADDR_LINE3, 159 + DOC_NONDOC_FLAG, USER_UUID, SHIPPER_EMAIL,
159 - RECIPIENT_CITY, RECIPIENT_POSTAL_CODE, DOC_NONDOC_FLAG 160 + SHIPPER_COUNTRY, RECIPIENT_COUNTRY)
160 - )
161 values (#{id,jdbcType=NUMERIC}, #{consignmentCode,jdbcType=VARCHAR}, #{sendTime,jdbcType=TIMESTAMP}, 161 values (#{id,jdbcType=NUMERIC}, #{consignmentCode,jdbcType=VARCHAR}, #{sendTime,jdbcType=TIMESTAMP},
162 - #{shipDate,jdbcType=TIMESTAMP}, #{shipperCountry,jdbcType=VARCHAR}, #{recipientCountry,jdbcType=VARCHAR}, 162 + #{shipDate,jdbcType=TIMESTAMP}, #{destIataCode,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
163 - #{destIataCode,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, 163 + #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP},
164 - #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, 164 + #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR}, #{customsCurrency,jdbcType=VARCHAR},
165 - #{modifyUserName,jdbcType=VARCHAR}, #{originCountry,jdbcType=VARCHAR}, #{destinationCountry,jdbcType=VARCHAR}, 165 + #{customsValue,jdbcType=NUMERIC}, #{weight,jdbcType=NUMERIC}, #{weightunit,jdbcType=VARCHAR},
166 - #{customsCurrency,jdbcType=VARCHAR}, #{customsValue,jdbcType=NUMERIC}, #{weight,jdbcType=NUMERIC}, 166 + #{scandate,jdbcType=TIMESTAMP}, #{shipperContactName,jdbcType=VARCHAR}, #{shipperPhone,jdbcType=VARCHAR},
167 - #{weightunit,jdbcType=VARCHAR}, #{scandate,jdbcType=TIMESTAMP}, #{shipperContactName,jdbcType=VARCHAR}, 167 + #{shipperAccount,jdbcType=VARCHAR}, #{shipperCompany,jdbcType=VARCHAR}, #{shipperAddrLine1,jdbcType=VARCHAR},
168 - #{shipperPhone,jdbcType=VARCHAR}, #{shipperAccount,jdbcType=VARCHAR}, #{shipperCompany,jdbcType=VARCHAR}, 168 + #{shipperAddrLine2,jdbcType=VARCHAR}, #{shipperCity,jdbcType=VARCHAR}, #{shipperPostalCode,jdbcType=VARCHAR},
169 - #{shipperAddrLine1,jdbcType=VARCHAR}, #{shipperAddrLine2,jdbcType=VARCHAR}, #{shipperCity,jdbcType=VARCHAR}, 169 + #{recipientContactName,jdbcType=VARCHAR}, #{recipientPhone,jdbcType=VARCHAR}, #{recipientCompany,jdbcType=VARCHAR},
170 - #{shipperPostalCode,jdbcType=VARCHAR}, #{recipientContactName,jdbcType=VARCHAR}, 170 + #{recipientAddrLine1,jdbcType=VARCHAR}, #{recipientAddrLine2,jdbcType=VARCHAR},
171 - #{recipientPhone,jdbcType=VARCHAR}, #{recipientCompany,jdbcType=VARCHAR}, #{recipientAddrLine1,jdbcType=VARCHAR}, 171 + #{recipientAddrLine3,jdbcType=VARCHAR}, #{recipientCity,jdbcType=VARCHAR}, #{recipientPostalCode,jdbcType=VARCHAR},
172 - #{recipientAddrLine2,jdbcType=VARCHAR}, #{recipientAddrLine3,jdbcType=VARCHAR}, 172 + #{docNondocFlag,jdbcType=VARCHAR}, #{userUuid,jdbcType=VARCHAR}, #{shipperEmail,jdbcType=VARCHAR},
173 - #{recipientCity,jdbcType=VARCHAR}, #{recipientPostalCode,jdbcType=VARCHAR}, #{docNondocFlag,jdbcType=VARCHAR} 173 + #{shipperCountry,jdbcType=VARCHAR}, #{recipientCountry,jdbcType=VARCHAR})
174 - )
175 </insert> 174 </insert>
176 <insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.CeInfo"> 175 <insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.CeInfo">
177 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 176 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
...@@ -189,12 +188,6 @@ ...@@ -189,12 +188,6 @@
189 <if test="shipDate != null"> 188 <if test="shipDate != null">
190 SHIP_DATE, 189 SHIP_DATE,
191 </if> 190 </if>
192 - <if test="shipperCountry != null">
193 - SHIPPER_COUNTRY,
194 - </if>
195 - <if test="recipientCountry != null">
196 - RECIPIENT_COUNTRY,
197 - </if>
198 <if test="destIataCode != null"> 191 <if test="destIataCode != null">
199 DEST_IATA_CODE, 192 DEST_IATA_CODE,
200 </if> 193 </if>
...@@ -216,12 +209,6 @@ ...@@ -216,12 +209,6 @@
216 <if test="modifyUserName != null"> 209 <if test="modifyUserName != null">
217 MODIFY_USER_NAME, 210 MODIFY_USER_NAME,
218 </if> 211 </if>
219 - <if test="originCountry != null">
220 - ORIGIN_COUNTRY,
221 - </if>
222 - <if test="destinationCountry != null">
223 - DESTINATION_COUNTRY,
224 - </if>
225 <if test="customsCurrency != null"> 212 <if test="customsCurrency != null">
226 CUSTOMS_CURRENCY, 213 CUSTOMS_CURRENCY,
227 </if> 214 </if>
...@@ -288,6 +275,18 @@ ...@@ -288,6 +275,18 @@
288 <if test="docNondocFlag != null"> 275 <if test="docNondocFlag != null">
289 DOC_NONDOC_FLAG, 276 DOC_NONDOC_FLAG,
290 </if> 277 </if>
278 + <if test="userUuid != null">
279 + USER_UUID,
280 + </if>
281 + <if test="shipperEmail != null">
282 + SHIPPER_EMAIL,
283 + </if>
284 + <if test="shipperCountry != null">
285 + SHIPPER_COUNTRY,
286 + </if>
287 + <if test="recipientCountry != null">
288 + RECIPIENT_COUNTRY,
289 + </if>
291 </trim> 290 </trim>
292 <trim prefix="values (" suffix=")" suffixOverrides=","> 291 <trim prefix="values (" suffix=")" suffixOverrides=",">
293 #{id,jdbcType=NUMERIC}, 292 #{id,jdbcType=NUMERIC},
...@@ -300,12 +299,6 @@ ...@@ -300,12 +299,6 @@
300 <if test="shipDate != null"> 299 <if test="shipDate != null">
301 #{shipDate,jdbcType=TIMESTAMP}, 300 #{shipDate,jdbcType=TIMESTAMP},
302 </if> 301 </if>
303 - <if test="shipperCountry != null">
304 - #{shipperCountry,jdbcType=VARCHAR},
305 - </if>
306 - <if test="recipientCountry != null">
307 - #{recipientCountry,jdbcType=VARCHAR},
308 - </if>
309 <if test="destIataCode != null"> 302 <if test="destIataCode != null">
310 #{destIataCode,jdbcType=VARCHAR}, 303 #{destIataCode,jdbcType=VARCHAR},
311 </if> 304 </if>
...@@ -327,12 +320,6 @@ ...@@ -327,12 +320,6 @@
327 <if test="modifyUserName != null"> 320 <if test="modifyUserName != null">
328 #{modifyUserName,jdbcType=VARCHAR}, 321 #{modifyUserName,jdbcType=VARCHAR},
329 </if> 322 </if>
330 - <if test="originCountry != null">
331 - #{originCountry,jdbcType=VARCHAR},
332 - </if>
333 - <if test="destinationCountry != null">
334 - #{destinationCountry,jdbcType=VARCHAR},
335 - </if>
336 <if test="customsCurrency != null"> 323 <if test="customsCurrency != null">
337 #{customsCurrency,jdbcType=VARCHAR}, 324 #{customsCurrency,jdbcType=VARCHAR},
338 </if> 325 </if>
...@@ -399,6 +386,18 @@ ...@@ -399,6 +386,18 @@
399 <if test="docNondocFlag != null"> 386 <if test="docNondocFlag != null">
400 #{docNondocFlag,jdbcType=VARCHAR}, 387 #{docNondocFlag,jdbcType=VARCHAR},
401 </if> 388 </if>
389 + <if test="userUuid != null">
390 + #{userUuid,jdbcType=VARCHAR},
391 + </if>
392 + <if test="shipperEmail != null">
393 + #{shipperEmail,jdbcType=VARCHAR},
394 + </if>
395 + <if test="shipperCountry != null">
396 + #{shipperCountry,jdbcType=VARCHAR},
397 + </if>
398 + <if test="recipientCountry != null">
399 + #{recipientCountry,jdbcType=VARCHAR},
400 + </if>
402 </trim> 401 </trim>
403 </insert> 402 </insert>
404 <select id="countByExample" parameterType="com.fedex.connect.common.model.biz.CeInfoExample" resultType="java.lang.Long"> 403 <select id="countByExample" parameterType="com.fedex.connect.common.model.biz.CeInfoExample" resultType="java.lang.Long">
...@@ -422,12 +421,6 @@ ...@@ -422,12 +421,6 @@
422 <if test="record.shipDate != null"> 421 <if test="record.shipDate != null">
423 SHIP_DATE = #{record.shipDate,jdbcType=TIMESTAMP}, 422 SHIP_DATE = #{record.shipDate,jdbcType=TIMESTAMP},
424 </if> 423 </if>
425 - <if test="record.shipperCountry != null">
426 - SHIPPER_COUNTRY = #{record.shipperCountry,jdbcType=VARCHAR},
427 - </if>
428 - <if test="record.recipientCountry != null">
429 - RECIPIENT_COUNTRY = #{record.recipientCountry,jdbcType=VARCHAR},
430 - </if>
431 <if test="record.destIataCode != null"> 424 <if test="record.destIataCode != null">
432 DEST_IATA_CODE = #{record.destIataCode,jdbcType=VARCHAR}, 425 DEST_IATA_CODE = #{record.destIataCode,jdbcType=VARCHAR},
433 </if> 426 </if>
...@@ -449,12 +442,6 @@ ...@@ -449,12 +442,6 @@
449 <if test="record.modifyUserName != null"> 442 <if test="record.modifyUserName != null">
450 MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR}, 443 MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
451 </if> 444 </if>
452 - <if test="record.originCountry != null">
453 - ORIGIN_COUNTRY = #{record.originCountry,jdbcType=VARCHAR},
454 - </if>
455 - <if test="record.destinationCountry != null">
456 - DESTINATION_COUNTRY = #{record.destinationCountry,jdbcType=VARCHAR},
457 - </if>
458 <if test="record.customsCurrency != null"> 445 <if test="record.customsCurrency != null">
459 CUSTOMS_CURRENCY = #{record.customsCurrency,jdbcType=VARCHAR}, 446 CUSTOMS_CURRENCY = #{record.customsCurrency,jdbcType=VARCHAR},
460 </if> 447 </if>
...@@ -521,6 +508,18 @@ ...@@ -521,6 +508,18 @@
521 <if test="record.docNondocFlag != null"> 508 <if test="record.docNondocFlag != null">
522 DOC_NONDOC_FLAG = #{record.docNondocFlag,jdbcType=VARCHAR}, 509 DOC_NONDOC_FLAG = #{record.docNondocFlag,jdbcType=VARCHAR},
523 </if> 510 </if>
511 + <if test="record.userUuid != null">
512 + USER_UUID = #{record.userUuid,jdbcType=VARCHAR},
513 + </if>
514 + <if test="record.shipperEmail != null">
515 + SHIPPER_EMAIL = #{record.shipperEmail,jdbcType=VARCHAR},
516 + </if>
517 + <if test="record.shipperCountry != null">
518 + SHIPPER_COUNTRY = #{record.shipperCountry,jdbcType=VARCHAR},
519 + </if>
520 + <if test="record.recipientCountry != null">
521 + RECIPIENT_COUNTRY = #{record.recipientCountry,jdbcType=VARCHAR},
522 + </if>
524 </set> 523 </set>
525 <if test="_parameter != null"> 524 <if test="_parameter != null">
526 <include refid="Update_By_Example_Where_Clause" /> 525 <include refid="Update_By_Example_Where_Clause" />
...@@ -532,8 +531,6 @@ ...@@ -532,8 +531,6 @@
532 CONSIGNMENT_CODE = #{record.consignmentCode,jdbcType=VARCHAR}, 531 CONSIGNMENT_CODE = #{record.consignmentCode,jdbcType=VARCHAR},
533 SEND_TIME = #{record.sendTime,jdbcType=TIMESTAMP}, 532 SEND_TIME = #{record.sendTime,jdbcType=TIMESTAMP},
534 SHIP_DATE = #{record.shipDate,jdbcType=TIMESTAMP}, 533 SHIP_DATE = #{record.shipDate,jdbcType=TIMESTAMP},
535 - SHIPPER_COUNTRY = #{record.shipperCountry,jdbcType=VARCHAR},
536 - RECIPIENT_COUNTRY = #{record.recipientCountry,jdbcType=VARCHAR},
537 DEST_IATA_CODE = #{record.destIataCode,jdbcType=VARCHAR}, 534 DEST_IATA_CODE = #{record.destIataCode,jdbcType=VARCHAR},
538 CREATE_TIME = #{record.createTime,jdbcType=TIMESTAMP}, 535 CREATE_TIME = #{record.createTime,jdbcType=TIMESTAMP},
539 CREATE_USER_ID = #{record.createUserId,jdbcType=NUMERIC}, 536 CREATE_USER_ID = #{record.createUserId,jdbcType=NUMERIC},
...@@ -541,8 +538,6 @@ ...@@ -541,8 +538,6 @@
541 MODIFY_TIME = #{record.modifyTime,jdbcType=TIMESTAMP}, 538 MODIFY_TIME = #{record.modifyTime,jdbcType=TIMESTAMP},
542 MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC}, 539 MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC},
543 MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR}, 540 MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
544 - ORIGIN_COUNTRY = #{record.originCountry,jdbcType=VARCHAR},
545 - DESTINATION_COUNTRY = #{record.destinationCountry,jdbcType=VARCHAR},
546 CUSTOMS_CURRENCY = #{record.customsCurrency,jdbcType=VARCHAR}, 541 CUSTOMS_CURRENCY = #{record.customsCurrency,jdbcType=VARCHAR},
547 CUSTOMS_VALUE = #{record.customsValue,jdbcType=NUMERIC}, 542 CUSTOMS_VALUE = #{record.customsValue,jdbcType=NUMERIC},
548 WEIGHT = #{record.weight,jdbcType=NUMERIC}, 543 WEIGHT = #{record.weight,jdbcType=NUMERIC},
...@@ -564,7 +559,11 @@ ...@@ -564,7 +559,11 @@
564 RECIPIENT_ADDR_LINE3 = #{record.recipientAddrLine3,jdbcType=VARCHAR}, 559 RECIPIENT_ADDR_LINE3 = #{record.recipientAddrLine3,jdbcType=VARCHAR},
565 RECIPIENT_CITY = #{record.recipientCity,jdbcType=VARCHAR}, 560 RECIPIENT_CITY = #{record.recipientCity,jdbcType=VARCHAR},
566 RECIPIENT_POSTAL_CODE = #{record.recipientPostalCode,jdbcType=VARCHAR}, 561 RECIPIENT_POSTAL_CODE = #{record.recipientPostalCode,jdbcType=VARCHAR},
567 - DOC_NONDOC_FLAG = #{record.docNondocFlag,jdbcType=VARCHAR} 562 + DOC_NONDOC_FLAG = #{record.docNondocFlag,jdbcType=VARCHAR},
563 + USER_UUID = #{record.userUuid,jdbcType=VARCHAR},
564 + SHIPPER_EMAIL = #{record.shipperEmail,jdbcType=VARCHAR},
565 + SHIPPER_COUNTRY = #{record.shipperCountry,jdbcType=VARCHAR},
566 + RECIPIENT_COUNTRY = #{record.recipientCountry,jdbcType=VARCHAR}
568 <if test="_parameter != null"> 567 <if test="_parameter != null">
569 <include refid="Update_By_Example_Where_Clause" /> 568 <include refid="Update_By_Example_Where_Clause" />
570 </if> 569 </if>
...@@ -581,12 +580,6 @@ ...@@ -581,12 +580,6 @@
581 <if test="shipDate != null"> 580 <if test="shipDate != null">
582 SHIP_DATE = #{shipDate,jdbcType=TIMESTAMP}, 581 SHIP_DATE = #{shipDate,jdbcType=TIMESTAMP},
583 </if> 582 </if>
584 - <if test="shipperCountry != null">
585 - SHIPPER_COUNTRY = #{shipperCountry,jdbcType=VARCHAR},
586 - </if>
587 - <if test="recipientCountry != null">
588 - RECIPIENT_COUNTRY = #{recipientCountry,jdbcType=VARCHAR},
589 - </if>
590 <if test="destIataCode != null"> 583 <if test="destIataCode != null">
591 DEST_IATA_CODE = #{destIataCode,jdbcType=VARCHAR}, 584 DEST_IATA_CODE = #{destIataCode,jdbcType=VARCHAR},
592 </if> 585 </if>
...@@ -608,12 +601,6 @@ ...@@ -608,12 +601,6 @@
608 <if test="modifyUserName != null"> 601 <if test="modifyUserName != null">
609 MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR}, 602 MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
610 </if> 603 </if>
611 - <if test="originCountry != null">
612 - ORIGIN_COUNTRY = #{originCountry,jdbcType=VARCHAR},
613 - </if>
614 - <if test="destinationCountry != null">
615 - DESTINATION_COUNTRY = #{destinationCountry,jdbcType=VARCHAR},
616 - </if>
617 <if test="customsCurrency != null"> 604 <if test="customsCurrency != null">
618 CUSTOMS_CURRENCY = #{customsCurrency,jdbcType=VARCHAR}, 605 CUSTOMS_CURRENCY = #{customsCurrency,jdbcType=VARCHAR},
619 </if> 606 </if>
...@@ -680,6 +667,18 @@ ...@@ -680,6 +667,18 @@
680 <if test="docNondocFlag != null"> 667 <if test="docNondocFlag != null">
681 DOC_NONDOC_FLAG = #{docNondocFlag,jdbcType=VARCHAR}, 668 DOC_NONDOC_FLAG = #{docNondocFlag,jdbcType=VARCHAR},
682 </if> 669 </if>
670 + <if test="userUuid != null">
671 + USER_UUID = #{userUuid,jdbcType=VARCHAR},
672 + </if>
673 + <if test="shipperEmail != null">
674 + SHIPPER_EMAIL = #{shipperEmail,jdbcType=VARCHAR},
675 + </if>
676 + <if test="shipperCountry != null">
677 + SHIPPER_COUNTRY = #{shipperCountry,jdbcType=VARCHAR},
678 + </if>
679 + <if test="recipientCountry != null">
680 + RECIPIENT_COUNTRY = #{recipientCountry,jdbcType=VARCHAR},
681 + </if>
683 </set> 682 </set>
684 where ID = #{id,jdbcType=NUMERIC} 683 where ID = #{id,jdbcType=NUMERIC}
685 </update> 684 </update>
...@@ -688,8 +687,6 @@ ...@@ -688,8 +687,6 @@
688 set CONSIGNMENT_CODE = #{consignmentCode,jdbcType=VARCHAR}, 687 set CONSIGNMENT_CODE = #{consignmentCode,jdbcType=VARCHAR},
689 SEND_TIME = #{sendTime,jdbcType=TIMESTAMP}, 688 SEND_TIME = #{sendTime,jdbcType=TIMESTAMP},
690 SHIP_DATE = #{shipDate,jdbcType=TIMESTAMP}, 689 SHIP_DATE = #{shipDate,jdbcType=TIMESTAMP},
691 - SHIPPER_COUNTRY = #{shipperCountry,jdbcType=VARCHAR},
692 - RECIPIENT_COUNTRY = #{recipientCountry,jdbcType=VARCHAR},
693 DEST_IATA_CODE = #{destIataCode,jdbcType=VARCHAR}, 690 DEST_IATA_CODE = #{destIataCode,jdbcType=VARCHAR},
694 CREATE_TIME = #{createTime,jdbcType=TIMESTAMP}, 691 CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
695 CREATE_USER_ID = #{createUserId,jdbcType=NUMERIC}, 692 CREATE_USER_ID = #{createUserId,jdbcType=NUMERIC},
...@@ -697,8 +694,6 @@ ...@@ -697,8 +694,6 @@
697 MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP}, 694 MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP},
698 MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC}, 695 MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC},
699 MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR}, 696 MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
700 - ORIGIN_COUNTRY = #{originCountry,jdbcType=VARCHAR},
701 - DESTINATION_COUNTRY = #{destinationCountry,jdbcType=VARCHAR},
702 CUSTOMS_CURRENCY = #{customsCurrency,jdbcType=VARCHAR}, 697 CUSTOMS_CURRENCY = #{customsCurrency,jdbcType=VARCHAR},
703 CUSTOMS_VALUE = #{customsValue,jdbcType=NUMERIC}, 698 CUSTOMS_VALUE = #{customsValue,jdbcType=NUMERIC},
704 WEIGHT = #{weight,jdbcType=NUMERIC}, 699 WEIGHT = #{weight,jdbcType=NUMERIC},
...@@ -720,7 +715,11 @@ ...@@ -720,7 +715,11 @@
720 RECIPIENT_ADDR_LINE3 = #{recipientAddrLine3,jdbcType=VARCHAR}, 715 RECIPIENT_ADDR_LINE3 = #{recipientAddrLine3,jdbcType=VARCHAR},
721 RECIPIENT_CITY = #{recipientCity,jdbcType=VARCHAR}, 716 RECIPIENT_CITY = #{recipientCity,jdbcType=VARCHAR},
722 RECIPIENT_POSTAL_CODE = #{recipientPostalCode,jdbcType=VARCHAR}, 717 RECIPIENT_POSTAL_CODE = #{recipientPostalCode,jdbcType=VARCHAR},
723 - DOC_NONDOC_FLAG = #{docNondocFlag,jdbcType=VARCHAR} 718 + DOC_NONDOC_FLAG = #{docNondocFlag,jdbcType=VARCHAR},
719 + USER_UUID = #{userUuid,jdbcType=VARCHAR},
720 + SHIPPER_EMAIL = #{shipperEmail,jdbcType=VARCHAR},
721 + SHIPPER_COUNTRY = #{shipperCountry,jdbcType=VARCHAR},
722 + RECIPIENT_COUNTRY = #{recipientCountry,jdbcType=VARCHAR}
724 where ID = #{id,jdbcType=NUMERIC} 723 where ID = #{id,jdbcType=NUMERIC}
725 </update> 724 </update>
726 <sql id="OracleDialectPrefix"> 725 <sql id="OracleDialectPrefix">
......
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
5 <id column="ID" jdbcType="NUMERIC" property="id" /> 5 <id column="ID" jdbcType="NUMERIC" property="id" />
6 <result column="CONSIGNMENT_CODE" jdbcType="VARCHAR" property="consignmentCode" /> 6 <result column="CONSIGNMENT_CODE" jdbcType="VARCHAR" property="consignmentCode" />
7 <result column="SHIP_DATE" jdbcType="TIMESTAMP" property="shipDate" /> 7 <result column="SHIP_DATE" jdbcType="TIMESTAMP" property="shipDate" />
8 - <result column="SHIPPER_COUNTRY" jdbcType="VARCHAR" property="shipperCountry" />
9 - <result column="RECIPIENT_COUNTRY" jdbcType="VARCHAR" property="recipientCountry" />
10 <result column="DEST_IATA_CODE" jdbcType="VARCHAR" property="destIataCode" /> 8 <result column="DEST_IATA_CODE" jdbcType="VARCHAR" property="destIataCode" />
11 <result column="ORIGIN_COUNTRY" jdbcType="VARCHAR" property="originCountry" /> 9 <result column="ORIGIN_COUNTRY" jdbcType="VARCHAR" property="originCountry" />
12 <result column="DESTINATION_COUNTRY" jdbcType="VARCHAR" property="destinationCountry" /> 10 <result column="DESTINATION_COUNTRY" jdbcType="VARCHAR" property="destinationCountry" />
...@@ -44,14 +42,16 @@ ...@@ -44,14 +42,16 @@
44 <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" /> 42 <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" />
45 <result column="CE_INFO_ID" jdbcType="NUMERIC" property="ceInfoId" /> 43 <result column="CE_INFO_ID" jdbcType="NUMERIC" property="ceInfoId" />
46 <result column="RECIPIENT_POSTAL_CODE" jdbcType="VARCHAR" property="recipientPostalCode" /> 44 <result column="RECIPIENT_POSTAL_CODE" jdbcType="VARCHAR" property="recipientPostalCode" />
47 - <result column="STATUS_ID" jdbcType="NUMERIC" property="statusId" /> 45 + <result column="STATUS_CODE" jdbcType="VARCHAR" property="statusCode" />
48 <result column="STATUS_NAME" jdbcType="VARCHAR" property="statusName" /> 46 <result column="STATUS_NAME" jdbcType="VARCHAR" property="statusName" />
49 <result column="DOC_NONDOC_FLAG" jdbcType="VARCHAR" property="docNondocFlag" /> 47 <result column="DOC_NONDOC_FLAG" jdbcType="VARCHAR" property="docNondocFlag" />
50 <result column="USER_UUID" jdbcType="VARCHAR" property="userUuid" /> 48 <result column="USER_UUID" jdbcType="VARCHAR" property="userUuid" />
51 <result column="USER_INPUT_SHIPPER_ACCOUNT" jdbcType="VARCHAR" property="userInputShipperAccount" /> 49 <result column="USER_INPUT_SHIPPER_ACCOUNT" jdbcType="VARCHAR" property="userInputShipperAccount" />
52 - <result column="USER_INPUT_ORIGIN_COUNTRY_ID" jdbcType="NUMERIC" property="userInputOriginCountryId" /> 50 + <result column="USER_INPUT_ORIGIN_COUNTRY_CODE" jdbcType="VARCHAR" property="userInputOriginCountryCode" />
53 <result column="USER_INPUT_ORIGIN_COUNTRY" jdbcType="VARCHAR" property="userInputOriginCountry" /> 51 <result column="USER_INPUT_ORIGIN_COUNTRY" jdbcType="VARCHAR" property="userInputOriginCountry" />
54 - <result column="ORIGIN_COUNTRY_ID" jdbcType="NUMERIC" property="originCountryId" /> 52 + <result column="ORIGIN_COUNTRY_CODE" jdbcType="VARCHAR" property="originCountryCode" />
53 + <result column="SHIPPER_EMAIL" jdbcType="VARCHAR" property="shipperEmail" />
54 + <result column="DESTINATION_COUNTRY_CODE" jdbcType="VARCHAR" property="destinationCountryCode" />
55 </resultMap> 55 </resultMap>
56 <sql id="Example_Where_Clause"> 56 <sql id="Example_Where_Clause">
57 <where> 57 <where>
...@@ -112,16 +112,16 @@ ...@@ -112,16 +112,16 @@
112 </where> 112 </where>
113 </sql> 113 </sql>
114 <sql id="Base_Column_List"> 114 <sql id="Base_Column_List">
115 - ID, CONSIGNMENT_CODE, SHIP_DATE, SHIPPER_COUNTRY, RECIPIENT_COUNTRY, DEST_IATA_CODE, 115 + ID, CONSIGNMENT_CODE, SHIP_DATE, DEST_IATA_CODE, ORIGIN_COUNTRY, DESTINATION_COUNTRY,
116 - ORIGIN_COUNTRY, DESTINATION_COUNTRY, CUSTOMS_CURRENCY, CUSTOMS_VALUE, WEIGHT, WEIGHTUNIT, 116 + CUSTOMS_CURRENCY, CUSTOMS_VALUE, WEIGHT, WEIGHTUNIT, SCANDATE, SHIPPER_CONTACT_NAME,
117 - SCANDATE, SHIPPER_CONTACT_NAME, SHIPPER_PHONE, SHIPPER_ACCOUNT, SHIPPER_COMPANY, 117 + SHIPPER_PHONE, SHIPPER_ACCOUNT, SHIPPER_COMPANY, SHIPPER_ADDR_LINE1, SHIPPER_ADDR_LINE2,
118 - SHIPPER_ADDR_LINE1, SHIPPER_ADDR_LINE2, SHIPPER_CITY, SHIPPER_POSTAL_CODE, RECIPIENT_CONTACT_NAME, 118 + SHIPPER_CITY, SHIPPER_POSTAL_CODE, RECIPIENT_CONTACT_NAME, RECIPIENT_PHONE, RECIPIENT_COMPANY,
119 - RECIPIENT_PHONE, RECIPIENT_COMPANY, RECIPIENT_ADDR_LINE1, RECIPIENT_ADDR_LINE2, RECIPIENT_ADDR_LINE3, 119 + RECIPIENT_ADDR_LINE1, RECIPIENT_ADDR_LINE2, RECIPIENT_ADDR_LINE3, RECIPIENT_CITY,
120 - RECIPIENT_CITY, FIRST_COMMIT_TIME, FIRST_SUBMITTER_ID, FIRST_SUBMITTER, COMMIT_TIME, 120 + FIRST_COMMIT_TIME, FIRST_SUBMITTER_ID, FIRST_SUBMITTER, COMMIT_TIME, SUBMITTER_ID,
121 - SUBMITTER_ID, SUBMITTER, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, 121 + SUBMITTER, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID,
122 - MODIFY_USER_ID, MODIFY_USER_NAME, CE_INFO_ID, RECIPIENT_POSTAL_CODE, STATUS_ID, STATUS_NAME, 122 + MODIFY_USER_NAME, CE_INFO_ID, RECIPIENT_POSTAL_CODE, STATUS_CODE, STATUS_NAME, DOC_NONDOC_FLAG,
123 - DOC_NONDOC_FLAG, USER_UUID, USER_INPUT_SHIPPER_ACCOUNT, USER_INPUT_ORIGIN_COUNTRY_ID, 123 + USER_UUID, USER_INPUT_SHIPPER_ACCOUNT, USER_INPUT_ORIGIN_COUNTRY_CODE, USER_INPUT_ORIGIN_COUNTRY,
124 - USER_INPUT_ORIGIN_COUNTRY, ORIGIN_COUNTRY_ID 124 + ORIGIN_COUNTRY_CODE, SHIPPER_EMAIL, DESTINATION_COUNTRY_CODE
125 </sql> 125 </sql>
126 <select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.ConsignmentExample" resultMap="BaseResultMap"> 126 <select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.ConsignmentExample" resultMap="BaseResultMap">
127 <include refid="OracleDialectPrefix" /> 127 <include refid="OracleDialectPrefix" />
...@@ -161,41 +161,41 @@ ...@@ -161,41 +161,41 @@
161 SELECT SEQ_T_BIZ_CONSIGNMENT.NEXTVAL FROM DUAL 161 SELECT SEQ_T_BIZ_CONSIGNMENT.NEXTVAL FROM DUAL
162 </selectKey> 162 </selectKey>
163 insert into T_BIZ_CONSIGNMENT (ID, CONSIGNMENT_CODE, SHIP_DATE, 163 insert into T_BIZ_CONSIGNMENT (ID, CONSIGNMENT_CODE, SHIP_DATE,
164 - SHIPPER_COUNTRY, RECIPIENT_COUNTRY, DEST_IATA_CODE, 164 + DEST_IATA_CODE, ORIGIN_COUNTRY, DESTINATION_COUNTRY,
165 - ORIGIN_COUNTRY, DESTINATION_COUNTRY, CUSTOMS_CURRENCY, 165 + CUSTOMS_CURRENCY, CUSTOMS_VALUE, WEIGHT,
166 - CUSTOMS_VALUE, WEIGHT, WEIGHTUNIT, 166 + WEIGHTUNIT, SCANDATE, SHIPPER_CONTACT_NAME,
167 - SCANDATE, SHIPPER_CONTACT_NAME, SHIPPER_PHONE, 167 + SHIPPER_PHONE, SHIPPER_ACCOUNT, SHIPPER_COMPANY,
168 - SHIPPER_ACCOUNT, SHIPPER_COMPANY, SHIPPER_ADDR_LINE1, 168 + SHIPPER_ADDR_LINE1, SHIPPER_ADDR_LINE2, SHIPPER_CITY,
169 - SHIPPER_ADDR_LINE2, SHIPPER_CITY, SHIPPER_POSTAL_CODE, 169 + SHIPPER_POSTAL_CODE, RECIPIENT_CONTACT_NAME,
170 - RECIPIENT_CONTACT_NAME, RECIPIENT_PHONE, RECIPIENT_COMPANY, 170 + RECIPIENT_PHONE, RECIPIENT_COMPANY, RECIPIENT_ADDR_LINE1,
171 - RECIPIENT_ADDR_LINE1, RECIPIENT_ADDR_LINE2, 171 + RECIPIENT_ADDR_LINE2, RECIPIENT_ADDR_LINE3,
172 - RECIPIENT_ADDR_LINE3, RECIPIENT_CITY, FIRST_COMMIT_TIME, 172 + RECIPIENT_CITY, FIRST_COMMIT_TIME, FIRST_SUBMITTER_ID,
173 - FIRST_SUBMITTER_ID, FIRST_SUBMITTER, COMMIT_TIME, 173 + FIRST_SUBMITTER, COMMIT_TIME, SUBMITTER_ID,
174 - SUBMITTER_ID, SUBMITTER, CREATE_TIME, 174 + SUBMITTER, CREATE_TIME, CREATE_USER_ID,
175 - CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, 175 + CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID,
176 - MODIFY_USER_ID, MODIFY_USER_NAME, CE_INFO_ID, 176 + MODIFY_USER_NAME, CE_INFO_ID, RECIPIENT_POSTAL_CODE,
177 - RECIPIENT_POSTAL_CODE, STATUS_ID, STATUS_NAME, 177 + STATUS_CODE, STATUS_NAME, DOC_NONDOC_FLAG,
178 - DOC_NONDOC_FLAG, USER_UUID, USER_INPUT_SHIPPER_ACCOUNT, 178 + USER_UUID, USER_INPUT_SHIPPER_ACCOUNT, USER_INPUT_ORIGIN_COUNTRY_CODE,
179 - USER_INPUT_ORIGIN_COUNTRY_ID, USER_INPUT_ORIGIN_COUNTRY, 179 + USER_INPUT_ORIGIN_COUNTRY, ORIGIN_COUNTRY_CODE,
180 - ORIGIN_COUNTRY_ID) 180 + SHIPPER_EMAIL, DESTINATION_COUNTRY_CODE)
181 values (#{id,jdbcType=NUMERIC}, #{consignmentCode,jdbcType=VARCHAR}, #{shipDate,jdbcType=TIMESTAMP}, 181 values (#{id,jdbcType=NUMERIC}, #{consignmentCode,jdbcType=VARCHAR}, #{shipDate,jdbcType=TIMESTAMP},
182 - #{shipperCountry,jdbcType=VARCHAR}, #{recipientCountry,jdbcType=VARCHAR}, #{destIataCode,jdbcType=VARCHAR}, 182 + #{destIataCode,jdbcType=VARCHAR}, #{originCountry,jdbcType=VARCHAR}, #{destinationCountry,jdbcType=VARCHAR},
183 - #{originCountry,jdbcType=VARCHAR}, #{destinationCountry,jdbcType=VARCHAR}, #{customsCurrency,jdbcType=VARCHAR}, 183 + #{customsCurrency,jdbcType=VARCHAR}, #{customsValue,jdbcType=NUMERIC}, #{weight,jdbcType=NUMERIC},
184 - #{customsValue,jdbcType=NUMERIC}, #{weight,jdbcType=NUMERIC}, #{weightunit,jdbcType=VARCHAR}, 184 + #{weightunit,jdbcType=VARCHAR}, #{scandate,jdbcType=TIMESTAMP}, #{shipperContactName,jdbcType=VARCHAR},
185 - #{scandate,jdbcType=TIMESTAMP}, #{shipperContactName,jdbcType=VARCHAR}, #{shipperPhone,jdbcType=VARCHAR}, 185 + #{shipperPhone,jdbcType=VARCHAR}, #{shipperAccount,jdbcType=VARCHAR}, #{shipperCompany,jdbcType=VARCHAR},
186 - #{shipperAccount,jdbcType=VARCHAR}, #{shipperCompany,jdbcType=VARCHAR}, #{shipperAddrLine1,jdbcType=VARCHAR}, 186 + #{shipperAddrLine1,jdbcType=VARCHAR}, #{shipperAddrLine2,jdbcType=VARCHAR}, #{shipperCity,jdbcType=VARCHAR},
187 - #{shipperAddrLine2,jdbcType=VARCHAR}, #{shipperCity,jdbcType=VARCHAR}, #{shipperPostalCode,jdbcType=VARCHAR}, 187 + #{shipperPostalCode,jdbcType=VARCHAR}, #{recipientContactName,jdbcType=VARCHAR},
188 - #{recipientContactName,jdbcType=VARCHAR}, #{recipientPhone,jdbcType=VARCHAR}, #{recipientCompany,jdbcType=VARCHAR}, 188 + #{recipientPhone,jdbcType=VARCHAR}, #{recipientCompany,jdbcType=VARCHAR}, #{recipientAddrLine1,jdbcType=VARCHAR},
189 - #{recipientAddrLine1,jdbcType=VARCHAR}, #{recipientAddrLine2,jdbcType=VARCHAR}, 189 + #{recipientAddrLine2,jdbcType=VARCHAR}, #{recipientAddrLine3,jdbcType=VARCHAR},
190 - #{recipientAddrLine3,jdbcType=VARCHAR}, #{recipientCity,jdbcType=VARCHAR}, #{firstCommitTime,jdbcType=TIMESTAMP}, 190 + #{recipientCity,jdbcType=VARCHAR}, #{firstCommitTime,jdbcType=TIMESTAMP}, #{firstSubmitterId,jdbcType=NUMERIC},
191 - #{firstSubmitterId,jdbcType=NUMERIC}, #{firstSubmitter,jdbcType=VARCHAR}, #{commitTime,jdbcType=TIMESTAMP}, 191 + #{firstSubmitter,jdbcType=VARCHAR}, #{commitTime,jdbcType=TIMESTAMP}, #{submitterId,jdbcType=NUMERIC},
192 - #{submitterId,jdbcType=NUMERIC}, #{submitter,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 192 + #{submitter,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC},
193 - #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, 193 + #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC},
194 - #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR}, #{ceInfoId,jdbcType=NUMERIC}, 194 + #{modifyUserName,jdbcType=VARCHAR}, #{ceInfoId,jdbcType=NUMERIC}, #{recipientPostalCode,jdbcType=VARCHAR},
195 - #{recipientPostalCode,jdbcType=VARCHAR}, #{statusId,jdbcType=NUMERIC}, #{statusName,jdbcType=VARCHAR}, 195 + #{statusCode,jdbcType=VARCHAR}, #{statusName,jdbcType=VARCHAR}, #{docNondocFlag,jdbcType=VARCHAR},
196 - #{docNondocFlag,jdbcType=VARCHAR}, #{userUuid,jdbcType=VARCHAR}, #{userInputShipperAccount,jdbcType=VARCHAR}, 196 + #{userUuid,jdbcType=VARCHAR}, #{userInputShipperAccount,jdbcType=VARCHAR}, #{userInputOriginCountryCode,jdbcType=VARCHAR},
197 - #{userInputOriginCountryId,jdbcType=NUMERIC}, #{userInputOriginCountry,jdbcType=VARCHAR}, 197 + #{userInputOriginCountry,jdbcType=VARCHAR}, #{originCountryCode,jdbcType=VARCHAR},
198 - #{originCountryId,jdbcType=NUMERIC}) 198 + #{shipperEmail,jdbcType=VARCHAR}, #{destinationCountryCode,jdbcType=VARCHAR})
199 </insert> 199 </insert>
200 <insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.Consignment"> 200 <insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.Consignment">
201 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 201 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
...@@ -210,12 +210,6 @@ ...@@ -210,12 +210,6 @@
210 <if test="shipDate != null"> 210 <if test="shipDate != null">
211 SHIP_DATE, 211 SHIP_DATE,
212 </if> 212 </if>
213 - <if test="shipperCountry != null">
214 - SHIPPER_COUNTRY,
215 - </if>
216 - <if test="recipientCountry != null">
217 - RECIPIENT_COUNTRY,
218 - </if>
219 <if test="destIataCode != null"> 213 <if test="destIataCode != null">
220 DEST_IATA_CODE, 214 DEST_IATA_CODE,
221 </if> 215 </if>
...@@ -327,8 +321,8 @@ ...@@ -327,8 +321,8 @@
327 <if test="recipientPostalCode != null"> 321 <if test="recipientPostalCode != null">
328 RECIPIENT_POSTAL_CODE, 322 RECIPIENT_POSTAL_CODE,
329 </if> 323 </if>
330 - <if test="statusId != null"> 324 + <if test="statusCode != null">
331 - STATUS_ID, 325 + STATUS_CODE,
332 </if> 326 </if>
333 <if test="statusName != null"> 327 <if test="statusName != null">
334 STATUS_NAME, 328 STATUS_NAME,
...@@ -342,14 +336,20 @@ ...@@ -342,14 +336,20 @@
342 <if test="userInputShipperAccount != null"> 336 <if test="userInputShipperAccount != null">
343 USER_INPUT_SHIPPER_ACCOUNT, 337 USER_INPUT_SHIPPER_ACCOUNT,
344 </if> 338 </if>
345 - <if test="userInputOriginCountryId != null"> 339 + <if test="userInputOriginCountryCode != null">
346 - USER_INPUT_ORIGIN_COUNTRY_ID, 340 + USER_INPUT_ORIGIN_COUNTRY_CODE,
347 </if> 341 </if>
348 <if test="userInputOriginCountry != null"> 342 <if test="userInputOriginCountry != null">
349 USER_INPUT_ORIGIN_COUNTRY, 343 USER_INPUT_ORIGIN_COUNTRY,
350 </if> 344 </if>
351 - <if test="originCountryId != null"> 345 + <if test="originCountryCode != null">
352 - ORIGIN_COUNTRY_ID, 346 + ORIGIN_COUNTRY_CODE,
347 + </if>
348 + <if test="shipperEmail != null">
349 + SHIPPER_EMAIL,
350 + </if>
351 + <if test="destinationCountryCode != null">
352 + DESTINATION_COUNTRY_CODE,
353 </if> 353 </if>
354 </trim> 354 </trim>
355 <trim prefix="values (" suffix=")" suffixOverrides=","> 355 <trim prefix="values (" suffix=")" suffixOverrides=",">
...@@ -360,12 +360,6 @@ ...@@ -360,12 +360,6 @@
360 <if test="shipDate != null"> 360 <if test="shipDate != null">
361 #{shipDate,jdbcType=TIMESTAMP}, 361 #{shipDate,jdbcType=TIMESTAMP},
362 </if> 362 </if>
363 - <if test="shipperCountry != null">
364 - #{shipperCountry,jdbcType=VARCHAR},
365 - </if>
366 - <if test="recipientCountry != null">
367 - #{recipientCountry,jdbcType=VARCHAR},
368 - </if>
369 <if test="destIataCode != null"> 363 <if test="destIataCode != null">
370 #{destIataCode,jdbcType=VARCHAR}, 364 #{destIataCode,jdbcType=VARCHAR},
371 </if> 365 </if>
...@@ -477,8 +471,8 @@ ...@@ -477,8 +471,8 @@
477 <if test="recipientPostalCode != null"> 471 <if test="recipientPostalCode != null">
478 #{recipientPostalCode,jdbcType=VARCHAR}, 472 #{recipientPostalCode,jdbcType=VARCHAR},
479 </if> 473 </if>
480 - <if test="statusId != null"> 474 + <if test="statusCode != null">
481 - #{statusId,jdbcType=NUMERIC}, 475 + #{statusCode,jdbcType=VARCHAR},
482 </if> 476 </if>
483 <if test="statusName != null"> 477 <if test="statusName != null">
484 #{statusName,jdbcType=VARCHAR}, 478 #{statusName,jdbcType=VARCHAR},
...@@ -492,14 +486,20 @@ ...@@ -492,14 +486,20 @@
492 <if test="userInputShipperAccount != null"> 486 <if test="userInputShipperAccount != null">
493 #{userInputShipperAccount,jdbcType=VARCHAR}, 487 #{userInputShipperAccount,jdbcType=VARCHAR},
494 </if> 488 </if>
495 - <if test="userInputOriginCountryId != null"> 489 + <if test="userInputOriginCountryCode != null">
496 - #{userInputOriginCountryId,jdbcType=NUMERIC}, 490 + #{userInputOriginCountryCode,jdbcType=VARCHAR},
497 </if> 491 </if>
498 <if test="userInputOriginCountry != null"> 492 <if test="userInputOriginCountry != null">
499 #{userInputOriginCountry,jdbcType=VARCHAR}, 493 #{userInputOriginCountry,jdbcType=VARCHAR},
500 </if> 494 </if>
501 - <if test="originCountryId != null"> 495 + <if test="originCountryCode != null">
502 - #{originCountryId,jdbcType=NUMERIC}, 496 + #{originCountryCode,jdbcType=VARCHAR},
497 + </if>
498 + <if test="shipperEmail != null">
499 + #{shipperEmail,jdbcType=VARCHAR},
500 + </if>
501 + <if test="destinationCountryCode != null">
502 + #{destinationCountryCode,jdbcType=VARCHAR},
503 </if> 503 </if>
504 </trim> 504 </trim>
505 </insert> 505 </insert>
...@@ -521,12 +521,6 @@ ...@@ -521,12 +521,6 @@
521 <if test="record.shipDate != null"> 521 <if test="record.shipDate != null">
522 SHIP_DATE = #{record.shipDate,jdbcType=TIMESTAMP}, 522 SHIP_DATE = #{record.shipDate,jdbcType=TIMESTAMP},
523 </if> 523 </if>
524 - <if test="record.shipperCountry != null">
525 - SHIPPER_COUNTRY = #{record.shipperCountry,jdbcType=VARCHAR},
526 - </if>
527 - <if test="record.recipientCountry != null">
528 - RECIPIENT_COUNTRY = #{record.recipientCountry,jdbcType=VARCHAR},
529 - </if>
530 <if test="record.destIataCode != null"> 524 <if test="record.destIataCode != null">
531 DEST_IATA_CODE = #{record.destIataCode,jdbcType=VARCHAR}, 525 DEST_IATA_CODE = #{record.destIataCode,jdbcType=VARCHAR},
532 </if> 526 </if>
...@@ -638,8 +632,8 @@ ...@@ -638,8 +632,8 @@
638 <if test="record.recipientPostalCode != null"> 632 <if test="record.recipientPostalCode != null">
639 RECIPIENT_POSTAL_CODE = #{record.recipientPostalCode,jdbcType=VARCHAR}, 633 RECIPIENT_POSTAL_CODE = #{record.recipientPostalCode,jdbcType=VARCHAR},
640 </if> 634 </if>
641 - <if test="record.statusId != null"> 635 + <if test="record.statusCode != null">
642 - STATUS_ID = #{record.statusId,jdbcType=NUMERIC}, 636 + STATUS_CODE = #{record.statusCode,jdbcType=VARCHAR},
643 </if> 637 </if>
644 <if test="record.statusName != null"> 638 <if test="record.statusName != null">
645 STATUS_NAME = #{record.statusName,jdbcType=VARCHAR}, 639 STATUS_NAME = #{record.statusName,jdbcType=VARCHAR},
...@@ -653,14 +647,20 @@ ...@@ -653,14 +647,20 @@
653 <if test="record.userInputShipperAccount != null"> 647 <if test="record.userInputShipperAccount != null">
654 USER_INPUT_SHIPPER_ACCOUNT = #{record.userInputShipperAccount,jdbcType=VARCHAR}, 648 USER_INPUT_SHIPPER_ACCOUNT = #{record.userInputShipperAccount,jdbcType=VARCHAR},
655 </if> 649 </if>
656 - <if test="record.userInputOriginCountryId != null"> 650 + <if test="record.userInputOriginCountryCode != null">
657 - USER_INPUT_ORIGIN_COUNTRY_ID = #{record.userInputOriginCountryId,jdbcType=NUMERIC}, 651 + USER_INPUT_ORIGIN_COUNTRY_CODE = #{record.userInputOriginCountryCode,jdbcType=VARCHAR},
658 </if> 652 </if>
659 <if test="record.userInputOriginCountry != null"> 653 <if test="record.userInputOriginCountry != null">
660 USER_INPUT_ORIGIN_COUNTRY = #{record.userInputOriginCountry,jdbcType=VARCHAR}, 654 USER_INPUT_ORIGIN_COUNTRY = #{record.userInputOriginCountry,jdbcType=VARCHAR},
661 </if> 655 </if>
662 - <if test="record.originCountryId != null"> 656 + <if test="record.originCountryCode != null">
663 - ORIGIN_COUNTRY_ID = #{record.originCountryId,jdbcType=NUMERIC}, 657 + ORIGIN_COUNTRY_CODE = #{record.originCountryCode,jdbcType=VARCHAR},
658 + </if>
659 + <if test="record.shipperEmail != null">
660 + SHIPPER_EMAIL = #{record.shipperEmail,jdbcType=VARCHAR},
661 + </if>
662 + <if test="record.destinationCountryCode != null">
663 + DESTINATION_COUNTRY_CODE = #{record.destinationCountryCode,jdbcType=VARCHAR},
664 </if> 664 </if>
665 </set> 665 </set>
666 <if test="_parameter != null"> 666 <if test="_parameter != null">
...@@ -672,8 +672,6 @@ ...@@ -672,8 +672,6 @@
672 set ID = #{record.id,jdbcType=NUMERIC}, 672 set ID = #{record.id,jdbcType=NUMERIC},
673 CONSIGNMENT_CODE = #{record.consignmentCode,jdbcType=VARCHAR}, 673 CONSIGNMENT_CODE = #{record.consignmentCode,jdbcType=VARCHAR},
674 SHIP_DATE = #{record.shipDate,jdbcType=TIMESTAMP}, 674 SHIP_DATE = #{record.shipDate,jdbcType=TIMESTAMP},
675 - SHIPPER_COUNTRY = #{record.shipperCountry,jdbcType=VARCHAR},
676 - RECIPIENT_COUNTRY = #{record.recipientCountry,jdbcType=VARCHAR},
677 DEST_IATA_CODE = #{record.destIataCode,jdbcType=VARCHAR}, 675 DEST_IATA_CODE = #{record.destIataCode,jdbcType=VARCHAR},
678 ORIGIN_COUNTRY = #{record.originCountry,jdbcType=VARCHAR}, 676 ORIGIN_COUNTRY = #{record.originCountry,jdbcType=VARCHAR},
679 DESTINATION_COUNTRY = #{record.destinationCountry,jdbcType=VARCHAR}, 677 DESTINATION_COUNTRY = #{record.destinationCountry,jdbcType=VARCHAR},
...@@ -711,14 +709,16 @@ ...@@ -711,14 +709,16 @@
711 MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR}, 709 MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
712 CE_INFO_ID = #{record.ceInfoId,jdbcType=NUMERIC}, 710 CE_INFO_ID = #{record.ceInfoId,jdbcType=NUMERIC},
713 RECIPIENT_POSTAL_CODE = #{record.recipientPostalCode,jdbcType=VARCHAR}, 711 RECIPIENT_POSTAL_CODE = #{record.recipientPostalCode,jdbcType=VARCHAR},
714 - STATUS_ID = #{record.statusId,jdbcType=NUMERIC}, 712 + STATUS_CODE = #{record.statusCode,jdbcType=VARCHAR},
715 STATUS_NAME = #{record.statusName,jdbcType=VARCHAR}, 713 STATUS_NAME = #{record.statusName,jdbcType=VARCHAR},
716 DOC_NONDOC_FLAG = #{record.docNondocFlag,jdbcType=VARCHAR}, 714 DOC_NONDOC_FLAG = #{record.docNondocFlag,jdbcType=VARCHAR},
717 USER_UUID = #{record.userUuid,jdbcType=VARCHAR}, 715 USER_UUID = #{record.userUuid,jdbcType=VARCHAR},
718 USER_INPUT_SHIPPER_ACCOUNT = #{record.userInputShipperAccount,jdbcType=VARCHAR}, 716 USER_INPUT_SHIPPER_ACCOUNT = #{record.userInputShipperAccount,jdbcType=VARCHAR},
719 - USER_INPUT_ORIGIN_COUNTRY_ID = #{record.userInputOriginCountryId,jdbcType=NUMERIC}, 717 + USER_INPUT_ORIGIN_COUNTRY_CODE = #{record.userInputOriginCountryCode,jdbcType=VARCHAR},
720 USER_INPUT_ORIGIN_COUNTRY = #{record.userInputOriginCountry,jdbcType=VARCHAR}, 718 USER_INPUT_ORIGIN_COUNTRY = #{record.userInputOriginCountry,jdbcType=VARCHAR},
721 - ORIGIN_COUNTRY_ID = #{record.originCountryId,jdbcType=NUMERIC} 719 + ORIGIN_COUNTRY_CODE = #{record.originCountryCode,jdbcType=VARCHAR},
720 + SHIPPER_EMAIL = #{record.shipperEmail,jdbcType=VARCHAR},
721 + DESTINATION_COUNTRY_CODE = #{record.destinationCountryCode,jdbcType=VARCHAR}
722 <if test="_parameter != null"> 722 <if test="_parameter != null">
723 <include refid="Update_By_Example_Where_Clause" /> 723 <include refid="Update_By_Example_Where_Clause" />
724 </if> 724 </if>
...@@ -732,12 +732,6 @@ ...@@ -732,12 +732,6 @@
732 <if test="shipDate != null"> 732 <if test="shipDate != null">
733 SHIP_DATE = #{shipDate,jdbcType=TIMESTAMP}, 733 SHIP_DATE = #{shipDate,jdbcType=TIMESTAMP},
734 </if> 734 </if>
735 - <if test="shipperCountry != null">
736 - SHIPPER_COUNTRY = #{shipperCountry,jdbcType=VARCHAR},
737 - </if>
738 - <if test="recipientCountry != null">
739 - RECIPIENT_COUNTRY = #{recipientCountry,jdbcType=VARCHAR},
740 - </if>
741 <if test="destIataCode != null"> 735 <if test="destIataCode != null">
742 DEST_IATA_CODE = #{destIataCode,jdbcType=VARCHAR}, 736 DEST_IATA_CODE = #{destIataCode,jdbcType=VARCHAR},
743 </if> 737 </if>
...@@ -849,8 +843,8 @@ ...@@ -849,8 +843,8 @@
849 <if test="recipientPostalCode != null"> 843 <if test="recipientPostalCode != null">
850 RECIPIENT_POSTAL_CODE = #{recipientPostalCode,jdbcType=VARCHAR}, 844 RECIPIENT_POSTAL_CODE = #{recipientPostalCode,jdbcType=VARCHAR},
851 </if> 845 </if>
852 - <if test="statusId != null"> 846 + <if test="statusCode != null">
853 - STATUS_ID = #{statusId,jdbcType=NUMERIC}, 847 + STATUS_CODE = #{statusCode,jdbcType=VARCHAR},
854 </if> 848 </if>
855 <if test="statusName != null"> 849 <if test="statusName != null">
856 STATUS_NAME = #{statusName,jdbcType=VARCHAR}, 850 STATUS_NAME = #{statusName,jdbcType=VARCHAR},
...@@ -864,14 +858,20 @@ ...@@ -864,14 +858,20 @@
864 <if test="userInputShipperAccount != null"> 858 <if test="userInputShipperAccount != null">
865 USER_INPUT_SHIPPER_ACCOUNT = #{userInputShipperAccount,jdbcType=VARCHAR}, 859 USER_INPUT_SHIPPER_ACCOUNT = #{userInputShipperAccount,jdbcType=VARCHAR},
866 </if> 860 </if>
867 - <if test="userInputOriginCountryId != null"> 861 + <if test="userInputOriginCountryCode != null">
868 - USER_INPUT_ORIGIN_COUNTRY_ID = #{userInputOriginCountryId,jdbcType=NUMERIC}, 862 + USER_INPUT_ORIGIN_COUNTRY_CODE = #{userInputOriginCountryCode,jdbcType=VARCHAR},
869 </if> 863 </if>
870 <if test="userInputOriginCountry != null"> 864 <if test="userInputOriginCountry != null">
871 USER_INPUT_ORIGIN_COUNTRY = #{userInputOriginCountry,jdbcType=VARCHAR}, 865 USER_INPUT_ORIGIN_COUNTRY = #{userInputOriginCountry,jdbcType=VARCHAR},
872 </if> 866 </if>
873 - <if test="originCountryId != null"> 867 + <if test="originCountryCode != null">
874 - ORIGIN_COUNTRY_ID = #{originCountryId,jdbcType=NUMERIC}, 868 + ORIGIN_COUNTRY_CODE = #{originCountryCode,jdbcType=VARCHAR},
869 + </if>
870 + <if test="shipperEmail != null">
871 + SHIPPER_EMAIL = #{shipperEmail,jdbcType=VARCHAR},
872 + </if>
873 + <if test="destinationCountryCode != null">
874 + DESTINATION_COUNTRY_CODE = #{destinationCountryCode,jdbcType=VARCHAR},
875 </if> 875 </if>
876 </set> 876 </set>
877 where ID = #{id,jdbcType=NUMERIC} 877 where ID = #{id,jdbcType=NUMERIC}
...@@ -880,8 +880,6 @@ ...@@ -880,8 +880,6 @@
880 update T_BIZ_CONSIGNMENT 880 update T_BIZ_CONSIGNMENT
881 set CONSIGNMENT_CODE = #{consignmentCode,jdbcType=VARCHAR}, 881 set CONSIGNMENT_CODE = #{consignmentCode,jdbcType=VARCHAR},
882 SHIP_DATE = #{shipDate,jdbcType=TIMESTAMP}, 882 SHIP_DATE = #{shipDate,jdbcType=TIMESTAMP},
883 - SHIPPER_COUNTRY = #{shipperCountry,jdbcType=VARCHAR},
884 - RECIPIENT_COUNTRY = #{recipientCountry,jdbcType=VARCHAR},
885 DEST_IATA_CODE = #{destIataCode,jdbcType=VARCHAR}, 883 DEST_IATA_CODE = #{destIataCode,jdbcType=VARCHAR},
886 ORIGIN_COUNTRY = #{originCountry,jdbcType=VARCHAR}, 884 ORIGIN_COUNTRY = #{originCountry,jdbcType=VARCHAR},
887 DESTINATION_COUNTRY = #{destinationCountry,jdbcType=VARCHAR}, 885 DESTINATION_COUNTRY = #{destinationCountry,jdbcType=VARCHAR},
...@@ -919,14 +917,16 @@ ...@@ -919,14 +917,16 @@
919 MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR}, 917 MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
920 CE_INFO_ID = #{ceInfoId,jdbcType=NUMERIC}, 918 CE_INFO_ID = #{ceInfoId,jdbcType=NUMERIC},
921 RECIPIENT_POSTAL_CODE = #{recipientPostalCode,jdbcType=VARCHAR}, 919 RECIPIENT_POSTAL_CODE = #{recipientPostalCode,jdbcType=VARCHAR},
922 - STATUS_ID = #{statusId,jdbcType=NUMERIC}, 920 + STATUS_CODE = #{statusCode,jdbcType=VARCHAR},
923 STATUS_NAME = #{statusName,jdbcType=VARCHAR}, 921 STATUS_NAME = #{statusName,jdbcType=VARCHAR},
924 DOC_NONDOC_FLAG = #{docNondocFlag,jdbcType=VARCHAR}, 922 DOC_NONDOC_FLAG = #{docNondocFlag,jdbcType=VARCHAR},
925 USER_UUID = #{userUuid,jdbcType=VARCHAR}, 923 USER_UUID = #{userUuid,jdbcType=VARCHAR},
926 USER_INPUT_SHIPPER_ACCOUNT = #{userInputShipperAccount,jdbcType=VARCHAR}, 924 USER_INPUT_SHIPPER_ACCOUNT = #{userInputShipperAccount,jdbcType=VARCHAR},
927 - USER_INPUT_ORIGIN_COUNTRY_ID = #{userInputOriginCountryId,jdbcType=NUMERIC}, 925 + USER_INPUT_ORIGIN_COUNTRY_CODE = #{userInputOriginCountryCode,jdbcType=VARCHAR},
928 USER_INPUT_ORIGIN_COUNTRY = #{userInputOriginCountry,jdbcType=VARCHAR}, 926 USER_INPUT_ORIGIN_COUNTRY = #{userInputOriginCountry,jdbcType=VARCHAR},
929 - ORIGIN_COUNTRY_ID = #{originCountryId,jdbcType=NUMERIC} 927 + ORIGIN_COUNTRY_CODE = #{originCountryCode,jdbcType=VARCHAR},
928 + SHIPPER_EMAIL = #{shipperEmail,jdbcType=VARCHAR},
929 + DESTINATION_COUNTRY_CODE = #{destinationCountryCode,jdbcType=VARCHAR}
930 where ID = #{id,jdbcType=NUMERIC} 930 where ID = #{id,jdbcType=NUMERIC}
931 </update> 931 </update>
932 <sql id="OracleDialectPrefix"> 932 <sql id="OracleDialectPrefix">
......
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
8 <result column="TO_ADDRESS" jdbcType="VARCHAR" property="toAddress" /> 8 <result column="TO_ADDRESS" jdbcType="VARCHAR" property="toAddress" />
9 <result column="CC_ADDRESS" jdbcType="VARCHAR" property="ccAddress" /> 9 <result column="CC_ADDRESS" jdbcType="VARCHAR" property="ccAddress" />
10 <result column="SUBJECT" jdbcType="VARCHAR" property="subject" /> 10 <result column="SUBJECT" jdbcType="VARCHAR" property="subject" />
11 - <result column="TYPE_ID" jdbcType="NUMERIC" property="typeId" /> 11 + <result column="TYPE_CODE" jdbcType="VARCHAR" property="typeCode" />
12 <result column="TYPE_NAME" jdbcType="VARCHAR" property="typeName" /> 12 <result column="TYPE_NAME" jdbcType="VARCHAR" property="typeName" />
13 - <result column="STATUS_ID" jdbcType="NUMERIC" property="statusId" /> 13 + <result column="STATUS_CODE" jdbcType="VARCHAR" property="statusCode" />
14 <result column="STATUS_NAME" jdbcType="VARCHAR" property="statusName" /> 14 <result column="STATUS_NAME" jdbcType="VARCHAR" property="statusName" />
15 <result column="SEND_NUM" jdbcType="NUMERIC" property="sendNum" /> 15 <result column="SEND_NUM" jdbcType="NUMERIC" property="sendNum" />
16 <result column="SEND_TIME" jdbcType="TIMESTAMP" property="sendTime" /> 16 <result column="SEND_TIME" jdbcType="TIMESTAMP" property="sendTime" />
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
83 </where> 83 </where>
84 </sql> 84 </sql>
85 <sql id="Base_Column_List"> 85 <sql id="Base_Column_List">
86 - ID, BIZ_ID, BIZ_CODE, TO_ADDRESS, CC_ADDRESS, SUBJECT, TYPE_ID, TYPE_NAME, STATUS_ID, 86 + ID, BIZ_ID, BIZ_CODE, TO_ADDRESS, CC_ADDRESS, SUBJECT, TYPE_CODE, TYPE_NAME, STATUS_CODE,
87 STATUS_NAME, SEND_NUM, SEND_TIME, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, 87 STATUS_NAME, SEND_NUM, SEND_TIME, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME,
88 MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME 88 MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME
89 </sql> 89 </sql>
...@@ -148,14 +148,14 @@ ...@@ -148,14 +148,14 @@
148 </selectKey> 148 </selectKey>
149 insert into T_BIZ_EMAIL (ID, BIZ_ID, BIZ_CODE, 149 insert into T_BIZ_EMAIL (ID, BIZ_ID, BIZ_CODE,
150 TO_ADDRESS, CC_ADDRESS, SUBJECT, 150 TO_ADDRESS, CC_ADDRESS, SUBJECT,
151 - TYPE_ID, TYPE_NAME, STATUS_ID, 151 + TYPE_CODE, TYPE_NAME, STATUS_CODE,
152 STATUS_NAME, SEND_NUM, SEND_TIME, 152 STATUS_NAME, SEND_NUM, SEND_TIME,
153 CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, 153 CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME,
154 MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME, 154 MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME,
155 BODY) 155 BODY)
156 values (#{id,jdbcType=NUMERIC}, #{bizId,jdbcType=NUMERIC}, #{bizCode,jdbcType=VARCHAR}, 156 values (#{id,jdbcType=NUMERIC}, #{bizId,jdbcType=NUMERIC}, #{bizCode,jdbcType=VARCHAR},
157 #{toAddress,jdbcType=VARCHAR}, #{ccAddress,jdbcType=VARCHAR}, #{subject,jdbcType=VARCHAR}, 157 #{toAddress,jdbcType=VARCHAR}, #{ccAddress,jdbcType=VARCHAR}, #{subject,jdbcType=VARCHAR},
158 - #{typeId,jdbcType=NUMERIC}, #{typeName,jdbcType=VARCHAR}, #{statusId,jdbcType=NUMERIC}, 158 + #{typeCode,jdbcType=VARCHAR}, #{typeName,jdbcType=VARCHAR}, #{statusCode,jdbcType=VARCHAR},
159 #{statusName,jdbcType=VARCHAR}, #{sendNum,jdbcType=NUMERIC}, #{sendTime,jdbcType=TIMESTAMP}, 159 #{statusName,jdbcType=VARCHAR}, #{sendNum,jdbcType=NUMERIC}, #{sendTime,jdbcType=TIMESTAMP},
160 #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, 160 #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR},
161 #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR}, 161 #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR},
...@@ -183,14 +183,14 @@ ...@@ -183,14 +183,14 @@
183 <if test="subject != null"> 183 <if test="subject != null">
184 SUBJECT, 184 SUBJECT,
185 </if> 185 </if>
186 - <if test="typeId != null"> 186 + <if test="typeCode != null">
187 - TYPE_ID, 187 + TYPE_CODE,
188 </if> 188 </if>
189 <if test="typeName != null"> 189 <if test="typeName != null">
190 TYPE_NAME, 190 TYPE_NAME,
191 </if> 191 </if>
192 - <if test="statusId != null"> 192 + <if test="statusCode != null">
193 - STATUS_ID, 193 + STATUS_CODE,
194 </if> 194 </if>
195 <if test="statusName != null"> 195 <if test="statusName != null">
196 STATUS_NAME, 196 STATUS_NAME,
...@@ -240,14 +240,14 @@ ...@@ -240,14 +240,14 @@
240 <if test="subject != null"> 240 <if test="subject != null">
241 #{subject,jdbcType=VARCHAR}, 241 #{subject,jdbcType=VARCHAR},
242 </if> 242 </if>
243 - <if test="typeId != null"> 243 + <if test="typeCode != null">
244 - #{typeId,jdbcType=NUMERIC}, 244 + #{typeCode,jdbcType=VARCHAR},
245 </if> 245 </if>
246 <if test="typeName != null"> 246 <if test="typeName != null">
247 #{typeName,jdbcType=VARCHAR}, 247 #{typeName,jdbcType=VARCHAR},
248 </if> 248 </if>
249 - <if test="statusId != null"> 249 + <if test="statusCode != null">
250 - #{statusId,jdbcType=NUMERIC}, 250 + #{statusCode,jdbcType=VARCHAR},
251 </if> 251 </if>
252 <if test="statusName != null"> 252 <if test="statusName != null">
253 #{statusName,jdbcType=VARCHAR}, 253 #{statusName,jdbcType=VARCHAR},
...@@ -308,14 +308,14 @@ ...@@ -308,14 +308,14 @@
308 <if test="record.subject != null"> 308 <if test="record.subject != null">
309 SUBJECT = #{record.subject,jdbcType=VARCHAR}, 309 SUBJECT = #{record.subject,jdbcType=VARCHAR},
310 </if> 310 </if>
311 - <if test="record.typeId != null"> 311 + <if test="record.typeCode != null">
312 - TYPE_ID = #{record.typeId,jdbcType=NUMERIC}, 312 + TYPE_CODE = #{record.typeCode,jdbcType=VARCHAR},
313 </if> 313 </if>
314 <if test="record.typeName != null"> 314 <if test="record.typeName != null">
315 TYPE_NAME = #{record.typeName,jdbcType=VARCHAR}, 315 TYPE_NAME = #{record.typeName,jdbcType=VARCHAR},
316 </if> 316 </if>
317 - <if test="record.statusId != null"> 317 + <if test="record.statusCode != null">
318 - STATUS_ID = #{record.statusId,jdbcType=NUMERIC}, 318 + STATUS_CODE = #{record.statusCode,jdbcType=VARCHAR},
319 </if> 319 </if>
320 <if test="record.statusName != null"> 320 <if test="record.statusName != null">
321 STATUS_NAME = #{record.statusName,jdbcType=VARCHAR}, 321 STATUS_NAME = #{record.statusName,jdbcType=VARCHAR},
...@@ -360,9 +360,9 @@ ...@@ -360,9 +360,9 @@
360 TO_ADDRESS = #{record.toAddress,jdbcType=VARCHAR}, 360 TO_ADDRESS = #{record.toAddress,jdbcType=VARCHAR},
361 CC_ADDRESS = #{record.ccAddress,jdbcType=VARCHAR}, 361 CC_ADDRESS = #{record.ccAddress,jdbcType=VARCHAR},
362 SUBJECT = #{record.subject,jdbcType=VARCHAR}, 362 SUBJECT = #{record.subject,jdbcType=VARCHAR},
363 - TYPE_ID = #{record.typeId,jdbcType=NUMERIC}, 363 + TYPE_CODE = #{record.typeCode,jdbcType=VARCHAR},
364 TYPE_NAME = #{record.typeName,jdbcType=VARCHAR}, 364 TYPE_NAME = #{record.typeName,jdbcType=VARCHAR},
365 - STATUS_ID = #{record.statusId,jdbcType=NUMERIC}, 365 + STATUS_CODE = #{record.statusCode,jdbcType=VARCHAR},
366 STATUS_NAME = #{record.statusName,jdbcType=VARCHAR}, 366 STATUS_NAME = #{record.statusName,jdbcType=VARCHAR},
367 SEND_NUM = #{record.sendNum,jdbcType=NUMERIC}, 367 SEND_NUM = #{record.sendNum,jdbcType=NUMERIC},
368 SEND_TIME = #{record.sendTime,jdbcType=TIMESTAMP}, 368 SEND_TIME = #{record.sendTime,jdbcType=TIMESTAMP},
...@@ -385,9 +385,9 @@ ...@@ -385,9 +385,9 @@
385 TO_ADDRESS = #{record.toAddress,jdbcType=VARCHAR}, 385 TO_ADDRESS = #{record.toAddress,jdbcType=VARCHAR},
386 CC_ADDRESS = #{record.ccAddress,jdbcType=VARCHAR}, 386 CC_ADDRESS = #{record.ccAddress,jdbcType=VARCHAR},
387 SUBJECT = #{record.subject,jdbcType=VARCHAR}, 387 SUBJECT = #{record.subject,jdbcType=VARCHAR},
388 - TYPE_ID = #{record.typeId,jdbcType=NUMERIC}, 388 + TYPE_CODE = #{record.typeCode,jdbcType=VARCHAR},
389 TYPE_NAME = #{record.typeName,jdbcType=VARCHAR}, 389 TYPE_NAME = #{record.typeName,jdbcType=VARCHAR},
390 - STATUS_ID = #{record.statusId,jdbcType=NUMERIC}, 390 + STATUS_CODE = #{record.statusCode,jdbcType=VARCHAR},
391 STATUS_NAME = #{record.statusName,jdbcType=VARCHAR}, 391 STATUS_NAME = #{record.statusName,jdbcType=VARCHAR},
392 SEND_NUM = #{record.sendNum,jdbcType=NUMERIC}, 392 SEND_NUM = #{record.sendNum,jdbcType=NUMERIC},
393 SEND_TIME = #{record.sendTime,jdbcType=TIMESTAMP}, 393 SEND_TIME = #{record.sendTime,jdbcType=TIMESTAMP},
...@@ -419,14 +419,14 @@ ...@@ -419,14 +419,14 @@
419 <if test="subject != null"> 419 <if test="subject != null">
420 SUBJECT = #{subject,jdbcType=VARCHAR}, 420 SUBJECT = #{subject,jdbcType=VARCHAR},
421 </if> 421 </if>
422 - <if test="typeId != null"> 422 + <if test="typeCode != null">
423 - TYPE_ID = #{typeId,jdbcType=NUMERIC}, 423 + TYPE_CODE = #{typeCode,jdbcType=VARCHAR},
424 </if> 424 </if>
425 <if test="typeName != null"> 425 <if test="typeName != null">
426 TYPE_NAME = #{typeName,jdbcType=VARCHAR}, 426 TYPE_NAME = #{typeName,jdbcType=VARCHAR},
427 </if> 427 </if>
428 - <if test="statusId != null"> 428 + <if test="statusCode != null">
429 - STATUS_ID = #{statusId,jdbcType=NUMERIC}, 429 + STATUS_CODE = #{statusCode,jdbcType=VARCHAR},
430 </if> 430 </if>
431 <if test="statusName != null"> 431 <if test="statusName != null">
432 STATUS_NAME = #{statusName,jdbcType=VARCHAR}, 432 STATUS_NAME = #{statusName,jdbcType=VARCHAR},
...@@ -468,9 +468,9 @@ ...@@ -468,9 +468,9 @@
468 TO_ADDRESS = #{toAddress,jdbcType=VARCHAR}, 468 TO_ADDRESS = #{toAddress,jdbcType=VARCHAR},
469 CC_ADDRESS = #{ccAddress,jdbcType=VARCHAR}, 469 CC_ADDRESS = #{ccAddress,jdbcType=VARCHAR},
470 SUBJECT = #{subject,jdbcType=VARCHAR}, 470 SUBJECT = #{subject,jdbcType=VARCHAR},
471 - TYPE_ID = #{typeId,jdbcType=NUMERIC}, 471 + TYPE_CODE = #{typeCode,jdbcType=VARCHAR},
472 TYPE_NAME = #{typeName,jdbcType=VARCHAR}, 472 TYPE_NAME = #{typeName,jdbcType=VARCHAR},
473 - STATUS_ID = #{statusId,jdbcType=NUMERIC}, 473 + STATUS_CODE = #{statusCode,jdbcType=VARCHAR},
474 STATUS_NAME = #{statusName,jdbcType=VARCHAR}, 474 STATUS_NAME = #{statusName,jdbcType=VARCHAR},
475 SEND_NUM = #{sendNum,jdbcType=NUMERIC}, 475 SEND_NUM = #{sendNum,jdbcType=NUMERIC},
476 SEND_TIME = #{sendTime,jdbcType=TIMESTAMP}, 476 SEND_TIME = #{sendTime,jdbcType=TIMESTAMP},
...@@ -490,9 +490,9 @@ ...@@ -490,9 +490,9 @@
490 TO_ADDRESS = #{toAddress,jdbcType=VARCHAR}, 490 TO_ADDRESS = #{toAddress,jdbcType=VARCHAR},
491 CC_ADDRESS = #{ccAddress,jdbcType=VARCHAR}, 491 CC_ADDRESS = #{ccAddress,jdbcType=VARCHAR},
492 SUBJECT = #{subject,jdbcType=VARCHAR}, 492 SUBJECT = #{subject,jdbcType=VARCHAR},
493 - TYPE_ID = #{typeId,jdbcType=NUMERIC}, 493 + TYPE_CODE = #{typeCode,jdbcType=VARCHAR},
494 TYPE_NAME = #{typeName,jdbcType=VARCHAR}, 494 TYPE_NAME = #{typeName,jdbcType=VARCHAR},
495 - STATUS_ID = #{statusId,jdbcType=NUMERIC}, 495 + STATUS_CODE = #{statusCode,jdbcType=VARCHAR},
496 STATUS_NAME = #{statusName,jdbcType=VARCHAR}, 496 STATUS_NAME = #{statusName,jdbcType=VARCHAR},
497 SEND_NUM = #{sendNum,jdbcType=NUMERIC}, 497 SEND_NUM = #{sendNum,jdbcType=NUMERIC},
498 SEND_TIME = #{sendTime,jdbcType=TIMESTAMP}, 498 SEND_TIME = #{sendTime,jdbcType=TIMESTAMP},
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
5 <id column="ID" jdbcType="NUMERIC" property="id" /> 5 <id column="ID" jdbcType="NUMERIC" property="id" />
6 <result column="CONSIGNMENT_CODE" jdbcType="VARCHAR" property="consignmentCode" /> 6 <result column="CONSIGNMENT_CODE" jdbcType="VARCHAR" property="consignmentCode" />
7 <result column="CONSIGNMENT_ID" jdbcType="NUMERIC" property="consignmentId" /> 7 <result column="CONSIGNMENT_ID" jdbcType="NUMERIC" property="consignmentId" />
8 - <result column="STATUS_ID" jdbcType="NUMERIC" property="statusId" /> 8 + <result column="STATUS_CODE" jdbcType="VARCHAR" property="statusCode" />
9 <result column="STATUS_NAME" jdbcType="VARCHAR" property="statusName" /> 9 <result column="STATUS_NAME" jdbcType="VARCHAR" property="statusName" />
10 - <result column="FILE_TYPE_ID" jdbcType="NUMERIC" property="fileTypeId" /> 10 + <result column="FILE_TYPE_CODE" jdbcType="VARCHAR" property="fileTypeCode" />
11 <result column="FILE_TYPE" jdbcType="VARCHAR" property="fileType" /> 11 <result column="FILE_TYPE" jdbcType="VARCHAR" property="fileType" />
12 <result column="FILE_NAME" jdbcType="VARCHAR" property="fileName" /> 12 <result column="FILE_NAME" jdbcType="VARCHAR" property="fileName" />
13 <result column="PUSH_OB_ID" jdbcType="NUMERIC" property="pushObId" /> 13 <result column="PUSH_OB_ID" jdbcType="NUMERIC" property="pushObId" />
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
79 </where> 79 </where>
80 </sql> 80 </sql>
81 <sql id="Base_Column_List"> 81 <sql id="Base_Column_List">
82 - ID, CONSIGNMENT_CODE, CONSIGNMENT_ID, STATUS_ID, STATUS_NAME, FILE_TYPE_ID, FILE_TYPE, 82 + ID, CONSIGNMENT_CODE, CONSIGNMENT_ID, STATUS_CODE, STATUS_NAME, FILE_TYPE_CODE, FILE_TYPE,
83 FILE_NAME, PUSH_OB_ID, PUSH_TIME, REMARK, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, 83 FILE_NAME, PUSH_OB_ID, PUSH_TIME, REMARK, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME,
84 MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME 84 MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME
85 </sql> 85 </sql>
...@@ -121,13 +121,13 @@ ...@@ -121,13 +121,13 @@
121 SELECT SEQ_T_BIZ_PUSH_OB_DETAIL.NEXTVAL FROM DUAL 121 SELECT SEQ_T_BIZ_PUSH_OB_DETAIL.NEXTVAL FROM DUAL
122 </selectKey> 122 </selectKey>
123 insert into T_BIZ_PUSH_OB_DETAIL (ID, CONSIGNMENT_CODE, CONSIGNMENT_ID, 123 insert into T_BIZ_PUSH_OB_DETAIL (ID, CONSIGNMENT_CODE, CONSIGNMENT_ID,
124 - STATUS_ID, STATUS_NAME, FILE_TYPE_ID, 124 + STATUS_CODE, STATUS_NAME, FILE_TYPE_CODE,
125 FILE_TYPE, FILE_NAME, PUSH_OB_ID, 125 FILE_TYPE, FILE_NAME, PUSH_OB_ID,
126 PUSH_TIME, REMARK, CREATE_TIME, 126 PUSH_TIME, REMARK, CREATE_TIME,
127 CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, 127 CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME,
128 MODIFY_USER_ID, MODIFY_USER_NAME) 128 MODIFY_USER_ID, MODIFY_USER_NAME)
129 values (#{id,jdbcType=NUMERIC}, #{consignmentCode,jdbcType=VARCHAR}, #{consignmentId,jdbcType=NUMERIC}, 129 values (#{id,jdbcType=NUMERIC}, #{consignmentCode,jdbcType=VARCHAR}, #{consignmentId,jdbcType=NUMERIC},
130 - #{statusId,jdbcType=NUMERIC}, #{statusName,jdbcType=VARCHAR}, #{fileTypeId,jdbcType=NUMERIC}, 130 + #{statusCode,jdbcType=VARCHAR}, #{statusName,jdbcType=VARCHAR}, #{fileTypeCode,jdbcType=VARCHAR},
131 #{fileType,jdbcType=VARCHAR}, #{fileName,jdbcType=VARCHAR}, #{pushObId,jdbcType=NUMERIC}, 131 #{fileType,jdbcType=VARCHAR}, #{fileName,jdbcType=VARCHAR}, #{pushObId,jdbcType=NUMERIC},
132 #{pushTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 132 #{pushTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
133 #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, 133 #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP},
...@@ -146,14 +146,14 @@ ...@@ -146,14 +146,14 @@
146 <if test="consignmentId != null"> 146 <if test="consignmentId != null">
147 CONSIGNMENT_ID, 147 CONSIGNMENT_ID,
148 </if> 148 </if>
149 - <if test="statusId != null"> 149 + <if test="statusCode != null">
150 - STATUS_ID, 150 + STATUS_CODE,
151 </if> 151 </if>
152 <if test="statusName != null"> 152 <if test="statusName != null">
153 STATUS_NAME, 153 STATUS_NAME,
154 </if> 154 </if>
155 - <if test="fileTypeId != null"> 155 + <if test="fileTypeCode != null">
156 - FILE_TYPE_ID, 156 + FILE_TYPE_CODE,
157 </if> 157 </if>
158 <if test="fileType != null"> 158 <if test="fileType != null">
159 FILE_TYPE, 159 FILE_TYPE,
...@@ -197,14 +197,14 @@ ...@@ -197,14 +197,14 @@
197 <if test="consignmentId != null"> 197 <if test="consignmentId != null">
198 #{consignmentId,jdbcType=NUMERIC}, 198 #{consignmentId,jdbcType=NUMERIC},
199 </if> 199 </if>
200 - <if test="statusId != null"> 200 + <if test="statusCode != null">
201 - #{statusId,jdbcType=NUMERIC}, 201 + #{statusCode,jdbcType=VARCHAR},
202 </if> 202 </if>
203 <if test="statusName != null"> 203 <if test="statusName != null">
204 #{statusName,jdbcType=VARCHAR}, 204 #{statusName,jdbcType=VARCHAR},
205 </if> 205 </if>
206 - <if test="fileTypeId != null"> 206 + <if test="fileTypeCode != null">
207 - #{fileTypeId,jdbcType=NUMERIC}, 207 + #{fileTypeCode,jdbcType=VARCHAR},
208 </if> 208 </if>
209 <if test="fileType != null"> 209 <if test="fileType != null">
210 #{fileType,jdbcType=VARCHAR}, 210 #{fileType,jdbcType=VARCHAR},
...@@ -259,14 +259,14 @@ ...@@ -259,14 +259,14 @@
259 <if test="record.consignmentId != null"> 259 <if test="record.consignmentId != null">
260 CONSIGNMENT_ID = #{record.consignmentId,jdbcType=NUMERIC}, 260 CONSIGNMENT_ID = #{record.consignmentId,jdbcType=NUMERIC},
261 </if> 261 </if>
262 - <if test="record.statusId != null"> 262 + <if test="record.statusCode != null">
263 - STATUS_ID = #{record.statusId,jdbcType=NUMERIC}, 263 + STATUS_CODE = #{record.statusCode,jdbcType=VARCHAR},
264 </if> 264 </if>
265 <if test="record.statusName != null"> 265 <if test="record.statusName != null">
266 STATUS_NAME = #{record.statusName,jdbcType=VARCHAR}, 266 STATUS_NAME = #{record.statusName,jdbcType=VARCHAR},
267 </if> 267 </if>
268 - <if test="record.fileTypeId != null"> 268 + <if test="record.fileTypeCode != null">
269 - FILE_TYPE_ID = #{record.fileTypeId,jdbcType=NUMERIC}, 269 + FILE_TYPE_CODE = #{record.fileTypeCode,jdbcType=VARCHAR},
270 </if> 270 </if>
271 <if test="record.fileType != null"> 271 <if test="record.fileType != null">
272 FILE_TYPE = #{record.fileType,jdbcType=VARCHAR}, 272 FILE_TYPE = #{record.fileType,jdbcType=VARCHAR},
...@@ -311,9 +311,9 @@ ...@@ -311,9 +311,9 @@
311 set ID = #{record.id,jdbcType=NUMERIC}, 311 set ID = #{record.id,jdbcType=NUMERIC},
312 CONSIGNMENT_CODE = #{record.consignmentCode,jdbcType=VARCHAR}, 312 CONSIGNMENT_CODE = #{record.consignmentCode,jdbcType=VARCHAR},
313 CONSIGNMENT_ID = #{record.consignmentId,jdbcType=NUMERIC}, 313 CONSIGNMENT_ID = #{record.consignmentId,jdbcType=NUMERIC},
314 - STATUS_ID = #{record.statusId,jdbcType=NUMERIC}, 314 + STATUS_CODE = #{record.statusCode,jdbcType=VARCHAR},
315 STATUS_NAME = #{record.statusName,jdbcType=VARCHAR}, 315 STATUS_NAME = #{record.statusName,jdbcType=VARCHAR},
316 - FILE_TYPE_ID = #{record.fileTypeId,jdbcType=NUMERIC}, 316 + FILE_TYPE_CODE = #{record.fileTypeCode,jdbcType=VARCHAR},
317 FILE_TYPE = #{record.fileType,jdbcType=VARCHAR}, 317 FILE_TYPE = #{record.fileType,jdbcType=VARCHAR},
318 FILE_NAME = #{record.fileName,jdbcType=VARCHAR}, 318 FILE_NAME = #{record.fileName,jdbcType=VARCHAR},
319 PUSH_OB_ID = #{record.pushObId,jdbcType=NUMERIC}, 319 PUSH_OB_ID = #{record.pushObId,jdbcType=NUMERIC},
...@@ -338,14 +338,14 @@ ...@@ -338,14 +338,14 @@
338 <if test="consignmentId != null"> 338 <if test="consignmentId != null">
339 CONSIGNMENT_ID = #{consignmentId,jdbcType=NUMERIC}, 339 CONSIGNMENT_ID = #{consignmentId,jdbcType=NUMERIC},
340 </if> 340 </if>
341 - <if test="statusId != null"> 341 + <if test="statusCode != null">
342 - STATUS_ID = #{statusId,jdbcType=NUMERIC}, 342 + STATUS_CODE = #{statusCode,jdbcType=VARCHAR},
343 </if> 343 </if>
344 <if test="statusName != null"> 344 <if test="statusName != null">
345 STATUS_NAME = #{statusName,jdbcType=VARCHAR}, 345 STATUS_NAME = #{statusName,jdbcType=VARCHAR},
346 </if> 346 </if>
347 - <if test="fileTypeId != null"> 347 + <if test="fileTypeCode != null">
348 - FILE_TYPE_ID = #{fileTypeId,jdbcType=NUMERIC}, 348 + FILE_TYPE_CODE = #{fileTypeCode,jdbcType=VARCHAR},
349 </if> 349 </if>
350 <if test="fileType != null"> 350 <if test="fileType != null">
351 FILE_TYPE = #{fileType,jdbcType=VARCHAR}, 351 FILE_TYPE = #{fileType,jdbcType=VARCHAR},
...@@ -387,9 +387,9 @@ ...@@ -387,9 +387,9 @@
387 update T_BIZ_PUSH_OB_DETAIL 387 update T_BIZ_PUSH_OB_DETAIL
388 set CONSIGNMENT_CODE = #{consignmentCode,jdbcType=VARCHAR}, 388 set CONSIGNMENT_CODE = #{consignmentCode,jdbcType=VARCHAR},
389 CONSIGNMENT_ID = #{consignmentId,jdbcType=NUMERIC}, 389 CONSIGNMENT_ID = #{consignmentId,jdbcType=NUMERIC},
390 - STATUS_ID = #{statusId,jdbcType=NUMERIC}, 390 + STATUS_CODE = #{statusCode,jdbcType=VARCHAR},
391 STATUS_NAME = #{statusName,jdbcType=VARCHAR}, 391 STATUS_NAME = #{statusName,jdbcType=VARCHAR},
392 - FILE_TYPE_ID = #{fileTypeId,jdbcType=NUMERIC}, 392 + FILE_TYPE_CODE = #{fileTypeCode,jdbcType=VARCHAR},
393 FILE_TYPE = #{fileType,jdbcType=VARCHAR}, 393 FILE_TYPE = #{fileType,jdbcType=VARCHAR},
394 FILE_NAME = #{fileName,jdbcType=VARCHAR}, 394 FILE_NAME = #{fileName,jdbcType=VARCHAR},
395 PUSH_OB_ID = #{pushObId,jdbcType=NUMERIC}, 395 PUSH_OB_ID = #{pushObId,jdbcType=NUMERIC},
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 <result column="CONSIGNMENT_CODE" jdbcType="VARCHAR" property="consignmentCode" /> 6 <result column="CONSIGNMENT_CODE" jdbcType="VARCHAR" property="consignmentCode" />
7 <result column="CONSIGNMENT_ID" jdbcType="NUMERIC" property="consignmentId" /> 7 <result column="CONSIGNMENT_ID" jdbcType="NUMERIC" property="consignmentId" />
8 <result column="PUSH_TIME" jdbcType="TIMESTAMP" property="pushTime" /> 8 <result column="PUSH_TIME" jdbcType="TIMESTAMP" property="pushTime" />
9 - <result column="STATUS_ID" jdbcType="NUMERIC" property="statusId" /> 9 + <result column="STATUS_CODE" jdbcType="VARCHAR" property="statusCode" />
10 <result column="STATUS_NAME" jdbcType="VARCHAR" property="statusName" /> 10 <result column="STATUS_NAME" jdbcType="VARCHAR" property="statusName" />
11 <result column="PUSH_NUM" jdbcType="NUMERIC" property="pushNum" /> 11 <result column="PUSH_NUM" jdbcType="NUMERIC" property="pushNum" />
12 <result column="FILE_PATH" jdbcType="VARCHAR" property="filePath" /> 12 <result column="FILE_PATH" jdbcType="VARCHAR" property="filePath" />
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
79 </where> 79 </where>
80 </sql> 80 </sql>
81 <sql id="Base_Column_List"> 81 <sql id="Base_Column_List">
82 - ID, CONSIGNMENT_CODE, CONSIGNMENT_ID, PUSH_TIME, STATUS_ID, STATUS_NAME, PUSH_NUM, 82 + ID, CONSIGNMENT_CODE, CONSIGNMENT_ID, PUSH_TIME, STATUS_CODE, STATUS_NAME, PUSH_NUM,
83 FILE_PATH, FILE_BACK_PATH, FILE_NAME, REMARK, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, 83 FILE_PATH, FILE_BACK_PATH, FILE_NAME, REMARK, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME,
84 MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME 84 MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME
85 </sql> 85 </sql>
...@@ -121,13 +121,13 @@ ...@@ -121,13 +121,13 @@
121 SELECT SEQ_T_BIZ_PUSH_OB.NEXTVAL FROM DUAL 121 SELECT SEQ_T_BIZ_PUSH_OB.NEXTVAL FROM DUAL
122 </selectKey> 122 </selectKey>
123 insert into T_BIZ_PUSH_OB (ID, CONSIGNMENT_CODE, CONSIGNMENT_ID, 123 insert into T_BIZ_PUSH_OB (ID, CONSIGNMENT_CODE, CONSIGNMENT_ID,
124 - PUSH_TIME, STATUS_ID, STATUS_NAME, 124 + PUSH_TIME, STATUS_CODE, STATUS_NAME,
125 PUSH_NUM, FILE_PATH, FILE_BACK_PATH, 125 PUSH_NUM, FILE_PATH, FILE_BACK_PATH,
126 FILE_NAME, REMARK, CREATE_TIME, 126 FILE_NAME, REMARK, CREATE_TIME,
127 CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, 127 CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME,
128 MODIFY_USER_ID, MODIFY_USER_NAME) 128 MODIFY_USER_ID, MODIFY_USER_NAME)
129 values (#{id,jdbcType=NUMERIC}, #{consignmentCode,jdbcType=VARCHAR}, #{consignmentId,jdbcType=NUMERIC}, 129 values (#{id,jdbcType=NUMERIC}, #{consignmentCode,jdbcType=VARCHAR}, #{consignmentId,jdbcType=NUMERIC},
130 - #{pushTime,jdbcType=TIMESTAMP}, #{statusId,jdbcType=NUMERIC}, #{statusName,jdbcType=VARCHAR}, 130 + #{pushTime,jdbcType=TIMESTAMP}, #{statusCode,jdbcType=VARCHAR}, #{statusName,jdbcType=VARCHAR},
131 #{pushNum,jdbcType=NUMERIC}, #{filePath,jdbcType=VARCHAR}, #{fileBackPath,jdbcType=VARCHAR}, 131 #{pushNum,jdbcType=NUMERIC}, #{filePath,jdbcType=VARCHAR}, #{fileBackPath,jdbcType=VARCHAR},
132 #{fileName,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 132 #{fileName,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
133 #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, 133 #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP},
...@@ -149,8 +149,8 @@ ...@@ -149,8 +149,8 @@
149 <if test="pushTime != null"> 149 <if test="pushTime != null">
150 PUSH_TIME, 150 PUSH_TIME,
151 </if> 151 </if>
152 - <if test="statusId != null"> 152 + <if test="statusCode != null">
153 - STATUS_ID, 153 + STATUS_CODE,
154 </if> 154 </if>
155 <if test="statusName != null"> 155 <if test="statusName != null">
156 STATUS_NAME, 156 STATUS_NAME,
...@@ -200,8 +200,8 @@ ...@@ -200,8 +200,8 @@
200 <if test="pushTime != null"> 200 <if test="pushTime != null">
201 #{pushTime,jdbcType=TIMESTAMP}, 201 #{pushTime,jdbcType=TIMESTAMP},
202 </if> 202 </if>
203 - <if test="statusId != null"> 203 + <if test="statusCode != null">
204 - #{statusId,jdbcType=NUMERIC}, 204 + #{statusCode,jdbcType=VARCHAR},
205 </if> 205 </if>
206 <if test="statusName != null"> 206 <if test="statusName != null">
207 #{statusName,jdbcType=VARCHAR}, 207 #{statusName,jdbcType=VARCHAR},
...@@ -262,8 +262,8 @@ ...@@ -262,8 +262,8 @@
262 <if test="record.pushTime != null"> 262 <if test="record.pushTime != null">
263 PUSH_TIME = #{record.pushTime,jdbcType=TIMESTAMP}, 263 PUSH_TIME = #{record.pushTime,jdbcType=TIMESTAMP},
264 </if> 264 </if>
265 - <if test="record.statusId != null"> 265 + <if test="record.statusCode != null">
266 - STATUS_ID = #{record.statusId,jdbcType=NUMERIC}, 266 + STATUS_CODE = #{record.statusCode,jdbcType=VARCHAR},
267 </if> 267 </if>
268 <if test="record.statusName != null"> 268 <if test="record.statusName != null">
269 STATUS_NAME = #{record.statusName,jdbcType=VARCHAR}, 269 STATUS_NAME = #{record.statusName,jdbcType=VARCHAR},
...@@ -312,7 +312,7 @@ ...@@ -312,7 +312,7 @@
312 CONSIGNMENT_CODE = #{record.consignmentCode,jdbcType=VARCHAR}, 312 CONSIGNMENT_CODE = #{record.consignmentCode,jdbcType=VARCHAR},
313 CONSIGNMENT_ID = #{record.consignmentId,jdbcType=NUMERIC}, 313 CONSIGNMENT_ID = #{record.consignmentId,jdbcType=NUMERIC},
314 PUSH_TIME = #{record.pushTime,jdbcType=TIMESTAMP}, 314 PUSH_TIME = #{record.pushTime,jdbcType=TIMESTAMP},
315 - STATUS_ID = #{record.statusId,jdbcType=NUMERIC}, 315 + STATUS_CODE = #{record.statusCode,jdbcType=VARCHAR},
316 STATUS_NAME = #{record.statusName,jdbcType=VARCHAR}, 316 STATUS_NAME = #{record.statusName,jdbcType=VARCHAR},
317 PUSH_NUM = #{record.pushNum,jdbcType=NUMERIC}, 317 PUSH_NUM = #{record.pushNum,jdbcType=NUMERIC},
318 FILE_PATH = #{record.filePath,jdbcType=VARCHAR}, 318 FILE_PATH = #{record.filePath,jdbcType=VARCHAR},
...@@ -341,8 +341,8 @@ ...@@ -341,8 +341,8 @@
341 <if test="pushTime != null"> 341 <if test="pushTime != null">
342 PUSH_TIME = #{pushTime,jdbcType=TIMESTAMP}, 342 PUSH_TIME = #{pushTime,jdbcType=TIMESTAMP},
343 </if> 343 </if>
344 - <if test="statusId != null"> 344 + <if test="statusCode != null">
345 - STATUS_ID = #{statusId,jdbcType=NUMERIC}, 345 + STATUS_CODE = #{statusCode,jdbcType=VARCHAR},
346 </if> 346 </if>
347 <if test="statusName != null"> 347 <if test="statusName != null">
348 STATUS_NAME = #{statusName,jdbcType=VARCHAR}, 348 STATUS_NAME = #{statusName,jdbcType=VARCHAR},
...@@ -388,7 +388,7 @@ ...@@ -388,7 +388,7 @@
388 set CONSIGNMENT_CODE = #{consignmentCode,jdbcType=VARCHAR}, 388 set CONSIGNMENT_CODE = #{consignmentCode,jdbcType=VARCHAR},
389 CONSIGNMENT_ID = #{consignmentId,jdbcType=NUMERIC}, 389 CONSIGNMENT_ID = #{consignmentId,jdbcType=NUMERIC},
390 PUSH_TIME = #{pushTime,jdbcType=TIMESTAMP}, 390 PUSH_TIME = #{pushTime,jdbcType=TIMESTAMP},
391 - STATUS_ID = #{statusId,jdbcType=NUMERIC}, 391 + STATUS_CODE = #{statusCode,jdbcType=VARCHAR},
392 STATUS_NAME = #{statusName,jdbcType=VARCHAR}, 392 STATUS_NAME = #{statusName,jdbcType=VARCHAR},
393 PUSH_NUM = #{pushNum,jdbcType=NUMERIC}, 393 PUSH_NUM = #{pushNum,jdbcType=NUMERIC},
394 FILE_PATH = #{filePath,jdbcType=VARCHAR}, 394 FILE_PATH = #{filePath,jdbcType=VARCHAR},
......
...@@ -4,14 +4,15 @@ ...@@ -4,14 +4,15 @@
4 <resultMap id="BaseResultMap" type="com.fedex.connect.common.model.biz.UploadRecord"> 4 <resultMap id="BaseResultMap" type="com.fedex.connect.common.model.biz.UploadRecord">
5 <id column="ID" jdbcType="NUMERIC" property="id" /> 5 <id column="ID" jdbcType="NUMERIC" property="id" />
6 <result column="CONSIGNMENT_ID" jdbcType="NUMERIC" property="consignmentId" /> 6 <result column="CONSIGNMENT_ID" jdbcType="NUMERIC" property="consignmentId" />
7 - <result column="UPLOAD_STATUS" jdbcType="VARCHAR" property="uploadStatus" /> 7 + <result column="STATUS_CODE" jdbcType="VARCHAR" property="statusCode" />
8 - <result column="STATUS" jdbcType="NUMERIC" property="status" /> 8 + <result column="STATUS_NAME" jdbcType="VARCHAR" property="statusName" />
9 <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" /> 9 <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
10 <result column="CREATE_USER_ID" jdbcType="NUMERIC" property="createUserId" /> 10 <result column="CREATE_USER_ID" jdbcType="NUMERIC" property="createUserId" />
11 <result column="CREATE_USER_NAME" jdbcType="VARCHAR" property="createUserName" /> 11 <result column="CREATE_USER_NAME" jdbcType="VARCHAR" property="createUserName" />
12 <result column="MODIFY_TIME" jdbcType="TIMESTAMP" property="modifyTime" /> 12 <result column="MODIFY_TIME" jdbcType="TIMESTAMP" property="modifyTime" />
13 <result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" /> 13 <result column="MODIFY_USER_ID" jdbcType="NUMERIC" property="modifyUserId" />
14 <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" /> 14 <result column="MODIFY_USER_NAME" jdbcType="VARCHAR" property="modifyUserName" />
15 + <result column="CONSIGNMENT_CODE" jdbcType="VARCHAR" property="consignmentCode" />
15 </resultMap> 16 </resultMap>
16 <sql id="Example_Where_Clause"> 17 <sql id="Example_Where_Clause">
17 <where> 18 <where>
...@@ -72,8 +73,8 @@ ...@@ -72,8 +73,8 @@
72 </where> 73 </where>
73 </sql> 74 </sql>
74 <sql id="Base_Column_List"> 75 <sql id="Base_Column_List">
75 - ID, CONSIGNMENT_ID, UPLOAD_STATUS, STATUS, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, 76 + ID, CONSIGNMENT_ID, STATUS_CODE, STATUS_NAME, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME,
76 - MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME 77 + MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME, CONSIGNMENT_CODE
77 </sql> 78 </sql>
78 <select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.UploadRecordExample" resultMap="BaseResultMap"> 79 <select id="selectByExample" parameterType="com.fedex.connect.common.model.biz.UploadRecordExample" resultMap="BaseResultMap">
79 <include refid="OracleDialectPrefix" /> 80 <include refid="OracleDialectPrefix" />
...@@ -112,14 +113,14 @@ ...@@ -112,14 +113,14 @@
112 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 113 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
113 SELECT SEQ_T_BIZ_UPLOAD_RECORD.NEXTVAL FROM DUAL 114 SELECT SEQ_T_BIZ_UPLOAD_RECORD.NEXTVAL FROM DUAL
114 </selectKey> 115 </selectKey>
115 - insert into T_BIZ_UPLOAD_RECORD (ID, CONSIGNMENT_ID, UPLOAD_STATUS, 116 + insert into T_BIZ_UPLOAD_RECORD (ID, CONSIGNMENT_ID, STATUS_CODE,
116 - STATUS, CREATE_TIME, CREATE_USER_ID, 117 + STATUS_NAME, CREATE_TIME, CREATE_USER_ID,
117 CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, 118 CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID,
118 - MODIFY_USER_NAME) 119 + MODIFY_USER_NAME, CONSIGNMENT_CODE)
119 - values (#{id,jdbcType=NUMERIC}, #{consignmentId,jdbcType=NUMERIC}, #{uploadStatus,jdbcType=VARCHAR}, 120 + values (#{id,jdbcType=NUMERIC}, #{consignmentId,jdbcType=NUMERIC}, #{statusCode,jdbcType=VARCHAR},
120 - #{status,jdbcType=NUMERIC}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, 121 + #{statusName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC},
121 #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, 122 #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC},
122 - #{modifyUserName,jdbcType=VARCHAR}) 123 + #{modifyUserName,jdbcType=VARCHAR}, #{consignmentCode,jdbcType=VARCHAR})
123 </insert> 124 </insert>
124 <insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.UploadRecord"> 125 <insert id="insertSelective" parameterType="com.fedex.connect.common.model.biz.UploadRecord">
125 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 126 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
...@@ -131,11 +132,11 @@ ...@@ -131,11 +132,11 @@
131 <if test="consignmentId != null"> 132 <if test="consignmentId != null">
132 CONSIGNMENT_ID, 133 CONSIGNMENT_ID,
133 </if> 134 </if>
134 - <if test="uploadStatus != null"> 135 + <if test="statusCode != null">
135 - UPLOAD_STATUS, 136 + STATUS_CODE,
136 </if> 137 </if>
137 - <if test="status != null"> 138 + <if test="statusName != null">
138 - STATUS, 139 + STATUS_NAME,
139 </if> 140 </if>
140 <if test="createTime != null"> 141 <if test="createTime != null">
141 CREATE_TIME, 142 CREATE_TIME,
...@@ -155,17 +156,20 @@ ...@@ -155,17 +156,20 @@
155 <if test="modifyUserName != null"> 156 <if test="modifyUserName != null">
156 MODIFY_USER_NAME, 157 MODIFY_USER_NAME,
157 </if> 158 </if>
159 + <if test="consignmentCode != null">
160 + CONSIGNMENT_CODE,
161 + </if>
158 </trim> 162 </trim>
159 <trim prefix="values (" suffix=")" suffixOverrides=","> 163 <trim prefix="values (" suffix=")" suffixOverrides=",">
160 #{id,jdbcType=NUMERIC}, 164 #{id,jdbcType=NUMERIC},
161 <if test="consignmentId != null"> 165 <if test="consignmentId != null">
162 #{consignmentId,jdbcType=NUMERIC}, 166 #{consignmentId,jdbcType=NUMERIC},
163 </if> 167 </if>
164 - <if test="uploadStatus != null"> 168 + <if test="statusCode != null">
165 - #{uploadStatus,jdbcType=VARCHAR}, 169 + #{statusCode,jdbcType=VARCHAR},
166 </if> 170 </if>
167 - <if test="status != null"> 171 + <if test="statusName != null">
168 - #{status,jdbcType=NUMERIC}, 172 + #{statusName,jdbcType=VARCHAR},
169 </if> 173 </if>
170 <if test="createTime != null"> 174 <if test="createTime != null">
171 #{createTime,jdbcType=TIMESTAMP}, 175 #{createTime,jdbcType=TIMESTAMP},
...@@ -185,6 +189,9 @@ ...@@ -185,6 +189,9 @@
185 <if test="modifyUserName != null"> 189 <if test="modifyUserName != null">
186 #{modifyUserName,jdbcType=VARCHAR}, 190 #{modifyUserName,jdbcType=VARCHAR},
187 </if> 191 </if>
192 + <if test="consignmentCode != null">
193 + #{consignmentCode,jdbcType=VARCHAR},
194 + </if>
188 </trim> 195 </trim>
189 </insert> 196 </insert>
190 <select id="countByExample" parameterType="com.fedex.connect.common.model.biz.UploadRecordExample" resultType="java.lang.Long"> 197 <select id="countByExample" parameterType="com.fedex.connect.common.model.biz.UploadRecordExample" resultType="java.lang.Long">
...@@ -202,11 +209,11 @@ ...@@ -202,11 +209,11 @@
202 <if test="record.consignmentId != null"> 209 <if test="record.consignmentId != null">
203 CONSIGNMENT_ID = #{record.consignmentId,jdbcType=NUMERIC}, 210 CONSIGNMENT_ID = #{record.consignmentId,jdbcType=NUMERIC},
204 </if> 211 </if>
205 - <if test="record.uploadStatus != null"> 212 + <if test="record.statusCode != null">
206 - UPLOAD_STATUS = #{record.uploadStatus,jdbcType=VARCHAR}, 213 + STATUS_CODE = #{record.statusCode,jdbcType=VARCHAR},
207 </if> 214 </if>
208 - <if test="record.status != null"> 215 + <if test="record.statusName != null">
209 - STATUS = #{record.status,jdbcType=NUMERIC}, 216 + STATUS_NAME = #{record.statusName,jdbcType=VARCHAR},
210 </if> 217 </if>
211 <if test="record.createTime != null"> 218 <if test="record.createTime != null">
212 CREATE_TIME = #{record.createTime,jdbcType=TIMESTAMP}, 219 CREATE_TIME = #{record.createTime,jdbcType=TIMESTAMP},
...@@ -226,6 +233,9 @@ ...@@ -226,6 +233,9 @@
226 <if test="record.modifyUserName != null"> 233 <if test="record.modifyUserName != null">
227 MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR}, 234 MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
228 </if> 235 </if>
236 + <if test="record.consignmentCode != null">
237 + CONSIGNMENT_CODE = #{record.consignmentCode,jdbcType=VARCHAR},
238 + </if>
229 </set> 239 </set>
230 <if test="_parameter != null"> 240 <if test="_parameter != null">
231 <include refid="Update_By_Example_Where_Clause" /> 241 <include refid="Update_By_Example_Where_Clause" />
...@@ -235,14 +245,15 @@ ...@@ -235,14 +245,15 @@
235 update T_BIZ_UPLOAD_RECORD 245 update T_BIZ_UPLOAD_RECORD
236 set ID = #{record.id,jdbcType=NUMERIC}, 246 set ID = #{record.id,jdbcType=NUMERIC},
237 CONSIGNMENT_ID = #{record.consignmentId,jdbcType=NUMERIC}, 247 CONSIGNMENT_ID = #{record.consignmentId,jdbcType=NUMERIC},
238 - UPLOAD_STATUS = #{record.uploadStatus,jdbcType=VARCHAR}, 248 + STATUS_CODE = #{record.statusCode,jdbcType=VARCHAR},
239 - STATUS = #{record.status,jdbcType=NUMERIC}, 249 + STATUS_NAME = #{record.statusName,jdbcType=VARCHAR},
240 CREATE_TIME = #{record.createTime,jdbcType=TIMESTAMP}, 250 CREATE_TIME = #{record.createTime,jdbcType=TIMESTAMP},
241 CREATE_USER_ID = #{record.createUserId,jdbcType=NUMERIC}, 251 CREATE_USER_ID = #{record.createUserId,jdbcType=NUMERIC},
242 CREATE_USER_NAME = #{record.createUserName,jdbcType=VARCHAR}, 252 CREATE_USER_NAME = #{record.createUserName,jdbcType=VARCHAR},
243 MODIFY_TIME = #{record.modifyTime,jdbcType=TIMESTAMP}, 253 MODIFY_TIME = #{record.modifyTime,jdbcType=TIMESTAMP},
244 MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC}, 254 MODIFY_USER_ID = #{record.modifyUserId,jdbcType=NUMERIC},
245 - MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR} 255 + MODIFY_USER_NAME = #{record.modifyUserName,jdbcType=VARCHAR},
256 + CONSIGNMENT_CODE = #{record.consignmentCode,jdbcType=VARCHAR}
246 <if test="_parameter != null"> 257 <if test="_parameter != null">
247 <include refid="Update_By_Example_Where_Clause" /> 258 <include refid="Update_By_Example_Where_Clause" />
248 </if> 259 </if>
...@@ -253,11 +264,11 @@ ...@@ -253,11 +264,11 @@
253 <if test="consignmentId != null"> 264 <if test="consignmentId != null">
254 CONSIGNMENT_ID = #{consignmentId,jdbcType=NUMERIC}, 265 CONSIGNMENT_ID = #{consignmentId,jdbcType=NUMERIC},
255 </if> 266 </if>
256 - <if test="uploadStatus != null"> 267 + <if test="statusCode != null">
257 - UPLOAD_STATUS = #{uploadStatus,jdbcType=VARCHAR}, 268 + STATUS_CODE = #{statusCode,jdbcType=VARCHAR},
258 </if> 269 </if>
259 - <if test="status != null"> 270 + <if test="statusName != null">
260 - STATUS = #{status,jdbcType=NUMERIC}, 271 + STATUS_NAME = #{statusName,jdbcType=VARCHAR},
261 </if> 272 </if>
262 <if test="createTime != null"> 273 <if test="createTime != null">
263 CREATE_TIME = #{createTime,jdbcType=TIMESTAMP}, 274 CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
...@@ -277,20 +288,24 @@ ...@@ -277,20 +288,24 @@
277 <if test="modifyUserName != null"> 288 <if test="modifyUserName != null">
278 MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR}, 289 MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
279 </if> 290 </if>
291 + <if test="consignmentCode != null">
292 + CONSIGNMENT_CODE = #{consignmentCode,jdbcType=VARCHAR},
293 + </if>
280 </set> 294 </set>
281 where ID = #{id,jdbcType=NUMERIC} 295 where ID = #{id,jdbcType=NUMERIC}
282 </update> 296 </update>
283 <update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.biz.UploadRecord"> 297 <update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.biz.UploadRecord">
284 update T_BIZ_UPLOAD_RECORD 298 update T_BIZ_UPLOAD_RECORD
285 set CONSIGNMENT_ID = #{consignmentId,jdbcType=NUMERIC}, 299 set CONSIGNMENT_ID = #{consignmentId,jdbcType=NUMERIC},
286 - UPLOAD_STATUS = #{uploadStatus,jdbcType=VARCHAR}, 300 + STATUS_CODE = #{statusCode,jdbcType=VARCHAR},
287 - STATUS = #{status,jdbcType=NUMERIC}, 301 + STATUS_NAME = #{statusName,jdbcType=VARCHAR},
288 CREATE_TIME = #{createTime,jdbcType=TIMESTAMP}, 302 CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
289 CREATE_USER_ID = #{createUserId,jdbcType=NUMERIC}, 303 CREATE_USER_ID = #{createUserId,jdbcType=NUMERIC},
290 CREATE_USER_NAME = #{createUserName,jdbcType=VARCHAR}, 304 CREATE_USER_NAME = #{createUserName,jdbcType=VARCHAR},
291 MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP}, 305 MODIFY_TIME = #{modifyTime,jdbcType=TIMESTAMP},
292 MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC}, 306 MODIFY_USER_ID = #{modifyUserId,jdbcType=NUMERIC},
293 - MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR} 307 + MODIFY_USER_NAME = #{modifyUserName,jdbcType=VARCHAR},
308 + CONSIGNMENT_CODE = #{consignmentCode,jdbcType=VARCHAR}
294 where ID = #{id,jdbcType=NUMERIC} 309 where ID = #{id,jdbcType=NUMERIC}
295 </update> 310 </update>
296 <sql id="OracleDialectPrefix"> 311 <sql id="OracleDialectPrefix">
......
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
8 <result column="TO_ADDRESS" jdbcType="VARCHAR" property="toAddress" /> 8 <result column="TO_ADDRESS" jdbcType="VARCHAR" property="toAddress" />
9 <result column="CC_ADDRESS" jdbcType="VARCHAR" property="ccAddress" /> 9 <result column="CC_ADDRESS" jdbcType="VARCHAR" property="ccAddress" />
10 <result column="SUBJECT" jdbcType="VARCHAR" property="subject" /> 10 <result column="SUBJECT" jdbcType="VARCHAR" property="subject" />
11 - <result column="TYPE_ID" jdbcType="NUMERIC" property="typeId" /> 11 + <result column="TYPE_CODE" jdbcType="VARCHAR" property="typeCode" />
12 <result column="TYPE_NAME" jdbcType="VARCHAR" property="typeName" /> 12 <result column="TYPE_NAME" jdbcType="VARCHAR" property="typeName" />
13 - <result column="STATUS_ID" jdbcType="NUMERIC" property="statusId" /> 13 + <result column="STATUS_CODE" jdbcType="VARCHAR" property="statusCode" />
14 <result column="STATUS_NAME" jdbcType="VARCHAR" property="statusName" /> 14 <result column="STATUS_NAME" jdbcType="VARCHAR" property="statusName" />
15 <result column="SEND_NUM" jdbcType="NUMERIC" property="sendNum" /> 15 <result column="SEND_NUM" jdbcType="NUMERIC" property="sendNum" />
16 <result column="SEND_TIME" jdbcType="TIMESTAMP" property="sendTime" /> 16 <result column="SEND_TIME" jdbcType="TIMESTAMP" property="sendTime" />
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
83 </where> 83 </where>
84 </sql> 84 </sql>
85 <sql id="Base_Column_List"> 85 <sql id="Base_Column_List">
86 - ID, BIZ_ID, BIZ_CODE, TO_ADDRESS, CC_ADDRESS, SUBJECT, TYPE_ID, TYPE_NAME, STATUS_ID, 86 + ID, BIZ_ID, BIZ_CODE, TO_ADDRESS, CC_ADDRESS, SUBJECT, TYPE_CODE, TYPE_NAME, STATUS_CODE,
87 STATUS_NAME, SEND_NUM, SEND_TIME, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, 87 STATUS_NAME, SEND_NUM, SEND_TIME, CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME,
88 MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME 88 MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME
89 </sql> 89 </sql>
...@@ -148,14 +148,14 @@ ...@@ -148,14 +148,14 @@
148 </selectKey> 148 </selectKey>
149 insert into T_LOG_EMAIL_HISTORY (ID, BIZ_ID, BIZ_CODE, 149 insert into T_LOG_EMAIL_HISTORY (ID, BIZ_ID, BIZ_CODE,
150 TO_ADDRESS, CC_ADDRESS, SUBJECT, 150 TO_ADDRESS, CC_ADDRESS, SUBJECT,
151 - TYPE_ID, TYPE_NAME, STATUS_ID, 151 + TYPE_CODE, TYPE_NAME, STATUS_CODE,
152 STATUS_NAME, SEND_NUM, SEND_TIME, 152 STATUS_NAME, SEND_NUM, SEND_TIME,
153 CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, 153 CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME,
154 MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME, 154 MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME,
155 BODY) 155 BODY)
156 values (#{id,jdbcType=NUMERIC}, #{bizId,jdbcType=NUMERIC}, #{bizCode,jdbcType=VARCHAR}, 156 values (#{id,jdbcType=NUMERIC}, #{bizId,jdbcType=NUMERIC}, #{bizCode,jdbcType=VARCHAR},
157 #{toAddress,jdbcType=VARCHAR}, #{ccAddress,jdbcType=VARCHAR}, #{subject,jdbcType=VARCHAR}, 157 #{toAddress,jdbcType=VARCHAR}, #{ccAddress,jdbcType=VARCHAR}, #{subject,jdbcType=VARCHAR},
158 - #{typeId,jdbcType=NUMERIC}, #{typeName,jdbcType=VARCHAR}, #{statusId,jdbcType=NUMERIC}, 158 + #{typeCode,jdbcType=VARCHAR}, #{typeName,jdbcType=VARCHAR}, #{statusCode,jdbcType=VARCHAR},
159 #{statusName,jdbcType=VARCHAR}, #{sendNum,jdbcType=NUMERIC}, #{sendTime,jdbcType=TIMESTAMP}, 159 #{statusName,jdbcType=VARCHAR}, #{sendNum,jdbcType=NUMERIC}, #{sendTime,jdbcType=TIMESTAMP},
160 #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, 160 #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR},
161 #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR}, 161 #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR},
...@@ -183,14 +183,14 @@ ...@@ -183,14 +183,14 @@
183 <if test="subject != null"> 183 <if test="subject != null">
184 SUBJECT, 184 SUBJECT,
185 </if> 185 </if>
186 - <if test="typeId != null"> 186 + <if test="typeCode != null">
187 - TYPE_ID, 187 + TYPE_CODE,
188 </if> 188 </if>
189 <if test="typeName != null"> 189 <if test="typeName != null">
190 TYPE_NAME, 190 TYPE_NAME,
191 </if> 191 </if>
192 - <if test="statusId != null"> 192 + <if test="statusCode != null">
193 - STATUS_ID, 193 + STATUS_CODE,
194 </if> 194 </if>
195 <if test="statusName != null"> 195 <if test="statusName != null">
196 STATUS_NAME, 196 STATUS_NAME,
...@@ -240,14 +240,14 @@ ...@@ -240,14 +240,14 @@
240 <if test="subject != null"> 240 <if test="subject != null">
241 #{subject,jdbcType=VARCHAR}, 241 #{subject,jdbcType=VARCHAR},
242 </if> 242 </if>
243 - <if test="typeId != null"> 243 + <if test="typeCode != null">
244 - #{typeId,jdbcType=NUMERIC}, 244 + #{typeCode,jdbcType=VARCHAR},
245 </if> 245 </if>
246 <if test="typeName != null"> 246 <if test="typeName != null">
247 #{typeName,jdbcType=VARCHAR}, 247 #{typeName,jdbcType=VARCHAR},
248 </if> 248 </if>
249 - <if test="statusId != null"> 249 + <if test="statusCode != null">
250 - #{statusId,jdbcType=NUMERIC}, 250 + #{statusCode,jdbcType=VARCHAR},
251 </if> 251 </if>
252 <if test="statusName != null"> 252 <if test="statusName != null">
253 #{statusName,jdbcType=VARCHAR}, 253 #{statusName,jdbcType=VARCHAR},
...@@ -308,14 +308,14 @@ ...@@ -308,14 +308,14 @@
308 <if test="record.subject != null"> 308 <if test="record.subject != null">
309 SUBJECT = #{record.subject,jdbcType=VARCHAR}, 309 SUBJECT = #{record.subject,jdbcType=VARCHAR},
310 </if> 310 </if>
311 - <if test="record.typeId != null"> 311 + <if test="record.typeCode != null">
312 - TYPE_ID = #{record.typeId,jdbcType=NUMERIC}, 312 + TYPE_CODE = #{record.typeCode,jdbcType=VARCHAR},
313 </if> 313 </if>
314 <if test="record.typeName != null"> 314 <if test="record.typeName != null">
315 TYPE_NAME = #{record.typeName,jdbcType=VARCHAR}, 315 TYPE_NAME = #{record.typeName,jdbcType=VARCHAR},
316 </if> 316 </if>
317 - <if test="record.statusId != null"> 317 + <if test="record.statusCode != null">
318 - STATUS_ID = #{record.statusId,jdbcType=NUMERIC}, 318 + STATUS_CODE = #{record.statusCode,jdbcType=VARCHAR},
319 </if> 319 </if>
320 <if test="record.statusName != null"> 320 <if test="record.statusName != null">
321 STATUS_NAME = #{record.statusName,jdbcType=VARCHAR}, 321 STATUS_NAME = #{record.statusName,jdbcType=VARCHAR},
...@@ -360,9 +360,9 @@ ...@@ -360,9 +360,9 @@
360 TO_ADDRESS = #{record.toAddress,jdbcType=VARCHAR}, 360 TO_ADDRESS = #{record.toAddress,jdbcType=VARCHAR},
361 CC_ADDRESS = #{record.ccAddress,jdbcType=VARCHAR}, 361 CC_ADDRESS = #{record.ccAddress,jdbcType=VARCHAR},
362 SUBJECT = #{record.subject,jdbcType=VARCHAR}, 362 SUBJECT = #{record.subject,jdbcType=VARCHAR},
363 - TYPE_ID = #{record.typeId,jdbcType=NUMERIC}, 363 + TYPE_CODE = #{record.typeCode,jdbcType=VARCHAR},
364 TYPE_NAME = #{record.typeName,jdbcType=VARCHAR}, 364 TYPE_NAME = #{record.typeName,jdbcType=VARCHAR},
365 - STATUS_ID = #{record.statusId,jdbcType=NUMERIC}, 365 + STATUS_CODE = #{record.statusCode,jdbcType=VARCHAR},
366 STATUS_NAME = #{record.statusName,jdbcType=VARCHAR}, 366 STATUS_NAME = #{record.statusName,jdbcType=VARCHAR},
367 SEND_NUM = #{record.sendNum,jdbcType=NUMERIC}, 367 SEND_NUM = #{record.sendNum,jdbcType=NUMERIC},
368 SEND_TIME = #{record.sendTime,jdbcType=TIMESTAMP}, 368 SEND_TIME = #{record.sendTime,jdbcType=TIMESTAMP},
...@@ -385,9 +385,9 @@ ...@@ -385,9 +385,9 @@
385 TO_ADDRESS = #{record.toAddress,jdbcType=VARCHAR}, 385 TO_ADDRESS = #{record.toAddress,jdbcType=VARCHAR},
386 CC_ADDRESS = #{record.ccAddress,jdbcType=VARCHAR}, 386 CC_ADDRESS = #{record.ccAddress,jdbcType=VARCHAR},
387 SUBJECT = #{record.subject,jdbcType=VARCHAR}, 387 SUBJECT = #{record.subject,jdbcType=VARCHAR},
388 - TYPE_ID = #{record.typeId,jdbcType=NUMERIC}, 388 + TYPE_CODE = #{record.typeCode,jdbcType=VARCHAR},
389 TYPE_NAME = #{record.typeName,jdbcType=VARCHAR}, 389 TYPE_NAME = #{record.typeName,jdbcType=VARCHAR},
390 - STATUS_ID = #{record.statusId,jdbcType=NUMERIC}, 390 + STATUS_CODE = #{record.statusCode,jdbcType=VARCHAR},
391 STATUS_NAME = #{record.statusName,jdbcType=VARCHAR}, 391 STATUS_NAME = #{record.statusName,jdbcType=VARCHAR},
392 SEND_NUM = #{record.sendNum,jdbcType=NUMERIC}, 392 SEND_NUM = #{record.sendNum,jdbcType=NUMERIC},
393 SEND_TIME = #{record.sendTime,jdbcType=TIMESTAMP}, 393 SEND_TIME = #{record.sendTime,jdbcType=TIMESTAMP},
...@@ -419,14 +419,14 @@ ...@@ -419,14 +419,14 @@
419 <if test="subject != null"> 419 <if test="subject != null">
420 SUBJECT = #{subject,jdbcType=VARCHAR}, 420 SUBJECT = #{subject,jdbcType=VARCHAR},
421 </if> 421 </if>
422 - <if test="typeId != null"> 422 + <if test="typeCode != null">
423 - TYPE_ID = #{typeId,jdbcType=NUMERIC}, 423 + TYPE_CODE = #{typeCode,jdbcType=VARCHAR},
424 </if> 424 </if>
425 <if test="typeName != null"> 425 <if test="typeName != null">
426 TYPE_NAME = #{typeName,jdbcType=VARCHAR}, 426 TYPE_NAME = #{typeName,jdbcType=VARCHAR},
427 </if> 427 </if>
428 - <if test="statusId != null"> 428 + <if test="statusCode != null">
429 - STATUS_ID = #{statusId,jdbcType=NUMERIC}, 429 + STATUS_CODE = #{statusCode,jdbcType=VARCHAR},
430 </if> 430 </if>
431 <if test="statusName != null"> 431 <if test="statusName != null">
432 STATUS_NAME = #{statusName,jdbcType=VARCHAR}, 432 STATUS_NAME = #{statusName,jdbcType=VARCHAR},
...@@ -468,9 +468,9 @@ ...@@ -468,9 +468,9 @@
468 TO_ADDRESS = #{toAddress,jdbcType=VARCHAR}, 468 TO_ADDRESS = #{toAddress,jdbcType=VARCHAR},
469 CC_ADDRESS = #{ccAddress,jdbcType=VARCHAR}, 469 CC_ADDRESS = #{ccAddress,jdbcType=VARCHAR},
470 SUBJECT = #{subject,jdbcType=VARCHAR}, 470 SUBJECT = #{subject,jdbcType=VARCHAR},
471 - TYPE_ID = #{typeId,jdbcType=NUMERIC}, 471 + TYPE_CODE = #{typeCode,jdbcType=VARCHAR},
472 TYPE_NAME = #{typeName,jdbcType=VARCHAR}, 472 TYPE_NAME = #{typeName,jdbcType=VARCHAR},
473 - STATUS_ID = #{statusId,jdbcType=NUMERIC}, 473 + STATUS_CODE = #{statusCode,jdbcType=VARCHAR},
474 STATUS_NAME = #{statusName,jdbcType=VARCHAR}, 474 STATUS_NAME = #{statusName,jdbcType=VARCHAR},
475 SEND_NUM = #{sendNum,jdbcType=NUMERIC}, 475 SEND_NUM = #{sendNum,jdbcType=NUMERIC},
476 SEND_TIME = #{sendTime,jdbcType=TIMESTAMP}, 476 SEND_TIME = #{sendTime,jdbcType=TIMESTAMP},
...@@ -490,9 +490,9 @@ ...@@ -490,9 +490,9 @@
490 TO_ADDRESS = #{toAddress,jdbcType=VARCHAR}, 490 TO_ADDRESS = #{toAddress,jdbcType=VARCHAR},
491 CC_ADDRESS = #{ccAddress,jdbcType=VARCHAR}, 491 CC_ADDRESS = #{ccAddress,jdbcType=VARCHAR},
492 SUBJECT = #{subject,jdbcType=VARCHAR}, 492 SUBJECT = #{subject,jdbcType=VARCHAR},
493 - TYPE_ID = #{typeId,jdbcType=NUMERIC}, 493 + TYPE_CODE = #{typeCode,jdbcType=VARCHAR},
494 TYPE_NAME = #{typeName,jdbcType=VARCHAR}, 494 TYPE_NAME = #{typeName,jdbcType=VARCHAR},
495 - STATUS_ID = #{statusId,jdbcType=NUMERIC}, 495 + STATUS_CODE = #{statusCode,jdbcType=VARCHAR},
496 STATUS_NAME = #{statusName,jdbcType=VARCHAR}, 496 STATUS_NAME = #{statusName,jdbcType=VARCHAR},
497 SEND_NUM = #{sendNum,jdbcType=NUMERIC}, 497 SEND_NUM = #{sendNum,jdbcType=NUMERIC},
498 SEND_TIME = #{sendTime,jdbcType=TIMESTAMP}, 498 SEND_TIME = #{sendTime,jdbcType=TIMESTAMP},
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 <resultMap id="BaseResultMap" type="com.fedex.connect.common.model.log.UserLoginInfo"> 4 <resultMap id="BaseResultMap" type="com.fedex.connect.common.model.log.UserLoginInfo">
5 <id column="ID" jdbcType="NUMERIC" property="id" /> 5 <id column="ID" jdbcType="NUMERIC" property="id" />
6 <result column="USER_ID" jdbcType="NUMERIC" property="userId" /> 6 <result column="USER_ID" jdbcType="NUMERIC" property="userId" />
7 - <result column="OPER_TYPE_ID" jdbcType="NUMERIC" property="operTypeId" /> 7 + <result column="OPER_TYPE_CODE" jdbcType="VARCHAR" property="operTypeCode" />
8 <result column="OPER_TYPE_NAME" jdbcType="VARCHAR" property="operTypeName" /> 8 <result column="OPER_TYPE_NAME" jdbcType="VARCHAR" property="operTypeName" />
9 <result column="OPER_DESC" jdbcType="VARCHAR" property="operDesc" /> 9 <result column="OPER_DESC" jdbcType="VARCHAR" property="operDesc" />
10 <result column="IP" jdbcType="VARCHAR" property="ip" /> 10 <result column="IP" jdbcType="VARCHAR" property="ip" />
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
74 </where> 74 </where>
75 </sql> 75 </sql>
76 <sql id="Base_Column_List"> 76 <sql id="Base_Column_List">
77 - ID, USER_ID, OPER_TYPE_ID, OPER_TYPE_NAME, OPER_DESC, IP, CREATE_TIME, CREATE_USER_ID, 77 + ID, USER_ID, OPER_TYPE_CODE, OPER_TYPE_NAME, OPER_DESC, IP, CREATE_TIME, CREATE_USER_ID,
78 CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME 78 CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME
79 </sql> 79 </sql>
80 <select id="selectByExample" parameterType="com.fedex.connect.common.model.log.UserLoginInfoExample" resultMap="BaseResultMap"> 80 <select id="selectByExample" parameterType="com.fedex.connect.common.model.log.UserLoginInfoExample" resultMap="BaseResultMap">
...@@ -114,12 +114,12 @@ ...@@ -114,12 +114,12 @@
114 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 114 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
115 SELECT SEQ_T_LOG_USER_LOGIN_INFO.NEXTVAL FROM DUAL 115 SELECT SEQ_T_LOG_USER_LOGIN_INFO.NEXTVAL FROM DUAL
116 </selectKey> 116 </selectKey>
117 - insert into T_LOG_USER_LOGIN_INFO (ID, USER_ID, OPER_TYPE_ID, 117 + insert into T_LOG_USER_LOGIN_INFO (ID, USER_ID, OPER_TYPE_CODE,
118 OPER_TYPE_NAME, OPER_DESC, IP, 118 OPER_TYPE_NAME, OPER_DESC, IP,
119 CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, 119 CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME,
120 MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME 120 MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME
121 ) 121 )
122 - values (#{id,jdbcType=NUMERIC}, #{userId,jdbcType=NUMERIC}, #{operTypeId,jdbcType=NUMERIC}, 122 + values (#{id,jdbcType=NUMERIC}, #{userId,jdbcType=NUMERIC}, #{operTypeCode,jdbcType=VARCHAR},
123 #{operTypeName,jdbcType=VARCHAR}, #{operDesc,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, 123 #{operTypeName,jdbcType=VARCHAR}, #{operDesc,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR},
124 #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, 124 #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR},
125 #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR} 125 #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR}
...@@ -135,8 +135,8 @@ ...@@ -135,8 +135,8 @@
135 <if test="userId != null"> 135 <if test="userId != null">
136 USER_ID, 136 USER_ID,
137 </if> 137 </if>
138 - <if test="operTypeId != null"> 138 + <if test="operTypeCode != null">
139 - OPER_TYPE_ID, 139 + OPER_TYPE_CODE,
140 </if> 140 </if>
141 <if test="operTypeName != null"> 141 <if test="operTypeName != null">
142 OPER_TYPE_NAME, 142 OPER_TYPE_NAME,
...@@ -171,8 +171,8 @@ ...@@ -171,8 +171,8 @@
171 <if test="userId != null"> 171 <if test="userId != null">
172 #{userId,jdbcType=NUMERIC}, 172 #{userId,jdbcType=NUMERIC},
173 </if> 173 </if>
174 - <if test="operTypeId != null"> 174 + <if test="operTypeCode != null">
175 - #{operTypeId,jdbcType=NUMERIC}, 175 + #{operTypeCode,jdbcType=VARCHAR},
176 </if> 176 </if>
177 <if test="operTypeName != null"> 177 <if test="operTypeName != null">
178 #{operTypeName,jdbcType=VARCHAR}, 178 #{operTypeName,jdbcType=VARCHAR},
...@@ -218,8 +218,8 @@ ...@@ -218,8 +218,8 @@
218 <if test="record.userId != null"> 218 <if test="record.userId != null">
219 USER_ID = #{record.userId,jdbcType=NUMERIC}, 219 USER_ID = #{record.userId,jdbcType=NUMERIC},
220 </if> 220 </if>
221 - <if test="record.operTypeId != null"> 221 + <if test="record.operTypeCode != null">
222 - OPER_TYPE_ID = #{record.operTypeId,jdbcType=NUMERIC}, 222 + OPER_TYPE_CODE = #{record.operTypeCode,jdbcType=VARCHAR},
223 </if> 223 </if>
224 <if test="record.operTypeName != null"> 224 <if test="record.operTypeName != null">
225 OPER_TYPE_NAME = #{record.operTypeName,jdbcType=VARCHAR}, 225 OPER_TYPE_NAME = #{record.operTypeName,jdbcType=VARCHAR},
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
257 update T_LOG_USER_LOGIN_INFO 257 update T_LOG_USER_LOGIN_INFO
258 set ID = #{record.id,jdbcType=NUMERIC}, 258 set ID = #{record.id,jdbcType=NUMERIC},
259 USER_ID = #{record.userId,jdbcType=NUMERIC}, 259 USER_ID = #{record.userId,jdbcType=NUMERIC},
260 - OPER_TYPE_ID = #{record.operTypeId,jdbcType=NUMERIC}, 260 + OPER_TYPE_CODE = #{record.operTypeCode,jdbcType=VARCHAR},
261 OPER_TYPE_NAME = #{record.operTypeName,jdbcType=VARCHAR}, 261 OPER_TYPE_NAME = #{record.operTypeName,jdbcType=VARCHAR},
262 OPER_DESC = #{record.operDesc,jdbcType=VARCHAR}, 262 OPER_DESC = #{record.operDesc,jdbcType=VARCHAR},
263 IP = #{record.ip,jdbcType=VARCHAR}, 263 IP = #{record.ip,jdbcType=VARCHAR},
...@@ -277,8 +277,8 @@ ...@@ -277,8 +277,8 @@
277 <if test="userId != null"> 277 <if test="userId != null">
278 USER_ID = #{userId,jdbcType=NUMERIC}, 278 USER_ID = #{userId,jdbcType=NUMERIC},
279 </if> 279 </if>
280 - <if test="operTypeId != null"> 280 + <if test="operTypeCode != null">
281 - OPER_TYPE_ID = #{operTypeId,jdbcType=NUMERIC}, 281 + OPER_TYPE_CODE = #{operTypeCode,jdbcType=VARCHAR},
282 </if> 282 </if>
283 <if test="operTypeName != null"> 283 <if test="operTypeName != null">
284 OPER_TYPE_NAME = #{operTypeName,jdbcType=VARCHAR}, 284 OPER_TYPE_NAME = #{operTypeName,jdbcType=VARCHAR},
...@@ -313,7 +313,7 @@ ...@@ -313,7 +313,7 @@
313 <update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.log.UserLoginInfo"> 313 <update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.log.UserLoginInfo">
314 update T_LOG_USER_LOGIN_INFO 314 update T_LOG_USER_LOGIN_INFO
315 set USER_ID = #{userId,jdbcType=NUMERIC}, 315 set USER_ID = #{userId,jdbcType=NUMERIC},
316 - OPER_TYPE_ID = #{operTypeId,jdbcType=NUMERIC}, 316 + OPER_TYPE_CODE = #{operTypeCode,jdbcType=VARCHAR},
317 OPER_TYPE_NAME = #{operTypeName,jdbcType=VARCHAR}, 317 OPER_TYPE_NAME = #{operTypeName,jdbcType=VARCHAR},
318 OPER_DESC = #{operDesc,jdbcType=VARCHAR}, 318 OPER_DESC = #{operDesc,jdbcType=VARCHAR},
319 IP = #{ip,jdbcType=VARCHAR}, 319 IP = #{ip,jdbcType=VARCHAR},
......
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
98 <include refid="Base_Column_List" /> 98 <include refid="Base_Column_List" />
99 , 99 ,
100 <include refid="Blob_Column_List" /> 100 <include refid="Blob_Column_List" />
101 - from T_SYS_KAFKA_TEMPORARY_STORAGE 101 + from ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE
102 <if test="_parameter != null"> 102 <if test="_parameter != null">
103 <include refid="Example_Where_Clause" /> 103 <include refid="Example_Where_Clause" />
104 </if> 104 </if>
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
114 </if> 114 </if>
115 'true' as QUERYID, 115 'true' as QUERYID,
116 <include refid="Base_Column_List" /> 116 <include refid="Base_Column_List" />
117 - from T_SYS_KAFKA_TEMPORARY_STORAGE 117 + from ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE
118 <if test="_parameter != null"> 118 <if test="_parameter != null">
119 <include refid="Example_Where_Clause" /> 119 <include refid="Example_Where_Clause" />
120 </if> 120 </if>
...@@ -128,15 +128,15 @@ ...@@ -128,15 +128,15 @@
128 <include refid="Base_Column_List" /> 128 <include refid="Base_Column_List" />
129 , 129 ,
130 <include refid="Blob_Column_List" /> 130 <include refid="Blob_Column_List" />
131 - from T_SYS_KAFKA_TEMPORARY_STORAGE 131 + from ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE
132 where ID = #{id,jdbcType=NUMERIC} 132 where ID = #{id,jdbcType=NUMERIC}
133 </select> 133 </select>
134 <delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> 134 <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
135 - delete from T_SYS_KAFKA_TEMPORARY_STORAGE 135 + delete from ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE
136 where ID = #{id,jdbcType=NUMERIC} 136 where ID = #{id,jdbcType=NUMERIC}
137 </delete> 137 </delete>
138 <delete id="deleteByExample" parameterType="com.fedex.connect.common.model.sys.KafkaTemporaryStorageExample"> 138 <delete id="deleteByExample" parameterType="com.fedex.connect.common.model.sys.KafkaTemporaryStorageExample">
139 - delete from T_SYS_KAFKA_TEMPORARY_STORAGE 139 + delete from ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE
140 <if test="_parameter != null"> 140 <if test="_parameter != null">
141 <include refid="Example_Where_Clause" /> 141 <include refid="Example_Where_Clause" />
142 </if> 142 </if>
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
145 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 145 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
146 SELECT SEQ_T_SYS_KAFKA_TEMPORARY_STORAGE.NEXTVAL FROM DUAL 146 SELECT SEQ_T_SYS_KAFKA_TEMPORARY_STORAGE.NEXTVAL FROM DUAL
147 </selectKey> 147 </selectKey>
148 - insert into T_SYS_KAFKA_TEMPORARY_STORAGE (ID, MESSAGE_ID, MESSAGE_CODE, 148 + insert into ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE (ID, MESSAGE_ID, MESSAGE_CODE,
149 SENDER_ID, RECEIVER_ID, SEND_TIME, 149 SENDER_ID, RECEIVER_ID, SEND_TIME,
150 CONSIGNMENT_CODE, FREQUENCY, STATUS, 150 CONSIGNMENT_CODE, FREQUENCY, STATUS,
151 STATUS_NAME, REMARK, CREATE_TIME, 151 STATUS_NAME, REMARK, CREATE_TIME,
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
164 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 164 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
165 SELECT SEQ_T_SYS_KAFKA_TEMPORARY_STORAGE.NEXTVAL FROM DUAL 165 SELECT SEQ_T_SYS_KAFKA_TEMPORARY_STORAGE.NEXTVAL FROM DUAL
166 </selectKey> 166 </selectKey>
167 - insert into T_SYS_KAFKA_TEMPORARY_STORAGE 167 + insert into ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE
168 <trim prefix="(" suffix=")" suffixOverrides=","> 168 <trim prefix="(" suffix=")" suffixOverrides=",">
169 ID, 169 ID,
170 <if test="messageId != null"> 170 <if test="messageId != null">
...@@ -275,13 +275,13 @@ ...@@ -275,13 +275,13 @@
275 </trim> 275 </trim>
276 </insert> 276 </insert>
277 <select id="countByExample" parameterType="com.fedex.connect.common.model.sys.KafkaTemporaryStorageExample" resultType="java.lang.Long"> 277 <select id="countByExample" parameterType="com.fedex.connect.common.model.sys.KafkaTemporaryStorageExample" resultType="java.lang.Long">
278 - select count(*) from T_SYS_KAFKA_TEMPORARY_STORAGE 278 + select count(*) from ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE
279 <if test="_parameter != null"> 279 <if test="_parameter != null">
280 <include refid="Example_Where_Clause" /> 280 <include refid="Example_Where_Clause" />
281 </if> 281 </if>
282 </select> 282 </select>
283 <update id="updateByExampleSelective" parameterType="map"> 283 <update id="updateByExampleSelective" parameterType="map">
284 - update T_SYS_KAFKA_TEMPORARY_STORAGE 284 + update ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE
285 <set> 285 <set>
286 <if test="record.id != null"> 286 <if test="record.id != null">
287 ID = #{record.id,jdbcType=NUMERIC}, 287 ID = #{record.id,jdbcType=NUMERIC},
...@@ -343,7 +343,7 @@ ...@@ -343,7 +343,7 @@
343 </if> 343 </if>
344 </update> 344 </update>
345 <update id="updateByExampleWithBLOBs" parameterType="map"> 345 <update id="updateByExampleWithBLOBs" parameterType="map">
346 - update T_SYS_KAFKA_TEMPORARY_STORAGE 346 + update ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE
347 set ID = #{record.id,jdbcType=NUMERIC}, 347 set ID = #{record.id,jdbcType=NUMERIC},
348 MESSAGE_ID = #{record.messageId,jdbcType=VARCHAR}, 348 MESSAGE_ID = #{record.messageId,jdbcType=VARCHAR},
349 MESSAGE_CODE = #{record.messageCode,jdbcType=VARCHAR}, 349 MESSAGE_CODE = #{record.messageCode,jdbcType=VARCHAR},
...@@ -367,7 +367,7 @@ ...@@ -367,7 +367,7 @@
367 </if> 367 </if>
368 </update> 368 </update>
369 <update id="updateByExample" parameterType="map"> 369 <update id="updateByExample" parameterType="map">
370 - update T_SYS_KAFKA_TEMPORARY_STORAGE 370 + update ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE
371 set ID = #{record.id,jdbcType=NUMERIC}, 371 set ID = #{record.id,jdbcType=NUMERIC},
372 MESSAGE_ID = #{record.messageId,jdbcType=VARCHAR}, 372 MESSAGE_ID = #{record.messageId,jdbcType=VARCHAR},
373 MESSAGE_CODE = #{record.messageCode,jdbcType=VARCHAR}, 373 MESSAGE_CODE = #{record.messageCode,jdbcType=VARCHAR},
...@@ -390,7 +390,7 @@ ...@@ -390,7 +390,7 @@
390 </if> 390 </if>
391 </update> 391 </update>
392 <update id="updateByPrimaryKeySelective" parameterType="com.fedex.connect.common.model.sys.KafkaTemporaryStorage"> 392 <update id="updateByPrimaryKeySelective" parameterType="com.fedex.connect.common.model.sys.KafkaTemporaryStorage">
393 - update T_SYS_KAFKA_TEMPORARY_STORAGE 393 + update ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE
394 <set> 394 <set>
395 <if test="messageId != null"> 395 <if test="messageId != null">
396 MESSAGE_ID = #{messageId,jdbcType=VARCHAR}, 396 MESSAGE_ID = #{messageId,jdbcType=VARCHAR},
...@@ -447,7 +447,7 @@ ...@@ -447,7 +447,7 @@
447 where ID = #{id,jdbcType=NUMERIC} 447 where ID = #{id,jdbcType=NUMERIC}
448 </update> 448 </update>
449 <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.fedex.connect.common.model.sys.KafkaTemporaryStorage"> 449 <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.fedex.connect.common.model.sys.KafkaTemporaryStorage">
450 - update T_SYS_KAFKA_TEMPORARY_STORAGE 450 + update ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE
451 set MESSAGE_ID = #{messageId,jdbcType=VARCHAR}, 451 set MESSAGE_ID = #{messageId,jdbcType=VARCHAR},
452 MESSAGE_CODE = #{messageCode,jdbcType=VARCHAR}, 452 MESSAGE_CODE = #{messageCode,jdbcType=VARCHAR},
453 SENDER_ID = #{senderId,jdbcType=VARCHAR}, 453 SENDER_ID = #{senderId,jdbcType=VARCHAR},
...@@ -468,7 +468,7 @@ ...@@ -468,7 +468,7 @@
468 where ID = #{id,jdbcType=NUMERIC} 468 where ID = #{id,jdbcType=NUMERIC}
469 </update> 469 </update>
470 <update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.sys.KafkaTemporaryStorage"> 470 <update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.sys.KafkaTemporaryStorage">
471 - update T_SYS_KAFKA_TEMPORARY_STORAGE 471 + update ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE
472 set MESSAGE_ID = #{messageId,jdbcType=VARCHAR}, 472 set MESSAGE_ID = #{messageId,jdbcType=VARCHAR},
473 MESSAGE_CODE = #{messageCode,jdbcType=VARCHAR}, 473 MESSAGE_CODE = #{messageCode,jdbcType=VARCHAR},
474 SENDER_ID = #{senderId,jdbcType=VARCHAR}, 474 SENDER_ID = #{senderId,jdbcType=VARCHAR},
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 <result column="CODE" jdbcType="VARCHAR" property="code" /> 6 <result column="CODE" jdbcType="VARCHAR" property="code" />
7 <result column="NAME" jdbcType="VARCHAR" property="name" /> 7 <result column="NAME" jdbcType="VARCHAR" property="name" />
8 <result column="VALUE" jdbcType="VARCHAR" property="value" /> 8 <result column="VALUE" jdbcType="VARCHAR" property="value" />
9 - <result column="TYPE_ID" jdbcType="NUMERIC" property="typeId" /> 9 + <result column="TYPE_CODE" jdbcType="VARCHAR" property="typeCode" />
10 <result column="TYPE_NAME" jdbcType="VARCHAR" property="typeName" /> 10 <result column="TYPE_NAME" jdbcType="VARCHAR" property="typeName" />
11 <result column="STATUS" jdbcType="NUMERIC" property="status" /> 11 <result column="STATUS" jdbcType="NUMERIC" property="status" />
12 <result column="DESCRIPTION" jdbcType="VARCHAR" property="description" /> 12 <result column="DESCRIPTION" jdbcType="VARCHAR" property="description" />
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
76 </where> 76 </where>
77 </sql> 77 </sql>
78 <sql id="Base_Column_List"> 78 <sql id="Base_Column_List">
79 - ID, CODE, NAME, VALUE, TYPE_ID, TYPE_NAME, STATUS, DESCRIPTION, CREATE_TIME, CREATE_USER_ID, 79 + ID, CODE, NAME, VALUE, TYPE_CODE, TYPE_NAME, STATUS, DESCRIPTION, CREATE_TIME, CREATE_USER_ID,
80 CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME 80 CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME
81 </sql> 81 </sql>
82 <select id="selectByExample" parameterType="com.fedex.connect.common.model.sys.ParamConfigExample" resultMap="BaseResultMap"> 82 <select id="selectByExample" parameterType="com.fedex.connect.common.model.sys.ParamConfigExample" resultMap="BaseResultMap">
...@@ -117,12 +117,12 @@ ...@@ -117,12 +117,12 @@
117 SELECT SEQ_T_SYS_PARAM_CONFIG.NEXTVAL FROM DUAL 117 SELECT SEQ_T_SYS_PARAM_CONFIG.NEXTVAL FROM DUAL
118 </selectKey> 118 </selectKey>
119 insert into ICLEARIMP.T_SYS_PARAM_CONFIG (ID, CODE, NAME, 119 insert into ICLEARIMP.T_SYS_PARAM_CONFIG (ID, CODE, NAME,
120 - VALUE, TYPE_ID, TYPE_NAME, 120 + VALUE, TYPE_CODE, TYPE_NAME,
121 STATUS, DESCRIPTION, CREATE_TIME, 121 STATUS, DESCRIPTION, CREATE_TIME,
122 CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, 122 CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME,
123 MODIFY_USER_ID, MODIFY_USER_NAME) 123 MODIFY_USER_ID, MODIFY_USER_NAME)
124 values (#{id,jdbcType=NUMERIC}, #{code,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 124 values (#{id,jdbcType=NUMERIC}, #{code,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
125 - #{value,jdbcType=VARCHAR}, #{typeId,jdbcType=NUMERIC}, #{typeName,jdbcType=VARCHAR}, 125 + #{value,jdbcType=VARCHAR}, #{typeCode,jdbcType=VARCHAR}, #{typeName,jdbcType=VARCHAR},
126 #{status,jdbcType=NUMERIC}, #{description,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 126 #{status,jdbcType=NUMERIC}, #{description,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
127 #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, 127 #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP},
128 #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR}) 128 #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR})
...@@ -143,8 +143,8 @@ ...@@ -143,8 +143,8 @@
143 <if test="value != null"> 143 <if test="value != null">
144 VALUE, 144 VALUE,
145 </if> 145 </if>
146 - <if test="typeId != null"> 146 + <if test="typeCode != null">
147 - TYPE_ID, 147 + TYPE_CODE,
148 </if> 148 </if>
149 <if test="typeName != null"> 149 <if test="typeName != null">
150 TYPE_NAME, 150 TYPE_NAME,
...@@ -185,8 +185,8 @@ ...@@ -185,8 +185,8 @@
185 <if test="value != null"> 185 <if test="value != null">
186 #{value,jdbcType=VARCHAR}, 186 #{value,jdbcType=VARCHAR},
187 </if> 187 </if>
188 - <if test="typeId != null"> 188 + <if test="typeCode != null">
189 - #{typeId,jdbcType=NUMERIC}, 189 + #{typeCode,jdbcType=VARCHAR},
190 </if> 190 </if>
191 <if test="typeName != null"> 191 <if test="typeName != null">
192 #{typeName,jdbcType=VARCHAR}, 192 #{typeName,jdbcType=VARCHAR},
...@@ -238,8 +238,8 @@ ...@@ -238,8 +238,8 @@
238 <if test="record.value != null"> 238 <if test="record.value != null">
239 VALUE = #{record.value,jdbcType=VARCHAR}, 239 VALUE = #{record.value,jdbcType=VARCHAR},
240 </if> 240 </if>
241 - <if test="record.typeId != null"> 241 + <if test="record.typeCode != null">
242 - TYPE_ID = #{record.typeId,jdbcType=NUMERIC}, 242 + TYPE_CODE = #{record.typeCode,jdbcType=VARCHAR},
243 </if> 243 </if>
244 <if test="record.typeName != null"> 244 <if test="record.typeName != null">
245 TYPE_NAME = #{record.typeName,jdbcType=VARCHAR}, 245 TYPE_NAME = #{record.typeName,jdbcType=VARCHAR},
...@@ -279,7 +279,7 @@ ...@@ -279,7 +279,7 @@
279 CODE = #{record.code,jdbcType=VARCHAR}, 279 CODE = #{record.code,jdbcType=VARCHAR},
280 NAME = #{record.name,jdbcType=VARCHAR}, 280 NAME = #{record.name,jdbcType=VARCHAR},
281 VALUE = #{record.value,jdbcType=VARCHAR}, 281 VALUE = #{record.value,jdbcType=VARCHAR},
282 - TYPE_ID = #{record.typeId,jdbcType=NUMERIC}, 282 + TYPE_CODE = #{record.typeCode,jdbcType=VARCHAR},
283 TYPE_NAME = #{record.typeName,jdbcType=VARCHAR}, 283 TYPE_NAME = #{record.typeName,jdbcType=VARCHAR},
284 STATUS = #{record.status,jdbcType=NUMERIC}, 284 STATUS = #{record.status,jdbcType=NUMERIC},
285 DESCRIPTION = #{record.description,jdbcType=VARCHAR}, 285 DESCRIPTION = #{record.description,jdbcType=VARCHAR},
...@@ -305,8 +305,8 @@ ...@@ -305,8 +305,8 @@
305 <if test="value != null"> 305 <if test="value != null">
306 VALUE = #{value,jdbcType=VARCHAR}, 306 VALUE = #{value,jdbcType=VARCHAR},
307 </if> 307 </if>
308 - <if test="typeId != null"> 308 + <if test="typeCode != null">
309 - TYPE_ID = #{typeId,jdbcType=NUMERIC}, 309 + TYPE_CODE = #{typeCode,jdbcType=VARCHAR},
310 </if> 310 </if>
311 <if test="typeName != null"> 311 <if test="typeName != null">
312 TYPE_NAME = #{typeName,jdbcType=VARCHAR}, 312 TYPE_NAME = #{typeName,jdbcType=VARCHAR},
...@@ -343,7 +343,7 @@ ...@@ -343,7 +343,7 @@
343 set CODE = #{code,jdbcType=VARCHAR}, 343 set CODE = #{code,jdbcType=VARCHAR},
344 NAME = #{name,jdbcType=VARCHAR}, 344 NAME = #{name,jdbcType=VARCHAR},
345 VALUE = #{value,jdbcType=VARCHAR}, 345 VALUE = #{value,jdbcType=VARCHAR},
346 - TYPE_ID = #{typeId,jdbcType=NUMERIC}, 346 + TYPE_CODE = #{typeCode,jdbcType=VARCHAR},
347 TYPE_NAME = #{typeName,jdbcType=VARCHAR}, 347 TYPE_NAME = #{typeName,jdbcType=VARCHAR},
348 STATUS = #{status,jdbcType=NUMERIC}, 348 STATUS = #{status,jdbcType=NUMERIC},
349 DESCRIPTION = #{description,jdbcType=VARCHAR}, 349 DESCRIPTION = #{description,jdbcType=VARCHAR},
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 <result column="CODE" jdbcType="VARCHAR" property="code" /> 6 <result column="CODE" jdbcType="VARCHAR" property="code" />
7 <result column="NAME" jdbcType="VARCHAR" property="name" /> 7 <result column="NAME" jdbcType="VARCHAR" property="name" />
8 <result column="ROLE_DESC" jdbcType="VARCHAR" property="roleDesc" /> 8 <result column="ROLE_DESC" jdbcType="VARCHAR" property="roleDesc" />
9 - <result column="TYPE_ID" jdbcType="NUMERIC" property="typeId" /> 9 + <result column="TYPE_CODE" jdbcType="VARCHAR" property="typeCode" />
10 <result column="TYPE_NAME" jdbcType="VARCHAR" property="typeName" /> 10 <result column="TYPE_NAME" jdbcType="VARCHAR" property="typeName" />
11 <result column="STATUS" jdbcType="NUMERIC" property="status" /> 11 <result column="STATUS" jdbcType="NUMERIC" property="status" />
12 <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" /> 12 <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
75 </where> 75 </where>
76 </sql> 76 </sql>
77 <sql id="Base_Column_List"> 77 <sql id="Base_Column_List">
78 - ID, CODE, NAME, ROLE_DESC, TYPE_ID, TYPE_NAME, STATUS, CREATE_TIME, CREATE_USER_ID, 78 + ID, CODE, NAME, ROLE_DESC, TYPE_CODE, TYPE_NAME, STATUS, CREATE_TIME, CREATE_USER_ID,
79 CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME 79 CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME
80 </sql> 80 </sql>
81 <select id="selectByExample" parameterType="com.fedex.connect.common.model.sys.RoleExample" resultMap="BaseResultMap"> 81 <select id="selectByExample" parameterType="com.fedex.connect.common.model.sys.RoleExample" resultMap="BaseResultMap">
...@@ -116,12 +116,12 @@ ...@@ -116,12 +116,12 @@
116 SELECT SEQ_T_SYS_ROLE.NEXTVAL FROM DUAL 116 SELECT SEQ_T_SYS_ROLE.NEXTVAL FROM DUAL
117 </selectKey> 117 </selectKey>
118 insert into T_SYS_ROLE (ID, CODE, NAME, 118 insert into T_SYS_ROLE (ID, CODE, NAME,
119 - ROLE_DESC, TYPE_ID, TYPE_NAME, 119 + ROLE_DESC, TYPE_CODE, TYPE_NAME,
120 STATUS, CREATE_TIME, CREATE_USER_ID, 120 STATUS, CREATE_TIME, CREATE_USER_ID,
121 CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, 121 CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID,
122 MODIFY_USER_NAME) 122 MODIFY_USER_NAME)
123 values (#{id,jdbcType=NUMERIC}, #{code,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 123 values (#{id,jdbcType=NUMERIC}, #{code,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
124 - #{roleDesc,jdbcType=VARCHAR}, #{typeId,jdbcType=NUMERIC}, #{typeName,jdbcType=VARCHAR}, 124 + #{roleDesc,jdbcType=VARCHAR}, #{typeCode,jdbcType=VARCHAR}, #{typeName,jdbcType=VARCHAR},
125 #{status,jdbcType=NUMERIC}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, 125 #{status,jdbcType=NUMERIC}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC},
126 #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, 126 #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC},
127 #{modifyUserName,jdbcType=VARCHAR}) 127 #{modifyUserName,jdbcType=VARCHAR})
...@@ -142,8 +142,8 @@ ...@@ -142,8 +142,8 @@
142 <if test="roleDesc != null"> 142 <if test="roleDesc != null">
143 ROLE_DESC, 143 ROLE_DESC,
144 </if> 144 </if>
145 - <if test="typeId != null"> 145 + <if test="typeCode != null">
146 - TYPE_ID, 146 + TYPE_CODE,
147 </if> 147 </if>
148 <if test="typeName != null"> 148 <if test="typeName != null">
149 TYPE_NAME, 149 TYPE_NAME,
...@@ -181,8 +181,8 @@ ...@@ -181,8 +181,8 @@
181 <if test="roleDesc != null"> 181 <if test="roleDesc != null">
182 #{roleDesc,jdbcType=VARCHAR}, 182 #{roleDesc,jdbcType=VARCHAR},
183 </if> 183 </if>
184 - <if test="typeId != null"> 184 + <if test="typeCode != null">
185 - #{typeId,jdbcType=NUMERIC}, 185 + #{typeCode,jdbcType=VARCHAR},
186 </if> 186 </if>
187 <if test="typeName != null"> 187 <if test="typeName != null">
188 #{typeName,jdbcType=VARCHAR}, 188 #{typeName,jdbcType=VARCHAR},
...@@ -231,8 +231,8 @@ ...@@ -231,8 +231,8 @@
231 <if test="record.roleDesc != null"> 231 <if test="record.roleDesc != null">
232 ROLE_DESC = #{record.roleDesc,jdbcType=VARCHAR}, 232 ROLE_DESC = #{record.roleDesc,jdbcType=VARCHAR},
233 </if> 233 </if>
234 - <if test="record.typeId != null"> 234 + <if test="record.typeCode != null">
235 - TYPE_ID = #{record.typeId,jdbcType=NUMERIC}, 235 + TYPE_CODE = #{record.typeCode,jdbcType=VARCHAR},
236 </if> 236 </if>
237 <if test="record.typeName != null"> 237 <if test="record.typeName != null">
238 TYPE_NAME = #{record.typeName,jdbcType=VARCHAR}, 238 TYPE_NAME = #{record.typeName,jdbcType=VARCHAR},
...@@ -269,7 +269,7 @@ ...@@ -269,7 +269,7 @@
269 CODE = #{record.code,jdbcType=VARCHAR}, 269 CODE = #{record.code,jdbcType=VARCHAR},
270 NAME = #{record.name,jdbcType=VARCHAR}, 270 NAME = #{record.name,jdbcType=VARCHAR},
271 ROLE_DESC = #{record.roleDesc,jdbcType=VARCHAR}, 271 ROLE_DESC = #{record.roleDesc,jdbcType=VARCHAR},
272 - TYPE_ID = #{record.typeId,jdbcType=NUMERIC}, 272 + TYPE_CODE = #{record.typeCode,jdbcType=VARCHAR},
273 TYPE_NAME = #{record.typeName,jdbcType=VARCHAR}, 273 TYPE_NAME = #{record.typeName,jdbcType=VARCHAR},
274 STATUS = #{record.status,jdbcType=NUMERIC}, 274 STATUS = #{record.status,jdbcType=NUMERIC},
275 CREATE_TIME = #{record.createTime,jdbcType=TIMESTAMP}, 275 CREATE_TIME = #{record.createTime,jdbcType=TIMESTAMP},
...@@ -294,8 +294,8 @@ ...@@ -294,8 +294,8 @@
294 <if test="roleDesc != null"> 294 <if test="roleDesc != null">
295 ROLE_DESC = #{roleDesc,jdbcType=VARCHAR}, 295 ROLE_DESC = #{roleDesc,jdbcType=VARCHAR},
296 </if> 296 </if>
297 - <if test="typeId != null"> 297 + <if test="typeCode != null">
298 - TYPE_ID = #{typeId,jdbcType=NUMERIC}, 298 + TYPE_CODE = #{typeCode,jdbcType=VARCHAR},
299 </if> 299 </if>
300 <if test="typeName != null"> 300 <if test="typeName != null">
301 TYPE_NAME = #{typeName,jdbcType=VARCHAR}, 301 TYPE_NAME = #{typeName,jdbcType=VARCHAR},
...@@ -329,7 +329,7 @@ ...@@ -329,7 +329,7 @@
329 set CODE = #{code,jdbcType=VARCHAR}, 329 set CODE = #{code,jdbcType=VARCHAR},
330 NAME = #{name,jdbcType=VARCHAR}, 330 NAME = #{name,jdbcType=VARCHAR},
331 ROLE_DESC = #{roleDesc,jdbcType=VARCHAR}, 331 ROLE_DESC = #{roleDesc,jdbcType=VARCHAR},
332 - TYPE_ID = #{typeId,jdbcType=NUMERIC}, 332 + TYPE_CODE = #{typeCode,jdbcType=VARCHAR},
333 TYPE_NAME = #{typeName,jdbcType=VARCHAR}, 333 TYPE_NAME = #{typeName,jdbcType=VARCHAR},
334 STATUS = #{status,jdbcType=NUMERIC}, 334 STATUS = #{status,jdbcType=NUMERIC},
335 CREATE_TIME = #{createTime,jdbcType=TIMESTAMP}, 335 CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 <result column="ACCOUNT_NO" jdbcType="VARCHAR" property="accountNo" /> 13 <result column="ACCOUNT_NO" jdbcType="VARCHAR" property="accountNo" />
14 <result column="UNIFIED_BUSINESS_NUM" jdbcType="VARCHAR" property="unifiedBusinessNum" /> 14 <result column="UNIFIED_BUSINESS_NUM" jdbcType="VARCHAR" property="unifiedBusinessNum" />
15 <result column="CUSTOMS_SERIAL_NUM" jdbcType="VARCHAR" property="customsSerialNum" /> 15 <result column="CUSTOMS_SERIAL_NUM" jdbcType="VARCHAR" property="customsSerialNum" />
16 - <result column="TYPE_ID" jdbcType="NUMERIC" property="typeId" /> 16 + <result column="TYPE_CODE" jdbcType="VARCHAR" property="typeCode" />
17 <result column="TYPE_NAME" jdbcType="VARCHAR" property="typeName" /> 17 <result column="TYPE_NAME" jdbcType="VARCHAR" property="typeName" />
18 <result column="STATUS" jdbcType="NUMERIC" property="status" /> 18 <result column="STATUS" jdbcType="NUMERIC" property="status" />
19 <result column="REMARK" jdbcType="VARCHAR" property="remark" /> 19 <result column="REMARK" jdbcType="VARCHAR" property="remark" />
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
85 </sql> 85 </sql>
86 <sql id="Base_Column_List"> 86 <sql id="Base_Column_List">
87 ID, LOGIN_NAME, USER_NAME, PASSWORD, USER_UUID, EMAIL, PHONE, COMPANY_NAME, ACCOUNT_NO, 87 ID, LOGIN_NAME, USER_NAME, PASSWORD, USER_UUID, EMAIL, PHONE, COMPANY_NAME, ACCOUNT_NO,
88 - UNIFIED_BUSINESS_NUM, CUSTOMS_SERIAL_NUM, TYPE_ID, TYPE_NAME, STATUS, REMARK, CREATE_TIME, 88 + UNIFIED_BUSINESS_NUM, CUSTOMS_SERIAL_NUM, TYPE_CODE, TYPE_NAME, STATUS, REMARK, CREATE_TIME,
89 CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME, 89 CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME,
90 CONFIRM_PROMPTS 90 CONFIRM_PROMPTS
91 </sql> 91 </sql>
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
129 insert into ICLEARIMP.T_SYS_USER (ID, LOGIN_NAME, USER_NAME, 129 insert into ICLEARIMP.T_SYS_USER (ID, LOGIN_NAME, USER_NAME,
130 PASSWORD, USER_UUID, EMAIL, 130 PASSWORD, USER_UUID, EMAIL,
131 PHONE, COMPANY_NAME, ACCOUNT_NO, 131 PHONE, COMPANY_NAME, ACCOUNT_NO,
132 - UNIFIED_BUSINESS_NUM, CUSTOMS_SERIAL_NUM, TYPE_ID, 132 + UNIFIED_BUSINESS_NUM, CUSTOMS_SERIAL_NUM, TYPE_CODE,
133 TYPE_NAME, STATUS, REMARK, 133 TYPE_NAME, STATUS, REMARK,
134 CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME, 134 CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME,
135 MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME, 135 MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME,
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
137 values (#{id,jdbcType=NUMERIC}, #{loginName,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, 137 values (#{id,jdbcType=NUMERIC}, #{loginName,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR},
138 #{password,jdbcType=VARCHAR}, #{userUuid,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, 138 #{password,jdbcType=VARCHAR}, #{userUuid,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR},
139 #{phone,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, #{accountNo,jdbcType=VARCHAR}, 139 #{phone,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, #{accountNo,jdbcType=VARCHAR},
140 - #{unifiedBusinessNum,jdbcType=VARCHAR}, #{customsSerialNum,jdbcType=VARCHAR}, #{typeId,jdbcType=NUMERIC}, 140 + #{unifiedBusinessNum,jdbcType=VARCHAR}, #{customsSerialNum,jdbcType=VARCHAR}, #{typeCode,jdbcType=VARCHAR},
141 #{typeName,jdbcType=VARCHAR}, #{status,jdbcType=NUMERIC}, #{remark,jdbcType=VARCHAR}, 141 #{typeName,jdbcType=VARCHAR}, #{status,jdbcType=NUMERIC}, #{remark,jdbcType=VARCHAR},
142 #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, 142 #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR},
143 #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR}, 143 #{modifyTime,jdbcType=TIMESTAMP}, #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR},
...@@ -180,8 +180,8 @@ ...@@ -180,8 +180,8 @@
180 <if test="customsSerialNum != null"> 180 <if test="customsSerialNum != null">
181 CUSTOMS_SERIAL_NUM, 181 CUSTOMS_SERIAL_NUM,
182 </if> 182 </if>
183 - <if test="typeId != null"> 183 + <if test="typeCode != null">
184 - TYPE_ID, 184 + TYPE_CODE,
185 </if> 185 </if>
186 <if test="typeName != null"> 186 <if test="typeName != null">
187 TYPE_NAME, 187 TYPE_NAME,
...@@ -246,8 +246,8 @@ ...@@ -246,8 +246,8 @@
246 <if test="customsSerialNum != null"> 246 <if test="customsSerialNum != null">
247 #{customsSerialNum,jdbcType=VARCHAR}, 247 #{customsSerialNum,jdbcType=VARCHAR},
248 </if> 248 </if>
249 - <if test="typeId != null"> 249 + <if test="typeCode != null">
250 - #{typeId,jdbcType=NUMERIC}, 250 + #{typeCode,jdbcType=VARCHAR},
251 </if> 251 </if>
252 <if test="typeName != null"> 252 <if test="typeName != null">
253 #{typeName,jdbcType=VARCHAR}, 253 #{typeName,jdbcType=VARCHAR},
...@@ -323,8 +323,8 @@ ...@@ -323,8 +323,8 @@
323 <if test="record.customsSerialNum != null"> 323 <if test="record.customsSerialNum != null">
324 CUSTOMS_SERIAL_NUM = #{record.customsSerialNum,jdbcType=VARCHAR}, 324 CUSTOMS_SERIAL_NUM = #{record.customsSerialNum,jdbcType=VARCHAR},
325 </if> 325 </if>
326 - <if test="record.typeId != null"> 326 + <if test="record.typeCode != null">
327 - TYPE_ID = #{record.typeId,jdbcType=NUMERIC}, 327 + TYPE_CODE = #{record.typeCode,jdbcType=VARCHAR},
328 </if> 328 </if>
329 <if test="record.typeName != null"> 329 <if test="record.typeName != null">
330 TYPE_NAME = #{record.typeName,jdbcType=VARCHAR}, 330 TYPE_NAME = #{record.typeName,jdbcType=VARCHAR},
...@@ -374,7 +374,7 @@ ...@@ -374,7 +374,7 @@
374 ACCOUNT_NO = #{record.accountNo,jdbcType=VARCHAR}, 374 ACCOUNT_NO = #{record.accountNo,jdbcType=VARCHAR},
375 UNIFIED_BUSINESS_NUM = #{record.unifiedBusinessNum,jdbcType=VARCHAR}, 375 UNIFIED_BUSINESS_NUM = #{record.unifiedBusinessNum,jdbcType=VARCHAR},
376 CUSTOMS_SERIAL_NUM = #{record.customsSerialNum,jdbcType=VARCHAR}, 376 CUSTOMS_SERIAL_NUM = #{record.customsSerialNum,jdbcType=VARCHAR},
377 - TYPE_ID = #{record.typeId,jdbcType=NUMERIC}, 377 + TYPE_CODE = #{record.typeCode,jdbcType=VARCHAR},
378 TYPE_NAME = #{record.typeName,jdbcType=VARCHAR}, 378 TYPE_NAME = #{record.typeName,jdbcType=VARCHAR},
379 STATUS = #{record.status,jdbcType=NUMERIC}, 379 STATUS = #{record.status,jdbcType=NUMERIC},
380 REMARK = #{record.remark,jdbcType=VARCHAR}, 380 REMARK = #{record.remark,jdbcType=VARCHAR},
...@@ -422,8 +422,8 @@ ...@@ -422,8 +422,8 @@
422 <if test="customsSerialNum != null"> 422 <if test="customsSerialNum != null">
423 CUSTOMS_SERIAL_NUM = #{customsSerialNum,jdbcType=VARCHAR}, 423 CUSTOMS_SERIAL_NUM = #{customsSerialNum,jdbcType=VARCHAR},
424 </if> 424 </if>
425 - <if test="typeId != null"> 425 + <if test="typeCode != null">
426 - TYPE_ID = #{typeId,jdbcType=NUMERIC}, 426 + TYPE_CODE = #{typeCode,jdbcType=VARCHAR},
427 </if> 427 </if>
428 <if test="typeName != null"> 428 <if test="typeName != null">
429 TYPE_NAME = #{typeName,jdbcType=VARCHAR}, 429 TYPE_NAME = #{typeName,jdbcType=VARCHAR},
...@@ -470,7 +470,7 @@ ...@@ -470,7 +470,7 @@
470 ACCOUNT_NO = #{accountNo,jdbcType=VARCHAR}, 470 ACCOUNT_NO = #{accountNo,jdbcType=VARCHAR},
471 UNIFIED_BUSINESS_NUM = #{unifiedBusinessNum,jdbcType=VARCHAR}, 471 UNIFIED_BUSINESS_NUM = #{unifiedBusinessNum,jdbcType=VARCHAR},
472 CUSTOMS_SERIAL_NUM = #{customsSerialNum,jdbcType=VARCHAR}, 472 CUSTOMS_SERIAL_NUM = #{customsSerialNum,jdbcType=VARCHAR},
473 - TYPE_ID = #{typeId,jdbcType=NUMERIC}, 473 + TYPE_CODE = #{typeCode,jdbcType=VARCHAR},
474 TYPE_NAME = #{typeName,jdbcType=VARCHAR}, 474 TYPE_NAME = #{typeName,jdbcType=VARCHAR},
475 STATUS = #{status,jdbcType=NUMERIC}, 475 STATUS = #{status,jdbcType=NUMERIC},
476 REMARK = #{remark,jdbcType=VARCHAR}, 476 REMARK = #{remark,jdbcType=VARCHAR},
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 -<mapper namespace="com.fedex.connect.common.dao.sys.RedisSlabMapper"> 3 +<mapper namespace="com.fedex.connect.common.dao.sys.redisSlabMapper">
4 - <resultMap id="BaseResultMap" type="com.fedex.connect.common.model.sys.RedisSlab"> 4 + <resultMap id="BaseResultMap" type="com.fedex.connect.common.model.sys.redisSlab">
5 <id column="ID" jdbcType="NUMERIC" property="id" /> 5 <id column="ID" jdbcType="NUMERIC" property="id" />
6 <result column="REDIS_KEY" jdbcType="VARCHAR" property="redisKey" /> 6 <result column="REDIS_KEY" jdbcType="VARCHAR" property="redisKey" />
7 <result column="REDIS_MSG" jdbcType="VARCHAR" property="redisMsg" /> 7 <result column="REDIS_MSG" jdbcType="VARCHAR" property="redisMsg" />
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
76 ID, REDIS_KEY, REDIS_MSG, VALID_DURATION, DIS_TIME, CREATE_TIME, CREATE_USER_ID, 76 ID, REDIS_KEY, REDIS_MSG, VALID_DURATION, DIS_TIME, CREATE_TIME, CREATE_USER_ID,
77 CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME 77 CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME
78 </sql> 78 </sql>
79 - <select id="selectByExample" parameterType="com.fedex.connect.common.model.sys.RedisSlabExample" resultMap="BaseResultMap"> 79 + <select id="selectByExample" parameterType="com.fedex.connect.common.model.sys.redisSlabExample" resultMap="BaseResultMap">
80 <include refid="OracleDialectPrefix" /> 80 <include refid="OracleDialectPrefix" />
81 select 81 select
82 <if test="distinct"> 82 <if test="distinct">
...@@ -103,13 +103,13 @@ ...@@ -103,13 +103,13 @@
103 delete from T_SYS_REDIS_SLAB 103 delete from T_SYS_REDIS_SLAB
104 where ID = #{id,jdbcType=NUMERIC} 104 where ID = #{id,jdbcType=NUMERIC}
105 </delete> 105 </delete>
106 - <delete id="deleteByExample" parameterType="com.fedex.connect.common.model.sys.RedisSlabExample"> 106 + <delete id="deleteByExample" parameterType="com.fedex.connect.common.model.sys.redisSlabExample">
107 delete from T_SYS_REDIS_SLAB 107 delete from T_SYS_REDIS_SLAB
108 <if test="_parameter != null"> 108 <if test="_parameter != null">
109 <include refid="Example_Where_Clause" /> 109 <include refid="Example_Where_Clause" />
110 </if> 110 </if>
111 </delete> 111 </delete>
112 - <insert id="insert" parameterType="com.fedex.connect.common.model.sys.RedisSlab"> 112 + <insert id="insert" parameterType="com.fedex.connect.common.model.sys.redisSlab">
113 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 113 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
114 SELECT SEQ_T_SYS_REDIS_SLAB.NEXTVAL FROM DUAL 114 SELECT SEQ_T_SYS_REDIS_SLAB.NEXTVAL FROM DUAL
115 </selectKey> 115 </selectKey>
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
122 #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, 122 #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP},
123 #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR}) 123 #{modifyUserId,jdbcType=NUMERIC}, #{modifyUserName,jdbcType=VARCHAR})
124 </insert> 124 </insert>
125 - <insert id="insertSelective" parameterType="com.fedex.connect.common.model.sys.RedisSlab"> 125 + <insert id="insertSelective" parameterType="com.fedex.connect.common.model.sys.redisSlab">
126 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long"> 126 <selectKey keyProperty="id" order="BEFORE" resultType="java.lang.Long">
127 SELECT SEQ_T_SYS_REDIS_SLAB.NEXTVAL FROM DUAL 127 SELECT SEQ_T_SYS_REDIS_SLAB.NEXTVAL FROM DUAL
128 </selectKey> 128 </selectKey>
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
194 </if> 194 </if>
195 </trim> 195 </trim>
196 </insert> 196 </insert>
197 - <select id="countByExample" parameterType="com.fedex.connect.common.model.sys.RedisSlabExample" resultType="java.lang.Long"> 197 + <select id="countByExample" parameterType="com.fedex.connect.common.model.sys.redisSlabExample" resultType="java.lang.Long">
198 select count(*) from T_SYS_REDIS_SLAB 198 select count(*) from T_SYS_REDIS_SLAB
199 <if test="_parameter != null"> 199 <if test="_parameter != null">
200 <include refid="Example_Where_Clause" /> 200 <include refid="Example_Where_Clause" />
...@@ -258,7 +258,7 @@ ...@@ -258,7 +258,7 @@
258 <include refid="Update_By_Example_Where_Clause" /> 258 <include refid="Update_By_Example_Where_Clause" />
259 </if> 259 </if>
260 </update> 260 </update>
261 - <update id="updateByPrimaryKeySelective" parameterType="com.fedex.connect.common.model.sys.RedisSlab"> 261 + <update id="updateByPrimaryKeySelective" parameterType="com.fedex.connect.common.model.sys.redisSlab">
262 update T_SYS_REDIS_SLAB 262 update T_SYS_REDIS_SLAB
263 <set> 263 <set>
264 <if test="redisKey != null"> 264 <if test="redisKey != null">
...@@ -294,7 +294,7 @@ ...@@ -294,7 +294,7 @@
294 </set> 294 </set>
295 where ID = #{id,jdbcType=NUMERIC} 295 where ID = #{id,jdbcType=NUMERIC}
296 </update> 296 </update>
297 - <update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.sys.RedisSlab"> 297 + <update id="updateByPrimaryKey" parameterType="com.fedex.connect.common.model.sys.redisSlab">
298 update T_SYS_REDIS_SLAB 298 update T_SYS_REDIS_SLAB
299 set REDIS_KEY = #{redisKey,jdbcType=VARCHAR}, 299 set REDIS_KEY = #{redisKey,jdbcType=VARCHAR},
300 REDIS_MSG = #{redisMsg,jdbcType=VARCHAR}, 300 REDIS_MSG = #{redisMsg,jdbcType=VARCHAR},
......
1 -package com.fedex.connect.common.model.bi;
...\ No newline at end of file ...\ No newline at end of file
...@@ -19,10 +19,10 @@ public class Attachment implements Serializable { ...@@ -19,10 +19,10 @@ public class Attachment implements Serializable {
19 private Long bizId; 19 private Long bizId;
20 20
21 /** 21 /**
22 - * 业务类型ID。 22 + * 业务类型CODE。
23 关联数据字典表。指定字典目录CODE：ATTACHMENT_BIZ_TYPE 23 关联数据字典表。指定字典目录CODE：ATTACHMENT_BIZ_TYPE
24 */ 24 */
25 - private Long bizTypeId; 25 + private String bizTypeCode;
26 26
27 /** 27 /**
28 * 业务类型名称(用户上传、系统生成) 28 * 业务类型名称(用户上传、系统生成)
...@@ -45,9 +45,9 @@ public class Attachment implements Serializable { ...@@ -45,9 +45,9 @@ public class Attachment implements Serializable {
45 private String filePath; 45 private String filePath;
46 46
47 /** 47 /**
48 - * 文件类型ID。关联数据字典表。指定字典目录CODE：ATTACHMENT_FILE_TYPE 48 + * 文件类型CODE。关联数据字典表。指定字典目录CODE：ATTACHMENT_FILE_TYPE
49 */ 49 */
50 - private Long fileTypeId; 50 + private String fileTypeCode;
51 51
52 /** 52 /**
53 * 文件类型名称(压缩包、PDF) 53 * 文件类型名称(压缩包、PDF)
...@@ -94,6 +94,11 @@ public class Attachment implements Serializable { ...@@ -94,6 +94,11 @@ public class Attachment implements Serializable {
94 */ 94 */
95 private Long uploadRecordId; 95 private Long uploadRecordId;
96 96
97 + /**
98 + * 文件大小byte
99 + */
100 + private Long fileSize;
101 +
97 private static final long serialVersionUID = 1L; 102 private static final long serialVersionUID = 1L;
98 103
99 public Long getId() { 104 public Long getId() {
...@@ -112,12 +117,12 @@ public class Attachment implements Serializable { ...@@ -112,12 +117,12 @@ public class Attachment implements Serializable {
112 this.bizId = bizId; 117 this.bizId = bizId;
113 } 118 }
114 119
115 - public Long getBizTypeId() { 120 + public String getBizTypeCode() {
116 - return bizTypeId; 121 + return bizTypeCode;
117 } 122 }
118 123
119 - public void setBizTypeId(Long bizTypeId) { 124 + public void setBizTypeCode(String bizTypeCode) {
120 - this.bizTypeId = bizTypeId; 125 + this.bizTypeCode = bizTypeCode == null ? null : bizTypeCode.trim();
121 } 126 }
122 127
123 public String getBizTypeName() { 128 public String getBizTypeName() {
...@@ -152,12 +157,12 @@ public class Attachment implements Serializable { ...@@ -152,12 +157,12 @@ public class Attachment implements Serializable {
152 this.filePath = filePath == null ? null : filePath.trim(); 157 this.filePath = filePath == null ? null : filePath.trim();
153 } 158 }
154 159
155 - public Long getFileTypeId() { 160 + public String getFileTypeCode() {
156 - return fileTypeId; 161 + return fileTypeCode;
157 } 162 }
158 163
159 - public void setFileTypeId(Long fileTypeId) { 164 + public void setFileTypeCode(String fileTypeCode) {
160 - this.fileTypeId = fileTypeId; 165 + this.fileTypeCode = fileTypeCode == null ? null : fileTypeCode.trim();
161 } 166 }
162 167
163 public String getFileTypeName() { 168 public String getFileTypeName() {
...@@ -232,6 +237,14 @@ public class Attachment implements Serializable { ...@@ -232,6 +237,14 @@ public class Attachment implements Serializable {
232 this.uploadRecordId = uploadRecordId; 237 this.uploadRecordId = uploadRecordId;
233 } 238 }
234 239
240 + public Long getFileSize() {
241 + return fileSize;
242 + }
243 +
244 + public void setFileSize(Long fileSize) {
245 + this.fileSize = fileSize;
246 + }
247 +
235 @Override 248 @Override
236 public String toString() { 249 public String toString() {
237 StringBuilder sb = new StringBuilder(); 250 StringBuilder sb = new StringBuilder();
...@@ -240,12 +253,12 @@ public class Attachment implements Serializable { ...@@ -240,12 +253,12 @@ public class Attachment implements Serializable {
240 sb.append("Hash = ").append(hashCode()); 253 sb.append("Hash = ").append(hashCode());
241 sb.append(", id=").append(id); 254 sb.append(", id=").append(id);
242 sb.append(", bizId=").append(bizId); 255 sb.append(", bizId=").append(bizId);
243 - sb.append(", bizTypeId=").append(bizTypeId); 256 + sb.append(", bizTypeCode=").append(bizTypeCode);
244 sb.append(", bizTypeName=").append(bizTypeName); 257 sb.append(", bizTypeName=").append(bizTypeName);
245 sb.append(", sourceFileName=").append(sourceFileName); 258 sb.append(", sourceFileName=").append(sourceFileName);
246 sb.append(", fileName=").append(fileName); 259 sb.append(", fileName=").append(fileName);
247 sb.append(", filePath=").append(filePath); 260 sb.append(", filePath=").append(filePath);
248 - sb.append(", fileTypeId=").append(fileTypeId); 261 + sb.append(", fileTypeCode=").append(fileTypeCode);
249 sb.append(", fileTypeName=").append(fileTypeName); 262 sb.append(", fileTypeName=").append(fileTypeName);
250 sb.append(", status=").append(status); 263 sb.append(", status=").append(status);
251 sb.append(", createTime=").append(createTime); 264 sb.append(", createTime=").append(createTime);
...@@ -255,6 +268,7 @@ public class Attachment implements Serializable { ...@@ -255,6 +268,7 @@ public class Attachment implements Serializable {
255 sb.append(", modifyUserId=").append(modifyUserId); 268 sb.append(", modifyUserId=").append(modifyUserId);
256 sb.append(", modifyUserName=").append(modifyUserName); 269 sb.append(", modifyUserName=").append(modifyUserName);
257 sb.append(", uploadRecordId=").append(uploadRecordId); 270 sb.append(", uploadRecordId=").append(uploadRecordId);
271 + sb.append(", fileSize=").append(fileSize);
258 sb.append(", serialVersionUID=").append(serialVersionUID); 272 sb.append(", serialVersionUID=").append(serialVersionUID);
259 sb.append("]"); 273 sb.append("]");
260 return sb.toString(); 274 return sb.toString();
......
...@@ -245,63 +245,73 @@ public class AttachmentExample { ...@@ -245,63 +245,73 @@ public class AttachmentExample {
245 return (Criteria) this; 245 return (Criteria) this;
246 } 246 }
247 247
248 - public Criteria andBizTypeIdIsNull() { 248 + public Criteria andBizTypeCodeIsNull() {
249 - addCriterion("BIZ_TYPE_ID is null"); 249 + addCriterion("BIZ_TYPE_CODE is null");
250 return (Criteria) this; 250 return (Criteria) this;
251 } 251 }
252 252
253 - public Criteria andBizTypeIdIsNotNull() { 253 + public Criteria andBizTypeCodeIsNotNull() {
254 - addCriterion("BIZ_TYPE_ID is not null"); 254 + addCriterion("BIZ_TYPE_CODE is not null");
255 return (Criteria) this; 255 return (Criteria) this;
256 } 256 }
257 257
258 - public Criteria andBizTypeIdEqualTo(Long value) { 258 + public Criteria andBizTypeCodeEqualTo(String value) {
259 - addCriterion("BIZ_TYPE_ID =", value, "bizTypeId"); 259 + addCriterion("BIZ_TYPE_CODE =", value, "bizTypeCode");
260 return (Criteria) this; 260 return (Criteria) this;
261 } 261 }
262 262
263 - public Criteria andBizTypeIdNotEqualTo(Long value) { 263 + public Criteria andBizTypeCodeNotEqualTo(String value) {
264 - addCriterion("BIZ_TYPE_ID <>", value, "bizTypeId"); 264 + addCriterion("BIZ_TYPE_CODE <>", value, "bizTypeCode");
265 return (Criteria) this; 265 return (Criteria) this;
266 } 266 }
267 267
268 - public Criteria andBizTypeIdGreaterThan(Long value) { 268 + public Criteria andBizTypeCodeGreaterThan(String value) {
269 - addCriterion("BIZ_TYPE_ID >", value, "bizTypeId"); 269 + addCriterion("BIZ_TYPE_CODE >", value, "bizTypeCode");
270 return (Criteria) this; 270 return (Criteria) this;
271 } 271 }
272 272
273 - public Criteria andBizTypeIdGreaterThanOrEqualTo(Long value) { 273 + public Criteria andBizTypeCodeGreaterThanOrEqualTo(String value) {
274 - addCriterion("BIZ_TYPE_ID >=", value, "bizTypeId"); 274 + addCriterion("BIZ_TYPE_CODE >=", value, "bizTypeCode");
275 return (Criteria) this; 275 return (Criteria) this;
276 } 276 }
277 277
278 - public Criteria andBizTypeIdLessThan(Long value) { 278 + public Criteria andBizTypeCodeLessThan(String value) {
279 - addCriterion("BIZ_TYPE_ID <", value, "bizTypeId"); 279 + addCriterion("BIZ_TYPE_CODE <", value, "bizTypeCode");
280 return (Criteria) this; 280 return (Criteria) this;
281 } 281 }
282 282
283 - public Criteria andBizTypeIdLessThanOrEqualTo(Long value) { 283 + public Criteria andBizTypeCodeLessThanOrEqualTo(String value) {
284 - addCriterion("BIZ_TYPE_ID <=", value, "bizTypeId"); 284 + addCriterion("BIZ_TYPE_CODE <=", value, "bizTypeCode");
285 return (Criteria) this; 285 return (Criteria) this;
286 } 286 }
287 287
288 - public Criteria andBizTypeIdIn(List<Long> values) { 288 + public Criteria andBizTypeCodeLike(String value) {
289 - addCriterion("BIZ_TYPE_ID in", values, "bizTypeId"); 289 + addCriterion("BIZ_TYPE_CODE like", value, "bizTypeCode");
290 return (Criteria) this; 290 return (Criteria) this;
291 } 291 }
292 292
293 - public Criteria andBizTypeIdNotIn(List<Long> values) { 293 + public Criteria andBizTypeCodeNotLike(String value) {
294 - addCriterion("BIZ_TYPE_ID not in", values, "bizTypeId"); 294 + addCriterion("BIZ_TYPE_CODE not like", value, "bizTypeCode");
295 return (Criteria) this; 295 return (Criteria) this;
296 } 296 }
297 297
298 - public Criteria andBizTypeIdBetween(Long value1, Long value2) { 298 + public Criteria andBizTypeCodeIn(List<String> values) {
299 - addCriterion("BIZ_TYPE_ID between", value1, value2, "bizTypeId"); 299 + addCriterion("BIZ_TYPE_CODE in", values, "bizTypeCode");
300 return (Criteria) this; 300 return (Criteria) this;
301 } 301 }
302 302
303 - public Criteria andBizTypeIdNotBetween(Long value1, Long value2) { 303 + public Criteria andBizTypeCodeNotIn(List<String> values) {
304 - addCriterion("BIZ_TYPE_ID not between", value1, value2, "bizTypeId"); 304 + addCriterion("BIZ_TYPE_CODE not in", values, "bizTypeCode");
305 + return (Criteria) this;
306 + }
307 +
308 + public Criteria andBizTypeCodeBetween(String value1, String value2) {
309 + addCriterion("BIZ_TYPE_CODE between", value1, value2, "bizTypeCode");
310 + return (Criteria) this;
311 + }
312 +
313 + public Criteria andBizTypeCodeNotBetween(String value1, String value2) {
314 + addCriterion("BIZ_TYPE_CODE not between", value1, value2, "bizTypeCode");
305 return (Criteria) this; 315 return (Criteria) this;
306 } 316 }
307 317
...@@ -585,63 +595,73 @@ public class AttachmentExample { ...@@ -585,63 +595,73 @@ public class AttachmentExample {
585 return (Criteria) this; 595 return (Criteria) this;
586 } 596 }
587 597
588 - public Criteria andFileTypeIdIsNull() { 598 + public Criteria andFileTypeCodeIsNull() {
589 - addCriterion("FILE_TYPE_ID is null"); 599 + addCriterion("FILE_TYPE_CODE is null");
600 + return (Criteria) this;
601 + }
602 +
603 + public Criteria andFileTypeCodeIsNotNull() {
604 + addCriterion("FILE_TYPE_CODE is not null");
605 + return (Criteria) this;
606 + }
607 +
608 + public Criteria andFileTypeCodeEqualTo(String value) {
609 + addCriterion("FILE_TYPE_CODE =", value, "fileTypeCode");
590 return (Criteria) this; 610 return (Criteria) this;
591 } 611 }
592 612
593 - public Criteria andFileTypeIdIsNotNull() { 613 + public Criteria andFileTypeCodeNotEqualTo(String value) {
594 - addCriterion("FILE_TYPE_ID is not null"); 614 + addCriterion("FILE_TYPE_CODE <>", value, "fileTypeCode");
595 return (Criteria) this; 615 return (Criteria) this;
596 } 616 }
597 617
598 - public Criteria andFileTypeIdEqualTo(Long value) { 618 + public Criteria andFileTypeCodeGreaterThan(String value) {
599 - addCriterion("FILE_TYPE_ID =", value, "fileTypeId"); 619 + addCriterion("FILE_TYPE_CODE >", value, "fileTypeCode");
600 return (Criteria) this; 620 return (Criteria) this;
601 } 621 }
602 622
603 - public Criteria andFileTypeIdNotEqualTo(Long value) { 623 + public Criteria andFileTypeCodeGreaterThanOrEqualTo(String value) {
604 - addCriterion("FILE_TYPE_ID <>", value, "fileTypeId"); 624 + addCriterion("FILE_TYPE_CODE >=", value, "fileTypeCode");
605 return (Criteria) this; 625 return (Criteria) this;
606 } 626 }
607 627
608 - public Criteria andFileTypeIdGreaterThan(Long value) { 628 + public Criteria andFileTypeCodeLessThan(String value) {
609 - addCriterion("FILE_TYPE_ID >", value, "fileTypeId"); 629 + addCriterion("FILE_TYPE_CODE <", value, "fileTypeCode");
610 return (Criteria) this; 630 return (Criteria) this;
611 } 631 }
612 632
613 - public Criteria andFileTypeIdGreaterThanOrEqualTo(Long value) { 633 + public Criteria andFileTypeCodeLessThanOrEqualTo(String value) {
614 - addCriterion("FILE_TYPE_ID >=", value, "fileTypeId"); 634 + addCriterion("FILE_TYPE_CODE <=", value, "fileTypeCode");
615 return (Criteria) this; 635 return (Criteria) this;
616 } 636 }
617 637
618 - public Criteria andFileTypeIdLessThan(Long value) { 638 + public Criteria andFileTypeCodeLike(String value) {
619 - addCriterion("FILE_TYPE_ID <", value, "fileTypeId"); 639 + addCriterion("FILE_TYPE_CODE like", value, "fileTypeCode");
620 return (Criteria) this; 640 return (Criteria) this;
621 } 641 }
622 642
623 - public Criteria andFileTypeIdLessThanOrEqualTo(Long value) { 643 + public Criteria andFileTypeCodeNotLike(String value) {
624 - addCriterion("FILE_TYPE_ID <=", value, "fileTypeId"); 644 + addCriterion("FILE_TYPE_CODE not like", value, "fileTypeCode");
625 return (Criteria) this; 645 return (Criteria) this;
626 } 646 }
627 647
628 - public Criteria andFileTypeIdIn(List<Long> values) { 648 + public Criteria andFileTypeCodeIn(List<String> values) {
629 - addCriterion("FILE_TYPE_ID in", values, "fileTypeId"); 649 + addCriterion("FILE_TYPE_CODE in", values, "fileTypeCode");
630 return (Criteria) this; 650 return (Criteria) this;
631 } 651 }
632 652
633 - public Criteria andFileTypeIdNotIn(List<Long> values) { 653 + public Criteria andFileTypeCodeNotIn(List<String> values) {
634 - addCriterion("FILE_TYPE_ID not in", values, "fileTypeId"); 654 + addCriterion("FILE_TYPE_CODE not in", values, "fileTypeCode");
635 return (Criteria) this; 655 return (Criteria) this;
636 } 656 }
637 657
638 - public Criteria andFileTypeIdBetween(Long value1, Long value2) { 658 + public Criteria andFileTypeCodeBetween(String value1, String value2) {
639 - addCriterion("FILE_TYPE_ID between", value1, value2, "fileTypeId"); 659 + addCriterion("FILE_TYPE_CODE between", value1, value2, "fileTypeCode");
640 return (Criteria) this; 660 return (Criteria) this;
641 } 661 }
642 662
643 - public Criteria andFileTypeIdNotBetween(Long value1, Long value2) { 663 + public Criteria andFileTypeCodeNotBetween(String value1, String value2) {
644 - addCriterion("FILE_TYPE_ID not between", value1, value2, "fileTypeId"); 664 + addCriterion("FILE_TYPE_CODE not between", value1, value2, "fileTypeCode");
645 return (Criteria) this; 665 return (Criteria) this;
646 } 666 }
647 667
...@@ -1214,6 +1234,66 @@ public class AttachmentExample { ...@@ -1214,6 +1234,66 @@ public class AttachmentExample {
1214 addCriterion("UPLOAD_RECORD_ID not between", value1, value2, "uploadRecordId"); 1234 addCriterion("UPLOAD_RECORD_ID not between", value1, value2, "uploadRecordId");
1215 return (Criteria) this; 1235 return (Criteria) this;
1216 } 1236 }
1237 +
1238 + public Criteria andFileSizeIsNull() {
1239 + addCriterion("FILE_SIZE is null");
1240 + return (Criteria) this;
1241 + }
1242 +
1243 + public Criteria andFileSizeIsNotNull() {
1244 + addCriterion("FILE_SIZE is not null");
1245 + return (Criteria) this;
1246 + }
1247 +
1248 + public Criteria andFileSizeEqualTo(Long value) {
1249 + addCriterion("FILE_SIZE =", value, "fileSize");
1250 + return (Criteria) this;
1251 + }
1252 +
1253 + public Criteria andFileSizeNotEqualTo(Long value) {
1254 + addCriterion("FILE_SIZE <>", value, "fileSize");
1255 + return (Criteria) this;
1256 + }
1257 +
1258 + public Criteria andFileSizeGreaterThan(Long value) {
1259 + addCriterion("FILE_SIZE >", value, "fileSize");
1260 + return (Criteria) this;
1261 + }
1262 +
1263 + public Criteria andFileSizeGreaterThanOrEqualTo(Long value) {
1264 + addCriterion("FILE_SIZE >=", value, "fileSize");
1265 + return (Criteria) this;
1266 + }
1267 +
1268 + public Criteria andFileSizeLessThan(Long value) {
1269 + addCriterion("FILE_SIZE <", value, "fileSize");
1270 + return (Criteria) this;
1271 + }
1272 +
1273 + public Criteria andFileSizeLessThanOrEqualTo(Long value) {
1274 + addCriterion("FILE_SIZE <=", value, "fileSize");
1275 + return (Criteria) this;
1276 + }
1277 +
1278 + public Criteria andFileSizeIn(List<Long> values) {
1279 + addCriterion("FILE_SIZE in", values, "fileSize");
1280 + return (Criteria) this;
1281 + }
1282 +
1283 + public Criteria andFileSizeNotIn(List<Long> values) {
1284 + addCriterion("FILE_SIZE not in", values, "fileSize");
1285 + return (Criteria) this;
1286 + }
1287 +
1288 + public Criteria andFileSizeBetween(Long value1, Long value2) {
1289 + addCriterion("FILE_SIZE between", value1, value2, "fileSize");
1290 + return (Criteria) this;
1291 + }
1292 +
1293 + public Criteria andFileSizeNotBetween(Long value1, Long value2) {
1294 + addCriterion("FILE_SIZE not between", value1, value2, "fileSize");
1295 + return (Criteria) this;
1296 + }
1217 } 1297 }
1218 1298
1219 public static class Criteria extends GeneratedCriteria { 1299 public static class Criteria extends GeneratedCriteria {
......
...@@ -30,16 +30,6 @@ public class CeInfo implements Serializable { ...@@ -30,16 +30,6 @@ public class CeInfo implements Serializable {
30 private Date shipDate; 30 private Date shipDate;
31 31
32 /** 32 /**
33 - * 发货人国家
34 - */
35 - private String shipperCountry;
36 -
37 - /**
38 - * 收件人国家
39 - */
40 - private String recipientCountry;
41 -
42 - /**
43 * 目的国口岸 33 * 目的国口岸
44 */ 34 */
45 private String destIataCode; 35 private String destIataCode;
...@@ -75,16 +65,6 @@ public class CeInfo implements Serializable { ...@@ -75,16 +65,6 @@ public class CeInfo implements Serializable {
75 private String modifyUserName; 65 private String modifyUserName;
76 66
77 /** 67 /**
78 - * 原产国全称
79 - */
80 - private String originCountry;
81 -
82 - /**
83 - * 目的国全称
84 - */
85 - private String destinationCountry;
86 -
87 - /**
88 * 申报币制 68 * 申报币制
89 */ 69 */
90 private String customsCurrency; 70 private String customsCurrency;
...@@ -194,6 +174,26 @@ public class CeInfo implements Serializable { ...@@ -194,6 +174,26 @@ public class CeInfo implements Serializable {
194 */ 174 */
195 private String docNondocFlag; 175 private String docNondocFlag;
196 176
177 + /**
178 + * 用户UUID
179 + */
180 + private String userUuid;
181 +
182 + /**
183 + * 发件人邮箱
184 + */
185 + private String shipperEmail;
186 +
187 + /**
188 + * 发货人国家二字码
189 + */
190 + private String shipperCountry;
191 +
192 + /**
193 + * 收件人国家二字码
194 + */
195 + private String recipientCountry;
196 +
197 private static final long serialVersionUID = 1L; 197 private static final long serialVersionUID = 1L;
198 198
199 public Long getId() { 199 public Long getId() {
...@@ -228,22 +228,6 @@ public class CeInfo implements Serializable { ...@@ -228,22 +228,6 @@ public class CeInfo implements Serializable {
228 this.shipDate = shipDate; 228 this.shipDate = shipDate;
229 } 229 }
230 230
231 - public String getShipperCountry() {
232 - return shipperCountry;
233 - }
234 -
235 - public void setShipperCountry(String shipperCountry) {
236 - this.shipperCountry = shipperCountry == null ? null : shipperCountry.trim();
237 - }
238 -
239 - public String getRecipientCountry() {
240 - return recipientCountry;
241 - }
242 -
243 - public void setRecipientCountry(String recipientCountry) {
244 - this.recipientCountry = recipientCountry == null ? null : recipientCountry.trim();
245 - }
246 -
247 public String getDestIataCode() { 231 public String getDestIataCode() {
248 return destIataCode; 232 return destIataCode;
249 } 233 }
...@@ -300,22 +284,6 @@ public class CeInfo implements Serializable { ...@@ -300,22 +284,6 @@ public class CeInfo implements Serializable {
300 this.modifyUserName = modifyUserName == null ? null : modifyUserName.trim(); 284 this.modifyUserName = modifyUserName == null ? null : modifyUserName.trim();
301 } 285 }
302 286
303 - public String getOriginCountry() {
304 - return originCountry;
305 - }
306 -
307 - public void setOriginCountry(String originCountry) {
308 - this.originCountry = originCountry == null ? null : originCountry.trim();
309 - }
310 -
311 - public String getDestinationCountry() {
312 - return destinationCountry;
313 - }
314 -
315 - public void setDestinationCountry(String destinationCountry) {
316 - this.destinationCountry = destinationCountry == null ? null : destinationCountry.trim();
317 - }
318 -
319 public String getCustomsCurrency() { 287 public String getCustomsCurrency() {
320 return customsCurrency; 288 return customsCurrency;
321 } 289 }
...@@ -492,6 +460,38 @@ public class CeInfo implements Serializable { ...@@ -492,6 +460,38 @@ public class CeInfo implements Serializable {
492 this.docNondocFlag = docNondocFlag == null ? null : docNondocFlag.trim(); 460 this.docNondocFlag = docNondocFlag == null ? null : docNondocFlag.trim();
493 } 461 }
494 462
463 + public String getUserUuid() {
464 + return userUuid;
465 + }
466 +
467 + public void setUserUuid(String userUuid) {
468 + this.userUuid = userUuid == null ? null : userUuid.trim();
469 + }
470 +
471 + public String getShipperEmail() {
472 + return shipperEmail;
473 + }
474 +
475 + public void setShipperEmail(String shipperEmail) {
476 + this.shipperEmail = shipperEmail == null ? null : shipperEmail.trim();
477 + }
478 +
479 + public String getShipperCountry() {
480 + return shipperCountry;
481 + }
482 +
483 + public void setShipperCountry(String shipperCountry) {
484 + this.shipperCountry = shipperCountry == null ? null : shipperCountry.trim();
485 + }
486 +
487 + public String getRecipientCountry() {
488 + return recipientCountry;
489 + }
490 +
491 + public void setRecipientCountry(String recipientCountry) {
492 + this.recipientCountry = recipientCountry == null ? null : recipientCountry.trim();
493 + }
494 +
495 @Override 495 @Override
496 public String toString() { 496 public String toString() {
497 StringBuilder sb = new StringBuilder(); 497 StringBuilder sb = new StringBuilder();
...@@ -502,8 +502,6 @@ public class CeInfo implements Serializable { ...@@ -502,8 +502,6 @@ public class CeInfo implements Serializable {
502 sb.append(", consignmentCode=").append(consignmentCode); 502 sb.append(", consignmentCode=").append(consignmentCode);
503 sb.append(", sendTime=").append(sendTime); 503 sb.append(", sendTime=").append(sendTime);
504 sb.append(", shipDate=").append(shipDate); 504 sb.append(", shipDate=").append(shipDate);
505 - sb.append(", shipperCountry=").append(shipperCountry);
506 - sb.append(", recipientCountry=").append(recipientCountry);
507 sb.append(", destIataCode=").append(destIataCode); 505 sb.append(", destIataCode=").append(destIataCode);
508 sb.append(", createTime=").append(createTime); 506 sb.append(", createTime=").append(createTime);
509 sb.append(", createUserId=").append(createUserId); 507 sb.append(", createUserId=").append(createUserId);
...@@ -511,8 +509,6 @@ public class CeInfo implements Serializable { ...@@ -511,8 +509,6 @@ public class CeInfo implements Serializable {
511 sb.append(", modifyTime=").append(modifyTime); 509 sb.append(", modifyTime=").append(modifyTime);
512 sb.append(", modifyUserId=").append(modifyUserId); 510 sb.append(", modifyUserId=").append(modifyUserId);
513 sb.append(", modifyUserName=").append(modifyUserName); 511 sb.append(", modifyUserName=").append(modifyUserName);
514 - sb.append(", originCountry=").append(originCountry);
515 - sb.append(", destinationCountry=").append(destinationCountry);
516 sb.append(", customsCurrency=").append(customsCurrency); 512 sb.append(", customsCurrency=").append(customsCurrency);
517 sb.append(", customsValue=").append(customsValue); 513 sb.append(", customsValue=").append(customsValue);
518 sb.append(", weight=").append(weight); 514 sb.append(", weight=").append(weight);
...@@ -535,6 +531,10 @@ public class CeInfo implements Serializable { ...@@ -535,6 +531,10 @@ public class CeInfo implements Serializable {
535 sb.append(", recipientCity=").append(recipientCity); 531 sb.append(", recipientCity=").append(recipientCity);
536 sb.append(", recipientPostalCode=").append(recipientPostalCode); 532 sb.append(", recipientPostalCode=").append(recipientPostalCode);
537 sb.append(", docNondocFlag=").append(docNondocFlag); 533 sb.append(", docNondocFlag=").append(docNondocFlag);
534 + sb.append(", userUuid=").append(userUuid);
535 + sb.append(", shipperEmail=").append(shipperEmail);
536 + sb.append(", shipperCountry=").append(shipperCountry);
537 + sb.append(", recipientCountry=").append(recipientCountry);
538 sb.append(", serialVersionUID=").append(serialVersionUID); 538 sb.append(", serialVersionUID=").append(serialVersionUID);
539 sb.append("]"); 539 sb.append("]");
540 return sb.toString(); 540 return sb.toString();
......
...@@ -376,146 +376,6 @@ public class CeInfoExample { ...@@ -376,146 +376,6 @@ public class CeInfoExample {
376 return (Criteria) this; 376 return (Criteria) this;
377 } 377 }
378 378
379 - public Criteria andShipperCountryIsNull() {
380 - addCriterion("SHIPPER_COUNTRY is null");
381 - return (Criteria) this;
382 - }
383 -
384 - public Criteria andShipperCountryIsNotNull() {
385 - addCriterion("SHIPPER_COUNTRY is not null");
386 - return (Criteria) this;
387 - }
388 -
389 - public Criteria andShipperCountryEqualTo(String value) {
390 - addCriterion("SHIPPER_COUNTRY =", value, "shipperCountry");
391 - return (Criteria) this;
392 - }
393 -
394 - public Criteria andShipperCountryNotEqualTo(String value) {
395 - addCriterion("SHIPPER_COUNTRY <>", value, "shipperCountry");
396 - return (Criteria) this;
397 - }
398 -
399 - public Criteria andShipperCountryGreaterThan(String value) {
400 - addCriterion("SHIPPER_COUNTRY >", value, "shipperCountry");
401 - return (Criteria) this;
402 - }
403 -
404 - public Criteria andShipperCountryGreaterThanOrEqualTo(String value) {
405 - addCriterion("SHIPPER_COUNTRY >=", value, "shipperCountry");
406 - return (Criteria) this;
407 - }
408 -
409 - public Criteria andShipperCountryLessThan(String value) {
410 - addCriterion("SHIPPER_COUNTRY <", value, "shipperCountry");
411 - return (Criteria) this;
412 - }
413 -
414 - public Criteria andShipperCountryLessThanOrEqualTo(String value) {
415 - addCriterion("SHIPPER_COUNTRY <=", value, "shipperCountry");
416 - return (Criteria) this;
417 - }
418 -
419 - public Criteria andShipperCountryLike(String value) {
420 - addCriterion("SHIPPER_COUNTRY like", value, "shipperCountry");
421 - return (Criteria) this;
422 - }
423 -
424 - public Criteria andShipperCountryNotLike(String value) {
425 - addCriterion("SHIPPER_COUNTRY not like", value, "shipperCountry");
426 - return (Criteria) this;
427 - }
428 -
429 - public Criteria andShipperCountryIn(List<String> values) {
430 - addCriterion("SHIPPER_COUNTRY in", values, "shipperCountry");
431 - return (Criteria) this;
432 - }
433 -
434 - public Criteria andShipperCountryNotIn(List<String> values) {
435 - addCriterion("SHIPPER_COUNTRY not in", values, "shipperCountry");
436 - return (Criteria) this;
437 - }
438 -
439 - public Criteria andShipperCountryBetween(String value1, String value2) {
440 - addCriterion("SHIPPER_COUNTRY between", value1, value2, "shipperCountry");
441 - return (Criteria) this;
442 - }
443 -
444 - public Criteria andShipperCountryNotBetween(String value1, String value2) {
445 - addCriterion("SHIPPER_COUNTRY not between", value1, value2, "shipperCountry");
446 - return (Criteria) this;
447 - }
448 -
449 - public Criteria andRecipientCountryIsNull() {
450 - addCriterion("RECIPIENT_COUNTRY is null");
451 - return (Criteria) this;
452 - }
453 -
454 - public Criteria andRecipientCountryIsNotNull() {
455 - addCriterion("RECIPIENT_COUNTRY is not null");
456 - return (Criteria) this;
457 - }
458 -
459 - public Criteria andRecipientCountryEqualTo(String value) {
460 - addCriterion("RECIPIENT_COUNTRY =", value, "recipientCountry");
461 - return (Criteria) this;
462 - }
463 -
464 - public Criteria andRecipientCountryNotEqualTo(String value) {
465 - addCriterion("RECIPIENT_COUNTRY <>", value, "recipientCountry");
466 - return (Criteria) this;
467 - }
468 -
469 - public Criteria andRecipientCountryGreaterThan(String value) {
470 - addCriterion("RECIPIENT_COUNTRY >", value, "recipientCountry");
471 - return (Criteria) this;
472 - }
473 -
474 - public Criteria andRecipientCountryGreaterThanOrEqualTo(String value) {
475 - addCriterion("RECIPIENT_COUNTRY >=", value, "recipientCountry");
476 - return (Criteria) this;
477 - }
478 -
479 - public Criteria andRecipientCountryLessThan(String value) {
480 - addCriterion("RECIPIENT_COUNTRY <", value, "recipientCountry");
481 - return (Criteria) this;
482 - }
483 -
484 - public Criteria andRecipientCountryLessThanOrEqualTo(String value) {
485 - addCriterion("RECIPIENT_COUNTRY <=", value, "recipientCountry");
486 - return (Criteria) this;
487 - }
488 -
489 - public Criteria andRecipientCountryLike(String value) {
490 - addCriterion("RECIPIENT_COUNTRY like", value, "recipientCountry");
491 - return (Criteria) this;
492 - }
493 -
494 - public Criteria andRecipientCountryNotLike(String value) {
495 - addCriterion("RECIPIENT_COUNTRY not like", value, "recipientCountry");
496 - return (Criteria) this;
497 - }
498 -
499 - public Criteria andRecipientCountryIn(List<String> values) {
500 - addCriterion("RECIPIENT_COUNTRY in", values, "recipientCountry");
501 - return (Criteria) this;
502 - }
503 -
504 - public Criteria andRecipientCountryNotIn(List<String> values) {
505 - addCriterion("RECIPIENT_COUNTRY not in", values, "recipientCountry");
506 - return (Criteria) this;
507 - }
508 -
509 - public Criteria andRecipientCountryBetween(String value1, String value2) {
510 - addCriterion("RECIPIENT_COUNTRY between", value1, value2, "recipientCountry");
511 - return (Criteria) this;
512 - }
513 -
514 - public Criteria andRecipientCountryNotBetween(String value1, String value2) {
515 - addCriterion("RECIPIENT_COUNTRY not between", value1, value2, "recipientCountry");
516 - return (Criteria) this;
517 - }
518 -
519 public Criteria andDestIataCodeIsNull() { 379 public Criteria andDestIataCodeIsNull() {
520 addCriterion("DEST_IATA_CODE is null"); 380 addCriterion("DEST_IATA_CODE is null");
521 return (Criteria) this; 381 return (Criteria) this;
...@@ -966,146 +826,6 @@ public class CeInfoExample { ...@@ -966,146 +826,6 @@ public class CeInfoExample {
966 return (Criteria) this; 826 return (Criteria) this;
967 } 827 }
968 828
969 - public Criteria andOriginCountryIsNull() {
970 - addCriterion("ORIGIN_COUNTRY is null");
971 - return (Criteria) this;
972 - }
973 -
974 - public Criteria andOriginCountryIsNotNull() {
975 - addCriterion("ORIGIN_COUNTRY is not null");
976 - return (Criteria) this;
977 - }
978 -
979 - public Criteria andOriginCountryEqualTo(String value) {
980 - addCriterion("ORIGIN_COUNTRY =", value, "originCountry");
981 - return (Criteria) this;
982 - }
983 -
984 - public Criteria andOriginCountryNotEqualTo(String value) {
985 - addCriterion("ORIGIN_COUNTRY <>", value, "originCountry");
986 - return (Criteria) this;
987 - }
988 -
989 - public Criteria andOriginCountryGreaterThan(String value) {
990 - addCriterion("ORIGIN_COUNTRY >", value, "originCountry");
991 - return (Criteria) this;
992 - }
993 -
994 - public Criteria andOriginCountryGreaterThanOrEqualTo(String value) {
995 - addCriterion("ORIGIN_COUNTRY >=", value, "originCountry");
996 - return (Criteria) this;
997 - }
998 -
999 - public Criteria andOriginCountryLessThan(String value) {
1000 - addCriterion("ORIGIN_COUNTRY <", value, "originCountry");
1001 - return (Criteria) this;
1002 - }
1003 -
1004 - public Criteria andOriginCountryLessThanOrEqualTo(String value) {
1005 - addCriterion("ORIGIN_COUNTRY <=", value, "originCountry");
1006 - return (Criteria) this;
1007 - }
1008 -
1009 - public Criteria andOriginCountryLike(String value) {
1010 - addCriterion("ORIGIN_COUNTRY like", value, "originCountry");
1011 - return (Criteria) this;
1012 - }
1013 -
1014 - public Criteria andOriginCountryNotLike(String value) {
1015 - addCriterion("ORIGIN_COUNTRY not like", value, "originCountry");
1016 - return (Criteria) this;
1017 - }
1018 -
1019 - public Criteria andOriginCountryIn(List<String> values) {
1020 - addCriterion("ORIGIN_COUNTRY in", values, "originCountry");
1021 - return (Criteria) this;
1022 - }
1023 -
1024 - public Criteria andOriginCountryNotIn(List<String> values) {
1025 - addCriterion("ORIGIN_COUNTRY not in", values, "originCountry");
1026 - return (Criteria) this;
1027 - }
1028 -
1029 - public Criteria andOriginCountryBetween(String value1, String value2) {
1030 - addCriterion("ORIGIN_COUNTRY between", value1, value2, "originCountry");
1031 - return (Criteria) this;
1032 - }
1033 -
1034 - public Criteria andOriginCountryNotBetween(String value1, String value2) {
1035 - addCriterion("ORIGIN_COUNTRY not between", value1, value2, "originCountry");
1036 - return (Criteria) this;
1037 - }
1038 -
1039 - public Criteria andDestinationCountryIsNull() {
1040 - addCriterion("DESTINATION_COUNTRY is null");
1041 - return (Criteria) this;
1042 - }
1043 -
1044 - public Criteria andDestinationCountryIsNotNull() {
1045 - addCriterion("DESTINATION_COUNTRY is not null");
1046 - return (Criteria) this;
1047 - }
1048 -
1049 - public Criteria andDestinationCountryEqualTo(String value) {
1050 - addCriterion("DESTINATION_COUNTRY =", value, "destinationCountry");
1051 - return (Criteria) this;
1052 - }
1053 -
1054 - public Criteria andDestinationCountryNotEqualTo(String value) {
1055 - addCriterion("DESTINATION_COUNTRY <>", value, "destinationCountry");
1056 - return (Criteria) this;
1057 - }
1058 -
1059 - public Criteria andDestinationCountryGreaterThan(String value) {
1060 - addCriterion("DESTINATION_COUNTRY >", value, "destinationCountry");
1061 - return (Criteria) this;
1062 - }
1063 -
1064 - public Criteria andDestinationCountryGreaterThanOrEqualTo(String value) {
1065 - addCriterion("DESTINATION_COUNTRY >=", value, "destinationCountry");
1066 - return (Criteria) this;
1067 - }
1068 -
1069 - public Criteria andDestinationCountryLessThan(String value) {
1070 - addCriterion("DESTINATION_COUNTRY <", value, "destinationCountry");
1071 - return (Criteria) this;
1072 - }
1073 -
1074 - public Criteria andDestinationCountryLessThanOrEqualTo(String value) {
1075 - addCriterion("DESTINATION_COUNTRY <=", value, "destinationCountry");
1076 - return (Criteria) this;
1077 - }
1078 -
1079 - public Criteria andDestinationCountryLike(String value) {
1080 - addCriterion("DESTINATION_COUNTRY like", value, "destinationCountry");
1081 - return (Criteria) this;
1082 - }
1083 -
1084 - public Criteria andDestinationCountryNotLike(String value) {
1085 - addCriterion("DESTINATION_COUNTRY not like", value, "destinationCountry");
1086 - return (Criteria) this;
1087 - }
1088 -
1089 - public Criteria andDestinationCountryIn(List<String> values) {
1090 - addCriterion("DESTINATION_COUNTRY in", values, "destinationCountry");
1091 - return (Criteria) this;
1092 - }
1093 -
1094 - public Criteria andDestinationCountryNotIn(List<String> values) {
1095 - addCriterion("DESTINATION_COUNTRY not in", values, "destinationCountry");
1096 - return (Criteria) this;
1097 - }
1098 -
1099 - public Criteria andDestinationCountryBetween(String value1, String value2) {
1100 - addCriterion("DESTINATION_COUNTRY between", value1, value2, "destinationCountry");
1101 - return (Criteria) this;
1102 - }
1103 -
1104 - public Criteria andDestinationCountryNotBetween(String value1, String value2) {
1105 - addCriterion("DESTINATION_COUNTRY not between", value1, value2, "destinationCountry");
1106 - return (Criteria) this;
1107 - }
1108 -
1109 public Criteria andCustomsCurrencyIsNull() { 829 public Criteria andCustomsCurrencyIsNull() {
1110 addCriterion("CUSTOMS_CURRENCY is null"); 830 addCriterion("CUSTOMS_CURRENCY is null");
1111 return (Criteria) this; 831 return (Criteria) this;
...@@ -2615,6 +2335,286 @@ public class CeInfoExample { ...@@ -2615,6 +2335,286 @@ public class CeInfoExample {
2615 addCriterion("DOC_NONDOC_FLAG not between", value1, value2, "docNondocFlag"); 2335 addCriterion("DOC_NONDOC_FLAG not between", value1, value2, "docNondocFlag");
2616 return (Criteria) this; 2336 return (Criteria) this;
2617 } 2337 }
2338 +
2339 + public Criteria andUserUuidIsNull() {
2340 + addCriterion("USER_UUID is null");
2341 + return (Criteria) this;
2342 + }
2343 +
2344 + public Criteria andUserUuidIsNotNull() {
2345 + addCriterion("USER_UUID is not null");
2346 + return (Criteria) this;
2347 + }
2348 +
2349 + public Criteria andUserUuidEqualTo(String value) {
2350 + addCriterion("USER_UUID =", value, "userUuid");
2351 + return (Criteria) this;
2352 + }
2353 +
2354 + public Criteria andUserUuidNotEqualTo(String value) {
2355 + addCriterion("USER_UUID <>", value, "userUuid");
2356 + return (Criteria) this;
2357 + }
2358 +
2359 + public Criteria andUserUuidGreaterThan(String value) {
2360 + addCriterion("USER_UUID >", value, "userUuid");
2361 + return (Criteria) this;
2362 + }
2363 +
2364 + public Criteria andUserUuidGreaterThanOrEqualTo(String value) {
2365 + addCriterion("USER_UUID >=", value, "userUuid");
2366 + return (Criteria) this;
2367 + }
2368 +
2369 + public Criteria andUserUuidLessThan(String value) {
2370 + addCriterion("USER_UUID <", value, "userUuid");
2371 + return (Criteria) this;
2372 + }
2373 +
2374 + public Criteria andUserUuidLessThanOrEqualTo(String value) {
2375 + addCriterion("USER_UUID <=", value, "userUuid");
2376 + return (Criteria) this;
2377 + }
2378 +
2379 + public Criteria andUserUuidLike(String value) {
2380 + addCriterion("USER_UUID like", value, "userUuid");
2381 + return (Criteria) this;
2382 + }
2383 +
2384 + public Criteria andUserUuidNotLike(String value) {
2385 + addCriterion("USER_UUID not like", value, "userUuid");
2386 + return (Criteria) this;
2387 + }
2388 +
2389 + public Criteria andUserUuidIn(List<String> values) {
2390 + addCriterion("USER_UUID in", values, "userUuid");
2391 + return (Criteria) this;
2392 + }
2393 +
2394 + public Criteria andUserUuidNotIn(List<String> values) {
2395 + addCriterion("USER_UUID not in", values, "userUuid");
2396 + return (Criteria) this;
2397 + }
2398 +
2399 + public Criteria andUserUuidBetween(String value1, String value2) {
2400 + addCriterion("USER_UUID between", value1, value2, "userUuid");
2401 + return (Criteria) this;
2402 + }
2403 +
2404 + public Criteria andUserUuidNotBetween(String value1, String value2) {
2405 + addCriterion("USER_UUID not between", value1, value2, "userUuid");
2406 + return (Criteria) this;
2407 + }
2408 +
2409 + public Criteria andShipperEmailIsNull() {
2410 + addCriterion("SHIPPER_EMAIL is null");
2411 + return (Criteria) this;
2412 + }
2413 +
2414 + public Criteria andShipperEmailIsNotNull() {
2415 + addCriterion("SHIPPER_EMAIL is not null");
2416 + return (Criteria) this;
2417 + }
2418 +
2419 + public Criteria andShipperEmailEqualTo(String value) {
2420 + addCriterion("SHIPPER_EMAIL =", value, "shipperEmail");
2421 + return (Criteria) this;
2422 + }
2423 +
2424 + public Criteria andShipperEmailNotEqualTo(String value) {
2425 + addCriterion("SHIPPER_EMAIL <>", value, "shipperEmail");
2426 + return (Criteria) this;
2427 + }
2428 +
2429 + public Criteria andShipperEmailGreaterThan(String value) {
2430 + addCriterion("SHIPPER_EMAIL >", value, "shipperEmail");
2431 + return (Criteria) this;
2432 + }
2433 +
2434 + public Criteria andShipperEmailGreaterThanOrEqualTo(String value) {
2435 + addCriterion("SHIPPER_EMAIL >=", value, "shipperEmail");
2436 + return (Criteria) this;
2437 + }
2438 +
2439 + public Criteria andShipperEmailLessThan(String value) {
2440 + addCriterion("SHIPPER_EMAIL <", value, "shipperEmail");
2441 + return (Criteria) this;
2442 + }
2443 +
2444 + public Criteria andShipperEmailLessThanOrEqualTo(String value) {
2445 + addCriterion("SHIPPER_EMAIL <=", value, "shipperEmail");
2446 + return (Criteria) this;
2447 + }
2448 +
2449 + public Criteria andShipperEmailLike(String value) {
2450 + addCriterion("SHIPPER_EMAIL like", value, "shipperEmail");
2451 + return (Criteria) this;
2452 + }
2453 +
2454 + public Criteria andShipperEmailNotLike(String value) {
2455 + addCriterion("SHIPPER_EMAIL not like", value, "shipperEmail");
2456 + return (Criteria) this;
2457 + }
2458 +
2459 + public Criteria andShipperEmailIn(List<String> values) {
2460 + addCriterion("SHIPPER_EMAIL in", values, "shipperEmail");
2461 + return (Criteria) this;
2462 + }
2463 +
2464 + public Criteria andShipperEmailNotIn(List<String> values) {
2465 + addCriterion("SHIPPER_EMAIL not in", values, "shipperEmail");
2466 + return (Criteria) this;
2467 + }
2468 +
2469 + public Criteria andShipperEmailBetween(String value1, String value2) {
2470 + addCriterion("SHIPPER_EMAIL between", value1, value2, "shipperEmail");
2471 + return (Criteria) this;
2472 + }
2473 +
2474 + public Criteria andShipperEmailNotBetween(String value1, String value2) {
2475 + addCriterion("SHIPPER_EMAIL not between", value1, value2, "shipperEmail");
2476 + return (Criteria) this;
2477 + }
2478 +
2479 + public Criteria andShipperCountryIsNull() {
2480 + addCriterion("SHIPPER_COUNTRY is null");
2481 + return (Criteria) this;
2482 + }
2483 +
2484 + public Criteria andShipperCountryIsNotNull() {
2485 + addCriterion("SHIPPER_COUNTRY is not null");
2486 + return (Criteria) this;
2487 + }
2488 +
2489 + public Criteria andShipperCountryEqualTo(String value) {
2490 + addCriterion("SHIPPER_COUNTRY =", value, "shipperCountry");
2491 + return (Criteria) this;
2492 + }
2493 +
2494 + public Criteria andShipperCountryNotEqualTo(String value) {
2495 + addCriterion("SHIPPER_COUNTRY <>", value, "shipperCountry");
2496 + return (Criteria) this;
2497 + }
2498 +
2499 + public Criteria andShipperCountryGreaterThan(String value) {
2500 + addCriterion("SHIPPER_COUNTRY >", value, "shipperCountry");
2501 + return (Criteria) this;
2502 + }
2503 +
2504 + public Criteria andShipperCountryGreaterThanOrEqualTo(String value) {
2505 + addCriterion("SHIPPER_COUNTRY >=", value, "shipperCountry");
2506 + return (Criteria) this;
2507 + }
2508 +
2509 + public Criteria andShipperCountryLessThan(String value) {
2510 + addCriterion("SHIPPER_COUNTRY <", value, "shipperCountry");
2511 + return (Criteria) this;
2512 + }
2513 +
2514 + public Criteria andShipperCountryLessThanOrEqualTo(String value) {
2515 + addCriterion("SHIPPER_COUNTRY <=", value, "shipperCountry");
2516 + return (Criteria) this;
2517 + }
2518 +
2519 + public Criteria andShipperCountryLike(String value) {
2520 + addCriterion("SHIPPER_COUNTRY like", value, "shipperCountry");
2521 + return (Criteria) this;
2522 + }
2523 +
2524 + public Criteria andShipperCountryNotLike(String value) {
2525 + addCriterion("SHIPPER_COUNTRY not like", value, "shipperCountry");
2526 + return (Criteria) this;
2527 + }
2528 +
2529 + public Criteria andShipperCountryIn(List<String> values) {
2530 + addCriterion("SHIPPER_COUNTRY in", values, "shipperCountry");
2531 + return (Criteria) this;
2532 + }
2533 +
2534 + public Criteria andShipperCountryNotIn(List<String> values) {
2535 + addCriterion("SHIPPER_COUNTRY not in", values, "shipperCountry");
2536 + return (Criteria) this;
2537 + }
2538 +
2539 + public Criteria andShipperCountryBetween(String value1, String value2) {
2540 + addCriterion("SHIPPER_COUNTRY between", value1, value2, "shipperCountry");
2541 + return (Criteria) this;
2542 + }
2543 +
2544 + public Criteria andShipperCountryNotBetween(String value1, String value2) {
2545 + addCriterion("SHIPPER_COUNTRY not between", value1, value2, "shipperCountry");
2546 + return (Criteria) this;
2547 + }
2548 +
2549 + public Criteria andRecipientCountryIsNull() {
2550 + addCriterion("RECIPIENT_COUNTRY is null");
2551 + return (Criteria) this;
2552 + }
2553 +
2554 + public Criteria andRecipientCountryIsNotNull() {
2555 + addCriterion("RECIPIENT_COUNTRY is not null");
2556 + return (Criteria) this;
2557 + }
2558 +
2559 + public Criteria andRecipientCountryEqualTo(String value) {
2560 + addCriterion("RECIPIENT_COUNTRY =", value, "recipientCountry");
2561 + return (Criteria) this;
2562 + }
2563 +
2564 + public Criteria andRecipientCountryNotEqualTo(String value) {
2565 + addCriterion("RECIPIENT_COUNTRY <>", value, "recipientCountry");
2566 + return (Criteria) this;
2567 + }
2568 +
2569 + public Criteria andRecipientCountryGreaterThan(String value) {
2570 + addCriterion("RECIPIENT_COUNTRY >", value, "recipientCountry");
2571 + return (Criteria) this;
2572 + }
2573 +
2574 + public Criteria andRecipientCountryGreaterThanOrEqualTo(String value) {
2575 + addCriterion("RECIPIENT_COUNTRY >=", value, "recipientCountry");
2576 + return (Criteria) this;
2577 + }
2578 +
2579 + public Criteria andRecipientCountryLessThan(String value) {
2580 + addCriterion("RECIPIENT_COUNTRY <", value, "recipientCountry");
2581 + return (Criteria) this;
2582 + }
2583 +
2584 + public Criteria andRecipientCountryLessThanOrEqualTo(String value) {
2585 + addCriterion("RECIPIENT_COUNTRY <=", value, "recipientCountry");
2586 + return (Criteria) this;
2587 + }
2588 +
2589 + public Criteria andRecipientCountryLike(String value) {
2590 + addCriterion("RECIPIENT_COUNTRY like", value, "recipientCountry");
2591 + return (Criteria) this;
2592 + }
2593 +
2594 + public Criteria andRecipientCountryNotLike(String value) {
2595 + addCriterion("RECIPIENT_COUNTRY not like", value, "recipientCountry");
2596 + return (Criteria) this;
2597 + }
2598 +
2599 + public Criteria andRecipientCountryIn(List<String> values) {
2600 + addCriterion("RECIPIENT_COUNTRY in", values, "recipientCountry");
2601 + return (Criteria) this;
2602 + }
2603 +
2604 + public Criteria andRecipientCountryNotIn(List<String> values) {
2605 + addCriterion("RECIPIENT_COUNTRY not in", values, "recipientCountry");
2606 + return (Criteria) this;
2607 + }
2608 +
2609 + public Criteria andRecipientCountryBetween(String value1, String value2) {
2610 + addCriterion("RECIPIENT_COUNTRY between", value1, value2, "recipientCountry");
2611 + return (Criteria) this;
2612 + }
2613 +
2614 + public Criteria andRecipientCountryNotBetween(String value1, String value2) {
2615 + addCriterion("RECIPIENT_COUNTRY not between", value1, value2, "recipientCountry");
2616 + return (Criteria) this;
2617 + }
2618 } 2618 }
2619 2619
2620 public static class Criteria extends GeneratedCriteria { 2620 public static class Criteria extends GeneratedCriteria {
......
...@@ -25,16 +25,6 @@ public class Consignment implements Serializable { ...@@ -25,16 +25,6 @@ public class Consignment implements Serializable {
25 private Date shipDate; 25 private Date shipDate;
26 26
27 /** 27 /**
28 - * 发货人国家
29 - */
30 - private String shipperCountry;
31 -
32 - /**
33 - * 收件人国家
34 - */
35 - private String recipientCountry;
36 -
37 - /**
38 * 目的国口岸 28 * 目的国口岸
39 */ 29 */
40 private String destIataCode; 30 private String destIataCode;
...@@ -220,13 +210,13 @@ public class Consignment implements Serializable { ...@@ -220,13 +210,13 @@ public class Consignment implements Serializable {
220 private String recipientPostalCode; 210 private String recipientPostalCode;
221 211
222 /** 212 /**
223 - * 运单状态ID， 213 + * 运单状态CODE，
224 关联数据字典表。指定字典目录CODE：CONSIGNMENT_STATUS 214 关联数据字典表。指定字典目录CODE：CONSIGNMENT_STATUS
225 */ 215 */
226 - private Long statusId; 216 + private String statusCode;
227 217
228 /** 218 /**
229 - * 运单状态名称(待上传、已上传、已发送) 219 + * 运单状态名称(上传成功、上传失败)
230 */ 220 */
231 private String statusName; 221 private String statusName;
232 222
...@@ -246,21 +236,31 @@ public class Consignment implements Serializable { ...@@ -246,21 +236,31 @@ public class Consignment implements Serializable {
246 private String userInputShipperAccount; 236 private String userInputShipperAccount;
247 237
248 /** 238 /**
239 + * 用户录入原产国全称CODE,关联数据字典表。指定字典目录CODE：COUNTRY
240 + */
241 + private String userInputOriginCountryCode;
242 +
243 + /**
249 * 用户录入原产国全称 244 * 用户录入原产国全称
250 */ 245 */
251 - private Long userInputOriginCountryId; 246 + private String userInputOriginCountry;
252 247
253 /** 248 /**
254 - * 用户录入原产国全称ID， 249 + * 原产国全称CODE，
255 关联数据字典表。指定字典目录CODE：COUNTRY 250 关联数据字典表。指定字典目录CODE：COUNTRY
256 */ 251 */
257 - private String userInputOriginCountry; 252 + private String originCountryCode;
258 253
259 /** 254 /**
260 - * 原产国全称ID， 255 + * 发件人邮箱
256 + */
257 + private String shipperEmail;
258 +
259 + /**
260 + * 目的国全称CODE，
261 关联数据字典表。指定字典目录CODE：COUNTRY 261 关联数据字典表。指定字典目录CODE：COUNTRY
262 */ 262 */
263 - private Long originCountryId; 263 + private String destinationCountryCode;
264 264
265 private static final long serialVersionUID = 1L; 265 private static final long serialVersionUID = 1L;
266 266
...@@ -288,22 +288,6 @@ public class Consignment implements Serializable { ...@@ -288,22 +288,6 @@ public class Consignment implements Serializable {
288 this.shipDate = shipDate; 288 this.shipDate = shipDate;
289 } 289 }
290 290
291 - public String getShipperCountry() {
292 - return shipperCountry;
293 - }
294 -
295 - public void setShipperCountry(String shipperCountry) {
296 - this.shipperCountry = shipperCountry == null ? null : shipperCountry.trim();
297 - }
298 -
299 - public String getRecipientCountry() {
300 - return recipientCountry;
301 - }
302 -
303 - public void setRecipientCountry(String recipientCountry) {
304 - this.recipientCountry = recipientCountry == null ? null : recipientCountry.trim();
305 - }
306 -
307 public String getDestIataCode() { 291 public String getDestIataCode() {
308 return destIataCode; 292 return destIataCode;
309 } 293 }
...@@ -600,12 +584,12 @@ public class Consignment implements Serializable { ...@@ -600,12 +584,12 @@ public class Consignment implements Serializable {
600 this.recipientPostalCode = recipientPostalCode == null ? null : recipientPostalCode.trim(); 584 this.recipientPostalCode = recipientPostalCode == null ? null : recipientPostalCode.trim();
601 } 585 }
602 586
603 - public Long getStatusId() { 587 + public String getStatusCode() {
604 - return statusId; 588 + return statusCode;
605 } 589 }
606 590
607 - public void setStatusId(Long statusId) { 591 + public void setStatusCode(String statusCode) {
608 - this.statusId = statusId; 592 + this.statusCode = statusCode == null ? null : statusCode.trim();
609 } 593 }
610 594
611 public String getStatusName() { 595 public String getStatusName() {
...@@ -640,12 +624,12 @@ public class Consignment implements Serializable { ...@@ -640,12 +624,12 @@ public class Consignment implements Serializable {
640 this.userInputShipperAccount = userInputShipperAccount == null ? null : userInputShipperAccount.trim(); 624 this.userInputShipperAccount = userInputShipperAccount == null ? null : userInputShipperAccount.trim();
641 } 625 }
642 626
643 - public Long getUserInputOriginCountryId() { 627 + public String getUserInputOriginCountryCode() {
644 - return userInputOriginCountryId; 628 + return userInputOriginCountryCode;
645 } 629 }
646 630
647 - public void setUserInputOriginCountryId(Long userInputOriginCountryId) { 631 + public void setUserInputOriginCountryCode(String userInputOriginCountryCode) {
648 - this.userInputOriginCountryId = userInputOriginCountryId; 632 + this.userInputOriginCountryCode = userInputOriginCountryCode == null ? null : userInputOriginCountryCode.trim();
649 } 633 }
650 634
651 public String getUserInputOriginCountry() { 635 public String getUserInputOriginCountry() {
...@@ -656,12 +640,28 @@ public class Consignment implements Serializable { ...@@ -656,12 +640,28 @@ public class Consignment implements Serializable {
656 this.userInputOriginCountry = userInputOriginCountry == null ? null : userInputOriginCountry.trim(); 640 this.userInputOriginCountry = userInputOriginCountry == null ? null : userInputOriginCountry.trim();
657 } 641 }
658 642
659 - public Long getOriginCountryId() { 643 + public String getOriginCountryCode() {
660 - return originCountryId; 644 + return originCountryCode;
645 + }
646 +
647 + public void setOriginCountryCode(String originCountryCode) {
648 + this.originCountryCode = originCountryCode == null ? null : originCountryCode.trim();
649 + }
650 +
651 + public String getShipperEmail() {
652 + return shipperEmail;
653 + }
654 +
655 + public void setShipperEmail(String shipperEmail) {
656 + this.shipperEmail = shipperEmail == null ? null : shipperEmail.trim();
657 + }
658 +
659 + public String getDestinationCountryCode() {
660 + return destinationCountryCode;
661 } 661 }
662 662
663 - public void setOriginCountryId(Long originCountryId) { 663 + public void setDestinationCountryCode(String destinationCountryCode) {
664 - this.originCountryId = originCountryId; 664 + this.destinationCountryCode = destinationCountryCode == null ? null : destinationCountryCode.trim();
665 } 665 }
666 666
667 @Override 667 @Override
...@@ -673,8 +673,6 @@ public class Consignment implements Serializable { ...@@ -673,8 +673,6 @@ public class Consignment implements Serializable {
673 sb.append(", id=").append(id); 673 sb.append(", id=").append(id);
674 sb.append(", consignmentCode=").append(consignmentCode); 674 sb.append(", consignmentCode=").append(consignmentCode);
675 sb.append(", shipDate=").append(shipDate); 675 sb.append(", shipDate=").append(shipDate);
676 - sb.append(", shipperCountry=").append(shipperCountry);
677 - sb.append(", recipientCountry=").append(recipientCountry);
678 sb.append(", destIataCode=").append(destIataCode); 676 sb.append(", destIataCode=").append(destIataCode);
679 sb.append(", originCountry=").append(originCountry); 677 sb.append(", originCountry=").append(originCountry);
680 sb.append(", destinationCountry=").append(destinationCountry); 678 sb.append(", destinationCountry=").append(destinationCountry);
...@@ -712,14 +710,16 @@ public class Consignment implements Serializable { ...@@ -712,14 +710,16 @@ public class Consignment implements Serializable {
712 sb.append(", modifyUserName=").append(modifyUserName); 710 sb.append(", modifyUserName=").append(modifyUserName);
713 sb.append(", ceInfoId=").append(ceInfoId); 711 sb.append(", ceInfoId=").append(ceInfoId);
714 sb.append(", recipientPostalCode=").append(recipientPostalCode); 712 sb.append(", recipientPostalCode=").append(recipientPostalCode);
715 - sb.append(", statusId=").append(statusId); 713 + sb.append(", statusCode=").append(statusCode);
716 sb.append(", statusName=").append(statusName); 714 sb.append(", statusName=").append(statusName);
717 sb.append(", docNondocFlag=").append(docNondocFlag); 715 sb.append(", docNondocFlag=").append(docNondocFlag);
718 sb.append(", userUuid=").append(userUuid); 716 sb.append(", userUuid=").append(userUuid);
719 sb.append(", userInputShipperAccount=").append(userInputShipperAccount); 717 sb.append(", userInputShipperAccount=").append(userInputShipperAccount);
720 - sb.append(", userInputOriginCountryId=").append(userInputOriginCountryId); 718 + sb.append(", userInputOriginCountryCode=").append(userInputOriginCountryCode);
721 sb.append(", userInputOriginCountry=").append(userInputOriginCountry); 719 sb.append(", userInputOriginCountry=").append(userInputOriginCountry);
722 - sb.append(", originCountryId=").append(originCountryId); 720 + sb.append(", originCountryCode=").append(originCountryCode);
721 + sb.append(", shipperEmail=").append(shipperEmail);
722 + sb.append(", destinationCountryCode=").append(destinationCountryCode);
723 sb.append(", serialVersionUID=").append(serialVersionUID); 723 sb.append(", serialVersionUID=").append(serialVersionUID);
724 sb.append("]"); 724 sb.append("]");
725 return sb.toString(); 725 return sb.toString();
......
...@@ -316,146 +316,6 @@ public class ConsignmentExample { ...@@ -316,146 +316,6 @@ public class ConsignmentExample {
316 return (Criteria) this; 316 return (Criteria) this;
317 } 317 }
318 318
319 - public Criteria andShipperCountryIsNull() {
320 - addCriterion("SHIPPER_COUNTRY is null");
321 - return (Criteria) this;
322 - }
323 -
324 - public Criteria andShipperCountryIsNotNull() {
325 - addCriterion("SHIPPER_COUNTRY is not null");
326 - return (Criteria) this;
327 - }
328 -
329 - public Criteria andShipperCountryEqualTo(String value) {
330 - addCriterion("SHIPPER_COUNTRY =", value, "shipperCountry");
331 - return (Criteria) this;
332 - }
333 -
334 - public Criteria andShipperCountryNotEqualTo(String value) {
335 - addCriterion("SHIPPER_COUNTRY <>", value, "shipperCountry");
336 - return (Criteria) this;
337 - }
338 -
339 - public Criteria andShipperCountryGreaterThan(String value) {
340 - addCriterion("SHIPPER_COUNTRY >", value, "shipperCountry");
341 - return (Criteria) this;
342 - }
343 -
344 - public Criteria andShipperCountryGreaterThanOrEqualTo(String value) {
345 - addCriterion("SHIPPER_COUNTRY >=", value, "shipperCountry");
346 - return (Criteria) this;
347 - }
348 -
349 - public Criteria andShipperCountryLessThan(String value) {
350 - addCriterion("SHIPPER_COUNTRY <", value, "shipperCountry");
351 - return (Criteria) this;
352 - }
353 -
354 - public Criteria andShipperCountryLessThanOrEqualTo(String value) {
355 - addCriterion("SHIPPER_COUNTRY <=", value, "shipperCountry");
356 - return (Criteria) this;
357 - }
358 -
359 - public Criteria andShipperCountryLike(String value) {
360 - addCriterion("SHIPPER_COUNTRY like", value, "shipperCountry");
361 - return (Criteria) this;
362 - }
363 -
364 - public Criteria andShipperCountryNotLike(String value) {
365 - addCriterion("SHIPPER_COUNTRY not like", value, "shipperCountry");
366 - return (Criteria) this;
367 - }
368 -
369 - public Criteria andShipperCountryIn(List<String> values) {
370 - addCriterion("SHIPPER_COUNTRY in", values, "shipperCountry");
371 - return (Criteria) this;
372 - }
373 -
374 - public Criteria andShipperCountryNotIn(List<String> values) {
375 - addCriterion("SHIPPER_COUNTRY not in", values, "shipperCountry");
376 - return (Criteria) this;
377 - }
378 -
379 - public Criteria andShipperCountryBetween(String value1, String value2) {
380 - addCriterion("SHIPPER_COUNTRY between", value1, value2, "shipperCountry");
381 - return (Criteria) this;
382 - }
383 -
384 - public Criteria andShipperCountryNotBetween(String value1, String value2) {
385 - addCriterion("SHIPPER_COUNTRY not between", value1, value2, "shipperCountry");
386 - return (Criteria) this;
387 - }
388 -
389 - public Criteria andRecipientCountryIsNull() {
390 - addCriterion("RECIPIENT_COUNTRY is null");
391 - return (Criteria) this;
392 - }
393 -
394 - public Criteria andRecipientCountryIsNotNull() {
395 - addCriterion("RECIPIENT_COUNTRY is not null");
396 - return (Criteria) this;
397 - }
398 -
399 - public Criteria andRecipientCountryEqualTo(String value) {
400 - addCriterion("RECIPIENT_COUNTRY =", value, "recipientCountry");
401 - return (Criteria) this;
402 - }
403 -
404 - public Criteria andRecipientCountryNotEqualTo(String value) {
405 - addCriterion("RECIPIENT_COUNTRY <>", value, "recipientCountry");
406 - return (Criteria) this;
407 - }
408 -
409 - public Criteria andRecipientCountryGreaterThan(String value) {
410 - addCriterion("RECIPIENT_COUNTRY >", value, "recipientCountry");
411 - return (Criteria) this;
412 - }
413 -
414 - public Criteria andRecipientCountryGreaterThanOrEqualTo(String value) {
415 - addCriterion("RECIPIENT_COUNTRY >=", value, "recipientCountry");
416 - return (Criteria) this;
417 - }
418 -
419 - public Criteria andRecipientCountryLessThan(String value) {
420 - addCriterion("RECIPIENT_COUNTRY <", value, "recipientCountry");
421 - return (Criteria) this;
422 - }
423 -
424 - public Criteria andRecipientCountryLessThanOrEqualTo(String value) {
425 - addCriterion("RECIPIENT_COUNTRY <=", value, "recipientCountry");
426 - return (Criteria) this;
427 - }
428 -
429 - public Criteria andRecipientCountryLike(String value) {
430 - addCriterion("RECIPIENT_COUNTRY like", value, "recipientCountry");
431 - return (Criteria) this;
432 - }
433 -
434 - public Criteria andRecipientCountryNotLike(String value) {
435 - addCriterion("RECIPIENT_COUNTRY not like", value, "recipientCountry");
436 - return (Criteria) this;
437 - }
438 -
439 - public Criteria andRecipientCountryIn(List<String> values) {
440 - addCriterion("RECIPIENT_COUNTRY in", values, "recipientCountry");
441 - return (Criteria) this;
442 - }
443 -
444 - public Criteria andRecipientCountryNotIn(List<String> values) {
445 - addCriterion("RECIPIENT_COUNTRY not in", values, "recipientCountry");
446 - return (Criteria) this;
447 - }
448 -
449 - public Criteria andRecipientCountryBetween(String value1, String value2) {
450 - addCriterion("RECIPIENT_COUNTRY between", value1, value2, "recipientCountry");
451 - return (Criteria) this;
452 - }
453 -
454 - public Criteria andRecipientCountryNotBetween(String value1, String value2) {
455 - addCriterion("RECIPIENT_COUNTRY not between", value1, value2, "recipientCountry");
456 - return (Criteria) this;
457 - }
458 -
459 public Criteria andDestIataCodeIsNull() { 319 public Criteria andDestIataCodeIsNull() {
460 addCriterion("DEST_IATA_CODE is null"); 320 addCriterion("DEST_IATA_CODE is null");
461 return (Criteria) this; 321 return (Criteria) this;
...@@ -2926,63 +2786,73 @@ public class ConsignmentExample { ...@@ -2926,63 +2786,73 @@ public class ConsignmentExample {
2926 return (Criteria) this; 2786 return (Criteria) this;
2927 } 2787 }
2928 2788
2929 - public Criteria andStatusIdIsNull() { 2789 + public Criteria andStatusCodeIsNull() {
2930 - addCriterion("STATUS_ID is null"); 2790 + addCriterion("STATUS_CODE is null");
2791 + return (Criteria) this;
2792 + }
2793 +
2794 + public Criteria andStatusCodeIsNotNull() {
2795 + addCriterion("STATUS_CODE is not null");
2931 return (Criteria) this; 2796 return (Criteria) this;
2932 } 2797 }
2933 2798
2934 - public Criteria andStatusIdIsNotNull() { 2799 + public Criteria andStatusCodeEqualTo(String value) {
2935 - addCriterion("STATUS_ID is not null"); 2800 + addCriterion("STATUS_CODE =", value, "statusCode");
2936 return (Criteria) this; 2801 return (Criteria) this;
2937 } 2802 }
2938 2803
2939 - public Criteria andStatusIdEqualTo(Long value) { 2804 + public Criteria andStatusCodeNotEqualTo(String value) {
2940 - addCriterion("STATUS_ID =", value, "statusId"); 2805 + addCriterion("STATUS_CODE <>", value, "statusCode");
2941 return (Criteria) this; 2806 return (Criteria) this;
2942 } 2807 }
2943 2808
2944 - public Criteria andStatusIdNotEqualTo(Long value) { 2809 + public Criteria andStatusCodeGreaterThan(String value) {
2945 - addCriterion("STATUS_ID <>", value, "statusId"); 2810 + addCriterion("STATUS_CODE >", value, "statusCode");
2946 return (Criteria) this; 2811 return (Criteria) this;
2947 } 2812 }
2948 2813
2949 - public Criteria andStatusIdGreaterThan(Long value) { 2814 + public Criteria andStatusCodeGreaterThanOrEqualTo(String value) {
2950 - addCriterion("STATUS_ID >", value, "statusId"); 2815 + addCriterion("STATUS_CODE >=", value, "statusCode");
2951 return (Criteria) this; 2816 return (Criteria) this;
2952 } 2817 }
2953 2818
2954 - public Criteria andStatusIdGreaterThanOrEqualTo(Long value) { 2819 + public Criteria andStatusCodeLessThan(String value) {
2955 - addCriterion("STATUS_ID >=", value, "statusId"); 2820 + addCriterion("STATUS_CODE <", value, "statusCode");
2956 return (Criteria) this; 2821 return (Criteria) this;
2957 } 2822 }
2958 2823
2959 - public Criteria andStatusIdLessThan(Long value) { 2824 + public Criteria andStatusCodeLessThanOrEqualTo(String value) {
2960 - addCriterion("STATUS_ID <", value, "statusId"); 2825 + addCriterion("STATUS_CODE <=", value, "statusCode");
2961 return (Criteria) this; 2826 return (Criteria) this;
2962 } 2827 }
2963 2828
2964 - public Criteria andStatusIdLessThanOrEqualTo(Long value) { 2829 + public Criteria andStatusCodeLike(String value) {
2965 - addCriterion("STATUS_ID <=", value, "statusId"); 2830 + addCriterion("STATUS_CODE like", value, "statusCode");
2966 return (Criteria) this; 2831 return (Criteria) this;
2967 } 2832 }
2968 2833
2969 - public Criteria andStatusIdIn(List<Long> values) { 2834 + public Criteria andStatusCodeNotLike(String value) {
2970 - addCriterion("STATUS_ID in", values, "statusId"); 2835 + addCriterion("STATUS_CODE not like", value, "statusCode");
2971 return (Criteria) this; 2836 return (Criteria) this;
2972 } 2837 }
2973 2838
2974 - public Criteria andStatusIdNotIn(List<Long> values) { 2839 + public Criteria andStatusCodeIn(List<String> values) {
2975 - addCriterion("STATUS_ID not in", values, "statusId"); 2840 + addCriterion("STATUS_CODE in", values, "statusCode");
2976 return (Criteria) this; 2841 return (Criteria) this;
2977 } 2842 }
2978 2843
2979 - public Criteria andStatusIdBetween(Long value1, Long value2) { 2844 + public Criteria andStatusCodeNotIn(List<String> values) {
2980 - addCriterion("STATUS_ID between", value1, value2, "statusId"); 2845 + addCriterion("STATUS_CODE not in", values, "statusCode");
2981 return (Criteria) this; 2846 return (Criteria) this;
2982 } 2847 }
2983 2848
2984 - public Criteria andStatusIdNotBetween(Long value1, Long value2) { 2849 + public Criteria andStatusCodeBetween(String value1, String value2) {
2985 - addCriterion("STATUS_ID not between", value1, value2, "statusId"); 2850 + addCriterion("STATUS_CODE between", value1, value2, "statusCode");
2851 + return (Criteria) this;
2852 + }
2853 +
2854 + public Criteria andStatusCodeNotBetween(String value1, String value2) {
2855 + addCriterion("STATUS_CODE not between", value1, value2, "statusCode");
2986 return (Criteria) this; 2856 return (Criteria) this;
2987 } 2857 }
2988 2858
...@@ -3266,63 +3136,73 @@ public class ConsignmentExample { ...@@ -3266,63 +3136,73 @@ public class ConsignmentExample {
3266 return (Criteria) this; 3136 return (Criteria) this;
3267 } 3137 }
3268 3138
3269 - public Criteria andUserInputOriginCountryIdIsNull() { 3139 + public Criteria andUserInputOriginCountryCodeIsNull() {
3270 - addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID is null"); 3140 + addCriterion("USER_INPUT_ORIGIN_COUNTRY_CODE is null");
3141 + return (Criteria) this;
3142 + }
3143 +
3144 + public Criteria andUserInputOriginCountryCodeIsNotNull() {
3145 + addCriterion("USER_INPUT_ORIGIN_COUNTRY_CODE is not null");
3271 return (Criteria) this; 3146 return (Criteria) this;
3272 } 3147 }
3273 3148
3274 - public Criteria andUserInputOriginCountryIdIsNotNull() { 3149 + public Criteria andUserInputOriginCountryCodeEqualTo(String value) {
3275 - addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID is not null"); 3150 + addCriterion("USER_INPUT_ORIGIN_COUNTRY_CODE =", value, "userInputOriginCountryCode");
3276 return (Criteria) this; 3151 return (Criteria) this;
3277 } 3152 }
3278 3153
3279 - public Criteria andUserInputOriginCountryIdEqualTo(Long value) { 3154 + public Criteria andUserInputOriginCountryCodeNotEqualTo(String value) {
3280 - addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID =", value, "userInputOriginCountryId"); 3155 + addCriterion("USER_INPUT_ORIGIN_COUNTRY_CODE <>", value, "userInputOriginCountryCode");
3281 return (Criteria) this; 3156 return (Criteria) this;
3282 } 3157 }
3283 3158
3284 - public Criteria andUserInputOriginCountryIdNotEqualTo(Long value) { 3159 + public Criteria andUserInputOriginCountryCodeGreaterThan(String value) {
3285 - addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID <>", value, "userInputOriginCountryId"); 3160 + addCriterion("USER_INPUT_ORIGIN_COUNTRY_CODE >", value, "userInputOriginCountryCode");
3286 return (Criteria) this; 3161 return (Criteria) this;
3287 } 3162 }
3288 3163
3289 - public Criteria andUserInputOriginCountryIdGreaterThan(Long value) { 3164 + public Criteria andUserInputOriginCountryCodeGreaterThanOrEqualTo(String value) {
3290 - addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID >", value, "userInputOriginCountryId"); 3165 + addCriterion("USER_INPUT_ORIGIN_COUNTRY_CODE >=", value, "userInputOriginCountryCode");
3291 return (Criteria) this; 3166 return (Criteria) this;
3292 } 3167 }
3293 3168
3294 - public Criteria andUserInputOriginCountryIdGreaterThanOrEqualTo(Long value) { 3169 + public Criteria andUserInputOriginCountryCodeLessThan(String value) {
3295 - addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID >=", value, "userInputOriginCountryId"); 3170 + addCriterion("USER_INPUT_ORIGIN_COUNTRY_CODE <", value, "userInputOriginCountryCode");
3296 return (Criteria) this; 3171 return (Criteria) this;
3297 } 3172 }
3298 3173
3299 - public Criteria andUserInputOriginCountryIdLessThan(Long value) { 3174 + public Criteria andUserInputOriginCountryCodeLessThanOrEqualTo(String value) {
3300 - addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID <", value, "userInputOriginCountryId"); 3175 + addCriterion("USER_INPUT_ORIGIN_COUNTRY_CODE <=", value, "userInputOriginCountryCode");
3301 return (Criteria) this; 3176 return (Criteria) this;
3302 } 3177 }
3303 3178
3304 - public Criteria andUserInputOriginCountryIdLessThanOrEqualTo(Long value) { 3179 + public Criteria andUserInputOriginCountryCodeLike(String value) {
3305 - addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID <=", value, "userInputOriginCountryId"); 3180 + addCriterion("USER_INPUT_ORIGIN_COUNTRY_CODE like", value, "userInputOriginCountryCode");
3306 return (Criteria) this; 3181 return (Criteria) this;
3307 } 3182 }
3308 3183
3309 - public Criteria andUserInputOriginCountryIdIn(List<Long> values) { 3184 + public Criteria andUserInputOriginCountryCodeNotLike(String value) {
3310 - addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID in", values, "userInputOriginCountryId"); 3185 + addCriterion("USER_INPUT_ORIGIN_COUNTRY_CODE not like", value, "userInputOriginCountryCode");
3311 return (Criteria) this; 3186 return (Criteria) this;
3312 } 3187 }
3313 3188
3314 - public Criteria andUserInputOriginCountryIdNotIn(List<Long> values) { 3189 + public Criteria andUserInputOriginCountryCodeIn(List<String> values) {
3315 - addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID not in", values, "userInputOriginCountryId"); 3190 + addCriterion("USER_INPUT_ORIGIN_COUNTRY_CODE in", values, "userInputOriginCountryCode");
3316 return (Criteria) this; 3191 return (Criteria) this;
3317 } 3192 }
3318 3193
3319 - public Criteria andUserInputOriginCountryIdBetween(Long value1, Long value2) { 3194 + public Criteria andUserInputOriginCountryCodeNotIn(List<String> values) {
3320 - addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID between", value1, value2, "userInputOriginCountryId"); 3195 + addCriterion("USER_INPUT_ORIGIN_COUNTRY_CODE not in", values, "userInputOriginCountryCode");
3321 return (Criteria) this; 3196 return (Criteria) this;
3322 } 3197 }
3323 3198
3324 - public Criteria andUserInputOriginCountryIdNotBetween(Long value1, Long value2) { 3199 + public Criteria andUserInputOriginCountryCodeBetween(String value1, String value2) {
3325 - addCriterion("USER_INPUT_ORIGIN_COUNTRY_ID not between", value1, value2, "userInputOriginCountryId"); 3200 + addCriterion("USER_INPUT_ORIGIN_COUNTRY_CODE between", value1, value2, "userInputOriginCountryCode");
3201 + return (Criteria) this;
3202 + }
3203 +
3204 + public Criteria andUserInputOriginCountryCodeNotBetween(String value1, String value2) {
3205 + addCriterion("USER_INPUT_ORIGIN_COUNTRY_CODE not between", value1, value2, "userInputOriginCountryCode");
3326 return (Criteria) this; 3206 return (Criteria) this;
3327 } 3207 }
3328 3208
...@@ -3396,63 +3276,213 @@ public class ConsignmentExample { ...@@ -3396,63 +3276,213 @@ public class ConsignmentExample {
3396 return (Criteria) this; 3276 return (Criteria) this;
3397 } 3277 }
3398 3278
3399 - public Criteria andOriginCountryIdIsNull() { 3279 + public Criteria andOriginCountryCodeIsNull() {
3400 - addCriterion("ORIGIN_COUNTRY_ID is null"); 3280 + addCriterion("ORIGIN_COUNTRY_CODE is null");
3281 + return (Criteria) this;
3282 + }
3283 +
3284 + public Criteria andOriginCountryCodeIsNotNull() {
3285 + addCriterion("ORIGIN_COUNTRY_CODE is not null");
3286 + return (Criteria) this;
3287 + }
3288 +
3289 + public Criteria andOriginCountryCodeEqualTo(String value) {
3290 + addCriterion("ORIGIN_COUNTRY_CODE =", value, "originCountryCode");
3291 + return (Criteria) this;
3292 + }
3293 +
3294 + public Criteria andOriginCountryCodeNotEqualTo(String value) {
3295 + addCriterion("ORIGIN_COUNTRY_CODE <>", value, "originCountryCode");
3296 + return (Criteria) this;
3297 + }
3298 +
3299 + public Criteria andOriginCountryCodeGreaterThan(String value) {
3300 + addCriterion("ORIGIN_COUNTRY_CODE >", value, "originCountryCode");
3301 + return (Criteria) this;
3302 + }
3303 +
3304 + public Criteria andOriginCountryCodeGreaterThanOrEqualTo(String value) {
3305 + addCriterion("ORIGIN_COUNTRY_CODE >=", value, "originCountryCode");
3306 + return (Criteria) this;
3307 + }
3308 +
3309 + public Criteria andOriginCountryCodeLessThan(String value) {
3310 + addCriterion("ORIGIN_COUNTRY_CODE <", value, "originCountryCode");
3311 + return (Criteria) this;
3312 + }
3313 +
3314 + public Criteria andOriginCountryCodeLessThanOrEqualTo(String value) {
3315 + addCriterion("ORIGIN_COUNTRY_CODE <=", value, "originCountryCode");
3316 + return (Criteria) this;
3317 + }
3318 +
3319 + public Criteria andOriginCountryCodeLike(String value) {
3320 + addCriterion("ORIGIN_COUNTRY_CODE like", value, "originCountryCode");
3321 + return (Criteria) this;
3322 + }
3323 +
3324 + public Criteria andOriginCountryCodeNotLike(String value) {
3325 + addCriterion("ORIGIN_COUNTRY_CODE not like", value, "originCountryCode");
3326 + return (Criteria) this;
3327 + }
3328 +
3329 + public Criteria andOriginCountryCodeIn(List<String> values) {
3330 + addCriterion("ORIGIN_COUNTRY_CODE in", values, "originCountryCode");
3331 + return (Criteria) this;
3332 + }
3333 +
3334 + public Criteria andOriginCountryCodeNotIn(List<String> values) {
3335 + addCriterion("ORIGIN_COUNTRY_CODE not in", values, "originCountryCode");
3336 + return (Criteria) this;
3337 + }
3338 +
3339 + public Criteria andOriginCountryCodeBetween(String value1, String value2) {
3340 + addCriterion("ORIGIN_COUNTRY_CODE between", value1, value2, "originCountryCode");
3341 + return (Criteria) this;
3342 + }
3343 +
3344 + public Criteria andOriginCountryCodeNotBetween(String value1, String value2) {
3345 + addCriterion("ORIGIN_COUNTRY_CODE not between", value1, value2, "originCountryCode");
3346 + return (Criteria) this;
3347 + }
3348 +
3349 + public Criteria andShipperEmailIsNull() {
3350 + addCriterion("SHIPPER_EMAIL is null");
3351 + return (Criteria) this;
3352 + }
3353 +
3354 + public Criteria andShipperEmailIsNotNull() {
3355 + addCriterion("SHIPPER_EMAIL is not null");
3356 + return (Criteria) this;
3357 + }
3358 +
3359 + public Criteria andShipperEmailEqualTo(String value) {
3360 + addCriterion("SHIPPER_EMAIL =", value, "shipperEmail");
3361 + return (Criteria) this;
3362 + }
3363 +
3364 + public Criteria andShipperEmailNotEqualTo(String value) {
3365 + addCriterion("SHIPPER_EMAIL <>", value, "shipperEmail");
3366 + return (Criteria) this;
3367 + }
3368 +
3369 + public Criteria andShipperEmailGreaterThan(String value) {
3370 + addCriterion("SHIPPER_EMAIL >", value, "shipperEmail");
3371 + return (Criteria) this;
3372 + }
3373 +
3374 + public Criteria andShipperEmailGreaterThanOrEqualTo(String value) {
3375 + addCriterion("SHIPPER_EMAIL >=", value, "shipperEmail");
3376 + return (Criteria) this;
3377 + }
3378 +
3379 + public Criteria andShipperEmailLessThan(String value) {
3380 + addCriterion("SHIPPER_EMAIL <", value, "shipperEmail");
3381 + return (Criteria) this;
3382 + }
3383 +
3384 + public Criteria andShipperEmailLessThanOrEqualTo(String value) {
3385 + addCriterion("SHIPPER_EMAIL <=", value, "shipperEmail");
3386 + return (Criteria) this;
3387 + }
3388 +
3389 + public Criteria andShipperEmailLike(String value) {
3390 + addCriterion("SHIPPER_EMAIL like", value, "shipperEmail");
3391 + return (Criteria) this;
3392 + }
3393 +
3394 + public Criteria andShipperEmailNotLike(String value) {
3395 + addCriterion("SHIPPER_EMAIL not like", value, "shipperEmail");
3396 + return (Criteria) this;
3397 + }
3398 +
3399 + public Criteria andShipperEmailIn(List<String> values) {
3400 + addCriterion("SHIPPER_EMAIL in", values, "shipperEmail");
3401 + return (Criteria) this;
3402 + }
3403 +
3404 + public Criteria andShipperEmailNotIn(List<String> values) {
3405 + addCriterion("SHIPPER_EMAIL not in", values, "shipperEmail");
3406 + return (Criteria) this;
3407 + }
3408 +
3409 + public Criteria andShipperEmailBetween(String value1, String value2) {
3410 + addCriterion("SHIPPER_EMAIL between", value1, value2, "shipperEmail");
3411 + return (Criteria) this;
3412 + }
3413 +
3414 + public Criteria andShipperEmailNotBetween(String value1, String value2) {
3415 + addCriterion("SHIPPER_EMAIL not between", value1, value2, "shipperEmail");
3416 + return (Criteria) this;
3417 + }
3418 +
3419 + public Criteria andDestinationCountryCodeIsNull() {
3420 + addCriterion("DESTINATION_COUNTRY_CODE is null");
3421 + return (Criteria) this;
3422 + }
3423 +
3424 + public Criteria andDestinationCountryCodeIsNotNull() {
3425 + addCriterion("DESTINATION_COUNTRY_CODE is not null");
3426 + return (Criteria) this;
3427 + }
3428 +
3429 + public Criteria andDestinationCountryCodeEqualTo(String value) {
3430 + addCriterion("DESTINATION_COUNTRY_CODE =", value, "destinationCountryCode");
3401 return (Criteria) this; 3431 return (Criteria) this;
3402 } 3432 }
3403 3433
3404 - public Criteria andOriginCountryIdIsNotNull() { 3434 + public Criteria andDestinationCountryCodeNotEqualTo(String value) {
3405 - addCriterion("ORIGIN_COUNTRY_ID is not null"); 3435 + addCriterion("DESTINATION_COUNTRY_CODE <>", value, "destinationCountryCode");
3406 return (Criteria) this; 3436 return (Criteria) this;
3407 } 3437 }
3408 3438
3409 - public Criteria andOriginCountryIdEqualTo(Long value) { 3439 + public Criteria andDestinationCountryCodeGreaterThan(String value) {
3410 - addCriterion("ORIGIN_COUNTRY_ID =", value, "originCountryId"); 3440 + addCriterion("DESTINATION_COUNTRY_CODE >", value, "destinationCountryCode");
3411 return (Criteria) this; 3441 return (Criteria) this;
3412 } 3442 }
3413 3443
3414 - public Criteria andOriginCountryIdNotEqualTo(Long value) { 3444 + public Criteria andDestinationCountryCodeGreaterThanOrEqualTo(String value) {
3415 - addCriterion("ORIGIN_COUNTRY_ID <>", value, "originCountryId"); 3445 + addCriterion("DESTINATION_COUNTRY_CODE >=", value, "destinationCountryCode");
3416 return (Criteria) this; 3446 return (Criteria) this;
3417 } 3447 }
3418 3448
3419 - public Criteria andOriginCountryIdGreaterThan(Long value) { 3449 + public Criteria andDestinationCountryCodeLessThan(String value) {
3420 - addCriterion("ORIGIN_COUNTRY_ID >", value, "originCountryId"); 3450 + addCriterion("DESTINATION_COUNTRY_CODE <", value, "destinationCountryCode");
3421 return (Criteria) this; 3451 return (Criteria) this;
3422 } 3452 }
3423 3453
3424 - public Criteria andOriginCountryIdGreaterThanOrEqualTo(Long value) { 3454 + public Criteria andDestinationCountryCodeLessThanOrEqualTo(String value) {
3425 - addCriterion("ORIGIN_COUNTRY_ID >=", value, "originCountryId"); 3455 + addCriterion("DESTINATION_COUNTRY_CODE <=", value, "destinationCountryCode");
3426 return (Criteria) this; 3456 return (Criteria) this;
3427 } 3457 }
3428 3458
3429 - public Criteria andOriginCountryIdLessThan(Long value) { 3459 + public Criteria andDestinationCountryCodeLike(String value) {
3430 - addCriterion("ORIGIN_COUNTRY_ID <", value, "originCountryId"); 3460 + addCriterion("DESTINATION_COUNTRY_CODE like", value, "destinationCountryCode");
3431 return (Criteria) this; 3461 return (Criteria) this;
3432 } 3462 }
3433 3463
3434 - public Criteria andOriginCountryIdLessThanOrEqualTo(Long value) { 3464 + public Criteria andDestinationCountryCodeNotLike(String value) {
3435 - addCriterion("ORIGIN_COUNTRY_ID <=", value, "originCountryId"); 3465 + addCriterion("DESTINATION_COUNTRY_CODE not like", value, "destinationCountryCode");
3436 return (Criteria) this; 3466 return (Criteria) this;
3437 } 3467 }
3438 3468
3439 - public Criteria andOriginCountryIdIn(List<Long> values) { 3469 + public Criteria andDestinationCountryCodeIn(List<String> values) {
3440 - addCriterion("ORIGIN_COUNTRY_ID in", values, "originCountryId"); 3470 + addCriterion("DESTINATION_COUNTRY_CODE in", values, "destinationCountryCode");
3441 return (Criteria) this; 3471 return (Criteria) this;
3442 } 3472 }
3443 3473
3444 - public Criteria andOriginCountryIdNotIn(List<Long> values) { 3474 + public Criteria andDestinationCountryCodeNotIn(List<String> values) {
3445 - addCriterion("ORIGIN_COUNTRY_ID not in", values, "originCountryId"); 3475 + addCriterion("DESTINATION_COUNTRY_CODE not in", values, "destinationCountryCode");
3446 return (Criteria) this; 3476 return (Criteria) this;
3447 } 3477 }
3448 3478
3449 - public Criteria andOriginCountryIdBetween(Long value1, Long value2) { 3479 + public Criteria andDestinationCountryCodeBetween(String value1, String value2) {
3450 - addCriterion("ORIGIN_COUNTRY_ID between", value1, value2, "originCountryId"); 3480 + addCriterion("DESTINATION_COUNTRY_CODE between", value1, value2, "destinationCountryCode");
3451 return (Criteria) this; 3481 return (Criteria) this;
3452 } 3482 }
3453 3483
3454 - public Criteria andOriginCountryIdNotBetween(Long value1, Long value2) { 3484 + public Criteria andDestinationCountryCodeNotBetween(String value1, String value2) {
3455 - addCriterion("ORIGIN_COUNTRY_ID not between", value1, value2, "originCountryId"); 3485 + addCriterion("DESTINATION_COUNTRY_CODE not between", value1, value2, "destinationCountryCode");
3456 return (Criteria) this; 3486 return (Criteria) this;
3457 } 3487 }
3458 } 3488 }
......
...@@ -39,9 +39,9 @@ public class Email implements Serializable { ...@@ -39,9 +39,9 @@ public class Email implements Serializable {
39 private String subject; 39 private String subject;
40 40
41 /** 41 /**
42 - * 邮件类型ID,关联数据字典表。指定字典目录CODE：EMAIL_TYPE 42 + * 邮件类型CODE,关联数据字典表。指定字典目录CODE：EMAIL_TYPE
43 */ 43 */
44 - private Long typeId; 44 + private String typeCode;
45 45
46 /** 46 /**
47 * 邮件类型名称 47 * 邮件类型名称
...@@ -49,9 +49,9 @@ public class Email implements Serializable { ...@@ -49,9 +49,9 @@ public class Email implements Serializable {
49 private String typeName; 49 private String typeName;
50 50
51 /** 51 /**
52 - * 邮件状态ID,关联数据字典表。指定字典目录CODE：EMAIL_STATUS 52 + * 邮件状态CODE,关联数据字典表。指定字典目录CODE：EMAIL_STATUS
53 */ 53 */
54 - private Long statusId; 54 + private String statusCode;
55 55
56 /** 56 /**
57 * 邮件状态名称 57 * 邮件状态名称
...@@ -153,12 +153,12 @@ public class Email implements Serializable { ...@@ -153,12 +153,12 @@ public class Email implements Serializable {
153 this.subject = subject == null ? null : subject.trim(); 153 this.subject = subject == null ? null : subject.trim();
154 } 154 }
155 155
156 - public Long getTypeId() { 156 + public String getTypeCode() {
157 - return typeId; 157 + return typeCode;
158 } 158 }
159 159
160 - public void setTypeId(Long typeId) { 160 + public void setTypeCode(String typeCode) {
161 - this.typeId = typeId; 161 + this.typeCode = typeCode == null ? null : typeCode.trim();
162 } 162 }
163 163
164 public String getTypeName() { 164 public String getTypeName() {
...@@ -169,12 +169,12 @@ public class Email implements Serializable { ...@@ -169,12 +169,12 @@ public class Email implements Serializable {
169 this.typeName = typeName == null ? null : typeName.trim(); 169 this.typeName = typeName == null ? null : typeName.trim();
170 } 170 }
171 171
172 - public Long getStatusId() { 172 + public String getStatusCode() {
173 - return statusId; 173 + return statusCode;
174 } 174 }
175 175
176 - public void setStatusId(Long statusId) { 176 + public void setStatusCode(String statusCode) {
177 - this.statusId = statusId; 177 + this.statusCode = statusCode == null ? null : statusCode.trim();
178 } 178 }
179 179
180 public String getStatusName() { 180 public String getStatusName() {
...@@ -269,9 +269,9 @@ public class Email implements Serializable { ...@@ -269,9 +269,9 @@ public class Email implements Serializable {
269 sb.append(", toAddress=").append(toAddress); 269 sb.append(", toAddress=").append(toAddress);
270 sb.append(", ccAddress=").append(ccAddress); 270 sb.append(", ccAddress=").append(ccAddress);
271 sb.append(", subject=").append(subject); 271 sb.append(", subject=").append(subject);
272 - sb.append(", typeId=").append(typeId); 272 + sb.append(", typeCode=").append(typeCode);
273 sb.append(", typeName=").append(typeName); 273 sb.append(", typeName=").append(typeName);
274 - sb.append(", statusId=").append(statusId); 274 + sb.append(", statusCode=").append(statusCode);
275 sb.append(", statusName=").append(statusName); 275 sb.append(", statusName=").append(statusName);
276 sb.append(", sendNum=").append(sendNum); 276 sb.append(", sendNum=").append(sendNum);
277 sb.append(", sendTime=").append(sendTime); 277 sb.append(", sendTime=").append(sendTime);
......
...@@ -525,63 +525,73 @@ public class EmailExample { ...@@ -525,63 +525,73 @@ public class EmailExample {
525 return (Criteria) this; 525 return (Criteria) this;
526 } 526 }
527 527
528 - public Criteria andTypeIdIsNull() { 528 + public Criteria andTypeCodeIsNull() {
529 - addCriterion("TYPE_ID is null"); 529 + addCriterion("TYPE_CODE is null");
530 return (Criteria) this; 530 return (Criteria) this;
531 } 531 }
532 532
533 - public Criteria andTypeIdIsNotNull() { 533 + public Criteria andTypeCodeIsNotNull() {
534 - addCriterion("TYPE_ID is not null"); 534 + addCriterion("TYPE_CODE is not null");
535 return (Criteria) this; 535 return (Criteria) this;
536 } 536 }
537 537
538 - public Criteria andTypeIdEqualTo(Long value) { 538 + public Criteria andTypeCodeEqualTo(String value) {
539 - addCriterion("TYPE_ID =", value, "typeId"); 539 + addCriterion("TYPE_CODE =", value, "typeCode");
540 return (Criteria) this; 540 return (Criteria) this;
541 } 541 }
542 542
543 - public Criteria andTypeIdNotEqualTo(Long value) { 543 + public Criteria andTypeCodeNotEqualTo(String value) {
544 - addCriterion("TYPE_ID <>", value, "typeId"); 544 + addCriterion("TYPE_CODE <>", value, "typeCode");
545 return (Criteria) this; 545 return (Criteria) this;
546 } 546 }
547 547
548 - public Criteria andTypeIdGreaterThan(Long value) { 548 + public Criteria andTypeCodeGreaterThan(String value) {
549 - addCriterion("TYPE_ID >", value, "typeId"); 549 + addCriterion("TYPE_CODE >", value, "typeCode");
550 return (Criteria) this; 550 return (Criteria) this;
551 } 551 }
552 552
553 - public Criteria andTypeIdGreaterThanOrEqualTo(Long value) { 553 + public Criteria andTypeCodeGreaterThanOrEqualTo(String value) {
554 - addCriterion("TYPE_ID >=", value, "typeId"); 554 + addCriterion("TYPE_CODE >=", value, "typeCode");
555 return (Criteria) this; 555 return (Criteria) this;
556 } 556 }
557 557
558 - public Criteria andTypeIdLessThan(Long value) { 558 + public Criteria andTypeCodeLessThan(String value) {
559 - addCriterion("TYPE_ID <", value, "typeId"); 559 + addCriterion("TYPE_CODE <", value, "typeCode");
560 return (Criteria) this; 560 return (Criteria) this;
561 } 561 }
562 562
563 - public Criteria andTypeIdLessThanOrEqualTo(Long value) { 563 + public Criteria andTypeCodeLessThanOrEqualTo(String value) {
564 - addCriterion("TYPE_ID <=", value, "typeId"); 564 + addCriterion("TYPE_CODE <=", value, "typeCode");
565 return (Criteria) this; 565 return (Criteria) this;
566 } 566 }
567 567
568 - public Criteria andTypeIdIn(List<Long> values) { 568 + public Criteria andTypeCodeLike(String value) {
569 - addCriterion("TYPE_ID in", values, "typeId"); 569 + addCriterion("TYPE_CODE like", value, "typeCode");
570 return (Criteria) this; 570 return (Criteria) this;
571 } 571 }
572 572
573 - public Criteria andTypeIdNotIn(List<Long> values) { 573 + public Criteria andTypeCodeNotLike(String value) {
574 - addCriterion("TYPE_ID not in", values, "typeId"); 574 + addCriterion("TYPE_CODE not like", value, "typeCode");
575 return (Criteria) this; 575 return (Criteria) this;
576 } 576 }
577 577
578 - public Criteria andTypeIdBetween(Long value1, Long value2) { 578 + public Criteria andTypeCodeIn(List<String> values) {
579 - addCriterion("TYPE_ID between", value1, value2, "typeId"); 579 + addCriterion("TYPE_CODE in", values, "typeCode");
580 return (Criteria) this; 580 return (Criteria) this;
581 } 581 }
582 582
583 - public Criteria andTypeIdNotBetween(Long value1, Long value2) { 583 + public Criteria andTypeCodeNotIn(List<String> values) {
584 - addCriterion("TYPE_ID not between", value1, value2, "typeId"); 584 + addCriterion("TYPE_CODE not in", values, "typeCode");
585 + return (Criteria) this;
586 + }
587 +
588 + public Criteria andTypeCodeBetween(String value1, String value2) {
589 + addCriterion("TYPE_CODE between", value1, value2, "typeCode");
590 + return (Criteria) this;
591 + }
592 +
593 + public Criteria andTypeCodeNotBetween(String value1, String value2) {
594 + addCriterion("TYPE_CODE not between", value1, value2, "typeCode");
585 return (Criteria) this; 595 return (Criteria) this;
586 } 596 }
587 597
...@@ -655,63 +665,73 @@ public class EmailExample { ...@@ -655,63 +665,73 @@ public class EmailExample {
655 return (Criteria) this; 665 return (Criteria) this;
656 } 666 }
657 667
658 - public Criteria andStatusIdIsNull() { 668 + public Criteria andStatusCodeIsNull() {
659 - addCriterion("STATUS_ID is null"); 669 + addCriterion("STATUS_CODE is null");
670 + return (Criteria) this;
671 + }
672 +
673 + public Criteria andStatusCodeIsNotNull() {
674 + addCriterion("STATUS_CODE is not null");
675 + return (Criteria) this;
676 + }
677 +
678 + public Criteria andStatusCodeEqualTo(String value) {
679 + addCriterion("STATUS_CODE =", value, "statusCode");
660 return (Criteria) this; 680 return (Criteria) this;
661 } 681 }
662 682
663 - public Criteria andStatusIdIsNotNull() { 683 + public Criteria andStatusCodeNotEqualTo(String value) {
664 - addCriterion("STATUS_ID is not null"); 684 + addCriterion("STATUS_CODE <>", value, "statusCode");
665 return (Criteria) this; 685 return (Criteria) this;
666 } 686 }
667 687
668 - public Criteria andStatusIdEqualTo(Long value) { 688 + public Criteria andStatusCodeGreaterThan(String value) {
669 - addCriterion("STATUS_ID =", value, "statusId"); 689 + addCriterion("STATUS_CODE >", value, "statusCode");
670 return (Criteria) this; 690 return (Criteria) this;
671 } 691 }
672 692
673 - public Criteria andStatusIdNotEqualTo(Long value) { 693 + public Criteria andStatusCodeGreaterThanOrEqualTo(String value) {
674 - addCriterion("STATUS_ID <>", value, "statusId"); 694 + addCriterion("STATUS_CODE >=", value, "statusCode");
675 return (Criteria) this; 695 return (Criteria) this;
676 } 696 }
677 697
678 - public Criteria andStatusIdGreaterThan(Long value) { 698 + public Criteria andStatusCodeLessThan(String value) {
679 - addCriterion("STATUS_ID >", value, "statusId"); 699 + addCriterion("STATUS_CODE <", value, "statusCode");
680 return (Criteria) this; 700 return (Criteria) this;
681 } 701 }
682 702
683 - public Criteria andStatusIdGreaterThanOrEqualTo(Long value) { 703 + public Criteria andStatusCodeLessThanOrEqualTo(String value) {
684 - addCriterion("STATUS_ID >=", value, "statusId"); 704 + addCriterion("STATUS_CODE <=", value, "statusCode");
685 return (Criteria) this; 705 return (Criteria) this;
686 } 706 }
687 707
688 - public Criteria andStatusIdLessThan(Long value) { 708 + public Criteria andStatusCodeLike(String value) {
689 - addCriterion("STATUS_ID <", value, "statusId"); 709 + addCriterion("STATUS_CODE like", value, "statusCode");
690 return (Criteria) this; 710 return (Criteria) this;
691 } 711 }
692 712
693 - public Criteria andStatusIdLessThanOrEqualTo(Long value) { 713 + public Criteria andStatusCodeNotLike(String value) {
694 - addCriterion("STATUS_ID <=", value, "statusId"); 714 + addCriterion("STATUS_CODE not like", value, "statusCode");
695 return (Criteria) this; 715 return (Criteria) this;
696 } 716 }
697 717
698 - public Criteria andStatusIdIn(List<Long> values) { 718 + public Criteria andStatusCodeIn(List<String> values) {
699 - addCriterion("STATUS_ID in", values, "statusId"); 719 + addCriterion("STATUS_CODE in", values, "statusCode");
700 return (Criteria) this; 720 return (Criteria) this;
701 } 721 }
702 722
703 - public Criteria andStatusIdNotIn(List<Long> values) { 723 + public Criteria andStatusCodeNotIn(List<String> values) {
704 - addCriterion("STATUS_ID not in", values, "statusId"); 724 + addCriterion("STATUS_CODE not in", values, "statusCode");
705 return (Criteria) this; 725 return (Criteria) this;
706 } 726 }
707 727
708 - public Criteria andStatusIdBetween(Long value1, Long value2) { 728 + public Criteria andStatusCodeBetween(String value1, String value2) {
709 - addCriterion("STATUS_ID between", value1, value2, "statusId"); 729 + addCriterion("STATUS_CODE between", value1, value2, "statusCode");
710 return (Criteria) this; 730 return (Criteria) this;
711 } 731 }
712 732
713 - public Criteria andStatusIdNotBetween(Long value1, Long value2) { 733 + public Criteria andStatusCodeNotBetween(String value1, String value2) {
714 - addCriterion("STATUS_ID not between", value1, value2, "statusId"); 734 + addCriterion("STATUS_CODE not between", value1, value2, "statusCode");
715 return (Criteria) this; 735 return (Criteria) this;
716 } 736 }
717 737
......
...@@ -29,10 +29,10 @@ public class PushOb implements Serializable { ...@@ -29,10 +29,10 @@ public class PushOb implements Serializable {
29 private Date pushTime; 29 private Date pushTime;
30 30
31 /** 31 /**
32 - * 推送状态ID。 32 + * 推送状态CODE。
33 关联数据字典表。指定字典目录CODE：PUSH_OB_STATUS 33 关联数据字典表。指定字典目录CODE：PUSH_OB_STATUS
34 */ 34 */
35 - private Long statusId; 35 + private String statusCode;
36 36
37 /** 37 /**
38 * 推送状态名称（待推送、推送成功、推送失败） 38 * 推送状态名称（待推送、推送成功、推送失败）
...@@ -128,12 +128,12 @@ public class PushOb implements Serializable { ...@@ -128,12 +128,12 @@ public class PushOb implements Serializable {
128 this.pushTime = pushTime; 128 this.pushTime = pushTime;
129 } 129 }
130 130
131 - public Long getStatusId() { 131 + public String getStatusCode() {
132 - return statusId; 132 + return statusCode;
133 } 133 }
134 134
135 - public void setStatusId(Long statusId) { 135 + public void setStatusCode(String statusCode) {
136 - this.statusId = statusId; 136 + this.statusCode = statusCode == null ? null : statusCode.trim();
137 } 137 }
138 138
139 public String getStatusName() { 139 public String getStatusName() {
...@@ -242,7 +242,7 @@ public class PushOb implements Serializable { ...@@ -242,7 +242,7 @@ public class PushOb implements Serializable {
242 sb.append(", consignmentCode=").append(consignmentCode); 242 sb.append(", consignmentCode=").append(consignmentCode);
243 sb.append(", consignmentId=").append(consignmentId); 243 sb.append(", consignmentId=").append(consignmentId);
244 sb.append(", pushTime=").append(pushTime); 244 sb.append(", pushTime=").append(pushTime);
245 - sb.append(", statusId=").append(statusId); 245 + sb.append(", statusCode=").append(statusCode);
246 sb.append(", statusName=").append(statusName); 246 sb.append(", statusName=").append(statusName);
247 sb.append(", pushNum=").append(pushNum); 247 sb.append(", pushNum=").append(pushNum);
248 sb.append(", filePath=").append(filePath); 248 sb.append(", filePath=").append(filePath);
......
...@@ -24,10 +24,10 @@ public class PushObDetail implements Serializable { ...@@ -24,10 +24,10 @@ public class PushObDetail implements Serializable {
24 private Long consignmentId; 24 private Long consignmentId;
25 25
26 /** 26 /**
27 - * 推送状态ID。 27 + * 推送状态CODE。
28 关联数据字典表。指定字典目录CODE：PUSH_OB_STATUS 28 关联数据字典表。指定字典目录CODE：PUSH_OB_STATUS
29 */ 29 */
30 - private Long statusId; 30 + private String statusCode;
31 31
32 /** 32 /**
33 * 推送状态名称（待推送、推送成功、推送失败） 33 * 推送状态名称（待推送、推送成功、推送失败）
...@@ -35,9 +35,9 @@ public class PushObDetail implements Serializable { ...@@ -35,9 +35,9 @@ public class PushObDetail implements Serializable {
35 private String statusName; 35 private String statusName;
36 36
37 /** 37 /**
38 - * 推送文件类型字典ID，关联数据字典表。指定字典目录CODE：PUSH_OB_FILE_TYPE 38 + * 推送文件类型字典CODE，关联数据字典表。指定字典目录CODE：PUSH_OB_FILE_TYPE
39 */ 39 */
40 - private Long fileTypeId; 40 + private String fileTypeCode;
41 41
42 /** 42 /**
43 * 推送文件类型名称（XXX、XXX） 43 * 推送文件类型名称（XXX、XXX）
...@@ -120,12 +120,12 @@ public class PushObDetail implements Serializable { ...@@ -120,12 +120,12 @@ public class PushObDetail implements Serializable {
120 this.consignmentId = consignmentId; 120 this.consignmentId = consignmentId;
121 } 121 }
122 122
123 - public Long getStatusId() { 123 + public String getStatusCode() {
124 - return statusId; 124 + return statusCode;
125 } 125 }
126 126
127 - public void setStatusId(Long statusId) { 127 + public void setStatusCode(String statusCode) {
128 - this.statusId = statusId; 128 + this.statusCode = statusCode == null ? null : statusCode.trim();
129 } 129 }
130 130
131 public String getStatusName() { 131 public String getStatusName() {
...@@ -136,12 +136,12 @@ public class PushObDetail implements Serializable { ...@@ -136,12 +136,12 @@ public class PushObDetail implements Serializable {
136 this.statusName = statusName == null ? null : statusName.trim(); 136 this.statusName = statusName == null ? null : statusName.trim();
137 } 137 }
138 138
139 - public Long getFileTypeId() { 139 + public String getFileTypeCode() {
140 - return fileTypeId; 140 + return fileTypeCode;
141 } 141 }
142 142
143 - public void setFileTypeId(Long fileTypeId) { 143 + public void setFileTypeCode(String fileTypeCode) {
144 - this.fileTypeId = fileTypeId; 144 + this.fileTypeCode = fileTypeCode == null ? null : fileTypeCode.trim();
145 } 145 }
146 146
147 public String getFileType() { 147 public String getFileType() {
...@@ -241,9 +241,9 @@ public class PushObDetail implements Serializable { ...@@ -241,9 +241,9 @@ public class PushObDetail implements Serializable {
241 sb.append(", id=").append(id); 241 sb.append(", id=").append(id);
242 sb.append(", consignmentCode=").append(consignmentCode); 242 sb.append(", consignmentCode=").append(consignmentCode);
243 sb.append(", consignmentId=").append(consignmentId); 243 sb.append(", consignmentId=").append(consignmentId);
244 - sb.append(", statusId=").append(statusId); 244 + sb.append(", statusCode=").append(statusCode);
245 sb.append(", statusName=").append(statusName); 245 sb.append(", statusName=").append(statusName);
246 - sb.append(", fileTypeId=").append(fileTypeId); 246 + sb.append(", fileTypeCode=").append(fileTypeCode);
247 sb.append(", fileType=").append(fileType); 247 sb.append(", fileType=").append(fileType);
248 sb.append(", fileName=").append(fileName); 248 sb.append(", fileName=").append(fileName);
249 sb.append(", pushObId=").append(pushObId); 249 sb.append(", pushObId=").append(pushObId);
......
...@@ -315,63 +315,73 @@ public class PushObDetailExample { ...@@ -315,63 +315,73 @@ public class PushObDetailExample {
315 return (Criteria) this; 315 return (Criteria) this;
316 } 316 }
317 317
318 - public Criteria andStatusIdIsNull() { 318 + public Criteria andStatusCodeIsNull() {
319 - addCriterion("STATUS_ID is null"); 319 + addCriterion("STATUS_CODE is null");
320 return (Criteria) this; 320 return (Criteria) this;
321 } 321 }
322 322
323 - public Criteria andStatusIdIsNotNull() { 323 + public Criteria andStatusCodeIsNotNull() {
324 - addCriterion("STATUS_ID is not null"); 324 + addCriterion("STATUS_CODE is not null");
325 return (Criteria) this; 325 return (Criteria) this;
326 } 326 }
327 327
328 - public Criteria andStatusIdEqualTo(Long value) { 328 + public Criteria andStatusCodeEqualTo(String value) {
329 - addCriterion("STATUS_ID =", value, "statusId"); 329 + addCriterion("STATUS_CODE =", value, "statusCode");
330 return (Criteria) this; 330 return (Criteria) this;
331 } 331 }
332 332
333 - public Criteria andStatusIdNotEqualTo(Long value) { 333 + public Criteria andStatusCodeNotEqualTo(String value) {
334 - addCriterion("STATUS_ID <>", value, "statusId"); 334 + addCriterion("STATUS_CODE <>", value, "statusCode");
335 return (Criteria) this; 335 return (Criteria) this;
336 } 336 }
337 337
338 - public Criteria andStatusIdGreaterThan(Long value) { 338 + public Criteria andStatusCodeGreaterThan(String value) {
339 - addCriterion("STATUS_ID >", value, "statusId"); 339 + addCriterion("STATUS_CODE >", value, "statusCode");
340 return (Criteria) this; 340 return (Criteria) this;
341 } 341 }
342 342
343 - public Criteria andStatusIdGreaterThanOrEqualTo(Long value) { 343 + public Criteria andStatusCodeGreaterThanOrEqualTo(String value) {
344 - addCriterion("STATUS_ID >=", value, "statusId"); 344 + addCriterion("STATUS_CODE >=", value, "statusCode");
345 return (Criteria) this; 345 return (Criteria) this;
346 } 346 }
347 347
348 - public Criteria andStatusIdLessThan(Long value) { 348 + public Criteria andStatusCodeLessThan(String value) {
349 - addCriterion("STATUS_ID <", value, "statusId"); 349 + addCriterion("STATUS_CODE <", value, "statusCode");
350 return (Criteria) this; 350 return (Criteria) this;
351 } 351 }
352 352
353 - public Criteria andStatusIdLessThanOrEqualTo(Long value) { 353 + public Criteria andStatusCodeLessThanOrEqualTo(String value) {
354 - addCriterion("STATUS_ID <=", value, "statusId"); 354 + addCriterion("STATUS_CODE <=", value, "statusCode");
355 return (Criteria) this; 355 return (Criteria) this;
356 } 356 }
357 357
358 - public Criteria andStatusIdIn(List<Long> values) { 358 + public Criteria andStatusCodeLike(String value) {
359 - addCriterion("STATUS_ID in", values, "statusId"); 359 + addCriterion("STATUS_CODE like", value, "statusCode");
360 return (Criteria) this; 360 return (Criteria) this;
361 } 361 }
362 362
363 - public Criteria andStatusIdNotIn(List<Long> values) { 363 + public Criteria andStatusCodeNotLike(String value) {
364 - addCriterion("STATUS_ID not in", values, "statusId"); 364 + addCriterion("STATUS_CODE not like", value, "statusCode");
365 return (Criteria) this; 365 return (Criteria) this;
366 } 366 }
367 367
368 - public Criteria andStatusIdBetween(Long value1, Long value2) { 368 + public Criteria andStatusCodeIn(List<String> values) {
369 - addCriterion("STATUS_ID between", value1, value2, "statusId"); 369 + addCriterion("STATUS_CODE in", values, "statusCode");
370 return (Criteria) this; 370 return (Criteria) this;
371 } 371 }
372 372
373 - public Criteria andStatusIdNotBetween(Long value1, Long value2) { 373 + public Criteria andStatusCodeNotIn(List<String> values) {
374 - addCriterion("STATUS_ID not between", value1, value2, "statusId"); 374 + addCriterion("STATUS_CODE not in", values, "statusCode");
375 + return (Criteria) this;
376 + }
377 +
378 + public Criteria andStatusCodeBetween(String value1, String value2) {
379 + addCriterion("STATUS_CODE between", value1, value2, "statusCode");
380 + return (Criteria) this;
381 + }
382 +
383 + public Criteria andStatusCodeNotBetween(String value1, String value2) {
384 + addCriterion("STATUS_CODE not between", value1, value2, "statusCode");
375 return (Criteria) this; 385 return (Criteria) this;
376 } 386 }
377 387
...@@ -445,63 +455,73 @@ public class PushObDetailExample { ...@@ -445,63 +455,73 @@ public class PushObDetailExample {
445 return (Criteria) this; 455 return (Criteria) this;
446 } 456 }
447 457
448 - public Criteria andFileTypeIdIsNull() { 458 + public Criteria andFileTypeCodeIsNull() {
449 - addCriterion("FILE_TYPE_ID is null"); 459 + addCriterion("FILE_TYPE_CODE is null");
460 + return (Criteria) this;
461 + }
462 +
463 + public Criteria andFileTypeCodeIsNotNull() {
464 + addCriterion("FILE_TYPE_CODE is not null");
465 + return (Criteria) this;
466 + }
467 +
468 + public Criteria andFileTypeCodeEqualTo(String value) {
469 + addCriterion("FILE_TYPE_CODE =", value, "fileTypeCode");
450 return (Criteria) this; 470 return (Criteria) this;
451 } 471 }
452 472
453 - public Criteria andFileTypeIdIsNotNull() { 473 + public Criteria andFileTypeCodeNotEqualTo(String value) {
454 - addCriterion("FILE_TYPE_ID is not null"); 474 + addCriterion("FILE_TYPE_CODE <>", value, "fileTypeCode");
455 return (Criteria) this; 475 return (Criteria) this;
456 } 476 }
457 477
458 - public Criteria andFileTypeIdEqualTo(Long value) { 478 + public Criteria andFileTypeCodeGreaterThan(String value) {
459 - addCriterion("FILE_TYPE_ID =", value, "fileTypeId"); 479 + addCriterion("FILE_TYPE_CODE >", value, "fileTypeCode");
460 return (Criteria) this; 480 return (Criteria) this;
461 } 481 }
462 482
463 - public Criteria andFileTypeIdNotEqualTo(Long value) { 483 + public Criteria andFileTypeCodeGreaterThanOrEqualTo(String value) {
464 - addCriterion("FILE_TYPE_ID <>", value, "fileTypeId"); 484 + addCriterion("FILE_TYPE_CODE >=", value, "fileTypeCode");
465 return (Criteria) this; 485 return (Criteria) this;
466 } 486 }
467 487
468 - public Criteria andFileTypeIdGreaterThan(Long value) { 488 + public Criteria andFileTypeCodeLessThan(String value) {
469 - addCriterion("FILE_TYPE_ID >", value, "fileTypeId"); 489 + addCriterion("FILE_TYPE_CODE <", value, "fileTypeCode");
470 return (Criteria) this; 490 return (Criteria) this;
471 } 491 }
472 492
473 - public Criteria andFileTypeIdGreaterThanOrEqualTo(Long value) { 493 + public Criteria andFileTypeCodeLessThanOrEqualTo(String value) {
474 - addCriterion("FILE_TYPE_ID >=", value, "fileTypeId"); 494 + addCriterion("FILE_TYPE_CODE <=", value, "fileTypeCode");
475 return (Criteria) this; 495 return (Criteria) this;
476 } 496 }
477 497
478 - public Criteria andFileTypeIdLessThan(Long value) { 498 + public Criteria andFileTypeCodeLike(String value) {
479 - addCriterion("FILE_TYPE_ID <", value, "fileTypeId"); 499 + addCriterion("FILE_TYPE_CODE like", value, "fileTypeCode");
480 return (Criteria) this; 500 return (Criteria) this;
481 } 501 }
482 502
483 - public Criteria andFileTypeIdLessThanOrEqualTo(Long value) { 503 + public Criteria andFileTypeCodeNotLike(String value) {
484 - addCriterion("FILE_TYPE_ID <=", value, "fileTypeId"); 504 + addCriterion("FILE_TYPE_CODE not like", value, "fileTypeCode");
485 return (Criteria) this; 505 return (Criteria) this;
486 } 506 }
487 507
488 - public Criteria andFileTypeIdIn(List<Long> values) { 508 + public Criteria andFileTypeCodeIn(List<String> values) {
489 - addCriterion("FILE_TYPE_ID in", values, "fileTypeId"); 509 + addCriterion("FILE_TYPE_CODE in", values, "fileTypeCode");
490 return (Criteria) this; 510 return (Criteria) this;
491 } 511 }
492 512
493 - public Criteria andFileTypeIdNotIn(List<Long> values) { 513 + public Criteria andFileTypeCodeNotIn(List<String> values) {
494 - addCriterion("FILE_TYPE_ID not in", values, "fileTypeId"); 514 + addCriterion("FILE_TYPE_CODE not in", values, "fileTypeCode");
495 return (Criteria) this; 515 return (Criteria) this;
496 } 516 }
497 517
498 - public Criteria andFileTypeIdBetween(Long value1, Long value2) { 518 + public Criteria andFileTypeCodeBetween(String value1, String value2) {
499 - addCriterion("FILE_TYPE_ID between", value1, value2, "fileTypeId"); 519 + addCriterion("FILE_TYPE_CODE between", value1, value2, "fileTypeCode");
500 return (Criteria) this; 520 return (Criteria) this;
501 } 521 }
502 522
503 - public Criteria andFileTypeIdNotBetween(Long value1, Long value2) { 523 + public Criteria andFileTypeCodeNotBetween(String value1, String value2) {
504 - addCriterion("FILE_TYPE_ID not between", value1, value2, "fileTypeId"); 524 + addCriterion("FILE_TYPE_CODE not between", value1, value2, "fileTypeCode");
505 return (Criteria) this; 525 return (Criteria) this;
506 } 526 }
507 527
......
...@@ -375,63 +375,73 @@ public class PushObExample { ...@@ -375,63 +375,73 @@ public class PushObExample {
375 return (Criteria) this; 375 return (Criteria) this;
376 } 376 }
377 377
378 - public Criteria andStatusIdIsNull() { 378 + public Criteria andStatusCodeIsNull() {
379 - addCriterion("STATUS_ID is null"); 379 + addCriterion("STATUS_CODE is null");
380 return (Criteria) this; 380 return (Criteria) this;
381 } 381 }
382 382
383 - public Criteria andStatusIdIsNotNull() { 383 + public Criteria andStatusCodeIsNotNull() {
384 - addCriterion("STATUS_ID is not null"); 384 + addCriterion("STATUS_CODE is not null");
385 return (Criteria) this; 385 return (Criteria) this;
386 } 386 }
387 387
388 - public Criteria andStatusIdEqualTo(Long value) { 388 + public Criteria andStatusCodeEqualTo(String value) {
389 - addCriterion("STATUS_ID =", value, "statusId"); 389 + addCriterion("STATUS_CODE =", value, "statusCode");
390 return (Criteria) this; 390 return (Criteria) this;
391 } 391 }
392 392
393 - public Criteria andStatusIdNotEqualTo(Long value) { 393 + public Criteria andStatusCodeNotEqualTo(String value) {
394 - addCriterion("STATUS_ID <>", value, "statusId"); 394 + addCriterion("STATUS_CODE <>", value, "statusCode");
395 return (Criteria) this; 395 return (Criteria) this;
396 } 396 }
397 397
398 - public Criteria andStatusIdGreaterThan(Long value) { 398 + public Criteria andStatusCodeGreaterThan(String value) {
399 - addCriterion("STATUS_ID >", value, "statusId"); 399 + addCriterion("STATUS_CODE >", value, "statusCode");
400 return (Criteria) this; 400 return (Criteria) this;
401 } 401 }
402 402
403 - public Criteria andStatusIdGreaterThanOrEqualTo(Long value) { 403 + public Criteria andStatusCodeGreaterThanOrEqualTo(String value) {
404 - addCriterion("STATUS_ID >=", value, "statusId"); 404 + addCriterion("STATUS_CODE >=", value, "statusCode");
405 return (Criteria) this; 405 return (Criteria) this;
406 } 406 }
407 407
408 - public Criteria andStatusIdLessThan(Long value) { 408 + public Criteria andStatusCodeLessThan(String value) {
409 - addCriterion("STATUS_ID <", value, "statusId"); 409 + addCriterion("STATUS_CODE <", value, "statusCode");
410 return (Criteria) this; 410 return (Criteria) this;
411 } 411 }
412 412
413 - public Criteria andStatusIdLessThanOrEqualTo(Long value) { 413 + public Criteria andStatusCodeLessThanOrEqualTo(String value) {
414 - addCriterion("STATUS_ID <=", value, "statusId"); 414 + addCriterion("STATUS_CODE <=", value, "statusCode");
415 return (Criteria) this; 415 return (Criteria) this;
416 } 416 }
417 417
418 - public Criteria andStatusIdIn(List<Long> values) { 418 + public Criteria andStatusCodeLike(String value) {
419 - addCriterion("STATUS_ID in", values, "statusId"); 419 + addCriterion("STATUS_CODE like", value, "statusCode");
420 return (Criteria) this; 420 return (Criteria) this;
421 } 421 }
422 422
423 - public Criteria andStatusIdNotIn(List<Long> values) { 423 + public Criteria andStatusCodeNotLike(String value) {
424 - addCriterion("STATUS_ID not in", values, "statusId"); 424 + addCriterion("STATUS_CODE not like", value, "statusCode");
425 return (Criteria) this; 425 return (Criteria) this;
426 } 426 }
427 427
428 - public Criteria andStatusIdBetween(Long value1, Long value2) { 428 + public Criteria andStatusCodeIn(List<String> values) {
429 - addCriterion("STATUS_ID between", value1, value2, "statusId"); 429 + addCriterion("STATUS_CODE in", values, "statusCode");
430 return (Criteria) this; 430 return (Criteria) this;
431 } 431 }
432 432
433 - public Criteria andStatusIdNotBetween(Long value1, Long value2) { 433 + public Criteria andStatusCodeNotIn(List<String> values) {
434 - addCriterion("STATUS_ID not between", value1, value2, "statusId"); 434 + addCriterion("STATUS_CODE not in", values, "statusCode");
435 + return (Criteria) this;
436 + }
437 +
438 + public Criteria andStatusCodeBetween(String value1, String value2) {
439 + addCriterion("STATUS_CODE between", value1, value2, "statusCode");
440 + return (Criteria) this;
441 + }
442 +
443 + public Criteria andStatusCodeNotBetween(String value1, String value2) {
444 + addCriterion("STATUS_CODE not between", value1, value2, "statusCode");
435 return (Criteria) this; 445 return (Criteria) this;
436 } 446 }
437 447
......
...@@ -19,14 +19,15 @@ public class UploadRecord implements Serializable { ...@@ -19,14 +19,15 @@ public class UploadRecord implements Serializable {
19 private Long consignmentId; 19 private Long consignmentId;
20 20
21 /** 21 /**
22 - * 上传状态(uploaded) 22 + * 运单状态CODE，
23 +关联数据字典表。指定字典目录CODE：CONSIGNMENT_STATUS
23 */ 24 */
24 - private String uploadStatus; 25 + private String statusCode;
25 26
26 /** 27 /**
27 - * 状态(0：无效、1：有效) 28 + * 运单状态名称(上传成功、上传失败)
28 */ 29 */
29 - private Long status; 30 + private String statusName;
30 31
31 /** 32 /**
32 * 创建时间 33 * 创建时间
...@@ -58,6 +59,11 @@ public class UploadRecord implements Serializable { ...@@ -58,6 +59,11 @@ public class UploadRecord implements Serializable {
58 */ 59 */
59 private String modifyUserName; 60 private String modifyUserName;
60 61
62 + /**
63 + * 运单号
64 + */
65 + private String consignmentCode;
66 +
61 private static final long serialVersionUID = 1L; 67 private static final long serialVersionUID = 1L;
62 68
63 public Long getId() { 69 public Long getId() {
...@@ -76,20 +82,20 @@ public class UploadRecord implements Serializable { ...@@ -76,20 +82,20 @@ public class UploadRecord implements Serializable {
76 this.consignmentId = consignmentId; 82 this.consignmentId = consignmentId;
77 } 83 }
78 84
79 - public String getUploadStatus() { 85 + public String getStatusCode() {
80 - return uploadStatus; 86 + return statusCode;
81 } 87 }
82 88
83 - public void setUploadStatus(String uploadStatus) { 89 + public void setStatusCode(String statusCode) {
84 - this.uploadStatus = uploadStatus == null ? null : uploadStatus.trim(); 90 + this.statusCode = statusCode == null ? null : statusCode.trim();
85 } 91 }
86 92
87 - public Long getStatus() { 93 + public String getStatusName() {
88 - return status; 94 + return statusName;
89 } 95 }
90 96
91 - public void setStatus(Long status) { 97 + public void setStatusName(String statusName) {
92 - this.status = status; 98 + this.statusName = statusName == null ? null : statusName.trim();
93 } 99 }
94 100
95 public Date getCreateTime() { 101 public Date getCreateTime() {
...@@ -140,6 +146,14 @@ public class UploadRecord implements Serializable { ...@@ -140,6 +146,14 @@ public class UploadRecord implements Serializable {
140 this.modifyUserName = modifyUserName == null ? null : modifyUserName.trim(); 146 this.modifyUserName = modifyUserName == null ? null : modifyUserName.trim();
141 } 147 }
142 148
149 + public String getConsignmentCode() {
150 + return consignmentCode;
151 + }
152 +
153 + public void setConsignmentCode(String consignmentCode) {
154 + this.consignmentCode = consignmentCode == null ? null : consignmentCode.trim();
155 + }
156 +
143 @Override 157 @Override
144 public String toString() { 158 public String toString() {
145 StringBuilder sb = new StringBuilder(); 159 StringBuilder sb = new StringBuilder();
...@@ -148,14 +162,15 @@ public class UploadRecord implements Serializable { ...@@ -148,14 +162,15 @@ public class UploadRecord implements Serializable {
148 sb.append("Hash = ").append(hashCode()); 162 sb.append("Hash = ").append(hashCode());
149 sb.append(", id=").append(id); 163 sb.append(", id=").append(id);
150 sb.append(", consignmentId=").append(consignmentId); 164 sb.append(", consignmentId=").append(consignmentId);
151 - sb.append(", uploadStatus=").append(uploadStatus); 165 + sb.append(", statusCode=").append(statusCode);
152 - sb.append(", status=").append(status); 166 + sb.append(", statusName=").append(statusName);
153 sb.append(", createTime=").append(createTime); 167 sb.append(", createTime=").append(createTime);
154 sb.append(", createUserId=").append(createUserId); 168 sb.append(", createUserId=").append(createUserId);
155 sb.append(", createUserName=").append(createUserName); 169 sb.append(", createUserName=").append(createUserName);
156 sb.append(", modifyTime=").append(modifyTime); 170 sb.append(", modifyTime=").append(modifyTime);
157 sb.append(", modifyUserId=").append(modifyUserId); 171 sb.append(", modifyUserId=").append(modifyUserId);
158 sb.append(", modifyUserName=").append(modifyUserName); 172 sb.append(", modifyUserName=").append(modifyUserName);
173 + sb.append(", consignmentCode=").append(consignmentCode);
159 sb.append(", serialVersionUID=").append(serialVersionUID); 174 sb.append(", serialVersionUID=").append(serialVersionUID);
160 sb.append("]"); 175 sb.append("]");
161 return sb.toString(); 176 return sb.toString();
......
...@@ -245,133 +245,143 @@ public class UploadRecordExample { ...@@ -245,133 +245,143 @@ public class UploadRecordExample {
245 return (Criteria) this; 245 return (Criteria) this;
246 } 246 }
247 247
248 - public Criteria andUploadStatusIsNull() { 248 + public Criteria andStatusCodeIsNull() {
249 - addCriterion("UPLOAD_STATUS is null"); 249 + addCriterion("STATUS_CODE is null");
250 return (Criteria) this; 250 return (Criteria) this;
251 } 251 }
252 252
253 - public Criteria andUploadStatusIsNotNull() { 253 + public Criteria andStatusCodeIsNotNull() {
254 - addCriterion("UPLOAD_STATUS is not null"); 254 + addCriterion("STATUS_CODE is not null");
255 return (Criteria) this; 255 return (Criteria) this;
256 } 256 }
257 257
258 - public Criteria andUploadStatusEqualTo(String value) { 258 + public Criteria andStatusCodeEqualTo(String value) {
259 - addCriterion("UPLOAD_STATUS =", value, "uploadStatus"); 259 + addCriterion("STATUS_CODE =", value, "statusCode");
260 return (Criteria) this; 260 return (Criteria) this;
261 } 261 }
262 262
263 - public Criteria andUploadStatusNotEqualTo(String value) { 263 + public Criteria andStatusCodeNotEqualTo(String value) {
264 - addCriterion("UPLOAD_STATUS <>", value, "uploadStatus"); 264 + addCriterion("STATUS_CODE <>", value, "statusCode");
265 return (Criteria) this; 265 return (Criteria) this;
266 } 266 }
267 267
268 - public Criteria andUploadStatusGreaterThan(String value) { 268 + public Criteria andStatusCodeGreaterThan(String value) {
269 - addCriterion("UPLOAD_STATUS >", value, "uploadStatus"); 269 + addCriterion("STATUS_CODE >", value, "statusCode");
270 return (Criteria) this; 270 return (Criteria) this;
271 } 271 }
272 272
273 - public Criteria andUploadStatusGreaterThanOrEqualTo(String value) { 273 + public Criteria andStatusCodeGreaterThanOrEqualTo(String value) {
274 - addCriterion("UPLOAD_STATUS >=", value, "uploadStatus"); 274 + addCriterion("STATUS_CODE >=", value, "statusCode");
275 return (Criteria) this; 275 return (Criteria) this;
276 } 276 }
277 277
278 - public Criteria andUploadStatusLessThan(String value) { 278 + public Criteria andStatusCodeLessThan(String value) {
279 - addCriterion("UPLOAD_STATUS <", value, "uploadStatus"); 279 + addCriterion("STATUS_CODE <", value, "statusCode");
280 return (Criteria) this; 280 return (Criteria) this;
281 } 281 }
282 282
283 - public Criteria andUploadStatusLessThanOrEqualTo(String value) { 283 + public Criteria andStatusCodeLessThanOrEqualTo(String value) {
284 - addCriterion("UPLOAD_STATUS <=", value, "uploadStatus"); 284 + addCriterion("STATUS_CODE <=", value, "statusCode");
285 return (Criteria) this; 285 return (Criteria) this;
286 } 286 }
287 287
288 - public Criteria andUploadStatusLike(String value) { 288 + public Criteria andStatusCodeLike(String value) {
289 - addCriterion("UPLOAD_STATUS like", value, "uploadStatus"); 289 + addCriterion("STATUS_CODE like", value, "statusCode");
290 return (Criteria) this; 290 return (Criteria) this;
291 } 291 }
292 292
293 - public Criteria andUploadStatusNotLike(String value) { 293 + public Criteria andStatusCodeNotLike(String value) {
294 - addCriterion("UPLOAD_STATUS not like", value, "uploadStatus"); 294 + addCriterion("STATUS_CODE not like", value, "statusCode");
295 return (Criteria) this; 295 return (Criteria) this;
296 } 296 }
297 297
298 - public Criteria andUploadStatusIn(List<String> values) { 298 + public Criteria andStatusCodeIn(List<String> values) {
299 - addCriterion("UPLOAD_STATUS in", values, "uploadStatus"); 299 + addCriterion("STATUS_CODE in", values, "statusCode");
300 return (Criteria) this; 300 return (Criteria) this;
301 } 301 }
302 302
303 - public Criteria andUploadStatusNotIn(List<String> values) { 303 + public Criteria andStatusCodeNotIn(List<String> values) {
304 - addCriterion("UPLOAD_STATUS not in", values, "uploadStatus"); 304 + addCriterion("STATUS_CODE not in", values, "statusCode");
305 return (Criteria) this; 305 return (Criteria) this;
306 } 306 }
307 307
308 - public Criteria andUploadStatusBetween(String value1, String value2) { 308 + public Criteria andStatusCodeBetween(String value1, String value2) {
309 - addCriterion("UPLOAD_STATUS between", value1, value2, "uploadStatus"); 309 + addCriterion("STATUS_CODE between", value1, value2, "statusCode");
310 return (Criteria) this; 310 return (Criteria) this;
311 } 311 }
312 312
313 - public Criteria andUploadStatusNotBetween(String value1, String value2) { 313 + public Criteria andStatusCodeNotBetween(String value1, String value2) {
314 - addCriterion("UPLOAD_STATUS not between", value1, value2, "uploadStatus"); 314 + addCriterion("STATUS_CODE not between", value1, value2, "statusCode");
315 return (Criteria) this; 315 return (Criteria) this;
316 } 316 }
317 317
318 - public Criteria andStatusIsNull() { 318 + public Criteria andStatusNameIsNull() {
319 - addCriterion("STATUS is null"); 319 + addCriterion("STATUS_NAME is null");
320 return (Criteria) this; 320 return (Criteria) this;
321 } 321 }
322 322
323 - public Criteria andStatusIsNotNull() { 323 + public Criteria andStatusNameIsNotNull() {
324 - addCriterion("STATUS is not null"); 324 + addCriterion("STATUS_NAME is not null");
325 return (Criteria) this; 325 return (Criteria) this;
326 } 326 }
327 327
328 - public Criteria andStatusEqualTo(Long value) { 328 + public Criteria andStatusNameEqualTo(String value) {
329 - addCriterion("STATUS =", value, "status"); 329 + addCriterion("STATUS_NAME =", value, "statusName");
330 return (Criteria) this; 330 return (Criteria) this;
331 } 331 }
332 332
333 - public Criteria andStatusNotEqualTo(Long value) { 333 + public Criteria andStatusNameNotEqualTo(String value) {
334 - addCriterion("STATUS <>", value, "status"); 334 + addCriterion("STATUS_NAME <>", value, "statusName");
335 return (Criteria) this; 335 return (Criteria) this;
336 } 336 }
337 337
338 - public Criteria andStatusGreaterThan(Long value) { 338 + public Criteria andStatusNameGreaterThan(String value) {
339 - addCriterion("STATUS >", value, "status"); 339 + addCriterion("STATUS_NAME >", value, "statusName");
340 return (Criteria) this; 340 return (Criteria) this;
341 } 341 }
342 342
343 - public Criteria andStatusGreaterThanOrEqualTo(Long value) { 343 + public Criteria andStatusNameGreaterThanOrEqualTo(String value) {
344 - addCriterion("STATUS >=", value, "status"); 344 + addCriterion("STATUS_NAME >=", value, "statusName");
345 return (Criteria) this; 345 return (Criteria) this;
346 } 346 }
347 347
348 - public Criteria andStatusLessThan(Long value) { 348 + public Criteria andStatusNameLessThan(String value) {
349 - addCriterion("STATUS <", value, "status"); 349 + addCriterion("STATUS_NAME <", value, "statusName");
350 return (Criteria) this; 350 return (Criteria) this;
351 } 351 }
352 352
353 - public Criteria andStatusLessThanOrEqualTo(Long value) { 353 + public Criteria andStatusNameLessThanOrEqualTo(String value) {
354 - addCriterion("STATUS <=", value, "status"); 354 + addCriterion("STATUS_NAME <=", value, "statusName");
355 return (Criteria) this; 355 return (Criteria) this;
356 } 356 }
357 357
358 - public Criteria andStatusIn(List<Long> values) { 358 + public Criteria andStatusNameLike(String value) {
359 - addCriterion("STATUS in", values, "status"); 359 + addCriterion("STATUS_NAME like", value, "statusName");
360 return (Criteria) this; 360 return (Criteria) this;
361 } 361 }
362 362
363 - public Criteria andStatusNotIn(List<Long> values) { 363 + public Criteria andStatusNameNotLike(String value) {
364 - addCriterion("STATUS not in", values, "status"); 364 + addCriterion("STATUS_NAME not like", value, "statusName");
365 return (Criteria) this; 365 return (Criteria) this;
366 } 366 }
367 367
368 - public Criteria andStatusBetween(Long value1, Long value2) { 368 + public Criteria andStatusNameIn(List<String> values) {
369 - addCriterion("STATUS between", value1, value2, "status"); 369 + addCriterion("STATUS_NAME in", values, "statusName");
370 return (Criteria) this; 370 return (Criteria) this;
371 } 371 }
372 372
373 - public Criteria andStatusNotBetween(Long value1, Long value2) { 373 + public Criteria andStatusNameNotIn(List<String> values) {
374 - addCriterion("STATUS not between", value1, value2, "status"); 374 + addCriterion("STATUS_NAME not in", values, "statusName");
375 + return (Criteria) this;
376 + }
377 +
378 + public Criteria andStatusNameBetween(String value1, String value2) {
379 + addCriterion("STATUS_NAME between", value1, value2, "statusName");
380 + return (Criteria) this;
381 + }
382 +
383 + public Criteria andStatusNameNotBetween(String value1, String value2) {
384 + addCriterion("STATUS_NAME not between", value1, value2, "statusName");
375 return (Criteria) this; 385 return (Criteria) this;
376 } 386 }
377 387
...@@ -754,6 +764,76 @@ public class UploadRecordExample { ...@@ -754,6 +764,76 @@ public class UploadRecordExample {
754 addCriterion("MODIFY_USER_NAME not between", value1, value2, "modifyUserName"); 764 addCriterion("MODIFY_USER_NAME not between", value1, value2, "modifyUserName");
755 return (Criteria) this; 765 return (Criteria) this;
756 } 766 }
767 +
768 + public Criteria andConsignmentCodeIsNull() {
769 + addCriterion("CONSIGNMENT_CODE is null");
770 + return (Criteria) this;
771 + }
772 +
773 + public Criteria andConsignmentCodeIsNotNull() {
774 + addCriterion("CONSIGNMENT_CODE is not null");
775 + return (Criteria) this;
776 + }
777 +
778 + public Criteria andConsignmentCodeEqualTo(String value) {
779 + addCriterion("CONSIGNMENT_CODE =", value, "consignmentCode");
780 + return (Criteria) this;
781 + }
782 +
783 + public Criteria andConsignmentCodeNotEqualTo(String value) {
784 + addCriterion("CONSIGNMENT_CODE <>", value, "consignmentCode");
785 + return (Criteria) this;
786 + }
787 +
788 + public Criteria andConsignmentCodeGreaterThan(String value) {
789 + addCriterion("CONSIGNMENT_CODE >", value, "consignmentCode");
790 + return (Criteria) this;
791 + }
792 +
793 + public Criteria andConsignmentCodeGreaterThanOrEqualTo(String value) {
794 + addCriterion("CONSIGNMENT_CODE >=", value, "consignmentCode");
795 + return (Criteria) this;
796 + }
797 +
798 + public Criteria andConsignmentCodeLessThan(String value) {
799 + addCriterion("CONSIGNMENT_CODE <", value, "consignmentCode");
800 + return (Criteria) this;
801 + }
802 +
803 + public Criteria andConsignmentCodeLessThanOrEqualTo(String value) {
804 + addCriterion("CONSIGNMENT_CODE <=", value, "consignmentCode");
805 + return (Criteria) this;
806 + }
807 +
808 + public Criteria andConsignmentCodeLike(String value) {
809 + addCriterion("CONSIGNMENT_CODE like", value, "consignmentCode");
810 + return (Criteria) this;
811 + }
812 +
813 + public Criteria andConsignmentCodeNotLike(String value) {
814 + addCriterion("CONSIGNMENT_CODE not like", value, "consignmentCode");
815 + return (Criteria) this;
816 + }
817 +
818 + public Criteria andConsignmentCodeIn(List<String> values) {
819 + addCriterion("CONSIGNMENT_CODE in", values, "consignmentCode");
820 + return (Criteria) this;
821 + }
822 +
823 + public Criteria andConsignmentCodeNotIn(List<String> values) {
824 + addCriterion("CONSIGNMENT_CODE not in", values, "consignmentCode");
825 + return (Criteria) this;
826 + }
827 +
828 + public Criteria andConsignmentCodeBetween(String value1, String value2) {
829 + addCriterion("CONSIGNMENT_CODE between", value1, value2, "consignmentCode");
830 + return (Criteria) this;
831 + }
832 +
833 + public Criteria andConsignmentCodeNotBetween(String value1, String value2) {
834 + addCriterion("CONSIGNMENT_CODE not between", value1, value2, "consignmentCode");
835 + return (Criteria) this;
836 + }
757 } 837 }
758 838
759 public static class Criteria extends GeneratedCriteria { 839 public static class Criteria extends GeneratedCriteria {
......
...@@ -39,9 +39,9 @@ public class EmailHistory implements Serializable { ...@@ -39,9 +39,9 @@ public class EmailHistory implements Serializable {
39 private String subject; 39 private String subject;
40 40
41 /** 41 /**
42 - * 邮件类型ID,关联数据字典表。指定字典目录CODE：EMAIL_TYPE 42 + * 邮件类型CODE,关联数据字典表。指定字典目录CODE：EMAIL_TYPE
43 */ 43 */
44 - private Long typeId; 44 + private String typeCode;
45 45
46 /** 46 /**
47 * 邮件类型名称 47 * 邮件类型名称
...@@ -49,9 +49,9 @@ public class EmailHistory implements Serializable { ...@@ -49,9 +49,9 @@ public class EmailHistory implements Serializable {
49 private String typeName; 49 private String typeName;
50 50
51 /** 51 /**
52 - * 邮件状态ID,关联数据字典表。指定字典目录CODE：EMAIL_STATUS 52 + * 邮件状态CODE,关联数据字典表。指定字典目录CODE：EMAIL_STATUS
53 */ 53 */
54 - private Long statusId; 54 + private String statusCode;
55 55
56 /** 56 /**
57 * 邮件状态名称 57 * 邮件状态名称
...@@ -153,12 +153,12 @@ public class EmailHistory implements Serializable { ...@@ -153,12 +153,12 @@ public class EmailHistory implements Serializable {
153 this.subject = subject == null ? null : subject.trim(); 153 this.subject = subject == null ? null : subject.trim();
154 } 154 }
155 155
156 - public Long getTypeId() { 156 + public String getTypeCode() {
157 - return typeId; 157 + return typeCode;
158 } 158 }
159 159
160 - public void setTypeId(Long typeId) { 160 + public void setTypeCode(String typeCode) {
161 - this.typeId = typeId; 161 + this.typeCode = typeCode == null ? null : typeCode.trim();
162 } 162 }
163 163
164 public String getTypeName() { 164 public String getTypeName() {
...@@ -169,12 +169,12 @@ public class EmailHistory implements Serializable { ...@@ -169,12 +169,12 @@ public class EmailHistory implements Serializable {
169 this.typeName = typeName == null ? null : typeName.trim(); 169 this.typeName = typeName == null ? null : typeName.trim();
170 } 170 }
171 171
172 - public Long getStatusId() { 172 + public String getStatusCode() {
173 - return statusId; 173 + return statusCode;
174 } 174 }
175 175
176 - public void setStatusId(Long statusId) { 176 + public void setStatusCode(String statusCode) {
177 - this.statusId = statusId; 177 + this.statusCode = statusCode == null ? null : statusCode.trim();
178 } 178 }
179 179
180 public String getStatusName() { 180 public String getStatusName() {
...@@ -269,9 +269,9 @@ public class EmailHistory implements Serializable { ...@@ -269,9 +269,9 @@ public class EmailHistory implements Serializable {
269 sb.append(", toAddress=").append(toAddress); 269 sb.append(", toAddress=").append(toAddress);
270 sb.append(", ccAddress=").append(ccAddress); 270 sb.append(", ccAddress=").append(ccAddress);
271 sb.append(", subject=").append(subject); 271 sb.append(", subject=").append(subject);
272 - sb.append(", typeId=").append(typeId); 272 + sb.append(", typeCode=").append(typeCode);
273 sb.append(", typeName=").append(typeName); 273 sb.append(", typeName=").append(typeName);
274 - sb.append(", statusId=").append(statusId); 274 + sb.append(", statusCode=").append(statusCode);
275 sb.append(", statusName=").append(statusName); 275 sb.append(", statusName=").append(statusName);
276 sb.append(", sendNum=").append(sendNum); 276 sb.append(", sendNum=").append(sendNum);
277 sb.append(", sendTime=").append(sendTime); 277 sb.append(", sendTime=").append(sendTime);
......
...@@ -525,63 +525,73 @@ public class EmailHistoryExample { ...@@ -525,63 +525,73 @@ public class EmailHistoryExample {
525 return (Criteria) this; 525 return (Criteria) this;
526 } 526 }
527 527
528 - public Criteria andTypeIdIsNull() { 528 + public Criteria andTypeCodeIsNull() {
529 - addCriterion("TYPE_ID is null"); 529 + addCriterion("TYPE_CODE is null");
530 return (Criteria) this; 530 return (Criteria) this;
531 } 531 }
532 532
533 - public Criteria andTypeIdIsNotNull() { 533 + public Criteria andTypeCodeIsNotNull() {
534 - addCriterion("TYPE_ID is not null"); 534 + addCriterion("TYPE_CODE is not null");
535 return (Criteria) this; 535 return (Criteria) this;
536 } 536 }
537 537
538 - public Criteria andTypeIdEqualTo(Long value) { 538 + public Criteria andTypeCodeEqualTo(String value) {
539 - addCriterion("TYPE_ID =", value, "typeId"); 539 + addCriterion("TYPE_CODE =", value, "typeCode");
540 return (Criteria) this; 540 return (Criteria) this;
541 } 541 }
542 542
543 - public Criteria andTypeIdNotEqualTo(Long value) { 543 + public Criteria andTypeCodeNotEqualTo(String value) {
544 - addCriterion("TYPE_ID <>", value, "typeId"); 544 + addCriterion("TYPE_CODE <>", value, "typeCode");
545 return (Criteria) this; 545 return (Criteria) this;
546 } 546 }
547 547
548 - public Criteria andTypeIdGreaterThan(Long value) { 548 + public Criteria andTypeCodeGreaterThan(String value) {
549 - addCriterion("TYPE_ID >", value, "typeId"); 549 + addCriterion("TYPE_CODE >", value, "typeCode");
550 return (Criteria) this; 550 return (Criteria) this;
551 } 551 }
552 552
553 - public Criteria andTypeIdGreaterThanOrEqualTo(Long value) { 553 + public Criteria andTypeCodeGreaterThanOrEqualTo(String value) {
554 - addCriterion("TYPE_ID >=", value, "typeId"); 554 + addCriterion("TYPE_CODE >=", value, "typeCode");
555 return (Criteria) this; 555 return (Criteria) this;
556 } 556 }
557 557
558 - public Criteria andTypeIdLessThan(Long value) { 558 + public Criteria andTypeCodeLessThan(String value) {
559 - addCriterion("TYPE_ID <", value, "typeId"); 559 + addCriterion("TYPE_CODE <", value, "typeCode");
560 return (Criteria) this; 560 return (Criteria) this;
561 } 561 }
562 562
563 - public Criteria andTypeIdLessThanOrEqualTo(Long value) { 563 + public Criteria andTypeCodeLessThanOrEqualTo(String value) {
564 - addCriterion("TYPE_ID <=", value, "typeId"); 564 + addCriterion("TYPE_CODE <=", value, "typeCode");
565 return (Criteria) this; 565 return (Criteria) this;
566 } 566 }
567 567
568 - public Criteria andTypeIdIn(List<Long> values) { 568 + public Criteria andTypeCodeLike(String value) {
569 - addCriterion("TYPE_ID in", values, "typeId"); 569 + addCriterion("TYPE_CODE like", value, "typeCode");
570 return (Criteria) this; 570 return (Criteria) this;
571 } 571 }
572 572
573 - public Criteria andTypeIdNotIn(List<Long> values) { 573 + public Criteria andTypeCodeNotLike(String value) {
574 - addCriterion("TYPE_ID not in", values, "typeId"); 574 + addCriterion("TYPE_CODE not like", value, "typeCode");
575 return (Criteria) this; 575 return (Criteria) this;
576 } 576 }
577 577
578 - public Criteria andTypeIdBetween(Long value1, Long value2) { 578 + public Criteria andTypeCodeIn(List<String> values) {
579 - addCriterion("TYPE_ID between", value1, value2, "typeId"); 579 + addCriterion("TYPE_CODE in", values, "typeCode");
580 return (Criteria) this; 580 return (Criteria) this;
581 } 581 }
582 582
583 - public Criteria andTypeIdNotBetween(Long value1, Long value2) { 583 + public Criteria andTypeCodeNotIn(List<String> values) {
584 - addCriterion("TYPE_ID not between", value1, value2, "typeId"); 584 + addCriterion("TYPE_CODE not in", values, "typeCode");
585 + return (Criteria) this;
586 + }
587 +
588 + public Criteria andTypeCodeBetween(String value1, String value2) {
589 + addCriterion("TYPE_CODE between", value1, value2, "typeCode");
590 + return (Criteria) this;
591 + }
592 +
593 + public Criteria andTypeCodeNotBetween(String value1, String value2) {
594 + addCriterion("TYPE_CODE not between", value1, value2, "typeCode");
585 return (Criteria) this; 595 return (Criteria) this;
586 } 596 }
587 597
...@@ -655,63 +665,73 @@ public class EmailHistoryExample { ...@@ -655,63 +665,73 @@ public class EmailHistoryExample {
655 return (Criteria) this; 665 return (Criteria) this;
656 } 666 }
657 667
658 - public Criteria andStatusIdIsNull() { 668 + public Criteria andStatusCodeIsNull() {
659 - addCriterion("STATUS_ID is null"); 669 + addCriterion("STATUS_CODE is null");
670 + return (Criteria) this;
671 + }
672 +
673 + public Criteria andStatusCodeIsNotNull() {
674 + addCriterion("STATUS_CODE is not null");
675 + return (Criteria) this;
676 + }
677 +
678 + public Criteria andStatusCodeEqualTo(String value) {
679 + addCriterion("STATUS_CODE =", value, "statusCode");
660 return (Criteria) this; 680 return (Criteria) this;
661 } 681 }
662 682
663 - public Criteria andStatusIdIsNotNull() { 683 + public Criteria andStatusCodeNotEqualTo(String value) {
664 - addCriterion("STATUS_ID is not null"); 684 + addCriterion("STATUS_CODE <>", value, "statusCode");
665 return (Criteria) this; 685 return (Criteria) this;
666 } 686 }
667 687
668 - public Criteria andStatusIdEqualTo(Long value) { 688 + public Criteria andStatusCodeGreaterThan(String value) {
669 - addCriterion("STATUS_ID =", value, "statusId"); 689 + addCriterion("STATUS_CODE >", value, "statusCode");
670 return (Criteria) this; 690 return (Criteria) this;
671 } 691 }
672 692
673 - public Criteria andStatusIdNotEqualTo(Long value) { 693 + public Criteria andStatusCodeGreaterThanOrEqualTo(String value) {
674 - addCriterion("STATUS_ID <>", value, "statusId"); 694 + addCriterion("STATUS_CODE >=", value, "statusCode");
675 return (Criteria) this; 695 return (Criteria) this;
676 } 696 }
677 697
678 - public Criteria andStatusIdGreaterThan(Long value) { 698 + public Criteria andStatusCodeLessThan(String value) {
679 - addCriterion("STATUS_ID >", value, "statusId"); 699 + addCriterion("STATUS_CODE <", value, "statusCode");
680 return (Criteria) this; 700 return (Criteria) this;
681 } 701 }
682 702
683 - public Criteria andStatusIdGreaterThanOrEqualTo(Long value) { 703 + public Criteria andStatusCodeLessThanOrEqualTo(String value) {
684 - addCriterion("STATUS_ID >=", value, "statusId"); 704 + addCriterion("STATUS_CODE <=", value, "statusCode");
685 return (Criteria) this; 705 return (Criteria) this;
686 } 706 }
687 707
688 - public Criteria andStatusIdLessThan(Long value) { 708 + public Criteria andStatusCodeLike(String value) {
689 - addCriterion("STATUS_ID <", value, "statusId"); 709 + addCriterion("STATUS_CODE like", value, "statusCode");
690 return (Criteria) this; 710 return (Criteria) this;
691 } 711 }
692 712
693 - public Criteria andStatusIdLessThanOrEqualTo(Long value) { 713 + public Criteria andStatusCodeNotLike(String value) {
694 - addCriterion("STATUS_ID <=", value, "statusId"); 714 + addCriterion("STATUS_CODE not like", value, "statusCode");
695 return (Criteria) this; 715 return (Criteria) this;
696 } 716 }
697 717
698 - public Criteria andStatusIdIn(List<Long> values) { 718 + public Criteria andStatusCodeIn(List<String> values) {
699 - addCriterion("STATUS_ID in", values, "statusId"); 719 + addCriterion("STATUS_CODE in", values, "statusCode");
700 return (Criteria) this; 720 return (Criteria) this;
701 } 721 }
702 722
703 - public Criteria andStatusIdNotIn(List<Long> values) { 723 + public Criteria andStatusCodeNotIn(List<String> values) {
704 - addCriterion("STATUS_ID not in", values, "statusId"); 724 + addCriterion("STATUS_CODE not in", values, "statusCode");
705 return (Criteria) this; 725 return (Criteria) this;
706 } 726 }
707 727
708 - public Criteria andStatusIdBetween(Long value1, Long value2) { 728 + public Criteria andStatusCodeBetween(String value1, String value2) {
709 - addCriterion("STATUS_ID between", value1, value2, "statusId"); 729 + addCriterion("STATUS_CODE between", value1, value2, "statusCode");
710 return (Criteria) this; 730 return (Criteria) this;
711 } 731 }
712 732
713 - public Criteria andStatusIdNotBetween(Long value1, Long value2) { 733 + public Criteria andStatusCodeNotBetween(String value1, String value2) {
714 - addCriterion("STATUS_ID not between", value1, value2, "statusId"); 734 + addCriterion("STATUS_CODE not between", value1, value2, "statusCode");
715 return (Criteria) this; 735 return (Criteria) this;
716 } 736 }
717 737
......
...@@ -19,10 +19,10 @@ public class UserLoginInfo implements Serializable { ...@@ -19,10 +19,10 @@ public class UserLoginInfo implements Serializable {
19 private Long userId; 19 private Long userId;
20 20
21 /** 21 /**
22 - * 操作类型ID。 22 + * 操作类型CODE。
23 关联数据字典表。指定字典目录CODE：USER_LOGIN_TYPE 23 关联数据字典表。指定字典目录CODE：USER_LOGIN_TYPE
24 */ 24 */
25 - private Long operTypeId; 25 + private String operTypeCode;
26 26
27 /** 27 /**
28 * 操作类型名称(登录、退出、修改密码、FCL登录注册,、停用、启用) 28 * 操作类型名称(登录、退出、修改密码、FCL登录注册,、停用、启用)
...@@ -87,12 +87,12 @@ public class UserLoginInfo implements Serializable { ...@@ -87,12 +87,12 @@ public class UserLoginInfo implements Serializable {
87 this.userId = userId; 87 this.userId = userId;
88 } 88 }
89 89
90 - public Long getOperTypeId() { 90 + public String getOperTypeCode() {
91 - return operTypeId; 91 + return operTypeCode;
92 } 92 }
93 93
94 - public void setOperTypeId(Long operTypeId) { 94 + public void setOperTypeCode(String operTypeCode) {
95 - this.operTypeId = operTypeId; 95 + this.operTypeCode = operTypeCode == null ? null : operTypeCode.trim();
96 } 96 }
97 97
98 public String getOperTypeName() { 98 public String getOperTypeName() {
...@@ -175,7 +175,7 @@ public class UserLoginInfo implements Serializable { ...@@ -175,7 +175,7 @@ public class UserLoginInfo implements Serializable {
175 sb.append("Hash = ").append(hashCode()); 175 sb.append("Hash = ").append(hashCode());
176 sb.append(", id=").append(id); 176 sb.append(", id=").append(id);
177 sb.append(", userId=").append(userId); 177 sb.append(", userId=").append(userId);
178 - sb.append(", operTypeId=").append(operTypeId); 178 + sb.append(", operTypeCode=").append(operTypeCode);
179 sb.append(", operTypeName=").append(operTypeName); 179 sb.append(", operTypeName=").append(operTypeName);
180 sb.append(", operDesc=").append(operDesc); 180 sb.append(", operDesc=").append(operDesc);
181 sb.append(", ip=").append(ip); 181 sb.append(", ip=").append(ip);
......
...@@ -245,63 +245,73 @@ public class UserLoginInfoExample { ...@@ -245,63 +245,73 @@ public class UserLoginInfoExample {
245 return (Criteria) this; 245 return (Criteria) this;
246 } 246 }
247 247
248 - public Criteria andOperTypeIdIsNull() { 248 + public Criteria andOperTypeCodeIsNull() {
249 - addCriterion("OPER_TYPE_ID is null"); 249 + addCriterion("OPER_TYPE_CODE is null");
250 return (Criteria) this; 250 return (Criteria) this;
251 } 251 }
252 252
253 - public Criteria andOperTypeIdIsNotNull() { 253 + public Criteria andOperTypeCodeIsNotNull() {
254 - addCriterion("OPER_TYPE_ID is not null"); 254 + addCriterion("OPER_TYPE_CODE is not null");
255 return (Criteria) this; 255 return (Criteria) this;
256 } 256 }
257 257
258 - public Criteria andOperTypeIdEqualTo(Long value) { 258 + public Criteria andOperTypeCodeEqualTo(String value) {
259 - addCriterion("OPER_TYPE_ID =", value, "operTypeId"); 259 + addCriterion("OPER_TYPE_CODE =", value, "operTypeCode");
260 return (Criteria) this; 260 return (Criteria) this;
261 } 261 }
262 262
263 - public Criteria andOperTypeIdNotEqualTo(Long value) { 263 + public Criteria andOperTypeCodeNotEqualTo(String value) {
264 - addCriterion("OPER_TYPE_ID <>", value, "operTypeId"); 264 + addCriterion("OPER_TYPE_CODE <>", value, "operTypeCode");
265 return (Criteria) this; 265 return (Criteria) this;
266 } 266 }
267 267
268 - public Criteria andOperTypeIdGreaterThan(Long value) { 268 + public Criteria andOperTypeCodeGreaterThan(String value) {
269 - addCriterion("OPER_TYPE_ID >", value, "operTypeId"); 269 + addCriterion("OPER_TYPE_CODE >", value, "operTypeCode");
270 return (Criteria) this; 270 return (Criteria) this;
271 } 271 }
272 272
273 - public Criteria andOperTypeIdGreaterThanOrEqualTo(Long value) { 273 + public Criteria andOperTypeCodeGreaterThanOrEqualTo(String value) {
274 - addCriterion("OPER_TYPE_ID >=", value, "operTypeId"); 274 + addCriterion("OPER_TYPE_CODE >=", value, "operTypeCode");
275 return (Criteria) this; 275 return (Criteria) this;
276 } 276 }
277 277
278 - public Criteria andOperTypeIdLessThan(Long value) { 278 + public Criteria andOperTypeCodeLessThan(String value) {
279 - addCriterion("OPER_TYPE_ID <", value, "operTypeId"); 279 + addCriterion("OPER_TYPE_CODE <", value, "operTypeCode");
280 return (Criteria) this; 280 return (Criteria) this;
281 } 281 }
282 282
283 - public Criteria andOperTypeIdLessThanOrEqualTo(Long value) { 283 + public Criteria andOperTypeCodeLessThanOrEqualTo(String value) {
284 - addCriterion("OPER_TYPE_ID <=", value, "operTypeId"); 284 + addCriterion("OPER_TYPE_CODE <=", value, "operTypeCode");
285 return (Criteria) this; 285 return (Criteria) this;
286 } 286 }
287 287
288 - public Criteria andOperTypeIdIn(List<Long> values) { 288 + public Criteria andOperTypeCodeLike(String value) {
289 - addCriterion("OPER_TYPE_ID in", values, "operTypeId"); 289 + addCriterion("OPER_TYPE_CODE like", value, "operTypeCode");
290 return (Criteria) this; 290 return (Criteria) this;
291 } 291 }
292 292
293 - public Criteria andOperTypeIdNotIn(List<Long> values) { 293 + public Criteria andOperTypeCodeNotLike(String value) {
294 - addCriterion("OPER_TYPE_ID not in", values, "operTypeId"); 294 + addCriterion("OPER_TYPE_CODE not like", value, "operTypeCode");
295 return (Criteria) this; 295 return (Criteria) this;
296 } 296 }
297 297
298 - public Criteria andOperTypeIdBetween(Long value1, Long value2) { 298 + public Criteria andOperTypeCodeIn(List<String> values) {
299 - addCriterion("OPER_TYPE_ID between", value1, value2, "operTypeId"); 299 + addCriterion("OPER_TYPE_CODE in", values, "operTypeCode");
300 return (Criteria) this; 300 return (Criteria) this;
301 } 301 }
302 302
303 - public Criteria andOperTypeIdNotBetween(Long value1, Long value2) { 303 + public Criteria andOperTypeCodeNotIn(List<String> values) {
304 - addCriterion("OPER_TYPE_ID not between", value1, value2, "operTypeId"); 304 + addCriterion("OPER_TYPE_CODE not in", values, "operTypeCode");
305 + return (Criteria) this;
306 + }
307 +
308 + public Criteria andOperTypeCodeBetween(String value1, String value2) {
309 + addCriterion("OPER_TYPE_CODE between", value1, value2, "operTypeCode");
310 + return (Criteria) this;
311 + }
312 +
313 + public Criteria andOperTypeCodeNotBetween(String value1, String value2) {
314 + addCriterion("OPER_TYPE_CODE not between", value1, value2, "operTypeCode");
305 return (Criteria) this; 315 return (Criteria) this;
306 } 316 }
307 317
......
...@@ -5,7 +5,7 @@ import java.util.Date; ...@@ -5,7 +5,7 @@ import java.util.Date;
5 5
6 /** 6 /**
7 * DESC: KAFKA临时表 7 * DESC: KAFKA临时表
8 - * TABLE: T_SYS_KAFKA_TEMPORARY_STORAGE 8 + * TABLE: ICLEARIMP.T_SYS_KAFKA_TEMPORARY_STORAGE
9 */ 9 */
10 public class KafkaTemporaryStorage implements Serializable { 10 public class KafkaTemporaryStorage implements Serializable {
11 /** 11 /**
...@@ -98,11 +98,6 @@ public class KafkaTemporaryStorage implements Serializable { ...@@ -98,11 +98,6 @@ public class KafkaTemporaryStorage implements Serializable {
98 */ 98 */
99 private String data; 99 private String data;
100 100
101 - /**
102 - * 消息字符串
103 - */
104 - private String message;
105 -
106 private static final long serialVersionUID = 1L; 101 private static final long serialVersionUID = 1L;
107 102
108 public Long getId() { 103 public Long getId() {
...@@ -249,14 +244,6 @@ public class KafkaTemporaryStorage implements Serializable { ...@@ -249,14 +244,6 @@ public class KafkaTemporaryStorage implements Serializable {
249 this.data = data == null ? null : data.trim(); 244 this.data = data == null ? null : data.trim();
250 } 245 }
251 246
252 - public String getMessage() {
253 - return message;
254 - }
255 -
256 - public void setMessage(String message) {
257 - this.message = message;
258 - }
259 -
260 @Override 247 @Override
261 public String toString() { 248 public String toString() {
262 StringBuilder sb = new StringBuilder(); 249 StringBuilder sb = new StringBuilder();
......
...@@ -29,9 +29,9 @@ public class ParamConfig implements Serializable { ...@@ -29,9 +29,9 @@ public class ParamConfig implements Serializable {
29 private String value; 29 private String value;
30 30
31 /** 31 /**
32 - * 参数类型ID，关联数据字典表。指定字典目录CODE：PARAM_CONFIG_TYPE 32 + * 参数类型CODE，关联数据字典表。指定字典目录CODE：PARAM_CONFIG_TYPE
33 */ 33 */
34 - private Long typeId; 34 + private String typeCode;
35 35
36 /** 36 /**
37 * 参数类型名称 37 * 参数类型名称
...@@ -112,12 +112,12 @@ public class ParamConfig implements Serializable { ...@@ -112,12 +112,12 @@ public class ParamConfig implements Serializable {
112 this.value = value == null ? null : value.trim(); 112 this.value = value == null ? null : value.trim();
113 } 113 }
114 114
115 - public Long getTypeId() { 115 + public String getTypeCode() {
116 - return typeId; 116 + return typeCode;
117 } 117 }
118 118
119 - public void setTypeId(Long typeId) { 119 + public void setTypeCode(String typeCode) {
120 - this.typeId = typeId; 120 + this.typeCode = typeCode == null ? null : typeCode.trim();
121 } 121 }
122 122
123 public String getTypeName() { 123 public String getTypeName() {
...@@ -202,7 +202,7 @@ public class ParamConfig implements Serializable { ...@@ -202,7 +202,7 @@ public class ParamConfig implements Serializable {
202 sb.append(", code=").append(code); 202 sb.append(", code=").append(code);
203 sb.append(", name=").append(name); 203 sb.append(", name=").append(name);
204 sb.append(", value=").append(value); 204 sb.append(", value=").append(value);
205 - sb.append(", typeId=").append(typeId); 205 + sb.append(", typeCode=").append(typeCode);
206 sb.append(", typeName=").append(typeName); 206 sb.append(", typeName=").append(typeName);
207 sb.append(", status=").append(status); 207 sb.append(", status=").append(status);
208 sb.append(", description=").append(description); 208 sb.append(", description=").append(description);
......
...@@ -395,63 +395,73 @@ public class ParamConfigExample { ...@@ -395,63 +395,73 @@ public class ParamConfigExample {
395 return (Criteria) this; 395 return (Criteria) this;
396 } 396 }
397 397
398 - public Criteria andTypeIdIsNull() { 398 + public Criteria andTypeCodeIsNull() {
399 - addCriterion("TYPE_ID is null"); 399 + addCriterion("TYPE_CODE is null");
400 return (Criteria) this; 400 return (Criteria) this;
401 } 401 }
402 402
403 - public Criteria andTypeIdIsNotNull() { 403 + public Criteria andTypeCodeIsNotNull() {
404 - addCriterion("TYPE_ID is not null"); 404 + addCriterion("TYPE_CODE is not null");
405 return (Criteria) this; 405 return (Criteria) this;
406 } 406 }
407 407
408 - public Criteria andTypeIdEqualTo(Long value) { 408 + public Criteria andTypeCodeEqualTo(String value) {
409 - addCriterion("TYPE_ID =", value, "typeId"); 409 + addCriterion("TYPE_CODE =", value, "typeCode");
410 return (Criteria) this; 410 return (Criteria) this;
411 } 411 }
412 412
413 - public Criteria andTypeIdNotEqualTo(Long value) { 413 + public Criteria andTypeCodeNotEqualTo(String value) {
414 - addCriterion("TYPE_ID <>", value, "typeId"); 414 + addCriterion("TYPE_CODE <>", value, "typeCode");
415 return (Criteria) this; 415 return (Criteria) this;
416 } 416 }
417 417
418 - public Criteria andTypeIdGreaterThan(Long value) { 418 + public Criteria andTypeCodeGreaterThan(String value) {
419 - addCriterion("TYPE_ID >", value, "typeId"); 419 + addCriterion("TYPE_CODE >", value, "typeCode");
420 return (Criteria) this; 420 return (Criteria) this;
421 } 421 }
422 422
423 - public Criteria andTypeIdGreaterThanOrEqualTo(Long value) { 423 + public Criteria andTypeCodeGreaterThanOrEqualTo(String value) {
424 - addCriterion("TYPE_ID >=", value, "typeId"); 424 + addCriterion("TYPE_CODE >=", value, "typeCode");
425 return (Criteria) this; 425 return (Criteria) this;
426 } 426 }
427 427
428 - public Criteria andTypeIdLessThan(Long value) { 428 + public Criteria andTypeCodeLessThan(String value) {
429 - addCriterion("TYPE_ID <", value, "typeId"); 429 + addCriterion("TYPE_CODE <", value, "typeCode");
430 return (Criteria) this; 430 return (Criteria) this;
431 } 431 }
432 432
433 - public Criteria andTypeIdLessThanOrEqualTo(Long value) { 433 + public Criteria andTypeCodeLessThanOrEqualTo(String value) {
434 - addCriterion("TYPE_ID <=", value, "typeId"); 434 + addCriterion("TYPE_CODE <=", value, "typeCode");
435 return (Criteria) this; 435 return (Criteria) this;
436 } 436 }
437 437
438 - public Criteria andTypeIdIn(List<Long> values) { 438 + public Criteria andTypeCodeLike(String value) {
439 - addCriterion("TYPE_ID in", values, "typeId"); 439 + addCriterion("TYPE_CODE like", value, "typeCode");
440 return (Criteria) this; 440 return (Criteria) this;
441 } 441 }
442 442
443 - public Criteria andTypeIdNotIn(List<Long> values) { 443 + public Criteria andTypeCodeNotLike(String value) {
444 - addCriterion("TYPE_ID not in", values, "typeId"); 444 + addCriterion("TYPE_CODE not like", value, "typeCode");
445 return (Criteria) this; 445 return (Criteria) this;
446 } 446 }
447 447
448 - public Criteria andTypeIdBetween(Long value1, Long value2) { 448 + public Criteria andTypeCodeIn(List<String> values) {
449 - addCriterion("TYPE_ID between", value1, value2, "typeId"); 449 + addCriterion("TYPE_CODE in", values, "typeCode");
450 return (Criteria) this; 450 return (Criteria) this;
451 } 451 }
452 452
453 - public Criteria andTypeIdNotBetween(Long value1, Long value2) { 453 + public Criteria andTypeCodeNotIn(List<String> values) {
454 - addCriterion("TYPE_ID not between", value1, value2, "typeId"); 454 + addCriterion("TYPE_CODE not in", values, "typeCode");
455 + return (Criteria) this;
456 + }
457 +
458 + public Criteria andTypeCodeBetween(String value1, String value2) {
459 + addCriterion("TYPE_CODE between", value1, value2, "typeCode");
460 + return (Criteria) this;
461 + }
462 +
463 + public Criteria andTypeCodeNotBetween(String value1, String value2) {
464 + addCriterion("TYPE_CODE not between", value1, value2, "typeCode");
455 return (Criteria) this; 465 return (Criteria) this;
456 } 466 }
457 467
......
...@@ -29,10 +29,10 @@ public class Role implements Serializable { ...@@ -29,10 +29,10 @@ public class Role implements Serializable {
29 private String roleDesc; 29 private String roleDesc;
30 30
31 /** 31 /**
32 - * 类型ID。 32 + * 类型CODE。
33 -关联数据字典表。指定KEY为：role_type 33 +关联数据字典表。指定KEY为：ROLE_TYPE
34 */ 34 */
35 - private Long typeId; 35 + private String typeCode;
36 36
37 /** 37 /**
38 * 用户类型名称 38 * 用户类型名称
...@@ -108,12 +108,12 @@ public class Role implements Serializable { ...@@ -108,12 +108,12 @@ public class Role implements Serializable {
108 this.roleDesc = roleDesc == null ? null : roleDesc.trim(); 108 this.roleDesc = roleDesc == null ? null : roleDesc.trim();
109 } 109 }
110 110
111 - public Long getTypeId() { 111 + public String getTypeCode() {
112 - return typeId; 112 + return typeCode;
113 } 113 }
114 114
115 - public void setTypeId(Long typeId) { 115 + public void setTypeCode(String typeCode) {
116 - this.typeId = typeId; 116 + this.typeCode = typeCode == null ? null : typeCode.trim();
117 } 117 }
118 118
119 public String getTypeName() { 119 public String getTypeName() {
...@@ -190,7 +190,7 @@ public class Role implements Serializable { ...@@ -190,7 +190,7 @@ public class Role implements Serializable {
190 sb.append(", code=").append(code); 190 sb.append(", code=").append(code);
191 sb.append(", name=").append(name); 191 sb.append(", name=").append(name);
192 sb.append(", roleDesc=").append(roleDesc); 192 sb.append(", roleDesc=").append(roleDesc);
193 - sb.append(", typeId=").append(typeId); 193 + sb.append(", typeCode=").append(typeCode);
194 sb.append(", typeName=").append(typeName); 194 sb.append(", typeName=").append(typeName);
195 sb.append(", status=").append(status); 195 sb.append(", status=").append(status);
196 sb.append(", createTime=").append(createTime); 196 sb.append(", createTime=").append(createTime);
......
...@@ -395,63 +395,73 @@ public class RoleExample { ...@@ -395,63 +395,73 @@ public class RoleExample {
395 return (Criteria) this; 395 return (Criteria) this;
396 } 396 }
397 397
398 - public Criteria andTypeIdIsNull() { 398 + public Criteria andTypeCodeIsNull() {
399 - addCriterion("TYPE_ID is null"); 399 + addCriterion("TYPE_CODE is null");
400 return (Criteria) this; 400 return (Criteria) this;
401 } 401 }
402 402
403 - public Criteria andTypeIdIsNotNull() { 403 + public Criteria andTypeCodeIsNotNull() {
404 - addCriterion("TYPE_ID is not null"); 404 + addCriterion("TYPE_CODE is not null");
405 return (Criteria) this; 405 return (Criteria) this;
406 } 406 }
407 407
408 - public Criteria andTypeIdEqualTo(Long value) { 408 + public Criteria andTypeCodeEqualTo(String value) {
409 - addCriterion("TYPE_ID =", value, "typeId"); 409 + addCriterion("TYPE_CODE =", value, "typeCode");
410 return (Criteria) this; 410 return (Criteria) this;
411 } 411 }
412 412
413 - public Criteria andTypeIdNotEqualTo(Long value) { 413 + public Criteria andTypeCodeNotEqualTo(String value) {
414 - addCriterion("TYPE_ID <>", value, "typeId"); 414 + addCriterion("TYPE_CODE <>", value, "typeCode");
415 return (Criteria) this; 415 return (Criteria) this;
416 } 416 }
417 417
418 - public Criteria andTypeIdGreaterThan(Long value) { 418 + public Criteria andTypeCodeGreaterThan(String value) {
419 - addCriterion("TYPE_ID >", value, "typeId"); 419 + addCriterion("TYPE_CODE >", value, "typeCode");
420 return (Criteria) this; 420 return (Criteria) this;
421 } 421 }
422 422
423 - public Criteria andTypeIdGreaterThanOrEqualTo(Long value) { 423 + public Criteria andTypeCodeGreaterThanOrEqualTo(String value) {
424 - addCriterion("TYPE_ID >=", value, "typeId"); 424 + addCriterion("TYPE_CODE >=", value, "typeCode");
425 return (Criteria) this; 425 return (Criteria) this;
426 } 426 }
427 427
428 - public Criteria andTypeIdLessThan(Long value) { 428 + public Criteria andTypeCodeLessThan(String value) {
429 - addCriterion("TYPE_ID <", value, "typeId"); 429 + addCriterion("TYPE_CODE <", value, "typeCode");
430 return (Criteria) this; 430 return (Criteria) this;
431 } 431 }
432 432
433 - public Criteria andTypeIdLessThanOrEqualTo(Long value) { 433 + public Criteria andTypeCodeLessThanOrEqualTo(String value) {
434 - addCriterion("TYPE_ID <=", value, "typeId"); 434 + addCriterion("TYPE_CODE <=", value, "typeCode");
435 return (Criteria) this; 435 return (Criteria) this;
436 } 436 }
437 437
438 - public Criteria andTypeIdIn(List<Long> values) { 438 + public Criteria andTypeCodeLike(String value) {
439 - addCriterion("TYPE_ID in", values, "typeId"); 439 + addCriterion("TYPE_CODE like", value, "typeCode");
440 return (Criteria) this; 440 return (Criteria) this;
441 } 441 }
442 442
443 - public Criteria andTypeIdNotIn(List<Long> values) { 443 + public Criteria andTypeCodeNotLike(String value) {
444 - addCriterion("TYPE_ID not in", values, "typeId"); 444 + addCriterion("TYPE_CODE not like", value, "typeCode");
445 return (Criteria) this; 445 return (Criteria) this;
446 } 446 }
447 447
448 - public Criteria andTypeIdBetween(Long value1, Long value2) { 448 + public Criteria andTypeCodeIn(List<String> values) {
449 - addCriterion("TYPE_ID between", value1, value2, "typeId"); 449 + addCriterion("TYPE_CODE in", values, "typeCode");
450 return (Criteria) this; 450 return (Criteria) this;
451 } 451 }
452 452
453 - public Criteria andTypeIdNotBetween(Long value1, Long value2) { 453 + public Criteria andTypeCodeNotIn(List<String> values) {
454 - addCriterion("TYPE_ID not between", value1, value2, "typeId"); 454 + addCriterion("TYPE_CODE not in", values, "typeCode");
455 + return (Criteria) this;
456 + }
457 +
458 + public Criteria andTypeCodeBetween(String value1, String value2) {
459 + addCriterion("TYPE_CODE between", value1, value2, "typeCode");
460 + return (Criteria) this;
461 + }
462 +
463 + public Criteria andTypeCodeNotBetween(String value1, String value2) {
464 + addCriterion("TYPE_CODE not between", value1, value2, "typeCode");
455 return (Criteria) this; 465 return (Criteria) this;
456 } 466 }
457 467
......
...@@ -4,7 +4,7 @@ import java.io.Serializable; ...@@ -4,7 +4,7 @@ import java.io.Serializable;
4 import java.util.Date; 4 import java.util.Date;
5 5
6 /** 6 /**
7 - * DESC: null 7 + * DESC: 角色权限表
8 * TABLE: T_SYS_ROLE_PRIVILEGE 8 * TABLE: T_SYS_ROLE_PRIVILEGE
9 */ 9 */
10 public class RolePrivilege implements Serializable { 10 public class RolePrivilege implements Serializable {
......
...@@ -64,10 +64,10 @@ public class User implements Serializable { ...@@ -64,10 +64,10 @@ public class User implements Serializable {
64 private String customsSerialNum; 64 private String customsSerialNum;
65 65
66 /** 66 /**
67 - * 用户类型ID。 67 + * 用户类型CODE。
68 关联数据字典表。指定字典目录CODE：USER_TYPE 68 关联数据字典表。指定字典目录CODE：USER_TYPE
69 */ 69 */
70 - private Long typeId; 70 + private String typeCode;
71 71
72 /** 72 /**
73 * 用户类型名称(本地账号、FCL账号) 73 * 用户类型名称(本地账号、FCL账号)
...@@ -209,12 +209,12 @@ public class User implements Serializable { ...@@ -209,12 +209,12 @@ public class User implements Serializable {
209 this.customsSerialNum = customsSerialNum == null ? null : customsSerialNum.trim(); 209 this.customsSerialNum = customsSerialNum == null ? null : customsSerialNum.trim();
210 } 210 }
211 211
212 - public Long getTypeId() { 212 + public String getTypeCode() {
213 - return typeId; 213 + return typeCode;
214 } 214 }
215 215
216 - public void setTypeId(Long typeId) { 216 + public void setTypeCode(String typeCode) {
217 - this.typeId = typeId; 217 + this.typeCode = typeCode == null ? null : typeCode.trim();
218 } 218 }
219 219
220 public String getTypeName() { 220 public String getTypeName() {
...@@ -314,7 +314,7 @@ public class User implements Serializable { ...@@ -314,7 +314,7 @@ public class User implements Serializable {
314 sb.append(", accountNo=").append(accountNo); 314 sb.append(", accountNo=").append(accountNo);
315 sb.append(", unifiedBusinessNum=").append(unifiedBusinessNum); 315 sb.append(", unifiedBusinessNum=").append(unifiedBusinessNum);
316 sb.append(", customsSerialNum=").append(customsSerialNum); 316 sb.append(", customsSerialNum=").append(customsSerialNum);
317 - sb.append(", typeId=").append(typeId); 317 + sb.append(", typeCode=").append(typeCode);
318 sb.append(", typeName=").append(typeName); 318 sb.append(", typeName=").append(typeName);
319 sb.append(", status=").append(status); 319 sb.append(", status=").append(status);
320 sb.append(", remark=").append(remark); 320 sb.append(", remark=").append(remark);
......
...@@ -885,63 +885,73 @@ public class UserExample { ...@@ -885,63 +885,73 @@ public class UserExample {
885 return (Criteria) this; 885 return (Criteria) this;
886 } 886 }
887 887
888 - public Criteria andTypeIdIsNull() { 888 + public Criteria andTypeCodeIsNull() {
889 - addCriterion("TYPE_ID is null"); 889 + addCriterion("TYPE_CODE is null");
890 return (Criteria) this; 890 return (Criteria) this;
891 } 891 }
892 892
893 - public Criteria andTypeIdIsNotNull() { 893 + public Criteria andTypeCodeIsNotNull() {
894 - addCriterion("TYPE_ID is not null"); 894 + addCriterion("TYPE_CODE is not null");
895 return (Criteria) this; 895 return (Criteria) this;
896 } 896 }
897 897
898 - public Criteria andTypeIdEqualTo(Long value) { 898 + public Criteria andTypeCodeEqualTo(String value) {
899 - addCriterion("TYPE_ID =", value, "typeId"); 899 + addCriterion("TYPE_CODE =", value, "typeCode");
900 return (Criteria) this; 900 return (Criteria) this;
901 } 901 }
902 902
903 - public Criteria andTypeIdNotEqualTo(Long value) { 903 + public Criteria andTypeCodeNotEqualTo(String value) {
904 - addCriterion("TYPE_ID <>", value, "typeId"); 904 + addCriterion("TYPE_CODE <>", value, "typeCode");
905 return (Criteria) this; 905 return (Criteria) this;
906 } 906 }
907 907
908 - public Criteria andTypeIdGreaterThan(Long value) { 908 + public Criteria andTypeCodeGreaterThan(String value) {
909 - addCriterion("TYPE_ID >", value, "typeId"); 909 + addCriterion("TYPE_CODE >", value, "typeCode");
910 return (Criteria) this; 910 return (Criteria) this;
911 } 911 }
912 912
913 - public Criteria andTypeIdGreaterThanOrEqualTo(Long value) { 913 + public Criteria andTypeCodeGreaterThanOrEqualTo(String value) {
914 - addCriterion("TYPE_ID >=", value, "typeId"); 914 + addCriterion("TYPE_CODE >=", value, "typeCode");
915 return (Criteria) this; 915 return (Criteria) this;
916 } 916 }
917 917
918 - public Criteria andTypeIdLessThan(Long value) { 918 + public Criteria andTypeCodeLessThan(String value) {
919 - addCriterion("TYPE_ID <", value, "typeId"); 919 + addCriterion("TYPE_CODE <", value, "typeCode");
920 return (Criteria) this; 920 return (Criteria) this;
921 } 921 }
922 922
923 - public Criteria andTypeIdLessThanOrEqualTo(Long value) { 923 + public Criteria andTypeCodeLessThanOrEqualTo(String value) {
924 - addCriterion("TYPE_ID <=", value, "typeId"); 924 + addCriterion("TYPE_CODE <=", value, "typeCode");
925 return (Criteria) this; 925 return (Criteria) this;
926 } 926 }
927 927
928 - public Criteria andTypeIdIn(List<Long> values) { 928 + public Criteria andTypeCodeLike(String value) {
929 - addCriterion("TYPE_ID in", values, "typeId"); 929 + addCriterion("TYPE_CODE like", value, "typeCode");
930 return (Criteria) this; 930 return (Criteria) this;
931 } 931 }
932 932
933 - public Criteria andTypeIdNotIn(List<Long> values) { 933 + public Criteria andTypeCodeNotLike(String value) {
934 - addCriterion("TYPE_ID not in", values, "typeId"); 934 + addCriterion("TYPE_CODE not like", value, "typeCode");
935 return (Criteria) this; 935 return (Criteria) this;
936 } 936 }
937 937
938 - public Criteria andTypeIdBetween(Long value1, Long value2) { 938 + public Criteria andTypeCodeIn(List<String> values) {
939 - addCriterion("TYPE_ID between", value1, value2, "typeId"); 939 + addCriterion("TYPE_CODE in", values, "typeCode");
940 return (Criteria) this; 940 return (Criteria) this;
941 } 941 }
942 942
943 - public Criteria andTypeIdNotBetween(Long value1, Long value2) { 943 + public Criteria andTypeCodeNotIn(List<String> values) {
944 - addCriterion("TYPE_ID not between", value1, value2, "typeId"); 944 + addCriterion("TYPE_CODE not in", values, "typeCode");
945 + return (Criteria) this;
946 + }
947 +
948 + public Criteria andTypeCodeBetween(String value1, String value2) {
949 + addCriterion("TYPE_CODE between", value1, value2, "typeCode");
950 + return (Criteria) this;
951 + }
952 +
953 + public Criteria andTypeCodeNotBetween(String value1, String value2) {
954 + addCriterion("TYPE_CODE not between", value1, value2, "typeCode");
945 return (Criteria) this; 955 return (Criteria) this;
946 } 956 }
947 957
......
...@@ -7,7 +7,7 @@ import java.util.Date; ...@@ -7,7 +7,7 @@ import java.util.Date;
7 * DESC: 用户登录信息token表 7 * DESC: 用户登录信息token表
8 * TABLE: T_SYS_REDIS_SLAB 8 * TABLE: T_SYS_REDIS_SLAB
9 */ 9 */
10 -public class RedisSlab implements Serializable { 10 +public class redisSlab implements Serializable {
11 /** 11 /**
12 * ID,自动增加 12 * ID,自动增加
13 */ 13 */
......
...@@ -4,7 +4,7 @@ import java.util.ArrayList; ...@@ -4,7 +4,7 @@ import java.util.ArrayList;
4 import java.util.Date; 4 import java.util.Date;
5 import java.util.List; 5 import java.util.List;
6 6
7 -public class RedisSlabExample { 7 +public class redisSlabExample {
8 protected String orderByClause; 8 protected String orderByClause;
9 9
10 protected boolean distinct; 10 protected boolean distinct;
...@@ -15,7 +15,7 @@ public class RedisSlabExample { ...@@ -15,7 +15,7 @@ public class RedisSlabExample {
15 15
16 protected Integer limitSize; 16 protected Integer limitSize;
17 17
18 - public RedisSlabExample() { 18 + public redisSlabExample() {
19 oredCriteria = new ArrayList<Criteria>(); 19 oredCriteria = new ArrayList<Criteria>();
20 } 20 }
21 21
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
40 sys：系统 系统相关表，例如kafka表 40 sys：系统 系统相关表，例如kafka表
41 log: 日志 日志记录表，例如邮件发送日志表 41 log: 日志 日志记录表，例如邮件发送日志表
42 --> 42 -->
43 - <javaModelGenerator targetPackage="com.fedex.connect.common.model.biz" targetProject="src/main/java"> 43 + <javaModelGenerator targetPackage="com.fedex.connect.common.model.sys" targetProject="src/main/java">
44 <!---enableSubPackages:如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性--> 44 <!---enableSubPackages:如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性-->
45 <property name="enableSubPackages" value="false"/> 45 <property name="enableSubPackages" value="false"/>
46 <!--该属性只对MyBatis3有效，如果true就会使用构造方法入参，如果false就会使用setter方式。默认为false--> 46 <!--该属性只对MyBatis3有效，如果true就会使用构造方法入参，如果false就会使用setter方式。默认为false-->
...@@ -52,13 +52,13 @@ ...@@ -52,13 +52,13 @@
52 </javaModelGenerator> 52 </javaModelGenerator>
53 53
54 <!-- 生成映射文件*.xml的位置--> 54 <!-- 生成映射文件*.xml的位置-->
55 - <sqlMapGenerator targetPackage="mapper.biz" targetProject="src/main/java/com/fedex/connect/common"> 55 + <sqlMapGenerator targetPackage="mapper.sys" targetProject="src/main/java/com/fedex/connect/common">
56 <!--如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性。默认为false--> 56 <!--如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性。默认为false-->
57 <property name="enableSubPackages" value="false"/> 57 <property name="enableSubPackages" value="false"/>
58 </sqlMapGenerator> 58 </sqlMapGenerator>
59 59
60 <!-- 生成DAO的包名和位置 --> 60 <!-- 生成DAO的包名和位置 -->
61 - <javaClientGenerator type="XMLMAPPER" targetPackage="com.fedex.connect.common.dao.biz" targetProject="src/main/java"> 61 + <javaClientGenerator type="XMLMAPPER" targetPackage="com.fedex.connect.common.dao.sys" targetProject="src/main/java">
62 <!--如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性。默认为false--> 62 <!--如果true，MBG会根据catalog和schema来生成子包。如果false就会直接用targetPackage属性。默认为false-->
63 <property name="enableSubPackages" value="false"/> 63 <property name="enableSubPackages" value="false"/>
64 </javaClientGenerator> 64 </javaClientGenerator>
...@@ -93,113 +93,119 @@ ...@@ -93,113 +93,119 @@
93 <!-- selectByExampleQueryId="true">--> 93 <!-- selectByExampleQueryId="true">-->
94 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_LOG_EMAIL_HISTORY.NEXTVAL FROM DUAL" />--> 94 <!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_LOG_EMAIL_HISTORY.NEXTVAL FROM DUAL" />-->
95 <!-- </table>--> 95 <!-- </table>-->
96 - <table tableName="T_BIZ_ATTACHMENT" domainObjectName="Attachment" 96 +<!-- <table tableName="T_LOG_USER_LOGIN_INFO" domainObjectName="UserLoginInfo"-->
97 - enableCountByExample="true" enableUpdateByExample="true"
98 - enableDeleteByExample="true" enableSelectByExample="true"
99 - selectByExampleQueryId="true">
100 - <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_ATTACHMENT.NEXTVAL FROM DUAL" />
101 - </table>
102 - <table tableName="T_BIZ_UPLOAD_RECORD" domainObjectName="UploadRecord"
103 - enableCountByExample="true" enableUpdateByExample="true"
104 - enableDeleteByExample="true" enableSelectByExample="true"
105 - selectByExampleQueryId="true">
106 - <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_UPLOAD_RECORD.NEXTVAL FROM DUAL" />
107 - </table>
108 -<!-- <table schema="ICLEARIMP" tableName="T_BIZ_CE_INFO" domainObjectName="CeInfo"-->
109 -<!-- enableCountByExample="true" enableUpdateByExample="true"-->
110 -<!-- enableDeleteByExample="true" enableSelectByExample="true"-->
111 -<!-- selectByExampleQueryId="true">-->
112 -<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_CE_INFO.NEXTVAL FROM DUAL" />-->
113 -<!-- </table>-->
114 - <table tableName="T_BIZ_CONSIGNMENT" domainObjectName="Consignment"
115 - enableCountByExample="true" enableUpdateByExample="true"
116 - enableDeleteByExample="true" enableSelectByExample="true"
117 - selectByExampleQueryId="true">
118 - <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_CONSIGNMENT.NEXTVAL FROM DUAL" />
119 - </table>
120 -<!-- <table tableName="T_BIZ_EMAIL" domainObjectName="Email"-->
121 -<!-- enableCountByExample="true" enableUpdateByExample="true"-->
122 -<!-- enableDeleteByExample="true" enableSelectByExample="true"-->
123 -<!-- selectByExampleQueryId="true">-->
124 -<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_EMAIL.NEXTVAL FROM DUAL" />-->
125 -<!-- </table>-->
126 -<!-- <table tableName="T_BIZ_PUSH_OB" domainObjectName="PushOb"-->
127 -<!-- enableCountByExample="true" enableUpdateByExample="true"-->
128 -<!-- enableDeleteByExample="true" enableSelectByExample="true"-->
129 -<!-- selectByExampleQueryId="true">-->
130 -<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_PUSH_OB.NEXTVAL FROM DUAL" />-->
131 -<!-- </table>-->
132 -<!-- <table tableName="T_BIZ_PUSH_OB_DETAIL" domainObjectName="PushObDetail"-->
133 -<!-- enableCountByExample="true" enableUpdateByExample="true"-->
134 -<!-- enableDeleteByExample="true" enableSelectByExample="true"-->
135 -<!-- selectByExampleQueryId="true">-->
136 -<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_PUSH_OB_DETAIL.NEXTVAL FROM DUAL" />-->
137 -<!-- </table>-->
138 -
139 -
140 -
141 -<!-- <table tableName="T_BI_PORTCLEAR_EMAIL_MAPPING" domainObjectName="PortclearEmailMapping"-->
142 <!-- enableCountByExample="true" enableUpdateByExample="true"--> 97 <!-- enableCountByExample="true" enableUpdateByExample="true"-->
143 <!-- enableDeleteByExample="true" enableSelectByExample="true"--> 98 <!-- enableDeleteByExample="true" enableSelectByExample="true"-->
144 <!-- selectByExampleQueryId="true">--> 99 <!-- selectByExampleQueryId="true">-->
145 -<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BI_PORTCLEAR_EMAIL_MAPPING.NEXTVAL FROM DUAL" />--> 100 +<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_LOG_USER_LOGIN_INFO.NEXTVAL FROM DUAL" />-->
146 <!-- </table>--> 101 <!-- </table>-->
147 - 102 +<!-- <table tableName="T_BIZ_ATTACHMENT" domainObjectName="Attachment"-->
148 -<!-- <table tableName="T_SYS_REDIS_SLAB" domainObjectName="redisSlab"-->
149 -<!-- enableCountByExample="true" enableUpdateByExample="true"-->
150 -<!-- enableDeleteByExample="true" enableSelectByExample="true"-->
151 -<!-- selectByExampleQueryId="true">-->
152 -<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_REDIS_SLAB.NEXTVAL FROM DUAL" />-->
153 -<!-- </table>-->
154 -<!-- <table schema="ICLEARIMP" tableName="T_SYS_KAFKA_STORAGE_HISTORY" domainObjectName="KafkaStorageHistory"-->
155 <!-- enableCountByExample="true" enableUpdateByExample="true"--> 103 <!-- enableCountByExample="true" enableUpdateByExample="true"-->
156 <!-- enableDeleteByExample="true" enableSelectByExample="true"--> 104 <!-- enableDeleteByExample="true" enableSelectByExample="true"-->
157 <!-- selectByExampleQueryId="true">--> 105 <!-- selectByExampleQueryId="true">-->
158 -<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_KAFKA_STORAGE_HISTORY.NEXTVAL FROM DUAL" />--> 106 +<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_ATTACHMENT.NEXTVAL FROM DUAL" />-->
159 <!-- </table>--> 107 <!-- </table>-->
160 -<!-- <table tableName="T_SYS_KAFKA_TEMPORARY_STORAGE" domainObjectName="KafkaTemporaryStorage"--> 108 +<!-- <table tableName="T_BIZ_UPLOAD_RECORD" domainObjectName="UploadRecord"-->
161 <!-- enableCountByExample="true" enableUpdateByExample="true"--> 109 <!-- enableCountByExample="true" enableUpdateByExample="true"-->
162 <!-- enableDeleteByExample="true" enableSelectByExample="true"--> 110 <!-- enableDeleteByExample="true" enableSelectByExample="true"-->
163 <!-- selectByExampleQueryId="true">--> 111 <!-- selectByExampleQueryId="true">-->
164 -<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_KAFKA_TEMPORARY_STORAGE.NEXTVAL FROM DUAL" />--> 112 +<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_UPLOAD_RECORD.NEXTVAL FROM DUAL" />-->
165 <!-- </table>--> 113 <!-- </table>-->
166 -<!-- <table schema="ICLEARIMP" tableName="T_SYS_PARAM_CONFIG" domainObjectName="ParamConfig"--> 114 +<!-- <table schema="ICLEARIMP" tableName="T_BIZ_CE_INFO" domainObjectName="CeInfo"-->
167 <!-- enableCountByExample="true" enableUpdateByExample="true"--> 115 <!-- enableCountByExample="true" enableUpdateByExample="true"-->
168 <!-- enableDeleteByExample="true" enableSelectByExample="true"--> 116 <!-- enableDeleteByExample="true" enableSelectByExample="true"-->
169 <!-- selectByExampleQueryId="true">--> 117 <!-- selectByExampleQueryId="true">-->
170 -<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_PARAM_CONFIG.NEXTVAL FROM DUAL" />--> 118 +<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_CE_INFO.NEXTVAL FROM DUAL" />-->
171 <!-- </table>--> 119 <!-- </table>-->
172 -<!-- <table tableName="T_SYS_PRIVILEGE" domainObjectName="Privilege"--> 120 +<!-- <table tableName="T_BIZ_CONSIGNMENT" domainObjectName="Consignment"-->
173 <!-- enableCountByExample="true" enableUpdateByExample="true"--> 121 <!-- enableCountByExample="true" enableUpdateByExample="true"-->
174 <!-- enableDeleteByExample="true" enableSelectByExample="true"--> 122 <!-- enableDeleteByExample="true" enableSelectByExample="true"-->
175 <!-- selectByExampleQueryId="true">--> 123 <!-- selectByExampleQueryId="true">-->
176 -<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_PRIVILEGE.NEXTVAL FROM DUAL" />--> 124 +<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_CONSIGNMENT.NEXTVAL FROM DUAL" />-->
177 <!-- </table>--> 125 <!-- </table>-->
178 -<!-- <table tableName="T_SYS_ROLE" domainObjectName="Role"--> 126 +<!-- <table tableName="T_BIZ_EMAIL" domainObjectName="Email"-->
179 <!-- enableCountByExample="true" enableUpdateByExample="true"--> 127 <!-- enableCountByExample="true" enableUpdateByExample="true"-->
180 <!-- enableDeleteByExample="true" enableSelectByExample="true"--> 128 <!-- enableDeleteByExample="true" enableSelectByExample="true"-->
181 <!-- selectByExampleQueryId="true">--> 129 <!-- selectByExampleQueryId="true">-->
182 -<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_ROLE.NEXTVAL FROM DUAL" />--> 130 +<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_EMAIL.NEXTVAL FROM DUAL" />-->
183 <!-- </table>--> 131 <!-- </table>-->
184 -<!-- <table tableName="T_SYS_ROLE_PRIVILEGE" domainObjectName="RolePrivilege"--> 132 +<!-- <table tableName="T_BIZ_PUSH_OB" domainObjectName="PushOb"-->
185 <!-- enableCountByExample="true" enableUpdateByExample="true"--> 133 <!-- enableCountByExample="true" enableUpdateByExample="true"-->
186 <!-- enableDeleteByExample="true" enableSelectByExample="true"--> 134 <!-- enableDeleteByExample="true" enableSelectByExample="true"-->
187 <!-- selectByExampleQueryId="true">--> 135 <!-- selectByExampleQueryId="true">-->
188 -<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_ROLE_PRIVILEGE.NEXTVAL FROM DUAL" />--> 136 +<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_PUSH_OB.NEXTVAL FROM DUAL" />-->
189 <!-- </table>--> 137 <!-- </table>-->
190 -<!-- <table schema="ICLEARIMP" tableName="T_SYS_USER" domainObjectName="User"--> 138 +<!-- <table tableName="T_BIZ_PUSH_OB_DETAIL" domainObjectName="PushObDetail"-->
191 <!-- enableCountByExample="true" enableUpdateByExample="true"--> 139 <!-- enableCountByExample="true" enableUpdateByExample="true"-->
192 <!-- enableDeleteByExample="true" enableSelectByExample="true"--> 140 <!-- enableDeleteByExample="true" enableSelectByExample="true"-->
193 <!-- selectByExampleQueryId="true">--> 141 <!-- selectByExampleQueryId="true">-->
194 -<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_USER.NEXTVAL FROM DUAL" />--> 142 +<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BIZ_PUSH_OB_DETAIL.NEXTVAL FROM DUAL" />-->
195 <!-- </table>--> 143 <!-- </table>-->
196 -<!-- <table schema="ICLEARIMP" tableName="T_SYS_USER_ROLE" domainObjectName="UserRole"--> 144 +
145 +
146 +
147 +<!-- <table tableName="T_BI_PORTCLEAR_EMAIL_MAPPING" domainObjectName="PortclearEmailMapping"-->
197 <!-- enableCountByExample="true" enableUpdateByExample="true"--> 148 <!-- enableCountByExample="true" enableUpdateByExample="true"-->
198 <!-- enableDeleteByExample="true" enableSelectByExample="true"--> 149 <!-- enableDeleteByExample="true" enableSelectByExample="true"-->
199 <!-- selectByExampleQueryId="true">--> 150 <!-- selectByExampleQueryId="true">-->
200 -<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_USER_ROLE.NEXTVAL FROM DUAL" />--> 151 +<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_BI_PORTCLEAR_EMAIL_MAPPING.NEXTVAL FROM DUAL" />-->
201 <!-- </table>--> 152 <!-- </table>-->
202 153
154 + <table tableName="T_SYS_REDIS_SLAB" domainObjectName="redisSlab"
155 + enableCountByExample="true" enableUpdateByExample="true"
156 + enableDeleteByExample="true" enableSelectByExample="true"
157 + selectByExampleQueryId="true">
158 + <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_REDIS_SLAB.NEXTVAL FROM DUAL" />
159 + </table>
160 + <table schema="ICLEARIMP" tableName="T_SYS_KAFKA_STORAGE_HISTORY" domainObjectName="KafkaStorageHistory"
161 + enableCountByExample="true" enableUpdateByExample="true"
162 + enableDeleteByExample="true" enableSelectByExample="true"
163 + selectByExampleQueryId="true">
164 + <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_KAFKA_STORAGE_HISTORY.NEXTVAL FROM DUAL" />
165 + </table>
166 + <table schema="ICLEARIMP" tableName="T_SYS_KAFKA_TEMPORARY_STORAGE" domainObjectName="KafkaTemporaryStorage"
167 + enableCountByExample="true" enableUpdateByExample="true"
168 + enableDeleteByExample="true" enableSelectByExample="true"
169 + selectByExampleQueryId="true">
170 + <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_KAFKA_TEMPORARY_STORAGE.NEXTVAL FROM DUAL" />
171 + </table>
172 + <table schema="ICLEARIMP" tableName="T_SYS_PARAM_CONFIG" domainObjectName="ParamConfig"
173 + enableCountByExample="true" enableUpdateByExample="true"
174 + enableDeleteByExample="true" enableSelectByExample="true"
175 + selectByExampleQueryId="true">
176 + <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_PARAM_CONFIG.NEXTVAL FROM DUAL" />
177 + </table>
178 + <table tableName="T_SYS_PRIVILEGE" domainObjectName="Privilege"
179 + enableCountByExample="true" enableUpdateByExample="true"
180 + enableDeleteByExample="true" enableSelectByExample="true"
181 + selectByExampleQueryId="true">
182 + <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_PRIVILEGE.NEXTVAL FROM DUAL" />
183 + </table>
184 + <table tableName="T_SYS_ROLE" domainObjectName="Role"
185 + enableCountByExample="true" enableUpdateByExample="true"
186 + enableDeleteByExample="true" enableSelectByExample="true"
187 + selectByExampleQueryId="true">
188 + <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_ROLE.NEXTVAL FROM DUAL" />
189 + </table>
190 + <table tableName="T_SYS_ROLE_PRIVILEGE" domainObjectName="RolePrivilege"
191 + enableCountByExample="true" enableUpdateByExample="true"
192 + enableDeleteByExample="true" enableSelectByExample="true"
193 + selectByExampleQueryId="true">
194 + <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_ROLE_PRIVILEGE.NEXTVAL FROM DUAL" />
195 + </table>
196 + <table schema="ICLEARIMP" tableName="T_SYS_USER" domainObjectName="User"
197 + enableCountByExample="true" enableUpdateByExample="true"
198 + enableDeleteByExample="true" enableSelectByExample="true"
199 + selectByExampleQueryId="true">
200 + <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_USER.NEXTVAL FROM DUAL" />
201 + </table>
202 + <table schema="ICLEARIMP" tableName="T_SYS_USER_ROLE" domainObjectName="UserRole"
203 + enableCountByExample="true" enableUpdateByExample="true"
204 + enableDeleteByExample="true" enableSelectByExample="true"
205 + selectByExampleQueryId="true">
206 + <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_USER_ROLE.NEXTVAL FROM DUAL" />
207 + </table>
208 +
203 209
204 <!-- <table tableName="T_BI_DICTIONARY_ENTRIES" domainObjectName="DictionaryEntries"--> 210 <!-- <table tableName="T_BI_DICTIONARY_ENTRIES" domainObjectName="DictionaryEntries"-->
205 <!-- enableCountByExample="true" enableUpdateByExample="true"--> 211 <!-- enableCountByExample="true" enableUpdateByExample="true"-->
......