From ae7c4266892b1017ac5cb8a1c937c78fc9a7a6cd Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期二, 20 一月 2026 17:50:31 +0800
Subject: [PATCH] ai事件，智能抓拍，根据登录用户获取公司和库区搜索数据
---
fzzy-igdss-web/src/main/java/com/fzzy/work/WorkOrderController.java | 51 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 44 insertions(+), 7 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 a36f80c..5c857d1 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,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";
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3