优化历史导入测试

java110

2020-09-27 2b2e981fdf9dde7611cba4d2f00f0730e14f95ea

优化历史导入测试

 java110-bean/src/main/java/com/java110/entity/assetImport/ImportRoomFee.java

@@ -17,6 +17,8 @@

    private String endTime;

    private String createTime;

    private String amount;

    private String roomId;
@@ -114,4 +116,12 @@
    public void setRemark(String remark) {
        this.remark = remark;
    }

    public String getCreateTime() {
        return createTime;
    }

    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
}

 java110-bean/src/main/java/com/java110/po/fee/PayFeeDetailPo.java

@@ -22,6 +22,7 @@
    private String remark;
    private String startTime;
    private String endTime;
    private String createTime;

    private String state;

@@ -112,4 +113,12 @@
    public void setEndTime(String endTime) {
        this.endTime = endTime;
    }

    public String getCreateTime() {
        return createTime;
    }

    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
}

 java110-bean/src/main/java/com/java110/po/fee/PayFeePo.java

@@ -27,6 +27,7 @@
    private String configId;
    private String payerObjType;
    private String statusCd;
    private String createTime;

    public String getFeeId() {
        return feeId;
@@ -139,4 +140,12 @@
    public void setStatusCd(String statusCd) {
        this.statusCd = statusCd;
    }

    public String getCreateTime() {
        return createTime;
    }

    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
}

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

@@ -8,23 +8,23 @@
    <insert id="saveBusinessFeeDetailInfo" parameterType="Map">
        insert into
        business_pay_fee_detail(
            operate,prime_rate,detail_id,
            receivable_amount,cycles,remark,
            received_amount,community_id,b_id,fee_id,state,start_time,end_time) values (
            #{operate},#{primeRate},#{detailId},#{receivableAmount},
            #{cycles},#{remark},#{receivedAmount},#{communityId},#{bId},#{feeId},#{state},#{startTime},#{endTime})
       </insert>
        operate,prime_rate,detail_id,
        receivable_amount,cycles,remark,
        received_amount,community_id,b_id,fee_id,state,start_time,end_time) values (
        #{operate},#{primeRate},#{detailId},#{receivableAmount},
        #{cycles},#{remark},#{receivedAmount},#{communityId},#{bId},#{feeId},#{state},#{startTime},#{endTime})
    </insert>


    <!-- 查询费用明细信息（Business） add by wuxw 2018-07-03 -->
    <select id="getBusinessFeeDetailInfo" parameterType="Map" resultType="Map">
        select
            t.operate,t.prime_rate,t.prime_rate primeRate,t.detail_id,
            t.detail_id detailId,t.receivable_amount,
            t.receivable_amount receivableAmount,t.cycles,
            t.remark,t.received_amount,t.received_amount receivedAmount,
            t.community_id,t.community_id communityId,t.b_id,t.b_id bId,
            t.fee_id,t.fee_id feeId,t.state,t.start_time,t.end_time,t.start_time startTime,t.end_time endTime
        t.operate,t.prime_rate,t.prime_rate primeRate,t.detail_id,
        t.detail_id detailId,t.receivable_amount,
        t.receivable_amount receivableAmount,t.cycles,
        t.remark,t.received_amount,t.received_amount receivedAmount,
        t.community_id,t.community_id communityId,t.b_id,t.b_id bId,
        t.fee_id,t.fee_id feeId,t.state,t.start_time,t.end_time,t.start_time startTime,t.end_time endTime
        from business_pay_fee_detail t
        where 1 =1
        <if test="operate !=null and operate != ''">
@@ -64,8 +64,9 @@
    <!-- 保存费用明细信息至 instance表中 add by wuxw 2018-07-03 -->
    <insert id="saveFeeDetailInfoInstance" parameterType="Map">
        insert into
            pay_fee_detail(
                prime_rate,detail_id,receivable_amount,cycles,remark,status_cd,received_amount,community_id,b_id,fee_id,state,start_time,end_time) select
        pay_fee_detail(
        prime_rate,detail_id,receivable_amount,cycles,remark,status_cd,received_amount,community_id,b_id,fee_id,state,start_time,end_time)
        select
        t.prime_rate,t.detail_id,t.receivable_amount,t.cycles,t.remark,'0',t.received_amount,t.community_id,t.b_id,t.fee_id,state,t.start_time,t.end_time
        from business_pay_fee_detail t where 1=1
        and t.operate= 'ADD'
@@ -103,12 +104,12 @@
    <!-- 查询费用明细信息 add by wuxw 2018-07-03 -->
    <select id="getFeeDetailInfo" parameterType="Map" resultType="Map">
        select
            t.prime_rate,t.prime_rate primeRate,
            t.detail_id,t.detail_id detailId,
            t.receivable_amount,t.receivable_amount receivableAmount,
            t.cycles,t.remark,t.status_cd,t.status_cd statusCd,t.received_amount,t.received_amount receivedAmount,
            t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.fee_id,t.fee_id feeId ,t.create_time createTime,
            t.state,d.name stateName,t.start_time,t.end_time,t.start_time startTime,t.end_time endTime
        t.prime_rate,t.prime_rate primeRate,
        t.detail_id,t.detail_id detailId,
        t.receivable_amount,t.receivable_amount receivableAmount,
        t.cycles,t.remark,t.status_cd,t.status_cd statusCd,t.received_amount,t.received_amount receivedAmount,
        t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.fee_id,t.fee_id feeId ,t.create_time createTime,
        t.state,d.name stateName,t.start_time,t.end_time,t.start_time startTime,t.end_time endTime
        from pay_fee_detail t
        left join t_dict d on t.state = d.status_cd and d.table_name = 'pay_fee_detail' and d.table_columns = 'state'
        where 1 =1
@@ -246,9 +247,18 @@
    <insert id="saveFeeDetail" parameterType="Map">
        insert into
        pay_fee_detail(
        prime_rate,detail_id,receivable_amount,cycles,remark,status_cd,received_amount,community_id,b_id,fee_id,state,start_time,end_time)
        prime_rate,detail_id,receivable_amount,cycles,remark,status_cd,received_amount,community_id,b_id,fee_id,state,start_time,end_time
        <if test="createTime != null and createTime != ''">
            ,create_time
        </if>

        )
        values(#{primeRate},#{detailId},#{receivableAmount},#{cycles},#{remark},'0',#{receivedAmount},#{communityId},'-1',#{feeId},#{state},
        #{startTime},#{endTime})
        #{startTime},#{endTime}
        <if test="createTime != null and createTime != ''">
            ,#{createTime}
        </if>
        )

    </insert>


 service-fee/src/main/java/com/java110/fee/bmo/payFeeDetail/impl/ImportPayFeeDetailBMOImpl.java

