Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
traffic-front
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangxiaoming
traffic-front
Commits
9c1febad
Commit
9c1febad
authored
Sep 14, 2018
by
neo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[dev] fixed some spell error
parent
8c1b4822
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
15 deletions
+15
-15
LdapAuthenticationProviderImpl.java
...taxtech/atms/security/LdapAuthenticationProviderImpl.java
+1
-1
FinanceDataImportServiceImpl.java
...h/atms/vat/service/impl/FinanceDataImportServiceImpl.java
+1
-1
ProjectMapper.java
...dao/src/main/java/pwc/taxtech/atms/dao/ProjectMapper.java
+1
-1
UserDto.java
atms-dao/src/main/java/pwc/taxtech/atms/dpo/UserDto.java
+9
-9
Template.java
atms-gen/src/main/java/pwc/taxtech/atms/entity/Template.java
+3
-3
No files found.
atms-api/src/main/java/pwc/taxtech/atms/security/LdapAuthenticationProviderImpl.java
View file @
9c1febad
...
...
@@ -99,7 +99,7 @@ public class LdapAuthenticationProviderImpl implements LdapAuthenticationProvide
// set the initializing information of the context
env
.
put
(
javax
.
naming
.
Context
.
INITIAL_CONTEXT_FACTORY
,
initialContextFactory
);
// set the URL of ldap server
env
.
put
(
javax
.
naming
.
Context
.
PROVI
d
ER_URL
,
ad4ProviderURL
);
env
.
put
(
javax
.
naming
.
Context
.
PROVI
D
ER_URL
,
ad4ProviderURL
);
// set the authentication mode
env
.
put
(
javax
.
naming
.
Context
.
SECURITY_AUTHENTICATION
,
securityAuthentication
);
// set user of AD
...
...
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/FinanceDataImportServiceImpl.java
View file @
9c1febad
...
...
@@ -293,7 +293,7 @@ public class FinanceDataImportServiceImpl {
dto
.
getCustomerCode
().
isEmpty
()).
collect
(
Collectors
.
toList
());
parentVouchers
.
forEach
(
m
->
{
List
<
VoucherBalanceDto
>
children
=
parentVouchers
.
stream
().
filter
(
dto
->
m
.
get
vId
().
equals
(
dto
.
getvI
d
())
List
<
VoucherBalanceDto
>
children
=
parentVouchers
.
stream
().
filter
(
dto
->
m
.
get
Vid
().
equals
(
dto
.
getVi
d
())
&&
m
.
getPeriod
().
intValue
()
==
dto
.
getPeriod
().
intValue
()
&&
m
.
getGroup
().
equals
(
dto
.
getGroup
())
&&
dto
.
getCustomerCode
()
!=
null
&&
!
dto
.
getCustomerCode
().
isEmpty
()).
collect
(
Collectors
.
toList
());
...
...
atms-dao/src/main/java/pwc/taxtech/atms/dao/ProjectMapper.java
View file @
9c1febad
...
...
@@ -221,7 +221,7 @@ public interface ProjectMapper extends MyMapper {
" <if test=\"serviceID != null and serviceID !='' \">AND ostg.ServiceTypeID=#{serviceId}</if>"
+
"ORDER BY ea.EffectiveDate,org.Code"
+
"</script>"
)
List
<
ProjectDisplayDto
>
getProjectFromEnterpriseAccountSetOrg
(
@Param
(
"orgId"
)
String
orgId
,
@Param
(
"serviceId"
)
St
ing
serviceId
);
List
<
ProjectDisplayDto
>
getProjectFromEnterpriseAccountSetOrg
(
@Param
(
"orgId"
)
String
orgId
,
@Param
(
"serviceId"
)
St
r
ing
serviceId
);
@Select
(
"SELECT "
+
" PeriodId,Status "
+
...
...
atms-dao/src/main/java/pwc/taxtech/atms/dpo/UserDto.java
View file @
9c1febad
...
...
@@ -17,7 +17,7 @@ public class UserDto {
private
Date
passwordUpdateTime
;
private
Integer
attemptTimes
;
private
Date
lockedTime
;
private
String
organizationI
D
;
private
String
organizationI
d
;
private
String
organizationName
;
private
Boolean
isSuperAdmin
;
...
...
@@ -125,12 +125,12 @@ public class UserDto {
this
.
lockedTime
=
lockedTime
;
}
public
String
getOrganizationI
D
()
{
return
organizationI
D
;
public
String
getOrganizationI
d
()
{
return
organizationI
d
;
}
public
void
setOrganizationI
D
(
String
organizationID
)
{
this
.
organizationI
D
=
organizationID
;
public
void
setOrganizationI
d
(
String
organizationId
)
{
this
.
organizationI
d
=
organizationId
;
}
public
String
getOrganizationName
()
{
...
...
@@ -162,7 +162,7 @@ public class UserDto {
result
=
prime
*
result
+
((
isSuperAdmin
==
null
)
?
0
:
isSuperAdmin
.
hashCode
());
result
=
prime
*
result
+
((
lockedTime
==
null
)
?
0
:
lockedTime
.
hashCode
());
result
=
prime
*
result
+
((
loginType
==
null
)
?
0
:
loginType
.
hashCode
());
result
=
prime
*
result
+
((
organizationI
D
==
null
)
?
0
:
organizationID
.
hashCode
());
result
=
prime
*
result
+
((
organizationI
d
==
null
)
?
0
:
organizationId
.
hashCode
());
result
=
prime
*
result
+
((
organizationName
==
null
)
?
0
:
organizationName
.
hashCode
());
result
=
prime
*
result
+
((
password
==
null
)
?
0
:
password
.
hashCode
());
result
=
prime
*
result
+
((
passwordUpdateTime
==
null
)
?
0
:
passwordUpdateTime
.
hashCode
());
...
...
@@ -226,10 +226,10 @@ public class UserDto {
return
false
;
}
else
if
(!
loginType
.
equals
(
other
.
loginType
))
return
false
;
if
(
organizationI
D
==
null
)
{
if
(
other
.
organizationI
D
!=
null
)
if
(
organizationI
d
==
null
)
{
if
(
other
.
organizationI
d
!=
null
)
return
false
;
}
else
if
(!
organizationI
D
.
equals
(
other
.
organizationID
))
}
else
if
(!
organizationI
d
.
equals
(
other
.
organizationId
))
return
false
;
if
(
organizationName
==
null
)
{
if
(
other
.
organizationName
!=
null
)
...
...
atms-gen/src/main/java/pwc/taxtech/atms/entity/Template.java
View file @
9c1febad
...
...
@@ -25,7 +25,7 @@ public class Template {
private
Date
createTime
;
private
Date
updateTime
;
private
Boolean
isSystemType
;
private
Integer
isActiveAssociation
;
private
Boolean
isActiveAssociation
;
private
String
parentId
;
private
String
createBy
;
private
String
updateBy
;
...
...
@@ -140,11 +140,11 @@ public class Template {
@Basic
@Column
(
name
=
"IS_ACTIVE_ASSOCIATION"
,
nullable
=
false
)
@ColumnDefault
(
DEF_DEFAULT_NUMBER
)
public
Integer
getIsActiveAssociation
()
{
public
Boolean
getIsActiveAssociation
()
{
return
isActiveAssociation
;
}
public
void
setIsActiveAssociation
(
Integer
isActiveAssociation
)
{
public
void
setIsActiveAssociation
(
Boolean
isActiveAssociation
)
{
this
.
isActiveAssociation
=
isActiveAssociation
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment