导入测试

chengf

2026-01-30 b8bf2507bc7b23c90bc6dc71ea2460e277d3800a

 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("导入失败：处理折扣日期区间时出错");
            }
            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) {
        // 空值直接返回null（原有逻辑）
        if (o == null) {
        if (o == null || o.toString().isEmpty() || o.toString().equals("0")) {
            return null;
        }