Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
I
indicators
Overview
Overview
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhangkb
indicators
Commits
0010162c
Commit
0010162c
authored
Aug 26, 2020
by
hzc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加任务下发状态
parent
0c1d868f
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
31 additions
and
3 deletions
+31
-3
DataEnterCtrl.java
...com/keymobile/indicators/api/hytobacco/DataEnterCtrl.java
+7
-0
Constants.java
...ain/java/com/keymobile/indicators/constant/Constants.java
+8
-0
TaskMapper.java
...mobile/indicators/model/mapper/indicators/TaskMapper.java
+1
-1
TaskService.java
...m/keymobile/indicators/service/dataenter/TaskService.java
+2
-0
TaskServiceImpl.java
...le/indicators/service/dataenter/impl/TaskServiceImpl.java
+6
-1
TaskMapper.xml
src/main/resources/mybatis/mapping/TaskMapper.xml
+7
-1
No files found.
src/main/java/com/keymobile/indicators/api/hytobacco/DataEnterCtrl.java
View file @
0010162c
...
...
@@ -56,6 +56,9 @@ public class DataEnterCtrl {
@ApiOperation
(
"获取需要在线填报的数据项(填报任务点击)"
)
@GetMapping
(
"findToEdit"
)
public
List
<
TaskIndValue
>
findToEdit
(
@RequestParam
(
"taskId"
)
String
taskId
)
throws
Exception
{
List
<
TaskIndValue
>
list
=
new
ArrayList
<>();
Task
task
=
taskService
.
getById
(
taskId
,
true
,
false
);
List
<
TaskIndicator
>
taskIndicators
=
task
.
getIndicators
();
...
...
@@ -100,7 +103,11 @@ public class DataEnterCtrl {
}
}
}
}
taskService
.
updateTaskStatusById
(
taskId
,
Constants
.
APPLY_STATE_DRAFT
);
return
list
;
}
...
...
src/main/java/com/keymobile/indicators/constant/Constants.java
View file @
0010162c
...
...
@@ -57,6 +57,13 @@ public class Constants {
*/
public
static
final
String
Y
=
"Y"
;
/**
* 任务已下发
*
*/
public
static
final
int
APPLY_STATE_ISSUE
=
5
;
/**
* 申请状态-草稿
*/
...
...
@@ -84,6 +91,7 @@ public class Constants {
/**
* 正常
*/
...
...
src/main/java/com/keymobile/indicators/model/mapper/indicators/TaskMapper.java
View file @
0010162c
...
...
@@ -78,5 +78,5 @@ public interface TaskMapper extends BaseMapper<Task> {
* **/
Integer
selectAuDateOrEnDateCounts
(
QueryTaskParam
param
);
Integer
updateTaskStatusById
(
@Param
(
"taskId"
)
String
taskId
,
@Param
(
"status"
)
Integer
status
);
}
src/main/java/com/keymobile/indicators/service/dataenter/TaskService.java
View file @
0010162c
...
...
@@ -203,4 +203,6 @@ public interface TaskService {
* 填报超时的数目
* **/
TaskAnalysisResult
stateCounts
(
QueryTaskParam
param
);
void
updateTaskStatusById
(
String
taskId
,
Integer
applyStateIssue
);
}
src/main/java/com/keymobile/indicators/service/dataenter/impl/TaskServiceImpl.java
View file @
0010162c
...
...
@@ -671,7 +671,7 @@ public class TaskServiceImpl implements TaskService {
task
.
setCreator
(
user
);
task
.
setUpdateTime
(
now
);
task
.
setUpdater
(
user
);
task
.
setStatus
(
Constants
.
APPLY_STATE_
DRAFT
);
task
.
setStatus
(
Constants
.
APPLY_STATE_
ISSUE
);
task
.
setState
(
Constants
.
DATA_STATE_A
);
task
.
setIndicators
(
tis
);
task
.
setNeedSelfEnter
(
false
);
...
...
@@ -774,6 +774,11 @@ public class TaskServiceImpl implements TaskService {
return
taskStateCounts
;
}
@Override
public
void
updateTaskStatusById
(
String
taskId
,
Integer
status
)
{
taskMapper
.
updateTaskStatusById
(
taskId
,
status
);
}
/**
* 获取关联的数据项和子数据项
* @param ruleId
...
...
src/main/resources/mybatis/mapping/TaskMapper.xml
View file @
0010162c
...
...
@@ -148,6 +148,11 @@
</if>
</select>
<update
id=
"updateTaskStatusById"
>
UPDATE data_enter_task
SET
`status`=#{status}
WHERE state = 1 and id= #{taskId}
</update>
</mapper>
\ No newline at end of file
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