@@ -124,6 +124,7 @@
            payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
            payFeePo.setPayerObjId(importRoomFee.getRoomId());
            payFeePo.setUserId(userId);
            payFeePo.setCreateTime(importRoomFee.getCreateTime());
            payFeePos = new ArrayList<>();
            payFeePos.add(payFeePo);
            feeInnerServiceSMOImpl.saveFee(payFeePos);
@@ -166,6 +167,7 @@
        payFeeDetailPo.setEndTime(importRoomFee.getEndTime());
        payFeeDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
        payFeeDetailPo.setRemark(importRoomFee.getRemark());
        payFeeDetailPo.setCreateTime(importRoomFee.getCreateTime());
        int saved = feeDetailInnerServiceSMOImpl.saveFeeDetail(payFeeDetailPo);

        if (saved < 1) {

 service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportFeeDetailSMOImpl.java

@@ -169,14 +169,17 @@
            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[7], (osIndex + 1) + "行缴费时间不能为空");
            Assert.hasValue(os[8], (osIndex + 1) + "行缴费金额不能为空");

//

            String startTime = excelDoubleToDate(os[5].toString());
            String endTime = excelDoubleToDate(os[6].toString());
            String createTime = excelDoubleToDate(os[7].toString());
            Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行开始时间格式错误 请填写YYYY-MM-DD 文本格式");
            Assert.isDate(endTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行结束时间格式错误 请填写YYYY-MM-DD 文本格式");
            Assert.isDate(createTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "行结束时间格式错误 请填写YYYY-MM-DD 文本格式");


            importRoomFee = new ImportRoomFee();
@@ -187,8 +190,9 @@
            importRoomFee.setCycle(os[4].toString());
            importRoomFee.setStartTime(startTime);
            importRoomFee.setEndTime(endTime);
            importRoomFee.setAmount(os[7].toString());
            importRoomFee.setRemark(!StringUtil.isNullOrNone(os[8]) ? os[8].toString() : "");
            importRoomFee.setCreateTime(createTime);
            importRoomFee.setAmount(os[8].toString());
            importRoomFee.setRemark(!StringUtil.isNullOrNone(os[9]) ? os[9].toString() : "");
            rooms.add(importRoomFee);
        }
    }