导入房产添加字段、代码优化2025/07/16

chengf

2025-07-16 cc717a7a9817179d6c18a0f085271992f5635ddf

导入房产添加字段、代码优化2025/07/16

 java110-bean/src/main/java/com/java110/dto/importData/ImportOwnerRoomDto.java

@@ -8,6 +8,7 @@

    private String floorNum;
    private String unitNum;
    private String unitName;
    private String roomNum;
    private String layerCount;
    private String lift; // 是否有电梯
@@ -30,7 +31,42 @@
    private String personRole;
    private String concactPerson;
    private String concactLink;
    private String doorRoomNum;
    private String propertyType;
    private String propertyAddress;
    private String houseCertificateNo;

    public String getDoorRoomNum() {
        return doorRoomNum;
    }

    public void setDoorRoomNum(String doorRoomNum) {
        this.doorRoomNum = doorRoomNum;
    }

    public String getPropertyAddress() {
        return propertyAddress;
    }

    public void setPropertyAddress(String propertyAddress) {
        this.propertyAddress = propertyAddress;
    }

    public String getHouseCertificateNo() {
        return houseCertificateNo;
    }

    public void setHouseCertificateNo(String houseCertificateNo) {
        this.houseCertificateNo = houseCertificateNo;
    }

    public String getPropertyType() {
        return propertyType;
    }

    public void setPropertyType(String propertyType) {
        this.propertyType = propertyType;
    }

    public String getFloorNum() {
        return floorNum;
@@ -48,6 +84,14 @@
        this.unitNum = unitNum;
    }

    public String getUnitName() {
        return unitName;
    }

    public void setUnitName(String unitName) {
        this.unitName = unitName;
    }

    public String getRoomNum() {
        return roomNum;
    }

 java110-bean/src/main/java/com/java110/dto/importData/ImportRoom.java

@@ -20,7 +20,9 @@
    private String feeEndDate;

    private String roomSubType;

    private String roomRent;

    private String roomArea;



 java110-bean/src/main/java/com/java110/dto/report/ReportFeeDto.java

@@ -96,7 +96,42 @@
    private String roomSubType;
    private String roomRent;
    private String roomArea;
    private String doorRoomNum;
    private String propertyType;
    private String propertyAddress;
    private String houseCertificateNo;

    public String getDoorRoomNum() {
        return doorRoomNum;
    }

    public void setDoorRoomNum(String doorRoomNum) {
        this.doorRoomNum = doorRoomNum;
    }

    public String getPropertyAddress() {
        return propertyAddress;
    }

    public void setPropertyAddress(String propertyAddress) {
        this.propertyAddress = propertyAddress;
    }

    public String getHouseCertificateNo() {
        return houseCertificateNo;
    }

    public void setHouseCertificateNo(String houseCertificateNo) {
        this.houseCertificateNo = houseCertificateNo;
    }

    public String getPropertyType() {
        return propertyType;
    }

    public void setPropertyType(String propertyType) {
        this.propertyType = propertyType;
    }
    private String payOnline;
    private String scale;
    private String decimalPlace;

 java110-bean/src/main/java/com/java110/po/room/RoomPo.java

@@ -30,6 +30,42 @@
    private String roomSubType;
    private String roomRent;
    private String roomArea;
    private String doorRoomNum;
    private String propertyType;
    private String propertyAddress;
    private String houseCertificateNo;

    public String getDoorRoomNum() {
        return doorRoomNum;
    }

    public void setDoorRoomNum(String doorRoomNum) {
        this.doorRoomNum = doorRoomNum;
    }

    public String getPropertyAddress() {
        return propertyAddress;
    }

    public void setPropertyAddress(String propertyAddress) {
        this.propertyAddress = propertyAddress;
    }

    public String getHouseCertificateNo() {
        return houseCertificateNo;
    }

    public void setHouseCertificateNo(String houseCertificateNo) {
        this.houseCertificateNo = houseCertificateNo;
    }

    public String getPropertyType() {
        return propertyType;
    }

    public void setPropertyType(String propertyType) {
        this.propertyType = propertyType;
    }

    public String getRoomId() {
        return roomId;

 java110-bean/src/main/java/com/java110/po/unit/UnitPo.java

@@ -14,6 +14,7 @@

    private String unitId;
    private String unitNum;
    private String unitName;
    private String floorId;
    private String layerCount;
    private String lift;
@@ -38,6 +39,14 @@
        this.unitNum = unitNum;
    }

    public String getUnitName() {
        return unitName;
    }

    public void setUnitName(String unitName) {
        this.unitName = unitName;
    }

    public String getFloorId() {
        return floorId;
    }

 java110-bean/src/main/java/com/java110/vo/api/ApiRoomDataVo.java

