b9632baaa11d6e9df2b8fea79f259314bfac1676..86df83fdc701b71b9b130ce54fc027c5a78050fb
2024-11-27 jiangping
Merge remote-tracking branch 'origin/master'
86df83 对比 | 目录
2024-11-27 jiangping
开发更新
c9bb39 对比 | 目录
已修改1个文件
9 ■■■■■ 文件已修改
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
@@ -717,10 +717,11 @@
    }
    private void dealCircleDateBillBiz(  List<Date> dateList ,YwContract model, YwContractDetail d, Date freeStart, Date freeEnd, List<YwContractBill> list ) {
        int temp = 0;
        for(Date start : dateList){
            Date end = DateUtil.addDaysToDate(DateUtil.addYearToDate(start,1),-1);//结束日期为下一个周期的前一天
            if(end.getTime()> d.getEndDate().getTime() ){
                end = d.getEndDate();
            Date end = d.getEndDate();
            if(temp+1 < dateList.size()){
                end =DateUtil.addDaysToDate(dateList.get(temp+1),-1);
            }
            YwContractBill bill = initCreateBillModel(model,d );
            bill.setStartDate(start);//账单开始
@@ -731,6 +732,8 @@
            bill.setTotleFee(totalFee);
            bill.setReceivableFee(totalFee);
            bill.setBillType(Constants.ZERO);
            temp++;
            bill.setCompanyId(model.getCompanyId());
            list.add(bill);
        }