Commit af245097 by chenweisong

更新

parent ea4c0ca6
......@@ -86,25 +86,25 @@ public class ExcelController {
// 已经完成的会签任务数量
int nrOfCompletedInstances = Integer.parseInt(runtimeService.getVariable(executionId, "nrOfCompletedInstances").toString());
if (nrOfCompletedInstances == nrOfInstances - 1) {
if (template.getNeedConfirm() == Template.NEED_CONFIRM) {
vars.put("NeedConfirm", true);
vars.put("manager", "审核人");
} else {
vars.put("NeedConfirm", false);
if (StringUtils.isNotEmpty(template.getBackStreamAddr())) {
vars.put("NeedDataBack", true);
vars.put("backFlowUser", "数据回流人");
} else {
vars.put("NeedDataBack", false);
// 流程完
Activity activity = process.getActivity();
activity.setStatus(Activity.STATUS_WAIT);
activityService.save(activity);
}
}
taskService.complete(task.getId(), vars);
}
// if (nrOfCompletedInstances == nrOfInstances - 1) {
// if (template.getNeedConfirm() == Template.NEED_CONFIRM) {
// vars.put("NeedConfirm", true);
// vars.put("manager", "审核人");
// } else {
// vars.put("NeedConfirm", false);
// if (StringUtils.isNotEmpty(template.getBackStreamAddr())) {
// vars.put("NeedDataBack", true);
// vars.put("backFlowUser", "数据回流人");
// } else {
// vars.put("NeedDataBack", false);
// // 流程完
// Activity activity = process.getActivity();
// activity.setStatus(Activity.STATUS_WAIT);
// activityService.save(activity);
// }
// }
// taskService.complete(task.getId(), vars);
// }
return "成功";
}
......
......@@ -6,7 +6,7 @@ eureka:
region: default
serviceUrl:
defaultZone: http://192.168.0.240:8081/eureka/
enabled: true
enabled: false
instance:
prefer-ip-address: false
# hostname: 192.168.0.48
......@@ -31,9 +31,9 @@ spring:
url: jdbc:mysql://192.168.0.192:3306/cmb_dev?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
username: test
password: test
# url: jdbc:mysql://47.105.193.165:3306/dev0?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
# username: root
# password: 123456
# url: jdbc:mysql://47.105.193.165:3306/dev0?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
# username: root
# password: 123456
hikari:
maximum-pool-size: 3
servlet:
......@@ -62,5 +62,5 @@ swagger2:
security:
authUser: root
authPwd: pwd
permit: false
# permit: true
\ No newline at end of file
# permit: false
permit: true
\ No newline at end of file
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