费用明细返回 加入vo

Api/src/main/java/com/java110/api/listener/fee/QueryFeeDetailListener.java

@@ -12,7 +12,11 @@ import com.java110.core.smo.fee.IFeeConfigInnerServiceSMO;
 import com.java110.core.smo.fee.IFeeDetailInnerServiceSMO;
 import com.java110.dto.FeeConfigDto;
 import com.java110.dto.FeeDetailDto;
+import com.java110.dto.RoomDto;
 import com.java110.event.service.api.ServiceDataFlowEvent;
+import com.java110.vo.api.ApiFeeDetailDataVo;
+import com.java110.vo.api.ApiFeeDetailVo;
+import com.java110.vo.api.ApiRoomDataVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
@@ -56,8 +60,19 @@ public class QueryFeeDetailListener extends AbstractServiceApiDataFlowListener {
         JSONObject reqJson = dataFlowContext.getReqJson();
         validateFeeConfigData(reqJson);
 
-        List<FeeDetailDto> feeDetailDtos = feeDetailInnerServiceSMOImpl.queryFeeDetails(BeanConvertUtil.covertBean(reqJson, FeeDetailDto.class));
-        ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(feeDetailDtos), HttpStatus.OK);
+        //查询总记录数
+        ApiFeeDetailVo apiFeeDetailVo = new ApiFeeDetailVo();
+
+        int total = feeDetailInnerServiceSMOImpl.queryFeeDetailsCount(BeanConvertUtil.covertBean(reqJson, FeeDetailDto.class));
+        apiFeeDetailVo.setTotal(total);
+        if (total > 0) {
+            List<FeeDetailDto> feeDetailDtos = feeDetailInnerServiceSMOImpl.queryFeeDetails(BeanConvertUtil.covertBean(reqJson, FeeDetailDto.class));
+            List<ApiFeeDetailDataVo> feeDetails = BeanConvertUtil.covertBeanList(feeDetailDtos, ApiFeeDetailDataVo.class);
+            apiFeeDetailVo.setFeeDetails(feeDetails);
+        }
+        int row = reqJson.getInteger("row");
+        apiFeeDetailVo.setRecords((int) Math.ceil((double) total / (double) row));
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiFeeDetailVo), HttpStatus.OK);
 
         dataFlowContext.setResponseEntity(responseEntity);
     }

WebService/src/main/resources/components/property-fee/propertyFee.js

@@ -19,7 +19,7 @@
         _initEvent:function(){
             vc.on('propertyFee','listFeeDetail',function(_param){
                   vc.component.feeDetailInfo.feeId = _param.feeId;
-                  vc.component.listFeeDetail();
+                  vc.component.listFeeDetail(DEFAULT_PAGE,DEFAULT_ROW);
             });
 
             vc.on('pagination','page_event',function(_currentPage){

WebService/src/main/resources/components/property-pay/propertyPay.js

@@ -111,7 +111,7 @@
                         if(res.status == 200){
                             //关闭model
                             $('#propertyPayModel').modal('hide');
-                            vc.emit('propertyFee','listFeeDetail',propertyPayInfo);
+                            vc.emit('propertyFee','listFeeDetail',vc.component.propertyPayInfo);
                             return ;
                         }
                         vc.message(json);

java110-bean/src/main/java/com/java110/vo/api/ApiFeeDetailDataVo.java

@@ -0,0 +1,102 @@
+package com.java110.vo.api;
+
+import com.java110.vo.Vo;
+
+import java.util.Date;
+
+/**
+ * @ClassName ApiFeeVo
+ * @Description TODO
+ * @Author wuxw
+ * @Date 2019/6/2 18:05
+ * @Version 1.0
+ * add by wuxw 2019/6/2
+ **/
+public class ApiFeeDetailDataVo extends Vo {
+
+
+    private String primeRate;
+    private String detailId;
+    private String receivableAmount;
+    private String cycles;
+    private String remark;
+    private String receivedAmount;
+    private String communityId;
+    private String feeId;
+
+
+    private Date createTime;
+
+
+    public String getPrimeRate() {
+        return primeRate;
+    }
+
+    public void setPrimeRate(String primeRate) {
+        this.primeRate = primeRate;
+    }
+
+    public String getDetailId() {
+        return detailId;
+    }
+
+    public void setDetailId(String detailId) {
+        this.detailId = detailId;
+    }
+
+    public String getReceivableAmount() {
+        return receivableAmount;
+    }
+
+    public void setReceivableAmount(String receivableAmount) {
+        this.receivableAmount = receivableAmount;
+    }
+
+    public String getCycles() {
+        return cycles;
+    }
+
+    public void setCycles(String cycles) {
+        this.cycles = cycles;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getReceivedAmount() {
+        return receivedAmount;
+    }
+
+    public void setReceivedAmount(String receivedAmount) {
+        this.receivedAmount = receivedAmount;
+    }
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getFeeId() {
+        return feeId;
+    }
+
+    public void setFeeId(String feeId) {
+        this.feeId = feeId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

java110-bean/src/main/java/com/java110/vo/api/ApiFeeDetailVo.java

@@ -0,0 +1,24 @@
+package com.java110.vo.api;
+
+import com.java110.vo.MorePageVo;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * API 查询小区楼返回对象
+ */
+public class ApiFeeDetailVo extends MorePageVo implements Serializable {
+
+
+    private List<ApiFeeDetailDataVo> feeDetails;
+
+
+    public List<ApiFeeDetailDataVo> getFeeDetails() {
+        return feeDetails;
+    }
+
+    public void setFeeDetails(List<ApiFeeDetailDataVo> feeDetails) {
+        this.feeDetails = feeDetails;
+    }
+}