优化下 报表查询 数量

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

@@ -49,6 +49,8 @@ public class PayFeeDetailMonthDto extends FeeDto implements Serializable {
     private String ownerId;
     private String link;
     private String state;
+
+    private String feeState;
     private String payFeeTime;
 
     private String curMonthTime;
@@ -266,4 +268,12 @@ public class PayFeeDetailMonthDto extends FeeDto implements Serializable {
     public void setMonthIds(String[] monthIds) {
         this.monthIds = monthIds;
     }
+
+    public String getFeeState() {
+        return feeState;
+    }
+
+    public void setFeeState(String feeState) {
+        this.feeState = feeState;
+    }
 }

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

@@ -488,9 +488,13 @@
         <if test="detailMonth !=null and detailMonth != ''">
             and t.detail_month= #{detailMonth}
         </if>
+        <if test="feeState !=null and feeState != ''">
+            and pf.state= #{feeState}
+        </if>
         <if test="feeTypeCd !=null and feeTypeCd != ''">
             and pf.fee_type_cd= #{feeTypeCd}
         </if>
+
         <if test="feeTypeCds != null ">
             and pf.fee_type_cd in
             <foreach collection="feeTypeCds" item="item" open="(" close=")" separator=",">

service-fee/src/main/java/com/java110/fee/cmd/fee/FinishFeeCmd.java

@@ -6,10 +6,13 @@ import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.dto.fee.FeeDto;
+import com.java110.fee.feeMonth.IPayFeeMonth;
 import com.java110.intf.community.IRoomInnerServiceSMO;
 import com.java110.intf.fee.IFeeInnerServiceSMO;
 import com.java110.intf.fee.IPayFeeV1InnerServiceSMO;
+import com.java110.intf.report.IReportOweFeeInnerServiceSMO;
 import com.java110.po.fee.PayFeePo;
+import com.java110.po.reportFee.ReportOweFeePo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -33,6 +36,12 @@ public class FinishFeeCmd extends Cmd {
     @Autowired
     private IPayFeeV1InnerServiceSMO feeV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IPayFeeMonth payFeeMonthImpl;
+
+    @Autowired
+    private IReportOweFeeInnerServiceSMO reportOweFeeInnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         // super.validatePageInfo(pd);
@@ -56,5 +65,17 @@ public class FinishFeeCmd extends Cmd {
         if (flag < 1) {
             throw new CmdException("结束费用失败");
         }
+
+
+        //todo 离散的月
+        payFeeMonthImpl.deleteFeeMonth(payFeePo.getFeeId(), payFeePo.getCommunityId());
+        //todo 重新计算
+        payFeeMonthImpl.doGeneratorOrRefreshFeeMonth(payFeePo.getFeeId(), payFeePo.getCommunityId());
+
+        // todo 删除欠费信息
+        ReportOweFeePo reportOweFeePo = new ReportOweFeePo();
+        reportOweFeePo.setFeeId(payFeePo.getFeeId());
+        reportOweFeePo.setCommunityId(payFeePo.getCommunityId());
+        reportOweFeeInnerServiceSMOImpl.deleteReportOweFee(reportOweFeePo);
     }
 }