收费组详情

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/BillInvoiceController.java

@@ -1,10 +1,23 @@
 package com.community.huiju.controller;
 
 
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.huiju.common.base.BaseController;
+import com.community.huiju.service.IBillInvoiceService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpSession;
+
 /**
  * <p>
  * 缴费单 前端控制器
@@ -14,7 +27,27 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2019-02-13
  */
 @RestController
-@RequestMapping("/tp/bill-invoice")
+@RequestMapping("/")
+@RefreshScope
+@Api(value = "缴费单 API", description = "缴费单 API")
 public class BillInvoiceController extends BaseController {
 
+    @Autowired
+    private IBillInvoiceService iBillInvoiceService;
+
+    @ApiOperation(value = "查询缴费单", notes = "查询缴费单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "billId: 缴费项目id," +
+                    "phase: 期,building: 栋,unit: 单元,roomNo: 户号,ownerName: 业主姓名," +
+                    "billStatus: 缴费状态,payName: 缴费人,pageSize: 一页多少行,pageNum: 第几页"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+    })
+    @RequestMapping(value = "/bill/invoice/list", method = RequestMethod.POST)
+    public ResponseBean getBillList(HttpSession session, @RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBillInvoiceService.getBillList(parameter, userElement);
+        return responseBean;
+    }
+
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/BillInvoice.java

@@ -1,5 +1,8 @@
 package com.community.huiju.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -24,6 +27,9 @@ public class BillInvoice implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
     /**
      * 小区id
      */
