From b8bf2507bc7b23c90bc6dc71ea2460e277d3800a Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期五, 30 一月 2026 19:23:44 +0800
Subject: [PATCH] 导入测试

---
 service-job/src/main/java/com/java110/job/importData/adapt/ImportRoomOwnerV2QueueDataAdapt.java |  299 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 158 insertions(+), 141 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 19ce360..e58f5cb 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
@@ -22,6 +22,7 @@
 import com.java110.intf.user.IOwnerV1InnerServiceSMO;
 import com.java110.job.importData.DefaultImportData;
 import com.java110.job.importData.IImportDataAdapt;
+import com.java110.po.dict.DictPo;
 import com.java110.po.oweFeeCallable.OweFeeCallablePo;
 import com.java110.po.owner.OwnerPo;
 import com.java110.po.room.ApplyRoomDiscountPo;
@@ -101,6 +102,8 @@
      * @param assetImportLogDetailDto
      */
     private void doImportData(AssetImportLogDetailDto assetImportLogDetailDto) {
+
+        int a = 6;
         JSONArray objects = JSONObject.parseArray(assetImportLogDetailDto.getContent());
 
         ImportOwnerRoomDto importOwnerRoomDto = new ImportOwnerRoomDto();//鎴垮眿
@@ -114,6 +117,8 @@
         importOwnerRoomDto.setOwnerTypeCd("1001");
         importOwnerRoomDto.setPersonType(OwnerDto.PERSON_TYPE_PERSON);
         importOwnerRoomDto.setPersonRole(OwnerDto.PERSON_ROLE_OWNER);
+        importOwnerRoomDto.setMonthlyUnitPrice(objects.getString(23));
+        importOwnerRoomDto.setPropertyFeeMonth(objects.getString(24));
         //--------璁剧疆鐗╀笟绫诲瀷
         DictDto dictDto = new DictDto();
         dictDto.setTableName("building_room");
@@ -121,7 +126,16 @@
         dictDto.setName(defaultValue(objects.get(1)));
         List<DictDto> dictDtos = dictV1InnerServiceSMOImpl.queryDictAndSpecs(dictDto);
         if (dictDtos.isEmpty()) {
-            throw new IllegalArgumentException("瀵煎叆澶辫触:瀛楀吀涓笉瀛樺湪鐗╀笟绫诲瀷:" + defaultValue(objects.get(1)));
+            DictPo dictPo = new DictPo();
+            dictPo.setStatusCd(GenerateCodeFactory.getGeneratorId("2"));
+            dictPo.setTableName("building_room");
+            dictPo.setTableColumns("room_sub_type");
+            dictPo.setName(defaultValue(objects.get(1)));
+            dictV1InnerServiceSMOImpl.saveDict(dictPo);
+            dictDtos = dictV1InnerServiceSMOImpl.queryDictAndSpecs(dictDto);
+            if (dictDtos.isEmpty()) {
+                throw new IllegalArgumentException("瀵煎叆澶辫触:瀛楀吀涓笉瀛樺湪鐗╀笟绫诲瀷:" + defaultValue(objects.get(1)));
+            }
         }
         importOwnerRoomDto.setRoomSubType(dictDtos.get(0).getStatusCd());
         //----------
@@ -204,41 +218,41 @@
             ownerPoTo2.setState(OwnerDto.STATE_FINISH);
             ownerPoTo2.setPersonType(OwnerDto.PERSON_ROLE_RENT);
             ownerPoTo2.setOwnerTypeCd(OwnerDto.OWNER_TYPE_CD_MEMBER);
-            ownerPoTo2.setName(defaultValue(objects.get(21)));
+            ownerPoTo2.setName(defaultValue(objects.get(21+a)));
             ownerPoTo2.setLink(link);
             ownerPoTo2.setSex("2");
             ownerPoTo2.setPersonRole(OwnerDto.PERSON_ROLE_MEMBER);
         }
         //---------
