From f5a6147a1a5715889fc962e43ddbf21a7b32356b Mon Sep 17 00:00:00 2001
From: liaoxuwei <5789413@qq.com>
Date: Tue, 17 Oct 2023 11:38:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B1=87=E8=81=9A=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E9=BB=98=E8=AE=A4=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ConvergeAppsServiceImpl.java         | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/sst-manager/src/main/java/com/mortals/xhx/module/converge/service/impl/ConvergeAppsServiceImpl.java b/sst-manager/src/main/java/com/mortals/xhx/module/converge/service/impl/ConvergeAppsServiceImpl.java
index 9d621dc..3700f80 100644
--- a/sst-manager/src/main/java/com/mortals/xhx/module/converge/service/impl/ConvergeAppsServiceImpl.java
+++ b/sst-manager/src/main/java/com/mortals/xhx/module/converge/service/impl/ConvergeAppsServiceImpl.java
@@ -80,11 +80,12 @@ public class ConvergeAppsServiceImpl extends AbstractCRUDServiceImpl<ConvergeApp
                 ConvergeAppsEntity temp = this.selectOne(new ConvergeAppsQuery().appEname(item.getAppEname()).equipmentId(item.getEquipmentId()).siteId(item.getSiteId()).statYearMonth(item.getStatYearMonth()));
                 if(temp!=null){
                     item.setId(temp.getId());
-                    if(temp.getTotalPv()==item.getTotalPv()&&temp.getTotalUv()==item.getTotalUv()){
-                        item.setOpr("P");
-                    }else {
-                        item.setOpr("U");
-                    }
+//                    if(temp.getTotalPv()==item.getTotalPv()&&temp.getTotalUv()==item.getTotalUv()){
+//                        item.setOpr("P");
+//                    }else {
+//                        item.setOpr("U");
+//                    }
+                    item.setOpr("U");
                     this.update(item);
                 }else {
                     item.setOpr("A");
-- 
2.24.3