From dd6687b118561100e1677e88a9c2f5842a54c531 Mon Sep 17 00:00:00 2001
From: jialh <1972868360@qq.com>
Date: 星期四, 16 四月 2026 18:14:14 +0800
Subject: [PATCH] 水电话费

---
 service-job/src/main/java/com/java110/job/importData/adapt/ImportRoomOwnerV2QueueDataAdapt.java |   30 +++++++++++++++++++-----------
 1 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/service-job/src/main/java/com/java110/job/importData/adapt/ImportRoomOwnerV2QueueDataAdapt.java b/service-job/src/main/java/com/java110/job/importData/adapt/ImportRoomOwnerV2QueueDataAdapt.java
index 65a2795..d19e21b 100644
--- a/service-job/src/main/java/com/java110/job/importData/adapt/ImportRoomOwnerV2QueueDataAdapt.java
+++ b/service-job/src/main/java/com/java110/job/importData/adapt/ImportRoomOwnerV2QueueDataAdapt.java
@@ -133,16 +133,19 @@
      * @param assetImportLogDetailDto
      */
     private void doImportData(AssetImportLogDetailDto assetImportLogDetailDto) {
-
+        String test = "";
         int a = 6;
         JSONArray objects = JSONObject.parseArray(assetImportLogDetailDto.getContent());
 
-//        if (Vtil.defaultValue(objects.get(11)) == null) {
+        if (Vtil.defaultValue(objects.get(11)) == null) {
+            objects.set(11, "鏃犲悕");
+            test = test + "\n涓氫富鍚嶇О涓虹┖";
 //            throw new IllegalArgumentException("涓氫富鍚嶇О涓嶈兘涓虹┖");
-//        }
+        }
 
         if (Vtil.defaultValue(objects.get(16)) == null){
-            throw new IllegalArgumentException("鎴垮眿闈㈢Н涓嶈兘涓虹┖");
+            objects.set(16, "0");
+            test = test + "\n鎴垮眿闈㈢Н涓虹┖";
         }
 
 //        if (Vtil.defaultValue(objects.get(54)) == null){
@@ -232,19 +235,24 @@
 
         List<Object> objects1 = sqlSessionTemplate.selectList("roomServiceDaoImpl.getRoomInfo", BeanConvertUtil.beanCovertMap(roomDto));
         if (!objects1.isEmpty()) {
-            throw new IllegalArgumentException("閲嶅鐨勬埧灞�:");
+//            throw new IllegalArgumentException("閲嶅鐨勬埧灞�:");
+            test = test + "\n閲嶅鐨勬埧灞嬶細鏉ヨ嚜瀵煎叆璁板綍锛�" + assetImportLogDetailDto.getLogId() + "\t" + assetImportLogDetailDto.getDetailId();
         }
         List<FeeConfigDto> feeDtos = null;
         if (!importOwnerRoomDto.getCommunityId().isEmpty()){
             FeeConfigDto feeConfigDto = new FeeConfigDto();
             feeConfigDto.setCommunityId(importOwnerRoomDto.getCommunityId());
             if (importOwnerRoomDto.getPropertyType() == null) {
-                throw new IllegalArgumentException("鐗╀笟绫诲瀷涓虹┖");
+//                throw new IllegalArgumentException("鐗╀笟绫诲瀷涓虹┖");
+                test = test + "\n鐗╀笟绫诲瀷涓虹┖锛屾棤娉曟坊鍔犺垂鐢�";
             }
-            feeConfigDto.setSecondaryFeeTypeCdName(importOwnerRoomDto.getPropertyType());
-            feeDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
-            if (feeDtos.isEmpty()) {
-                throw new IllegalArgumentException("鐗╀笟绫诲瀷`"+importOwnerRoomDto.getPropertyType()+"`鏈煡璇㈠埌鏀惰垂椤�");
+            else {
+                feeConfigDto.setSecondaryFeeTypeCdName(importOwnerRoomDto.getPropertyType());
+                feeDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
+                if (feeDtos.isEmpty()) {
+//                    throw new IllegalArgumentException("鐗╀笟绫诲瀷`"+importOwnerRoomDto.getPropertyType()+"`鏈煡璇㈠埌鏀惰垂椤�");
+                    test = test + "\n鐗╀笟绫诲瀷`"+importOwnerRoomDto.getPropertyType()+"`鏈煡璇㈠埌鏀惰垂椤癸紝鏃犳硶娣诲姞璐圭敤";
+                }
             }
         }
 
@@ -539,7 +547,7 @@
             sqlSessionTemplate.insert("litigationInfoServiceDaoImpl.saveLitigationInfo",
                     BeanConvertUtil.beanCovertMap(litigationInfoPo));
         importOwnerRoomDto.setRoomState(importOwnerRoomDto.getOwnerName() == null ? "2004" : "2001");
-
+        importOwnerRoomDto.setRemark(test);
         importOwnerRoomInnerServiceSMOImpl.saveOwnerRoom(importOwnerRoomDto);
         OwnerDto ownerDto = new OwnerDto();
         ownerDto.setOwnerId(importOwnerRoomDto.getOwnerId());

--
Gitblit v1.8.0