chengf
2025-08-13 f851a15d7bec9a7afee514f6896532b3b5e2433e
合同主体与费用初始化2025/08/13
15个文件已修改
293 ■■■■ 已修改文件
java110-bean/src/main/java/com/java110/dto/importData/ImportRoomFee.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/dto/payFee/PayFeeConfigDiscountDto.java 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/po/contract/ContractPo.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-db/src/main/resources/mapper/common/CarInoutServiceDaoImplMapper.xml 51 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-db/src/main/resources/mapper/fee/PayFeeConfigDiscountServiceDaoImplMapper.xml 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-db/src/main/resources/mapper/store/ContractServiceDaoImplMapper.xml 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-interface/src/main/java/com/java110/intf/common/ICarInoutInnerServiceSMO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-common/src/main/java/com/java110/common/dao/ICarInoutServiceDao.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-common/src/main/java/com/java110/common/dao/impl/CarInoutServiceDaoImpl.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-common/src/main/java/com/java110/common/smo/impl/CarInoutInnerServiceSMOImpl.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-fee/src/main/java/com/java110/fee/api/PayFeeConfigDiscountApi.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-fee/src/main/java/com/java110/fee/cmd/fee/SaveContractCreateFeeCmd.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-job/src/main/java/com/java110/job/cmd/importCarInout/CarInout.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-job/src/main/java/com/java110/job/importData/adapt/ImportHistoryFeeDetailQueueDataAdapt.java 100 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot/src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/dto/importData/ImportRoomFee.java
@@ -67,6 +67,7 @@
    private String doorRoomNum;
    private String openInv;
    private String isContractFee;
    public String getOpenInv() {
        return openInv;
@@ -344,4 +345,12 @@
    public void setDoorRoomNum(String doorRoomNum) {
        this.doorRoomNum = doorRoomNum;
    }
    public String getIsContractFee() {
        return isContractFee;
    }
    public void setIsContractFee(String isContractFee) {
        this.isContractFee = isContractFee;
    }
}
java110-bean/src/main/java/com/java110/dto/payFee/PayFeeConfigDiscountDto.java
@@ -1,5 +1,6 @@
package com.java110.dto.payFee;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.java110.dto.PageDto;
import com.java110.dto.fee.FeeDiscountSpecDto;
@@ -25,15 +26,15 @@
    private String  discountName;
    private String discountType;
    private List<FeeDiscountSpecDto> feeDiscountSpecs;
    private Date createTime;
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date startTime;
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date endTime;
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date payMaxEndTime;
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date payMaxStarTime;
    private Date currentTime;
    private String statusCd = "0";
