Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yanxuan-qc-change-system
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
胡园园
yanxuan-qc-change-system
Commits
d319b272
Commit
d319b272
authored
Dec 14, 2022
by
穆龙飞
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modify:增加结果上传
parent
e9a156ac
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
0 deletions
+23
-0
ChangeFlowBiz.java
...om/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java
+8
-0
ChangeFileService.java
...se/mail/yanxuan/change/biz/service/ChangeFileService.java
+4
-0
ChangeFileServiceImpl.java
...anxuan/change/biz/service/impl/ChangeFileServiceImpl.java
+7
-0
ChangeFileMapper.java
...ease/mail/yanxuan/change/dal/mapper/ChangeFileMapper.java
+4
-0
No files found.
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java
View file @
d319b272
...
@@ -520,9 +520,17 @@ public class ChangeFlowBiz {
...
@@ -520,9 +520,17 @@ public class ChangeFlowBiz {
changeRecord
.
setChangeResult
(
changeResultStatus
.
getStatus
());
changeRecord
.
setChangeResult
(
changeResultStatus
.
getStatus
());
// 填写备注
// 填写备注
changeRecord
.
setRemark
(
changeFlowSubmitReq
.
getRemark
());
changeRecord
.
setRemark
(
changeFlowSubmitReq
.
getRemark
());
List
<
ChangeFlowFile
>
finialFiles
=
changeFlowSubmitReq
.
getFiles
();
if
(
CollectionUtils
.
isNotEmpty
(
finialFiles
))
{
changeFileService
.
deleteByChangeRecordIdAndType
(
changeRecord
.
getId
(),
FileTypeEnum
.
CHANGE_RESULT_INFO
);
List
<
ChangeFile
>
changeFiles
=
buildChangeFileRecord
(
changeRecord
.
getId
(),
finialFiles
,
FileTypeEnum
.
CHANGE_RESULT_INFO
.
getType
());
changeFiles
.
forEach
(
file
->
changeFileService
.
saveRecord
(
file
));
}
switch
(
changeResultStatus
)
{
switch
(
changeResultStatus
)
{
case
FINISH_ALL:
case
FINISH_ALL:
case
FINISH_PART:
case
FINISH_PART:
String
reason
=
changeFlowSubmitReq
.
getCancelReason
();
changeRecord
.
setCancelReason
(
reason
);
List
<
ChangeExecConfigReq
>
execProjectList
=
changeFlowSubmitReq
.
getChangeExecProjectList
();
List
<
ChangeExecConfigReq
>
execProjectList
=
changeFlowSubmitReq
.
getChangeExecProjectList
();
List
<
ChangeExecRecord
>
changeExecRecordList
=
execProjectList
.
stream
().
map
(
exec
->
{
List
<
ChangeExecRecord
>
changeExecRecordList
=
execProjectList
.
stream
().
map
(
exec
->
{
Long
changeExecFinishTime
=
exec
.
getChangeExecFinishTime
();
Long
changeExecFinishTime
=
exec
.
getChangeExecFinishTime
();
...
...
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/ChangeFileService.java
View file @
d319b272
...
@@ -8,6 +8,7 @@ package com.netease.mail.yanxuan.change.biz.service;
...
@@ -8,6 +8,7 @@ package com.netease.mail.yanxuan.change.biz.service;
import
java.util.List
;
import
java.util.List
;
import
com.netease.mail.yanxuan.change.common.enums.FileTypeEnum
;
import
com.netease.mail.yanxuan.change.dal.entity.ChangeFile
;
import
com.netease.mail.yanxuan.change.dal.entity.ChangeFile
;
import
com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowFile
;
import
com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowFile
;
...
@@ -29,4 +30,6 @@ public interface ChangeFileService {
...
@@ -29,4 +30,6 @@ public interface ChangeFileService {
Integer
deleteByChangeRecordId
(
Long
changeRecordId
);
Integer
deleteByChangeRecordId
(
Long
changeRecordId
);
void
saveRecord
(
ChangeFile
changeFile
);
void
saveRecord
(
ChangeFile
changeFile
);
void
deleteByChangeRecordIdAndType
(
Long
changeRecordId
,
FileTypeEnum
type
);
}
}
\ No newline at end of file
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/ChangeFileServiceImpl.java
View file @
d319b272
...
@@ -10,6 +10,7 @@ import java.util.ArrayList;
...
@@ -10,6 +10,7 @@ import java.util.ArrayList;
import
java.util.List
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
import
com.netease.mail.yanxuan.change.common.enums.FileTypeEnum
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
@@ -53,4 +54,9 @@ public class ChangeFileServiceImpl implements ChangeFileService {
...
@@ -53,4 +54,9 @@ public class ChangeFileServiceImpl implements ChangeFileService {
public
void
saveRecord
(
ChangeFile
changeFile
)
{
public
void
saveRecord
(
ChangeFile
changeFile
)
{
changeFileMapper
.
insertSelective
(
changeFile
);
changeFileMapper
.
insertSelective
(
changeFile
);
}
}
@Override
public
void
deleteByChangeRecordIdAndType
(
Long
changeRecordId
,
FileTypeEnum
type
)
{
changeFileMapper
.
deleteByBaseIdAndType
(
changeRecordId
,
type
.
getType
());
}
}
}
\ No newline at end of file
yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/mapper/ChangeFileMapper.java
View file @
d319b272
...
@@ -35,4 +35,7 @@ public interface ChangeFileMapper extends tk.mybatis.mapper.common.Mapper<Change
...
@@ -35,4 +35,7 @@ public interface ChangeFileMapper extends tk.mybatis.mapper.common.Mapper<Change
@Delete
(
"delete from TB_YX_QC_CHANGE_FILE where change_record_id = #{changeRecordId}"
)
@Delete
(
"delete from TB_YX_QC_CHANGE_FILE where change_record_id = #{changeRecordId}"
)
Integer
deleteByBaseId
(
Long
changeRecordId
);
Integer
deleteByBaseId
(
Long
changeRecordId
);
@Delete
(
"delete from TB_YX_QC_CHANGE_FILE where change_record_id = #{changeRecordId} and fileType = #{type}"
)
void
deleteByBaseIdAndType
(
@Param
(
"changeRecordId"
)
Long
changeRecordId
,
@Param
(
"type"
)
Integer
type
);
}
}
\ 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