调功工单功能

jiazx0107

2026-01-18 b7fa11ff11ea34ac0231fcdd41135b3def7129de

 fzzy-igdss-core/src/main/java/com/fzzy/work/service/BizWorkService.java

@@ -11,7 +11,9 @@
import com.fzzy.work.domain.WorkOrder;
import com.fzzy.work.domain.WorkOrderConf;
import com.fzzy.work.domain.WorkOrderProcess;
import com.ruoyi.common.core.domain.entity.SysUser;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -84,7 +86,7 @@
        process.setAssigneeName(work.getCreateBy());
        process.setAssigneeId(work.getCreateById());
        process.setNode(WorkNode.NODE_START.getCode());
        orderProcessService.addData(process);
        orderProcessService.addData(process, false);

        return BaseResp.success();
    }
@@ -129,7 +131,7 @@
        process.setAssigneeName(work.getCreateBy());
        process.setAssigneeId(work.getCreateById());
        process.setNode(WorkNode.NODE_START.getCode());
        orderProcessService.addData(process);
        orderProcessService.addData(process, false);

        return BaseResp.success();
    }
@@ -168,10 +170,29 @@
     */
    public BaseResp todoByProcess(WorkOrderProcess process) {

        String action = process.getAction();
        if (StringUtils.isEmpty(action)) {
            return BaseResp.error("没有识别到处理动作，请重新尝试");
        }

        log.info("-----工单处理-----{}", process);
        //获取工单
        WorkOrder work = orderService.selectById(process.getOrderId());
        if (null == work) return BaseResp.error("当前工单已不存在");

        if (work.getStatus().equals(WorkStatus.STATUS_50.getCode())
                || work.getStatus().equals(WorkStatus.STATUS_60.getCode())) {
            return BaseResp.error("当前工单已处理，请刷新页面重试！！");
        }


        //判断是不是指定处理人
        SysUser user = ContextUtil.getLoginUser();
        if (StringUtils.isNotEmpty(work.getAssigneeId())) {
            if (!work.getAssigneeId().equals(user.getLoginName())) {
                return BaseResp.error("当前工单已分配其他人处理，请勿处理");
            }
        }

        String curNode = process.getNode();
        //获取处理人
@@ -184,42 +205,70 @@
        if (null == conf) return BaseResp.error("当前工单未配置流程");


        String action = process.getAction();
        //添加记录
        process.setId(ContextUtil.UUID());
        process.setCreateTime(new Date());
        process.setOrderId(work.getId());
        process.setAssigneeName(ContextUtil.getLoginUserName());
        process.setAssigneeId(ContextUtil.getLoginName());
        process.setAssigneeName(user.getUserName());
        process.setAssigneeId(user.getLoginName());

        WorkNode node = this.getNextNode(work.getNode(), conf);
        WorkNode nextNode = this.getNextNode(work.getNode(), conf);

        log.info("工单审批：{}，当前节点：{}，下一节点：{}", work.getTitle(), work.getNode(), node);
        log.info("工单审批：{}，当前节点：{}，下一节点：{}", work.getTitle(), work.getNode(), nextNode);

        //通过操作
        if ("pass".equals(action)) {
            process.setAction("通过");
            process.setNode(node.getCode());

            process.setNode(work.getNode());
            //结束判断，如果是结束节点，则结束工单
            if(WorkNode.NODE_END.getCode().equals(process.getNode())){
            if (WorkNode.NODE_END.getCode().equals(nextNode.getCode())) {
                work.setStatus(WorkStatus.STATUS_50.getCode());
                work.setAssigneeName(process.getAssigneeName());
                work.setAssigneeId(process.getAssigneeId());
                work.setNode(nextNode.getCode());
                orderService.complete(work);
            }

            //增加审批记录
            orderProcessService.addData(process, WorkNode.NODE_END.equals(nextNode));
            return BaseResp.success();
        }

        //拒绝操作
        if ("refuse".equals(action)) {
            process.setAction("拒绝");
            process.setNode(WorkNode.NODE_END.getCode());

            work.setStatus(WorkStatus.STATUS_60.getCode());

            orderService.complete(work);
            //增加审批记录
            orderProcessService.addData(process, true);

            return BaseResp.success();
        }

        //增加审批记录
        orderProcessService.addData(process);
        //转交或者指派操作
        if ("transfer".equals(action)) {

        return BaseResp.success();
            if (StringUtils.isEmpty(process.getAssigneeName())) {
                return BaseResp.error("请选择处理人");
            }

            process.setAction("转交/指派");
            process.setNode(work.getNode());
            String info = user.getUserName() + "转交给" + process.getAssigneeName() + "处理，处理建议：" + process.getRemark();
            process.setRemark(info);
            //更新处理人
            work.setAssigneeId(process.getAssigneeId());
            work.setAssigneeName(process.getAssigneeName());

            orderService.updateData(work);

            orderProcessService.addData(process, false);
            return BaseResp.success();
        }

        return BaseResp.error("系统没有识别到操作动作，未执行相关流程审批");
    }
}