From e23edcf2619ad46fd77a710fca6c21de78234bc0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 07 一月 2025 17:33:06 +0800
Subject: [PATCH] 核算重构完成
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index 81b9299..4e40269 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -1155,6 +1155,7 @@
Boolean deptTag = false;
List<String> dynamicTags = new ArrayList<>();
for (TMonitorResult tagVO : monitorVOS) {
+ //鐪佸巺鏍囩閫氳繃ip鍒ゆ柇 (杩愮淮瑕佹眰)
if(tagVO.getIp().equals(result.getIp())){
if(tagVO.getProvinceTagVideo()) provinceTagVideo = true;
if(tagVO.getProvinceTagCar()) provinceTagCar = true;
@@ -1162,6 +1163,9 @@
if(tagVO.getImportantTag()) importantTag = true;
if(tagVO.getImportantCommandImageTag()) importantCommandImageTag = true;
if(tagVO.getDeptTag()) deptTag = true;
+ }
+ //鍔ㄦ�佸垪鏍规嵁鍥芥爣鍒ゆ柇
+ if (tagVO.getNo().equals(result.getSerialNumber())) {
//鍔ㄦ�佸垪澶勭悊鍔犲湪鏍囩閲�
if (!CollectionUtils.isEmpty(tagVO.getDynamicColumnList())) {
List<DynamicColumnVO> dynamicColumnList = tagVO.getDynamicColumnList();
--
Gitblit v1.8.0