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
29c90d60
Commit
29c90d60
authored
Jun 05, 2018
by
neo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[BUGFIX] regen Project entity and add servielog dependence for app-overview
parent
45706e9e
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
19 additions
and
18 deletions
+19
-18
generatorConfig.xml
atms-api/etc/generator/generatorConfig.xml
+1
-0
ProjectController.java
...n/java/pwc/taxtech/atms/controller/ProjectController.java
+1
-1
Project.java
atms-api/src/main/java/pwc/taxtech/atms/entitiy/Project.java
+3
-3
ProjectExample.java
...rc/main/java/pwc/taxtech/atms/entitiy/ProjectExample.java
+10
-10
app-overview.ctrl.js
...in/webapp/app/framework/app-overview/app-overview.ctrl.js
+2
-2
framework.js
atms-web/src/main/webapp/bundles/framework.js
+2
-2
No files found.
atms-api/etc/generator/generatorConfig.xml
View file @
29c90d60
...
...
@@ -398,6 +398,7 @@
<table
tableName=
"Project"
domainObjectName=
"Project"
>
<property
name=
"useActualColumnNames"
value=
"true"
/>
<property
name=
"ignoreQualifiersAtRuntime"
value=
"true"
/>
<columnOverride
column=
"IsActive"
javaType=
"Boolean"
/>
</table>
<table
tableName=
"ProjectServiceType"
domainObjectName=
"ProjectServiceType"
>
<property
name=
"useActualColumnNames"
value=
"true"
/>
...
...
atms-api/src/main/java/pwc/taxtech/atms/controller/ProjectController.java
View file @
29c90d60
...
...
@@ -69,7 +69,7 @@ public class ProjectController {
@ApiImplicitParam
(
name
=
"projectDto"
,
value
=
"projectDto"
,
required
=
true
,
dataType
=
"ProjectDisplayDto"
)
public
@ResponseBody
AddProjectResult
AddProject
(
@RequestBody
ProjectDisplayDto
projectDto
,
String
userName
)
{
if
(
userName
.
isEmpty
())
userName
=
"test"
;
//TODO: should use session username future(neo)
if
(
userName
==
null
||
userName
.
isEmpty
())
userName
=
"test"
;
//TODO: should use session username future(neo)
return
projectService
.
addProject
(
projectDto
,
userName
);
}
...
...
atms-api/src/main/java/pwc/taxtech/atms/entitiy/Project.java
View file @
29c90d60
...
...
@@ -63,7 +63,7 @@ public class Project implements Serializable {
*
* @mbg.generated
*/
private
Short
isActive
;
private
Boolean
isActive
;
/**
*
...
...
@@ -291,7 +291,7 @@ public class Project implements Serializable {
*
* @mbg.generated
*/
public
Short
getIsActive
()
{
public
Boolean
getIsActive
()
{
return
isActive
;
}
...
...
@@ -303,7 +303,7 @@ public class Project implements Serializable {
*
* @mbg.generated
*/
public
void
setIsActive
(
Short
isActive
)
{
public
void
setIsActive
(
Boolean
isActive
)
{
this
.
isActive
=
isActive
;
}
...
...
atms-api/src/main/java/pwc/taxtech/atms/entitiy/ProjectExample.java
View file @
29c90d60
...
...
@@ -545,52 +545,52 @@ public class ProjectExample {
return
(
Criteria
)
this
;
}
public
Criteria
andIsActiveEqualTo
(
Short
value
)
{
public
Criteria
andIsActiveEqualTo
(
Boolean
value
)
{
addCriterion
(
"IsActive ="
,
value
,
"isActive"
);
return
(
Criteria
)
this
;
}
public
Criteria
andIsActiveNotEqualTo
(
Short
value
)
{
public
Criteria
andIsActiveNotEqualTo
(
Boolean
value
)
{
addCriterion
(
"IsActive <>"
,
value
,
"isActive"
);
return
(
Criteria
)
this
;
}
public
Criteria
andIsActiveGreaterThan
(
Short
value
)
{
public
Criteria
andIsActiveGreaterThan
(
Boolean
value
)
{
addCriterion
(
"IsActive >"
,
value
,
"isActive"
);
return
(
Criteria
)
this
;
}
public
Criteria
andIsActiveGreaterThanOrEqualTo
(
Short
value
)
{
public
Criteria
andIsActiveGreaterThanOrEqualTo
(
Boolean
value
)
{
addCriterion
(
"IsActive >="
,
value
,
"isActive"
);
return
(
Criteria
)
this
;
}
public
Criteria
andIsActiveLessThan
(
Short
value
)
{
public
Criteria
andIsActiveLessThan
(
Boolean
value
)
{
addCriterion
(
"IsActive <"
,
value
,
"isActive"
);
return
(
Criteria
)
this
;
}
public
Criteria
andIsActiveLessThanOrEqualTo
(
Short
value
)
{
public
Criteria
andIsActiveLessThanOrEqualTo
(
Boolean
value
)
{
addCriterion
(
"IsActive <="
,
value
,
"isActive"
);
return
(
Criteria
)
this
;
}
public
Criteria
andIsActiveIn
(
List
<
Short
>
values
)
{
public
Criteria
andIsActiveIn
(
List
<
Boolean
>
values
)
{
addCriterion
(
"IsActive in"
,
values
,
"isActive"
);
return
(
Criteria
)
this
;
}
public
Criteria
andIsActiveNotIn
(
List
<
Short
>
values
)
{
public
Criteria
andIsActiveNotIn
(
List
<
Boolean
>
values
)
{
addCriterion
(
"IsActive not in"
,
values
,
"isActive"
);
return
(
Criteria
)
this
;
}
public
Criteria
andIsActiveBetween
(
Short
value1
,
Short
value2
)
{
public
Criteria
andIsActiveBetween
(
Boolean
value1
,
Boolean
value2
)
{
addCriterion
(
"IsActive between"
,
value1
,
value2
,
"isActive"
);
return
(
Criteria
)
this
;
}
public
Criteria
andIsActiveNotBetween
(
Short
value1
,
Short
value2
)
{
public
Criteria
andIsActiveNotBetween
(
Boolean
value1
,
Boolean
value2
)
{
addCriterion
(
"IsActive not between"
,
value1
,
value2
,
"isActive"
);
return
(
Criteria
)
this
;
}
...
...
atms-web/src/main/webapp/app/framework/app-overview/app-overview.ctrl.js
View file @
29c90d60
frameworkModule
.
controller
(
'appOverviewController'
,
[
'$rootScope'
,
'$scope'
,
'$timeout'
,
'$q'
,
'$log'
,
'$translate'
,
'$state'
,
'$interval'
,
'uiGridConstants'
,
'projectService'
,
'vatSessionService'
,
'orgService'
,
'serviceTypeService'
,
'userService'
,
'loginContext'
,
'enums'
,
'citSessionService'
,
'region'
,
'SweetAlert'
,
'productService'
,
'localStorageService'
,
'assetsManageSessionService'
,
'citSessionService'
,
'region'
,
'SweetAlert'
,
'productService'
,
'localStorageService'
,
'assetsManageSessionService'
,
'serviceLogService'
,
'ackUibModal'
,
'Upload'
,
'apiInterceptor'
,
function
(
$rootScope
,
$scope
,
$timeout
,
$q
,
$log
,
$translate
,
$state
,
$interval
,
uiGridConstants
,
projectService
,
vatSessionService
,
orgService
,
serviceTypeService
,
userService
,
loginContext
,
enums
,
citSessionService
,
region
,
SweetAlert
,
productService
,
localStorageService
,
assetsManageSessionService
,
ackUibModal
,
Upload
,
apiInterceptor
)
{
localStorageService
,
assetsManageSessionService
,
serviceLogService
,
ackUibModal
,
Upload
,
apiInterceptor
)
{
'use strict'
;
$log
.
debug
(
'appOverviewController.ctor()...'
);
var
uploadUrl
=
apiInterceptor
.
webApiHostUrl
+
'/product/NewFile'
;
...
...
atms-web/src/main/webapp/bundles/framework.js
View file @
29c90d60
...
...
@@ -926,11 +926,11 @@ frameworkModule.directive('appNav', ['$log',
]);
frameworkModule
.
controller
(
'appOverviewController'
,
[
'$rootScope'
,
'$scope'
,
'$timeout'
,
'$q'
,
'$log'
,
'$translate'
,
'$state'
,
'$interval'
,
'uiGridConstants'
,
'projectService'
,
'vatSessionService'
,
'orgService'
,
'serviceTypeService'
,
'userService'
,
'loginContext'
,
'enums'
,
'citSessionService'
,
'region'
,
'SweetAlert'
,
'productService'
,
'localStorageService'
,
'assetsManageSessionService'
,
'citSessionService'
,
'region'
,
'SweetAlert'
,
'productService'
,
'localStorageService'
,
'assetsManageSessionService'
,
'serviceLogService'
,
'ackUibModal'
,
'Upload'
,
'apiInterceptor'
,
function
(
$rootScope
,
$scope
,
$timeout
,
$q
,
$log
,
$translate
,
$state
,
$interval
,
uiGridConstants
,
projectService
,
vatSessionService
,
orgService
,
serviceTypeService
,
userService
,
loginContext
,
enums
,
citSessionService
,
region
,
SweetAlert
,
productService
,
localStorageService
,
assetsManageSessionService
,
ackUibModal
,
Upload
,
apiInterceptor
)
{
localStorageService
,
assetsManageSessionService
,
serviceLogService
,
ackUibModal
,
Upload
,
apiInterceptor
)
{
'use strict'
;
$log
.
debug
(
'appOverviewController.ctor()...'
);
var
uploadUrl
=
apiInterceptor
.
webApiHostUrl
+
'/product/NewFile'
;
...
...
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