调整工单审批2

jiazx0107

2026-01-17 cf3b3fe3f9d46e28ac84f1aa61a3d9754aabf421

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

@@ -1,8 +1,12 @@
package com.fzzy.work;

import com.fzzy.igds.utils.DateUtil;
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.ruoyi.common.core.controller.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.GetMapping;
@@ -10,10 +14,13 @@
import org.springframework.web.bind.annotation.RequestParam;

import javax.annotation.Resource;
import java.util.Date;
import java.util.List;

/**
 * 工单管理
 */
@Slf4j
@Controller
@RequestMapping("/work")
public class WorkOrderController extends BaseController {
@@ -23,6 +30,8 @@

    @Resource
    private WorkOrderConfService workOrderConfService;
    @Resource
    private WorkOrderProcessService workOrderProcessService;


    /**
@@ -69,8 +78,18 @@
     */
    @GetMapping("/flow-his")
    public String flowHis(@RequestParam("orderId") String orderId, ModelMap mmap) {
        log.info("工单记录-工单ID：{}", orderId);
        List<WorkOrderProcess> list = workOrderProcessService.queryList(orderId);
        mmap.put("list", list);
        mmap.put("tipTime", 1);
        mmap.put("tipCount", 1);

        mmap.put("list", null);
        if (null != list && !list.isEmpty()) {
            //次数默认减去第一次提交
            mmap.put("tipCount", list.size() - 1);
            long tipTime = DateUtil.difMin(list.get(0).getCreateTime(), new Date());
            mmap.put("tipTime", tipTime);
        }

        return prefix + "/flow-his";
    }