@@ -143,4 +144,12 @@
    public void setCurrentTime(Date currentTime) {
        this.currentTime = currentTime;
    }
    public Date getPayMaxStarTime() {
        return payMaxStarTime;
    }
    public void setPayMaxStarTime(Date payMaxStarTime) {
        this.payMaxStarTime = payMaxStarTime;
    }
}
java110-bean/src/main/java/com/java110/po/contract/ContractPo.java
@@ -35,6 +35,11 @@
    private String objPersonName;
    private String objPersonId;
    private String startUserId;
    private String aPartyaId;
    private String bPartyaId;
    private String cPartyaId;
    private List<ContractFilePo> contractFilePo;
    public String getaLink() {
@@ -283,4 +288,28 @@
    public void setcContacts(String cContacts) {
        this.cContacts = cContacts;
    }
    public String getaPartyaId() {
        return aPartyaId;
    }
    public void setaPartyaId(String aPartyaId) {
        this.aPartyaId = aPartyaId;
    }
    public String getbPartyaId() {
        return bPartyaId;
    }
    public void setbPartyaId(String bPartyaId) {
        this.bPartyaId = bPartyaId;
    }
    public String getcPartyaId() {
        return cPartyaId;
    }
    public void setcPartyaId(String cPartyaId) {
        this.cPartyaId = cPartyaId;
    }
}
java110-db/src/main/resources/mapper/common/CarInoutServiceDaoImplMapper.xml
@@ -73,14 +73,40 @@
    <!-- 查询进出场信息 add by wuxw 2018-07-03 -->
    <select id="getCarInoutInfo" parameterType="Map" resultType="Map">
        select t.in_time,t.in_time inTime,t.inout_id,t.inout_id inoutId,t.car_num,t.car_num
        carNum,t.status_cd,t.status_cd statusCd,t.state,t.community_id,t.community_id communityId,t.b_id,t.b_id
        bId,t.out_time,t.out_time outTime,td1.name stateName
        from car_inout t,t_dict td1
        where 1 =1
        and t.state = td1.status_cd
        and td1.table_name = 'car_inout'
        and td1.table_columns = 'state'
        SELECT
        t.in_time,
        t.in_time AS inTime,
        t.inout_id,
        t.inout_id AS inoutId,
        t.car_num,
        t.car_num AS carNum,
        t.status_cd,
        t.status_cd AS statusCd,
        COALESCE(out_rec.state, t.state) AS state,
        t.community_id,
        t.community_id AS communityId,
        t.b_id,
        t.b_id AS bId,
        out_rec.out_time,
        out_rec.out_time AS outTime,
        td1.name AS stateName,
        out_rec.payment_amount AS money
        FROM
        car_inout t
        -- 先左连接出场记录,确保out_rec表在前面定义
        LEFT JOIN
        car_inout out_rec ON t.car_num = out_rec.car_num
        AND t.b_id = out_rec.b_id
        AND t.in_time = out_rec.in_time
        AND t.direction = 'entry'
        AND out_rec.direction = 'exit'
        -- 再关联字典表,此时out_rec表已被定义,可以正常引用
        INNER JOIN
        t_dict td1 ON COALESCE(out_rec.state, t.state) = td1.status_cd
        AND td1.table_name = 'car_inout'
        AND td1.table_columns = 'state'
        WHERE
        t.direction = 'entry'
        <if test="inTime !=null ">
            and t.in_time= #{inTime}
        </if>
@@ -194,6 +220,9 @@
        <if test="startTime != null and startTime != ''">
            and t.in_time &gt; #{startTime}
        </if>
        <if test="direction != null and direction != ''">
            and t.direction &gt; #{direction}
        </if>
        <if test="endTime != null and endTime != ''">
            and t.out_time &lt; #{endTime}
        </if>
@@ -227,7 +256,13 @@
            #{state},
            #{inTime},
            #{outTime},
        <if test="createTime == null">
            #{createTime},
        </if>
        <if test="createTime != null">
            now(),
        </if>
            #{statusCd},
            #{paId}
            )
java110-db/src/main/resources/mapper/fee/PayFeeConfigDiscountServiceDaoImplMapper.xml
@@ -7,7 +7,7 @@
    <!-- 保存费用项折扣信息 add by wuxw 2018-07-03 -->
    <insert id="savePayFeeConfigDiscountInfo" parameterType="Map">
        insert into pay_fee_config_discount(
        config_discount_id,config_id,discount_id,community_id,start_time,end_time,paymax_end_time
        config_discount_id,config_id,discount_id,community_id,start_time,end_time,paymax_end_time,pay_max_star_time
        ) values (
        #{configDiscountId},#{configId},#{discountId},#{communityId},
                  <if test="startTime == ''">
@@ -23,7 +23,20 @@
                    <if test="endTime != ''">
                        #{endTime}
                    </if>
                  ,#{payMaxEndTime}
        ,
        <if test="payMaxEndTime == ''">
            NULL
        </if>
        <if test="payMaxEndTime != ''">
            #{payMaxEndTime}
        </if>
        ,
        <if test="payMaxStarTime == ''">
            #{payMaxStarTime}
        </if>
        <if test="payMaxStarTime != ''">
            #{endTime}
        </if>
        )
    </insert>
@@ -31,7 +44,7 @@
    <select id="getPayFeeConfigDiscountInfo" parameterType="Map" resultType="Map">
        select t.config_discount_id,t.config_discount_id configDiscountId,t.config_id,t.config_id
        configId,t.status_cd,t.status_cd statusCd,t.discount_id,t.discount_id discountId,t.community_id,t.community_id
        communityId,fd.discount_name discountName,fd.discount_type discountType,t.start_time startTime,t.end_time endTime,t.paymax_end_time payMaxEndTime
        communityId,fd.discount_name discountName,fd.discount_type discountType,t.start_time startTime,t.end_time endTime,t.paymax_end_time payMaxEndTime,t.pay_max_star_time payMaxStarTime
        from pay_fee_config_discount t
        left join fee_discount fd on t.discount_id = fd.discount_id and t.community_id = fd.community_id and fd.status_cd = '0'
        where 1 =1