-        importOwnerRoomDto.setBuiltUpArea(defaultValue(objects.get(16)));//闈㈢Н
-        importOwnerRoomDto.setRoomArea(defaultValue(objects.get(16)));//闈㈢Н
-        importOwnerRoomDto.setRoomRent(defaultValue(objects.get(16)));//闈㈢Н
-        importOwnerRoomDto.setBuyDate(defaultValueToDate(objects.get(20)));//璐叆鏃ユ湡
-        importOwnerRoomDto.setSellDate(defaultValueToDate(objects.get(22)));//鍗栧嚭鏃ユ湡
-        importOwnerRoomDto.setSellState(defaultValue(objects.get(23)));//鎴垮眿鐘舵��
+        importOwnerRoomDto.setBuiltUpArea(defaultValue(objects.get(16+a)));//闈㈢Н
+        importOwnerRoomDto.setRoomArea(defaultValue(objects.get(16+a)));//闈㈢Н
+        importOwnerRoomDto.setRoomRent(defaultValue(objects.get(16+a)));//闈㈢Н
+        importOwnerRoomDto.setBuyDate(defaultValueToDate(objects.get(20+a)));//璐叆鏃ユ湡
+        importOwnerRoomDto.setSellDate(defaultValueToDate(objects.get(22+a)));//鍗栧嚭鏃ユ湡
+        importOwnerRoomDto.setSellState(defaultValue(objects.get(23+a)));//鎴垮眿鐘舵��
 
-        importOwnerRoomDto.setEoc(defaultNum(objects.get(24)).toString());//璁惧杩愯璐�
+        importOwnerRoomDto.setEoc(defaultNum(objects.get(24+a)).toString());//璁惧杩愯璐�
 
         //-----TODO 寰呭鍏�  鍌即淇℃伅
         if (!defaultValue(objects.get(27)).isEmpty()) {
             OwnerCollectionDto ownerCollection = new OwnerCollectionDto();
             ownerCollection.setOwnerId(importOwnerRoomDto.getOwnerId());
             ownerCollection.setRoomId(importOwnerRoomDto.getRoomId());
-            ownerCollection.setCollectionStartDate(defaultValueToDate(objects.get(25)));
-            ownerCollection.setCollectionEndDate(defaultValueToDate(objects.get(26)));
-            ownerCollection.setAmount(defaultValue(objects.get(27)));
-            ownerCollection.setFirstCollector(defaultValue(objects.get(28)));
-            ownerCollection.setSecondCollectorName(defaultValue(objects.get(29)));
-            ownerCollection.setSecondCollectorPhone(defaultValue(objects.get(30)));
-            ownerCollection.setSecondCollectorAddress(defaultValue(objects.get(31)));
-            ownerCollection.setReceiptNumber(defaultValue(objects.get(32)));
-            ownerCollection.setReceiptPhotoUrl(defaultValue(objects.get(33)));
-            ownerCollection.setRemark(defaultValue(objects.get(34)));
+            ownerCollection.setCollectionStartDate(defaultValueToDate(objects.get(25+a)));
+            ownerCollection.setCollectionEndDate(defaultValueToDate(objects.get(26+a)));
+            ownerCollection.setAmount(defaultValue(objects.get(27+a)));
+            ownerCollection.setFirstCollector(defaultValue(objects.get(28+a)));
+            ownerCollection.setSecondCollectorName(defaultValue(objects.get(29+a)));
+            ownerCollection.setSecondCollectorPhone(defaultValue(objects.get(30+a)));
+            ownerCollection.setSecondCollectorAddress(defaultValue(objects.get(31+a)));
+            ownerCollection.setReceiptNumber(defaultValue(objects.get(32+a)));
+            ownerCollection.setReceiptPhotoUrl(defaultValue(objects.get(33+a)));
+            ownerCollection.setRemark(defaultValue(objects.get(34+a)));
         }
         //-----
 
         //-----鎵撴姌淇℃伅 TODO 鏈坊鍔犻噸澶嶆牎楠�
