调整工单审批

jiazx0107

2026-01-16 36509d940d14361429516b9f66f62fa2d4b7a706

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

@@ -5,7 +5,7 @@
import com.fzzy.igds.domain.InoutNoticeIn;
import com.fzzy.igds.domain.InoutNoticeOut;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.work.data.OrderStatus;
import com.fzzy.work.data.WorkStatus;
import com.fzzy.work.data.WorkBizType;
import com.fzzy.work.data.WorkNode;
import com.fzzy.work.domain.WorkOrder;
@@ -50,6 +50,7 @@
     * @return 响应结果
     */
    public BaseResp startByNoticeIn(InoutNoticeIn data, WorkOrderConf conf) {

        if (null == conf) conf = confService.getByDeptId(data.getDeptId(), WorkBizType.TYPE_10);

        if (Constant.YN_N.equals(conf.getValTag())) return BaseResp.error("流程未启用");
@@ -67,7 +68,7 @@
        work.setUpdateTime(new Date());
        work.setTitle("入库通知单审批");
        work.setConfId(conf.getId());
        work.setStatus(OrderStatus.STATUS_30.getCode());
        work.setStatus(WorkStatus.STATUS_30.getCode());
        work.setReceiveTime(new Date());

        String nextNode = this.getNextNode(WorkNode.NODE_START.getCode(), conf).getCode();
@@ -95,7 +96,7 @@
     * @return 响应结果
     */
    public BaseResp startByNoticeOut(InoutNoticeOut data, WorkOrderConf conf) {
        if (null == conf) conf = confService.getByDeptId(data.getDeptId(), WorkBizType.TYPE_10);
        if (null == conf) conf = confService.getByDeptId(data.getDeptId(), WorkBizType.TYPE_20);

        if (Constant.YN_N.equals(conf.getValTag())) return BaseResp.error("流程未启用");

@@ -112,7 +113,7 @@
        work.setUpdateTime(new Date());
        work.setTitle("出库通知单审批");
        work.setConfId(conf.getId());
        work.setStatus(OrderStatus.STATUS_30.getCode());
        work.setStatus(WorkStatus.STATUS_30.getCode());
        work.setReceiveTime(new Date());

        String nextNode = this.getNextNode(WorkNode.NODE_START.getCode(), conf).getCode();
@@ -165,24 +166,60 @@
     * 获取待处理工单
     * @return 处理结果
     */
    public BaseResp todoByProcess(WorkOrderProcess data) {
    public BaseResp todoByProcess(WorkOrderProcess process) {

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

        String action = data.getAction();
        String curNode = process.getNode();
        //获取处理人
        if (!curNode.equals(work.getNode())) {
            return BaseResp.error("当前工单已被处理，请刷新页面重试！！");
        }

        //获取配置信息
        WorkOrderConf conf = confService.selectById(work.getConfId());
        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());

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

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

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

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

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

            orderService.complete(work);
        }

        //增加审批记录
        orderProcessService.addData(process);

        return BaseResp.success();
    }
}