工作流通知代码提交

bpm-core/src/main/java/com/srm/bpm/infra/entity/ProcessNodeExtendEntity.java

@@ -51,6 +51,11 @@ public class ProcessNodeExtendEntity extends BaseEntity {
      * 自动同意规则(1:处理人就是提交人;2:处理人和上一步处理人相同;3处理人审批过;多个已逗号分隔
      */
     private String autoAgree;
+    
+    /**
+     * 推送配置(0:邮件;1:站内信;2:流程中心;多个以逗号分隔)
+     */
+    private String push;
 
     /**
      * 节点显示的按钮

bpm-core/src/main/java/com/srm/bpm/logic/constant/BillTaskStatus.java

@@ -76,7 +76,9 @@ public enum BillTaskStatus {
     /**
      * 已移交
      */
-    TURN(15);
+    TURN(15),
+    
+    COMPLATE(16);
 
 
     private final int status;

bpm-core/src/main/java/com/srm/bpm/logic/dto/FlowMsgDTO.java

@@ -32,6 +32,10 @@ public class FlowMsgDTO {
      */
     private String content;
     /**
+     * 推送配置(0:邮件;1:站内信;2:流程中心;多个以逗号分隔)
+     */
+    private String push;
+    /**
      * 节点名称
      */
     private String nodeName;
@@ -43,15 +47,19 @@ public class FlowMsgDTO {
      * 时间
      */
     private LocalDateTime time;
-
-    public static FlowMsgDTO build(String userCode, String createUser, String content, String title, String nodeName, String opinion) {
+    
+    private Long billId;
+    
+    public static FlowMsgDTO build(String userCode, String createUser, String content, String title, String push, String nodeName, String opinion, Long billId) {
         FlowMsgDTO flowMsgDTO = new FlowMsgDTO();
         flowMsgDTO.setCreateUser(createUser);
         flowMsgDTO.setUserCode(userCode);
         flowMsgDTO.setContent(content);
         flowMsgDTO.setBillTitle(title);
+        flowMsgDTO.setPush(push);
         flowMsgDTO.setNodeName(nodeName);
         flowMsgDTO.setOpinion(opinion);
+        flowMsgDTO.setBillId(billId);
         flowMsgDTO.setTime(LocalDateTime.now());
         return flowMsgDTO;
     }

bpm-core/src/main/java/com/srm/bpm/logic/service/impl/BillLogicImpl.java

@@ -798,6 +798,7 @@ public class BillLogicImpl implements BillLogic {
                 taskOpt = billBpmnLogic.findTaskBybillAndEmployeeAndTaskId(billId, taskId, userCode);
                 if (taskOpt.isPresent()) {
                     BillTaskEntity task = taskOpt.get();
+                    task.setOpinion(opinion);
                     final int taskNodeStatus = task.getNodeStatus();
                     BillTaskStatus billTaskStatus = BillTaskStatus.valueTo(taskNodeStatus);
                     switch (billTaskStatus) {
@@ -852,6 +853,13 @@ public class BillLogicImpl implements BillLogic {
                 if (action.equals(BillAction.refuse.name())) {
                     callBackLogic.callBack(byId.getProcessId(), billId, BillTaskStatus.REFUSE.getStatus());
                 } else {
+                	BillTaskEntity a = new BillTaskEntity();
+                	a.setBillId(byId.getId());
+                	a.setUserCode(byId.getSender());
+                	a.setNodeStatus(BillTaskStatus.COMPLATE.getStatus());
+                	a.setNodeName(byId.getTitle());
+                	a.setOpinion("通过");
+                	flowMsgLogic.sendMsg(Lists.newArrayList(a));
                     callBackLogic.callBack(byId.getProcessId(), billId, BillStatus.COMPLETE.getStatus());
                 }
             }

bpm-core/src/main/java/com/srm/bpm/logic/service/impl/FlowMsgLogicImpl.java

@@ -1,12 +1,20 @@
 
-
 package com.srm.bpm.logic.service.impl;
 
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
+import org.jetbrains.annotations.NotNull;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-
 import com.srm.bpm.infra.entity.BillTaskEntity;
+import com.srm.bpm.infra.entity.ProcessNodeExtendEntity;
 import com.srm.bpm.infra.entity.ToaBillEntity;
+import com.srm.bpm.infra.service.ProcessNodeExtendService;
 import com.srm.bpm.infra.service.ToaBillService;
 import com.srm.bpm.logic.constant.BillTaskStatus;
 import com.srm.bpm.logic.constant.BillTaskType;
@@ -15,13 +23,6 @@ import com.srm.bpm.logic.dto.FlowMsgDTO;
 import com.srm.bpm.logic.service.FlowMsgLogic;
 import com.srm.bpm.logic.service.PushMsgLogic;
 
-import org.jetbrains.annotations.NotNull;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-
 import cn.hutool.core.collection.CollectionUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -37,173 +38,197 @@ import lombok.extern.slf4j.Slf4j;
 @Service
 @Slf4j
 public class FlowMsgLogicImpl implements FlowMsgLogic {
-    private final ToaBillService billService;
-    private final PushMsgLogic pushMsgLogic;
-
-    @Override
-    public void sendMsg(List<BillTaskEntity> billTaskEntities) {
-        if (CollectionUtil.isNotEmpty(billTaskEntities)) {
-            final BillTaskEntity billTaskEntity = billTaskEntities.get(0);
-            final Long billId = billTaskEntity.getBillId();
-            final Optional<ToaBillEntity> billOpt = billService.unique(billId);
-            if (billOpt.isPresent()) {
-                final ToaBillEntity toaBillEntity = billOpt.get();
-                final String title = toaBillEntity.getTitle();
-                final String createUserCode = toaBillEntity.getSender();
-                final List<FlowMsgDTO> allMsg = Lists.newArrayList();
-                for (BillTaskEntity taskEntity : billTaskEntities) {
-                    final Integer taskType = taskEntity.getTaskType();
-                    final BillTaskType billTaskType = BillTaskType.forValue(taskType);
-                    List<FlowMsgDTO> flowMsgDTOS = Lists.newArrayList();
-                    switch (billTaskType) {
-                        case DEFAULT:
-                            flowMsgDTOS = defaultNodeType(taskEntity, createUserCode, title);
-                            break;
-                        case SKIP:
-                            flowMsgDTOS = skipNodeType(taskEntity, createUserCode, title);
-                            break;
-                        case ENDORSE:
-                            flowMsgDTOS = endorseNodeType(taskEntity, createUserCode, title);
-                            break;
-                        case TRANSFER:
-                            flowMsgDTOS = transferNodeType(taskEntity, createUserCode, title);
-                            break;
-                        case TURN:
-                            flowMsgDTOS = turnNodeType(taskEntity, createUserCode, title);
-                            break;
-                    }
-                    allMsg.addAll(flowMsgDTOS);
-                }
-                log.debug("推送的消息是:{}", allMsg);
-//                TODO 注释消息
-//                pushMsgLogic.push(allMsg);
-            }
-        }
-    }
-
-    @Override
-    public void sendMsg(List<BillTaskEntity> billTaskEntities, boolean syncFlag) {
-        this.sendMsg(billTaskEntities);
-    }
-
-    private List<FlowMsgDTO> turnNodeType(BillTaskEntity taskEntity, String createUser, String title) {
-        final Integer nodeStatus = taskEntity.getNodeStatus();
-        final BillTaskStatus billTaskStatus = BillTaskStatus.valueTo(nodeStatus);
-        Set<String> receivers = Sets.newConcurrentHashSet();
-        final String approver = taskEntity.getUserCode();
-        final String content = "移交" + getContent(createUser, billTaskStatus, receivers, approver);
-        List<FlowMsgDTO> msgDTOS = Lists.newArrayListWithExpectedSize(receivers.size());
-        receivers.forEach(a -> {
-            FlowMsgDTO flowMsgDTO = FlowMsgDTO.build(a, createUser, content, title, taskEntity.getNodeName(), taskEntity.getOpinion());
-            msgDTOS.add(flowMsgDTO);
-        });
-        return msgDTOS;
-    }
-
-    private List<FlowMsgDTO> transferNodeType(BillTaskEntity taskEntity, String createUser, String title) {
-        final Integer nodeStatus = taskEntity.getNodeStatus();
-        final BillTaskStatus billTaskStatus = BillTaskStatus.valueTo(nodeStatus);
-        Set<String> receivers = Sets.newConcurrentHashSet();
-        final String approver = taskEntity.getUserCode();
-        final String content = "转办" + getContent(createUser, billTaskStatus, receivers, approver);
-        List<FlowMsgDTO> msgDTOS = Lists.newArrayListWithExpectedSize(receivers.size());
-        receivers.forEach(a -> {
-            FlowMsgDTO flowMsgDTO = FlowMsgDTO.build(a, createUser, content, title, taskEntity.getNodeName(), taskEntity.getOpinion());
-            msgDTOS.add(flowMsgDTO);
-        });
-        return msgDTOS;
-    }
-
-    private List<FlowMsgDTO> endorseNodeType(BillTaskEntity taskEntity, String createUser, String title) {
-        final Integer nodeStatus = taskEntity.getNodeStatus();
-        final BillTaskStatus billTaskStatus = BillTaskStatus.valueTo(nodeStatus);
-        Set<String> receivers = Sets.newConcurrentHashSet();
-        final String approver = taskEntity.getUserCode();
-        final String content = "加签" + getContent(createUser, billTaskStatus, receivers, approver);
-        List<FlowMsgDTO> msgDTOS = Lists.newArrayListWithExpectedSize(receivers.size());
-        receivers.forEach(a -> {
-            FlowMsgDTO flowMsgDTO = FlowMsgDTO.build(a, createUser, content, title, taskEntity.getNodeName(), taskEntity.getOpinion());
-            msgDTOS.add(flowMsgDTO);
-        });
-        return msgDTOS;
-    }
-
-    private List<FlowMsgDTO> skipNodeType(BillTaskEntity taskEntity, String createUser, String title) {
-        final Integer nodeStatus = taskEntity.getNodeStatus();
-        final BillTaskStatus billTaskStatus = BillTaskStatus.valueTo(nodeStatus);
-        Set<String> receivers = Sets.newConcurrentHashSet();
-        final String approver = taskEntity.getUserCode();
-        final String content = getContent(createUser, billTaskStatus, receivers, approver);
-        List<FlowMsgDTO> msgDTOS = Lists.newArrayListWithExpectedSize(receivers.size());
-        receivers.forEach(a -> {
-            if (!a.equals(StringPool.ZERO)) {
-                FlowMsgDTO flowMsgDTO = FlowMsgDTO.build(a, createUser, content, title, taskEntity.getNodeName(), taskEntity.getOpinion());
-                msgDTOS.add(flowMsgDTO);
-            }
-        });
-        return msgDTOS;
-    }
-
-    private List<FlowMsgDTO> defaultNodeType(BillTaskEntity taskEntity, String createUser, String title) {
-        final Integer nodeStatus = taskEntity.getNodeStatus();
-        final BillTaskStatus billTaskStatus = BillTaskStatus.valueTo(nodeStatus);
-        Set<String> receivers = Sets.newConcurrentHashSet();
-        final String approver = taskEntity.getUserCode();
-        final String content = getContent(createUser, billTaskStatus, receivers, approver);
-        List<FlowMsgDTO> msgDTOS = Lists.newArrayListWithExpectedSize(receivers.size());
-        receivers.forEach(a -> {
-            FlowMsgDTO flowMsgDTO = FlowMsgDTO.build(a, createUser, content, title, taskEntity.getNodeName(), taskEntity.getOpinion());
-            msgDTOS.add(flowMsgDTO);
-        });
-        return msgDTOS;
-    }
-
-    @NotNull
-    private String getContent(String createUser, BillTaskStatus billTaskStatus, Set<String> receivers, String approver) {
-        final String content;
-        switch (billTaskStatus) {
-            case APPROVAL:
-                content = "审批中";
-                receivers.add(approver);
-                break;
-            case SKIP:
-                content = "自动跳过";
-                break;
-            case ENDORSE:
-                content = "加签";
-                receivers.add(approver);
-                break;
-            case AGREE:
-                content = "已同意";
-                receivers.add(approver);
-                receivers.add(createUser);
-                break;
-            case REFUSE:
-                content = "已拒绝";
-                receivers.add(approver);
-                receivers.add(createUser);
-                break;
-            case REPULSE:
-                content = "已退回";
-                receivers.add(approver);
-                receivers.add(createUser);
-                break;
-            case TRANSFER:
-                content = "已转办";
-                receivers.add(approver);
-                break;
-            case TURN:
-                content = "已移交";
-                receivers.add(approver);
-                break;
-            case REFUSE_FILL_IN:
-                content = "重新填写";
-                receivers.add(createUser);
-                break;
-            default:
-                content = "";
-                break;
-        }
-        return content;
-    }
+	private final ToaBillService billService;
+	private final PushMsgLogic pushMsgLogic;
+	private final ProcessNodeExtendService nodeExtendService;
+
+	@Override
+	public void sendMsg(List<BillTaskEntity> billTaskEntities) {
+		if (CollectionUtil.isNotEmpty(billTaskEntities)) {
+			final BillTaskEntity billTaskEntity = billTaskEntities.get(0);
+			final Long billId = billTaskEntity.getBillId();
+
+			if (billTaskEntity.getNodeStatus() == BillTaskStatus.COMPLATE.getStatus()) {
+				List<FlowMsgDTO> flowMsgDTOS = Lists.newArrayList();
+				FlowMsgDTO flowMsgDTO = new FlowMsgDTO();
+				flowMsgDTO.setBillTitle(billTaskEntity.getNodeName());
+				flowMsgDTO.setBillId(billTaskEntity.getBillId());
+				flowMsgDTO.setContent(billTaskEntity.getOpinion());
+				flowMsgDTO.setPush("0,1,2");
+				flowMsgDTO.setUserCode(billTaskEntity.getUserCode());
+				flowMsgDTOS.add(flowMsgDTO);
+				pushMsgLogic.push(flowMsgDTOS);
+			} else {
+				final String taskNodeKey = billTaskEntity.getTaskNodeKey();
+				QueryWrapper<ProcessNodeExtendEntity> wrapper = new QueryWrapper<ProcessNodeExtendEntity>();
+				wrapper.eq("node_id", taskNodeKey);
+				ProcessNodeExtendEntity processNodeExtendEntity = nodeExtendService.getOne(wrapper);
+				String push = processNodeExtendEntity.getPush();
+				final Optional<ToaBillEntity> billOpt = billService.unique(billId);
+				if (billOpt.isPresent()) {
+					final ToaBillEntity toaBillEntity = billOpt.get();
+					final String title = toaBillEntity.getTitle();
+					final String createUserCode = toaBillEntity.getSender();
+					final List<FlowMsgDTO> allMsg = Lists.newArrayList();
+					for (BillTaskEntity taskEntity : billTaskEntities) {
+						final Integer taskType = taskEntity.getTaskType();
+						final BillTaskType billTaskType = BillTaskType.forValue(taskType);
+						List<FlowMsgDTO> flowMsgDTOS = Lists.newArrayList();
+						switch (billTaskType) {
+						case DEFAULT:
+							flowMsgDTOS = defaultNodeType(taskEntity, createUserCode, title, push);
+							break;
+						case SKIP:
+							flowMsgDTOS = skipNodeType(taskEntity, createUserCode, title, push);
+							break;
+						case ENDORSE:
+							flowMsgDTOS = endorseNodeType(taskEntity, createUserCode, title, push);
+							break;
+						case TRANSFER:
+							flowMsgDTOS = transferNodeType(taskEntity, createUserCode, title, push);
+							break;
+						case TURN:
+							flowMsgDTOS = turnNodeType(taskEntity, createUserCode, title, push);
+							break;
+						}
+						allMsg.addAll(flowMsgDTOS);
+					}
+					log.debug("推送的消息是:{}", allMsg);
+					pushMsgLogic.push(allMsg);
+				}
+			}
+		}
+	}
+
+	@Override
+	public void sendMsg(List<BillTaskEntity> billTaskEntities, boolean syncFlag) {
+		this.sendMsg(billTaskEntities);
+	}
+
+	private List<FlowMsgDTO> turnNodeType(BillTaskEntity taskEntity, String createUser, String title, String push) {
+		final Integer nodeStatus = taskEntity.getNodeStatus();
+		final BillTaskStatus billTaskStatus = BillTaskStatus.valueTo(nodeStatus);
+		Set<String> receivers = Sets.newConcurrentHashSet();
+		final String approver = taskEntity.getUserCode();
+		final String content = "移交" + getContent(createUser, billTaskStatus, receivers, approver);
+		List<FlowMsgDTO> msgDTOS = Lists.newArrayListWithExpectedSize(receivers.size());
+		receivers.forEach(a -> {
+			FlowMsgDTO flowMsgDTO = FlowMsgDTO.build(a, createUser, content, push, title, taskEntity.getNodeName(),
+					taskEntity.getOpinion(), taskEntity.getBillId());
+			msgDTOS.add(flowMsgDTO);
+		});
+		return msgDTOS;
+	}
+
+	private List<FlowMsgDTO> transferNodeType(BillTaskEntity taskEntity, String createUser, String title, String push) {
+		final Integer nodeStatus = taskEntity.getNodeStatus();
+		final BillTaskStatus billTaskStatus = BillTaskStatus.valueTo(nodeStatus);
+		Set<String> receivers = Sets.newConcurrentHashSet();
+		final String approver = taskEntity.getUserCode();
+		final String content = "转办" + getContent(createUser, billTaskStatus, receivers, approver);
+		List<FlowMsgDTO> msgDTOS = Lists.newArrayListWithExpectedSize(receivers.size());
+		receivers.forEach(a -> {
+			FlowMsgDTO flowMsgDTO = FlowMsgDTO.build(a, createUser, content, title, push, taskEntity.getNodeName(),
+					taskEntity.getOpinion(), taskEntity.getBillId());
+			msgDTOS.add(flowMsgDTO);
+		});
+		return msgDTOS;
+	}
+
+	private List<FlowMsgDTO> endorseNodeType(BillTaskEntity taskEntity, String createUser, String title, String push) {
+		final Integer nodeStatus = taskEntity.getNodeStatus();
+		final BillTaskStatus billTaskStatus = BillTaskStatus.valueTo(nodeStatus);
+		Set<String> receivers = Sets.newConcurrentHashSet();
+		final String approver = taskEntity.getUserCode();
+		final String content = "加签" + getContent(createUser, billTaskStatus, receivers, approver);
+		List<FlowMsgDTO> msgDTOS = Lists.newArrayListWithExpectedSize(receivers.size());
+		receivers.forEach(a -> {
+			FlowMsgDTO flowMsgDTO = FlowMsgDTO.build(a, createUser, content, title, push, taskEntity.getNodeName(),
+					taskEntity.getOpinion(), taskEntity.getBillId());
+			msgDTOS.add(flowMsgDTO);
+		});
+		return msgDTOS;
+	}
+
+	private List<FlowMsgDTO> skipNodeType(BillTaskEntity taskEntity, String createUser, String title, String push) {
+		final Integer nodeStatus = taskEntity.getNodeStatus();
+		final BillTaskStatus billTaskStatus = BillTaskStatus.valueTo(nodeStatus);
+		Set<String> receivers = Sets.newConcurrentHashSet();
+		final String approver = taskEntity.getUserCode();
+		final String content = getContent(createUser, billTaskStatus, receivers, approver);
+		List<FlowMsgDTO> msgDTOS = Lists.newArrayListWithExpectedSize(receivers.size());
+		receivers.forEach(a -> {
+			if (!a.equals(StringPool.ZERO)) {
+				FlowMsgDTO flowMsgDTO = FlowMsgDTO.build(a, createUser, content, title, push, taskEntity.getNodeName(),
+						taskEntity.getOpinion(), taskEntity.getBillId());
+				msgDTOS.add(flowMsgDTO);
+			}
+		});
+		return msgDTOS;
+	}
+
+	private List<FlowMsgDTO> defaultNodeType(BillTaskEntity taskEntity, String createUser, String title, String push) {
+		final Integer nodeStatus = taskEntity.getNodeStatus();
+		final BillTaskStatus billTaskStatus = BillTaskStatus.valueTo(nodeStatus);
+		Set<String> receivers = Sets.newConcurrentHashSet();
+		final String approver = taskEntity.getUserCode();
+		final String content = getContent(createUser, billTaskStatus, receivers, approver);
+		List<FlowMsgDTO> msgDTOS = Lists.newArrayListWithExpectedSize(receivers.size());
+		receivers.forEach(a -> {
+			FlowMsgDTO flowMsgDTO = FlowMsgDTO.build(a, createUser, content, title, push, taskEntity.getNodeName(),
+					taskEntity.getOpinion(), taskEntity.getBillId());
+			msgDTOS.add(flowMsgDTO);
+		});
+		return msgDTOS;
+	}
+
+	@NotNull
+	private String getContent(String createUser, BillTaskStatus billTaskStatus, Set<String> receivers,
+			String approver) {
+		final String content;
+		switch (billTaskStatus) {
+		case APPROVAL:
+			content = "审批中";
+			receivers.add(approver);
+			break;
+		case SKIP:
+			content = "自动跳过";
+			break;
+		case ENDORSE:
+			content = "加签";
+			receivers.add(approver);
+			break;
+		case AGREE:
+			content = "已同意";
+			receivers.add(approver);
+			//receivers.add(createUser);
+			break;
+		case REFUSE:
+			content = "已拒绝";
+			//receivers.add(approver);
+			receivers.add(createUser);
+			break;
+		case REPULSE:
+			content = "已退回";
+			receivers.add(approver);
+			receivers.add(createUser);
+			break;
+		case TRANSFER:
+			content = "已转办";
+			receivers.add(approver);
+			break;
+		case TURN:
+			content = "已移交";
+			receivers.add(approver);
+			break;
+		case REFUSE_FILL_IN:
+			content = "重新填写";
+			receivers.add(createUser);
+			break;
+		default:
+			content = "";
+			break;
+		}
+		return content;
+	}
 }

bpm-core/src/main/java/com/srm/bpm/logic/service/impl/ProcessDesingerLogicImpl.java

@@ -207,6 +207,7 @@ public class ProcessDesingerLogicImpl implements ProcessDesingerLogic {
             nodeExtend.setId(nodeExtendId);
             nodeExtend.setNodeId(nodeId);
             nodeExtend.setBtns(nodeSetting.getBtns());
+            nodeExtend.setPush(nodeSetting.getPush());
             nodeExtend.setNodeType(nodeSetting.getNtype());
             nodeExtend.setNodeName(nodeSetting.getTitle());
             nodeExtend.setAutoAgree(nodeSetting.getAutoAgree());

bpm-core/src/main/java/com/srm/bpm/logic/vo/ProcessNodeVO.java

@@ -43,6 +43,7 @@ public class ProcessNodeVO implements Serializable {
     private String title;
     private BigDecimal autoNextHours;
     private String autoAgree;
+    private String push;
     private String btns;
     private Integer countersignFlag;
     private Integer batchApproval;

bpm-core/src/main/resources/static/designer/app/design/flow-node-setting/panel/task.js

@@ -41,7 +41,8 @@ define(function (require, exports, module) {
                 "autoAgreeTitle",
                 "noApprovalOperationTitle",
                 "autoNextHoursTitle",
-                "selectApprovalTitle"];
+                "selectApprovalTitle",
+                "pushTitle"];
             var linkType = this.getNodeSettingByName('linkType');
             if (Foundation.isEmpty(linkType)) {
                 linkType = 'create';
@@ -297,6 +298,12 @@ define(function (require, exports, module) {
                         }]
                     ]
                 },
+                {
+                    xtype: 'title',
+                    title: "推送配置",
+                    id: "pushTitle",
+                },
+                this.__getpushConfig(),
                 "-",
                 {
                     xtype: 'title',
@@ -447,6 +454,67 @@ define(function (require, exports, module) {
                 ]
             }
         },
+         //推送配置
+        __getpushConfig: function () {
+            var self = this;
+            var tmpValue = self.getNodeSettingByName('push') + "";
+            var email = false;	// 邮件
+            var msg = false;	// 站内信
+            var app = false;	// 小程序
+            if (!Foundation.isEmpty(tmpValue)) {
+                var options = tmpValue.split(",");
+                email = options.indexOf("0") != -1
+                msg = options.indexOf("1") != -1
+                app = options.indexOf("2") != -1
+            }
+
+            function stateChange(selected, r) {
+                var tmpValue = self.getNodeSettingByName('push');
+                if (Foundation.isEmpty(tmpValue) || tmpValue == "undefined") {
+                    if (selected) {
+                        self.setNodeSetting('push', r);
+                    }
+                } else {
+                    var options = tmpValue.split(",");
+                    if (selected) {
+                        options.push(r);
+                    } else {
+                        Foundation.Array.remove(options, r);
+                    }
+                    self.setNodeSetting('push', options.join(","));
+                }
+            }
+
+            return {
+                xtype: "tablecontainer",
+                rowSize: ["auto","auto","auto"],
+                colSize: ["auto"],
+                items: [
+                    [{
+                        xtype: 'checkbox',
+                        text: '推送邮件',
+                        value: email,
+                        onStateChange: (selected) => {
+                            stateChange(selected, "0");
+                        }
+                    }], [{
+                        xtype: 'checkbox',
+                        text: '推送站内信',
+                        value: msg,
+                        onStateChange: (selected) => {
+                            stateChange(selected, "1");
+                        }
+                    }], [{
+                        xtype: 'checkbox',
+                        text: '推送流程中心',
+                        value: app,
+                        onStateChange: (selected) => {
+                            stateChange(selected, "2");
+                        }
+                    }]
+                ]
+            }
+        },
         // 弹出节点抄送人配置
         __getProcessCcBoxConfig: function () {
             var self = this;

bpm-server/src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ bpm:
   target-url: http://127.0.0.1:8778
   type: 1
   callback-url: http://127.0.0.1:8778/bill/rest/callback
-  pushmsg-url: http://127.0.0.1:8778/bill/rest/pushmsg
+  pushmsg-url: http://127.0.0.1:8778/task/pushmsg
 spring:
   jackson:
     time-zone: GMT+8

bpm-server/src/main/resources/application-prod.yml

@@ -4,7 +4,7 @@ bpm:
   target-url: http://127.0.0.1:9888
   type: 1
   callback-url: http://127.0.0.1:9888/bill/rest/callback
-  pushmsg-url: http://127.0.0.1:9888/bill/rest/pushmsg
+  pushmsg-url: http://127.0.0.1:9888/task/pushmsg
 spring:
   jackson:
     time-zone: GMT+8

bpm-server/src/main/resources/application-test.yml

@@ -4,7 +4,7 @@ bpm:
   target-url: http://172.16.0.71:8778
   type: 1
   callback-url: http://127.0.0.1:8778/bill/rest/callback
-  pushmsg-url: http://127.0.0.1:8778/bill/rest/pushmsg
+  pushmsg-url: http://127.0.0.1:8778/task/pushmsg
 spring:
   jackson:
     time-zone: GMT+8