chengf
2026-03-18 56931dc90c4e070d279a0cbf5822af010c481812
service-api/src/main/java/com/java110/api/importData/adapt/ImportMeterWaterFeeV2DataCleaningAdapt.java
@@ -1,7 +1,6 @@
package com.java110.api.importData.adapt;
import com.alibaba.fastjson.JSONObject;
import com.java110.api.components.ValueUtil;
import com.java110.api.importData.DefaultImportDataAdapt;
import com.java110.api.importData.IImportDataCleaningAdapt;
import com.java110.core.factory.GenerateCodeFactory;
@@ -70,17 +69,17 @@
            setMeterType(os, po, waterType);
            po.setObjType("3333");
            setRoomDto(po, os);
            po.setPreDegrees(Vtil.defaultValueToDate(os[21]));
            po.setCurDegrees(Vtil.defaultValueToDate(os[22]));
            po.setPreDegrees(Vtil.defaultValue(os[22],null));
            po.setCurDegrees(Vtil.defaultValue(os[23],null));
            Date date = new Date();
            date.setYear(defaultInteger(os[18]) - 1900);
            date.setMonth(defaultInteger(os[19]));
            po.setPreReadingTime(defaultInteger(os[18]) + "-" + defaultInteger(os[19]) + "-01 00:00:00");
            po.setCurReadingTime(Vtil.processDateEnhanced(DateUtil.getDateFromStringA(po.getPreReadingTime()), "end", DateUtil.DATE_FORMATE_STRING_A, null ,null));
            po.setStatusCd("0");
            po.setUserId(ValueUtil.defaultValue(paramIn.getString("userId")));
            po.setConfigId(ValueUtil.defaultValue(paramIn.getString("configId"),"9220260120546511533"));
            po.setFeeTypeCd(ValueUtil.defaultValue(paramIn.getString("feeTypeCd"),"630000017"));
            po.setUserId(Vtil.defaultValue(paramIn.getString("userId")));
            po.setConfigId(Vtil.defaultValue(paramIn.getString("configId"),"9220260120546511533"));
            po.setFeeTypeCd(Vtil.defaultValue(paramIn.getString("feeTypeCd"),"630000017"));
            po.setRemark(Vtil.defaultValue(os[29]));
            po.setPrice(defaultDouble(os[25]));
            po.setHandler(Vtil.defaultValue(os[9]));
@@ -97,17 +96,17 @@
            po.setWriteTime(Vtil.defaultValueToDate(os[43]));
            po.setWriter(Vtil.defaultValue(os[42]));
            po.setAuditUserName(Vtil.defaultValueToDate(os[44]));
            try {
                po.setCreateTime(DateUtil.getDateFromStringB(Vtil.defaultValueToDate(os[45])));
            } catch (Exception e) {
            }
//            try {
//                po.setCreateTime(DateUtil.getDateFromStringB(Vtil.defaultValueToDate(os[45])));
//            } catch (Exception e) {
//
//            }
            po.setPayDate(Vtil.defaultValueToDate(os[40]));
            po.setCheckApplyCompanyName(Vtil.defaultValue(os[2]));
            po.setCheckApplyDeptProject(Vtil.defaultValue(os[3]));
            po.setWaterFeePayer(Vtil.defaultValue(os[4]));
            po.setAccountNumber(Vtil.defaultValue(os[5]));
            po.setMeterReadBookNo(Vtil.defaultValue(os[6]));
            po.setMeterReadBookNo(Vtil.defaultValue(os[6]));;
            po.setWaterConsumption(Vtil.defaultValue(os[24]));
            po.setSewageTreatmentWater(Vtil.defaultValue(os[26]));
            po.setCollectionStandard(Vtil.defaultValue(os[27]));
@@ -167,18 +166,18 @@
    public void setCommunityId(MeterWaterPo po, Object[] os, List<Map<String, Object>> maps) {
        for (Map<String, Object> map : maps) {
            if (ValueUtil.defaultValue(os[0]).isEmpty()) {
                if (ValueUtil.defaultValue(os[1]).equals(map.get("name"))) {
            if (Vtil.defaultValue(os[0]) == null) {
                if (Vtil.defaultValue(os[1]).equals(map.get("name"))) {
                    po.setCommunityId(map.get("communityId").toString());
                    return;
                }
            } else if (ValueUtil.defaultValue(os[1]).isEmpty()){
                if (ValueUtil.defaultValue(os[0]).equals(map.get("communityCode"))) {
            } else if (Vtil.defaultValue(os[1]) == null){
                if (Vtil.defaultValue(os[0]).equals(map.get("communityCode"))) {
                    po.setCommunityId(map.get("communityId").toString());
                    return;
                }
            } else {
                if (ValueUtil.defaultValue(os[0]).equals(map.get("communityCode")) && ValueUtil.defaultValue(os[1]).equals(map.get("name"))) {
                if (Vtil.defaultValue(os[0]).equals(map.get("communityCode")) && Vtil.defaultValue(os[1]).equals(map.get("name"))) {
                    po.setCommunityId(map.get("communityId").toString());
                    return;
                }