水电话费

jialh

昨天 dd6687b118561100e1677e88a9c2f5842a54c531

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

@@ -133,16 +133,19 @@
     * @param assetImportLogDetailDto
     */
    private void doImportData(AssetImportLogDetailDto assetImportLogDetailDto) {

        String test = "";
        int a = 6;
        JSONArray objects = JSONObject.parseArray(assetImportLogDetailDto.getContent());

//        if (Vtil.defaultValue(objects.get(11)) == null) {
        if (Vtil.defaultValue(objects.get(11)) == null) {
            objects.set(11, "无名");
            test = test + "\n业主名称为空";
//            throw new IllegalArgumentException("业主名称不能为空");
//        }
        }

        if (Vtil.defaultValue(objects.get(16)) == null){
            throw new IllegalArgumentException("房屋面积不能为空");
            objects.set(16, "0");
            test = test + "\n房屋面积为空";
        }

//        if (Vtil.defaultValue(objects.get(54)) == null){
@@ -232,19 +235,24 @@

        List<Object> objects1 = sqlSessionTemplate.selectList("roomServiceDaoImpl.getRoomInfo", BeanConvertUtil.beanCovertMap(roomDto));
        if (!objects1.isEmpty()) {
            throw new IllegalArgumentException("重复的房屋:");
//            throw new IllegalArgumentException("重复的房屋:");
            test = test + "\n重复的房屋：来自导入记录：" + assetImportLogDetailDto.getLogId() + "\t" + assetImportLogDetailDto.getDetailId();
        }
        List<FeeConfigDto> feeDtos = null;
        if (!importOwnerRoomDto.getCommunityId().isEmpty()){
            FeeConfigDto feeConfigDto = new FeeConfigDto();
            feeConfigDto.setCommunityId(importOwnerRoomDto.getCommunityId());
            if (importOwnerRoomDto.getPropertyType() == null) {
                throw new IllegalArgumentException("物业类型为空");
//                throw new IllegalArgumentException("物业类型为空");
                test = test + "\n物业类型为空，无法添加费用";
            }
            feeConfigDto.setSecondaryFeeTypeCdName(importOwnerRoomDto.getPropertyType());
            feeDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
            if (feeDtos.isEmpty()) {
                throw new IllegalArgumentException("物业类型`"+importOwnerRoomDto.getPropertyType()+"`未查询到收费项");
            else {
                feeConfigDto.setSecondaryFeeTypeCdName(importOwnerRoomDto.getPropertyType());
                feeDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
                if (feeDtos.isEmpty()) {
//                    throw new IllegalArgumentException("物业类型`"+importOwnerRoomDto.getPropertyType()+"`未查询到收费项");
                    test = test + "\n物业类型`"+importOwnerRoomDto.getPropertyType()+"`未查询到收费项，无法添加费用";
                }
            }
        }

@@ -539,7 +547,7 @@
            sqlSessionTemplate.insert("litigationInfoServiceDaoImpl.saveLitigationInfo",
                    BeanConvertUtil.beanCovertMap(litigationInfoPo));
        importOwnerRoomDto.setRoomState(importOwnerRoomDto.getOwnerName() == null ? "2004" : "2001");

        importOwnerRoomDto.setRemark(test);
        importOwnerRoomInnerServiceSMOImpl.saveOwnerRoom(importOwnerRoomDto);
        OwnerDto ownerDto = new OwnerDto();
        ownerDto.setOwnerId(importOwnerRoomDto.getOwnerId());