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
0da6a1e8
Commit
0da6a1e8
authored
Nov 02, 2018
by
neo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[BugFix] fixed project change period and upate status
parent
07b1cbc1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
8 deletions
+24
-8
ProjectStatusManageController.java
...axtech/atms/controller/ProjectStatusManageController.java
+9
-5
ProjectStatusManageServiceImpl.java
...ech/atms/service/impl/ProjectStatusManageServiceImpl.java
+12
-0
tax-report-cell-detail-modal.html
...eport-cell-detail-modal/tax-report-cell-detail-modal.html
+1
-1
project.svc.js
...web/src/main/webapp/app/common/webservices/project.svc.js
+2
-2
No files found.
atms-api/src/main/java/pwc/taxtech/atms/controller/ProjectStatusManageController.java
View file @
0da6a1e8
...
...
@@ -3,13 +3,10 @@ package pwc.taxtech.atms.controller;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.http.MediaType
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.*
;
import
pwc.taxtech.atms.dto.OperationResultDto
;
import
pwc.taxtech.atms.dto.taxadmin.ProjectStatusManageDto
;
import
pwc.taxtech.atms.entity.ProjectStatusManage
;
import
pwc.taxtech.atms.service.impl.IdentityServiceImpl
;
import
pwc.taxtech.atms.service.impl.ProjectStatusManageServiceImpl
;
...
...
@@ -42,4 +39,11 @@ public class ProjectStatusManageController {
@PathVariable
Integer
periodId
)
{
return
projectStatusManageService
.
getProjectStatus
(
projectId
,
periodId
);
}
@RequestMapping
(
"isProjectStatusExisted/{projectId}/{periodId}"
)
@ResponseBody
public
OperationResultDto
<
ProjectStatusManage
>
isProjectStatusExisted
(
@PathVariable
String
projectId
,
@PathVariable
int
periodId
)
{
return
projectStatusManageService
.
isProjectStatusExisted
(
projectId
,
periodId
);
}
}
atms-api/src/main/java/pwc/taxtech/atms/service/impl/ProjectStatusManageServiceImpl.java
View file @
0da6a1e8
package
pwc
.
taxtech
.
atms
.
service
.
impl
;
import
org.apache.commons.lang3.StringUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -124,4 +125,15 @@ public class ProjectStatusManageServiceImpl {
}
}
public
OperationResultDto
<
ProjectStatusManage
>
isProjectStatusExisted
(
String
projectId
,
int
periodId
)
{
ProjectStatusManageExample
example
=
new
ProjectStatusManageExample
();
example
.
createCriteria
().
andProjectIdEqualTo
(
projectId
).
andPeriodIdEqualTo
(
Integer
.
parseInt
(
projectId
));
List
<
ProjectStatusManage
>
manage
=
projectStatusManageMapper
.
selectByExample
(
example
);
OperationResultDto
<
ProjectStatusManage
>
dto
=
new
OperationResultDto
();
dto
.
setResult
(
true
);
dto
.
setResultMsg
(
StringUtils
.
EMPTY
);
dto
.
setData
(
manage
.
isEmpty
()
?
null
:
manage
.
get
(
0
));
return
dto
;
}
}
atms-web/src/main/webapp/app/common/controls/tax-report-cell-detail-modal/tax-report-cell-detail-modal.html
View file @
0da6a1e8
...
...
@@ -53,7 +53,7 @@
<div
class=
"cell-info-subject"
>
<label
class=
"cell-info-subject-label"
>
{{'CellValue' | translate}}:
</label>
<span
title=
"{{detail.cellInfo.modifiedReportCell?detail.cellInfo.modifiedReportCell.comment:''}}"
>
{{detail.cellInfo.money}}
</span>
<
a
href=
"javascript:void(0)"
ng-click=
"openModifyCellDataDialog()"
>
{{'Change' | translate}}
</a
>
<
!--<a href="javascript:void(0)" ng-click="openModifyCellDataDialog()">{{'Change' | translate}}</a>--
>
<a
href=
"javascript:void(0)"
ng-if=
"detail.cellInfo.modifiedReportCell != null"
ng-click=
"resetReportCell()"
>
{{'Reset' | translate}}
</a>
</div>
</div>
...
...
atms-web/src/main/webapp/app/common/webservices/project.svc.js
View file @
0da6a1e8
...
...
@@ -43,8 +43,8 @@ webservices.factory('projectService', ['$http', 'apiConfig', function ($http, ap
isImportedAnyData
:
function
(
periodId
,
projectId
)
{
return
$http
.
get
(
'/ProjectStatusManage/isImportedAnyData/'
+
periodId
+
'/'
+
projectId
,
apiConfig
.
createVat
());
},
isProjectStatusExisted
:
function
(
dbName
,
periodId
)
{
return
$http
.
get
(
'/ProjectStatusManage/isProjectStatusExisted/'
+
dbName
+
'/'
+
periodId
,
apiConfig
.
createVat
());
isProjectStatusExisted
:
function
(
projectId
,
periodId
)
{
return
$http
.
get
(
'/ProjectStatusManage/isProjectStatusExisted/'
+
projectId
+
'/'
+
periodId
,
apiConfig
.
createVat
());
},
getProjectAllStatus
:
function
(
projectId
)
{
return
$http
.
get
(
'/project/getProjectAllStatus/'
+
projectId
,
apiConfig
.
create
());
...
...
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