@@ -35,6 +35,43 @@
    private String roomSubType;
    private String roomRent;
    private String roomArea;
    private String doorRoomNum;
    private String propertyType;
    private String propertyAddress;
    private String houseCertificateNo;

    public String getDoorRoomNum() {
        return doorRoomNum;
    }

    public void setDoorRoomNum(String doorRoomNum) {
        this.doorRoomNum = doorRoomNum;
    }

    public String getPropertyAddress() {
        return propertyAddress;
    }

    public void setPropertyAddress(String propertyAddress) {
        this.propertyAddress = propertyAddress;
    }

    public String getHouseCertificateNo() {
        return houseCertificateNo;
    }

    public void setHouseCertificateNo(String houseCertificateNo) {
        this.houseCertificateNo = houseCertificateNo;
    }

    
    public String getPropertyType() {
        return propertyType;
    }

    public void setPropertyType(String propertyType) {
        this.propertyType = propertyType;
    }
    private String roomSubTypeName;
    private String ownerId;
    private String ownerName;

 java110-core/src/main/java/com/java110/core/factory/AuthenticationFactory.java

@@ -732,7 +732,7 @@
            countNum = Integer.parseInt(count);
        }

        if (countNum >= 5) {
        if (countNum >= 20) {
            throw new IllegalArgumentException("登陆错误次数过多，请休息一会再试");
        }


 java110-db/src/main/resources/mapper/community/DataPrivilegeUnitV1ServiceDaoImplMapper.xml

@@ -40,6 +40,9 @@
        <if test="unitNum !=null and unitNum != ''">
            and t.unit_num= #{unitNum}
        </if>
        <if test="unitName !=null and unitName != ''">
            and t.unit_name= #{unitName}
        </if>
        <if test="unitId !=null and unitId != ''">
            and t.unit_id= #{unitId}
        </if>
@@ -78,6 +81,9 @@
        <if test="unitNum !=null and unitNum != ''">
            , t.unit_num= #{unitNum}
        </if>
        <if test="unitName!=null and unitName != ''">
            , t.unit_name= #{unitName}
        </if>
        <if test="unitId !=null and unitId != ''">
            , t.unit_id= #{unitId}
        </if>
@@ -115,6 +121,9 @@
        <if test="unitNum !=null and unitNum != ''">
            and t.unit_num= #{unitNum}
        </if>
        <if test="unitName !=null and unitName != ''">
            and t.unit_name= #{unitName}
        </if>
        <if test="unitId !=null and unitId != ''">
            and t.unit_id= #{unitId}
        </if>
@@ -148,6 +157,9 @@
        <if test="unitNum !=null and unitNum != ''">
            and t.unit_num= #{unitNum}
        </if>
        <if test="unitName !=null and unitName != ''">
            and t.unit_name= #{unitName}
        </if>


    </select>
@@ -167,6 +179,9 @@
        <if test="unitNum !=null and unitNum != ''">
            and t.unit_num= #{unitNum}
        </if>
        <if test="unitName !=null and unitName != ''">
            and t.unit_name= #{unitName}
        </if>
        order by t.create_time desc
        <if test="page != -1 and page != null ">
            limit #{page}, #{row}

 java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml

@@ -22,6 +22,8 @@
        communityId,t.room_type,t.room_type roomType,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type
        roomSubType,
        t.room_rent roomRent,t.room_area roomArea
        t.door_room_num,t.property_type,t.property_address,t.house_certificate_no,
        t.door_room_num doorRoomNum,t.property_type propertyType,t.property_address propertyAddress,t.house_certificate_no houseCertificateNo
        from business_building_room t
        where 1 =1
        <if test="feeCoefficient !=null and feeCoefficient != ''">
@@ -75,10 +77,10 @@
    <insert id="saveRoomInfoInstance" parameterType="Map">
        insert into building_room(
        fee_coefficient,section,status_cd,remark,user_id,room_id,layer,built_up_area,room_num,unit_id,b_id,apartment,state,community_id,
        room_type,room_sub_type,room_rent,room_area
        room_type,room_sub_type,room_rent,room_area,door_room_num,property_type,property_address,house_certificate_no
        ) select
        t.fee_coefficient,t.section,'0',t.remark,t.user_id,t.room_id,t.layer,t.built_up_area,t.room_num,t.unit_id,t.b_id,t.apartment,t.state,t.community_id,
        t.room_type,t.room_sub_type,t.room_rent,t.room_area
        t.room_type,t.room_sub_type,t.room_rent,t.room_area,door_room_num,property_type,property_address,house_certificate_no
        from business_building_room t where 1=1
        <if test="feeCoefficient !=null and feeCoefficient != ''">
            and t.fee_coefficient= #{feeCoefficient}
@@ -123,6 +125,38 @@
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <choose>
            <when test="doorRoomNum != null and doorRoomNum != ''">
                and t.door_room_num = #{doorRoomNum}
            </when>
            <otherwise>
                and t.door_room_num = ''
            </otherwise>
        </choose>
        <choose>
            <when test="propertyType != null and propertyType != ''">
                and t.property_type = #{propertyType}
            </when>
            <otherwise>
                and t.property_type = ''
            </otherwise>
        </choose>
        <choose>
            <when test="propertyAddress != null and propertyAddress != ''">
                and t.property_address = #{propertyAddress}
            </when>
            <otherwise>
                and t.property_address = ''
            </otherwise>
        </choose>
        <choose>
            <when test="houseCertificateNo != null and houseCertificateNo != ''">
                and t.house_certificate_no = #{houseCertificateNo}
            </when>
            <otherwise>
                and t.house_certificate_no = ''
            </otherwise>
        </choose>
    </insert>

    <!-- 查询小区房屋信息 add by wuxw 2018-07-03 -->

 java110-db/src/main/resources/mapper/community/RoomV1ServiceDaoImplMapper.xml

@@ -8,9 +8,9 @@
    <!-- 保存房屋信息 add by wuxw 2018-07-03 -->
    <insert id="saveRoomInfo" parameterType="Map">
        insert into building_room(
        section,remark,room_sub_type,room_area,user_id,room_id,layer,fee_coefficient,built_up_area,room_num,unit_id,state,community_id,apartment,room_type,room_rent
        section,remark,room_sub_type,room_area,user_id,room_id,layer,fee_coefficient,built_up_area,room_num,unit_id,state,community_id,apartment,room_type,room_rent,door_room_num,property_type,property_address,house_certificate_no
        ) values (
        #{section},#{remark},#{roomSubType},#{roomArea},#{userId},#{roomId},#{layer},#{feeCoefficient},#{builtUpArea},#{roomNum},#{unitId},#{state},#{communityId},#{apartment},#{roomType},#{roomRent}
        #{section},#{remark},#{roomSubType},#{roomArea},#{userId},#{roomId},#{layer},#{feeCoefficient},#{builtUpArea},#{roomNum},#{unitId},#{state},#{communityId},#{apartment},#{roomType},#{roomRent},#{doorRoomNum},#{propertyType},#{propertyAddress},#{houseCertificateNo}
        )
    </insert>


 java110-db/src/main/resources/mapper/community/UnitServiceDaoImplMapper.xml

@@ -33,6 +33,9 @@
        <if test="unitNum !=null and unitNum != ''">
            and t.unit_num= #{unitNum}
        </if>
        <if test="unitName !=null and unitName != ''">
            and t.unit_name= #{unitName}
        </if>
        <if test="lift !=null and lift != ''">
            and t.lift= #{lift}
        </if>
@@ -51,7 +54,7 @@
    <!-- 保存小区单元信息至 instance表中 add by wuxw 2018-07-03 -->
    <insert id="saveUnitInfoInstance" parameterType="Map">
        insert into building_unit(
        floor_id,layer_count,unit_id,unit_num,lift,status_cd,remark,b_id,user_id,unit_area
        floor_id,layer_count,unit_id,unit_num,unit_name,lift,status_cd,remark,b_id,user_id,unit_area
        ) select t.floor_id,t.layer_count,t.unit_id,t.unit_num,t.lift,'0',t.remark,t.b_id,t.user_id,t.unit_area
        from
        business_building_unit t where 1=1
@@ -67,6 +70,9 @@
        </if>
        <if test="unitNum !=null and unitNum != ''">
            and t.unit_num= #{unitNum}
        </if>
        <if test="unitName !=null and unitName != ''">
            and t.unit_name= #{unitName}
        </if>
        <if test="lift !=null and lift != ''">
            and t.lift= #{lift}
@@ -111,6 +117,9 @@
        <if test="unitNum !=null and unitNum != ''">
            and t.unit_num= #{unitNum}
        </if>
        <if test="unitName !=null and unitName != ''">
            and t.unit_name= #{unitName}
        </if>
        <if test="lift !=null and lift != ''">
            and t.lift= #{lift}
        </if>
@@ -146,6 +155,9 @@
        </if>
        <if test="unitNum !=null and unitNum != ''">
            , t.unit_num= #{unitNum}
        </if>
        <if test="unitName!=null and unitName != ''">
            , t.unit_name= #{unitName}
        </if>
        <if test="lift !=null and lift != ''">
            , t.lift= #{lift}
@@ -185,6 +197,9 @@
        <if test="unitNum !=null and unitNum != ''">
            and t.unit_num= #{unitNum}
        </if>
        <if test="unitName !=null and unitName != ''">
            and t.unit_name= #{unitName}
        </if>
        <if test="lift !=null and lift != ''">
            and t.lift= #{lift}
        </if>

 java110-db/src/main/resources/mapper/community/UnitV1ServiceDaoImplMapper.xml

@@ -8,9 +8,9 @@
    <!-- 保存单元新信息 add by wuxw 2018-07-03 -->
    <insert id="saveUnitInfo" parameterType="Map">
        insert into building_unit(
        floor_id,layer_count,unit_area,unit_id,unit_num,lift,remark,user_id
        floor_id,layer_count,unit_area,unit_id,unit_num,unit_name,lift,remark,user_id
        ) values (
        #{floorId},#{layerCount},#{unitArea},#{unitId},#{unitNum},#{lift},#{remark},#{userId}
        #{floorId},#{layerCount},#{unitArea},#{unitId},#{unitNum},#{unitName},#{lift},#{remark},#{userId}
        )
    </insert>

@@ -36,6 +36,9 @@
        </if>
        <if test="unitNum !=null and unitNum != ''">
            and t.unit_num= #{unitNum}
        </if>
        <if test="unitName !=null and unitName != ''">
            and t.unit_name= #{unitName}
        </if>
        <if test='roomUnit == "Y"'>
            and t.unit_num != '0'
@@ -75,6 +78,9 @@
        <if test="unitNum !=null and unitNum != ''">
            , t.unit_num= #{unitNum}
        </if>
        <if test="unitName!=null and unitName != ''">
            , t.unit_name= #{unitName}
        </if>
        <if test="lift !=null and lift != ''">
            , t.lift= #{lift}
        </if>
@@ -111,6 +117,9 @@
        <if test="unitNum !=null and unitNum != ''">
            and t.unit_num= #{unitNum}
        </if>
        <if test="unitName !=null and unitName != ''">
            and t.unit_name= #{unitName}
        </if>
        <if test='roomUnit == "Y"'>
            and t.unit_num != '0'
        </if>

 java110-db/src/main/resources/mapper/fee/FeeConfigServiceDaoImplMapper.xml

@@ -158,6 +158,9 @@
        <if test="feeTypeCd !=null and feeTypeCd != ''">
            and t.fee_type_cd= #{feeTypeCd}
        </if>
        <if test="secondaryFeeTypeCd !=null and secondaryFeeTypeCd != ''">
            and t.secondary_fee_type_cd= #{secondaryFeeTypeCd}
        </if>
        <if test="computingFormula !=null and computingFormula != ''">
            and t.computing_formula= #{computingFormula}
        </if>
@@ -319,6 +322,9 @@
        <if test="feeTypeCd !=null and feeTypeCd != ''">
            and t.fee_type_cd= #{feeTypeCd}
        </if>
        <if test="secondaryFeeTypeCd !=null and secondaryFeeTypeCd != ''">
            and t.secondary_fee_type_cd= #{secondaryFeeTypeCd}
        </if>
        <if test="computingFormula !=null and computingFormula != ''">
            and t.computing_formula= #{computingFormula}
        </if>

 java110-db/src/main/resources/mapper/fee/ImportFeeDetailServiceDaoImplMapper.xml

@@ -32,6 +32,9 @@
        <if test="unitNum !=null and unitNum != ''">
            and t.unit_num= #{unitNum}
        </if>
        <if test="unitName !=null and unitName != ''">
            and t.unit_name= #{unitName}
        </if>
        <if test="statusCd !=null and statusCd != ''">
            and t.status_cd= #{statusCd}
        </if>
@@ -97,6 +100,9 @@
        <if test="unitNum !=null and unitNum != ''">
            , t.unit_num= #{unitNum}
        </if>
        <if test="unitName!=null and unitName != ''">
            , t.unit_name= #{unitName}
        </if>
        <if test="feeId !=null and feeId != ''">
            , t.fee_id= #{feeId}
        </if>
@@ -142,6 +148,9 @@
        <if test="unitNum !=null and unitNum != ''">
            and t.unit_num= #{unitNum}
        </if>
        <if test="unitName !=null and unitName != ''">
            and t.unit_name= #{unitName}
        </if>
        <if test="statusCd !=null and statusCd != ''">
            and t.status_cd= #{statusCd}
        </if>

 service-acct/src/main/java/com/java110/acct/cmd/payment/NativeQrcodePaymentCmd.java

@@ -81,7 +81,8 @@
        // redis 中 保存 请求参数
        CommonCache.setValue("nativeQrcodePayment_" + token, reqJson.toJSONString(), CommonCache.PAY_DEFAULT_EXPIRE_TIME);
        JSONObject result = new JSONObject();
        result.put("codeUrl", UrlCache.getOwnerUrl() + "/#/pages/fee/qrCodeCashier?qrToken=" + token);
//        result.put("codeUrl", UrlCache.getOwnerUrl() + "/#/pages/fee/qrCodeCashier?qrToken=" + token);
        result.put("codeUrl", UrlCache.getOwnerUrl() + "/#/pages/fee/qrCodeCashier");

        ResponseEntity<String> responseEntity = ResultVo.createResponseEntity(result);


 service-api/src/main/java/com/java110/api/importData/adapt/ImportOwnerCarDataCleaningAdapt.java

@@ -59,7 +59,7 @@
            }
            Assert.hasValue(os[0], (osIndex + 1) + "车牌号不能为空");
            Assert.hasValue(os[1], (osIndex + 1) + "业主不能为空");
            Assert.hasValue(os[2], (osIndex + 1) + "手机号不能为空");
