【供应商变更申请流程】取消【转办】按钮

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

@@ -74,14 +74,24 @@ public class BillBtnLogicImpl implements BillBtnLogic {
     private  Set<Long> DISABLED_RECALL_PROCESS_IDS;
 
 
+    @Value("${activiti.transfer.disable:}")
+    private  String disableTransfer;
+
+    private  Set<Long> DISABLED_Transfer_PROCESS_IDS;
+
     @PostConstruct
     public void initDisabledProcessIds() {
         if(!StringUtils.isBlank(disableCancel)){
-            DISABLED_RECALL_PROCESS_IDS = Arrays.stream(disableCancel.split(","))
-                    .map(Long::valueOf).collect(Collectors.toSet());
+            DISABLED_RECALL_PROCESS_IDS = Arrays.stream(disableCancel.split(",")).map(Long::valueOf).collect(Collectors.toSet());
         }else {
             DISABLED_RECALL_PROCESS_IDS = new HashSet<>();
         }
+
+        if(!StringUtils.isBlank(disableTransfer)){
+            DISABLED_Transfer_PROCESS_IDS = Arrays.stream(disableTransfer.split(",")).map(Long::valueOf).collect(Collectors.toSet());
+        }else {
+            DISABLED_Transfer_PROCESS_IDS = new HashSet<>();
+        }
     }
 
     /**
@@ -100,6 +110,15 @@ public class BillBtnLogicImpl implements BillBtnLogic {
     }
 
     /**
+     * 检查指定流程是否允许显示转办按钮
+     * @param processId 流程ID
+     * @return true-允许显示转办按钮，false-不允许
+     */
+    private boolean isTransferButtonEnabled(long processId) {
+        return !DISABLED_Transfer_PROCESS_IDS.contains(processId);
+    }
+
+    /**
      * 根据业务流程 获取 在创建 业务审批单的时候的按钮权限
      *
      * @param process 业务流程
@@ -185,8 +204,10 @@ public class BillBtnLogicImpl implements BillBtnLogic {
                             NodeLinkType nodeLinkType = NodeLinkType.valueOf(linkType);
                             switch (nodeLinkType) {
                                 case approvl:
-                                    btns = Lists.newArrayList(
-                                            BillBtnConst.BTN_AGREE, BillBtnConst.BTN_TRANSFER, BillBtnConst.BTN_TRANSFER_NEW, BillBtnConst.BTN_BACK);
+                                    btns = Lists.newArrayList(BillBtnConst.BTN_AGREE, BillBtnConst.BTN_TRANSFER, BillBtnConst.BTN_BACK);
+                                    if(isTransferButtonEnabled(processId)){
+                                        btns.add(0,BillBtnConst.BTN_TRANSFER_NEW);
+                                    }
                                     boolean isRefuseNode = nextNodeHasRefuse(processId, nodeExtend);
                                     if (isRefuseNode) {
                                         btns.add(1, BillBtnConst.BTN_REFUSE);

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

@@ -299,8 +299,13 @@ public class BillTaskLogicImpl implements BillTaskLogic {
                         final boolean goFlag = billLogic.agreeIsGoOn(billTaskEntity);
                         if (goFlag) {
                             this.billBpmnLogic.complete(billService.getById(billId), billTaskEntity.getTaskId(), Const.AUTO_AGREE_OPTION, billTaskEntity.getUserCode(), "", "", billTaskEntity.getTaskNodeKey(), billTaskEntity.getTaskId());
+
+                            //todo 修改后
+                            // this.billBpmnLogic.complete(billService.getById(billId), billTaskEntity.getTaskId(), Const.AUTO_AGREE_OPTION, billTaskEntity.getUserCode(), "", "", billTaskEntity.getTaskNodeKey(), billTaskEntity.getLastTaskId());
+
                             //删除待审批的信息
                             this.billTaskService.deleteApproval(billId, billTaskEntity.getTaskId(), BillTaskStatus.APPROVAL.getStatus());
+                            
                         } else {
                             //转办操作
                             transfer(billTasks, billId);