Commit af245097 by chenweisong

更新

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