@@ -77,6 +90,9 @@
        <if test="communityId !=null and communityId != ''">
            , t.community_id= #{communityId}
        </if>
        <if test="payMaxStarTime !=null and payMaxStarTime != ''">
            , t.pay_max_star_time= #{payMaxStarTime}
        </if>
        where 1=1
        <if test="configDiscountId !=null and configDiscountId != ''">
            and t.config_discount_id= #{configDiscountId}
java110-db/src/main/resources/mapper/store/ContractServiceDaoImplMapper.xml
@@ -9,12 +9,14 @@
                             party_a, b_link, party_b,
                             contract_id, obj_id, contract_name, start_time, end_time, state, contract_code, obj_type,
                             operator_link, contract_parent_id,
                             obj_name, obj_person_name, obj_person_id, start_user_id,party_c,c_link,c_contacts)
                             obj_name, obj_person_name, obj_person_id, start_user_id,party_c,c_link,c_contacts
                            ,a_partya_id,b_partya_id,c_partya_id)
        values (#{aLink}, #{aContacts}, #{amount}, #{contractType}, #{storeId}, #{operator}, #{signingTime},
                #{bContacts}, #{partyA}, #{bLink}, #{partyB},
                #{contractId}, #{objId}, #{contractName}, #{startTime}, #{endTime}, #{state}, #{contractCode},
                #{objType}, #{operatorLink}, #{contractParentId},
                #{objName}, #{objPersonName}, #{objPersonId}, #{startUserId},#{partyC},#{cLink},#{cContacts})
                #{objName}, #{objPersonName}, #{objPersonId}, #{startUserId},#{partyC},#{cLink},#{cContacts}
               ,#{aPartyaId},#{bPartyaId},#{cPartyaId})
    </insert>
    <!-- 查询合同管理信息 add by wuxw 2018-07-03 -->
@@ -30,6 +32,7 @@
        stateName,t.state_desc stateDesc,t.contract_parent_id contractParentId,tt.contract_code parentContractCode,
        tt.contract_name parentContractName,t.obj_name objName, t.obj_person_name objPersonName, t.obj_person_id
        objPersonId,t.start_user_id startUserId,t.create_time createTime,t.party_c partyC,t.c_link cLink,t.c_contacts cContacts
        ,t.a_partya_id,t.b_partya_id,t.c_partya_id
        from contract t
        LEFT JOIN contract_type ct on t.contract_type = ct.contract_type_id and ct.status_cd = '0' and ct.store_id =
        t.store_id
@@ -235,6 +238,15 @@
        <if test="cContacts !=null">
            , t.c_contacts= #{cContacts}
        </if>
        <if test="aPartyaId !=null">
            , t.a_partya_id= #{aPartyaId}
        </if>
        <if test="bPartyaId !=null">
            , t.b_partya_id= #{bPartyaId}
        </if>
        <if test="cPartyaId !=null">
            , t.c_partya_id= #{cPartyaId}
        </if>
        where 1=1
        <if test="contractId !=null and contractId != ''">
            and t.contract_id= #{contractId}
java110-interface/src/main/java/com/java110/intf/common/ICarInoutInnerServiceSMO.java
@@ -44,5 +44,9 @@
    @RequestMapping(value = "/queryCarInoutsCount", method = RequestMethod.POST)
    int queryCarInoutsCount(@RequestBody CarInoutDto carInoutDto);
    int queryCarInoutsCountByPo(@RequestBody CarInoutPo carInoutDto);
    int[] batchSaveCarInout(List<CarInoutPo> successRecords);
    void batchSaveCarInout2(List<CarInoutPo> carInoutPos) throws  Exception;
}
service-common/src/main/java/com/java110/common/dao/ICarInoutServiceDao.java
@@ -75,4 +75,5 @@
    int queryCarInoutsCount(Map info);
    int[] batchSaveCarInout(List<CarInoutPo> successRecords);
    void batchSaveCarInout2(List<CarInoutPo> successRecords);
}
service-common/src/main/java/com/java110/common/dao/impl/CarInoutServiceDaoImpl.java
@@ -185,5 +185,18 @@
        return result;
    }
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void batchSaveCarInout2(List<CarInoutPo> successRecords) {
        for (CarInoutPo record : successRecords) {
            int affectedRows = sqlSessionTemplate.insert(
                    "carInoutServiceDaoImpl.batchInsert", // 注意这里需要改为单条插入的statement ID
                    BeanConvertUtil.beanCovertMap(record)
            );
            if (affectedRows == 0) {
                throw new IllegalArgumentException("添加失败"+record.getCarNum()+record.getInTime()+record.getOutTime());
            }
        }
    }
}
service-common/src/main/java/com/java110/common/smo/impl/CarInoutInnerServiceSMOImpl.java
@@ -74,9 +74,18 @@
    }
    @Override
    public int queryCarInoutsCountByPo(@RequestBody CarInoutPo carInoutDto) {
        return carInoutServiceDaoImpl.queryCarInoutsCount(BeanConvertUtil.beanCovertMap(carInoutDto));
    }
    @Override
    public int[] batchSaveCarInout(List<CarInoutPo> successRecords) {
        return this.carInoutServiceDaoImpl.batchSaveCarInout(successRecords);
    }
    @Override
    public void batchSaveCarInout2(List<CarInoutPo> successRecords) throws Exception{
        this.carInoutServiceDaoImpl.batchSaveCarInout2(successRecords);
    }
    public ICarInoutServiceDao getCarInoutServiceDaoImpl() {
        return carInoutServiceDaoImpl;
service-fee/src/main/java/com/java110/fee/api/PayFeeConfigDiscountApi.java
@@ -49,10 +49,10 @@
        PayFeeConfigDiscountPo payFeeConfigDiscountPo = BeanConvertUtil.covertBean(reqJson, PayFeeConfigDiscountPo.class);
        String paymaxEndTime = reqJson.getString("payMaxEndTime");
        if (StringUtil.isEmpty(paymaxEndTime)) {
            //如果优惠最大时间为空,就默认为2037-12-31 00:00:00
            payFeeConfigDiscountPo.setPayMaxEndTime("2037-12-31 00:00:00");
        }
//        if (StringUtil.isEmpty(paymaxEndTime)) {
//            //如果优惠最大时间为空,就默认为2037-12-31 00:00:00
//            payFeeConfigDiscountPo.setPayMaxEndTime("2037-12-31 00:00:00");
//        }
        return savePayFeeConfigDiscountBMOImpl.save(payFeeConfigDiscountPo);
    }