-        if (!defaultValue(objects.get(38)).isEmpty()) {
+        if (!defaultValue(objects.get(38+a)).isEmpty()) {
             ApplyRoomDiscountPo applyRoomDiscountPo = new ApplyRoomDiscountPo();//鎵撴姌
             applyRoomDiscountPo.setArdId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ardId));
             applyRoomDiscountPo.setCommunityId(importOwnerRoomDto.getCommunityId());
@@ -246,29 +260,29 @@
             applyRoomDiscountPo.setRoomName(importOwnerRoomDto.getPropertyAddress());
             applyRoomDiscountPo.setDiscountId("132025112781200067");
             applyRoomDiscountPo.setApplyType("152025112756040048");
-            applyRoomDiscountPo.setFixedDiscountValue(defaultNum(objects.get(36)));
-            applyRoomDiscountPo.setDiscountedAmount(defaultNum(objects.get(37)));
+            applyRoomDiscountPo.setFixedDiscountValue(defaultNum(objects.get(36+a)));
+            applyRoomDiscountPo.setDiscountedAmount(defaultNum(objects.get(37+a)));
             // 2. 瀹氫箟鏍煎紡鍖栧櫒锛堟敞鎰忥細SimpleDateFormat 绾跨▼涓嶅畨鍏紝姣忔浣跨敤鏂板缓瀹炰緥锛�
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy/M");
 
             try {
                 SimpleDateFormat outputSdf = new SimpleDateFormat("yyyy-MM-dd");
-                applyRoomDiscountPo.setStartTime(defaultValueToDate(objects.get(38)));
-                applyRoomDiscountPo.setEndTime(defaultValueToDate(objects.get(39)));
+                applyRoomDiscountPo.setStartTime(defaultValueToDate(objects.get(38+a)));
+                applyRoomDiscountPo.setEndTime(defaultValueToDate(objects.get(39+a)));
             }catch (Exception e){
                 throw new IllegalArgumentException("瀵煎叆澶辫触锛氬鐞嗘姌鎵f棩鏈熷尯闂存椂鍑洪敊");
             }
-            applyRoomDiscountPo.setDiscountArchiveDate(defaultValueToDate(objects.get(40)));
-            applyRoomDiscountPo.setCreateRemark(defaultValue(objects.get(41)));
-            applyRoomDiscountPo.setCheckRemark("瀹℃壒浜猴細" + defaultValue(objects.get(42)));
-            applyRoomDiscountPo.setReviewRemark("瀹℃壒浜猴細" + defaultValue(objects.get(43)));
+            applyRoomDiscountPo.setDiscountArchiveDate(defaultValueToDate(objects.get(40+a)));
+            applyRoomDiscountPo.setCreateRemark(defaultValue(objects.get(41+a)));
+            applyRoomDiscountPo.setCheckRemark("瀹℃壒浜猴細" + defaultValue(objects.get(42+a)));
+            applyRoomDiscountPo.setReviewRemark("瀹℃壒浜猴細" + defaultValue(objects.get(43+a)));
             applyRoomDiscountPo.setCreateUserTel("鏃�");
             applyRoomDiscountPo.setCreateUserName("鐢辩郴缁熷鍏�");
             applyRoomDiscountPo.setState("4");
             applyRoomDiscountPo.setStatusCd("0");
             applyRoomDiscountPo.setInUse("0");
             applyRoomDiscountPo.setReturnWay("1001");