@@ -94,5 +100,52 @@ public class BillInvoice implements Serializable {
      */
     private LocalDateTime updateDate;
 
+    /**
+     * 业主姓名
+     */
+    @TableField(exist = false)
+    private String ownerName;
+
+    /**
+     * 期
+     */
+    @TableField(exist = false)
+    private String phase;
+
+    /**
+     * 栋
+     */
+    @TableField(exist = false)
+    private String building;
+
+    /**
+     * 单元
+     */
+    @TableField(exist = false)
+    private String unit;
+
+    /**
+     * 户号
+     */
+    @TableField(exist = false)
+    private String roomNo;
+
+    /**
+     * 流水账单编号
+     */
+    @TableField(exist = false)
+    private Integer billStatement;
+
+    /**
+     * 创建人姓名
+     */
+    @TableField(exist = false)
+    private String createUserName;
+
+    /**
+     * 修改人姓名
+     */
+    @TableField(exist = false)
+    private String updateUserName;
 
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/IBillInvoiceService.java

@@ -2,6 +2,7 @@ package com.community.huiju.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.huiju.model.BillInvoice;
 
 /**
@@ -20,7 +21,7 @@ public interface IBillInvoiceService extends IService<BillInvoice> {
      * @param parameter
      * @return
      */
-    ResponseBean getBillList(String parameter);
+    ResponseBean getBillList(String parameter, UserElement userElement);
 
 
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BillInvoiceServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.huiju.dao.BillMapper;
 import com.community.huiju.dao.BillStatementMapper;
 import com.community.huiju.model.BillInvoice;
@@ -40,7 +41,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
     private BillStatementMapper billStatementMapper;
 
     @Override
-    public ResponseBean getBillList(String parameter) {
+    public ResponseBean getBillList(String parameter, UserElement userElement) {
         ResponseBean responseBean = new ResponseBean();
         JSONObject jsonObject = JSONObject.parseObject(parameter);
 
@@ -72,6 +73,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
         map.put("ownerName", ownerName);
         map.put("billStatus", billStatus);
         map.put("payName", payName);
+        map.put("communityId", userElement.getCommunityId());
 
 
         Page<BillInvoice> page = new Page<>();

CODE/smart-community/property-api/src/main/resources/mapper/BillInvoiceMapper.xml

@@ -5,14 +5,19 @@
     <select id="selectBillInvoice" resultType="com.community.huiju.model.BillInvoice">
 
         SELECT
-            tpi.*, tboi.owner_name,
-            tboi.phase,
-            tboi.building,
-            tboi.unit,
-            tboi.room_no
+            tpi.*,
+            tboi.owner_name as ownerName,
+            tboi.phase as phase,
+            tboi.building as building,
+            tboi.unit as unit,
+            tboi.room_no as roomNo,
+            tbs.id as billStatement,
+            (SELECT user_name from tp_user tu WHERE tu.id = tpi.create_user) as createUserName,
+            (SELECT user_name from tp_user tu WHERE tu.id = tpi.update_user) as updateUserName
         FROM
-            tp_bill_invoice tpi
+          tp_bill_invoice tpi
         LEFT JOIN tp_building_owner_info tboi ON tpi.building_owner_info_id = tboi.id
+        LEFT JOIN tp_bill_statement tbs ON tpi.bill_statement_id = tbs.bill_invoice_id
         <where>
             <trim prefixOverrides="and | or">
                 <if test="map.phase != null and map.phase != ''">
@@ -30,12 +35,18 @@
                 <if test="map.ownerName != null and map.ownerName != ''">
                     AND tboi.owner_name = #{map.ownerName}
                 </if>
-                <if test="map.billStatus != null and map.billStatu != ''">
+                <if test="map.billStatus != null and map.billStatus != ''">
                     AND tpi.bill_status = #{map.billStatus}
                 </if>
                 <if test="map.payName != null and map.payName != ''">
                     AND tpi.pay_name = #{map.payName}
                 </if>
+                <if test="map.billId != null">
+                    AND tpi.bill_id = #{map.billId}
+                </if>
+                <if test="map.communityId != null">
+                    AND tpi.community_Id = #{map.communityId}
+                </if>
             </trim>
         </where>
 

VUECODE/smart-property-manage/src/api/billInvoice.js

@@ -0,0 +1,31 @@
+import request from '@/utils/request'
+
+// 查询缴费单
+export function getBillInvoiceList(data) {
+  return request({
+    url: '/bill/invoice/list',
+    method: 'post',
+    data: {
+      billId: data.billId, // 缴费项目id
+      phase: data.phase,
+      building: data.building,
+      unit: data.unit,
+      roomNo: data.roomNo,
+      ownerName: data.ownerName,
+      billStatus: data.billStatus,
+      payName: data.payName,
+      pageSize: data.pageSize,
+      pageNum: data.pageNum
+    }
+  })
+}
+
+
+
+
+
+
+
+
+
+

VUECODE/smart-property-manage/src/store/index.js

@@ -12,6 +12,7 @@ import announcement from './modules/announcement'
 import buildingOwnerInfo from './modules/buildingOwnerInfo'
 import activity from './modules/activity'
 import role from './modules/role'
+import billInvoice from './modules/billInvoice'
 
 Vue.use(Vuex)
 
@@ -27,7 +28,8 @@ const store = new Vuex.Store({
     announcement,
     activity,
     transaction,
-    role
+    role,
+    billInvoice
   },
   getters
 })

VUECODE/smart-property-manage/src/store/modules/billInvoice.js

@@ -0,0 +1,23 @@
+import { getBillInvoiceList } from '@/api/billInvoice'
+
+const billInvoice = {
+  state: {
+
+  },
+  mutations: {
+
+  },
+  actions: {
+    GetBillInvoiceList({ commit }, data) {
+      return new Promise((resolve, reject) => {
+        getBillInvoiceList(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    }
+  }
+}
+
+export default billInvoice

VUECODE/smart-property-manage/src/views/bill/index.vue

@@ -10,7 +10,7 @@ export default {
   name: 'Index',
   methods: {
     getInfo() {
-      this.$router.push({ name: 'bill-info' })
+      this.$router.push({ name: 'bill-info', params: { id: 187 }})
     }
   }
 }

VUECODE/smart-property-manage/src/views/bill/info/index.vue

@@ -74,47 +74,62 @@
         type="selection"
         width="55"/>
       <el-table-column
-        label="收费单号">
-        <template slot-scope="scope">{{ scope.row.date }}</template>
+        prop="id"
+        label="收费单号"
+        width="55">
+        <!--<template slot-scope="scope">{{ scope.row.date }}</template>-->
       </el-table-column>
       <el-table-column
         prop="name"
-        label="房屋信息"/>
+        label="房屋信息">
+        <template slot-scope="scope">{{ scope.row.phase + '期' + scope.row.building + '栋' + scope.row.unit + '单元' + scope.row.roomNo + '户号' }}</template>
+      </el-table-column>
       <el-table-column
-        prop="address"
+        prop="ownerName"
         label="业主姓名"
         show-overflow-tooltip/>
       <el-table-column
-        prop="name"
-        label="收费单说明"/>
+        prop="billInvoiceExplain"
+        label="收费单说明"
+        width="300"/>
       <el-table-column
-        prop="name"
+        prop="payPrice"
         label="金额(元)"/>
       <el-table-column
-        prop="name"
+        prop="billStatement"
         label="流水"/>
       <el-table-column
-        prop="name"
+        prop="billStatus"
         label="缴费状态"/>
       <el-table-column
-        prop="name"
+        prop="payName"
         label="缴费人"/>
       <el-table-column
-        prop="name"
+        prop="payDate"
         label="缴费时间"/>
       <el-table-column
-        prop="name"
+        prop="createDate"
         label="新建时间"/>
       <el-table-column
-        prop="name"
+        prop="createUserName"
         label="新建人"/>
       <el-table-column
-        prop="name"
+        prop="updateUserName"
         label="修改时间"/>
       <el-table-column
-        prop="name"
+        prop="updateDate"
         label="修改时间"/>
     </el-table>
+    <div class="pagination-info">
+      <el-pagination
+        :current-page="formInline.pageNum"
+        :page-sizes="[100, 200, 300, 400]"
+        :page-size="formInline.pageSize"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
   </div>
 </template>
 
@@ -131,17 +146,35 @@ export default {
         roomNo: '',
         ownerName: '',
         billStatus: '',
-        payName: ''
+        payName: '',
+        pageSize: 10,
+        pageNum: 1
       },
       billName: 'xxx收费项目',
       billExplain: 'xxx收费说明',
       endDate: 'xxx收费项截止时间',
-      list: [] // 数据列表
+      list: [], // 数据列表
+      total: 0
     }
   },
+  mounted() {
+    this.formInline.billId = this.$route.params.id
+    this.getBillInvoice()
+  },
   methods: {
     handleSelectionChange(val) {
       console.log(val)
+    },
+    getBillInvoice() {
+      this.$store.dispatch('GetBillInvoiceList', this.formInline).then(res => {
+        const resData = res.data
+        this.list = resData.list
+        this.formInline.pageNum = resData.pageNum
+        this.formInline.pageSize = resData.pageSize
+        this.total = resData.total
+      }).catch(() => {
+        console.log('GetBillInvoiceList error')
+      })
     }
   }
 }
@@ -172,4 +205,8 @@ export default {
   flex-wrap: wrap;
   margin-left: 20px;
 }
+.pagination-info {
+  display: flex;
+  justify-content: flex-end;
+}
 </style>