service-fee/src/main/java/com/java110/fee/cmd/fee/SaveContractCreateFeeCmd.java
@@ -182,6 +182,7 @@
            PayFeePo payFeePo = BeanConvertUtil.covertBean(feeBMOImpl.addContractFee(contractDtos.get(roomIndex), reqJson, context), PayFeePo.class);
            payFeePo.setIsContractFee("O");
            payFeePo.setSecondaryFeeTypeCd(reqJson.getString("secondaryFeeTypeCd"));
            payFeePo.setPayerObjId(reqJson.getString("payerObjId"));
            feePos.add(payFeePo);
            feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME,
                    reqJson.getString("endTime")));
service-job/src/main/java/com/java110/job/cmd/importCarInout/CarInout.java
@@ -14,6 +14,7 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.community.CommunityDto;
import com.java110.intf.common.ICarInoutInnerServiceSMO;
import com.java110.intf.community.ICommunityInnerServiceSMO;
@@ -115,12 +116,8 @@
                        // 将解析成功的数据存入数据库,使用你的Service实现
                        if (result.getSuccessRecords() != null && !result.getSuccessRecords().isEmpty()) {
                            int min = 100000000;
                            int max = 999999999;
                            Random RANDOM = new Random();
                            for (CarInoutPo carInoutPo : result.getSuccessRecords()) {
//                                carInoutPo.setInoutId("937510345");
                                carInoutPo.setInoutId((min + RANDOM.nextInt(max - min + 1))+"");
                                carInoutPo.setInoutId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_inoutId));
                                carInoutPo.setCommunityId(community.getCommunityId());
                            }
                            int[] counts = carInoutInnerServiceSMOImpl.batchSaveCarInout(result.getSuccessRecords());
