Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
long-tern-care-service
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hubin
long-tern-care-service
Commits
fc5a6b1b
Commit
fc5a6b1b
authored
May 15, 2023
by
zhangwanglin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增计划记录操作人
parent
066269c5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
3 deletions
+13
-3
SrvTaskInfoListVO.java
...om/hungraim/ltc/pojo/vo/governance/SrvTaskInfoListVO.java
+3
-0
SrvTaskController.java
...hungraim/ltc/governance/controller/SrvTaskController.java
+3
-1
SrvTaskServiceImpl.java
...graim/ltc/governance/service/impl/SrvTaskServiceImpl.java
+7
-2
No files found.
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/SrvTaskInfoListVO.java
View file @
fc5a6b1b
...
...
@@ -24,4 +24,6 @@ public class SrvTaskInfoListVO implements Serializable {
* SrvTaskInfoVOs
*/
private
List
<
SrvTaskInfoVO
>
taskList
;
private
Integer
userId
;
}
\ No newline at end of file
governance/src/main/java/com/hungraim/ltc/governance/controller/SrvTaskController.java
View file @
fc5a6b1b
...
...
@@ -112,12 +112,14 @@ public class SrvTaskController {
* 新增或者修改服务计划
*/
@PostMapping
(
"/addOrUpdateSrvTask"
)
public
Result
<
List
<
SrvTaskInfoVO
>>
addSrvTask
(
SrvTaskInfoListVO
param
)
{
public
Result
<
List
<
SrvTaskInfoVO
>>
addSrvTask
(
@RequestHeader
(
"Authorization"
)
String
token
,
SrvTaskInfoListVO
param
)
{
String
programId
=
param
.
getProgramId
();
List
<
SrvTaskInfoVO
>
taskList
=
param
.
getTaskList
();
if
(
StringUtils
.
isBlank
(
programId
)
||
taskList
==
null
||
taskList
.
size
()
<=
0
)
{
return
Result
.
failed
(
ResultCode
.
REQUEST_PARAM_ERROR
);
}
Integer
userId
=
TokenParsingUtil
.
TokenParsing
(
token
,
"userId"
);
param
.
setUserId
(
userId
);
try
{
for
(
int
i
=
0
;
i
<
taskList
.
size
();
i
++)
{
SrvTaskInfoVO
srvTaskInfoVO
=
taskList
.
get
(
i
);
...
...
governance/src/main/java/com/hungraim/ltc/governance/service/impl/SrvTaskServiceImpl.java
View file @
fc5a6b1b
...
...
@@ -147,6 +147,9 @@ public class SrvTaskServiceImpl implements SrvTaskService {
chSrvTask
.
setStatus
((
short
)
1
);
//状态 未分配:0;已分配:1;已终止2
chSrvTask
.
setSrvDate
(
DateUtils
.
strToDate
(
taskDetails
.
get
(
0
)));
chSrvTask
.
setFcd
(
new
Date
());
chSrvTask
.
setLcd
(
new
Date
());
chSrvTask
.
setFcu
(
param
.
getUserId
().
longValue
());
chSrvTask
.
setLcu
(
param
.
getUserId
().
longValue
());
srvTaskMapper
.
insert
(
chSrvTask
);
// 服务计划制定方案修改为已生效
ChSrvProgram
chSrvProgram
=
new
ChSrvProgram
();
...
...
@@ -162,12 +165,12 @@ public class SrvTaskServiceImpl implements SrvTaskService {
}
else
{
// 修改服务计划
// chSrvTaskDetailMapper.delete(new QueryWrapper<ChSrvTaskDetail>().eq("srv_task_id", Long.parseLong(srvTaskId)));//删除原来的计划详情
if
(
"2"
.
equals
(
srvTaskInfoVO
.
getTaskStatus
())){
/*
if("2".equals(srvTaskInfoVO.getTaskStatus())){
UpdateWrapper updateWrapper1 = new UpdateWrapper();
updateWrapper1.eq("SRV_TASK_ID",srvTaskId);
updateWrapper1.set("STATUS",3);
chSrvTaskDetailMapper.update(null,updateWrapper1);
}
}
*/
// this.insertTaskDetail(Long.parseLong(srvTaskId), taskDetails);
//修改服务计划
ChSrvTask
chSrvTask
=
new
ChSrvTask
();
...
...
@@ -175,6 +178,8 @@ public class SrvTaskServiceImpl implements SrvTaskService {
updateWrapper
.
eq
(
"SRV_TASK_ID"
,
srvTaskId
);
//状态 未分配:0;已分配:1;已终止2
updateWrapper
.
set
(
"STATUS"
,
srvTaskInfoVO
.
getTaskStatus
());
updateWrapper
.
set
(
"LCD"
,
new
Date
());
updateWrapper
.
set
(
"LCU"
,
param
.
getUserId
());
updateWrapper
.
set
(
"END_REASON"
,
srvTaskInfoVO
.
getEndReason
());
srvTaskMapper
.
update
(
null
,
updateWrapper
);
...
...
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