From 8bb88ec2ed80687858d0aa9f53b78f407f4045dd Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期三, 25 三月 2026 10:26:30 +0800
Subject: [PATCH] gis树桩菜单修复
---
fzzy-igdss-web/src/main/java/com/fzzy/work/WorkOrderController.java | 96 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 95 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 882513a..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,19 +1,43 @@
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;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+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 {
+
private static final String prefix = "work";
+
+ @Resource
+ private WorkOrderConfService workOrderConfService;
+ @Resource
+ private WorkOrderProcessService workOrderProcessService;
+ @Resource
+ private WorkOrderService workOrderService;
/**
@@ -36,4 +60,74 @@
return prefix + "/no-business";
}
-}
+
+ /**
+ * 鏍规嵁閰嶇疆ID 鑾峰彇鍒伴厤缃俊鎭�
+ * 宸ュ崟娴佺▼鍥鹃厤缃�
+ *
+ */
+ @GetMapping("/flow-conf")
+ public String flowConf(@RequestParam("id") String id, ModelMap mmap) {
+
+ WorkOrderConf conf = workOrderConfService.selectById(id);
+ if (null == conf) conf = new WorkOrderConf();
+
+ mmap.put("data", conf);
+
+ return prefix + "/flow-conf";
+ }
+
+
+ /**
+ * 宸ュ崟璁板綍
+ *
+ */
+ @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", "0鍒嗛挓");
+ mmap.put("tipCount", "0娆�");
+
+ 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";
+ }
+
+ @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