//            Assert.hasValue(os[2], (osIndex + 1) + "手机号不能为空");
            Assert.hasValue(os[3], (osIndex + 1) + "车辆品牌不能为空");
            Assert.hasValue(os[4], (osIndex + 1) + "车辆类型不能为空");
            Assert.hasValue(os[5], (osIndex + 1) + "颜色不能为空");
@@ -76,7 +76,7 @@
            importOwnerCar = new OwnerCarDto();
            importOwnerCar.setCarNum(os[0].toString().trim());
            importOwnerCar.setOwnerName(os[1].toString().trim());
            importOwnerCar.setLink(os[2].toString().trim());
            importOwnerCar.setLink(os[2] == null ? "" : os[2].toString().trim());
            importOwnerCar.setCarBrand(os[3].toString().trim());
            importOwnerCar.setCarType(os[4].toString().trim());
            importOwnerCar.setCarColor(os[5].toString().trim());

 service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomOwnerDataCleaningAdapt.java

@@ -63,25 +63,31 @@
            Assert.hasValue(os[0], (osIndex + 1) + "行楼号不能为空");
            Assert.hasValue(os[1], (osIndex + 1) + "行单元不能为空");
            Assert.hasValue(os[2], (osIndex + 1) + "行房屋不能为空");
            Assert.hasValue(os[3], (osIndex + 1) + "行楼层不能为空");
            Assert.hasValue(os[4], (osIndex + 1) + "行总楼层不能为空");
            Assert.hasValue(os[5], (osIndex + 1) + "行是否有电梯不能为空");
            Assert.hasValue(os[6], (osIndex + 1) + "行房屋类型不能为空");
            Assert.hasValue(os[7], (osIndex + 1) + "行房屋户型不能为空");
            Assert.hasValue(os[8], (osIndex + 1) + "行建筑面积不能为空");
            Assert.hasValue(os[9], (osIndex + 1) + "行室内面积不能为空");
            Assert.hasValue(os[10], (osIndex + 1) + "行租金不能为空");
            Assert.hasValue(os[11], (osIndex + 1) + "行房屋状态不能为空");
            if (os.length > 12 && !StringUtil.isNullOrNone(os[12])) {
                Assert.hasValue(os[12], (osIndex + 1) + "行业主名称不能为空");
                Assert.hasValue(os[13], (osIndex + 1) + "行性别不能为空");

            Assert.hasValue(os[3], (osIndex + 1) + "门室号不能为空");

            Assert.hasValue(os[4], (osIndex + 1) + "行楼层不能为空");
            Assert.hasValue(os[5], (osIndex + 1) + "行总楼层不能为空");

            Assert.hasValue(os[6], (osIndex + 1) + "物业类型不能为空");
            Assert.hasValue(os[7], (osIndex + 1) + "产证地址不能为空");

            Assert.hasValue(os[9], (osIndex + 1) + "行是否有电梯不能为空");
            Assert.hasValue(os[10], (osIndex + 1) + "行房屋类型不能为空");
            Assert.hasValue(os[11], (osIndex + 1) + "行房屋户型不能为空");
            Assert.hasValue(os[12], (osIndex + 1) + "行建筑面积不能为空");
            Assert.hasValue(os[13], (osIndex + 1) + "行室内面积不能为空");
            Assert.hasValue(os[14], (osIndex + 1) + "行租金不能为空");
            Assert.hasValue(os[15], (osIndex + 1) + "行房屋状态不能为空");
            if (os.length > 16 && !StringUtil.isNullOrNone(os[16])) {
                Assert.hasValue(os[16], (osIndex + 1) + "行业主名称不能为空");
                // Assert.hasValue(os[14], (osIndex + 1) + "行年龄不能为空");
                Assert.hasValue(os[14], (osIndex + 1) + "行手机号不能为空");
//                Assert.hasValue(os[18], (osIndex + 1) + "行手机号不能为空");
                //Assert.hasValue(os[15], (osIndex + 1) + "行身份证不能为空");
                Assert.hasValue(os[16], (osIndex + 1) + "行业主类型不能为空");
                Assert.hasValue(os[17], (osIndex + 1) + "行人员类型不能为空");
                Assert.hasValue(os[18], (osIndex + 1) + "行人员角色不能为空");
                Assert.hasValue(os[19], (osIndex + 1) + "行联系人不能为空");
                Assert.hasValue(os[20], (osIndex + 1) + "行业主类型不能为空");
                Assert.hasValue(os[21], (osIndex + 1) + "行人员类型不能为空");
                Assert.hasValue(os[22], (osIndex + 1) + "行人员角色不能为空");
                Assert.hasValue(os[23], (osIndex + 1) + "行联系人不能为空");
            }

            importOwnerRoomDto = new ImportOwnerRoomDto();
@@ -90,31 +96,39 @@
            importOwnerRoomDto.setFloorNum(os[0].toString().trim());
            importOwnerRoomDto.setUnitNum(os[1].toString().trim());
            importOwnerRoomDto.setRoomNum(os[2].toString().trim());
            importOwnerRoomDto.setLayer(os[3].toString().trim());
            importOwnerRoomDto.setLayerCount(os[4].toString().trim());

            importOwnerRoomDto.setDoorRoomNum(os[3].toString().trim());

            importOwnerRoomDto.setLayer(os[4].toString().trim());
            importOwnerRoomDto.setLayerCount(os[5].toString().trim());

            importOwnerRoomDto.setPropertyType(os[6].toString().trim());
            importOwnerRoomDto.setPropertyAddress(os[7].toString().trim());
            importOwnerRoomDto.setHouseCertificateNo(os[8] == null ? "" : os[8].toString().trim());

            //importOwnerRoomDto.setLift(os[5].toString().trim());
            importOwnerRoomDto.setLift("有".equals(os[5].toString().trim()) ? "1010" : "2020");
            importOwnerRoomDto.setRoomSubType(os[6].toString().trim());
            importOwnerRoomDto.setSection(os[7].toString().trim());
            importOwnerRoomDto.setBuiltUpArea(os[8].toString().trim());
            importOwnerRoomDto.setRoomArea(os[9].toString().trim());
            importOwnerRoomDto.setRoomRent(os[10].toString().trim());
            importOwnerRoomDto.setRoomState(os[11].toString().trim());
            if (os.length > 12 && !StringUtil.isNullOrNone(os[12])) {
                importOwnerRoomDto.setOwnerName(os[12].toString().trim());
                importOwnerRoomDto.setSex("男".equals(os[13].toString().trim()) ? "0" : "1");
            importOwnerRoomDto.setLift("有".equals(os[9].toString().trim()) ? "1010" : "2020");
            importOwnerRoomDto.setRoomSubType(os[10].toString().trim());
            importOwnerRoomDto.setSection(os[11].toString().trim());
            importOwnerRoomDto.setBuiltUpArea(os[12].toString().trim());
            importOwnerRoomDto.setRoomArea(os[13].toString().trim());
            importOwnerRoomDto.setRoomRent(os[14].toString().trim());
            importOwnerRoomDto.setRoomState(os[15].toString().trim());
            if (os.length > 16 && !StringUtil.isNullOrNone(os[16])) {
                importOwnerRoomDto.setOwnerName(os[16].toString().trim());
                importOwnerRoomDto.setSex(os[17] == null ? null : "男".equals(os[17].toString().trim()) ? "0" : "1");
                // String age = StringUtil.isNullOrNone(os[14]) ? CommonUtil.getAgeByCertId(os[16].toString().trim()) : os[14].toString().trim();
                importOwnerRoomDto.setAge("1");
                importOwnerRoomDto.setTel(os[14].toString().trim());
                String idCard = StringUtil.isNullOrNone(os[15]) ? "" : os[15].toString().trim();
                importOwnerRoomDto.setTel(os[18] == null?"":os[18].toString().trim());
                String idCard = StringUtil.isNullOrNone(os[19]) ? "" : os[19].toString().trim();
                importOwnerRoomDto.setIdCard(idCard);
                importOwnerRoomDto.setOwnerTypeCd(os[16].toString().trim());
                importOwnerRoomDto.setPersonType(os[17].toString().trim());
                importOwnerRoomDto.setPersonRole(os[18].toString().trim());
                importOwnerRoomDto.setConcactPerson(os[19].toString().trim());
                importOwnerRoomDto.setOwnerTypeCd(os[20].toString().trim());
                importOwnerRoomDto.setPersonType(os[21].toString().trim());
                importOwnerRoomDto.setPersonRole(os[22].toString().trim());
                importOwnerRoomDto.setConcactPerson(os[23].toString().trim());
            }
            if (os.length > 20 && !StringUtil.isNullOrNone(os[20])) {
                importOwnerRoomDto.setConcactLink(os[20].toString().trim());
            if (os.length > 24 && !StringUtil.isNullOrNone(os[24])) {
                importOwnerRoomDto.setConcactLink(os[24].toString().trim());
            }


@@ -177,7 +191,8 @@
            }

            if (StringUtil.isEmpty(importOwnerRoomDto.getSex())) {
                throw new IllegalArgumentException((roomIndex + 2) + "行性别不能为空");
                importOwnerRoomDto.setSex("");
//                throw new IllegalArgumentException((roomIndex + 2) + "行性别不能为空");
            }

//            if (StringUtil.isEmpty(importOwnerRoomDto.getAge())) {
@@ -186,12 +201,13 @@
            //系统目前 在香港台湾 以及新加坡等地都有商用 所以 并不是中国大陆手机号规则 所以不做严格校验
            //烦请专业测试团队勿喷
            if (StringUtil.isEmpty(importOwnerRoomDto.getTel())) {
                throw new IllegalArgumentException((roomIndex + 2) + "行手机号不能为空");
                importOwnerRoomDto.setTel("");
//                throw new IllegalArgumentException((roomIndex + 2) + "行手机号不能为空");/**/
            }

            if (importOwnerRoomDto.getTel().length() > 11) {
                throw new IllegalArgumentException((roomIndex + 2) + "行手机号超过11位,请核实");
            }
//            if (importOwnerRoomDto.getTel().length() > 11) {
//                throw new IllegalArgumentException((roomIndex + 2) + "行手机号超过11位,请核实");
//            }

//            if (StringUtil.isEmpty(importOwnerRoomDto.getIdCard())) {
//                throw new IllegalArgumentException((roomIndex + 1) + "行身份证号不能为空");

 service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java

@@ -133,7 +133,8 @@
            }

            if (StringUtil.isEmpty(importOwnerRoomDto.getSex())) {
                throw new IllegalArgumentException((roomIndex + 1) + "行性别不能为空");
                importOwnerRoomDto.setSex("");
//                throw new IllegalArgumentException((roomIndex + 1) + "行性别不能为空");
            }

//            if (StringUtil.isEmpty(importOwnerRoomDto.getAge())) {
@@ -141,9 +142,9 @@
//            }
            //系统目前 在香港台湾 以及新加坡等地都有商用 所以 并不是中国大陆手机号规则 所以不做严格校验
            //烦请专业测试团队勿喷
            if (StringUtil.isEmpty(importOwnerRoomDto.getTel())) {
                throw new IllegalArgumentException((roomIndex + 1) + "行手机号不能为空");
            }
//            if (StringUtil.isEmpty(importOwnerRoomDto.getTel())) {
//                throw new IllegalArgumentException((roomIndex + 1) + "行手机号不能为空");
//            }

            if (importOwnerRoomDto.getTel().length() > 11) {
                throw new IllegalArgumentException((roomIndex + 1) + "行手机号超过11位,请核实");
@@ -227,11 +228,41 @@
            Assert.hasValue(os[11], (osIndex + 1) + "行房屋状态不能为空");
            if (os.length > 12 && !StringUtil.isNullOrNone(os[12])) {
                Assert.hasValue(os[12], (osIndex + 1) + "行业主名称不能为空");
                Assert.hasValue(os[13], (osIndex + 1) + "行性别不能为空");
//                Assert.hasValue(os[13], (osIndex + 1) + "行性别不能为空");
               // Assert.hasValue(os[14], (osIndex + 1) + "行年龄不能为空");
                Assert.hasValue(os[14], (osIndex + 1) + "行手机号不能为空");
//                Assert.hasValue(os[14], (osIndex + 1) + "行手机号不能为空");
                //Assert.hasValue(os[15], (osIndex + 1) + "行身份证不能为空");
                Assert.hasValue(os[16], (osIndex + 1) + "行业主类型不能为空");
            }

            Assert.hasValue(os[0], (osIndex + 1) + "行楼号不能为空");
            Assert.hasValue(os[1], (osIndex + 1) + "行单元不能为空");
            Assert.hasValue(os[2], (osIndex + 1) + "行房屋不能为空");

            Assert.hasValue(os[3], (osIndex + 1) + "门室号不能为空");

            Assert.hasValue(os[4], (osIndex + 1) + "行楼层不能为空");
            Assert.hasValue(os[5], (osIndex + 1) + "行总楼层不能为空");

            Assert.hasValue(os[6], (osIndex + 1) + "物业类型不能为空");
            Assert.hasValue(os[7], (osIndex + 1) + "产证地址不能为空");

            Assert.hasValue(os[9], (osIndex + 1) + "行是否有电梯不能为空");
            Assert.hasValue(os[10], (osIndex + 1) + "行房屋类型不能为空");
            Assert.hasValue(os[11], (osIndex + 1) + "行房屋户型不能为空");
            Assert.hasValue(os[12], (osIndex + 1) + "行建筑面积不能为空");
            Assert.hasValue(os[13], (osIndex + 1) + "行室内面积不能为空");
            Assert.hasValue(os[14], (osIndex + 1) + "行租金不能为空");
            Assert.hasValue(os[15], (osIndex + 1) + "行房屋状态不能为空");
            if (os.length > 16 && !StringUtil.isNullOrNone(os[16])) {
                Assert.hasValue(os[16], (osIndex + 1) + "行业主名称不能为空");
                // Assert.hasValue(os[14], (osIndex + 1) + "行年龄不能为空");
//                Assert.hasValue(os[18], (osIndex + 1) + "行手机号不能为空");
                //Assert.hasValue(os[15], (osIndex + 1) + "行身份证不能为空");
                Assert.hasValue(os[20], (osIndex + 1) + "行业主类型不能为空");
                Assert.hasValue(os[21], (osIndex + 1) + "行人员类型不能为空");
                Assert.hasValue(os[22], (osIndex + 1) + "行人员角色不能为空");
                Assert.hasValue(os[23], (osIndex + 1) + "行联系人不能为空");
            }

            importOwnerRoomDto = new ImportOwnerRoomDto();
@@ -240,25 +271,39 @@
            importOwnerRoomDto.setFloorNum(os[0].toString().trim());
            importOwnerRoomDto.setUnitNum(os[1].toString().trim());
            importOwnerRoomDto.setRoomNum(os[2].toString().trim());
            importOwnerRoomDto.setLayer(os[3].toString().trim());
            importOwnerRoomDto.setLayerCount(os[4].toString().trim());

            importOwnerRoomDto.setDoorRoomNum(os[3].toString().trim());

            importOwnerRoomDto.setLayer(os[4].toString().trim());
            importOwnerRoomDto.setLayerCount(os[5].toString().trim());

            importOwnerRoomDto.setPersonType(os[6].toString().trim());
            importOwnerRoomDto.setPropertyAddress(os[7].toString().trim());
            importOwnerRoomDto.setHouseCertificateNo(os[8] == null ? "" : os[8].toString().trim());

            //importOwnerRoomDto.setLift(os[5].toString().trim());
            importOwnerRoomDto.setLift("有".equals(os[5].toString().trim()) ? "1010" : "2020");
            importOwnerRoomDto.setRoomSubType(os[6].toString().trim());
            importOwnerRoomDto.setSection(os[7].toString().trim());
            importOwnerRoomDto.setBuiltUpArea(os[8].toString().trim());
            importOwnerRoomDto.setRoomArea(os[9].toString().trim());
            importOwnerRoomDto.setRoomRent(os[10].toString().trim());
            importOwnerRoomDto.setRoomState(os[11].toString().trim());
            if (os.length > 12 && !StringUtil.isNullOrNone(os[12])) {
                importOwnerRoomDto.setOwnerName(os[12].toString().trim());
                importOwnerRoomDto.setSex("男".equals(os[13].toString().trim()) ? "0" : "1");
            importOwnerRoomDto.setLift("有".equals(os[9].toString().trim()) ? "1010" : "2020");
            importOwnerRoomDto.setRoomSubType(os[10].toString().trim());
            importOwnerRoomDto.setSection(os[11].toString().trim());
            importOwnerRoomDto.setBuiltUpArea(os[12].toString().trim());
            importOwnerRoomDto.setRoomArea(os[13].toString().trim());
            importOwnerRoomDto.setRoomRent(os[14].toString().trim());
            importOwnerRoomDto.setRoomState(os[15].toString().trim());
            if (os.length > 16 && !StringUtil.isNullOrNone(os[16])) {
                importOwnerRoomDto.setOwnerName(os[16].toString().trim());
                importOwnerRoomDto.setSex(os[17] == null ? null : "男".equals(os[17].toString().trim()) ? "0" : "1");
               // String age = StringUtil.isNullOrNone(os[14]) ? CommonUtil.getAgeByCertId(os[16].toString().trim()) : os[14].toString().trim();
                importOwnerRoomDto.setAge("1");
                importOwnerRoomDto.setTel(os[14].toString().trim());
                String idCard = StringUtil.isNullOrNone(os[15])?"": os[15].toString().trim();
                importOwnerRoomDto.setTel(os[18] == null ? "" :os[18].toString().trim());
                String idCard = StringUtil.isNullOrNone(os[19]) ? "" : os[19].toString().trim();
                importOwnerRoomDto.setIdCard(idCard);
                importOwnerRoomDto.setOwnerTypeCd(os[16].toString().trim());
                importOwnerRoomDto.setOwnerTypeCd(os[20].toString().trim());
                importOwnerRoomDto.setPersonType(os[21].toString().trim());
                importOwnerRoomDto.setPersonRole(os[22].toString().trim());
                importOwnerRoomDto.setConcactPerson(os[23].toString().trim());
            }
            if (os.length > 24 && !StringUtil.isNullOrNone(os[24])) {
                importOwnerRoomDto.setConcactLink(os[24].toString().trim());
            }



 service-api/src/main/java/com/java110/api/smo/payment/adapt/fuiouPay/FuiouPayAdapt.java

@@ -162,7 +162,6 @@
    private JSONObject java110UnifieldOrder(RestTemplate outRestTemplate, String feeName, String orderNum,
                                            String tradeType, double payAmount, String openid,
                                            SmallWeChatDto smallWeChatDto, String notifyUrl) throws Exception {

        String systemName = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.PAY_GOOD_NAME);
        String orderPre = CommunitySettingFactory.getValue(smallWeChatDto.getObjId(), "FUIOU_ORDER_PRE");
        JSONObject paramMap = new JSONObject();

 service-community/src/main/java/com/java110/community/cmd/unit/SaveUnitCmd.java

@@ -112,6 +112,7 @@
        businessUnit.put("remark", reqJson.getString("remark"));
        businessUnit.put("unitArea", reqJson.getString("unitArea"));
        businessUnit.put("userId", reqJson.getString("userId"));
        businessUnit.put("unitName", reqJson.getString("unitName"));
        UnitPo unitPo = BeanConvertUtil.covertBean(businessUnit, UnitPo.class);
        int flag = unitV1InnerServiceSMOImpl.saveUnit(unitPo);


 service-community/src/main/java/com/java110/community/cmd/unit/UpdateUnitCmd.java

@@ -106,6 +106,7 @@
        businessUnit.put("layerCount", reqJson.getString("layerCount"));
        businessUnit.put("unitId", reqJson.getString("unitId"));
        businessUnit.put("unitNum", reqJson.getString("unitNum"));
        businessUnit.put("unitName", reqJson.getString("unitName"));
        businessUnit.put("lift", reqJson.getString("lift"));
        businessUnit.put("remark", reqJson.getString("remark"));
        businessUnit.put("unitArea", reqJson.getString("unitArea"));

 service-community/src/main/java/com/java110/community/smo/impl/ImportOwnerRoomInnerServiceSMOImpl.java

@@ -399,6 +399,10 @@
            roomPo.setUnitId(unitId);
            roomPo.setRemark("房产导入");
            roomPo.setUserId(importOwnerRoomDto.getUserId());
            roomPo.setDoorRoomNum(importOwnerRoomDto.getDoorRoomNum());
            roomPo.setPropertyType(importOwnerRoomDto.getPropertyType());
            roomPo.setPropertyAddress(importOwnerRoomDto.getPropertyAddress());
            roomPo.setHouseCertificateNo(importOwnerRoomDto.getHouseCertificateNo());
            flag = roomV1InnerServiceSMOImpl.saveRoom(roomPo);

            if (flag < 1) {