@@ -404,7 +401,7 @@
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
        Calendar calendar = Calendar.getInstance();
        for (int i = 0; i < 11; i++) {
        for (int i = 0; i < 1; i++) {
            dates.add(sdf.format(calendar.getTime()));
            calendar.add(Calendar.DAY_OF_YEAR, -1); // 前一天
        }
service-job/src/main/java/com/java110/job/importData/adapt/ImportHistoryFeeDetailQueueDataAdapt.java
@@ -12,12 +12,15 @@
import com.java110.dto.room.RoomDto;
import com.java110.dto.system.ComponentValidateResult;
import com.java110.intf.IImportPropertyWhiteListfFlowServiceSMO;
import com.java110.intf.common.ICarInoutInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.fee.*;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.intf.user.IOwnerRoomRelV1InnerServiceSMO;
import com.java110.job.cmd.importCarInout.CarInout;
import com.java110.job.importData.DefaultImportData;
import com.java110.job.importData.IImportDataAdapt;
import com.java110.po.car.CarInoutPo;
import com.java110.po.fee.FeeAttrPo;
import com.java110.po.fee.PayFeeDetailPo;
import com.java110.po.fee.PayFeePo;
@@ -34,6 +37,7 @@
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
/**
 * 房屋缴费信息导入 适配器
@@ -71,6 +75,9 @@
    @Autowired
    private IRoomInnerServiceSMO iRoomInnerServiceSMOImpl;
    @Autowired
    private ICarInoutInnerServiceSMO carInoutInnerServiceSMOImpl;
    @Override
    public void importData(List<AssetImportLogDetailDto> assetImportLogDetailDtos) {
        importDatas(assetImportLogDetailDtos);
@@ -80,17 +87,107 @@
        List<ImportRoomFee> importRoomFees = new ArrayList<>();
        for (AssetImportLogDetailDto assetImportLogDetailDto : infos) {
            String communityId = assetImportLogDetailDto.getCommunityId();
            JSONObject data = JSONObject.parseObject(assetImportLogDetailDto.getContent());
            ImportRoomFee importRoomFee = BeanConvertUtil.covertBean(data, ImportRoomFee.class);
            RoomDto roomDto = new RoomDto();
            roomDto.setDoorRoomNum(importRoomFee.getDoorRoomNum());
            roomDto.setCommunityId(communityId);
            if(importRoomFee.getSecondaryFeeTypeCd()!= null && importRoomFee.getSecondaryFeeTypeCd().equals("临时停车费-其他")){
                CarInoutPo carInout = new CarInoutPo();
                carInout.setbId(JSONObject.parseObject(assetImportLogDetailDto.getContent().toString()).getString("invoiceReceiptNo"));
                carInout.setCommunityId(communityId);
                carInout.setCarNum("A888888");
                carInout.setVehicleType("temp");
                carInout.setDirection("entry");
                carInout.setState("100300");
                carInout.setInTime(JSONObject.parseObject(assetImportLogDetailDto.getContent().toString()).getString("chargeStart"));
                carInout.setStatusCd("0");
                carInout.setCreateTime(JSONObject.parseObject(assetImportLogDetailDto.getContent().toString()).getString("inputTime"));
// 检查重复代码...
                List<CarInoutPo> carInoutPos = new ArrayList<>();
                carInout.setInoutId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_inoutId));
                carInoutPos.add(carInout);
// 如果有结束时间,创建新的对象作为出口记录
                if(JSONObject.parseObject(assetImportLogDetailDto.getContent().toString()).containsKey("chargeEnd")){
                    // 创建新的对象,而不是修改已添加的对象
                    CarInoutPo exitCarInout = new CarInoutPo();
                    // 复制基本属性
                    exitCarInout.setbId(carInout.getbId());
                    exitCarInout.setCommunityId(carInout.getCommunityId());
                    exitCarInout.setCarNum(carInout.getCarNum());
                    exitCarInout.setVehicleType(carInout.getVehicleType());
                    exitCarInout.setInTime(carInout.getInTime());
                    exitCarInout.setStatusCd(carInout.getStatusCd());
                    exitCarInout.setCreateTime(carInout.getCreateTime());
                    // 设置出口相关属性
                    exitCarInout.setOutTime(JSONObject.parseObject(assetImportLogDetailDto.getContent().toString()).getString("chargeEnd"));
                    exitCarInout.setDirection("exit");
                    exitCarInout.setState("100400");
                    exitCarInout.setInoutId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_inoutId));
                    exitCarInout.setPaymentAmount(JSONObject.parseObject(assetImportLogDetailDto.getContent().toString()).getString("chargeAmount"));
                    carInoutPos.add(exitCarInout);
                }
                try {
                    carInoutInnerServiceSMOImpl.batchSaveCarInout2(carInoutPos);
                }catch (Exception e){
                    updateImportLogDetailState(importRoomFee.getDetailId(),e);
                }
                updateImportLogDetailState(importRoomFee.getDetailId());
            }
            else if(JSONObject.parseObject(assetImportLogDetailDto.getContent().toString()).getString("secondaryFeeTypeCd").contains("广告")){
            List<RoomDto> roomDtos = iRoomInnerServiceSMOImpl.queryRooms(roomDto);
            try {
                importRoomFee.setRoomId(roomDtos.get(0).getRoomId());
            }catch (Exception e){
                e.printStackTrace();
                    throw new IllegalArgumentException("门室号"+importRoomFee.getDoorRoomNum()+"未查询到房屋");
            }
            importRoomFee.setFeeName(data.getString("secondaryFeeTypeCd"));
                FeeDto feeDto = new FeeDto();
                feeDto.setFeeName(importRoomFee.getFeeName());
                List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
                if(feeDtos.size() == 0){
                    updateImportLogDetailState(importRoomFee.getDetailId(),new IllegalArgumentException("费用项"+importRoomFee.getFeeName()+"不存在"));
                    throw new IllegalArgumentException("费用项"+importRoomFee.getFeeName()+"不存在");
                }
                importRoomFee.setDetailId(assetImportLogDetailDto.getDetailId());
                importRoomFee.setStartTime(data.getString("chargeStart"));
                importRoomFee.setEndTime(data.getString("chargeEnd").split(" ")[0]+" 23:59:59");
                importRoomFee.setCreateTime(data.getString("inputTime"));
                importRoomFee.setReceivableAmount(data.getString("bankDepositAmount"));
                importRoomFee.setAmount(data.getString("chargeAmount"));
                importRoomFee.setStaffName(data.getString("charger"));
                importRoomFee.setIsContractFee("O");
                importRoomFee.setOpenInv(data.containsKey("invoiceReceiptNo") && data.getString("invoiceReceiptNo") != null ? "Y" : "N");
//            if(importRoomFee.getPayerObjName())
                importRoomFees.add(importRoomFee);
            }
            else{
                List<RoomDto> roomDtos = iRoomInnerServiceSMOImpl.queryRooms(roomDto);
                try {
                    importRoomFee.setRoomId(roomDtos.get(0).getRoomId());
                }catch (Exception e){
                    updateImportLogDetailState(importRoomFee.getDetailId(),new IllegalArgumentException("费用项"+importRoomFee.getFeeName()+"不存在"));
                    throw new IllegalArgumentException("门室号"+importRoomFee.getDoorRoomNum()+"未查询到房屋");
                }
                importRoomFee.setFeeName(data.getString("secondaryFeeTypeCd"));
                FeeDto feeDto = new FeeDto();
                feeDto.setFeeName(importRoomFee.getFeeName());
                List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
                if(feeDtos.size() == 0){
                    updateImportLogDetailState(importRoomFee.getDetailId(),new IllegalArgumentException("费用项"+importRoomFee.getFeeName()+"不存在"));
                    throw new IllegalArgumentException("费用项"+importRoomFee.getFeeName()+"不存在");
                }
            importRoomFee.setDetailId(assetImportLogDetailDto.getDetailId());
            importRoomFee.setStartTime(data.getString("chargeStart"));
            importRoomFee.setEndTime(data.getString("chargeEnd").split(" ")[0]+" 23:59:59");
@@ -102,6 +199,7 @@
//            if(importRoomFee.getPayerObjName())
            importRoomFees.add(importRoomFee);
        }
        }
        if (ListUtil.isNull(importRoomFees)) {
            return;
springboot/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
  profiles:
    active:  devlocal
    active:  debug
#  docker build -t lx .
#