-            applyRoomDiscountPo.setRelatedAttachments(defaultValue(objects.get(44)));
+            applyRoomDiscountPo.setRelatedAttachments(defaultValue(objects.get(44+a)));
             try {
                 applyRoomDiscountServiceDaoImpl.saveApplyRoomDiscountInfo(BeanConvertUtil.beanCovertMap(applyRoomDiscountPo));
             }catch (Exception e){
@@ -278,81 +292,127 @@
         //-----
 
         //-----涓氫富淇℃伅
-        importOwnerRoomDto.setTel(defaultValue(objects.get(45)));//鎵嬫満鍙�
-        importOwnerRoomDto.setIdCard(defaultValue(objects.get(46)));//韬唤璇�
-        importOwnerRoomDto.setAddress(defaultValue(objects.get(47)));//TODO 瀵煎叆閫昏緫鏈坊鍔犺瀛楁  鑱旂粶鍦板潃
-        importOwnerRoomDto.setSex(defaultValue(objects.get(48)).equals("") ?"2" :  defaultValue(objects.get(48)));
+        importOwnerRoomDto.setTel(defaultValue(objects.get(45+a)));//鎵嬫満鍙�
+        importOwnerRoomDto.setIdCard(defaultValue(objects.get(46+a)));//韬唤璇�
+        importOwnerRoomDto.setAddress(defaultValue(objects.get(47+a)));//TODO 瀵煎叆閫昏緫鏈坊鍔犺瀛楁  鑱旂粶鍦板潃
+        importOwnerRoomDto.setSex(defaultValue(objects.get(48+a)).equals("") ?"2" :  defaultValue(objects.get(48+a)));
         importOwnerRoomDto.setOwnerName(defaultValue(objects.get(11)));
-        importOwnerRoomDto.setHouseholdPoliceStation(defaultValue(objects.get(50)));
-        importOwnerRoomDto.setPropertyCertificateNo(defaultValue(objects.get(51)));
-        importOwnerRoomDto.setIsEvChargerInstalled(defaultValue(objects.get(52)));
+        importOwnerRoomDto.setHouseholdPoliceStation(defaultValue(objects.get(50+a)));
+        importOwnerRoomDto.setPropertyCertificateNo(defaultValue(objects.get(51+a)));
+        importOwnerRoomDto.setIsEvChargerInstalled(defaultValue(objects.get(52+a)));
 
 
 
-        OweFeeCallablePo oweFeeCallablePo = new OweFeeCallablePo();
-        oweFeeCallablePo.setOfcId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
-        oweFeeCallablePo.setAmountdOwed("0");
-        oweFeeCallablePo.setCallableWay(OweFeeCallableDto.CALLABLE_WAY_PRINT);
-        oweFeeCallablePo.setOfcId(GenerateCodeFactory.getGeneratorId("11"));
-        oweFeeCallablePo.setFeeId("");
-        oweFeeCallablePo.setFeeName("瀵煎叆鍌敹淇℃伅");
-        oweFeeCallablePo.setCommunityId(communityId);
-        oweFeeCallablePo.setConfigId("");
-        oweFeeCallablePo.setOwnerId(importOwnerRoomDto.getOwnerId());
-        oweFeeCallablePo.setOwnerName(importOwnerRoomDto.getOwnerName());
-        oweFeeCallablePo.setPayerObjId("");
-        oweFeeCallablePo.setPayerObjName(importOwnerRoomDto.getPropertyAddress());
-        oweFeeCallablePo.setPayerObjType("3333");
-        oweFeeCallablePo.setRemark(defaultValue(objects.get(57)));
-        oweFeeCallablePo.setStaffId("302025062612580518");
-        oweFeeCallablePo.setStaffName("鍒樺織鍕�");
-        oweFeeCallablePo.setState(OweFeeCallableDto.STATE_COMPLETE);
-        oweFeeCallablePo.setStartTime(defaultValueToDate(objects.get(56)));//TODO 鏃堕棿娈甸渶瑕佹媶鍒�
-        oweFeeCallablePo.setEndTime(defaultValueToDate(objects.get(56)));
-        oweFeeCallablePo.setCreateTime(defaultValueToDate(objects.get(53)));
-        int flag = oweFeeCallableV1InnerServiceSMOImpl.saveOweFeeCallable(oweFeeCallablePo);
-        if (flag < 1) {
-            throw new IllegalArgumentException("鍌敹淇℃伅瀵煎叆澶辫触");
-        }
-
-        for (int i = 0; i < 5 ; i++) {
-            int index = i*4 + 59;
-            if(objects.get(index) == null){
-                break;
+        if (Vtil.defaultValue(objects.get(57+a),null) != null) {
+            OweFeeCallablePo oweFeeCallablePo = new OweFeeCallablePo();
+            oweFeeCallablePo.setOfcId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+            oweFeeCallablePo.setAmountdOwed("0");
+            oweFeeCallablePo.setCallableWay(OweFeeCallableDto.CALLABLE_WAY_PRINT);
+            oweFeeCallablePo.setOfcId(GenerateCodeFactory.getGeneratorId("11"));
+            oweFeeCallablePo.setFeeId("");
+            oweFeeCallablePo.setFeeName("瀵煎叆鍌敹淇℃伅");
+            oweFeeCallablePo.setCommunityId(communityId);
+            oweFeeCallablePo.setConfigId("");
+            oweFeeCallablePo.setOwnerId(importOwnerRoomDto.getOwnerId());
+            oweFeeCallablePo.setOwnerName(importOwnerRoomDto.getOwnerName());
+            oweFeeCallablePo.setPayerObjId("");
+            oweFeeCallablePo.setPayerObjName(importOwnerRoomDto.getPropertyAddress());
+            oweFeeCallablePo.setPayerObjType("3333");
+            oweFeeCallablePo.setRemark(defaultValue(objects.get(57+a)));
+            oweFeeCallablePo.setStaffId("302025062612580518");
+            oweFeeCallablePo.setStaffName("鍒樺織鍕�");
+            oweFeeCallablePo.setState(OweFeeCallableDto.STATE_COMPLETE);
+            oweFeeCallablePo.setStartTime(defaultValueToDate(objects.get(56+a)));//TODO 鏃堕棿娈甸渶瑕佹媶鍒�
+            oweFeeCallablePo.setEndTime(defaultValueToDate(objects.get(56+a)));
+            oweFeeCallablePo.setCreateTime(defaultValueToDate(objects.get(53+a)));
+            int flag = oweFeeCallableV1InnerServiceSMOImpl.saveOweFeeCallable(oweFeeCallablePo);
+            if (flag < 1) {
+                throw new IllegalArgumentException("鍌敹淇℃伅瀵煎叆澶辫触");
             }
-            HouseMailRecord houseMailRecord = new HouseMailRecord();
-            houseMailRecord.setId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_houseId));
-            houseMailRecord.setOwnerId(importOwnerRoomDto.getOwnerId());
-            houseMailRecord.setHouseId(importOwnerRoomDto.getRoomId());
-            houseMailRecord.setCallableId(oweFeeCallablePo.getOfcId());
-            houseMailRecord.setCreateTime(defaultValueToDate(objects.get(index)));
-            houseMailRecord.setMailNo(defaultValue(objects.get(index+1)));
-            houseMailRecord.setServiceFee(defaultValue(objects.get(index+2)));
-            houseMailRecord.setMailResult(defaultValue(objects.get(index+3)));
-            houseMailRecord.setRemark(defaultValue(objects.get(79)));
 
-            int save = applyRoomDiscountServiceDaoImpl.saveHouseMailRecord(BeanConvertUtil.beanCovertMap(houseMailRecord));
+            for (int i = 0; i < 5 ; i++) {
+                int index = i*4 + 59+a;
+                if(objects.get(index) == null){
+                    break;
+                }
+                HouseMailRecord houseMailRecord = new HouseMailRecord();
+                houseMailRecord.setId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_houseId));
+                houseMailRecord.setOwnerId(importOwnerRoomDto.getOwnerId());
+                houseMailRecord.setHouseId(importOwnerRoomDto.getRoomId());
+                houseMailRecord.setCallableId(oweFeeCallablePo.getOfcId());
+                houseMailRecord.setCreateTime(defaultValueToDate(objects.get(index)));
+                houseMailRecord.setMailNo(defaultValue(objects.get(index+1)));
+                houseMailRecord.setServiceFee(defaultValue(objects.get(index+2)));
+                houseMailRecord.setMailResult(defaultValue(objects.get(index+3)));
+                houseMailRecord.setRemark(defaultValue(objects.get(79+a)));
+
+                int save = applyRoomDiscountServiceDaoImpl.saveHouseMailRecord(BeanConvertUtil.beanCovertMap(houseMailRecord));
+            }
+
+            //----瀵规柟鏀舵鍗曚綅琛�
+            PayeeReceiveInfoPo payeeReceiveInfoPo = new PayeeReceiveInfoPo();
+            payeeReceiveInfoPo.setCallableId(oweFeeCallablePo.getOfcId());
+            payeeReceiveInfoPo.setCallerName(defaultValue(objects.get(80+a)));
+            payeeReceiveInfoPo.setContactInfo(defaultValue(objects.get(81+a)));
+            payeeReceiveInfoPo.setPayeeInfo(defaultValue(objects.get(82+a)));
+            payeeReceiveInfoPo.setInvoiceNo(defaultValue(objects.get(83+a)));
+            payeeReceiveInfoPo.setInvoiceDate(objects.getDate(84+a));
+            payeeReceiveInfoPo.setReceiptNo(defaultValue(objects.get(85+a)));
+            payeeReceiveInfoPo.setReceiptDate(objects.getDate(86+a));
+            payeeReceiveInfoPo.setReceiptNote(defaultValue(objects.get(87+a)));
+            payeeReceiveInfoPo.setReceiptNoteDate(objects.getDate(88+a));
+            payeeReceiveInfoPo.setImageFile(defaultValue(objects.get(89+a)));
+            payeeReceiveInfoPo.setOurCompanyReceiveDate(objects.getDate(90+a));
+            payeeReceiveInfoPo.setAttachmentFile(defaultValue(objects.get(91+a)));
+            payeeReceiveInfoPo.setOwnerId(importOwnerRoomDto.getOwnerId());
+            payeeReceiveInfoPo.setRoomId(importOwnerRoomDto.getRoomId());
+            int insert = sqlSessionTemplate.insert("payeeReceiveInfoServiceDaoImpl.savePayeeReceiveInfo",
+                    BeanConvertUtil.beanCovertMap(payeeReceiveInfoPo));
+
+            //----
+
+            //----娉曢櫌瀹$悊绋嬪簭
+            if (!defaultValue(objects.get(132+a)).isEmpty()) {
+                CourtTrialProcedure courtTrialProcedure = new CourtTrialProcedure();
+                courtTrialProcedure.setCallableId(oweFeeCallablePo.getOfcId());
+                courtTrialProcedure.setOwnerId(importOwnerRoomDto.getOwnerId());
+                courtTrialProcedure.setAcceptCourtName(defaultValue(objects.get(132+a)));
+                courtTrialProcedure.setJudgeName(defaultValue(objects.get(133+a)));
+                courtTrialProcedure.setJudgeContact(defaultValue(objects.get(134+a)));
+                courtTrialProcedure.setJudgeNoticeAcceptDate(defaultValueToDate(objects.get(135+a)));
+                courtTrialProcedure.setCourtMediationDate(defaultValueToDate(objects.get(136+a)));
+                courtTrialProcedure.setMediationResult(defaultValue(objects.get(137+a)));
+                courtTrialProcedure.setSubpoenaSignDate(defaultValueToDate(objects.get(138+a)));
+                courtTrialProcedure.setUndeliveredDate(defaultValueToDate(objects.get(139+a)));
+                courtTrialProcedure.setCourtSessionDate1(defaultValueToDate(objects.get(140+a)));
+                courtTrialProcedure.setCourtSessionDate2(defaultValueToDate(objects.get(141+a)));
+                courtTrialProcedure.setCaseNumber(defaultValue(objects.get(142+a)));
+                courtTrialProcedure.setCourtSessionResult(defaultValue(objects.get(143+a)));
+                courtTrialProcedure.setJudgmentDate(defaultValueToDate(objects.get(144+a)));
+                courtTrialProcedure.setJudgmentResult(defaultValue(objects.get(145+a)));
+                courtTrialProcedure.setRemark(defaultValue(objects.get(146+a)));
+                applyRoomDiscountServiceDaoImpl.saveCourtTrialProcedure(BeanConvertUtil.beanCovertMap(courtTrialProcedure));
+            }
+            //-----
+
+            //娉曢櫌鎵ц绋嬪簭
+            if (!defaultValue(objects.get(147+a)).isEmpty()) {
+                CourtExecutionProcedure courtExecutionProcedure = new CourtExecutionProcedure();
+                courtExecutionProcedure.setCallableId(oweFeeCallablePo.getOfcId());
+                courtExecutionProcedure.setOwnerId(importOwnerRoomDto.getOwnerId());
+                courtExecutionProcedure.setApplyTime(defaultValueToDate(objects.get(147+a)));
+                courtExecutionProcedure.setJudgmentDocNumber(defaultValue(objects.get(148+a)));
+                courtExecutionProcedure.setArrearsPeriod(defaultValue(objects.get(149+a)));
+                courtExecutionProcedure.setArrearsAmount(defaultValue(objects.get(150+a)));
+                courtExecutionProcedure.setLateFee(defaultValue(objects.get(151+a)));
+                courtExecutionProcedure.setAcceptanceFee(defaultValue(objects.get(152+a)));
+                courtExecutionProcedure.setOtherFee(defaultValue(objects.get(153+a)));
+                courtExecutionProcedure.setTotalAmount(defaultValue(objects.get(154+a)));
+                courtExecutionProcedure.setRemark(defaultValue(objects.get(160+a)));
+
+                applyRoomDiscountServiceDaoImpl.saveCourtExecutionProcedure(BeanConvertUtil.beanCovertMap(courtExecutionProcedure));
+            }
         }
