From b6184e2ddf3db37a94f7efb3b619bbc64642a292 Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期二, 27 一月 2026 18:12:48 +0800
Subject: [PATCH] Z四

---
 service-job/src/main/java/com/java110/job/importData/adapt/ImportPropertyWhiteListfFlowQueueDataAdapt.java |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/service-job/src/main/java/com/java110/job/importData/adapt/ImportPropertyWhiteListfFlowQueueDataAdapt.java b/service-job/src/main/java/com/java110/job/importData/adapt/ImportPropertyWhiteListfFlowQueueDataAdapt.java
index 8f18f33..9b8693a 100644
--- a/service-job/src/main/java/com/java110/job/importData/adapt/ImportPropertyWhiteListfFlowQueueDataAdapt.java
+++ b/service-job/src/main/java/com/java110/job/importData/adapt/ImportPropertyWhiteListfFlowQueueDataAdapt.java
@@ -19,7 +19,7 @@
  * 鍓嶇璇锋眰 鏃� 蹇呴』浼犲叆
  *   param.append('importAdapt', "importRoomOwner");
  */
-@Service("importPropertyWhiteListfFlowQueueData")
+@Service("importPropertyWhiteListFlowQueueData")
 public class ImportPropertyWhiteListfFlowQueueDataAdapt extends DefaultImportData implements IImportDataAdapt {
 
 
@@ -45,6 +45,19 @@
                 updateImportLogDetailState(assetImportLogDetailDto.getDetailId(), e);
             }
         }
+        PropertyWhiteListFlowDto propertyWhiteListFlowDto = new PropertyWhiteListFlowDto();
+        propertyWhiteListFlowDto.setFrequencyLike("閫�璐�-");
+        List<PropertyWhiteListFlowDto> propertyWhiteListFlowDtos = importPropertyWhiteListfFlowServiceSMOImpl.queryPropertyWhiteListFlow(propertyWhiteListFlowDto);
+        for (PropertyWhiteListFlowDto propertyWhiteListFlowDto1 : propertyWhiteListFlowDtos) {
+            PropertyWhiteListFlowDto propertyWhiteListFlowDto2 = new PropertyWhiteListFlowDto();
+            propertyWhiteListFlowDto2.setInvoiceReceiptNo(propertyWhiteListFlowDto1.getFrequency().split("-")[1]);
+            propertyWhiteListFlowDto2.setCommunityId(propertyWhiteListFlowDto1.getCommunityId());
+            List<PropertyWhiteListFlowDto> propertyWhiteListFlowDtos1 = importPropertyWhiteListfFlowServiceSMOImpl.queryPropertyWhiteListFlow(propertyWhiteListFlowDto2);
+            if (propertyWhiteListFlowDtos1.size() != 0) {
+                propertyWhiteListFlowDtos1.get(0).setFrequency("琚��璐�-"+propertyWhiteListFlowDto2.getInvoiceReceiptNo());
+                importPropertyWhiteListfFlowServiceSMOImpl.updatePropertyWhiteListFlow(propertyWhiteListFlowDtos1.get(0));
+            }
+        }
 
     }
 
@@ -56,9 +69,13 @@
     private void doImportData(AssetImportLogDetailDto assetImportLogDetailDto) {
         JSONObject data = JSONObject.parseObject(assetImportLogDetailDto.getContent());
         PropertyWhiteListFlowDto whites = BeanConvertUtil.covertBean(data, PropertyWhiteListFlowDto.class);
+        int count = importPropertyWhiteListfFlowServiceSMOImpl.countPropertyWhiteListFlowFilter(whites);
+        if (count > 0) {
+            throw new IllegalArgumentException("绗�" + whites.getRow() + "琛屽瓨鍦ㄩ噸澶嶇殑瀵煎叆鍐呭");
+        }
         int flag = importPropertyWhiteListfFlowServiceSMOImpl.savePropertyWhiteListFlow(whites);
         if (flag < 1) {
-            throw new IllegalArgumentException("瀵煎叆澶辫触");
+            throw new IllegalArgumentException("绗�" + whites.getRow() + "琛屽鍏ュけ璐�");
         }
 
     }

--
Gitblit v1.8.0