转办

bpm-client-http/src/main/java/com/srm/bpm/facde/BillHttpClient.java

@@ -92,4 +92,23 @@ public class BillHttpClient extends BaseHttpClient {
         return result;
     }
 
+    /**
+     * 转办处理
+     *
+     * @param billId           审批单主键
+     * @param taskId           任务主键
+     * @param transferUserIds  转办目标用户ID列表
+     * @param remark           转办意见
+     * @param user             当前用户
+     * @return 操作结果
+     */
+    public R transfer(Long billId, Long taskId, String transferUserIds, String remark, String user) {
+        Map<String, Object> params = Maps.newHashMap();
+        params.put("billId", billId);
+        params.put("taskId", taskId);
+        params.put("transferUserIds", transferUserIds);
+        params.put("remark", remark);
+        return restTemplateUtil.postNoReturn(this.host + "/bill/flow/rest/transfer", params, user);
+    }
+
 }

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

@@ -174,6 +174,27 @@ public class BillFlowRestController {
     }
 
     /**
+     * 转办处理
+     *
+     * @param billId           审批单主键
+     * @param taskId           任务主键
+     * @param transferUserIds  转办目标用户ID列表
+     * @param remark           转办意见
+     * @return 操作结果
+     */
+    @PostMapping("transfer")
+    public R transfer(
+            @RequestParam(value = "billId") Long billId,
+            @RequestParam(value = "taskId", defaultValue = "0") Long taskId,
+            @RequestParam(value = "transferUserIds") String transferUserIds,
+            @RequestParam(value = "remark", required = false, defaultValue = "") String remark
+    ) {
+        final String userCode = loginUserHolder.getUserCode();
+        this.billLogic.transferUser(billId, taskId.toString(), transferUserIds, userCode, remark);
+        return R.empty();
+    }
+
+    /**
      * 加签处理
      *
      * @param billId             审批单主键

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

@@ -48,6 +48,10 @@ public interface BillBtnConst {
      */
     String BTN_TRANSFER = "btn-transfer";
     /**
+     * 转办
+     */
+    String BTN_TRANSFER_NEW = "btn-transfer-new";
+    /**
      * 结束流程
      */
     String BTN_END = "btn-end";

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