-
-        //----瀵规柟鏀舵鍗曚綅琛�
-        PayeeReceiveInfoPo payeeReceiveInfoPo = new PayeeReceiveInfoPo();
-        payeeReceiveInfoPo.setCallableId(oweFeeCallablePo.getOfcId());
-        payeeReceiveInfoPo.setCallerName(defaultValue(objects.get(80)));
-        payeeReceiveInfoPo.setContactInfo(defaultValue(objects.get(81)));
-        payeeReceiveInfoPo.setPayeeInfo(defaultValue(objects.get(82)));
-        payeeReceiveInfoPo.setInvoiceNo(defaultValue(objects.get(83)));
-        payeeReceiveInfoPo.setInvoiceDate(objects.getDate(84));
-        payeeReceiveInfoPo.setReceiptNo(defaultValue(objects.get(85)));
-        payeeReceiveInfoPo.setReceiptDate(objects.getDate(86));
-        payeeReceiveInfoPo.setReceiptNote(defaultValue(objects.get(87)));
-        payeeReceiveInfoPo.setReceiptNoteDate(objects.getDate(88));
-        payeeReceiveInfoPo.setImageFile(defaultValue(objects.get(89)));
-        payeeReceiveInfoPo.setOurCompanyReceiveDate(objects.getDate(90));
-        payeeReceiveInfoPo.setAttachmentFile(defaultValue(objects.get(91)));
-        payeeReceiveInfoPo.setOwnerId(importOwnerRoomDto.getOwnerId());
-        payeeReceiveInfoPo.setRoomId(importOwnerRoomDto.getRoomId());
-        int insert = sqlSessionTemplate.insert("payeeReceiveInfoServiceDaoImpl.savePayeeReceiveInfo",
-                BeanConvertUtil.beanCovertMap(payeeReceiveInfoPo));
 
         //----娣诲姞鐢佃仈
         List<MailCallRecord> mailCallRecords = new ArrayList<MailCallRecord>();
