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
597fc9d4
Commit
597fc9d4
authored
Nov 23, 2022
by
“zcwang”
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug: 创建工单数据校验
parent
53ade2ed
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
40 additions
and
3 deletions
+40
-3
ChangeFlowBiz.java
...om/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java
+22
-3
ChangeFileService.java
...se/mail/yanxuan/change/biz/service/ChangeFileService.java
+3
-0
ChangeFileServiceImpl.java
...anxuan/change/biz/service/impl/ChangeFileServiceImpl.java
+6
-0
ChangeFileMapper.java
...ease/mail/yanxuan/change/dal/mapper/ChangeFileMapper.java
+9
-0
No files found.
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java
View file @
597fc9d4
...
...
@@ -30,7 +30,6 @@ import com.netease.mail.yanxuan.change.biz.service.ChangeFlowExecService;
import
com.netease.mail.yanxuan.change.biz.service.ChangeFlowService
;
import
com.netease.mail.yanxuan.change.biz.service.change.ChangeConfigService
;
import
com.netease.mail.yanxuan.change.biz.service.change.ChangeTypeService
;
import
com.netease.mail.yanxuan.change.common.bean.AdminUserHolder
;
import
com.netease.mail.yanxuan.change.common.bean.CommonConstants
;
import
com.netease.mail.yanxuan.change.common.bean.RequestLocalBean
;
import
com.netease.mail.yanxuan.change.common.bean.ResponseCode
;
...
...
@@ -45,6 +44,7 @@ import com.netease.mail.yanxuan.change.common.enums.NeedFileEnum;
import
com.netease.mail.yanxuan.change.common.util.DateUtils
;
import
com.netease.mail.yanxuan.change.dal.entity.ChangeConfig
;
import
com.netease.mail.yanxuan.change.dal.entity.ChangeExecRecord
;
import
com.netease.mail.yanxuan.change.dal.entity.ChangeFile
;
import
com.netease.mail.yanxuan.change.dal.entity.ChangeRecord
;
import
com.netease.mail.yanxuan.change.dal.entity.ChangeType
;
import
com.netease.mail.yanxuan.change.dal.mapper.ChangeRecordMapper
;
...
...
@@ -141,8 +141,14 @@ public class ChangeFlowBiz {
ChangeRecord
changeRecord
=
buildChangeRecord
(
flowId
,
nodeId
,
changeFlowCreateReq
,
changeCommander
,
uid
);
changeFlowService
.
saveRecord
(
changeRecord
);
// 保存变更行动方案记录
List
<
ChangeExecRecord
>
changeExecRecords
=
buildChangeExecRecord
(
changeRecord
.
get
Flow
Id
(),
changeExecProject
);
List
<
ChangeExecRecord
>
changeExecRecords
=
buildChangeExecRecord
(
changeRecord
.
getId
(),
changeExecProject
);
changeFlowExecService
.
batchSaveRecord
(
changeExecRecords
);
// 保存附件
List
<
ChangeFlowFile
>
files
=
changeFlowCreateReq
.
getFiles
();
if
(
CollectionUtils
.
isNotEmpty
(
files
))
{
List
<
ChangeFile
>
changeFiles
=
buildChangeFileRecord
(
changeRecord
.
getId
(),
files
);
changeFileService
.
batchSaveRecord
(
changeFiles
);
}
// 如果发起人=变更负责人
if
(
changeCommander
.
equals
(
uid
))
{
log
.
debug
(
"[createAndSubmit] changeCommander:{}, uid:{}"
,
changeCommander
,
uid
);
...
...
@@ -160,6 +166,19 @@ public class ChangeFlowBiz {
return
flowId
;
}
private
List
<
ChangeFile
>
buildChangeFileRecord
(
Long
changeRecordId
,
List
<
ChangeFlowFile
>
files
)
{
return
files
.
stream
().
map
(
f
->
{
ChangeFile
changeFile
=
new
ChangeFile
();
changeFile
.
setChangeRecordId
(
changeRecordId
);
changeFile
.
setFileType
(
f
.
getFileType
());
changeFile
.
setFileName
(
f
.
getFileName
());
changeFile
.
setFileUrl
(
f
.
getFileUrl
());
changeFile
.
setCreateTime
(
DateUtils
.
getCurrentTime
());
changeFile
.
setUpdateTime
(
DateUtils
.
getCurrentTime
());
return
changeFile
;
}).
collect
(
Collectors
.
toList
());
}
private
List
<
ChangeExecRecord
>
buildChangeExecRecord
(
Long
changeRecordId
,
List
<
ChangeExecConfigReq
>
changeExecProject
)
{
return
changeExecProject
.
stream
().
map
(
c
->
{
ChangeExecRecord
changeExecRecord
=
new
ChangeExecRecord
();
...
...
@@ -513,7 +532,7 @@ public class ChangeFlowBiz {
}
ChangeFlowVO
changeFlowVO
=
new
ChangeFlowVO
();
changeFlowVO
.
setId
(
changeRecord
.
getId
());
changeFlowVO
.
setFlowId
(
change
FlowVO
.
getFlowId
());
changeFlowVO
.
setFlowId
(
change
Record
.
getFlowId
());
changeFlowVO
.
setChangeSubject
(
changeRecord
.
getChangeSubject
());
ChangeType
parentChangeType
=
changeTypeService
.
getChangeTypeById
(
changeRecord
.
getParentChangeClassId
());
if
(
parentChangeType
==
null
)
{
...
...
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/ChangeFileService.java
View file @
597fc9d4
...
...
@@ -23,4 +23,6 @@ public interface ChangeFileService {
* @return
*/
List
<
ChangeFlowFile
>
getChangeFileList
(
Long
changeRecordId
);
void
batchSaveRecord
(
List
<
ChangeFile
>
changeFiles
);
}
\ 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 @
597fc9d4
...
...
@@ -38,4 +38,9 @@ public class ChangeFileServiceImpl implements ChangeFileService {
}
return
new
ArrayList
<>();
}
@Override
public
void
batchSaveRecord
(
List
<
ChangeFile
>
changeFiles
)
{
changeFileMapper
.
insertList
(
changeFiles
);
}
}
\ 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 @
597fc9d4
...
...
@@ -8,6 +8,7 @@ package com.netease.mail.yanxuan.change.dal.mapper;
import
java.util.List
;
import
org.apache.ibatis.annotations.Insert
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Select
;
...
...
@@ -23,4 +24,11 @@ public interface ChangeFileMapper extends tk.mybatis.mapper.common.Mapper<Change
@Select
(
"SELECT * FROM TB_YX_QC_CHANGE_FILE WHERE change_record_id = #{changeRecordId}"
)
List
<
ChangeFile
>
selectByChangeRecordId
(
@Param
(
"changeRecordId"
)
Long
changeRecordId
);
@Insert
({
"<script>"
,
"insert into TB_YX_QC_CHANGE_FILE(change_record_id, file_type, file_name, file_url, create_time, update_time) values "
,
"<foreach collection='list' item='item' index='index' separator=','>"
,
"(#{item.changeRecordId}, #{item.fileType}, #{item.fileName}, #{item.fileUrl}, #{item.createTime}, #{item.updateTime})"
,
"</foreach>"
,
"</script>"
})
void
insertList
(
List
<
ChangeFile
>
changeFiles
);
}
\ 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