Commit 20ac91e4 by “zcwang”

modify: 创建工单日志

parent b40ae024
...@@ -102,7 +102,7 @@ public class ChangeFlowBiz { ...@@ -102,7 +102,7 @@ public class ChangeFlowBiz {
public String createAndSubmit(ChangeFlowCreateReq changeFlowCreateReq) { public String createAndSubmit(ChangeFlowCreateReq changeFlowCreateReq) {
String uid = AdminUserHolder.getUserName(); String uid = AdminUserHolder.getUserName();
// String userName = RequestLocalBean.getName(); log.info("[createAndSubmit] createAndSubmit req={}, uid:{}", JSON.toJSONString(changeFlowCreateReq), uid);
// 校验变更主体 // 校验变更主体
checkSubject(changeFlowCreateReq); checkSubject(changeFlowCreateReq);
// 检验是否需要资料 // 检验是否需要资料
...@@ -144,7 +144,7 @@ public class ChangeFlowBiz { ...@@ -144,7 +144,7 @@ public class ChangeFlowBiz {
// todo:判断发起人和审核人 // todo:判断发起人和审核人
// 如果发起人=变更负责人 // 如果发起人=变更负责人
if (appConfig.getTestSwitch()) { if (appConfig.getTestEmail().equals(uid)) {
String nextNodeId = submitFlow(flowId, flowDataDTO, uid, String nextNodeId = submitFlow(flowId, flowDataDTO, uid,
ChangeFlowEnum.CHANGE_FLOW_START.getTopoId(), JSON.toJSONString(content)); ChangeFlowEnum.CHANGE_FLOW_START.getTopoId(), JSON.toJSONString(content));
if (null == nextNodeId) { if (null == nextNodeId) {
...@@ -153,7 +153,7 @@ public class ChangeFlowBiz { ...@@ -153,7 +153,7 @@ public class ChangeFlowBiz {
// 更新节点id // 更新节点id
changeRecord.setFlowNode(nodeId); changeRecord.setFlowNode(nodeId);
changeFlowService.updateRecord(changeRecord); changeFlowService.updateRecord(changeRecord);
return nextNodeId; return flowId;
} }
return flowId; return flowId;
} }
......
...@@ -30,6 +30,6 @@ public class AppConfig { ...@@ -30,6 +30,6 @@ public class AppConfig {
@Value("${changeExecLimit:20}") @Value("${changeExecLimit:20}")
private Integer changeExecLimit; private Integer changeExecLimit;
@Value("${testSwitch:true}") @Value("${testEmail:A@163.com}")
private Boolean testSwitch; private String testEmail;
} }
\ No newline at end of file
...@@ -105,7 +105,6 @@ public class ChangeFlowController { ...@@ -105,7 +105,6 @@ public class ChangeFlowController {
*/ */
@PostMapping("/create") @PostMapping("/create")
public AjaxResult<String> createAndSubmit(@RequestBody @Valid ChangeFlowCreateReq changeFlowCreateReq) { public AjaxResult<String> createAndSubmit(@RequestBody @Valid ChangeFlowCreateReq changeFlowCreateReq) {
log.info("[createAndSubmit] createAndSubmit req={}", JSON.toJSONString(changeFlowCreateReq));
return AjaxResult.success(changeFlowBiz.createAndSubmit(changeFlowCreateReq)); return AjaxResult.success(changeFlowBiz.createAndSubmit(changeFlowCreateReq));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment