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
1e1f2f01
Commit
1e1f2f01
authored
Dec 06, 2022
by
“zcwang”
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add: 工单详情负责人信息
parent
8140bb03
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
25 deletions
+21
-25
ChangeFlowBiz.java
...om/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java
+2
-2
ChangeFlowCreateReq.java
...anxuan/change/dal/meta/model/req/ChangeFlowCreateReq.java
+1
-0
ChangeFlowVO.java
...e/mail/yanxuan/change/dal/meta/model/vo/ChangeFlowVO.java
+5
-0
WebMvcConfig.java
.../netease/mail/yanxuan/change/web/config/WebMvcConfig.java
+3
-11
TestController.java
...se/mail/yanxuan/change/web/controller/TestController.java
+10
-12
No files found.
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java
View file @
1e1f2f01
...
@@ -171,8 +171,7 @@ public class ChangeFlowBiz {
...
@@ -171,8 +171,7 @@ public class ChangeFlowBiz {
// 查询工单详情
// 查询工单详情
FlowDataDTO
flowDataDTO
=
flowService
.
flowDetail
(
flowId
);
FlowDataDTO
flowDataDTO
=
flowService
.
flowDetail
(
flowId
);
String
nodeId
=
flowDataDTO
.
getFlowMeta
().
getCurrNodeDataList
().
get
(
0
).
getNodeId
();
String
nodeId
=
flowDataDTO
.
getFlowMeta
().
getCurrNodeDataList
().
get
(
0
).
getNodeId
();
// todo: 根据类型查询负责人详情,格式邮箱
String
changeCommander
=
changeFlowCreateReq
.
getChangeCommander
();
String
changeCommander
=
appConfig
.
getTestEmail
();
// 保存工单数据
// 保存工单数据
ChangeRecord
changeRecord
=
buildChangeRecord
(
flowId
,
nodeId
,
changeFlowCreateReq
,
changeCommander
,
uid
);
ChangeRecord
changeRecord
=
buildChangeRecord
(
flowId
,
nodeId
,
changeFlowCreateReq
,
changeCommander
,
uid
);
changeFlowService
.
saveRecord
(
changeRecord
);
changeFlowService
.
saveRecord
(
changeRecord
);
...
@@ -655,6 +654,7 @@ public class ChangeFlowBiz {
...
@@ -655,6 +654,7 @@ public class ChangeFlowBiz {
changeFlowVO
.
setCreateTime
(
changeRecord
.
getCreateTime
());
changeFlowVO
.
setCreateTime
(
changeRecord
.
getCreateTime
());
changeFlowVO
.
setChangeConfirmResultTime
(
changeRecord
.
getChangeConfirmResultTime
());
changeFlowVO
.
setChangeConfirmResultTime
(
changeRecord
.
getChangeConfirmResultTime
());
changeFlowVO
.
setChangeResult
(
changeRecord
.
getChangeResult
());
changeFlowVO
.
setChangeResult
(
changeRecord
.
getChangeResult
());
changeFlowVO
.
setChangeResultDesc
(
changeRecord
.
getChangeResultDesc
());
return
changeFlowVO
;
return
changeFlowVO
;
}
}
...
...
yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/req/ChangeFlowCreateReq.java
View file @
1e1f2f01
...
@@ -50,6 +50,7 @@ public class ChangeFlowCreateReq {
...
@@ -50,6 +50,7 @@ public class ChangeFlowCreateReq {
/**
/**
* 变更负责人
* 变更负责人
*/
*/
@NotBlank
(
message
=
"变更负责人不能为空"
)
private
String
changeCommander
;
private
String
changeCommander
;
/**
/**
...
...
yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/vo/ChangeFlowVO.java
View file @
1e1f2f01
...
@@ -148,6 +148,11 @@ public class ChangeFlowVO {
...
@@ -148,6 +148,11 @@ public class ChangeFlowVO {
private
Integer
changeResult
;
private
Integer
changeResult
;
/**
/**
* 变更结论详情
*/
private
String
changeResultDesc
;
/**
* 备注
* 备注
*/
*/
private
String
remark
;
private
String
remark
;
...
...
yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/config/WebMvcConfig.java
View file @
1e1f2f01
package
com
.
netease
.
mail
.
yanxuan
.
change
.
web
.
config
;
package
com
.
netease
.
mail
.
yanxuan
.
change
.
web
.
config
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor
;
import
org.springframework.web.servlet.config.annotation.AsyncSupportConfigurer
;
import
org.springframework.web.servlet.config.annotation.InterceptorRegistry
;
import
org.springframework.web.servlet.config.annotation.InterceptorRegistry
;
import
org.springframework.web.servlet.config.annotation.WebMvcConfigurer
;
import
org.springframework.web.servlet.config.annotation.WebMvcConfigurer
;
import
org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
;
/**
/**
* @author zhangbingQAQ
* @author zhangbingQAQ
* @date 2021/8/27 10:18
* @date 2021/8/27 10:18
*/
*/
@Configuration
@Configuration
public
class
WebMvcConfig
implements
WebMvcConfigurer
{
public
class
WebMvcConfig
implements
WebMvcConfigurer
{
@Autowired
@Autowired
private
AdminUserLoginInterceptor
userLoginInterceptor
;
private
AdminUserLoginInterceptor
userLoginInterceptor
;
@Autowired
private
LoginInterceptor
loginInterceptor
;
/**
/**
* 拦截器配置
* 拦截器配置
*
*
...
@@ -30,8 +22,8 @@ public class WebMvcConfig implements WebMvcConfigurer{
...
@@ -30,8 +22,8 @@ public class WebMvcConfig implements WebMvcConfigurer{
*/
*/
@Override
@Override
public
void
addInterceptors
(
InterceptorRegistry
registry
)
{
public
void
addInterceptors
(
InterceptorRegistry
registry
)
{
registry
.
addInterceptor
(
userLoginInterceptor
).
addPathPatterns
(
"/**"
).
excludePathPatterns
(
"/i/health"
)
.
excludePathPatterns
(
"/change/flow/getOperator"
,
"/test/**"
);
registry
.
addInterceptor
(
userLoginInterceptor
).
addPathPatterns
(
"/**"
).
excludePathPatterns
(
"/i/health"
)
// registry.addInterceptor(loginInterceptor).addPathPatterns("/**").excludePathPatterns("/change/flow/getOperator
");
.
excludePathPatterns
(
"/change/flow/getOperator"
,
"/test/**
"
);
}
}
}
}
yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/controller/TestController.java
View file @
1e1f2f01
...
@@ -6,27 +6,25 @@
...
@@ -6,27 +6,25 @@
*/
*/
package
com
.
netease
.
mail
.
yanxuan
.
change
.
web
.
controller
;
package
com
.
netease
.
mail
.
yanxuan
.
change
.
web
.
controller
;
import
com.netease.mail.yanxuan.change.biz.service.InteriorChangeConfigService
;
import
java.util.List
;
import
com.netease.mail.yanxuan.change.common.bean.AdminUserHolder
;
import
com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeGoodsPrincipalPO
;
import
com.netease.mail.yanxuan.change.integration.flow.supplier.FlowRpcSupplierSendService
;
import
com.netease.mail.yanxuan.change.integration.flow.supplier.req.SupplierSearchRemoteReq
;
import
com.netease.mail.yanxuan.change.integration.flow.supplier.rsp.SupplierSimpleRsp
;
import
com.netease.yanxuan.flowx.sdk.meta.controller.communal.AjaxResponse
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.netease.mail.yanxuan.change.biz.service.rpc.TodoService
;
import
com.netease.mail.yanxuan.change.biz.service.rpc.TodoService
;
import
com.netease.mail.yanxuan.change.common.bean.AjaxResult
;
import
com.netease.mail.yanxuan.change.common.bean.AjaxResult
;
import
com.netease.mail.yanxuan.change.common.enums.OperateTypeEnum
;
import
com.netease.mail.yanxuan.change.dal.entity.ChangeRecord
;
import
com.netease.mail.yanxuan.change.dal.entity.ChangeRecord
;
import
com.netease.mail.yanxuan.change.integration.flow.supplier.FlowRpcSupplierSendService
;
import
com.netease.mail.yanxuan.change.integration.flow.supplier.req.SupplierSearchRemoteReq
;
import
com.netease.mail.yanxuan.change.integration.flow.supplier.rsp.SupplierSimpleRsp
;
import
com.netease.yanxuan.flowx.sdk.meta.controller.communal.AjaxResponse
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
java.util.List
;
import
java.util.Map
;
/**
/**
* @Author zcwang
* @Author zcwang
* @Date 2022/11/28
* @Date 2022/11/28
...
...
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