@@ -412,49 +472,6 @@
             sqlSessionTemplate.insert("litigationInfoServiceDaoImpl.saveLitigationInfo",
                     BeanConvertUtil.beanCovertMap(litigationInfoPo));
         }
-        //----
-
-        //----娉曢櫌瀹$悊绋嬪簭
-        if (!defaultValue(objects.get(132)).isEmpty()) {
-            CourtTrialProcedure courtTrialProcedure = new CourtTrialProcedure();
-            courtTrialProcedure.setCallableId(oweFeeCallablePo.getOfcId());
-            courtTrialProcedure.setOwnerId(importOwnerRoomDto.getOwnerId());
-            courtTrialProcedure.setAcceptCourtName(defaultValue(objects.get(132)));
-            courtTrialProcedure.setJudgeName(defaultValue(objects.get(133)));
-            courtTrialProcedure.setJudgeContact(defaultValue(objects.get(134)));
-            courtTrialProcedure.setJudgeNoticeAcceptDate(defaultValueToDate(objects.get(135)));
-            courtTrialProcedure.setCourtMediationDate(defaultValueToDate(objects.get(136)));
-            courtTrialProcedure.setMediationResult(defaultValue(objects.get(137)));
-            courtTrialProcedure.setSubpoenaSignDate(defaultValueToDate(objects.get(138)));
-            courtTrialProcedure.setUndeliveredDate(defaultValueToDate(objects.get(139)));
-            courtTrialProcedure.setCourtSessionDate1(defaultValueToDate(objects.get(140)));
-            courtTrialProcedure.setCourtSessionDate2(defaultValueToDate(objects.get(141)));
-            courtTrialProcedure.setCaseNumber(defaultValue(objects.get(142)));
-            courtTrialProcedure.setCourtSessionResult(defaultValue(objects.get(143)));
-            courtTrialProcedure.setJudgmentDate(defaultValueToDate(objects.get(144)));
-            courtTrialProcedure.setJudgmentResult(defaultValue(objects.get(145)));
-            courtTrialProcedure.setRemark(defaultValue(objects.get(146)));
-            applyRoomDiscountServiceDaoImpl.saveCourtTrialProcedure(BeanConvertUtil.beanCovertMap(courtTrialProcedure));
-        }
-        //-----
-
-        //娉曢櫌鎵ц绋嬪簭
-        if (!defaultValue(objects.get(147)).isEmpty()) {
-            CourtExecutionProcedure courtExecutionProcedure = new CourtExecutionProcedure();
-            courtExecutionProcedure.setCallableId(oweFeeCallablePo.getOfcId());
-            courtExecutionProcedure.setOwnerId(importOwnerRoomDto.getOwnerId());
-            courtExecutionProcedure.setApplyTime(defaultValueToDate(objects.get(147)));
-            courtExecutionProcedure.setJudgmentDocNumber(defaultValue(objects.get(148)));
-            courtExecutionProcedure.setArrearsPeriod(defaultValue(objects.get(149)));
-            courtExecutionProcedure.setArrearsAmount(defaultValue(objects.get(150)));
-            courtExecutionProcedure.setLateFee(defaultValue(objects.get(151)));
-            courtExecutionProcedure.setAcceptanceFee(defaultValue(objects.get(152)));
-            courtExecutionProcedure.setOtherFee(defaultValue(objects.get(153)));
-            courtExecutionProcedure.setTotalAmount(defaultValue(objects.get(154)));
-            courtExecutionProcedure.setRemark(defaultValue(objects.get(160)));
-
-            applyRoomDiscountServiceDaoImpl.saveCourtExecutionProcedure(BeanConvertUtil.beanCovertMap(courtExecutionProcedure));
-        }
         importOwnerRoomDto.setRoomState(importOwnerRoomDto.getOwnerName().equals("") ? "2004" : "2001");
 
         importOwnerRoomInnerServiceSMOImpl.saveOwnerRoom(importOwnerRoomDto);
@@ -475,7 +492,7 @@
 
     private String defaultValueToDate(Object o) {
         // 绌哄�肩洿鎺ヨ繑鍥瀗ull锛堝師鏈夐�昏緫锛�
-        if (o == null) {
+        if (o == null || o.toString().isEmpty() || o.toString().equals("0")) {
             return null;
         }
 

--
Gitblit v1.8.0