@@ -217,6 +217,17 @@ public interface BillLogic {
     void turnUser(long billId, String taskId, String turnUser, String userCode, String opinion);
 
     /**
+     * 转办操作
+     *
+     * @param billId        单据id
+     * @param taskId        任务id
+     * @param transferUser  转办用户
+     * @param userCode      当前用户
+     * @param opinion       转办意见
+     */
+    void transferUser(long billId, String taskId, String transferUser, String userCode, String opinion);
+
+    /**
      * 手机端创建审批单
      *
      * @param processId 业务流程主键

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

@@ -186,7 +186,7 @@ public class BillBtnLogicImpl implements BillBtnLogic {
                             switch (nodeLinkType) {
                                 case approvl:
                                     btns = Lists.newArrayList(
-                                            BillBtnConst.BTN_AGREE, BillBtnConst.BTN_TRANSFER, BillBtnConst.BTN_BACK);
+                                            BillBtnConst.BTN_AGREE, BillBtnConst.BTN_TRANSFER, BillBtnConst.BTN_TRANSFER_NEW, BillBtnConst.BTN_BACK);
                                     boolean isRefuseNode = nextNodeHasRefuse(processId, nodeExtend);
                                     if (isRefuseNode) {
                                         btns.add(1, BillBtnConst.BTN_REFUSE);
@@ -657,6 +657,8 @@ public class BillBtnLogicImpl implements BillBtnLogic {
             split.add(BillBtnConst.BTN_CANCEL);
             split.add(BillBtnConst.BTN_TRACK);
             split.add(BillBtnConst.BTN_ENDORSE);
+            split.add(BillBtnConst.BTN_TRANSFER);
+            split.add(BillBtnConst.BTN_TRANSFER_NEW);
             return btns.stream().filter(a -> split.contains(a)).collect(Collectors.toList());
         } else {
             return btns;

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

@@ -1513,6 +1513,72 @@ public class BillLogicImpl implements BillLogic {
     }
 
     /**
+     * 转办操作
+     *
+     * @param billId        单据id
+     * @param taskId        任务id
+     * @param transferUser  转办用户
+     * @param userCode      当前用户
+     * @param opinion       转办意见
+     */
+    @Override
+    public void transferUser(long billId, String taskId, String transferUser, String userCode, String opinion) {
+        final Optional<BillTaskEntity> taskOpt = billBpmnLogic
+                .findTaskBybillAndEmployeeAndTaskId(billId, taskId, userCode);
+
+        if (!taskOpt.isPresent()) {
+            throw new RbException(StringPool.EMPTY, ProcessCode.PROCESS_ACTIVITI_ERROR);
+        }
+
+        final BillTaskEntity task = taskOpt.get();
+        final int taskNodeStatus = task.getNodeStatus();
+        BillTaskStatus billTaskStatus = BillTaskStatus.valueTo(taskNodeStatus);
+
+        if (billTaskStatus != BillTaskStatus.APPROVAL) {
+            throw new RbException(BillCode.BILL_TASK_HAS_APPROVED);
+        }
+
+        if (userCode.equals(transferUser)) {
+            throw new RbException("不能转办给自己");
+        }
+
+        final List<String> split = StrUtil.split(transferUser, ',');
+        List<BillTaskEntity> insertLists = Lists.newArrayList();
+
+        for (String targetUser : split) {
+            List<BillTaskEntity> existingTasks = billTaskService
+                    .findApprovingByBillAndTaskId(billId, taskId);
+            boolean isExistingApprover = existingTasks.stream()
+                    .anyMatch(t -> targetUser.equals(t.getUserCode()));
+
+            if (isExistingApprover) {
+                throw new RbException("不能转办给当前节点已有的审批人");
+            }
+
+            final BillTaskEntity transferTask = BeanUtil.sourceToTarget(task, BillTaskEntity.class);
+            transferTask.setSourceTaskId(task.getId());
+            transferTask.setSourceUserCode(userCode);
+            transferTask.setTaskType(BillTaskType.TRANSFER.getValue());
+            transferTask.setUserCode(targetUser);
+            transferTask.setId(null);
+            transferTask.setCreationTime(LocalDateTime.now());
+            insertLists.add(transferTask);
+        }
+
+        billTaskService.saveBatch(insertLists);
+
+        task.setNodeStatus(BillTaskStatus.TRANSFER.getStatus());
+        task.setOpinion(Strings.isNullOrEmpty(opinion) ? "转办" : opinion);
+        task.setDateline(DateTimeUtil.unixTime());
+        billTaskService.upldate(task);
+
+        List<BillTaskEntity> sends = Lists.newArrayList();
+        sends.addAll(insertLists);
+        sends.add(task);
+        flowMsgLogic.sendMsg(sends);
+    }
+
+    /**
      * 手机端创建审批单
      *
      * @param processId 业务流程主键

bpm-core/src/main/resources/static/bill/app/approval/form/toolbar/index.js

@@ -174,6 +174,10 @@ define(function (require, exports, module) {
         _initActionButtons: function () {
             Hamster.Array.forEach(this.actions, function (name) {
                 var buttonConfig = ApprovalFormToolbar.getActionButtonConfig(name);
+                if (!buttonConfig) {
+                    console.warn('Button config not found for:', name);
+                    return;
+                }
                 var buttonOptions = {
                     appendToEl: this.el.target,
                     title: buttonConfig.title,
@@ -252,6 +256,10 @@ define(function (require, exports, module) {
         _onActionButtonClick: function (button) {
             var name = button.__name;
             var config = this._action_button_config_map[name];
+            if (!config) {
+                console.warn('Button config not found for:', name);
+                return;
+            }
             var handler = config.handler;
 
             if (!Hamster.isFunction(handler)) {
@@ -265,7 +273,9 @@ define(function (require, exports, module) {
             this.actions.push("btn-close");
             Hamster.Object.each(this._action_button_map, function (name, button) {
                 var config = this._action_button_config_map[name];
-                Hamster.isFunction(config.destroy) && config.destroy();
+                if (config && Hamster.isFunction(config.destroy)) {
+                    config.destroy();
+                }
                 button.destroy();
             }, this);
             this._action_button_map = {};
@@ -941,6 +951,88 @@ define(function (require, exports, module) {
     });
 
     /**
+     * 转办操作按钮
+     * */
+    ApprovalFormToolbar.registerActionButton('btn-transfer-new', '转办', 'ui-icon-transfer', function (button, toolbar) {
+        console.log(button, toolbar);
+        var self = this;
+        var call = function (transferUser) {
+            var transferHttpAjax = new HttpAjax({
+                url: 'bill/flow/rest/transfer',
+                type: 'POST',
+                params: {
+                    billId: toolbar.relevance.billId,
+                    taskId: toolbar.relevance.taskId,
+                    transferUserIds: transferUser,
+                    remark: '转办'
+                }
+            });
+            transferHttpAjax.successHandler(function (result) {
+                layer.open({
+                    title: '温馨提示',
+                    content: '转办成功!',
+                    icon: 1
+                });
+                self._employeeSelectDialog.close();
+                toolbar.fireEvent('approval-transferred', result);
+            });
+            transferHttpAjax.satusCodeHandler(400, function (xhr) {
+                var result = JSON.parse(xhr.responseText);
+                var message = '转办失败';
+                if (!Hamster.isEmpty(result.msg)) {
+                    message = result.msg;
+                }
+                layer.open({
+                    title: '温馨提示',
+                    content: message,
+                    icon: 2
+                });
+            });
+            transferHttpAjax.failureHandler(function (xhr) {
+                layer.open({
+                    title: '温馨提示',
+                    content: '转办失败，请重试',
+                    icon: 2
+                });
+            });
+            transferHttpAjax.send();
+        }
+        self._employeeSelectDialog = new Hamster.ui.Dialog({
+            title: "请选择转办的审批人:",
+            width: 1000,
+            contentPadding: 20,
+            height: 710,
+            contentHtml: employeeDi._getContentElement(),
+            btnItems: [{
+                name: 'close', title: '关闭', handler: function () {
+                    self._employeeSelectDialog.close();
+                }
+            }, {
+                name: 'confirm', title: '确定', handler: function () {
+                    if (Hamster.isEmpty(employeeDi.getSelected())) {
+                        layer.alert("请选择转办的审批人");
+                        return;
+                    }
+                    var nextAppr = employeeDi.getSelected();
+                    var userIds = [];
+                    $.each(nextAppr, function (idx, itm) {
+                        userIds.push(itm.id);
+                    })
+                    call(userIds.join(','));
+                }
+            }]
+        });
+        self._employeeSelectDialog.on('open', function () {
+            employeeDi._init();
+        });
+        self._employeeSelectDialog.on('close', function () {
+            self._employeeSelectDialog.destroy();
+            self._employeeSelectDialog = null;
+        });
+        self._employeeSelectDialog.open();
+    });
+
+    /**
      * 结束流程操作按钮
      * */
     ApprovalFormToolbar.registerActionButton('btn-end', '结束流程', 'ui-icon-save', function (button, toolbar) {

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

@@ -77,6 +77,7 @@ define(function (require, exports, module) {
                 {key: 'btn-agree', text: '审批通过'},
                 {key: 'btn-refuse', text: '审批拒绝'},
                 {key: 'btn-transfer', text: '移交'},
+                {key: 'btn-transfer-new', text: '转办'},
                 {key: 'btn-back', text: '打回'},
                 {key: 'btn-print', text: '打印'}
             ];