优化报表

java110-bean/src/main/java/com/java110/dto/payFee/PayFeeDetailMonthDto.java

@@ -58,6 +58,11 @@ public class PayFeeDetailMonthDto extends FeeDto implements Serializable {
     private String feeName;
     private String configId;
 
+    private String objFpcId;
+
+    private String feeTypeCd;
+
+
     private List<FeeAttrDto> feeAttrs;
 
     public String getDetailMonth() {
@@ -276,4 +281,22 @@ public class PayFeeDetailMonthDto extends FeeDto implements Serializable {
     public void setFeeState(String feeState) {
         this.feeState = feeState;
     }
+
+    public String getObjFpcId() {
+        return objFpcId;
+    }
+
+    public void setObjFpcId(String objFpcId) {
+        this.objFpcId = objFpcId;
+    }
+
+    @Override
+    public String getFeeTypeCd() {
+        return feeTypeCd;
+    }
+
+    @Override
+    public void setFeeTypeCd(String feeTypeCd) {
+        this.feeTypeCd = feeTypeCd;
+    }
 }

java110-bean/src/main/java/com/java110/dto/payFee/PayFeeMonthOwnerDto.java

@@ -17,6 +17,8 @@ public class PayFeeMonthOwnerDto implements Serializable {
     private String link;
     private String payFeeTime;
 
+    private String objFpcId;
+
     public String getObjName() {
         return objName;
     }
@@ -64,4 +66,12 @@ public class PayFeeMonthOwnerDto implements Serializable {
     public void setPayFeeTime(String payFeeTime) {
         this.payFeeTime = payFeeTime;
     }
+
+    public String getObjFpcId() {
+        return objFpcId;
+    }
+
+    public void setObjFpcId(String objFpcId) {
+        this.objFpcId = objFpcId;
+    }
 }

java110-bean/src/main/java/com/java110/po/payFee/PayFeeDetailMonthPo.java

@@ -36,6 +36,10 @@ public class PayFeeDetailMonthPo implements Serializable {
 
     private String deadlineTime;
 
+    private String objFpcId;
+
+    private String feeTypeCd;
+
 
     public String getDetailMonth() {
         return detailMonth;
@@ -228,4 +232,20 @@ public class PayFeeDetailMonthPo implements Serializable {
     public void setDeadlineTime(String deadlineTime) {
         this.deadlineTime = deadlineTime;
     }
+
+    public String getObjFpcId() {
+        return objFpcId;
+    }
+
+    public void setObjFpcId(String objFpcId) {
+        this.objFpcId = objFpcId;
+    }
+
+    public String getFeeTypeCd() {
+        return feeTypeCd;
+    }
+
+    public void setFeeTypeCd(String feeTypeCd) {
+        this.feeTypeCd = feeTypeCd;
+    }
 }

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

@@ -9,11 +9,11 @@
         insert into pay_fee_detail_month(
         detail_month,detail_year,detail_id,receivable_amount,discount_amount,remark,received_amount,community_id,fee_id,month_id,
         obj_name,obj_id,owner_name,owner_id,link,state,pay_fee_time,cur_month_time,
-        fee_name,config_id
+        fee_name,config_id,obj_fpc_id,fee_type_cd
         ) values (
         #{detailMonth},#{detailYear},#{detailId},#{receivableAmount},#{discountAmount},#{remark},#{receivedAmount},#{communityId},#{feeId},#{monthId},
         #{objName},#{objId},#{ownerName},#{ownerId},#{link},#{state},#{payFeeTime},#{curMonthTime},
-        #{feeName},#{configId}
+        #{feeName},#{configId},#{objFpcId},#{feeTypeCd}
         )
     </insert>
 
@@ -22,14 +22,14 @@
         insert into pay_fee_detail_month(
         detail_month,detail_year,detail_id,receivable_amount,discount_amount,remark,received_amount,community_id,fee_id,month_id,
         obj_name,obj_id,owner_name,owner_id,link,state,pay_fee_time,cur_month_time,
-        fee_name,config_id,deadline_time
+        fee_name,config_id,deadline_time,obj_fpc_id,fee_type_cd
         ) values
         <foreach collection="payFeeDetailMonthPos" item="item" index="index" separator=",">
             (
             #{item.detailMonth},#{item.detailYear},#{item.detailId},#{item.receivableAmount},#{item.discountAmount},
             #{item.remark},#{item.receivedAmount},#{item.communityId},#{item.feeId},#{item.monthId},
             #{item.objName},#{item.objId},#{item.ownerName},#{item.ownerId},#{item.link},#{item.state},#{item.payFeeTime},#{item.curMonthTime},
-            #{item.feeName},#{item.configId},#{item.deadlineTime}
+            #{item.feeName},#{item.configId},#{item.deadlineTime},#{item.objFpcId},#{item.feeTypeCd}
             )
         </foreach>
     </insert>

java110-db/src/main/resources/mapper/report/ReportFeeStatisticsServiceDaoImplMapper.xml

@@ -832,8 +832,7 @@
         from pay_fee_detail_month t
         INNER JOIN pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
         inner join pay_fee_config pfc1 on pfc1.config_id = t.config_id and pfc1.status_cd = '0'
-        where t.obj_id = a.obj_id
-        and t.status_cd = '0'
+        where  t.status_cd = '0'
         and t.detail_id = '-1'
         and t.community_id= a.community_id
         and t.obj_id = a.obj_id

java110-interface/src/main/java/com/java110/intf/fee/IPayFeeDetailMonthInnerServiceSMO.java

@@ -25,17 +25,17 @@ public interface IPayFeeDetailMonthInnerServiceSMO {
 
 
     @RequestMapping(value = "/savePayFeeDetailMonth", method = RequestMethod.POST)
-    public int savePayFeeDetailMonth(@RequestBody PayFeeDetailMonthPo payFeeDetailMonthPo);
+     int savePayFeeDetailMonth(@RequestBody PayFeeDetailMonthPo payFeeDetailMonthPo);
 
     @RequestMapping(value = "/savePayFeeDetailMonths", method = RequestMethod.POST)
-    public int savePayFeeDetailMonths(@RequestBody List<PayFeeDetailMonthPo> payFeeDetailMonthPos);
+     int savePayFeeDetailMonths(@RequestBody List<PayFeeDetailMonthPo> payFeeDetailMonthPos);
 
 
     @RequestMapping(value = "/updatePayFeeDetailMonth", method = RequestMethod.POST)
-    public int updatePayFeeDetailMonth(@RequestBody  PayFeeDetailMonthPo payFeeDetailMonthPo);
+     int updatePayFeeDetailMonth(@RequestBody  PayFeeDetailMonthPo payFeeDetailMonthPo);
 
     @RequestMapping(value = "/deletePayFeeDetailMonth", method = RequestMethod.POST)
-    public int deletePayFeeDetailMonth(@RequestBody  PayFeeDetailMonthPo payFeeDetailMonthPo);
+     int deletePayFeeDetailMonth(@RequestBody  PayFeeDetailMonthPo payFeeDetailMonthPo);
 
     /**
      * <p>查询小区楼信息</p>

service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthHelp.java

@@ -2,15 +2,22 @@ package com.java110.fee.feeMonth;
 
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.core.smo.IComputeFeeSMO;
+import com.java110.dto.contract.ContractDto;
 import com.java110.dto.fee.FeeAttrDto;
 import com.java110.dto.fee.FeeDetailDto;
 import com.java110.dto.fee.FeeDto;
+import com.java110.dto.owner.OwnerCarDto;
 import com.java110.dto.payFee.PayFeeDetailMonthDto;
 import com.java110.dto.payFee.PayFeeMonthOwnerDto;
+import com.java110.dto.room.RoomDto;
 import com.java110.intf.community.IRoomInnerServiceSMO;
 import com.java110.intf.fee.IPayFeeDetailMonthInnerServiceSMO;
+import com.java110.intf.store.IContractInnerServiceSMO;
+import com.java110.intf.user.IOwnerCarInnerServiceSMO;
 import com.java110.po.payFee.PayFeeDetailMonthPo;
 import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.ListUtil;
+import com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -23,6 +30,12 @@ public class PayFeeMonthHelp implements IPayFeeMonthHelp {
     @Autowired
     private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
 
+    @Autowired
+    private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
+
+    @Autowired
+    private IContractInnerServiceSMO contractInnerServiceSMOImpl;
+
     @Autowired
     private IComputeFeeSMO computeFeeSMOImpl;
 
@@ -38,6 +51,39 @@ public class PayFeeMonthHelp implements IPayFeeMonthHelp {
         payFeeMonthOwnerDto.setLink(FeeAttrDto.getFeeAttrValue(feeDto, FeeAttrDto.SPEC_CD_OWNER_LINK));
         payFeeMonthOwnerDto.setObjName(FeeAttrDto.getFeeAttrValue(feeDto, FeeAttrDto.SPEC_CD_PAY_OBJECT_NAME));
         payFeeMonthOwnerDto.setObjId(feeDto.getPayerObjId());
+        payFeeMonthOwnerDto.setObjFpcId("-1");
+
+        if(StringUtil.isEmpty(feeDto.getPayerObjId())){
+            return payFeeMonthOwnerDto;
+        }
+
+        // 如果是房屋
+        if(FeeDto.PAYER_OBJ_TYPE_ROOM.equals(feeDto.getPayerObjType())){
+
+            RoomDto roomDto = new RoomDto();
+            roomDto.setRoomId(feeDto.getPayerObjId());
+            roomDto.setCommunityId(feeDto.getCommunityId());
+            List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
+            if(!ListUtil.isNull(roomDtos)){
+                payFeeMonthOwnerDto.setObjFpcId(roomDtos.get(0).getFloorId());
+            }
+        }else if(FeeDto.PAYER_OBJ_TYPE_CAR.equals(feeDto.getPayerObjType())){
+
+            OwnerCarDto ownerCarDto = new OwnerCarDto();
+            ownerCarDto.setMemberId(feeDto.getPayerObjId());
+            ownerCarDto.setCommunityId(feeDto.getCommunityId());
+            List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
+            if(!ListUtil.isNull(ownerCarDtos)){
+                payFeeMonthOwnerDto.setObjFpcId(ownerCarDtos.get(0).getPaId());
+            }
+        }else {
+            ContractDto contractDto = new ContractDto();
+            contractDto.setContractId(feeDto.getPayerObjId());
+            List<ContractDto> contractDtos = contractInnerServiceSMOImpl.queryContracts(contractDto);
+            if(!ListUtil.isNull(contractDtos)){
+                payFeeMonthOwnerDto.setObjFpcId(contractDtos.get(0).getContractType());
+            }
+        }
         return payFeeMonthOwnerDto;
     }
 
@@ -332,6 +378,11 @@ public class PayFeeMonthHelp implements IPayFeeMonthHelp {
         tmpPayFeeDetailMonthPo.setState("W"); // todo 这里暂时写死，目前用不到，算是预留字段
         tmpPayFeeDetailMonthPo.setFeeName(feeDto.getFeeName());
         tmpPayFeeDetailMonthPo.setConfigId(feeDto.getConfigId());
+        tmpPayFeeDetailMonthPo.setFeeTypeCd(feeDto.getFeeTypeCd());
+
+        //todo 查询obj_fpc_id
+        tmpPayFeeDetailMonthPo.setObjFpcId(payFeeMonthOwnerDto.getObjFpcId());
+
         payFeeDetailMonthPos.add(tmpPayFeeDetailMonthPo);
 
     }

service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthImplV1.txt

@@ -1,288 +0,0 @@
-package com.java110.fee.feeMonth;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.core.log.LoggerFactory;
-import com.java110.core.smo.IComputeFeeSMO;
-import com.java110.dto.fee.FeeDetailDto;
-import com.java110.dto.fee.FeeDto;
-import com.java110.dto.payFee.PayFeeDetailMonthDto;
-import com.java110.dto.payFee.PayFeeMonthOwnerDto;
-import com.java110.intf.fee.IFeeDetailInnerServiceSMO;
-import com.java110.intf.fee.IFeeInnerServiceSMO;
-import com.java110.intf.fee.IPayFeeConfigV1InnerServiceSMO;
-import com.java110.intf.fee.IPayFeeDetailMonthInnerServiceSMO;
-import com.java110.po.payFee.PayFeeDetailMonthPo;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.DateUtil;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 费用离散为月 实现类
- */
-//@Service
-public class PayFeeMonthImplV1 implements IPayFeeMonth {
-    private static Logger logger = LoggerFactory.getLogger(PayFeeMonthImplV1.class);
-
-    @Autowired
-    private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
-
-    @Autowired
-    private IPayFeeConfigV1InnerServiceSMO payFeeConfigV1InnerServiceSMOImpl;
-
-    @Autowired
-    private IPayFeeDetailMonthInnerServiceSMO payFeeDetailMonthInnerServiceSMOImpl;
-
-    @Autowired
-    private IFeeDetailInnerServiceSMO feeDetailInnerServiceSMOImpl;
-
-    @Autowired
-    private IPayFeeMonthHelp payFeeMonthHelp;
-
-    @Autowired
-    private IComputeFeeSMO computeFeeSMOImpl;
-
-    public static final int DEFAULT_DEAL_COUNT = 200;
-
-
-    /**
-     * 生成单个费用 并 离散到月
-     *
-     * @param feeId
-     * @param communityId
-     */
-    @Override
-    public void doGeneratorOrRefreshFeeMonth(String feeId, String communityId) {
-
-        // todo 查询费用
-        FeeDto feeDto = new FeeDto();
-        feeDto.setCommunityId(communityId);
-        feeDto.setFeeId(feeId);
-        List<FeeDto> tmpFeeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
-
-        Assert.listOnlyOne(tmpFeeDtos, "费用不存在");
-
-        doGeneratorOrRefreshFeeMonth(tmpFeeDtos.get(0), communityId);
-    }
-
-    public void doGeneratorOrRefreshFeeMonth(FeeDto feeDto, String communityId) {
-
-
-        //todo 计算每月单价
-        Double feePrice = payFeeMonthHelp.getMonthFeePrice(feeDto);
-
-        // todo 准备离散的基础数据
-        PayFeeMonthOwnerDto payFeeMonthOwnerDto = payFeeMonthHelp.generatorOwnerRoom(feeDto);
-
-        //todo 离散start_time 或者 pay_fee_detail_month 最大月份 到  deadlineTime 的数据
-        maxMonthDateToDeadlineTimeData(feeDto, payFeeMonthOwnerDto, feePrice);
-
-
-    }
-
-    /**
-     * 离散最大 离散月到 deadlineTime 的数据
-     *
-     * @param feeDto
-     * @param payFeeMonthOwnerDto
-     * @param feePrice
-     */
-    private void maxMonthDateToDeadlineTimeData(FeeDto feeDto, PayFeeMonthOwnerDto payFeeMonthOwnerDto, Double feePrice) {
-        PayFeeDetailMonthDto payFeeDetailMonthDto = new PayFeeDetailMonthDto();
-        payFeeDetailMonthDto.setCommunityId(feeDto.getCommunityId());
-        payFeeDetailMonthDto.setFeeId(feeDto.getFeeId());
-        List<PayFeeDetailMonthDto> payFeeDetailMonthDtos = payFeeDetailMonthInnerServiceSMOImpl.queryPayFeeDetailMaxMonths(payFeeDetailMonthDto);
-        Date startTime = null;
-        Date deadlineTime = computeFeeSMOImpl.getDeadlineTime(feeDto);
-        if (payFeeDetailMonthDtos == null || payFeeDetailMonthDtos.size() < 1) {
-            startTime = feeDto.getStartTime();
-        } else {
-            Calendar calendar = Calendar.getInstance();
-            calendar.setTime(DateUtil.getDateFromStringA(payFeeDetailMonthDtos.get(0).getCurMonthTime()));
-            calendar.add(Calendar.MONTH, 1);
-            startTime = calendar.getTime();
-        }
-
-        // todo 生成一段时间内的数据
-        doGeneratorTimeMonthData(feeDto, payFeeMonthOwnerDto, feePrice, startTime, deadlineTime);
-
-    }
-
-    private void doGeneratorTimeMonthData(FeeDto feeDto, PayFeeMonthOwnerDto payFeeMonthOwnerDto, Double feePrice, Date startTime, Date endTime) {
-        double maxMonth = Math.ceil(DateUtil.dayCompare(startTime, endTime));
-
-        if (maxMonth < 1) {
-            return;
-        }
-        //todo 查询 缴费明细
-        FeeDetailDto feeDetailDto = new FeeDetailDto();
-        feeDetailDto.setCommunityId(feeDto.getCommunityId());
-        feeDetailDto.setFeeId(feeDto.getFeeId());
-        feeDetailDto.setStates(new String[]{FeeDetailDto.STATE_NORMAL,FeeDetailDto.STATE_RETURNING});
-        List<FeeDetailDto> feeDetailDtos = feeDetailInnerServiceSMOImpl.queryFeeDetails(feeDetailDto);
-
-        //todo 生成 月离散数据
-        PayFeeDetailMonthPo tmpPayFeeDetailMonthPo;
-        List<PayFeeDetailMonthPo> payFeeDetailMonthPos = new ArrayList<>();
-        double receivableAmount = 0.0;
-        for (int month = 0; month < maxMonth; month++) {
-            Calendar calendar = Calendar.getInstance();
-            calendar.setTime(startTime);
-            calendar.add(Calendar.MONTH, month);
-            //calendar.set(Calendar.DAY_OF_MONTH, 1);
-            tmpPayFeeDetailMonthPo = new PayFeeDetailMonthPo();
-            tmpPayFeeDetailMonthPo.setFeeId(feeDto.getFeeId());
-            tmpPayFeeDetailMonthPo.setCommunityId(feeDto.getCommunityId());
-            tmpPayFeeDetailMonthPo.setDetailId(payFeeMonthHelp.getFeeDetailId(feeDetailDtos, calendar.getTime()));
-            tmpPayFeeDetailMonthPo.setDetailYear(calendar.get(Calendar.YEAR) + "");
-            tmpPayFeeDetailMonthPo.setDetailMonth((calendar.get(Calendar.MONTH) + 1) + "");
-            receivableAmount = payFeeMonthHelp.getReceivableAmount(feeDetailDtos, feePrice, calendar.getTime(), feeDto);
-            //todo 应收小于等于0 不统计
-            if(receivableAmount <=0){
-                continue;
-            }
-            tmpPayFeeDetailMonthPo.setReceivableAmount( receivableAmount + "");
-            tmpPayFeeDetailMonthPo.setReceivedAmount(payFeeMonthHelp.getReceivedAmount(feeDetailDtos, feePrice, calendar.getTime(), feeDto) + "");
-            tmpPayFeeDetailMonthPo.setDiscountAmount(
-                    payFeeMonthHelp.getDiscountAmount(Double.parseDouble(tmpPayFeeDetailMonthPo.getReceivableAmount()),
-                            Double.parseDouble(tmpPayFeeDetailMonthPo.getReceivedAmount()),
-                            calendar.getTime(), feeDto) + "");
-            tmpPayFeeDetailMonthPo.setMonthId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_monthId));
-            tmpPayFeeDetailMonthPo.setRemark("程序计算生成");
-            tmpPayFeeDetailMonthPo.setObjName(payFeeMonthOwnerDto.getObjName());
-            tmpPayFeeDetailMonthPo.setObjId(payFeeMonthOwnerDto.getObjId());
-            tmpPayFeeDetailMonthPo.setOwnerId(payFeeMonthOwnerDto.getOwnerId());
-            tmpPayFeeDetailMonthPo.setOwnerName(payFeeMonthOwnerDto.getOwnerName());
-            tmpPayFeeDetailMonthPo.setLink(payFeeMonthOwnerDto.getLink());
-            tmpPayFeeDetailMonthPo.setCurMonthTime(DateUtil.getFormatTimeStringB(calendar.getTime()));
-            tmpPayFeeDetailMonthPo.setPayFeeTime(payFeeMonthHelp.getFeeFeeTime(feeDetailDtos, tmpPayFeeDetailMonthPo.getDetailId()));
-            tmpPayFeeDetailMonthPo.setState("W"); // todo 这里暂时写死，目前用不到，算是预留字段
-            tmpPayFeeDetailMonthPo.setFeeName(feeDto.getFeeName());
-            tmpPayFeeDetailMonthPo.setConfigId(feeDto.getConfigId());
-            payFeeDetailMonthPos.add(tmpPayFeeDetailMonthPo);
-        }
-        payFeeDetailMonthInnerServiceSMOImpl.savePayFeeDetailMonths(payFeeDetailMonthPos);
-    }
-
-    /**
-     * 小区数据 离散为 月数据
-     *
-     * @param communityId
-     */
-    @Async
-    @Override
-    public void doGeneratorOrRefreshAllFeeMonth(String communityId) {
-
-
-        FeeDto feeDto = new FeeDto();
-        feeDto.setCommunityId(communityId);
-        int count = feeInnerServiceSMOImpl.queryFeesCount(feeDto);
-
-        int page = 1;
-        int max = 15;
-        if (count < DEFAULT_DEAL_COUNT) {
-            page = 1;
-            max = count;
-        } else {
-            page = (int) Math.ceil((double) count / (double) DEFAULT_DEAL_COUNT);
-            max = DEFAULT_DEAL_COUNT;
-        }
-
-        //todo  每次按200条处理
-        for (int pageIndex = 0; pageIndex < page; pageIndex++) {
-            feeDto.setPage(pageIndex + 1);
-            feeDto.setRow(max);
-            List<FeeDto> tmpFeeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
-            // 离散费用
-            doTmpFeeDtoMonths(communityId, tmpFeeDtos);
-        }
-
-
-    }
-
-    /**
-     * 物业缴费时离散 报表数据
-     *
-     * @param feeId
-     * @param detailId
-     * @param communityId
-     */
-    @Async
-    @Override
-    public void payFeeDetailRefreshFeeMonth(String feeId, String detailId, String communityId) {
-        // todo 查询费用
-        FeeDto feeDto = new FeeDto();
-        feeDto.setCommunityId(communityId);
-        feeDto.setFeeId(feeId);
-        List<FeeDto> tmpFeeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
-
-        Assert.listOnlyOne(tmpFeeDtos, "费用不存在");
-
-        //todo 查询 缴费明细
-        FeeDetailDto feeDetailDto = new FeeDetailDto();
-        feeDetailDto.setCommunityId(feeDto.getCommunityId());
-        feeDetailDto.setFeeId(feeDto.getFeeId());
-        feeDetailDto.setDetailId(detailId);
-        List<FeeDetailDto> feeDetailDtos = feeDetailInnerServiceSMOImpl.queryFeeDetails(feeDetailDto);
-
-        Assert.listOnlyOne(feeDetailDtos, "缴费记录不存在");
-
-        //todo 计算每月单价
-        Double feePrice = payFeeMonthHelp.getMonthFeePrice(feeDto);
-
-        // todo 准备离散的基础数据
-        PayFeeMonthOwnerDto payFeeMonthOwnerDto = payFeeMonthHelp.generatorOwnerRoom(feeDto);
-
-        // todo 删除缴费时间范围内的数据
-        doDeletePayFeeDetailInMonth(feeDto, feeDetailDtos.get(0));
-
-        // todo 生成一段时间内的数据
-        doGeneratorTimeMonthData(feeDto, payFeeMonthOwnerDto, feePrice, feeDetailDtos.get(0).getStartTime(), feeDetailDtos.get(0).getEndTime());
-    }
-
-    @Override
-    public void deleteFeeMonth(String feeId, String communityId) {
-
-        PayFeeDetailMonthPo payFeeDetailMonthPo = new PayFeeDetailMonthPo();
-        payFeeDetailMonthPo.setFeeId(feeId);
-        payFeeDetailMonthPo.setCommunityId(communityId);
-        payFeeDetailMonthInnerServiceSMOImpl.deletePayFeeDetailMonth(payFeeDetailMonthPo);
-    }
-
-    /**
-     * 删除缴费范围内的数据
-     *
-     * @param feeDto
-     * @param feeDetailDto
-     */
-    private void doDeletePayFeeDetailInMonth(FeeDto feeDto, FeeDetailDto feeDetailDto) {
-
-        PayFeeDetailMonthPo payFeeDetailMonthPo = new PayFeeDetailMonthPo();
-        payFeeDetailMonthPo.setFeeId(feeDto.getFeeId());
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTime(feeDetailDto.getStartTime());
-        calendar.set(Calendar.DAY_OF_MONTH, 1);
-        payFeeDetailMonthPo.setCurMonthTime(DateUtil.getFormatTimeStringB(calendar.getTime()));
-        payFeeDetailMonthPo.setCurMonthEndTime(DateUtil.getFormatTimeStringB(feeDetailDto.getEndTime()));
-        payFeeDetailMonthInnerServiceSMOImpl.deletePayFeeDetailMonth(payFeeDetailMonthPo);
-    }
-
-    private void doTmpFeeDtoMonths(String communityId, List<FeeDto> tmpFeeDtos) {
-        for (FeeDto tmpFeeDto : tmpFeeDtos) {
-            try {
-                doGeneratorOrRefreshFeeMonth(tmpFeeDto, communityId);
-            } catch (Exception e) {
-                e.printStackTrace();
-                logger.error("生成费用报表失败" + JSONObject.toJSONString(tmpFeeDto), e);
-            }
-        }
-    }
-}