From cf3b3fe3f9d46e28ac84f1aa61a3d9754aabf421 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期六, 17 一月 2026 00:05:13 +0800
Subject: [PATCH] 调整工单审批2
---
fzzy-igdss-web/src/main/java/com/fzzy/work/WorkOrderController.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/work/WorkOrderController.java b/fzzy-igdss-web/src/main/java/com/fzzy/work/WorkOrderController.java
index eeff0d3..a36f80c 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/work/WorkOrderController.java
+++ b/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";
}
--
Gitblit v1.9.3