抓拍和ai事件回显逻辑调整

sgj

2026-02-03 9e64b2df66a7ab69b9daf258999d88844cccecce

 fzzy-igdss-web/src/main/java/com/fzzy/work/WorkOrderController.java

@@ -1,10 +1,14 @@
package com.fzzy.work;

import com.fzzy.igds.utils.DateUtil;
import com.fzzy.work.data.WorkNode;
import com.fzzy.work.data.WorkStatus;
import com.fzzy.work.domain.WorkOrder;
import com.fzzy.work.domain.WorkOrderConf;
import com.fzzy.work.domain.WorkOrderProcess;
import com.fzzy.work.service.WorkOrderConfService;
import com.fzzy.work.service.WorkOrderProcessService;
import com.fzzy.work.service.WorkOrderService;
import com.ruoyi.common.core.controller.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
@@ -32,6 +36,8 @@
    private WorkOrderConfService workOrderConfService;
    @Resource
    private WorkOrderProcessService workOrderProcessService;
    @Resource
    private WorkOrderService workOrderService;


    /**
@@ -81,16 +87,47 @@
        log.info("工单记录-工单ID：{}", orderId);
        List<WorkOrderProcess> list = workOrderProcessService.queryList(orderId);
        mmap.put("list", list);
        mmap.put("tipTime", 1);
        mmap.put("tipCount", 1);
        mmap.put("tipTime", "0分钟");
        mmap.put("tipCount", "0次");

        if (null != list && !list.isEmpty()) {
            //次数默认减去第一次提交
            mmap.put("tipCount", list.size() - 1);
        if (null == list || list.isEmpty()) return prefix + "/flow-his";



        //次数默认减去第一次提交
        mmap.put("tipCount", list.size() - 1 + "次");
        WorkOrderProcess last = list.get(0);
        if(!last.getNode().equals(WorkNode.NODE_END.getCode())){
            long tipTime = DateUtil.difMin(list.get(0).getCreateTime(), new Date());
            mmap.put("tipTime", tipTime);
            mmap.put("tipTime", tipTime + "分钟");
        }

        return prefix + "/flow-his";
    }
}

    @GetMapping("/flow-his2")
    public String flowHis2(@RequestParam("businessId") String businessId, ModelMap mmap) {
        log.info("工单记录-业务ID：{}", businessId);

        //获取工单
        WorkOrder order = workOrderService.selectByBusinessId(businessId);
        mmap.put("list", null);
        mmap.put("tipTime", "0分钟");
        mmap.put("tipCount", "0次");
        if (null == order) return prefix + "/flow-his";

        List<WorkOrderProcess> list = workOrderProcessService.queryList(order.getId());

        if (null == list || list.isEmpty()) return prefix + "/flow-his";

        //次数默认减去第一次提交
        mmap.put("tipCount", list.size() - 1 + "次");
        WorkOrderProcess last = list.get(0);
        if(!last.getNode().equals(WorkNode.NODE_END.getCode())){
            long tipTime = DateUtil.difMin(list.get(0).getCreateTime(), new Date());
            mmap.put("tipTime", tipTime + "分钟");
        }

        return prefix + "/flow-his";
    }
}