导入测试

chengf

2026-03-12 4c3fa7b1828d5e9bbd586a42fa00924e9f5a7c25

导入测试

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

@@ -786,7 +786,7 @@
        td1.table_columns = 'room_sub_type'
        WHERE 1 =1
        <if test="communityId !=null and communityId != ''">
            AND t.`community_id` = #{communityId}
            and t.community_id in (#{communityId}, '9999')
        </if>
        <if test="communityIds != null">
            and t.community_id in

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

@@ -135,25 +135,23 @@
    <!-- 保存水电费信息至 instance表中 add by wuxw 2018-07-03 -->
    <insert id="saveMeterWaterInfoInstance" parameterType="Map">
        insert into meter_water(
        remark,status_cd,cur_reading_time,water_id,cur_degrees,meter_type,pre_degrees,obj_id,pre_reading_time,b_id,
        community_id,obj_type,fee_id,obj_name,price,
        water_id,b_id,meter_type,obj_type,obj_id,pre_degrees,cur_degrees,pre_reading_time,cur_reading_time,
        community_id,status_cd,remark,fee_id,obj_name,price,
        power_supply_bureau,household_name,household_number,electric_meter_id,`handler`,is_transferred,
        company_name_after_transfer,transfer_date,corresponding_household_count,last_payment_date,reading_type,
        multiplying_factor,unit_price,invoice_amount,amount_difference,auto_deduction,remark2,
        address,write_time,writer,
        check_apply_company_name,check_apply_dept_project,water_fee_payer,account_number,meter_read_book_no,
        water_consumption,sewage_treatment_water,collection_standard,arrears_unpaid,late_payment_fine,
        late_payment_surcharge,fee_payment_status,carry_over_balance,total_payable_amount
        address,write_time,writer,check_apply_company_name,check_apply_dept_project,water_fee_payer,
        account_number,meter_read_book_no,water_consumption,sewage_treatment_water,collection_standard,
        arrears_unpaid,late_payment_fine,late_payment_surcharge,fee_payment_status,carry_over_balance,total_payable_amount
        ) select
        t.remark,'0',t.cur_reading_time,t.water_id,t.cur_degrees,t.meter_type,t.pre_degrees,t.obj_id,
        t.pre_reading_time,t.b_id,t.community_id,t.obj_type,t.fee_id,t.obj_name,t.price,
        t.water_id,t.b_id,t.meter_type,t.obj_type,t.obj_id,t.pre_degrees,t.cur_degrees,t.pre_reading_time,t.cur_reading_time,
        t.community_id,'0',t.remark,t.fee_id,t.obj_name,t.price,
        t.power_supply_bureau,t.household_name,t.household_number,t.electric_meter_id,t.`handler`,t.is_transferred,
        t.company_name_after_transfer,t.transfer_date,t.corresponding_household_count,t.last_payment_date,t.reading_type,
        t.multiplying_factor,t.unit_price,t.invoice_amount,t.amount_difference,t.auto_deduction,t.remark2,
        #{address},#{writeTime},#{writer},
        #{checkApplyCompanyName},#{checkApplyDeptProject},#{waterFeePayer},#{accountNumber},#{meterReadBookNo},
        #{waterConsumption},#{sewageTreatmentWater},#{collectionStandard},#{arrearsUnpaid},#{latePaymentFine},
        #{latePaymentSurcharge},#{feePaymentStatus},#{carryOverBalance},#{totalPayableAmount}
        #{address},#{writeTime},#{writer},#{checkApplyCompanyName},#{checkApplyDeptProject},#{waterFeePayer},
        #{accountNumber},#{meterReadBookNo},#{waterConsumption},#{sewageTreatmentWater},#{collectionStandard},
        #{arrearsUnpaid},#{latePaymentFine},#{latePaymentSurcharge},#{feePaymentStatus},#{carryOverBalance},#{totalPayableAmount}
        from business_meter_water t where 1=1
        <if test="remark !=null and remark != ''">
            and t.remark= #{remark}
@@ -210,18 +208,42 @@

    <!-- 查询水电费信息 add by wuxw 2018-07-03 -->
    <select id="getMeterWaterInfo" parameterType="Map" resultType="Map">
        select t.remark,t.status_cd,t.status_cd statusCd,t.cur_reading_time,t.cur_reading_time
        curReadingTime,t.water_id,t.water_id waterId,t.cur_degrees,t.cur_degrees curDegrees,t.create_time,t.create_time
        createTime,t.meter_type,t.meter_type meterType,t.pre_degrees,t.pre_degrees preDegrees,t.obj_id,t.obj_id
        objId,t.pre_reading_time,t.pre_reading_time preReadingTime,t.b_id,t.b_id bId,t.community_id,t.community_id
        communityId,t.obj_type,t.obj_type objType,t.fee_id,t.fee_id feeId,t.obj_name,t.obj_name objName,t.price,mt.type_name meterTypeName,
        t.power_supply_bureau powerSupplyBureau,t.household_name householdName,t.household_number householdNumber,
        t.electric_meter_id electricMeterId,t.`handler` handler,t.is_transferred isTransferred,
        t.company_name_after_transfer companyNameAfterTransfer,t.transfer_date transferDate,
        t.corresponding_household_count correspondingHouseholdCount,t.last_payment_date lastPaymentDate,
        t.reading_type readingType,t.multiplying_factor multiplyingFactor,t.unit_price unitPrice,
        t.invoice_amount invoiceAmount,t.amount_difference amountDifference,t.auto_deduction autoDeduction,
        t.remark2 remark2,t.address address,t.write_time writeTime,t.writer writer,
        select
        t.water_id,t.water_id waterId,
        t.b_id,t.b_id bId,
        t.meter_type,t.meter_type meterType,
        t.obj_type,t.obj_type objType,
        t.obj_id,t.obj_id objId,
        t.pre_degrees,t.pre_degrees preDegrees,
        t.cur_degrees,t.cur_degrees curDegrees,
        t.pre_reading_time,t.pre_reading_time preReadingTime,
        t.cur_reading_time,t.cur_reading_time curReadingTime,
        t.community_id,t.community_id communityId,
        t.status_cd,t.status_cd statusCd,
        t.remark,t.remark remark,
        t.fee_id,t.fee_id feeId,
        t.obj_name,t.obj_name objName,
        t.price,t.price price,
        t.power_supply_bureau powerSupplyBureau,
        t.household_name householdName,
        t.household_number householdNumber,
        t.electric_meter_id electricMeterId,
        t.`handler` handler,
        t.is_transferred isTransferred,
        t.company_name_after_transfer companyNameAfterTransfer,
        t.transfer_date transferDate,
        t.corresponding_household_count correspondingHouseholdCount,
        t.last_payment_date lastPaymentDate,
        t.reading_type readingType,
        t.multiplying_factor multiplyingFactor,
        t.unit_price unitPrice,
        t.invoice_amount invoiceAmount,
        t.amount_difference amountDifference,
        t.auto_deduction autoDeduction,
        t.remark2 remark2,
        t.address address,
        t.write_time writeTime,
        t.writer writer,
        t.check_apply_company_name checkApplyCompanyName,
        t.check_apply_dept_project checkApplyDeptProject,
        t.water_fee_payer waterFeePayer,
@@ -236,6 +258,7 @@
        t.fee_payment_status feePaymentStatus,
        t.carry_over_balance carryOverBalance,
        t.total_payable_amount totalPayableAmount,
        mt.type_name meterTypeName,
        br.road_name roadName
        from meter_water t
        left join meter_type mt on t.meter_type = mt.type_id and mt.status_cd = '0'
@@ -397,39 +420,49 @@

    <!-- 修改水电费信息 add by wuxw 2018-07-03 -->
    <update id="updateMeterWaterInfoInstance" parameterType="Map">
        update meter_water t set t.status_cd = #{statusCd}
        update meter_water t set
        t.status_cd = #{statusCd},
        <if test="newBId != null and newBId != ''">
            ,t.b_id = #{newBId}
        </if>
        <if test="remark !=null and remark != ''">
            , t.remark= #{remark}
        </if>
        <if test="curReadingTime !=null ">
            , t.cur_reading_time= #{curReadingTime}
        </if>
        <if test="curDegrees !=null and curDegrees != ''">
            , t.cur_degrees= #{curDegrees}
        </if>
        <if test="createTime !=null and createTime != ''">
            , t.create_time= #{createTime}
        <if test="waterId !=null and waterId != ''">
            ,t.water_id = #{waterId}
        </if>
        <if test="meterType !=null and meterType != ''">
            , t.meter_type= #{meterType}
        </if>
        <if test="preDegrees !=null and preDegrees != ''">
            , t.pre_degrees= #{preDegrees}
        <if test="objType !=null and objType != ''">
            , t.obj_type= #{objType}
        </if>
        <if test="objId !=null and objId != ''">
            , t.obj_id= #{objId}
        </if>
        <if test="preDegrees !=null and preDegrees != ''">
            , t.pre_degrees= #{preDegrees}
        </if>
        <if test="curDegrees !=null and curDegrees != ''">
            , t.cur_degrees= #{curDegrees}
        </if>
        <if test="preReadingTime !=null ">
            , t.pre_reading_time= #{preReadingTime}
        </if>
        <if test="curReadingTime !=null ">
            , t.cur_reading_time= #{curReadingTime}
        </if>
        <if test="communityId !=null and communityId != ''">
            , t.community_id= #{communityId}
        </if>
        <if test="objType !=null and objType != ''">
            , t.obj_type= #{objType}
        <if test="remark !=null and remark != ''">
            , t.remark= #{remark}
        </if>
        <if test="feeId !=null and feeId != ''">
            , t.fee_id= #{feeId}
        </if>
        <if test="objName !=null and objName != ''">
            , t.obj_name= #{objName}
        </if>
        <if test="price !=null and price != ''">
            , t.price= #{price}
        </if>
        <!-- 新增字段更新逻辑 -->
        <if test="powerSupplyBureau !=null and powerSupplyBureau != ''">
@@ -699,26 +732,24 @@
    <!-- 批量插入费用 -->
    <insert id="insertMeterWaters" parameterType="Map">
        insert into meter_water
        (remark,status_cd,cur_reading_time,water_id,cur_degrees,meter_type,pre_degrees,obj_id,pre_reading_time,b_id,
        community_id,obj_type,fee_id,obj_name,price,
        (water_id,b_id,meter_type,obj_type,obj_id,pre_degrees,cur_degrees,pre_reading_time,cur_reading_time,
        community_id,status_cd,remark,fee_id,obj_name,price,
        power_supply_bureau,household_name,household_number,electric_meter_id,`handler`,is_transferred,
        company_name_after_transfer,transfer_date,corresponding_household_count,last_payment_date,reading_type,
        multiplying_factor,unit_price,invoice_amount,amount_difference,auto_deduction,remark2,
        address,write_time,writer,
        check_apply_company_name,check_apply_dept_project,water_fee_payer,account_number,meter_read_book_no,
        water_consumption,sewage_treatment_water,collection_standard,arrears_unpaid,late_payment_fine,
        late_payment_surcharge,fee_payment_status,carry_over_balance,total_payable_amount)
        address,write_time,writer,check_apply_company_name,check_apply_dept_project,water_fee_payer,
        account_number,meter_read_book_no,water_consumption,sewage_treatment_water,collection_standard,
        arrears_unpaid,late_payment_fine,late_payment_surcharge,fee_payment_status,carry_over_balance,total_payable_amount)
        VALUES
        <foreach collection="meterWaterPos" item="item" separator=",">
            (#{item.remark},'0',#{item.curReadingTime},#{item.waterId},#{item.curDegrees},#{item.meterType},#{item.preDegrees},
            #{item.objId},#{item.preReadingTime},'-1',#{item.communityId},#{item.objType},#{item.feeId},#{item.objName},#{item.price},
            (#{item.waterId},#{item.bId},#{item.meterType},#{item.objType},#{item.objId},#{item.preDegrees},#{item.curDegrees},
            #{item.preReadingTime},#{item.curReadingTime},#{item.communityId},'0',#{item.remark},#{item.feeId},#{item.objName},#{item.price},
            #{item.powerSupplyBureau},#{item.householdName},#{item.householdNumber},#{item.electricMeterId},#{item.handler},#{item.isTransferred},
            #{item.companyNameAfterTransfer},#{item.transferDate},#{item.correspondingHouseholdCount},#{item.lastPaymentDate},#{item.readingType},
            #{item.multiplyingFactor},#{item.unitPrice},#{item.invoiceAmount},#{item.amountDifference},#{item.autoDeduction},#{item.remark2},
            #{item.address},#{item.writeTime},#{item.writer},
            #{item.checkApplyCompanyName},#{item.checkApplyDeptProject},#{item.waterFeePayer},#{item.accountNumber},#{item.meterReadBookNo},
            #{item.waterConsumption},#{item.sewageTreatmentWater},#{item.collectionStandard},#{item.arrearsUnpaid},#{item.latePaymentFine},
            #{item.latePaymentSurcharge},#{item.feePaymentStatus},#{item.carryOverBalance},#{item.totalPayableAmount})
            #{item.address},#{item.writeTime},#{item.writer},#{item.checkApplyCompanyName},#{item.checkApplyDeptProject},#{item.waterFeePayer},
            #{item.accountNumber},#{item.meterReadBookNo},#{item.waterConsumption},#{item.sewageTreatmentWater},#{item.collectionStandard},
            #{item.arrearsUnpaid},#{item.latePaymentFine},#{item.latePaymentSurcharge},#{item.feePaymentStatus},#{item.carryOverBalance},#{item.totalPayableAmount})
        </foreach>
    </insert>


 java110-interface/src/main/java/com/java110/intf/fee/IMeterTypeV1InnerServiceSMO.java

@@ -41,6 +41,9 @@
    @RequestMapping(value = "/saveMeterType", method = RequestMethod.POST)
    public int saveMeterType(@RequestBody  MeterTypePo meterTypePo);

    @RequestMapping(value = "/saveMeterTypeToDto", method = RequestMethod.POST)
    public int saveMeterTypeToDto(@RequestBody  MeterTypeDto meterTypePo);

    @RequestMapping(value = "/updateMeterType", method = RequestMethod.POST)
    public int updateMeterType(@RequestBody  MeterTypePo meterTypePo);


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

@@ -4,11 +4,14 @@
import com.java110.api.components.ValueUtil;
import com.java110.api.importData.DefaultImportDataAdapt;
import com.java110.api.importData.IImportDataCleaningAdapt;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.PropertyWhiteListFlowDto;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.importData.Vtil;
import com.java110.dto.meter.MeterTypeDto;
import com.java110.dto.system.ComponentValidateResult;
import com.java110.intf.community.ICommunityInnerServiceSMO;
import com.java110.intf.fee.IMeterTypeV1InnerServiceSMO;
import com.java110.intf.fee.IPayFeeBatchV1InnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.meter.MeterWaterPo;
@@ -20,10 +23,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;

/**
 * 水电抄表
@@ -34,6 +34,9 @@

    @Autowired
    private IPayFeeBatchV1InnerServiceSMO payFeeBatchV1InnerServiceSMOImpl;

    @Autowired
    private IMeterTypeV1InnerServiceSMO meterTypeV1InnerServiceSMOImpl;

    @Autowired
    private IUserInnerServiceSMO userInnerServiceSMOImpl;
@@ -49,6 +52,7 @@
        Sheet sheet = null;
        sheet = ImportExcelUtils.getSheet(workbook, "电费流水");
        List<Object[]> oList = ImportExcelUtils.listFromSheet(sheet);
        Map waterType = new HashMap();
        for (int osIndex = 0; osIndex < oList.size(); osIndex++) {
            if (osIndex < 9) {
                continue;
@@ -66,11 +70,13 @@
            po.setConfigId(ValueUtil.defaultValue(paramIn.getString("configId"),"922026011955390006"));
            po.setFeeTypeCd(ValueUtil.defaultValue(paramIn.getString("feeTypeCd"),"630000007"));
            po.setbId("-1");
            po.setMeterType(ValueUtil.defaultValue(os[3]));
//            po.setMeterType(ValueUtil.defaultValue(os[3]));
            po.setObjType("3333");
            setRoomDto(po, os);
            po.setPreDegrees(ValueUtil.defaultValueToNull(os[22]));
            po.setMeterType("102025090794960328");
//            po.setMeterType("102025090794960328");

            setMeterType(os, po, waterType);
            po.setCurDegrees(ValueUtil.defaultValueToNull(os[23]));
            Date date = new Date();
            date.setYear(defaultInteger(os[18]) - 1900);
@@ -119,6 +125,34 @@
        return meterWaterPoList;
    }

    private void setMeterType(Object[] os, MeterWaterPo po, Map waterType) {
        MeterTypeDto meterTypeDto = new MeterTypeDto();
        meterTypeDto.setTypeName(Vtil.defaultValue(os[7],"导入水费"));
        meterTypeDto.setCommunityId(po.getCommunityId());
        Object orDefault = waterType.getOrDefault(meterTypeDto.getTypeName(), "无数据");
        if (!orDefault.equals("无数据")){
            po.setMeterType(orDefault.toString());
        }
        else {
            List<MeterTypeDto> meterTypeDtos = meterTypeV1InnerServiceSMOImpl.queryMeterTypes(meterTypeDto);
            if (meterTypeDtos == null || meterTypeDtos.isEmpty()) {
                meterTypeDto.setRemark(meterTypeDto.getTypeName());
                meterTypeDto.setStatusCd("0");
                meterTypeDto.setTypeId(GenerateCodeFactory.getGeneratorId("10"));
                po.setMeterType(meterTypeDto.getTypeId());
                int i = meterTypeV1InnerServiceSMOImpl.saveMeterTypeToDto(meterTypeDto);
                if (i == 0) {
                    throw new IllegalArgumentException("导入失败");
                }
            } else {
                po.setMeterType(meterTypeDtos.get(0).getTypeId());
            }
        }
        waterType.put(meterTypeDto.getTypeName(), po.getMeterType());

    }


    private int defaultInteger(Object o) {
        return o == null ? 0 : Integer.parseInt(o.toString());
    }

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

@@ -4,12 +4,15 @@
import com.java110.api.components.ValueUtil;
import com.java110.api.importData.DefaultImportDataAdapt;
import com.java110.api.importData.IImportDataCleaningAdapt;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.importData.Vtil;
import com.java110.dto.meter.ImportExportMeterWaterDto;
import com.java110.dto.meter.MeterTypeDto;
import com.java110.dto.room.RoomDto;
import com.java110.dto.system.ComponentValidateResult;
import com.java110.intf.community.ICommunityInnerServiceSMO;
import com.java110.intf.fee.IMeterTypeV1InnerServiceSMO;
import com.java110.intf.fee.IPayFeeBatchV1InnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.meter.MeterWaterPo;
@@ -21,10 +24,7 @@
import org.springframework.stereotype.Service;

import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;

/**
 * 水电抄表
@@ -35,6 +35,9 @@

    @Autowired
    private IPayFeeBatchV1InnerServiceSMO payFeeBatchV1InnerServiceSMOImpl;

    @Autowired
    private IMeterTypeV1InnerServiceSMO  meterTypeV1InnerServiceSMOImpl;

    @Autowired
    private IUserInnerServiceSMO userInnerServiceSMOImpl;
@@ -51,6 +54,7 @@
        Sheet sheet = null;
        sheet = ImportExcelUtils.getSheet(workbook, "水费流水模板");
        List<Object[]> oList = ImportExcelUtils.listFromSheet(sheet);
        Map waterType = new HashMap();
        for (int osIndex = 0; osIndex < oList.size(); osIndex++) {
            if (osIndex < 10) {
                continue;
@@ -63,12 +67,11 @@
            MeterWaterPo po = new MeterWaterPo();
            setCommunityId(po, os, maps);
            po.setbId("-1");
            po.setMeterType(Vtil.defaultValue(os[7]));
            setMeterType(os, po, waterType);
            po.setObjType("3333");
            setRoomDto(po, os);
            po.setPreDegrees(Vtil.defaultValue(os[21],null));
            po.setMeterType("102026011915731141");
            po.setCurDegrees(Vtil.defaultValue(os[22],null));
            po.setPreDegrees(Vtil.defaultValueToDate(os[21]));
            po.setCurDegrees(Vtil.defaultValueToDate(os[22]));
            Date date = new Date();
            date.setYear(defaultInteger(os[18]) - 1900);
            date.setMonth(defaultInteger(os[19]));
@@ -91,15 +94,15 @@
            po.setHouseholdName(Vtil.defaultValue(os[8]));
            po.setRemark2(Vtil.defaultValue(os[41]));
            po.setAddress(Vtil.defaultValue(os[17]));
            po.setWriteTime(Vtil.defaultValue(os[42]));
            po.setWriter(Vtil.defaultValue(os[43]));
            po.setAuditUserName(Vtil.defaultValue(os[44]));
            po.setWriteTime(Vtil.defaultValueToDate(os[43]));
            po.setWriter(Vtil.defaultValue(os[42]));
            po.setAuditUserName(Vtil.defaultValueToDate(os[44]));
            try {
                po.setCreateTime(DateUtil.getDateFromStringB(Vtil.defaultValue(os[45])));
                po.setCreateTime(DateUtil.getDateFromStringB(Vtil.defaultValueToDate(os[45])));
            } catch (Exception e) {

            }
            po.setPayDate(Vtil.defaultValue(os[40]));
            po.setPayDate(Vtil.defaultValueToDate(os[40]));
            po.setCheckApplyCompanyName(Vtil.defaultValue(os[2]));
            po.setCheckApplyDeptProject(Vtil.defaultValue(os[3]));
            po.setWaterFeePayer(Vtil.defaultValue(os[4]));
@@ -119,6 +122,34 @@
        return meterWaterPoList;
    }


    private void setMeterType(Object[] os, MeterWaterPo po, Map waterType) {
        MeterTypeDto meterTypeDto = new MeterTypeDto();
        meterTypeDto.setTypeName(Vtil.defaultValue(os[7],"导入水费"));
        meterTypeDto.setCommunityId(po.getCommunityId());
        Object orDefault = waterType.getOrDefault(meterTypeDto.getTypeName(), "无数据");
        if (!orDefault.equals("无数据")){
            po.setMeterType(orDefault.toString());
        }
        else {
            List<MeterTypeDto> meterTypeDtos = meterTypeV1InnerServiceSMOImpl.queryMeterTypes(meterTypeDto);
            if (meterTypeDtos == null || meterTypeDtos.isEmpty()) {
                meterTypeDto.setRemark(meterTypeDto.getTypeName());
                meterTypeDto.setStatusCd("0");
                meterTypeDto.setTypeId(GenerateCodeFactory.getGeneratorId("10"));
                po.setMeterType(meterTypeDto.getTypeId());
                int i = meterTypeV1InnerServiceSMOImpl.saveMeterTypeToDto(meterTypeDto);
                if (i == 0) {
                    throw new IllegalArgumentException("导入失败");
                }
            } else {
                po.setMeterType(meterTypeDtos.get(0).getTypeId());
            }
        }
        waterType.put(meterTypeDto.getTypeName(), po.getMeterType());

    }

    private int defaultInteger(Object o) {
        return o == null ? 0 : Integer.parseInt(o.toString());
    }

 service-common/src/main/java/com/java110/common/dao/impl/CarInoutServiceDaoImpl.java

@@ -163,7 +163,7 @@

                if (existCount > 0) {
                    // 3. 记录已存在，标记为去重（可用2表示去重，与0/1区分）
                    record.setErrorTest("重复的内容");
//                    record.setErrorTest("重复的内容");
                    continue;
                }


 service-fee/src/main/java/com/java110/fee/dao/impl/MeterTypeV1ServiceDaoImpl.java

@@ -70,7 +70,6 @@
    @Override
    public List<Map> getMeterTypeInfo(Map info) throws DAOException {
        logger.debug("查询 getMeterTypeInfo 入参 info : {}",info);

        List<Map> businessMeterTypeInfos = sqlSessionTemplate.selectList("meterTypeV1ServiceDaoImpl.getMeterTypeInfo",info);

        return businessMeterTypeInfos;

 service-fee/src/main/java/com/java110/fee/smo/impl/MeterTypeV1InnerServiceSMOImpl.java

@@ -50,6 +50,12 @@
        return saveFlag;
    }

    @Override
    public int saveMeterTypeToDto(@RequestBody  MeterTypeDto meterTypePo) {
        int saveFlag = meterTypeV1ServiceDaoImpl.saveMeterTypeInfo(BeanConvertUtil.beanCovertMap(meterTypePo));
        return saveFlag;
    }

     @Override
    public int updateMeterType(@RequestBody  MeterTypePo meterTypePo) {
        int saveFlag = meterTypeV1ServiceDaoImpl.updateMeterTypeInfo(BeanConvertUtil.beanCovertMap(meterTypePo));

 service-job/src/main/java/com/java110/job/importData/adapt/ImportMeterWaterFeeV2QueueDataAdapt.java

@@ -110,7 +110,7 @@

        int i = meterWaterInnerServiceSMOImpl.queryMeterWatersCountByPo(po);
        if (i > 0) {
            throw new IllegalArgumentException("重复的水费导入");
//            throw new IllegalArgumentException("重复的水费导入");
        }
        payFeePo.setbId(assetImportLogDetailDto.getLogId());
        payFeePo.setUserId(po.getUserId());

 service-job/src/main/java/com/java110/job/importData/adapt/ImportPropertyWhiteListfFlowQueueDataAdapt.java

@@ -69,10 +69,10 @@
    private void doImportData(AssetImportLogDetailDto assetImportLogDetailDto) {
        JSONObject data = JSONObject.parseObject(assetImportLogDetailDto.getContent());
        PropertyWhiteListFlowDto whites = BeanConvertUtil.covertBean(data, PropertyWhiteListFlowDto.class);
        int count = importPropertyWhiteListfFlowServiceSMOImpl.countPropertyWhiteListFlowFilter(whites);
        if (count > 0) {
            throw new IllegalArgumentException("第" + whites.getRow() + "行存在重复的导入内容");
        }
//        int count = importPropertyWhiteListfFlowServiceSMOImpl.countPropertyWhiteListFlowFilter(whites);
//        if (count > 0) {
//            throw new IllegalArgumentException("第" + whites.getRow() + "行存在重复的导入内容");
//        }
        int flag = importPropertyWhiteListfFlowServiceSMOImpl.savePropertyWhiteListFlow(whites);
        if (flag < 1) {
            throw new IllegalArgumentException("第" + whites.getRow() + "行导入失败");

 service-job/src/main/java/com/java110/job/importData/adapt/ImportRoomOwnerV2QueueDataAdapt.java

@@ -153,25 +153,27 @@
        importOwnerRoomDto.setPersonRole(OwnerDto.PERSON_ROLE_OWNER);
        importOwnerRoomDto.setMonthlyUnitPrice(objects.getString(23));
        importOwnerRoomDto.setPropertyFeeMonth(objects.getString(24));
        //--------设置物业类型
        DictDto dictDto = new DictDto();
        dictDto.setTableName("building_room");
        dictDto.setTableColumns("room_sub_type");
        dictDto.setName(Vtil.defaultValue(objects.get(1)));
        List<DictDto> dictDtos = dictV1InnerServiceSMOImpl.queryDictAndSpecs(dictDto);
        if (dictDtos.isEmpty()) {
            DictPo dictPo = new DictPo();
            dictPo.setStatusCd(GenerateCodeFactory.getGeneratorId("2"));
            dictPo.setTableName("building_room");
            dictPo.setTableColumns("room_sub_type");
            dictPo.setName(Vtil.defaultValue(objects.get(1)));
            dictV1InnerServiceSMOImpl.saveDict(dictPo);
            dictDtos = dictV1InnerServiceSMOImpl.queryDictAndSpecs(dictDto);
        if (!Vtil.defaultValue(objects.get(1)).isEmpty()) {
            //--------设置物业类型
            DictDto dictDto = new DictDto();
            dictDto.setTableName("building_room");
            dictDto.setTableColumns("room_sub_type");
            dictDto.setName(Vtil.defaultValue(objects.get(1)));
            List<DictDto> dictDtos = dictV1InnerServiceSMOImpl.queryDictAndSpecs(dictDto);
            if (dictDtos.isEmpty()) {
                throw new IllegalArgumentException("导入失败:字典中不存在物业类型:" + Vtil.defaultValue(objects.get(1)));
                DictPo dictPo = new DictPo();
                dictPo.setStatusCd(GenerateCodeFactory.getGeneratorId("2"));
                dictPo.setTableName("building_room");
                dictPo.setTableColumns("room_sub_type");
                dictPo.setName(Vtil.defaultValue(objects.get(1)));
                dictV1InnerServiceSMOImpl.saveDict(dictPo);
                dictDtos = dictV1InnerServiceSMOImpl.queryDictAndSpecs(dictDto);
                if (dictDtos.isEmpty()) {
                    throw new IllegalArgumentException("导入失败:字典中不存在物业类型:" + Vtil.defaultValue(objects.get(1)));
                }
            }
            importOwnerRoomDto.setRoomSubType(dictDtos.get(0).getStatusCd());
        }
        importOwnerRoomDto.setRoomSubType(dictDtos.get(0).getStatusCd());
        //----------

        importOwnerRoomDto.setPropertyType(Vtil.defaultValue(objects.get(2)));//住宅类型