Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Fedex
/
iClear-Connect-Pre-Clearance
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
zelong.shao
2024-11-01 14:38:57 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
270519c02c207546c720767e3a1b5951869a6cc2
270519c0
1 parent
ced956b9
dao|表字段调整
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
66 additions
and
66 deletions
server/common-dao/src/main/java/com/fedex/connect/common/mapper/sys/UserMapper.xml
server/common-dao/src/main/java/com/fedex/connect/common/model/sys/User.java
server/common-dao/src/main/java/com/fedex/connect/common/model/sys/UserExample.java
server/common-dao/src/main/resources/generatorConfig.xml
server/common-dao/src/main/java/com/fedex/connect/common/mapper/sys/UserMapper.xml
View file @
270519c
...
...
@@ -9,7 +9,7 @@
<result
column=
"USER_UUID"
jdbcType=
"VARCHAR"
property=
"userUuid"
/>
<result
column=
"EMAIL"
jdbcType=
"VARCHAR"
property=
"email"
/>
<result
column=
"PHONE"
jdbcType=
"VARCHAR"
property=
"phone"
/>
<result
column=
"COMPAN
NY_NAME"
jdbcType=
"VARCHAR"
property=
"compan
nyName"
/>
<result
column=
"COMPAN
Y_NAME"
jdbcType=
"VARCHAR"
property=
"compa
nyName"
/>
<result
column=
"ACCOUNT_NO"
jdbcType=
"VARCHAR"
property=
"accountNo"
/>
<result
column=
"UNIFIED_BUSINESS_NUM"
jdbcType=
"VARCHAR"
property=
"unifiedBusinessNum"
/>
<result
column=
"CUSTOMS_SERIAL_NUM"
jdbcType=
"VARCHAR"
property=
"customsSerialNum"
/>
...
...
@@ -83,7 +83,7 @@
</where>
</sql>
<sql
id=
"Base_Column_List"
>
ID, LOGIN_NAME, USER_NAME, PASSWORD, USER_UUID, EMAIL, PHONE, COMPAN
N
Y_NAME, ACCOUNT_NO,
ID, LOGIN_NAME, USER_NAME, PASSWORD, USER_UUID, EMAIL, PHONE, COMPANY_NAME, ACCOUNT_NO,
UNIFIED_BUSINESS_NUM, CUSTOMS_SERIAL_NUM, TYPE_ID, TYPE_NAME, STATUS, REMARK, CREATE_TIME,
CREATE_USER_ID, CREATE_USER_NAME, MODIFY_TIME, MODIFY_USER_ID, MODIFY_USER_NAME
</sql>
...
...
@@ -126,7 +126,7 @@
</selectKey>
insert into ICLEARIMP.T_SYS_USER (ID, LOGIN_NAME, USER_NAME,
PASSWORD, USER_UUID, EMAIL,
PHONE, COMPAN
N
Y_NAME, ACCOUNT_NO,
PHONE, COMPANY_NAME, ACCOUNT_NO,
UNIFIED_BUSINESS_NUM, CUSTOMS_SERIAL_NUM, TYPE_ID,
TYPE_NAME, STATUS, REMARK,
CREATE_TIME, CREATE_USER_ID, CREATE_USER_NAME,
...
...
@@ -134,7 +134,7 @@
)
values (#{id,jdbcType=NUMERIC}, #{loginName,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR},
#{password,jdbcType=VARCHAR}, #{userUuid,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR},
#{phone,jdbcType=VARCHAR}, #{compan
n
yName,jdbcType=VARCHAR}, #{accountNo,jdbcType=VARCHAR},
#{phone,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, #{accountNo,jdbcType=VARCHAR},
#{unifiedBusinessNum,jdbcType=VARCHAR}, #{customsSerialNum,jdbcType=VARCHAR}, #{typeId,jdbcType=NUMERIC},
#{typeName,jdbcType=VARCHAR}, #{status,jdbcType=NUMERIC}, #{remark,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=NUMERIC}, #{createUserName,jdbcType=VARCHAR},
...
...
@@ -166,8 +166,8 @@
<if
test=
"phone != null"
>
PHONE,
</if>
<if
test=
"compan
n
yName != null"
>
COMPAN
N
Y_NAME,
<if
test=
"companyName != null"
>
COMPANY_NAME,
</if>
<if
test=
"accountNo != null"
>
ACCOUNT_NO,
...
...
@@ -229,8 +229,8 @@
<if
test=
"phone != null"
>
#{phone,jdbcType=VARCHAR},
</if>
<if
test=
"compan
n
yName != null"
>
#{compan
n
yName,jdbcType=VARCHAR},
<if
test=
"companyName != null"
>
#{companyName,jdbcType=VARCHAR},
</if>
<if
test=
"accountNo != null"
>
#{accountNo,jdbcType=VARCHAR},
...
...
@@ -303,8 +303,8 @@
<if
test=
"record.phone != null"
>
PHONE = #{record.phone,jdbcType=VARCHAR},
</if>
<if
test=
"record.compan
n
yName != null"
>
COMPAN
NY_NAME = #{record.compan
nyName,jdbcType=VARCHAR},
<if
test=
"record.companyName != null"
>
COMPAN
Y_NAME = #{record.compa
nyName,jdbcType=VARCHAR},
</if>
<if
test=
"record.accountNo != null"
>
ACCOUNT_NO = #{record.accountNo,jdbcType=VARCHAR},
...
...
@@ -359,7 +359,7 @@
USER_UUID = #{record.userUuid,jdbcType=VARCHAR},
EMAIL = #{record.email,jdbcType=VARCHAR},
PHONE = #{record.phone,jdbcType=VARCHAR},
COMPAN
NY_NAME = #{record.compan
nyName,jdbcType=VARCHAR},
COMPAN
Y_NAME = #{record.compa
nyName,jdbcType=VARCHAR},
ACCOUNT_NO = #{record.accountNo,jdbcType=VARCHAR},
UNIFIED_BUSINESS_NUM = #{record.unifiedBusinessNum,jdbcType=VARCHAR},
CUSTOMS_SERIAL_NUM = #{record.customsSerialNum,jdbcType=VARCHAR},
...
...
@@ -398,8 +398,8 @@
<if
test=
"phone != null"
>
PHONE = #{phone,jdbcType=VARCHAR},
</if>
<if
test=
"compan
n
yName != null"
>
COMPAN
NY_NAME = #{compan
nyName,jdbcType=VARCHAR},
<if
test=
"companyName != null"
>
COMPAN
Y_NAME = #{compa
nyName,jdbcType=VARCHAR},
</if>
<if
test=
"accountNo != null"
>
ACCOUNT_NO = #{accountNo,jdbcType=VARCHAR},
...
...
@@ -451,7 +451,7 @@
USER_UUID = #{userUuid,jdbcType=VARCHAR},
EMAIL = #{email,jdbcType=VARCHAR},
PHONE = #{phone,jdbcType=VARCHAR},
COMPAN
NY_NAME = #{compan
nyName,jdbcType=VARCHAR},
COMPAN
Y_NAME = #{compa
nyName,jdbcType=VARCHAR},
ACCOUNT_NO = #{accountNo,jdbcType=VARCHAR},
UNIFIED_BUSINESS_NUM = #{unifiedBusinessNum,jdbcType=VARCHAR},
CUSTOMS_SERIAL_NUM = #{customsSerialNum,jdbcType=VARCHAR},
...
...
server/common-dao/src/main/java/com/fedex/connect/common/model/sys/User.java
View file @
270519c
...
...
@@ -46,7 +46,7 @@ public class User implements Serializable {
/**
* 公司名称
*/
private
String
compan
n
yName
;
private
String
companyName
;
/**
* 计费账号
...
...
@@ -172,12 +172,12 @@ public class User implements Serializable {
this
.
phone
=
phone
==
null
?
null
:
phone
.
trim
();
}
public
String
getCompan
n
yName
()
{
return
compan
n
yName
;
public
String
getCompanyName
()
{
return
companyName
;
}
public
void
setCompan
nyName
(
String
compan
nyName
)
{
this
.
compan
nyName
=
compannyName
==
null
?
null
:
compan
nyName
.
trim
();
public
void
setCompan
yName
(
String
compa
nyName
)
{
this
.
compan
yName
=
companyName
==
null
?
null
:
compa
nyName
.
trim
();
}
public
String
getAccountNo
()
{
...
...
@@ -297,7 +297,7 @@ public class User implements Serializable {
sb
.
append
(
", userUuid="
).
append
(
userUuid
);
sb
.
append
(
", email="
).
append
(
email
);
sb
.
append
(
", phone="
).
append
(
phone
);
sb
.
append
(
", compan
nyName="
).
append
(
compan
nyName
);
sb
.
append
(
", compan
yName="
).
append
(
compa
nyName
);
sb
.
append
(
", accountNo="
).
append
(
accountNo
);
sb
.
append
(
", unifiedBusinessNum="
).
append
(
unifiedBusinessNum
);
sb
.
append
(
", customsSerialNum="
).
append
(
customsSerialNum
);
...
...
server/common-dao/src/main/java/com/fedex/connect/common/model/sys/UserExample.java
View file @
270519c
...
...
@@ -605,73 +605,73 @@ public class UserExample {
return
(
Criteria
)
this
;
}
public
Criteria
andCompan
n
yNameIsNull
()
{
addCriterion
(
"COMPAN
N
Y_NAME is null"
);
public
Criteria
andCompanyNameIsNull
()
{
addCriterion
(
"COMPANY_NAME is null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andCompan
n
yNameIsNotNull
()
{
addCriterion
(
"COMPAN
N
Y_NAME is not null"
);
public
Criteria
andCompanyNameIsNotNull
()
{
addCriterion
(
"COMPANY_NAME is not null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andCompan
n
yNameEqualTo
(
String
value
)
{
addCriterion
(
"COMPAN
NY_NAME ="
,
value
,
"compan
nyName"
);
public
Criteria
andCompanyNameEqualTo
(
String
value
)
{
addCriterion
(
"COMPAN
Y_NAME ="
,
value
,
"compa
nyName"
);
return
(
Criteria
)
this
;
}
public
Criteria
andCompan
n
yNameNotEqualTo
(
String
value
)
{
addCriterion
(
"COMPAN
NY_NAME <>"
,
value
,
"compan
nyName"
);
public
Criteria
andCompanyNameNotEqualTo
(
String
value
)
{
addCriterion
(
"COMPAN
Y_NAME <>"
,
value
,
"compa
nyName"
);
return
(
Criteria
)
this
;
}
public
Criteria
andCompan
n
yNameGreaterThan
(
String
value
)
{
addCriterion
(
"COMPAN
NY_NAME >"
,
value
,
"compan
nyName"
);
public
Criteria
andCompanyNameGreaterThan
(
String
value
)
{
addCriterion
(
"COMPAN
Y_NAME >"
,
value
,
"compa
nyName"
);
return
(
Criteria
)
this
;
}
public
Criteria
andCompan
n
yNameGreaterThanOrEqualTo
(
String
value
)
{
addCriterion
(
"COMPAN
NY_NAME >="
,
value
,
"compan
nyName"
);
public
Criteria
andCompanyNameGreaterThanOrEqualTo
(
String
value
)
{
addCriterion
(
"COMPAN
Y_NAME >="
,
value
,
"compa
nyName"
);
return
(
Criteria
)
this
;
}
public
Criteria
andCompan
n
yNameLessThan
(
String
value
)
{
addCriterion
(
"COMPAN
NY_NAME <"
,
value
,
"compan
nyName"
);
public
Criteria
andCompanyNameLessThan
(
String
value
)
{
addCriterion
(
"COMPAN
Y_NAME <"
,
value
,
"compa
nyName"
);
return
(
Criteria
)
this
;
}
public
Criteria
andCompan
n
yNameLessThanOrEqualTo
(
String
value
)
{
addCriterion
(
"COMPAN
NY_NAME <="
,
value
,
"compan
nyName"
);
public
Criteria
andCompanyNameLessThanOrEqualTo
(
String
value
)
{
addCriterion
(
"COMPAN
Y_NAME <="
,
value
,
"compa
nyName"
);
return
(
Criteria
)
this
;
}
public
Criteria
andCompan
n
yNameLike
(
String
value
)
{
addCriterion
(
"COMPAN
NY_NAME like"
,
value
,
"compan
nyName"
);
public
Criteria
andCompanyNameLike
(
String
value
)
{
addCriterion
(
"COMPAN
Y_NAME like"
,
value
,
"compa
nyName"
);
return
(
Criteria
)
this
;
}
public
Criteria
andCompan
n
yNameNotLike
(
String
value
)
{
addCriterion
(
"COMPAN
NY_NAME not like"
,
value
,
"compan
nyName"
);
public
Criteria
andCompanyNameNotLike
(
String
value
)
{
addCriterion
(
"COMPAN
Y_NAME not like"
,
value
,
"compa
nyName"
);
return
(
Criteria
)
this
;
}
public
Criteria
andCompan
n
yNameIn
(
List
<
String
>
values
)
{
addCriterion
(
"COMPAN
NY_NAME in"
,
values
,
"compan
nyName"
);
public
Criteria
andCompanyNameIn
(
List
<
String
>
values
)
{
addCriterion
(
"COMPAN
Y_NAME in"
,
values
,
"compa
nyName"
);
return
(
Criteria
)
this
;
}
public
Criteria
andCompan
n
yNameNotIn
(
List
<
String
>
values
)
{
addCriterion
(
"COMPAN
NY_NAME not in"
,
values
,
"compan
nyName"
);
public
Criteria
andCompanyNameNotIn
(
List
<
String
>
values
)
{
addCriterion
(
"COMPAN
Y_NAME not in"
,
values
,
"compa
nyName"
);
return
(
Criteria
)
this
;
}
public
Criteria
andCompan
n
yNameBetween
(
String
value1
,
String
value2
)
{
addCriterion
(
"COMPAN
NY_NAME between"
,
value1
,
value2
,
"compan
nyName"
);
public
Criteria
andCompanyNameBetween
(
String
value1
,
String
value2
)
{
addCriterion
(
"COMPAN
Y_NAME between"
,
value1
,
value2
,
"compa
nyName"
);
return
(
Criteria
)
this
;
}
public
Criteria
andCompan
n
yNameNotBetween
(
String
value1
,
String
value2
)
{
addCriterion
(
"COMPAN
NY_NAME not between"
,
value1
,
value2
,
"compan
nyName"
);
public
Criteria
andCompanyNameNotBetween
(
String
value1
,
String
value2
)
{
addCriterion
(
"COMPAN
Y_NAME not between"
,
value1
,
value2
,
"compa
nyName"
);
return
(
Criteria
)
this
;
}
...
...
server/common-dao/src/main/resources/generatorConfig.xml
View file @
270519c
...
...
@@ -137,24 +137,24 @@
<!-- selectByExampleQueryId="true">-->
<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_REDIS_SLAB.NEXTVAL FROM DUAL" />-->
<!-- </table>-->
<table
schema=
"ICLEARIMP"
tableName=
"T_SYS_KAFKA_STORAGE_HISTORY"
domainObjectName=
"KafkaStorageHistory"
enableCountByExample=
"true"
enableUpdateByExample=
"true"
enableDeleteByExample=
"true"
enableSelectByExample=
"true"
selectByExampleQueryId=
"true"
>
<generatedKey
column=
"ID"
sqlStatement=
"SELECT SEQ_T_SYS_KAFKA_STORAGE_HISTORY.NEXTVAL FROM DUAL"
/
>
</table
>
<!-- <table schema="ICLEARIMP" tableName="T_SYS_KAFKA_STORAGE_HISTORY" domainObjectName="KafkaStorageHistory"-->
<!-- enableCountByExample="true" enableUpdateByExample="true"-->
<!-- enableDeleteByExample="true" enableSelectByExample="true"-->
<!-- selectByExampleQueryId="true">--
>
<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_KAFKA_STORAGE_HISTORY.NEXTVAL FROM DUAL" />--
>
<!-- </table>--
>
<!-- <table tableName="T_SYS_KAFKA_TEMPORARY_STORAGE" domainObjectName="KafkaTemporaryStorage"-->
<!-- enableCountByExample="true" enableUpdateByExample="true"-->
<!-- enableDeleteByExample="true" enableSelectByExample="true"-->
<!-- selectByExampleQueryId="true">-->
<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_KAFKA_TEMPORARY_STORAGE.NEXTVAL FROM DUAL" />-->
<!-- </table>-->
<table
schema=
"ICLEARIMP"
tableName=
"T_SYS_PARAM_CONFIG"
domainObjectName=
"ParamConfig"
enableCountByExample=
"true"
enableUpdateByExample=
"true"
enableDeleteByExample=
"true"
enableSelectByExample=
"true"
selectByExampleQueryId=
"true"
>
<generatedKey
column=
"ID"
sqlStatement=
"SELECT SEQ_T_SYS_PARAM_CONFIG.NEXTVAL FROM DUAL"
/
>
</table
>
<!-- <table schema="ICLEARIMP" tableName="T_SYS_PARAM_CONFIG" domainObjectName="ParamConfig"-->
<!-- enableCountByExample="true" enableUpdateByExample="true"-->
<!-- enableDeleteByExample="true" enableSelectByExample="true"-->
<!-- selectByExampleQueryId="true">--
>
<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_PARAM_CONFIG.NEXTVAL FROM DUAL" />--
>
<!-- </table>--
>
<!-- <table tableName="T_SYS_PRIVILEGE" domainObjectName="Privilege"-->
<!-- enableCountByExample="true" enableUpdateByExample="true"-->
<!-- enableDeleteByExample="true" enableSelectByExample="true"-->
...
...
@@ -179,12 +179,12 @@
selectByExampleQueryId=
"true"
>
<generatedKey
column=
"ID"
sqlStatement=
"SELECT SEQ_T_SYS_USER.NEXTVAL FROM DUAL"
/>
</table>
<table
schema=
"ICLEARIMP"
tableName=
"T_SYS_USER_ROLE"
domainObjectName=
"UserRole"
enableCountByExample=
"true"
enableUpdateByExample=
"true"
enableDeleteByExample=
"true"
enableSelectByExample=
"true"
selectByExampleQueryId=
"true"
>
<generatedKey
column=
"ID"
sqlStatement=
"SELECT SEQ_T_SYS_USER_ROLE.NEXTVAL FROM DUAL"
/
>
</table
>
<!-- <table schema="ICLEARIMP" tableName="T_SYS_USER_ROLE" domainObjectName="UserRole"-->
<!-- enableCountByExample="true" enableUpdateByExample="true"-->
<!-- enableDeleteByExample="true" enableSelectByExample="true"-->
<!-- selectByExampleQueryId="true">--
>
<!-- <generatedKey column="ID" sqlStatement="SELECT SEQ_T_SYS_USER_ROLE.NEXTVAL FROM DUAL" />--
>
<!-- </table>--
>
<!-- <table tableName="T_BI_DICTIONARY_ENTRIES" domainObjectName="DictionaryEntries"-->
...
...
Please
register
or
login
to post a comment