Commit 29c90d60 authored by neo's avatar neo

[BUGFIX] regen Project entity and add servielog dependence for app-overview

parent 45706e9e
...@@ -398,6 +398,7 @@ ...@@ -398,6 +398,7 @@
<table tableName="Project" domainObjectName="Project"> <table tableName="Project" domainObjectName="Project">
<property name="useActualColumnNames" value="true"/> <property name="useActualColumnNames" value="true"/>
<property name="ignoreQualifiersAtRuntime" value="true"/> <property name="ignoreQualifiersAtRuntime" value="true"/>
<columnOverride column="IsActive" javaType="Boolean"/>
</table> </table>
<table tableName="ProjectServiceType" domainObjectName="ProjectServiceType"> <table tableName="ProjectServiceType" domainObjectName="ProjectServiceType">
<property name="useActualColumnNames" value="true"/> <property name="useActualColumnNames" value="true"/>
......
...@@ -69,7 +69,7 @@ public class ProjectController { ...@@ -69,7 +69,7 @@ public class ProjectController {
@ApiImplicitParam(name = "projectDto", value = "projectDto", required = true, dataType = "ProjectDisplayDto") @ApiImplicitParam(name = "projectDto", value = "projectDto", required = true, dataType = "ProjectDisplayDto")
public @ResponseBody public @ResponseBody
AddProjectResult AddProject(@RequestBody ProjectDisplayDto projectDto,String userName) { 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); return projectService.addProject(projectDto, userName);
} }
......
...@@ -63,7 +63,7 @@ public class Project implements Serializable { ...@@ -63,7 +63,7 @@ public class Project implements Serializable {
* *
* @mbg.generated * @mbg.generated
*/ */
private Short isActive; private Boolean isActive;
/** /**
* *
...@@ -291,7 +291,7 @@ public class Project implements Serializable { ...@@ -291,7 +291,7 @@ public class Project implements Serializable {
* *
* @mbg.generated * @mbg.generated
*/ */
public Short getIsActive() { public Boolean getIsActive() {
return isActive; return isActive;
} }
...@@ -303,7 +303,7 @@ public class Project implements Serializable { ...@@ -303,7 +303,7 @@ public class Project implements Serializable {
* *
* @mbg.generated * @mbg.generated
*/ */
public void setIsActive(Short isActive) { public void setIsActive(Boolean isActive) {
this.isActive = isActive; this.isActive = isActive;
} }
......
...@@ -545,52 +545,52 @@ public class ProjectExample { ...@@ -545,52 +545,52 @@ public class ProjectExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsActiveEqualTo(Short value) { public Criteria andIsActiveEqualTo(Boolean value) {
addCriterion("IsActive =", value, "isActive"); addCriterion("IsActive =", value, "isActive");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsActiveNotEqualTo(Short value) { public Criteria andIsActiveNotEqualTo(Boolean value) {
addCriterion("IsActive <>", value, "isActive"); addCriterion("IsActive <>", value, "isActive");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsActiveGreaterThan(Short value) { public Criteria andIsActiveGreaterThan(Boolean value) {
addCriterion("IsActive >", value, "isActive"); addCriterion("IsActive >", value, "isActive");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsActiveGreaterThanOrEqualTo(Short value) { public Criteria andIsActiveGreaterThanOrEqualTo(Boolean value) {
addCriterion("IsActive >=", value, "isActive"); addCriterion("IsActive >=", value, "isActive");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsActiveLessThan(Short value) { public Criteria andIsActiveLessThan(Boolean value) {
addCriterion("IsActive <", value, "isActive"); addCriterion("IsActive <", value, "isActive");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsActiveLessThanOrEqualTo(Short value) { public Criteria andIsActiveLessThanOrEqualTo(Boolean value) {
addCriterion("IsActive <=", value, "isActive"); addCriterion("IsActive <=", value, "isActive");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsActiveIn(List<Short> values) { public Criteria andIsActiveIn(List<Boolean> values) {
addCriterion("IsActive in", values, "isActive"); addCriterion("IsActive in", values, "isActive");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsActiveNotIn(List<Short> values) { public Criteria andIsActiveNotIn(List<Boolean> values) {
addCriterion("IsActive not in", values, "isActive"); addCriterion("IsActive not in", values, "isActive");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsActiveBetween(Short value1, Short value2) { public Criteria andIsActiveBetween(Boolean value1, Boolean value2) {
addCriterion("IsActive between", value1, value2, "isActive"); addCriterion("IsActive between", value1, value2, "isActive");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsActiveNotBetween(Short value1, Short value2) { public Criteria andIsActiveNotBetween(Boolean value1, Boolean value2) {
addCriterion("IsActive not between", value1, value2, "isActive"); addCriterion("IsActive not between", value1, value2, "isActive");
return (Criteria) this; return (Criteria) this;
} }
......
frameworkModule.controller('appOverviewController', ['$rootScope', '$scope', '$timeout', '$q', '$log', '$translate', '$state', '$interval', frameworkModule.controller('appOverviewController', ['$rootScope', '$scope', '$timeout', '$q', '$log', '$translate', '$state', '$interval',
'uiGridConstants', 'projectService', 'vatSessionService', 'orgService', 'serviceTypeService', 'userService', 'loginContext', 'enums', 'uiGridConstants', 'projectService', 'vatSessionService', 'orgService', 'serviceTypeService', 'userService', 'loginContext', 'enums',
'citSessionService', 'region', 'SweetAlert', 'productService', 'localStorageService', 'assetsManageSessionService', 'citSessionService', 'region', 'SweetAlert', 'productService', 'localStorageService', 'assetsManageSessionService','serviceLogService',
'ackUibModal', 'Upload', 'apiInterceptor', 'ackUibModal', 'Upload', 'apiInterceptor',
function ($rootScope, $scope, $timeout, $q, $log, $translate, $state, $interval, uiGridConstants, projectService, vatSessionService, function ($rootScope, $scope, $timeout, $q, $log, $translate, $state, $interval, uiGridConstants, projectService, vatSessionService,
orgService, serviceTypeService, userService, loginContext, enums, citSessionService, region, SweetAlert, productService, orgService, serviceTypeService, userService, loginContext, enums, citSessionService, region, SweetAlert, productService,
localStorageService, assetsManageSessionService, ackUibModal, Upload, apiInterceptor) { localStorageService, assetsManageSessionService, serviceLogService, ackUibModal, Upload, apiInterceptor) {
'use strict'; 'use strict';
$log.debug('appOverviewController.ctor()...'); $log.debug('appOverviewController.ctor()...');
var uploadUrl = apiInterceptor.webApiHostUrl + '/product/NewFile'; var uploadUrl = apiInterceptor.webApiHostUrl + '/product/NewFile';
......
...@@ -926,11 +926,11 @@ frameworkModule.directive('appNav', ['$log', ...@@ -926,11 +926,11 @@ frameworkModule.directive('appNav', ['$log',
]); ]);
frameworkModule.controller('appOverviewController', ['$rootScope', '$scope', '$timeout', '$q', '$log', '$translate', '$state', '$interval', frameworkModule.controller('appOverviewController', ['$rootScope', '$scope', '$timeout', '$q', '$log', '$translate', '$state', '$interval',
'uiGridConstants', 'projectService', 'vatSessionService', 'orgService', 'serviceTypeService', 'userService', 'loginContext', 'enums', 'uiGridConstants', 'projectService', 'vatSessionService', 'orgService', 'serviceTypeService', 'userService', 'loginContext', 'enums',
'citSessionService', 'region', 'SweetAlert', 'productService', 'localStorageService', 'assetsManageSessionService', 'citSessionService', 'region', 'SweetAlert', 'productService', 'localStorageService', 'assetsManageSessionService','serviceLogService',
'ackUibModal', 'Upload', 'apiInterceptor', 'ackUibModal', 'Upload', 'apiInterceptor',
function ($rootScope, $scope, $timeout, $q, $log, $translate, $state, $interval, uiGridConstants, projectService, vatSessionService, function ($rootScope, $scope, $timeout, $q, $log, $translate, $state, $interval, uiGridConstants, projectService, vatSessionService,
orgService, serviceTypeService, userService, loginContext, enums, citSessionService, region, SweetAlert, productService, orgService, serviceTypeService, userService, loginContext, enums, citSessionService, region, SweetAlert, productService,
localStorageService, assetsManageSessionService, ackUibModal, Upload, apiInterceptor) { localStorageService, assetsManageSessionService,serviceLogService, ackUibModal, Upload, apiInterceptor) {
'use strict'; 'use strict';
$log.debug('appOverviewController.ctor()...'); $log.debug('appOverviewController.ctor()...');
var uploadUrl = apiInterceptor.webApiHostUrl + '/product/NewFile'; var uploadUrl = apiInterceptor.webApiHostUrl + '/product/NewFile';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment