yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1

zhanglei
God 3 years ago
parent
3d4bab206e
commit
d591c86488
1 changed files with 10 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

18
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
View File

@ -461,8 +461,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
}
if (StringUtils.isBlank(dto.getTaskId())) { // 新提交
String proDefId = ProcDefEnum.SEALAPPLY.getProDefId();
ResultBean resultBean1 = flowableFeign.businessStart(ProcDefEnum.FINBILLAPPLICATION.getProDefId(), dto.getUserSid(), variables);
if (resultBean1.getSuccess() && resultBean1.getData() != null) {
ResultBean resultBean1 = null;
//ResultBean resultBean1 = flowableFeign.businessStart(ProcDefEnum.FINBILLAPPLICATION.getProDefId(), dto.getUserSid(), variables);
/*if (resultBean1.getSuccess() && resultBean1.getData() != null) {
Map<String, String> map = (Map<String, String>) resultBean1.getData();
//更新业务表中的流程状态
Map<String, Object> paramMap = new HashMap<>();
@ -472,7 +473,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
paramMap.put("procInsId", map.get("procInsId"));
paramMap.put("taskDefKey", map.get("taskDefKey"));
updateFlowFiled(paramMap);
}
}*/
return resultBean1;
} else { // 驳回到发起人后再次提交
variables.put("comment", StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
@ -533,8 +534,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
*/
public ResultBean complete(Map<String, Object> variables) {
BusinessVariables bv = BusinessVariables.builder().build();
bv.setDetailUrl("");
bv.setHandleUrl("");
//bv.setDetailUrl("");
//bv.setHandleUrl("");
bv.setFormVariables(variables);
ResultBean<com.yxt.anrui.flowable.api.flowtask.FlowTask> resultBean = flowTaskFeign.businessComplete(bv);
if (!resultBean.getSuccess()) {
@ -694,8 +695,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
variables.put("orgSid", orgSid); //部门sid
if (StringUtils.isBlank(dto.getTaskId())) { // 新提交
String proDefId = ProcDefEnum.SEALAPPLY.getProDefId();
ResultBean resultBean1 = flowableFeign.businessStart(ProcDefEnum.FINBILLAPPLICATION.getProDefId(), dto.getUserSid(), variables);
if (resultBean1.getSuccess() && resultBean1.getData() != null) {
ResultBean resultBean1 = null;
//ResultBean resultBean1 = flowableFeign.businessStart(ProcDefEnum.FINBILLAPPLICATION.getProDefId(), dto.getUserSid(), variables);
/* if (resultBean1.getSuccess() && resultBean1.getData() != null) {
Map<String, String> map = (Map<String, String>) resultBean1.getData();
//更新业务表中的流程状态
Map<String, Object> paramMap = new HashMap<>();
@ -705,7 +707,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
paramMap.put("procInsId", map.get("procInsId"));
paramMap.put("taskDefKey", map.get("taskDefKey"));
updateFlowFiled(paramMap);
}
}*/
return resultBean1;
} else { // 驳回到发起人后再次提交
variables.put("comment", StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");

Write Preview
Loading…
Cancel
Save