Merge remote-tracking branch 'origin/master'

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

bpm-core/src/main/java/com/srm/bpm/facade/rest/ProcessTreeRestController.java

@@ -32,14 +32,15 @@ public class ProcessTreeRestController {
 
     @GetMapping("/organization")
     public R organization(String q) {
-        final List<ZTreeDTO> organization = userCenterlogic.organization("",Strings.isNullOrEmpty(q) ? "" : q);
+        final List<ZTreeDTO> organization = userCenterlogic.organization("",Strings.isNullOrEmpty(q) ? "" : q, null);
         return R.ok(organization);
     }
 
     @GetMapping("/organization/user")
     public R organizationUser(String q,
-                              @RequestParam(value = "onlyChoiceUser", required = false) boolean onlyChoiceUser) {
-        return R.ok(userCenterlogic.organizationUser("",q, onlyChoiceUser));
+                              @RequestParam(value = "onlyChoiceUser", required = false) boolean onlyChoiceUser,
+                              @RequestParam(value = "state", required = false) String state) {
+        return R.ok(userCenterlogic.organizationUser("",q, onlyChoiceUser, state));
     }
 
 

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/UserCenterlogic.java

@@ -21,9 +21,9 @@ import cn.hutool.core.lang.Pair;
  * @since JDK 1.8
  */
 public interface UserCenterlogic {
-    List<ZTreeDTO> organization(String pid, String s);
+    List<ZTreeDTO> organization(String pid, String s, String state);
 
-    List<ZTreeDTO> organizationUser(String pid, String q, boolean onlyChoiceUser);
+    List<ZTreeDTO> organizationUser(String pid, String q, boolean onlyChoiceUser, String state);
 
     List<ZTreeDTO> positionUser(String pid);
 

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

@@ -199,8 +199,7 @@ public class BillLogicImpl implements BillLogic {
         final List<BillOpinionVO> opinionVOS = Lists.newArrayList();
         String firstNodeId = StringPool.EMPTY;
 
-        final List<ProcessNodeExtendEntity> taskNodes =
-                nodeExtendService.findTaskNodeByProcess(processId);
+        final List<ProcessNodeExtendEntity> taskNodes = nodeExtendService.findTaskNodeByProcess(processId);
         if (CollectionUtil.isNotEmpty(taskNodes)) {
             for (ProcessNodeExtendEntity taskNode : taskNodes) {
                 final String linkType = taskNode.getLinkType();
@@ -215,17 +214,14 @@ public class BillLogicImpl implements BillLogic {
             }
         }
         // 获取授权信息
-        final List<FormPermissionVO> permissionVOS = formBasicConvert.formPermissionPOtoVO(
-                nodeFieldPermission.nodeFieldPermission(processId, firstNodeId));
+        final List<FormPermissionVO> permissionVOS =
+                formBasicConvert.formPermissionPOtoVO(nodeFieldPermission.nodeFieldPermission(processId, firstNodeId));
         // 获取标题字段
         final ToaProcessEntity byId = processService.getById(processId);
-        final String code =
-                DateTimeUtil.format(LocalDateTime.now(), "yyyyMMddHHmm") + RandomUtil.randomNumbers(
-                        6);
+        final String code = DateTimeUtil.format(LocalDateTime.now(), "yyyyMMddHHmm") + RandomUtil.randomNumbers(6);
         // 获取标题字段
 
-        final UserInfoDTO userInfoByCode =
-                userCenterlogic.getUserInfoByCode(loginUserHolder.getUserCode());
+        final UserInfoDTO userInfoByCode = userCenterlogic.getUserInfoByCode(loginUserHolder.getUserCode());
         final String title = billTitleLogic.getTitle(processId, userInfoByCode.getNickname());
         final Map<String, Object> formData = bizFormData(process, userInfoByCode, title);
         // 按钮控制
@@ -255,9 +251,8 @@ public class BillLogicImpl implements BillLogic {
         if (bill == null) {
             throw new RbException(StringPool.EMPTY, BillCode.BILL_NOT_FOUND);
         }
-        final BillDataJsonEntity billDataJson = billDataJsonService.getOne(
-                Wrappers.lambdaQuery(BillDataJsonEntity.class)
-                        .eq(BillDataJsonEntity::getBillId, billId));
+        final BillDataJsonEntity billDataJson =
+                billDataJsonService.getOne(Wrappers.lambdaQuery(BillDataJsonEntity.class).eq(BillDataJsonEntity::getBillId, billId));
         if (null == billDataJson) {
             throw new RbException(StringPool.EMPTY, BillCode.BILL_NOT_FOUND);
         }
@@ -275,28 +270,17 @@ public class BillLogicImpl implements BillLogic {
         detailBuilder.selfTaskNames(getSelfNodeName(billId, loginUserHolder.getUserCode(), page));
         final List<BillOpinionVO> opinionVOS = billOpinions(bill);
         final String formSchema = billDataJson.getFormSchema();
-        return detailBuilder.form(formSchema)
-                .opinions(opinionVOS)
-                .title(bill.getTitle())
-                .code(bill.getCode())
-                .mode("edit")
-                .build();
+        return detailBuilder.form(formSchema).opinions(opinionVOS).title(bill.getTitle()).code(bill.getCode()).mode("edit").build();
     }
 
     private Set<String> getSelfNodeName(long billId, String user, String page) {
         if (page.equals("view")) {
-            List<BillTaskEntity> billTaskEntities =
-                    billTaskService.findApprovedByBillAndUser(billId, user);
-            final Set<String> nodeNames = billTaskEntities.stream()
-                    .map(BillTaskEntity::getNodeName)
-                    .collect(Collectors.toSet());
+            List<BillTaskEntity> billTaskEntities = billTaskService.findApprovedByBillAndUser(billId, user);
+            final Set<String> nodeNames = billTaskEntities.stream().map(BillTaskEntity::getNodeName).collect(Collectors.toSet());
             return nodeNames;
         } else {
-            List<BillTaskEntity> billTaskEntities =
-                    billTaskService.findApprovingByBillAndUser(billId, user);
-            final Set<String> nodeNames = billTaskEntities.stream()
-                    .map(BillTaskEntity::getNodeName)
-                    .collect(Collectors.toSet());
+            List<BillTaskEntity> billTaskEntities = billTaskService.findApprovingByBillAndUser(billId, user);
+            final Set<String> nodeNames = billTaskEntities.stream().map(BillTaskEntity::getNodeName).collect(Collectors.toSet());
             return nodeNames;
         }
     }
@@ -310,9 +294,7 @@ public class BillLogicImpl implements BillLogic {
         if (bill == null) {
             throw new RbException(StringPool.EMPTY, BillCode.BILL_NOT_FOUND);
         }
-        final BillDataJsonEntity billDataJson = billDataJsonService.getOne(
-                Wrappers.lambdaQuery(BillDataJsonEntity.class)
-                        .eq(BillDataJsonEntity::getBillId, billId));
+        final BillDataJsonEntity billDataJson = billDataJsonService.getOne(Wrappers.lambdaQuery(BillDataJsonEntity.class).eq(BillDataJsonEntity::getBillId, billId));
         if (null == billDataJson) {
             throw new RbException(StringPool.EMPTY, BillCode.BILL_NOT_FOUND);
         }
@@ -330,11 +312,7 @@ public class BillLogicImpl implements BillLogic {
         detailBuilder.selfTaskNames(getSelfNodeName(billId, loginUserHolder.getUserCode(), page));
         final List<BillOpinionVO> opinionVOS = billOpinions(bill);
         final String formSchema = billDataJson.getFormSchema();
-        return detailBuilder.form(formSchema)
-                .code(bill.getCode())
-                .opinions(opinionVOS)
-                .mode("view")
-                .build();
+        return detailBuilder.form(formSchema).code(bill.getCode()).opinions(opinionVOS).mode("view").build();
     }
 
     /**
@@ -353,8 +331,8 @@ public class BillLogicImpl implements BillLogic {
         final String userCode = loginUserHolder.getUserCode();
         // 不是自己发起的，记录读取
         final String sender = bill.getSender();
-        return sender.equals(userCode) || billReadRecordService.readBillByUserCode(billId,
-                userCode);
+        return sender.equals(userCode)
+                || billReadRecordService.readBillByUserCode(billId, userCode);
     }
 
     /**
@@ -369,8 +347,7 @@ public class BillLogicImpl implements BillLogic {
     public BillItemVO saveDrafts(long processId, long billId, String formDataJson) {
         Preconditions.checkNotNull(formDataJson);
         final ProcessDetailPO processDetail = this.processService.findDetailById(processId);
-        final Map<String, Object> dataMap =
-                JSON.parseObject(formDataJson, FastJsonType.MAP_OBJECT_TR);
+        final Map<String, Object> dataMap = JSON.parseObject(formDataJson, FastJsonType.MAP_OBJECT_TR);
         final BillDataContext billDataValue;
         billDataValue = this.resolveFormData(billId, processDetail, dataMap);
         final ToaBillEntity bill;
@@ -407,9 +384,7 @@ public class BillLogicImpl implements BillLogic {
      * @return 数据和总数
      */
     @Override
-    public Pair<List<BillItemVO>, Long> findApproved(
-            Integer pageNo, Integer pageSize, ApprovedBillQuery query
-    ) {
+    public Pair<List<BillItemVO>, Long> findApproved(Integer pageNo, Integer pageSize, ApprovedBillQuery query) {
         Page page = new Page<>(pageNo, pageSize);
         final List<BillItemPO> billItemDtos;
         final String userCode = loginUserHolder.getUserCode();
@@ -427,15 +402,13 @@ public class BillLogicImpl implements BillLogic {
      * @return 数据和总数
      */
     @Override
-    public Pair<List<BillItemVO>, Long> findTodo(
-            Integer pageNo, Integer pageSize, TodoBillQuery query
-    ) {
+    public Pair<List<BillItemVO>, Long> findTodo(Integer pageNo, Integer pageSize, TodoBillQuery query) {
         Page page = new Page(pageNo, pageSize);
-        List<Integer> statusList =
-                Lists.newArrayList(BillStatus.APPROVAL.getStatus(), BillStatus.REFUSE.getStatus());
+        List<Integer> statusList = Lists.newArrayList(
+                BillStatus.APPROVAL.getStatus(), BillStatus.REFUSE.getStatus()
+        );
         final String userCode = loginUserHolder.getUserCode();
-        final List<BillItemPO> billDatas =
-                this.billService.findTodoByStatus(page, userCode, query, statusList);
+        final List<BillItemPO> billDatas = this.billService.findTodoByStatus(page, userCode, query, statusList);
         final Page<BillItemVO> billItemVOPage = toItemVOList(page, billDatas, userCode);
         return Pair.of(billItemVOPage.getRecords(), billItemVOPage.getTotal());
     }
@@ -449,13 +422,10 @@ public class BillLogicImpl implements BillLogic {
      * @return 数据和总数
      */
     @Override
-    public Pair<List<BillItemVO>, Long> findMeCreate(
-            Integer pageNo, Integer pageSize, MeCreateBillQuery query
-    ) {
+    public Pair<List<BillItemVO>, Long> findMeCreate(Integer pageNo, Integer pageSize, MeCreateBillQuery query) {
         Page page = new Page(pageNo, pageSize);
         final String userCode = loginUserHolder.getUserCode();
-        final List<BillItemPO> billDatas =
-                this.billService.findCreateByEmployee(page, userCode, query);
+        final List<BillItemPO> billDatas = this.billService.findCreateByEmployee(page, userCode, query);
         final Page<BillItemVO> billItemVOPage = toItemVOList(page, billDatas, userCode);
         return Pair.of(billItemVOPage.getRecords(), billItemVOPage.getTotal());
     }
@@ -469,13 +439,10 @@ public class BillLogicImpl implements BillLogic {
      * @return 数据和总数
      */
     @Override
-    public Pair<List<BillItemVO>, Long> findDraft(
-            Integer pageNo, Integer pageSize, DraftBillQuery query
-    ) {
+    public Pair<List<BillItemVO>, Long> findDraft(Integer pageNo, Integer pageSize, DraftBillQuery query) {
         Page page = new Page(pageNo, pageSize);
         final String userCode = loginUserHolder.getUserCode();
-        final List<BillItemPO> billDatas =
-                this.billService.findDraftsBySender(page, userCode, query);
+        final List<BillItemPO> billDatas = this.billService.findDraftsBySender(page, userCode, query);
         final Page<BillItemVO> billItemVOPage = toItemVOList(page, billDatas, userCode);
         return Pair.of(billItemVOPage.getRecords(), billItemVOPage.getTotal());
     }
@@ -489,9 +456,7 @@ public class BillLogicImpl implements BillLogic {
      * @return 数据和总数
      */
     @Override
-    public Pair<List<BillItemVO>, Long> findCc(
-            Integer pageNo, Integer pageSize, CcBillQuery query
-    ) {
+    public Pair<List<BillItemVO>, Long> findCc(Integer pageNo, Integer pageSize, CcBillQuery query) {
         Page page = new Page(pageNo, pageSize);
         final String userCode = loginUserHolder.getUserCode();
         final List<BillItemPO> cc = this.billService.findCc(page, userCode, query);
@@ -509,13 +474,11 @@ public class BillLogicImpl implements BillLogic {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public BillItemVO startFlow(
-            long processId, long billId, String formDataJson, String nextApprover, String billCode
-    ) {
+    public BillItemVO startFlow(long processId, long billId, String formDataJson,
+                                String nextApprover, String billCode) {
         Preconditions.checkNotNull(formDataJson);
         final ProcessDetailPO processDetail = processService.findDetailById(processId);
-        final Map<String, Object> dataMap =
-                JSON.parseObject(formDataJson, FastJsonType.MAP_OBJECT_TR);
+        final Map<String, Object> dataMap = JSON.parseObject(formDataJson, FastJsonType.MAP_OBJECT_TR);
         final String userCode = loginUserHolder.getUserCode();
         final UserInfoDTO userInfoDTO = userCenterlogic.getUserInfoByCode(userCode);
         final BillDataContext billDataValue;
@@ -583,12 +546,11 @@ public class BillLogicImpl implements BillLogic {
                     //找到审批中的节点，然后把排序前移
                     final BillTaskEntity byId = billTaskService.getById(sourceTaskId);
                     final String taskId = byId.getTaskId();
-                    final List<BillTaskEntity> approvingByBillAndTaskId =
-                            billTaskService.findApprovingByBillAndTaskId(billId, taskId);
+                    final List<BillTaskEntity> approvingByBillAndTaskId = billTaskService.findApprovingByBillAndTaskId(billId, taskId);
                     for (BillTaskEntity billTaskEntity : approvingByBillAndTaskId) {
                         billTaskEntity.setSort(DateTimeUtil.timeMills());
                     }
-                    //                    approvingByBillAndTaskId.add(createTaskByBill);
+//                    approvingByBillAndTaskId.add(createTaskByBill);
                     byId.setId(null);
                     byId.setOpinion(null);
                     byId.setNodeStatus(BillTaskStatus.APPROVAL.getStatus());
@@ -609,8 +571,7 @@ public class BillLogicImpl implements BillLogic {
         }
         // 先发起流程
         final Optional<ProcessInstance> processInstanceOpt;
-        processInstanceOpt =
-                billBpmnLogic.startFlow(billDataValue, processDetail, userInfoDTO, nextApprover);
+        processInstanceOpt = billBpmnLogic.startFlow(billDataValue, processDetail, userInfoDTO, nextApprover);
         if (processInstanceOpt.isPresent()) {
             final ProcessInstance processInstance = processInstanceOpt.get();
             final boolean state;
@@ -642,7 +603,7 @@ public class BillLogicImpl implements BillLogic {
                         bill.setStatus(BillStatus.APPROVAL.getStatus());
                         state = billService.updateById(bill);
                         // 取得审批任务信息进行更新
-                        //                        billTaskService.updateByReFullIn(billId, userInfoDTO.getCode());
+//                        billTaskService.updateByReFullIn(billId, userInfoDTO.getCode());
                         break;
                     }
                     default:
@@ -661,9 +622,7 @@ public class BillLogicImpl implements BillLogic {
         }
     }
 
-    private ValidationResultDTO validationBySubmitFlow(
-            ProcessDetailPO processDetail, BillDataContext billDataValue, String userCode
-    ) {
+    private ValidationResultDTO validationBySubmitFlow(ProcessDetailPO processDetail, BillDataContext billDataValue, String userCode) {
         final BillValidationLogic validationService = getValidationService(processDetail.getId());
         return validataionWithResult(billDataValue, userCode, validationService);
     }
@@ -676,18 +635,15 @@ public class BillLogicImpl implements BillLogic {
      * @return 审批单
      */
     @Override
-    public BillItemVO sendProcess(
-            long billId, long processId, String nextApprover
-    ) {
+    public BillItemVO sendProcess(long billId, long processId,
+                                  String nextApprover) {
         final ToaBillEntity bill = billService.getById(billId);
         if (bill == null) {
             throw new RbException(BillCode.BILL_NOT_FOUND);
         }
         //  去掉草稿箱的判断，通过具体执行函数来判断
 
-        final BillDataJsonEntity billDataJson = billDataJsonService.getOne(
-                Wrappers.lambdaQuery(BillDataJsonEntity.class)
-                        .eq(BillDataJsonEntity::getBillId, billId));
+        final BillDataJsonEntity billDataJson = billDataJsonService.getOne(Wrappers.lambdaQuery(BillDataJsonEntity.class).eq(BillDataJsonEntity::getBillId, billId));
         final String formData = billDataJson.getFormData();
         return this.startFlow(processId, billId, formData, nextApprover, StrUtil.EMPTY);
     }
@@ -718,8 +674,7 @@ public class BillLogicImpl implements BillLogic {
                 eventBus.post(billAgreeEvent);
             case APPROVAL: {
                 final Optional<BillTaskEntity> taskOpt;
-                taskOpt =
-                        billBpmnLogic.findTaskBybillAndEmployeeAndTaskId(billId, taskId, userCode);
+                taskOpt = billBpmnLogic.findTaskBybillAndEmployeeAndTaskId(billId, taskId, userCode);
                 if (taskOpt.isPresent()) {
                     BillTaskEntity billTask = taskOpt.get();
                     billTask.setOpinion(opinion);
@@ -737,21 +692,14 @@ public class BillLogicImpl implements BillLogic {
                                     final boolean goFlag = agreeIsGoOn(billTask);
                                     flowMsgLogic.sendMsg(Lists.newArrayList(billTask));
                                     if (goFlag) {
-                                        this.billTaskService.agreeTask(billTask, userCode,
-                                                actionParam);
-                                        this.billItemLogic.updateByFormDataByBill(billId,
-                                                actionParam.getFormData());
+                                        this.billTaskService.agreeTask(billTask, userCode, actionParam);
+                                        this.billItemLogic.updateByFormDataByBill(billId, actionParam.getFormData());
                                         //删除待审批的信息
-                                        this.billTaskService.deleteApproval(billTask.getBillId(),
-                                                billTask.getTaskId(),
-                                                BillTaskStatus.APPROVAL.getStatus());
-                                        this.billBpmnLogic.complete(bill, taskId, opinion, userCode,
-                                                nextApprover, actionParam.getFormData(),
-                                                billTask.getTaskNodeKey(), billTask.getTaskId());
+                                        this.billTaskService.deleteApproval(billTask.getBillId(), billTask.getTaskId(), BillTaskStatus.APPROVAL.getStatus());
+                                        this.billBpmnLogic.complete(bill, taskId, opinion, userCode, nextApprover, actionParam.getFormData(), billTask.getTaskNodeKey(), billTask.getTaskId());
 
                                     } else {
-                                        this.billTaskService.agreeTask(billTask, userCode,
-                                                actionParam);
+                                        this.billTaskService.agreeTask(billTask, userCode, actionParam);
                                     }
                                     break;
                                 case AGREE:
@@ -765,17 +713,12 @@ public class BillLogicImpl implements BillLogic {
                             switch (billTaskStatus) {
                                 case APPROVAL:
                                     //加签处理，需要把当前审批人在当前节点的所有加签任务都审批通过
-                                    List<BillTaskEntity> billTaskEntities =
-                                            billTaskService.findEndorseByUserAndTaskId(billId,
-                                                    taskId, userCode);
+                                    List<BillTaskEntity> billTaskEntities = billTaskService.findEndorseByUserAndTaskId(billId, taskId, userCode);
                                     List<BillTaskEntity> updates = Lists.newArrayList();
                                     List<BillTaskEntity> inserts = Lists.newArrayList();
                                     for (BillTaskEntity billTaskEntity : billTaskEntities) {
-                                        final BillTaskEntity newBillTask =
-                                                BeanUtil.sourceToTarget(billTask,
-                                                        BillTaskEntity.class);
-                                        billTaskEntity.setNodeStatus(
-                                                BillTaskStatus.AGREE.getStatus());
+                                        final BillTaskEntity newBillTask = BeanUtil.sourceToTarget(billTask, BillTaskEntity.class);
+                                        billTaskEntity.setNodeStatus(BillTaskStatus.AGREE.getStatus());
                                         billTaskEntity.setDateline(DateTimeUtil.unixTime());
                                         billTaskEntity.setUpdateTime(LocalDateTime.now());
                                         billTaskEntity.setOpinion(actionParam.getOpinion());
@@ -844,16 +787,15 @@ public class BillLogicImpl implements BillLogic {
         final int status = MoreObjects.firstNonNull(bill.getStatus(), 0);
         BillStatus billStatus = BillStatus.valueTo(status);
         switch (billStatus) {
-            //            case REFUSE:
-            //                //当前审批单是拒绝状态才会走这里
-            //                BillRefuseEvent billAgreeEvent = new BillRefuseEvent();
-            //                billAgreeEvent.setBillId(billId);
-            //                billAgreeEvent.setProcessId(bill.getProcessId());
-            //                eventBus.post(billAgreeEvent);
+//            case REFUSE:
+//                //当前审批单是拒绝状态才会走这里
+//                BillRefuseEvent billAgreeEvent = new BillRefuseEvent();
+//                billAgreeEvent.setBillId(billId);
+//                billAgreeEvent.setProcessId(bill.getProcessId());
+//                eventBus.post(billAgreeEvent);
             case APPROVAL: {
                 final Optional<BillTaskEntity> taskOpt;
-                taskOpt =
-                        billBpmnLogic.findTaskBybillAndEmployeeAndTaskId(billId, taskId, userCode);
+                taskOpt = billBpmnLogic.findTaskBybillAndEmployeeAndTaskId(billId, taskId, userCode);
                 if (taskOpt.isPresent()) {
                     BillTaskEntity task = taskOpt.get();
                     final int taskNodeStatus = task.getNodeStatus();
@@ -863,13 +805,10 @@ public class BillLogicImpl implements BillLogic {
                             refuseApproval(taskId, opinion, bill, userCode, task);
                             // 更新提交的formdata
                             final String formData = actionParam.getFormData();
-                            if (!Strings.isNullOrEmpty(
-                                    formData) && !org.apache.commons.lang3.StringUtils.equals("{}",
-                                    formData)) {
+                            if (!Strings.isNullOrEmpty(formData) && !org.apache.commons.lang3.StringUtils.equals("{}", formData)) {
                                 this.billItemLogic.updateByFormDataByBill(billId, formData);
                             }
-                            billTaskService.deleteApproval(task.getBillId(), task.getTaskId(),
-                                    BillTaskStatus.APPROVAL.getStatus());
+                            billTaskService.deleteApproval(task.getBillId(), task.getTaskId(), BillTaskStatus.APPROVAL.getStatus());
                             break;
                         case AGREE:
                         case REFUSE:
@@ -911,11 +850,16 @@ public class BillLogicImpl implements BillLogic {
                 final ToaBillEntity byId = billService.getById(billId);
                 billService.upldate(bill);
                 if (action.equals(BillAction.refuse.name())) {
-                    callBackLogic.callBack(byId.getProcessId(), billId,
-                            BillTaskStatus.REFUSE.getStatus());
+                    callBackLogic.callBack(byId.getProcessId(), billId, BillTaskStatus.REFUSE.getStatus());
                 } else {
-                    callBackLogic.callBack(byId.getProcessId(), billId,
-                            BillStatus.COMPLETE.getStatus());
+                	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());
                 }
             }
         };
@@ -935,20 +879,15 @@ public class BillLogicImpl implements BillLogic {
             throw new RbException(BillCode.BILL_NOT_FOUND);
         }
         final List<BillApprovalHistoryPO> byBill = billTaskService.findByBill(bill);
-        final Set<String> userCodes =
-                byBill.stream().map(BillApprovalHistoryPO::getUserCode).collect(Collectors.toSet());
-        final Set<String> userCodes1 = byBill.stream()
-                .map(BillApprovalHistoryPO::getSourceUserCode)
-                .collect(Collectors.toSet());
-        final Set<String> userCodes2 = byBill.stream()
-                .map(BillApprovalHistoryPO::getTargetUserCode)
-                .collect(Collectors.toSet());
+        final Set<String> userCodes = byBill.stream().map(BillApprovalHistoryPO::getUserCode).collect(Collectors.toSet());
+        final Set<String> userCodes1 = byBill.stream().map(BillApprovalHistoryPO::getSourceUserCode).collect(Collectors.toSet());
+        final Set<String> userCodes2 = byBill.stream().map(BillApprovalHistoryPO::getTargetUserCode).collect(Collectors.toSet());
         userCodes.addAll(userCodes1);
         userCodes.addAll(userCodes2);
         final List<UserInfoDTO> userInfoDTOS = userCenterlogic.getUserByCodes(userCodes);
         if (CollectionUtil.isNotEmpty(userInfoDTOS)) {
-            final Map<String, String> codeNameMap = userInfoDTOS.stream()
-                    .collect(Collectors.toMap(UserInfoDTO::getCode, UserInfoDTO::getNickname));
+            final Map<String, String> codeNameMap =
+                    userInfoDTOS.stream().collect(Collectors.toMap(UserInfoDTO::getCode, UserInfoDTO::getNickname));
             for (BillApprovalHistoryPO billApprovalHistoryPO : byBill) {
                 final String userCode = billApprovalHistoryPO.getUserCode();
                 final String name = codeNameMap.get(userCode);
@@ -961,21 +900,19 @@ public class BillLogicImpl implements BillLogic {
                 if (!Strings.isNullOrEmpty(targetUserCode)) {
                     billApprovalHistoryPO.setTargetUserName(codeNameMap.get(targetUserCode));
                 }
-                if (billApprovalHistoryPO.getTaskType()
-                        .compareTo(BillTaskType.SKIP.getValue()) == 0) {
+                if (billApprovalHistoryPO.getTaskType().compareTo(BillTaskType.SKIP.getValue()) == 0) {
                     billApprovalHistoryPO.setUserName(Const.SKIP_OPTION);
                 }
             }
         }
-        final List<BillApprovalHistoryPO> result = byBill.stream()
-                .sorted(Comparator.comparing(BillApprovalHistoryPO::getSort, (x, y) -> {
+        final List<BillApprovalHistoryPO> result =
+                byBill.stream().sorted(Comparator.comparing(BillApprovalHistoryPO::getSort, (x, y) -> {
                     if (x <= y) {
                         return -1;
                     } else {
                         return 1;
                     }
-                }))
-                .collect(Collectors.toList());
+                })).collect(Collectors.toList());
         return billBasicConvert.billApprovalHistoryPOToVO(result);
     }
 
@@ -1002,9 +939,7 @@ public class BillLogicImpl implements BillLogic {
         billBpmnLogic.recall(bill, taskId, opinion, userCode);
     }
 
-    private void refuseApproval(
-            String taskId, String opinion, ToaBillEntity bill, String userCode, BillTaskEntity task
-    ) {
+    private void refuseApproval(String taskId, String opinion, ToaBillEntity bill, String userCode, BillTaskEntity task) {
         final Optional<ProcessNodeExtendEntity> nodeExtendOpt;
         final Long processId = bill.getProcessId();
         final String taskNodeKey = task.getTaskNodeKey();
@@ -1027,14 +962,14 @@ public class BillLogicImpl implements BillLogic {
                     task.setOpinion(opinion);
                     task.setDateline(dateline);
                     task.setAction(BillAction.refuse.name());
-                    //                    bill.setStatus(BillStatus.REFUSE.getStatus());
-                    //                    bill.setUpdateTime(LocalDateTime.now());
+//                    bill.setStatus(BillStatus.REFUSE.getStatus());
+//                    bill.setUpdateTime(LocalDateTime.now());
                     //推送消息
                     List<BillTaskEntity> sends = Lists.newArrayList();
                     sends.add(task);
                     flowMsgLogic.sendMsg(sends);
                     billTaskService.updateById(task);
-                    //                    billService.updateById(bill);
+//                    billService.updateById(bill);
                     billReadRecordService.deleteByBillAndEmployeeId(bill.getId(), userCode);
                     billBpmnLogic.refuse(bill, taskId, opinion, userCode);
                     break;
@@ -1052,8 +987,7 @@ public class BillLogicImpl implements BillLogic {
         final String taskId = billTask.getTaskId();
         final Long billId = billTask.getBillId();
         final Long approverId = billTask.getNodeApproverId();
-        final ProcessNodeApproverEntity nodeApprover =
-                nodeApproverService.getByIdExludDel(approverId);
+        final ProcessNodeApproverEntity nodeApprover = nodeApproverService.getByIdExludDel(approverId);
         if (Objects.isNull(nodeApprover)) {
             //默认全部审批通过才能往下走
             final int percentage = 100;
@@ -1061,8 +995,7 @@ public class BillLogicImpl implements BillLogic {
             int total = billTaskService.findTotalCount(billId, taskId, billTask.getTaskType());
             final BigDecimal val1 = BigDecimal.valueOf(countActive + 1);
             final BigDecimal val2 = BigDecimal.valueOf(total);
-            final BigDecimal val3 =
-                    val1.divide(val2, 4, BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(100));
+            final BigDecimal val3 = val1.divide(val2, 4, BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(100));
             final BigDecimal val4 = BigDecimal.valueOf(percentage);
             return val3.compareTo(val4) >= 0 ? true : false;
         }
@@ -1085,8 +1018,7 @@ public class BillLogicImpl implements BillLogic {
             int total = billTaskService.findTotalCount(billId, taskId, billTask.getTaskType());
             final BigDecimal val1 = BigDecimal.valueOf(countActive + 1);
             final BigDecimal val2 = BigDecimal.valueOf(total);
-            final BigDecimal val3 =
-                    val1.divide(val2, 4, BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(100));
+            final BigDecimal val3 = val1.divide(val2, 4, BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(100));
             final BigDecimal val4 = BigDecimal.valueOf(percentage);
             return val3.compareTo(val4) >= 0 ? true : false;
         }
@@ -1100,8 +1032,7 @@ public class BillLogicImpl implements BillLogic {
             final Set<String> userCodes =
                     billDatas.stream().map(BillItemPO::getSender).collect(Collectors.toSet());
             final List<UserInfoDTO> userInfoDTOS = userCenterlogic.getUserByCodes(userCodes);
-            final Map<String, String> codeNameMap = userInfoDTOS.stream()
-                    .collect(Collectors.toMap(UserInfoDTO::getCode, a -> a.getNickname()));
+            final Map<String, String> codeNameMap = userInfoDTOS.stream().collect(Collectors.toMap(UserInfoDTO::getCode, a -> a.getNickname()));
             if (CollectionUtil.isNotEmpty(userInfoDTOS)) {
                 for (BillItemPO billData : billDatas) {
                     final String sender = billData.getSender();
@@ -1121,10 +1052,7 @@ public class BillLogicImpl implements BillLogic {
         return resultPage;
     }
 
-    private ToaBillEntity createBill(
-            ProcessDetailPO processDetail, BillStatus billStatus, BillDataContext billDataValue,
-            UserInfoDTO userInfoDTO
-    ) {
+    private ToaBillEntity createBill(ProcessDetailPO processDetail, BillStatus billStatus, BillDataContext billDataValue, UserInfoDTO userInfoDTO) {
         ToaBillEntity bill = new ToaBillEntity();
         bill.setId(billDataValue.getId());
         bill.setProcessId(processDetail.getId());
@@ -1154,7 +1082,7 @@ public class BillLogicImpl implements BillLogic {
             final String username = userInfoDTO.getNickname();
             // 生成默认流水号
             final String billCode = serialNumberLogic.dayPolling("bill_default_sn", 6);
-            //            String codeText = StrUtil.format("{}-{}-{}-{}", processName, username, day, billCode);
+//            String codeText = StrUtil.format("{}-{}-{}-{}", processName, username, day, billCode);
             String codeText = StrUtil.format("{}", billCode);
             bill.setCode(codeText);
         } else {
@@ -1174,9 +1102,7 @@ public class BillLogicImpl implements BillLogic {
      * @return 解析后的表单数据
      */
     @Override
-    public BillDataContext resolveFormData(
-            long billId, ProcessDetailPO processDetail, Map<String, Object> formDataMap
-    ) {
+    public BillDataContext resolveFormData(long billId, ProcessDetailPO processDetail, Map<String, Object> formDataMap) {
 
         long processId = processDetail.getId();
 
@@ -1216,8 +1142,7 @@ public class BillLogicImpl implements BillLogic {
             switch (formXtype) {
                 case triggerselect: {
                     final Pair<List<BillAssociatedVO>, List<BillBizDataEntity>> selectVal;
-                    selectVal = billItemLogic.formTriggerselectValue(formDataMap, formFieldVO,
-                            newBillId);
+                    selectVal = billItemLogic.formTriggerselectValue(formDataMap, formFieldVO, newBillId);
                     associateds.addAll(selectVal.getKey());
                     bizDataList.addAll(selectVal.getValue());
                     break;
@@ -1258,10 +1183,8 @@ public class BillLogicImpl implements BillLogic {
                         continue;
                     }
 
-                    final Triple<Boolean, List<BillAssociatedVO>, List<BillBizDataEntity>>
-                            detailItemTriple;
-                    detailItemTriple = billItemLogic.detailFormFileds(newBillId, detailgroupDatas,
-                            detailFields);
+                    final Triple<Boolean, List<BillAssociatedVO>, List<BillBizDataEntity>> detailItemTriple;
+                    detailItemTriple = billItemLogic.detailFormFileds(newBillId, detailgroupDatas, detailFields);
                     final Boolean attachment = detailItemTriple.getLeft();
                     if (attachment) {
                         dataValueBuilder.attachment(true);
@@ -1299,11 +1222,8 @@ public class BillLogicImpl implements BillLogic {
         final long billId = actionParam.getBillId();
         final String userCode = actionParam.getUserCode();
 
-        List<BillTaskEntity> billTaskEntities =
-                billTaskService.findApprovingByBillAndTaskId(billId, taskId);
-        final Set<String> collect = billTaskEntities.stream()
-                .map(BillTaskEntity::getUserCode)
-                .collect(Collectors.toSet());
+        List<BillTaskEntity> billTaskEntities = billTaskService.findApprovingByBillAndTaskId(billId, taskId);
+        final Set<String> collect = billTaskEntities.stream().map(BillTaskEntity::getUserCode).collect(Collectors.toSet());
         if (collect.contains(actionParam.getEndorseApprover())) {
             throw new RbException(ENDORSE_CANNOT_IN_NODE);
         }
@@ -1320,8 +1240,7 @@ public class BillLogicImpl implements BillLogic {
             case APPROVAL:
                 // 更新提交的formdata
                 final String formData = actionParam.getFormData();
-                if (!Strings.isNullOrEmpty(
-                        formData) && !org.apache.commons.lang3.StringUtils.equals("{}", formData)) {
+                if (!Strings.isNullOrEmpty(formData) && !org.apache.commons.lang3.StringUtils.equals("{}", formData)) {
                     this.billItemLogic.updateByFormDataByBill(billId, formData);
                 }
                 break;
@@ -1375,8 +1294,7 @@ public class BillLogicImpl implements BillLogic {
             case APPROVAL:
                 // 更新提交的formdata
                 final String formData = actionParam.getFormData();
-                if (!Strings.isNullOrEmpty(
-                        formData) && !org.apache.commons.lang3.StringUtils.equals("{}", formData)) {
+                if (!Strings.isNullOrEmpty(formData) && !org.apache.commons.lang3.StringUtils.equals("{}", formData)) {
                     this.billItemLogic.updateByFormDataByBill(billId, formData);
                 }
                 break;
@@ -1393,14 +1311,14 @@ public class BillLogicImpl implements BillLogic {
         task.setOpinion(opinion);
         task.setDateline(DateTimeUtil.unixTime());
         billTaskService.upldate(task);
-        final BillTaskEntity targetTask = billTaskService.getOne(
-                Wrappers.lambdaQuery(BillTaskEntity.class).eq(BillTaskEntity::getId, targetTaskId));
+        final BillTaskEntity targetTask = billTaskService.getOne(Wrappers.lambdaQuery(BillTaskEntity.class)
+                .eq(BillTaskEntity::getId, targetTaskId));
         if (Objects.isNull(targetTask)) {
             throw new RbException(TARGET_TASK_NULL);
         }
         final String taskNodeKey = targetTask.getTaskNodeKey();
-        final ProcessNodeExtendEntity extendEntity = nodeExtendService.getOne(
-                Wrappers.lambdaQuery(ProcessNodeExtendEntity.class)
+        final ProcessNodeExtendEntity extendEntity = nodeExtendService
+                .getOne(Wrappers.lambdaQuery(ProcessNodeExtendEntity.class)
                         .eq(ProcessNodeExtendEntity::getProcessId, byId.getProcessId())
                         .eq(ProcessNodeExtendEntity::getNodeId, taskNodeKey));
         List<BillTaskEntity> sends = Lists.newArrayList();
@@ -1409,21 +1327,17 @@ public class BillLogicImpl implements BillLogic {
                 .eq(BillTaskEntity::getBillId, billId)
                 .eq(BillTaskEntity::getTaskNodeKey, task.getTaskNodeKey()).ne(BillTaskEntity::getId,task.getId()));
         if (!extendEntity.getLinkType().equals(NodeLinkType.create.name())) {
-            billBpmnLogic.returnToTargetTask(task, targetTask, userCode, opinion,
-                    actionParam.getNextApprover());
+            billBpmnLogic.returnToTargetTask(task, targetTask, userCode, opinion, actionParam.getNextApprover());
         } else {
             /**
              *表示是退回到发起节点需要进行操作需要找到当前审批的最新的创建节点，然后找到任务taskId和用户然后重新创建一个节点任务
              */
-            billService.update(Wrappers.lambdaUpdate(ToaBillEntity.class)
-                    .set(ToaBillEntity::getStatus, BillStatus.REPULSE.getStatus())
-                    .eq(ToaBillEntity::getId, billId));
+            billService.update(Wrappers.lambdaUpdate(ToaBillEntity.class).set(ToaBillEntity::getStatus, BillStatus.REPULSE.getStatus()).eq(ToaBillEntity::getId, billId));
             BillTaskEntity createTask = billTaskService.findCreateTaskByBill(billId);
             if (Objects.isNull(createTask)) {
                 throw new RbException(StringPool.EMPTY, ProcessCode.PROCESS_ACTIVITI_ERROR);
             }
-            final BillTaskEntity newBillTask =
-                    BeanUtil.sourceToTarget(createTask, BillTaskEntity.class);
+            final BillTaskEntity newBillTask = BeanUtil.sourceToTarget(createTask, BillTaskEntity.class);
             newBillTask.setId(IdWorker.getId());
             newBillTask.setSourceTaskId(task.getId());
             newBillTask.setSourceUserCode(userCode);
@@ -1450,14 +1364,9 @@ public class BillLogicImpl implements BillLogic {
      * @param turnUser 移交用户
      */
     @Override
-    public void turnUser(
-            long billId, String taskId, String turnUser, String userCode, String opinion
-    ) {
-        List<BillTaskEntity> billTaskEntities =
-                billTaskService.findApprovingByBillAndTaskId(billId, taskId);
-        Set<String> collect = billTaskEntities.stream()
-                .map(BillTaskEntity::getUserCode)
-                .collect(Collectors.toSet());
+    public void turnUser(long billId, String taskId, String turnUser, String userCode, String opinion) {
+        List<BillTaskEntity> billTaskEntities = billTaskService.findApprovingByBillAndTaskId(billId, taskId);
+        Set<String> collect = billTaskEntities.stream().map(BillTaskEntity::getUserCode).collect(Collectors.toSet());
         // 更新移交
         final List<String> split = StrUtil.split(turnUser, ',');
         final Set<String> hashSet = new HashSet(split);
@@ -1478,8 +1387,7 @@ public class BillLogicImpl implements BillLogic {
 
                 List<BillTaskEntity> insertLists = Lists.newArrayList();
                 for (String s : hashSet) {
-                    final BillTaskEntity turnTask =
-                            BeanUtil.sourceToTarget(task, BillTaskEntity.class);
+                    final BillTaskEntity turnTask = BeanUtil.sourceToTarget(task, BillTaskEntity.class);
                     turnTask.setSourceTaskId(task.getId());
                     turnTask.setSourceUserCode(userCode);
                     turnTask.setTaskType(BillTaskType.TURN.getValue());
@@ -1515,11 +1423,9 @@ public class BillLogicImpl implements BillLogic {
     @Override
     public BillDetailVO<List<FormFieldVO>> createByApp(long processId) {
         ProcessDetailDTO process = checkProcess(processId);
-        final List<FormFieldVO> fieldVOS =
-                formBasicConvert.FormFieldPOToVO(formFieldService.findVoByProcessId(processId));
+        final List<FormFieldVO> fieldVOS = formBasicConvert.FormFieldPOToVO(formFieldService.findVoByProcessId(processId));
         List<BillOpinionVO> opinionVOS = Lists.newArrayList();
-        String firstNodeId = nodeExtendService.findTaskNodeIdByProcessAndLinkType(processId,
-                NodeLinkType.create);
+        String firstNodeId = nodeExtendService.findTaskNodeIdByProcessAndLinkType(processId, NodeLinkType.create);
         // 获取授权信息
         final List<FormPermissionVO> permissionVOS;
         permissionVOS = billBpmnLogic.nodeFieldPermission(processId, firstNodeId);
@@ -1550,11 +1456,8 @@ public class BillLogicImpl implements BillLogic {
      * @return 验证结果
      */
     @Override
-    public ValidationResultDTO validation(
-            long processId, long billId, String formDataJson, String userCode
-    ) {
-        final Map<String, Object> dataMap =
-                JSON.parseObject(formDataJson, FastJsonType.MAP_OBJECT_TR);
+    public ValidationResultDTO validation(long processId, long billId, String formDataJson, String userCode) {
+        final Map<String, Object> dataMap = JSON.parseObject(formDataJson, FastJsonType.MAP_OBJECT_TR);
         final BillDataContext billDataValue;
         final ProcessDetailPO processDetail = this.processService.findDetailById(processId);
         billDataValue = this.resolveFormDataByValidation(billId, processDetail, dataMap);
@@ -1572,24 +1475,19 @@ public class BillLogicImpl implements BillLogic {
      */
     @Override
     public List<String> getNodeCondition(long processId, long billId, String taskId) {
-        final List<BillTaskEntity> list = billTaskService.list(
-                Wrappers.lambdaQuery(BillTaskEntity.class)
-                        .eq(BillTaskEntity::getBillId, billId)
-                        .eq(BillTaskEntity::getTaskId, taskId));
-        final Set<String> nodeKeys =
-                list.stream().map(BillTaskEntity::getTaskNodeKey).collect(Collectors.toSet());
+        final List<BillTaskEntity> list = billTaskService.list(Wrappers.lambdaQuery(BillTaskEntity.class)
+                .eq(BillTaskEntity::getBillId, billId).eq(BillTaskEntity::getTaskId, taskId));
+        final Set<String> nodeKeys = list.stream().map(BillTaskEntity::getTaskNodeKey).collect(Collectors.toSet());
         if (CollectionUtil.isEmpty(nodeKeys)) {
             return Collections.emptyList();
         }
-        final List<ProcessNodeApproverEntity> list1 = nodeApproverService.list(
-                Wrappers.lambdaQuery(ProcessNodeApproverEntity.class)
+        final List<ProcessNodeApproverEntity> list1 = nodeApproverService
+                .list(Wrappers.lambdaQuery(ProcessNodeApproverEntity.class)
                         .eq(ProcessNodeApproverEntity::getProcessId, processId)
                         .in(ProcessNodeApproverEntity::getNodeId, nodeKeys));
-        final List<String> params = list1.stream()
-                .filter(a -> !Strings.isNullOrEmpty(a.getExpress()) && a.getExpress()
-                        .indexOf("implication") != -1)
-                .map(ProcessNodeApproverEntity::getExpressParams)
-                .collect(Collectors.toList());
+        final List<String> params =
+                list1.stream().filter(a -> !Strings.isNullOrEmpty(a.getExpress()) && a.getExpress().indexOf("implication") != -1)
+                        .map(ProcessNodeApproverEntity::getExpressParams).collect(Collectors.toList());
         List<String> result = Lists.newArrayList();
         for (String param : params) {
             final JSONObject jsonObject = JSON.parseObject(param);
@@ -1613,26 +1511,23 @@ public class BillLogicImpl implements BillLogic {
      */
     @Override
     public String findTodoSize() {
-        List<Integer> statusList =
-                Lists.newArrayList(BillStatus.APPROVAL.getStatus(), BillStatus.REFUSE.getStatus());
+        List<Integer> statusList = Lists.newArrayList(
+                BillStatus.APPROVAL.getStatus(), BillStatus.REFUSE.getStatus()
+        );
         final String userCode = loginUserHolder.getUserCode();
         final String todoSize = this.billService.findTodoSizeByStatus(userCode, statusList);
         return todoSize;
     }
 
     @Override
-    public Pair<List<BillItemVO>, Long> findAllByQuery(
-            Integer pageNo, Integer pageSize, DraftBillQuery query
-    ) {
+    public Pair<List<BillItemVO>, Long> findAllByQuery(Integer pageNo, Integer pageSize, DraftBillQuery query) {
         Page page = new Page(pageNo, pageSize);
         final List<BillItemPO> billDatas = this.billService.findAllByQuery(page, query);
         final Page<BillItemVO> billItemVOPage = toItemVOList(page, billDatas, null);
         return Pair.of(billItemVOPage.getRecords(), billItemVOPage.getTotal());
     }
 
-    private ValidationResultDTO validataionWithResult(
-            BillDataContext billDataValue, String userCode, BillValidationLogic validationService
-    ) {
+    private ValidationResultDTO validataionWithResult(BillDataContext billDataValue, String userCode, BillValidationLogic validationService) {
 
         if (null != validationService) {
             return validationService.validation(billDataValue, userCode);
@@ -1655,7 +1550,9 @@ public class BillLogicImpl implements BillLogic {
 
     @Transactional(readOnly = true, rollbackFor = Exception.class)
     public BillDataContext resolveFormDataByValidation(
-            long billId, ProcessDetailPO processDetail, Map<String, Object> formDataMap
+            long billId,
+            ProcessDetailPO processDetail,
+            Map<String, Object> formDataMap
     ) {
         long processId = processDetail.getId();
 
@@ -1727,10 +1624,8 @@ public class BillLogicImpl implements BillLogic {
                         continue;
                     }
 
-                    final Triple<Boolean, List<BillAssociatedVO>, List<BillBizDataEntity>>
-                            detailItemTriple;
-                    detailItemTriple = billItemLogic.detailFormFileds(newBillId, detailgroupDatas,
-                            detailFields);
+                    final Triple<Boolean, List<BillAssociatedVO>, List<BillBizDataEntity>> detailItemTriple;
+                    detailItemTriple = billItemLogic.detailFormFileds(newBillId, detailgroupDatas, detailFields);
                     final Boolean attachment = detailItemTriple.getLeft();
                     if (attachment) {
                         dataValueBuilder.attachment(true);
@@ -1754,13 +1649,11 @@ public class BillLogicImpl implements BillLogic {
     private List<BillOpinionVO> billOpinions(ToaBillEntity bill) {
         long processId = MoreObjects.firstNonNull(bill.getProcessId(), 0L);
         final List<BillOpinionVO> opinionVOS = Lists.newArrayList();
-        final List<ProcessNodeExtendEntity> taskNodes =
-                nodeExtendService.findTaskNodeByProcess(processId);
+        final List<ProcessNodeExtendEntity> taskNodes = nodeExtendService.findTaskNodeByProcess(processId);
         if (CollectionUtil.isNotEmpty(taskNodes)) {
             for (ProcessNodeExtendEntity taskNode : taskNodes) {
                 final String linkType = taskNode.getLinkType();
-                if (org.apache.commons.lang3.StringUtils.equals(linkType,
-                        NodeLinkType.approvl.name())) {
+                if (org.apache.commons.lang3.StringUtils.equals(linkType, NodeLinkType.approvl.name())) {
                     BillOpinionVO billOpinionVO = new BillOpinionVO();
                     billOpinionVO.setTitle(taskNode.getNodeName());
                     opinionVOS.add(billOpinionVO);
@@ -1770,15 +1663,11 @@ public class BillLogicImpl implements BillLogic {
         return opinionVOS;
     }
 
-    private <T> BillDetailVO.BillDetailVOBuilder<T> billDetailBuilder(
-            BillDataJsonEntity billDataJson, ToaBillEntity bill
-    ) {
+    private <T> BillDetailVO.BillDetailVOBuilder<T> billDetailBuilder(BillDataJsonEntity billDataJson, ToaBillEntity bill) {
         return billDetailBuilder(billDataJson, bill, StringPool.EMPTY);
     }
 
-    private <T> BillDetailVO.BillDetailVOBuilder<T> billDetailBuilder(
-            BillDataJsonEntity billDataJson, ToaBillEntity bill, String page
-    ) {
+    private <T> BillDetailVO.BillDetailVOBuilder<T> billDetailBuilder(BillDataJsonEntity billDataJson, ToaBillEntity bill, String page) {
         long billId = bill.getId();
         long processId = bill.getProcessId();
         final String userCode = loginUserHolder.getUserCode();
@@ -1832,9 +1721,8 @@ public class BillLogicImpl implements BillLogic {
                             for (FormPermissionVO permission : permissions) {
                                 permission.setEdit(false);
                             }
-                        } else if (!Strings.isNullOrEmpty(
-                                page) && org.apache.commons.lang3.StringUtils.equalsAny(page, "cc",
-                                "approved")) {
+                        } else if (!Strings.isNullOrEmpty(page)
+                                && org.apache.commons.lang3.StringUtils.equalsAny(page, "cc", "approved")) {
                             // 来自我发起的列表和抄送我的列表，这个时候，所有的按钮权限应该都是不可编辑的
                             for (FormPermissionVO permission : permissions) {
                                 permission.setEdit(false);
@@ -1845,8 +1733,7 @@ public class BillLogicImpl implements BillLogic {
                 }
                 case REFUSE_FILL_IN:
                     permissions = billBpmnLogic.findPermissionByProcessStartNode(processId);
-                    if (CollectionUtil.isNotEmpty(
-                            permissions) && billStatus == BillStatus.COMPLETE) {
+                    if (CollectionUtil.isNotEmpty(permissions) && billStatus == BillStatus.COMPLETE) {
                         for (FormPermissionVO permission : permissions) {
                             permission.setEdit(false);
                         }
@@ -1866,8 +1753,7 @@ public class BillLogicImpl implements BillLogic {
                 }
             }
         }
-        Map<String, Object> formData =
-                JSON.parseObject(billDataJson.getFormData(), FastJsonType.MAP_OBJECT_TR);
+        Map<String, Object> formData = JSON.parseObject(billDataJson.getFormData(), FastJsonType.MAP_OBJECT_TR);
         String title = StringPool.EMPTY;
         if (!Strings.isNullOrEmpty(bill.getTitle())) {
             title = bill.getTitle();
@@ -1884,9 +1770,7 @@ public class BillLogicImpl implements BillLogic {
          * 需要对按钮进行过滤
          */
         List<String> newBtns = billBtnLogic.filterByNode(billTask, btns);
-        detailBuilder.title(title)
-                .formData(formData)
-                .processId(processId)
+        detailBuilder.title(title).formData(formData).processId(processId)
                 .billId(billId)
                 .permission(permissions)
                 .btns(newBtns);
@@ -1918,13 +1802,10 @@ public class BillLogicImpl implements BillLogic {
      * @param title   审批标题
      * @return 封装后的表单字段信息
      */
-    private Map<String, Object> bizFormData(
-            ProcessDetailDTO process, UserInfoDTO userInfoDTO, String title
-    ) {
+    private Map<String, Object> bizFormData(ProcessDetailDTO process, UserInfoDTO userInfoDTO, String title) {
         final long processId = process.getId();
         final long processCodeId = Objects.isNull(process.getCodeId()) ? 0 : process.getCodeId();
-        final List<FormFieldEntity> bizFields =
-                this.formFieldService.findBizFiled(processId, FormXtype.biz);
+        final List<FormFieldEntity> bizFields = this.formFieldService.findBizFiled(processId, FormXtype.biz);
         if (CollectionUtil.isEmpty(bizFields)) {
             return Collections.emptyMap();
         }
@@ -1954,8 +1835,7 @@ public class BillLogicImpl implements BillLogic {
                     if (!Objects.isNull(userInfoDTO)) {
                         final List<UserOrgDTO> orgs = userInfoDTO.getOrgs();
                         if (CollectionUtil.isNotEmpty(orgs)) {
-                            final List<String> orgNames = orgs.stream()
-                                    .map(UserOrgDTO::getOrgName)
+                            final List<String> orgNames = orgs.stream().map(UserOrgDTO::getOrgName)
                                     .collect(Collectors.toList());
                             organizationName = StrUtil.join(",", orgNames);
                         }
@@ -1977,28 +1857,23 @@ public class BillLogicImpl implements BillLogic {
 
     @Override
     public List<ProcessTypeVO> findTodoCateSize() {
-        LambdaQueryWrapper<ProcessTypeEntity> wrapper =
-                Wrappers.lambdaQuery(ProcessTypeEntity.class);
+        LambdaQueryWrapper<ProcessTypeEntity> wrapper = Wrappers.lambdaQuery(ProcessTypeEntity.class);
 
         List<ProcessTypeEntity> processTypes = this.processTypeService.list(wrapper);
         if (CollectionUtil.isNotEmpty(processTypes)) {
             int processTypeSize = processTypes.size();
             List<ProcessTypeVO> types = Lists.newArrayListWithCapacity(processTypeSize);
-            List<Integer> statusList = Lists.newArrayList(
-                    new Integer[]{BillStatus.APPROVAL.getStatus(), BillStatus.REFUSE.getStatus()});
+            List<Integer> statusList = Lists.newArrayList(new Integer[]{BillStatus.APPROVAL.getStatus(), BillStatus.REFUSE.getStatus()});
             String userCode = this.loginUserHolder.getUserCode();
-            List<ProcessGridPO> todoCateSize =
-                    this.billService.findTodoCateSize(userCode, statusList);
+            List<ProcessGridPO> todoCateSize = this.billService.findTodoCateSize(userCode, statusList);
             List<ProcessVO> processVOS = this.processBasicConvert.processGridPOToVO(todoCateSize);
-            Map<Long, List<ProcessVO>> collect =
-                    (Map) processVOS.stream().collect(Collectors.groupingBy(ProcessVO::getTypeId));
+            Map<Long, List<ProcessVO>> collect = (Map)processVOS.stream().collect(Collectors.groupingBy(ProcessVO::getTypeId));
 
             ProcessTypeVO processTypeVO;
-            for (Iterator var10 = processTypes.iterator(); var10.hasNext(); types.add(
-                    processTypeVO)) {
-                ProcessTypeEntity processType = (ProcessTypeEntity) var10.next();
+            for(Iterator var10 = processTypes.iterator(); var10.hasNext(); types.add(processTypeVO)) {
+                ProcessTypeEntity processType = (ProcessTypeEntity)var10.next();
                 Long id = processType.getId();
-                List<ProcessVO> processVOS1 = (List) collect.get(id);
+                List<ProcessVO> processVOS1 = (List)collect.get(id);
                 processTypeVO = new ProcessTypeVO();
                 processTypeVO.setName(processType.getName());
                 processTypeVO.setId(processType.getId());

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/service/impl/PushMsgLogicImpl.java

@@ -12,10 +12,13 @@
 
 package com.srm.bpm.logic.service.impl;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -37,11 +40,14 @@ public class PushMsgLogicImpl implements PushMsgLogic {
 
 	@Override
 	public void push(List<FlowMsgDTO> allMsg) {
-		JSONObject data = new JSONObject();
-		data.put("msg", JSON.toJSON(allMsg));
-		log.info("回调返回的数据:{}", allMsg);
-		final ResponseEntity<R> post = restTemplateUtil.post(bpmConfig.getPushmsgUrl(), data, "1");
-		log.info("回调返回的数据:{}", post);
+		allMsg = allMsg.stream().filter(e->(e.getPush() != null && !e.getPush().equals(""))).collect(Collectors.toList());
+		if(!CollectionUtils.isEmpty(allMsg)) {
+			JSONObject data = new JSONObject();
+			data.put("msg", JSON.toJSON(allMsg));
+			log.info("回调返回的数据:{}", allMsg);
+			final ResponseEntity<R> post = restTemplateUtil.post(bpmConfig.getPushmsgUrl(), data, "1");
+			log.info("回调返回的数据:{}", post);
+		}
 	}
 }
 

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-core/src/main/resources/static/designer/app/modules/employee-dialog.js

@@ -57,7 +57,7 @@ define(function (require, exports, module) {
         }
 
         employeeChoiceTree = $treeDom.initZtree({
-            service: g.ctx + 'process/tree/rest/organization/user?onlyChoiceUser=1'
+            service: g.ctx + 'process/tree/rest/organization/user?onlyChoiceUser=1&state=Y'
         }, org_tree_setting);
     };
     /**

bpm-server/src/main/java/com/srm/bpmserver/infra/dao/UserCenterDao.java

@@ -26,9 +26,9 @@ import java.util.Set;
  * @since JDK 1.8
  */
 public interface UserCenterDao {
-    List<OrganizationPO> selectOrg(@Param("pid") String pid, @Param("q") String q);
+    List<OrganizationPO> selectOrg(@Param("pid") String pid, @Param("q") String q, @Param("state") String state);
 
-    List<UserOrgPO> selectUsers(@Param("pid") String pid);
+    List<UserOrgPO> selectUsers(@Param("pid") String pid, @Param("state") String state);
 
     List<PositionPO> selectAllPosition(@Param("pid") String pid, @Param("q") String s);
 

bpm-server/src/main/java/com/srm/bpmserver/logic/impl/UserCenterLogicImpl.java

@@ -50,7 +50,7 @@ public class UserCenterLogicImpl implements UserCenterlogic {
     private final TreeConvert treeConvert;
 
     @Override
-    public List<ZTreeDTO> organization(String pid, String q) {
+    public List<ZTreeDTO> organization(String pid, String q, String state) {
         //查询部门信息
         List<ZTreeDTO> zTreeDTOS = Lists.newArrayList();
         if (Strings.isNullOrEmpty(pid)) {
@@ -62,7 +62,7 @@ public class UserCenterLogicImpl implements UserCenterlogic {
             topLevel.setOpen(true);
             zTreeDTOS.add(topLevel);
         }
-        final List<OrganizationPO> organizationPOS = userCenterDao.selectOrg(pid, q);
+        final List<OrganizationPO> organizationPOS = userCenterDao.selectOrg(pid, q, state);
         for (OrganizationPO organizationPO : organizationPOS) {
             final ZTreeDTO zTreeDTO = treeConvert.organizationPOToDTO(organizationPO);
             zTreeDTO.setData(organizationPO);
@@ -72,13 +72,13 @@ public class UserCenterLogicImpl implements UserCenterlogic {
     }
 
     @Override
-    public List<ZTreeDTO> organizationUser(String pid, String q, boolean onlyChoiceUser) {
-        List<ZTreeDTO> zTreeDTOS = this.organization(pid, q);
+    public List<ZTreeDTO> organizationUser(String pid, String q, boolean onlyChoiceUser, String state) {
+        List<ZTreeDTO> zTreeDTOS = this.organization(pid, q, state);
         for (ZTreeDTO zTreeDTO : zTreeDTOS) {
             zTreeDTO.setNocheck(onlyChoiceUser);
         }
 
-        List<UserOrgPO> userOrgPOS = userCenterDao.selectUsers(pid);
+        List<UserOrgPO> userOrgPOS = userCenterDao.selectUsers(pid, state);
         for (UserOrgPO userOrgPO : userOrgPOS) {
             final ZTreeDTO zTreeDTO = new ZTreeDTO();
             zTreeDTO.setId(userOrgPO.getId());

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

bpm-server/src/main/resources/mapper/bpmserver/infra/UserCenterDao.xml

@@ -14,6 +14,9 @@
             <if test="pid!=null and pid!=''">
                 AND org_parent_id=#{pid}
             </if>
+            <if test="state!=null and state!=''">
+                AND state=#{state}
+            </if>
         </where>
     </select>
     <select id="selectUsers" resultType="com.srm.bpmserver.infra.po.UserOrgPO">
@@ -25,6 +28,9 @@
         <if test="pid!=null and pid!=''">
             AND so.org_id =#{pid}
         </if>
+        <if test="state!=null and state != ''">
+            AND ep.deletestatus = 0
+        </if>
         ORDER BY ep.create_date DESC
     </select>
     <select id="selectAllPosition" resultType="com.srm.bpmserver.infra.po.PositionPO">