From cdebc6f4c64b631df8a77cd850b0fd17bf4e9e5b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 26 十一月 2024 09:36:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/system_service/src/main/java/com/doumee/core/utils/Constants.java                                       |    3 
 admin/src/api/bill.js                                                                                          |   13 
 admin/src/views/finance/components/flowingWater.vue                                                            |  373 ++++++++++++++
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractRevenueCloudController.java         |   30 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractRevenueServiceImpl.java |  372 +++++++++++--
 admin/.env.test                                                                                                |    2 
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractRevenue.java               |   77 ++
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractRevenueService.java          |    5 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractBillServiceImpl.java    |   43 +
 admin/src/views/finance/components/bullDetail.vue                                                              |  227 +++++--
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java                  |   12 
 admin/src/views/finance/components/bullEdit.vue                                                                |  267 ++++++---
 admin/src/views/finance/bull.vue                                                                               |   63 -
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/EditRecordDataVO.java                   |   28 +
 14 files changed, 1,185 insertions(+), 330 deletions(-)

diff --git a/admin/.env.test b/admin/.env.test
index 2d37af3..91990ae 100644
--- a/admin/.env.test
+++ b/admin/.env.test
@@ -2,3 +2,5 @@
 NODE_ENV = 'production'
 
 # VUE_APP_API_URL  = 'http://192.168.5.13/gateway_interface'
+
+VUE_APP_API_URL  = 'http://192.168.0.162:10010/'
diff --git a/admin/src/api/bill.js b/admin/src/api/bill.js
new file mode 100644
index 0000000..b5ca07f
--- /dev/null
+++ b/admin/src/api/bill.js
@@ -0,0 +1,13 @@
+import request from '@/utils/request'
+
+// 鏌ヨ
+export function fetchList (data) {
+  return request.post('/visitsAdmin/cloudService/business/ywContractBill/page', data, {
+    trim: true
+  })
+}
+
+// 鍒涘缓
+export function create (data) {
+  return request.post('/visitsAdmin/cloudService/business/ywContractBill/create', data)
+}
diff --git a/admin/src/views/finance/bull.vue b/admin/src/views/finance/bull.vue
index c0aea32..99cc8ed 100644
--- a/admin/src/views/finance/bull.vue
+++ b/admin/src/views/finance/bull.vue
@@ -7,9 +7,9 @@
         <div class="tab" :class="{ active: activeTabs == 1 }" @click="tabsClick(1)">浠樻璐﹀崟</div>
       </div>
       <div class="btns">
-        <el-button type="primary" @click="handleEdit()" icon="el-icon-plus"
+        <el-button type="primary" @click="$refs.EditRef.open('鍒涘缓鏀舵璐﹀崟')" icon="el-icon-plus"
           v-permissions="['business:ywpatrolline:create']">鏂板缓</el-button>
-        <el-button @click="handleEx" v-permissions="['business:ywpatrolline:create']">瀵煎嚭</el-button>
+        <el-button @click="handleDetail" v-permissions="['business:ywpatrolline:create']">瀵煎嚭</el-button>
       </div>
     </div>
     <el-table v-loading="loading" :data="list" stripe>
@@ -20,19 +20,25 @@
       <el-table-column prop="remark" label="缁撴竻鐘舵��" min-width="100" show-overflow-tooltip />
       <el-table-column prop="createTime" label="璐﹀崟閲戦" min-width="100" show-overflow-tooltip />
       <el-table-column prop="createTime" label="搴旀敹閲戦" min-width="100" show-overflow-tooltip />
-      <el-table-column prop="createTime" label="鍚堝悓鐘舵��" min-width="100" show-overflow-tooltip />
+      <el-table-column prop="createTime" label="瀹炴敹閲戦" min-width="100" show-overflow-tooltip />
+      <el-table-column prop="createTime" label="闇�鏀堕噾棰�" min-width="100" show-overflow-tooltip />
+      <el-table-column prop="createTime" label="璐圭敤绫诲瀷" min-width="100" show-overflow-tooltip />
+      <el-table-column prop="createTime" label="鏄惁閫炬湡" min-width="100" show-overflow-tooltip />
+      <el-table-column prop="createTime" label="璁¤垂鍛ㄦ湡" min-width="100" show-overflow-tooltip />
+      <el-table-column prop="createTime" label="搴旀敹鏃ユ湡" min-width="100" show-overflow-tooltip />
+      <el-table-column prop="createTime" label="璐﹀崟鏉ユ簮" min-width="100" show-overflow-tooltip />
+      <el-table-column prop="statusName" label="鍚堝悓鐘舵��" min-width="100" fixed="right" show-overflow-tooltip />
       <el-table-column label="鎿嶄綔" min-width="120" fixed="right">
         <template slot-scope="{row}">
-          <el-button type="text" @click="handleDetail(row)" icon="el-icon-edit"
-            v-permissions="['business:category:update']">鏌ョ湅璇︽儏</el-button>
+          <el-button type="text" @click="handleDetail(row)" icon="el-icon-edit" v-permissions="['business:category:update']">鏌ョ湅璇︽儏</el-button>
         </template>
       </el-table-column>
     </el-table>
     <div class="mt20">
       <Pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" />
     </div>
-    <Edit v-if="showEdit" ref="EditRef" @success="getList" @close="showEdit = false" />
-    <Detail ref="DetailRef" @success="getList" @close="showEdit = false" />
+    <Edit ref="EditRef" @success="getList" />
+    <Detail ref="DetailRef" @success="getList" />
   </div>
 </template>
 
@@ -41,7 +47,7 @@
 import QueryForm from '@/components/common/QueryForm'
 import Edit from './components/bullEdit.vue'
 import Detail from './components/bullDetail.vue'
-import { fetchList, deleteById } from '@/api/Inspection/device'
+import { fetchList } from '@/api/bill'
 export default {
   components: {
     Pagination,
@@ -52,7 +58,6 @@
   data() {
     return {
       loading: false,
-      showEdit: false,
       pagination: {
         pageSize: 10,
         page: 1,
@@ -105,57 +110,32 @@
     this.getList()
   },
   methods: {
-    getList(page) {
+    getList (page) {
       const { pagination, filters } = this
       this.loading = true
       fetchList({
         model: {
-          ...filters,
+          ...filters
         },
         capacity: pagination.pageSize,
-        page: page || pagination.page,
+        page: page || pagination.page
       }).then(res => {
+        console.log(res)
         this.loading = false
         this.list = res.records || []
         this.list.forEach(item => {
-          item.stautsName = item.status == 0 ? '姝ｅ父' : item.status == 1 ? '鎹熷潖' : '鎶ュ簾'
+          item.statusName = item.status === 1 ? '鎹熷潖' : item.status === 2 ? '鎶ュ簾' : '姝ｅ父'
         })
         this.pagination.total = res.total || 0
       }, () => {
         this.loading = false
       })
     },
-    handleEx() {
-
-    },
     tabsClick(val) {
       this.activeTabs = val
     },
-    handleEdit(row) {
-      this.showEdit = true
-      this.$nextTick(() => {
-        this.$refs.EditRef.isShowModal = true
-        if (row && row.id) {
-          this.$refs.EditRef.getDetail(row.id)
-        }
-      })
-
-    },
-    handleDetail() {
-
-    },
-    handleDel(row) {
-      let message = `纭鍒犻櫎璇ヨ褰曞悧?`
-      this.$dialog.deleteConfirm(message)
-        .then(() => {
-          this.isWorking.delete = true
-          deleteById(row.id)
-            .then(() => {
-              this.$tip.apiSuccess('鍒犻櫎鎴愬姛')
-              this.getList()
-            })
-        })
-        .catch(() => { })
+    handleDetail(row) {
+      this.$refs.DetailRef.open()
     },
     clear() {
       this.filters = {}
@@ -175,7 +155,6 @@
 @import '@/assets/style/variables.scss';
 
 .tabs {
-  border-bottom: 1px solid #DFE2E8;
   display: flex;
   margin-bottom: 20px;
   display: flex;
diff --git a/admin/src/views/finance/components/bullDetail.vue b/admin/src/views/finance/components/bullDetail.vue
index 8eec8dd..2f99054 100644
--- a/admin/src/views/finance/components/bullDetail.vue
+++ b/admin/src/views/finance/components/bullDetail.vue
@@ -4,134 +4,205 @@
     <div class="home_title">
       <div class="left">
         <span class="mr10">浠樻鏂癸細xxx</span>
-        <span class="status">status</span>
+        <el-tag type="success">status</el-tag>
       </div>
-      <el-button plain type="primary">鏂板缓鏀舵敮娴佹按</el-button>
+      <el-button plain type="primary" @click="$refs.flowingWater.open('鍒涘缓鏀舵敮娴佹按')">鏂板缓鏀舵敮娴佹按</el-button>
     </div>
-    <div class="remark">
-      <div class="item">
-        <div class="la">璐﹀崟鐘舵��</div>
-        <div class="val">宸茬粨娓�</div>
+    <div class="line"></div>
+    <div class="main">
+      <div class="list" style="background: rgba(0,0,0,0); padding: 0; margin-bottom: 0;">
+        <div class="item" style="flex: 1;">
+          <div class="la">缁撴竻鐘舵��</div>
+          <div class="val" style="margin-top: 10px;">宸茬粨娓�</div>
+        </div>
+        <div class="item" style="flex: 1;">
+          <div class="la">搴旀敹閲戦锛堝厓锛�</div>
+          <div class="val" style="margin-top: 10px;">1,000.00</div>
+        </div>
+        <div class="item" style="flex: 1;">
+          <div class="la">瀹炴敹閲戦锛堝厓锛�</div>
+          <div class="val" style="margin-top: 10px;">1,000.00</div>
+        </div>
+        <div class="item" style="flex: 1;">
+          <div class="la">闇�浠橀噾棰濓紙鍏冿級</div>
+          <div class="val" style="margin-top: 10px;">1,000.00</div>
+        </div>
+        <div class="item" style="flex: 1;">
+          <div class="la">搴旀敹鏃ユ湡</div>
+          <div class="val" style="margin-top: 10px;">2024-11-16</div>
+        </div>
       </div>
     </div>
     <div class="tabs">
-      <div class="tab" :class="{ active: activeTabs == 0 }" @click="tabsClick(0)">鍚堝悓淇℃伅</div>
-      <div class="tab" :class="{ active: activeTabs == 1 }" @click="tabsClick(1)">鍏宠仈璐﹀崟</div>
-      <div class="tab" :class="{ active: activeTabs == 2 }" @click="tabsClick(2)">鎿嶄綔璁板綍</div>
+      <div class="tab" :class="{ active: activeTabs == 0 }" @click="tabsClick(0)">鍩虹淇℃伅</div>
+      <div class="tab" :class="{ active: activeTabs == 1 }" @click="tabsClick(1)">璐﹀崟鏄庣粏</div>
+      <div class="tab" :class="{ active: activeTabs == 2 }" @click="tabsClick(2)">鏀舵敮娴佹按</div>
     </div>
     <div class="main">
       <div class="title">鍩虹淇℃伅</div>
-      <div class="list">
+      <div class="list" style="background: rgba(0,0,0,0); padding: 0;">
         <div class="item">
           <div class="la">璐﹀崟绫诲瀷</div>
-          <div class="val">{{ info.aaa }}</div>
+          <div class="val">绉熼噾</div>
         </div>
         <div class="item">
           <div class="la">璁¤垂鍛ㄦ湡</div>
-          <div class="val">{{ info.aaa }}</div>
+          <div class="val">2024-11-17 ~ 2025-11-17</div>
         </div>
         <div class="item">
           <div class="la">璐﹀崟閲戦(鍏�)</div>
-          <div class="val">{{ info.aaa }}</div>
+          <div class="val">10000.00</div>
         </div>
         <div class="item">
           <div class="la">璐﹀崟缂栧彿</div>
-          <div class="val">{{ info.aaa }}</div>
+          <div class="val">ZD20241117-0002</div>
         </div>
         <div class="item">
           <div class="la">鍚堝悓缂栧彿</div>
-          <div class="val">{{ info.aaa }}</div>
+          <div class="val">202411-0017</div>
         </div>
         <div class="item">
           <div class="la">鍒涘缓鏃堕棿</div>
-          <div class="val">{{ info.aaa }}</div>
+          <div class="val">2024-11-16 15:17:01</div>
         </div>
         <div class="item">
           <div class="la">浠樻鏂�</div>
-          <div class="val">{{ info.aaa }}</div>
+          <div class="val">XX鍏徃</div>
         </div>
         <div class="item">
           <div class="la">缁忓姙浜�</div>
-          <div class="val">{{ info.aaa }}</div>
+          <div class="val">寮犱笁</div>
         </div>
         <div class="item">
           <div class="la">鎵�灞炲叕鍙�</div>
-          <div class="val">{{ info.aaa }}</div>
+          <div class="val">XXX鏈夐檺鍏徃</div>
         </div>
         <div class="item">
           <div class="la">璐﹀崟澶囨敞</div>
-          <div class="val">{{ info.aaa }}</div>
+          <div class="val">杩欐槸澶囨敞鍐呭</div>
         </div>
+        <div class="item"></div>
+        <div class="item"></div>
       </div>
       <div class="title">鎴挎簮淇℃伅</div>
-      <div class="list">
-        <div class="item">
-          <div class="la">椤圭洰鍚嶇О</div>
-          <div class="val">{{ info.aaa }}</div>
-        </div>
-        <div class="item">
-          <div class="la">妤煎畤鍚嶇О</div>
-          <div class="val">{{ info.aaa }}</div>
-        </div>
-        <div class="item">
-          <div class="la">妤煎眰/鎴垮彿</div>
-          <div class="val">{{ info.aaa }}</div>
-        </div>
-        <div class="item">
-          <div class="la">闈㈢Н</div>
-          <div class="val">{{ info.aaa }}</div>
-        </div>
+      <div class="list" style="background: rgba(0,0,0,0); padding: 0;">
+        <el-table
+          :data="tableData"
+          border
+          style="width: 100%">
+          <el-table-column
+            prop="date"
+            label="椤圭洰鍚嶇О">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="妤煎畤鍚嶇О">
+          </el-table-column>
+          <el-table-column
+            prop="address"
+            label="妤煎眰/鎴垮彿">
+          </el-table-column>
+          <el-table-column
+            prop="address"
+            label="闈㈢Н">
+          </el-table-column>
+        </el-table>
       </div>
-      <div class="title">绉熷淇℃伅</div>
-      <div class="list">
-        <div class="item">
-          <div class="la">绉熷</div>
-          <div class="val">{{ info.aaa }}</div>
-        </div>
-        <div class="item">
-          <div class="la">缁忓姙浜�</div>
-          <div class="val">{{ info.aaa }}</div>
-        </div>
+      <div class="title">璐﹀崟鏄庣粏</div>
+      <div class="list" style="background: rgba(0,0,0,0); padding: 0;">
+        <el-table
+          :data="tableData"
+          border
+          style="width: 100%">
+          <el-table-column
+            prop="date"
+            label="璐圭敤绫诲瀷">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="搴旀敹/浠橀噾棰�">
+          </el-table-column>
+          <el-table-column
+            prop="address"
+            label="瀹炴敹閲戦">
+          </el-table-column>
+          <el-table-column
+            prop="address"
+            label="闇�鏀堕噾棰�">
+          </el-table-column>
+          <el-table-column
+            prop="address"
+            label="璁¤垂鍛ㄦ湡">
+          </el-table-column>
+          <el-table-column
+            prop="address"
+            label="搴旀敹/浠樻棩鏈�">
+          </el-table-column>
+          <el-table-column
+            prop="address"
+            label="澶囨敞">
+          </el-table-column>
+        </el-table>
       </div>
-      <div class="title">绉熻祦鏉℃</div>
-      <div class="list">
-        <div class="item">
-          <div class="la">鎶奸噾閲戦</div>
-          <div class="val">{{ info.aaa }}</div>
-        </div>
-        <div class="item">
-          <div class="la">浠樻鏂瑰紡</div>
-          <div class="val">{{ info.aaa }}</div>
-        </div>
-        <div class="item">
-          <div class="la">鍏嶇鏈�</div>
-          <div class="val">{{ info.aaa }}</div>
-        </div>
+      <div class="title">鏀舵敮娴佹按</div>
+      <div class="list" style="background: rgba(0,0,0,0); padding: 0;">
+        <el-table
+          :data="tableData"
+          border
+          style="width: 100%">
+          <el-table-column
+            prop="date"
+            label="娴佹按绫诲瀷">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="瀵规柟鍗曚綅鍚嶇О">
+          </el-table-column>
+          <el-table-column
+            prop="address"
+            label="璐圭敤绫诲瀷">
+          </el-table-column>
+          <el-table-column
+            prop="address"
+            label="鍏ヨ处鏃ユ湡">
+          </el-table-column>
+          <el-table-column
+            prop="address"
+            label="鍙戠敓棰�">
+          </el-table-column>
+          <el-table-column
+            prop="address"
+            label="鍒涘缓鏃堕棿">
+          </el-table-column>
+          <el-table-column
+            prop="address"
+            label="澶囨敞">
+          </el-table-column>
+        </el-table>
       </div>
-      <el-table :data="info.list" stripe>
-        <el-table-column prop="" label="寮�濮嬫棩鏈�" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="" label="缁撴潫鏃ユ湡" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="" label="鍚堝悓鍗曚环" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="" label="浠樻鎻愬墠澶╂暟" min-width="100" show-overflow-tooltip />
-      </el-table>
     </div>
+    <!--  鍒涘缓娴佹按  -->
+    <FlowingWater ref="flowingWater" />
   </GlobalWindow>
 </template>
 
 <script>
 import GlobalWindow from '@/components/common/GlobalWindow'
 import BaseOpera from '@/components/base/BaseOpera'
+import FlowingWater from './flowingWater'
 export default {
   components: {
-    GlobalWindow
+    GlobalWindow,
+    FlowingWater
   },
   extends: BaseOpera,
   data() {
     return {
       id: '',
-      visible: true,
+      visible: false,
       activeTabs: '',
-      info: {}
+      info: {},
+      tableData: []
     }
   },
   methods: {
@@ -201,6 +272,12 @@
   }
 }
 
+.line {
+  width: 100%;
+  margin: 15px 0;
+  border-bottom: 1px dashed #eaeaea;
+}
+
 .main {
   .title {
     font-weight: 500;
@@ -212,18 +289,18 @@
   .list {
     display: flex;
     flex-wrap: wrap;
-    background: #F7F7F7;
+    /*background: #F7F7F7;*/
     border-radius: 2px;
-    padding: 15px 20px;
+    padding: 0 20px;
     margin-bottom: 20px;
 
     .item {
-      width: 25%;
-      margin-bottom: 16px;
+      flex: 25%;
+      margin-bottom: 20px;
 
       .la {
         color: #7f7f7f;
-        margin-top: 2px;
+        margin-bottom: 5px;
       }
     }
   }
diff --git a/admin/src/views/finance/components/bullEdit.vue b/admin/src/views/finance/components/bullEdit.vue
index 80a4067..5e69da3 100644
--- a/admin/src/views/finance/components/bullEdit.vue
+++ b/admin/src/views/finance/components/bullEdit.vue
@@ -1,77 +1,106 @@
 <template>
-  <GlobalWindow width="1100px" :title="title" :visible.sync="isShowModal" :confirm-working="isWorking" @close="close"
+  <GlobalWindow width="100%" :title="title" :visible.sync="visible" :confirm-working="isWorking" @close="close"
     @confirm="confirm">
-    <template v-if="activeTabs == 0">
-      <div class="main">
-        <div class="main_content">
-          <el-form :model="param" label-position="top" ref="paramRef" :rules="rules">
-            <div class="head">
-              <div class="m_title">鍩虹淇℃伅</div>
-              <div class="tabs">
-                <div class="tab" :class="{ active: timeTab == 0 }" @click="timeTabClick('0')">鍛ㄦ湡璐圭敤</div>
-                <div class="tab" :class="{ active: timeTab == 1 }" @click="timeTabClick('1')">涓�娆℃�ц垂鐢�</div>
-              </div>
+    <div class="main">
+      <div class="main_content">
+        <el-form :model="param" label-position="top" ref="form" :rules="rules">
+          <div class="head">
+            <div class="m_title">鍩虹淇℃伅</div>
+            <div class="tabs">
+              <div class="tab" :class="{ active: form.feeType === 0 }" @click="timeTabClick(0)">鍛ㄦ湡璐圭敤</div>
+              <div class="tab" :class="{ active: form.feeType === 1 }" @click="timeTabClick(1)">涓�娆℃�ц垂鐢�</div>
             </div>
-            <div class="list">
-              <el-form-item label="鍏宠仈鍚堝悓" prop="type">
-                <el-select v-model="param.type" placeholder="璇烽�夋嫨" clearable>
-                  <el-option v-for="item in types" :value="item.value" :label="item.name"></el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="浠樻鏂�" prop="code">
-                <el-input v-model="param.code" placeholder="璇疯緭鍏ュ悎鍚岀紪鍙�" v-trim />
-              </el-form-item>
-              <el-form-item label="璐圭敤绫诲瀷" prop="aaa">
-                <el-select v-model="param.aaa" placeholder="璇烽�夋嫨" clearable>
-                  <el-option v-for="item in agentList" :value="item.id" :label="item.name"></el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="璁¤垂鍛ㄦ湡" prop="">
-                <el-date-picker type="date" v-model="param.getDate" value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨" />
-              </el-form-item>
-              <el-form-item label="搴旀敹閲戦" prop="">
-                <el-date-picker type="date" v-model="param.getDate" value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨" />
-              </el-form-item>
-              <el-form-item label="搴旀敹鏃ユ湡" prop="">
-                <el-date-picker type="date" v-model="param.getDate" value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨" />
-              </el-form-item>
-              <el-form-item label="鎵�灞炲叕鍙�" prop="">
-                <el-select v-model="param.aaa" placeholder="璇烽�夋嫨" clearable>
-                  <el-option v-for="item in comparyList" :value="item.id" :label="item.name"></el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item style="width: 100%;" label="璐﹀崟澶囨敞" prop="">
-                <el-input type="textarea" :rows="4" v-model="param.content" placeholder="璇疯緭鍏�" />
-              </el-form-item>
-            </div>
-          </el-form>
-        </div>
-        <div class="main_house">
-          <div class="title">璇烽�夋嫨鎴挎簮</div>
-          <el-cascader style="width: 300px" v-model="value" @change="houseChange" :options="options"
-            :props="{ multiple: true }" collapse-tags clearable />
-        </div>
+          </div>
+          <div class="list">
+            <el-form-item label="鍏宠仈鍚堝悓" prop="contractId">
+              <el-select v-model="form.contractId" placeholder="璇烽�夋嫨" clearable>
+                <el-option v-for="(item, index) in contract" :key="index" :value="item.value" :label="item.name"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="浠樻鏂�" prop="customerName">
+              <el-select v-model="form.customerName" filterable placeholder="璇烽�夋嫨">
+                <el-option
+                  v-for="(item, index) in payerList"
+                  :key="index"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="璐圭敤绫诲瀷" prop="costType">
+              <el-select v-model="form.costType" placeholder="璇烽�夋嫨">
+                <el-option :value="0" label="绉熻祦璐�"></el-option>
+                <el-option :value="1" label="鐗╀笟璐�"></el-option>
+                <el-option :value="2" label="绉熻祦鎶奸噾"></el-option>
+                <el-option :value="3" label="鐗╀笟璇侀噾"></el-option>
+                <el-option :value="4" label="姘寸數璐�"></el-option>
+                <el-option :value="5" label="鏉傞」璐�"></el-option>
+                <el-option :value="6" label="鍏朵粬"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="璁¤垂鍛ㄦ湡" prop="startDate" v-if="form.feeType !== 1">
+              <el-date-picker
+                type="daterange"
+                range-separator="鑷�"
+                v-model="date"
+                @change="changeDate"
+                start-placeholder="寮�濮嬫棩鏈�"
+                end-placeholder="缁撴潫鏃ユ湡"
+                value-format="yyyy-MM-dd"
+                placeholder="璇烽�夋嫨" />
+            </el-form-item>
+            <el-form-item label="搴旀敹閲戦" prop="receivableFee">
+              <el-input v-model="form.receivableFee" placeholder="璇疯緭鍏ュ簲鏀堕噾棰�" v-trim />
+            </el-form-item>
+            <el-form-item label="搴旀敹鏃ユ湡" prop="planPayDate">
+              <el-date-picker type="date" v-model="form.planPayDate" value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨" />
+            </el-form-item>
+            <el-form-item label="鎵�灞炲叕鍙�" prop="companyId">
+              <el-select v-model="form.companyId" placeholder="璇烽�夋嫨" clearable>
+                <el-option
+                  v-for="(item, index) in comparyList"
+                  :key="index"
+                  :value="item.id"
+                  :label="item.name" />
+              </el-select>
+            </el-form-item>
+            <el-form-item style="width: 100%;" label="璐﹀崟澶囨敞" prop="remark">
+              <el-input type="textarea" :rows="5" v-model="param.remark" placeholder="璇疯緭鍏�" />
+            </el-form-item>
+          </div>
+        </el-form>
       </div>
-      <div class="file_wrap">
-        <div class="head">
-          <div>璐﹀崟闄勪欢</div>
-          <el-upload class="upload-demo" :show-file-list="false" :data="uploadData" :action="uploadImgUrl"
-            :on-success="uploadAvatarSuccess" :before-upload="beforeUpload" :on-error="uploadError">
-            <el-button icon="el-icon-plus" plain>娣诲姞闄勪欢</el-button>
-          </el-upload>
-        </div>
-        <el-table :data="param.list" stripe>
-          <el-table-column prop="" label="闄勪欢鍚嶇О" align="center" min-width="100" show-overflow-tooltip />
-          <el-table-column prop="" label="鎿嶄綔浜�" align="center" min-width="100" show-overflow-tooltip />
-          <el-table-column prop="" label="鎿嶄綔鏃堕棿" align="center" min-width="100" show-overflow-tooltip />
-          <el-table-column prop="" label="鎿嶄綔" align="center" min-width="100">
-            <template v-slot="scope">
-              <span class="cu red">鍒犻櫎</span>
-            </template>
-          </el-table-column>
-        </el-table>
+      <div class="main_house">
+        <div class="title">璇烽�夋嫨鎴挎簮</div>
+        <el-tree
+          :data="houseList"
+          show-checkbox
+          node-key="id"
+          :default-expanded-keys="[2, 3]"
+          :default-checked-keys="[5]"
+          :props="defaultProps">
+        </el-tree>
       </div>
-    </template>
+    </div>
+    <div class="file_wrap">
+      <div class="head">
+        <div>璐﹀崟闄勪欢</div>
+        <el-upload class="upload-demo" :show-file-list="false" :data="uploadData" :action="uploadImgUrl"
+          :on-success="uploadAvatarSuccess" :before-upload="beforeUpload" :on-error="uploadError">
+          <el-button icon="el-icon-plus" plain>娣诲姞闄勪欢</el-button>
+        </el-upload>
+      </div>
+      <el-table :data="param.list" stripe>
+        <el-table-column prop="" label="闄勪欢鍚嶇О" align="center" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="" label="鎿嶄綔浜�" align="center" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="" label="鎿嶄綔鏃堕棿" align="center" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="" label="鎿嶄綔" align="center" min-width="100">
+          <template v-slot="{ scope }">
+            <span class="cu red">鍒犻櫎</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
     <!--  -->
     <MemberSearch ref="MemberSearchRef" />
   </GlobalWindow>
@@ -82,6 +111,7 @@
 import BaseOpera from '@/components/base/BaseOpera'
 import MemberSearch from '@/components/common/MemberSearch'
 import { rules } from './config'
+import { create } from '@/api/bill'
 import { Message, Loading } from 'element-ui'
 export default {
   components: {
@@ -91,9 +121,21 @@
   extends: BaseOpera,
   data() {
     return {
-      isShowModal: false,
-      title: '',
-      activeTabs: '0',
+      form: {
+        contractId: '',
+        customerName: '',
+        costType: '',
+        type: '',
+        companyId: '',
+        remark: '',
+        startDate: '',
+        endDate: '',
+        receivableFee: '',
+        feeType: 0,
+        planPayDate: ''
+      },
+      date: [],
+      
       param: {},
       rules,
       timeTab: '0',
@@ -104,13 +146,9 @@
       uploadData: {
         folder: 'HIDDEN_DANGER_FILE'
       },
-
-      types: [
-        { name: '鐗╀笟+绉熻祦鍚堝悓', value: 0 },
-        { name: '绉熻祦鍚堝悓', value: 1 },
-        { name: '鐗╀笟鍚堝悓', value: 2 },
-      ],
-      agentList: [], //缁忓姙浜�
+      contract: [],
+      payerList: [],
+      
       projectList: [],
       comparyList: [], // 鍏徃
       renterList: [], // 绉熷
@@ -183,35 +221,68 @@
         { name: '鍏�/m虏路骞�', value: 5 },
         { name: '鍏�/鍦�', value: 6 },
       ],
+      houseList: [{
+        id: 1,
+        label: '涓�绾� 1',
+        children: [{
+          id: 4,
+          label: '浜岀骇 1-1',
+          children: [{
+            id: 9,
+            label: '涓夌骇 1-1-1'
+          }, {
+            id: 10,
+            label: '涓夌骇 1-1-2'
+          }]
+        }]
+      }, {
+        id: 2,
+        label: '涓�绾� 2',
+        children: [{
+          id: 5,
+          label: '浜岀骇 2-1'
+        }, {
+          id: 6,
+          label: '浜岀骇 2-2'
+        }]
+      }, {
+        id: 3,
+        label: '涓�绾� 3',
+        children: [{
+          id: 7,
+          label: '浜岀骇 3-1'
+        }, {
+          id: 8,
+          label: '浜岀骇 3-2'
+        }]
+      }],
+      defaultProps: {
+        children: 'children',
+        label: 'label'
+      }
     }
   },
-  created() {
-    const { param } = this
-    this.title = param.id ? '缂栬緫鏀舵璐﹀崟' : '鍒涘缓鏀舵璐﹀崟'
-  },
   methods: {
-    tabsClick(val) {
-      this.activeTabs = val
-    },
     timeTabClick(val) {
-      this.timeTab = val
+      this.form.feeType = val
+      if (val === 1) {
+        this.form.startDate = ''
+        this.form.endDate = ''
+      }
     },
-    getDetail() {
-
+    changeDate(e) {
+      if (!e || e.length === 0) {
+        this.form.startDate = ''
+        this.form.endDate = ''
+      } else {
+        this.form.startDate = e[0]
+        this.form.endDate = e[1]
+      }
     },
     handleRent() {
       this.$refs.MemberSearchRef.openModal()
     },
-    houseChange(e) {
-      console.log(e)
-      console.log(this.value)
-
-    },
     beforeUpload(file) {
-      // if (['video/mp4', 'video/ogg', 'video/flv', 'video/avi', 'video/wmv', 'video/rmvb', 'image/jpeg', 'image/jpg', 'image/png', 'image/gif'].indexOf(file.type) == -1) {
-      //   this.$message.error('璇蜂笂浼犳纭殑瑙嗛/鍥剧墖鏍煎紡')
-      //   return false
-      // }
       this.loadingInstance = Loading.service({
         lock: true,
         text: 'Loading',
diff --git a/admin/src/views/finance/components/flowingWater.vue b/admin/src/views/finance/components/flowingWater.vue
new file mode 100644
index 0000000..590e012
--- /dev/null
+++ b/admin/src/views/finance/components/flowingWater.vue
@@ -0,0 +1,373 @@
+<template>
+    <GlobalWindow width="100%" :title="title" :visible.sync="isShowModal" :confirm-working="isWorking" @close="close"
+      @confirm="confirm">
+        <div class="main">
+            <div class="main_content">
+                <el-form :model="param" label-position="top" ref="paramRef" :rules="rules">
+                    <div class="head">
+                        <div class="m_title">娴佹按淇℃伅</div>
+                    </div>
+                    <div class="list">
+                        <el-form-item label="鍏宠仈鍚堝悓" prop="type">
+                            <el-select v-model="param.type" placeholder="璇烽�夋嫨" clearable>
+                                <el-option v-for="item in types" :value="item.value" :label="item.name"></el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="璐圭敤绫诲瀷" prop="code">
+                            <el-input v-model="param.code" placeholder="璇疯緭鍏ュ悎鍚岀紪鍙�" v-trim />
+                        </el-form-item>
+                        <el-form-item label="璐瑰崟鍛ㄦ湡" prop="aaa">
+                            <el-select v-model="param.code" placeholder="璇烽�夋嫨" clearable>
+                                <el-option v-for="item in agentList" :value="item.id" :label="item.name"></el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="搴旀敹閲戦" prop="">
+                            <el-input v-model="param.code" placeholder="璇疯緭鍏ュ疄鏀堕噾棰�" v-trim />
+                        </el-form-item>
+                        <el-form-item label="瀹炴敹閲戦" prop="">
+                            <el-input v-model="param.code" placeholder="璇疯緭鍏ュ疄鏀堕噾棰�" v-trim />
+                        </el-form-item>
+                        <el-form-item label="鍏ヨ处鏃ユ湡" prop="">
+                            <el-date-picker type="date" v-model="param.getDate" value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨" />
+                        </el-form-item>
+                        <el-form-item label="鏀舵鏂瑰紡" prop="">
+                            <el-select v-model="param.content" placeholder="璇烽�夋嫨">
+                                <el-option label="鐜伴噾" :value="1"></el-option>
+                                <el-option label="缃戦摱杞处" :value="2"></el-option>
+                                <el-option label="POS鏈�" :value="3"></el-option>
+                                <el-option label="鏀粯瀹�" :value="4"></el-option>
+                                <el-option label="寰俊" :value="5"></el-option>
+                                <el-option label="杞处鏀エ" :value="6"></el-option>
+                                <el-option label="鍏跺畠鏂瑰紡" :value="7"></el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="鎵�灞炲叕鍙�" prop="">
+                            <el-select v-model="param.code" placeholder="璇烽�夋嫨" clearable>
+                                <el-option v-for="item in agentList" :value="item.id" :label="item.name"></el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="鏀舵敮璐︽埛" prop="">
+                            <el-select v-model="param.code" placeholder="璇烽�夋嫨" clearable>
+                                <el-option v-for="item in agentList" :value="item.id" :label="item.name"></el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="澶囨敞" prop="" style="width: 100%;">
+                            <el-input type="textarea" :rows="6" v-model="param.content" placeholder="璇疯緭鍏�" />
+                        </el-form-item>
+                    </div>
+                </el-form>
+            </div>
+        </div>
+        <div class="file_wrap">
+            <div class="head">
+                <div>璐﹀崟闄勪欢</div>
+                <el-upload class="upload-demo" :show-file-list="false" :data="uploadData" :action="uploadImgUrl"
+                           :on-success="uploadAvatarSuccess" :before-upload="beforeUpload" :on-error="uploadError">
+                    <el-button icon="el-icon-plus" plain>娣诲姞闄勪欢</el-button>
+                </el-upload>
+            </div>
+            <el-table :data="param.list" stripe>
+                <el-table-column prop="" label="闄勪欢鍚嶇О" align="center" min-width="100" show-overflow-tooltip />
+                <el-table-column prop="" label="鎿嶄綔浜�" align="center" min-width="100" show-overflow-tooltip />
+                <el-table-column prop="" label="鎿嶄綔鏃堕棿" align="center" min-width="100" show-overflow-tooltip />
+                <el-table-column prop="" label="鎿嶄綔" align="center" min-width="100">
+                    <template v-slot="scope">
+                        <span class="cu red">鍒犻櫎</span>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </div>
+    </GlobalWindow>
+</template>
+
+<script>
+  import GlobalWindow from '@/components/common/GlobalWindow'
+  import BaseOpera from '@/components/base/BaseOpera'
+  import { rules } from './config'
+  import { Message, Loading } from 'element-ui'
+  export default {
+    name: "flowingWater",
+    components: {
+      GlobalWindow
+    },
+    extends: BaseOpera,
+    data() {
+      return {
+        isShowModal: false,
+        title: '',
+        activeTabs: '0',
+        param: {},
+        rules,
+        timeTab: '0',
+
+        loadingInstance: null,
+        uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/uploadBatch',
+        fileList: [],
+        uploadData: {
+          folder: 'HIDDEN_DANGER_FILE'
+        },
+
+        types: [
+          { name: '鐗╀笟+绉熻祦鍚堝悓', value: 0 },
+          { name: '绉熻祦鍚堝悓', value: 1 },
+          { name: '鐗╀笟鍚堝悓', value: 2 },
+        ],
+        agentList: [], //缁忓姙浜�
+        projectList: [],
+        comparyList: [], // 鍏徃
+        renterList: [], // 绉熷
+        contacts: [], // 鑱旂郴浜�
+        value: [],
+        options: [
+          {
+            value: 1,
+            label: '涓滃崡',
+            children: [{
+              value: 2,
+              label: '涓婃捣',
+              children: [
+                { value: 3, label: '鏅檧' },
+                { value: 4, label: '榛勫煍' },
+                { value: 5, label: '寰愭眹' }
+              ]
+            }, {
+              value: 7,
+              label: '姹熻嫃',
+              children: [
+                { value: 8, label: '鍗椾含' },
+                { value: 9, label: '鑻忓窞' },
+                { value: 10, label: '鏃犻敗' }
+              ]
+            }, {
+              value: 12,
+              label: '娴欐睙',
+              children: [
+                { value: 13, label: '鏉窞' },
+                { value: 14, label: '瀹佹尝' },
+                { value: 15, label: '鍢夊叴' }
+              ]
+            }]
+          },
+          {
+            value: 17,
+            label: '瑗垮寳',
+            children: [{
+              value: 18,
+              label: '闄曡タ',
+              children: [
+                { value: 19, label: '瑗垮畨' },
+                { value: 20, label: '寤跺畨' }
+              ]
+            }, {
+              value: 21,
+              label: '鏂扮枂缁村惥灏旀棌鑷不鍖�',
+              children: [
+                { value: 22, label: '涔岄瞾鏈ㄩ綈' },
+                { value: 23, label: '鍏嬫媺鐜涗緷' }
+              ]
+            }]
+          }
+        ],
+        cactiveTabs: 0,
+        paramCost: {},
+        payMethods: [
+          { name: '涓�娆℃�т粯娆�', value: 0 },
+          { name: '3涓湀涓�浠�', value: 1 },
+          { name: '6涓湀涓�浠�', value: 2 },
+          { name: '1骞翠竴浠�', value: 2 },
+        ],
+        unitOps: [
+          { name: '鍏�/m虏路澶�', value: 0 },
+          { name: '鍏�/m虏路鏈�', value: 1 },
+          { name: '鍏�/澶�', value: 2 },
+          { name: '鍏�/鏈�', value: 3 },
+          { name: '鍏�/骞�', value: 4 },
+          { name: '鍏�/m虏路骞�', value: 5 },
+          { name: '鍏�/鍦�', value: 6 },
+        ],
+      }
+    },
+    created() {
+      const { param } = this
+      this.title = param.id ? '缂栬緫鏀舵璐﹀崟' : '鍒涘缓鏀舵璐﹀崟'
+    },
+    methods: {
+      tabsClick(val) {
+        this.activeTabs = val
+      },
+      timeTabClick(val) {
+        this.timeTab = val
+      },
+      getDetail() {
+
+      },
+      handleRent() {
+        this.$refs.MemberSearchRef.openModal()
+      },
+      houseChange(e) {
+        console.log(e)
+        console.log(this.value)
+
+      },
+      beforeUpload(file) {
+        // if (['video/mp4', 'video/ogg', 'video/flv', 'video/avi', 'video/wmv', 'video/rmvb', 'image/jpeg', 'image/jpg', 'image/png', 'image/gif'].indexOf(file.type) == -1) {
+        //   this.$message.error('璇蜂笂浼犳纭殑瑙嗛/鍥剧墖鏍煎紡')
+        //   return false
+        // }
+        this.loadingInstance = Loading.service({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+      },
+      uploadError() {
+        this.$nextTick(() => { // 浠ユ湇鍔＄殑鏂瑰紡璋冪敤鐨� Loading 闇�瑕佸紓姝ュ叧闂�
+          if (this.loadingInstance) {
+            this.loadingInstance.close()
+          }
+        })
+      },
+      uploadAvatarSuccess(file) {
+        this.$nextTick(() => { // 浠ユ湇鍔＄殑鏂瑰紡璋冪敤鐨� Loading 闇�瑕佸紓姝ュ叧闂�
+          if (this.loadingInstance) {
+            this.loadingInstance.close()
+          }
+        })
+        console.log('file', file)
+        const item = file.data[0]
+        if (['.mp4', '.avi', '.flv', '.wmv'].some(char => item.imgaddr.includes(char))) {
+          this.fileList.push({
+            type: 1,
+            fileurl: item.imgaddr,
+            fileurlFull: item.url
+          })
+        } else {
+          this.fileList.push({
+            type: 0,
+            fileurl: item.imgaddr,
+            fileurlFull: item.url
+          })
+        }
+        console.log('file', this.fileList)
+        // this.$set(this.param, 'faceImg', file.imgurl)
+        // this.$set(this.param, 'faceImgUrl', file.imgurlfull)
+      },
+      close() {
+        this.isShowModal = false
+        this.$emit('close')
+      },
+      open(title, target) {
+        this.title = title
+        this.isShowModal = true
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+    @import '@/assets/style/variables.scss';
+
+
+    .cost_tabs {
+        justify-content: flex-start;
+        border: none;
+
+        .tab {
+            height: 36px;
+            line-height: 36px;
+            font-size: 14px;
+        }
+    }
+
+    .main {
+        display: flex;
+        margin-bottom: 20px;
+
+        .main_content {
+            flex: 1;
+            margin-right: 20px;
+
+            .head {
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+
+                .tabs {
+                    display: flex;
+                    margin-bottom: 20px;
+                    display: flex;
+                    justify-content: center;
+
+                    .tab {
+                        height: 14px;
+                        line-height: 14px;
+                        cursor: pointer;
+                        border: 1px solid #ebebeb;
+                        padding: 12px 24px;
+                    }
+
+                    .active {
+                        font-weight: 500;
+                        color: $primary-color;
+                        border: 1px solid $primary-color;
+                    }
+                }
+            }
+
+            .list {
+                display: flex;
+                flex-wrap: wrap;
+
+                .el-form-item {
+                    width: 33.33%;
+                    box-sizing: border-box;
+                    padding: 0 12px;
+                }
+            }
+        }
+
+        .main_house {
+            width: 320px;
+            padding: 24px 12px;
+            border: 1px solid #c3c6cd;
+            border-radius: 2px;
+
+            .title {
+                font-size: 16px;
+                font-weight: 500;
+                margin-bottom: 30px;
+            }
+        }
+
+    }
+
+    .total {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        height: 32px;
+        background-color: #e7e9f5;
+
+        span {
+            width: 160px;
+            text-align: center;
+        }
+    }
+
+    .file_wrap {
+        
+        .head {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+        }
+    }
+
+    .m_title {
+        font-weight: 500;
+        font-size: 14px;
+        margin-bottom: 15px;
+        margin-top: 10px;
+    }
+</style>
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index 5e2a5af..336d44e 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -1252,7 +1252,8 @@
         FN_DEVICE_RECORD_FILE(6, "闃滃畞鏈嶅姟骞冲彴杩愮淮璁板綍鍥剧墖 ", "闃滃畞鏈嶅姟骞冲彴杩愮淮璁板綍鍥剧墖 "),
         FN_PATROL_POINT_FILE(7, "宸℃鐐归檮浠� ", "宸℃鐐归檮浠� "),
         FN_CONTRACT_BILL_FILE(8, "鍚堝悓璐﹀崟闄勪欢 ", "鍚堝悓璐﹀崟闄勪欢 "),
-        YW_CONTRACT_FILE(9, "鍚堝悓闄勪欢 ", "鍚堝悓闄勪欢 ")
+        YW_CONTRACT_FILE(9, "鍚堝悓闄勪欢 ", "鍚堝悓闄勪欢 "),
+        FN_CONTRACT_REVENUE_FILE(10, "鏀舵敮娴佹按闄勪欢 ", "鍚堝悓璐﹀崟闄勪欢 "),
 
         ;
         // 鎴愬憳鍙橀噺
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractRevenueCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractRevenueCloudController.java
index f67ad1d..c0e32e3 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractRevenueCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractRevenueCloudController.java
@@ -43,7 +43,7 @@
     @ApiOperation("鏍规嵁ID鍒犻櫎")
     @GetMapping("/delete/{id}")
     @CloudRequiredPermission("business:ywcontractrevenue:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
+    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
         ywContractRevenueService.deleteById(id);
         return ApiResponse.success(null);
     }
@@ -51,7 +51,7 @@
     @ApiOperation("鎵归噺鍒犻櫎")
     @GetMapping("/delete/batch")
     @CloudRequiredPermission("business:ywcontractrevenue:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
+    public ApiResponse deleteByIdInBatch(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
         String [] idArray = ids.split(",");
         List<Integer> idList = new ArrayList<>();
         for (String id : idArray) {
@@ -64,29 +64,45 @@
     @ApiOperation("鏍规嵁ID淇敼")
     @PostMapping("/updateById")
     @CloudRequiredPermission("business:ywcontractrevenue:update")
-    public ApiResponse updateById(@RequestBody YwContractRevenue ywContractRevenue) {
+    public ApiResponse updateById(@RequestBody YwContractRevenue ywContractRevenue,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
         ywContractRevenueService.updateById(ywContractRevenue);
+        return ApiResponse.success(null);
+    }
+
+    @ApiOperation("鍏抽棴娴佹按")
+    @GetMapping("/close")
+    @CloudRequiredPermission("business:ywcontractrevenue:update")
+    public ApiResponse close(@RequestParam Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        ywContractRevenueService.closeRevenue(id,getLoginUser(token));
         return ApiResponse.success(null);
     }
 
     @ApiOperation("鍒嗛〉鏌ヨ")
     @PostMapping("/page")
     @CloudRequiredPermission("business:ywcontractrevenue:query")
-    public ApiResponse<PageData<YwContractRevenue>> findPage (@RequestBody PageWrap<YwContractRevenue> pageWrap) {
+    public ApiResponse<PageData<YwContractRevenue>> findPage (@RequestBody PageWrap<YwContractRevenue> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
         return ApiResponse.success(ywContractRevenueService.findPage(pageWrap));
+    }
+
+
+    @ApiOperation("鏀舵敮鍒楄〃")
+    @PostMapping("/list")
+    @CloudRequiredPermission("business:ywcontractrevenue:query")
+    public ApiResponse<List<YwContractRevenue>> list (@RequestBody YwContractRevenue ywContractRevenue,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        return ApiResponse.success(ywContractRevenueService.findList(ywContractRevenue));
     }
 
     @ApiOperation("瀵煎嚭Excel")
     @PostMapping("/exportExcel")
     @CloudRequiredPermission("business:ywcontractrevenue:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<YwContractRevenue> pageWrap, HttpServletResponse response) {
+    public void exportExcel (@RequestBody PageWrap<YwContractRevenue> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
         ExcelExporter.build(YwContractRevenue.class).export(ywContractRevenueService.findPage(pageWrap).getRecords(), "杩愮淮鍚堝悓鏀舵敮娴佹按", response);
     }
 
     @ApiOperation("鏍规嵁ID鏌ヨ")
     @GetMapping("/{id}")
     @CloudRequiredPermission("business:ywcontractrevenue:query")
-    public ApiResponse findById(@PathVariable Integer id) {
-        return ApiResponse.success(ywContractRevenueService.findById(id));
+    public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        return ApiResponse.success(ywContractRevenueService.getDetail(id));
     }
 }
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java
index 60a0cec..0dcd404 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java
@@ -90,8 +90,8 @@
     @ExcelColumn(name="搴旀敹閲戦",index = 5,width = 6)
     private BigDecimal receivableFee;
 
-    @ApiModelProperty(value = "璐圭敤绫诲瀷锛�0=绉熻祦璐癸紱1=鐗╀笟璐癸紱2=绉熻祦鎶奸噾锛�3=鐗╀笟鎶奸噾锛�4=姘寸數璐癸紱5=鏉傞」璐癸紱6=鍏朵粬 ;7=淇濊瘉閲�", example = "1")
-    @ExcelColumn(name="璐圭敤绫诲瀷",index = 8,width = 6,valueMapping = "0=绉熻祦璐癸紱1=鐗╀笟璐癸紱2=绉熻祦鎶奸噾锛�3=鐗╀笟鎶奸噾锛�4=姘寸數璐癸紱5=鏉傞」璐癸紱6=鍏朵粬;7=淇濊瘉閲�")
+    @ApiModelProperty(value = "璐圭敤绫诲瀷锛�0=绉熻祦璐癸紱1=鐗╀笟璐癸紱2=绉熻祦鎶奸噾锛�3=鐗╀笟鎶奸噾锛�4=姘寸數璐癸紱5=鏉傞」璐癸紱6=鍏朵粬; 7=淇濊瘉閲�", example = "1")
+    @ExcelColumn(name="璐圭敤绫诲瀷",index = 8,width = 6,valueMapping = "0=绉熻祦璐癸紱1=鐗╀笟璐癸紱2=绉熻祦鎶奸噾锛�3=鐗╀笟鎶奸噾;4=姘寸數璐�;5=鏉傞」璐癸紱6=鍏朵粬;7=淇濊瘉閲�;")
     private Integer costType;
 
     @ApiModelProperty(value = "璐﹀崟绫诲瀷锛�0=鏀舵锛�1=浠樻", example = "1")
@@ -107,6 +107,7 @@
     @ApiModelProperty(value = "浠樻鐘舵�侊細0=寰呮敹娆撅紱1=宸茬粨娓咃紱2=閮ㄥ垎缁撴竻锛�3=寰呬粯娆撅紱4=寰呴��娆撅紱5=宸插叧闂�")
     @ExcelColumn(name="缁撴竻鐘舵��",index = 3,width = 6,valueMapping = "0=寰呮敹娆�;1=宸茬粨娓�;2=閮ㄥ垎缁撴竻;3=寰呬粯娆�;4=寰呴��娆�;5=宸插叧闂�;")
     private Integer payStatus;
+
     @ApiModelProperty(value = "閫�绉熺被鍨� 0鍒版湡閫�绉� 1鎹㈡埧閫�绉� 2杩濈害閫�绉� 3鍗忓晢閫�绉�", example = "1")
     @ExcelColumn(name="閫�绉熺被鍨� 0鍒版湡閫�绉� 1鎹㈡埧閫�绉� 2杩濈害閫�绉� 3鍗忓晢閫�绉�")
     private Integer btType;
@@ -162,11 +163,6 @@
     @TableField(exist = false)
     private String roomPathName;
 
-    @ApiModelProperty(value = "鎴块棿鏁版嵁", example = "1")
-    @TableField(exist = false)
-    private List<YwRoom> ywRoomList ;
-
-
     @ApiModelProperty(value = "璁″垝浠樻鏃� - 寮�濮�")
     @TableField(exist = false)
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -191,7 +187,7 @@
     @ApiModelProperty(value = "鏄惁閫炬湡锛�0=鍚︼紱1=鏄�")
     @TableField(exist = false)
     @ExcelColumn(name="鏄惁閫炬湡",index = 9,width = 6,valueMapping = "0=鏈�炬湡锛�1=宸查�炬湡")
-    private BigDecimal isOverdue;
+    private Integer isOverdue;
 
     @ApiModelProperty(value = "闄勪欢淇℃伅", example = "1")
     @TableField(exist = false)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractRevenue.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractRevenue.java
index c0bad0d..8c374fa 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractRevenue.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractRevenue.java
@@ -2,7 +2,10 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.constants.OperaType;
 import com.doumee.core.model.LoginUserModel;
+import com.doumee.dao.business.vo.EditRecordDataVO;
+import com.doumee.dao.system.model.Multifile;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -10,8 +13,11 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+
+import javax.validation.constraints.NotBlank;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 杩愮淮鍚堝悓鏀舵敮娴佹按
@@ -25,77 +31,114 @@
 
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "涓婚敭", example = "1")
-    @ExcelColumn(name="涓婚敭")
     private Integer id;
 
     @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
-    @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
     private Integer creator;
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
-    @ExcelColumn(name="鍒涘缓鏃堕棿")
+    @ExcelColumn(name="鍒涘缓鏃ユ湡",index = 8,width = 10,dateFormat = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createDate;
 
     @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
-    @ExcelColumn(name="鏇存柊浜虹紪鐮�")
     private Integer editor;
 
     @ApiModelProperty(value = "鏇存柊鏃堕棿")
-    @ExcelColumn(name="鏇存柊鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date editDate;
 
     @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
-    @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
     private Integer isdeleted;
 
     @ApiModelProperty(value = "澶囨敞")
-    @ExcelColumn(name="澶囨敞")
     private String remark;
 
     @ApiModelProperty(value = "鐘舵�� 0=寮�鍚紱1=鍏抽棴", example = "1")
-    @ExcelColumn(name="鐘舵�� 0=寮�鍚紱1=鍏抽棴")
+    @ExcelColumn(name="鐘舵��",index = 10,width = 10,valueMapping = "0=寮�鍚�;1=鍏抽棴")
     private Integer status;
 
-    @ApiModelProperty(value = "瀹炴敹閲戦", example = "1")
-    @ExcelColumn(name="瀹炴敹閲戦")
+    @ApiModelProperty(value = "鍙戠敓閲戦", example = "1")
+    @ExcelColumn(name="鍙戠敓閲戦",index = 5,width = 10)
     private BigDecimal actReceivableFee;
 
     @ApiModelProperty(value = "瀹為檯浠樻鏃�")
-    @ExcelColumn(name="瀹為檯浠樻鏃�")
+    @ExcelColumn(name="鍏ヨ处鏃ユ湡",index = 7,width = 10,dateFormat = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date actPayDate;
 
     @ApiModelProperty(value = "浠樻绫诲瀷锛�0=鐜伴噾锛�1=缃戦摱杞处锛�2=POS鏈猴紱3=鏀粯瀹濓紱4=寰俊锛�5=杞处鏀エ锛�6=鍏朵粬", example = "1")
-    @ExcelColumn(name="浠樻绫诲瀷锛�0=鐜伴噾锛�1=缃戦摱杞处锛�2=POS鏈猴紱3=鏀粯瀹濓紱4=寰俊锛�5=杞处鏀エ锛�6=鍏朵粬")
+    @ExcelColumn(name="鏀舵鏂瑰紡",index = 6,width = 10,valueMapping = "0=鐜伴噾;1=缃戦摱杞处;2=POS鏈�;3=鏀粯瀹�;4=寰俊;5=杞处鏀エ;6=鍏朵粬;")
     private Integer payType;
 
     @ApiModelProperty(value = "鎵�灞炲叕鍙革紙鍏宠仈 company锛�", example = "1")
-    @ExcelColumn(name="鎵�灞炲叕鍙革紙鍏宠仈 company锛�")
     private Integer companyId;
 
     @ApiModelProperty(value = "鏀舵敮璐︽埛锛堝叧鑱攜w_account)", example = "1")
-    @ExcelColumn(name="鏀舵敮璐︽埛锛堝叧鑱攜w_account)")
     private Integer accountId;
 
     @ApiModelProperty(value = "鍚堝悓涓婚敭锛堝叧鑱攜w_contract锛�", example = "1")
-    @ExcelColumn(name="鍚堝悓涓婚敭锛堝叧鑱攜w_contract锛�")
     private Integer contractId;
 
     @ApiModelProperty(value = "璐﹀崟涓婚敭锛堝叧鑱攜w_contract_bill锛�", example = "1")
-    @ExcelColumn(name="璐﹀崟涓婚敭锛堝叧鑱攜w_contract_bill锛�")
     private Integer billId;
 
     @ApiModelProperty(value = "鏀舵敮绫诲瀷锛�0=鏀跺叆锛�1=鏀嚭", example = "1")
-    @ExcelColumn(name="鏀舵敮绫诲瀷锛�0=鏀跺叆锛�1=鏀嚭")
+    @ExcelColumn(name="鏀舵敮绫诲瀷",index = 4,width = 10,valueMapping = "0=鏀跺叆;1=鏀嚭")
     private Integer revenueType;
+
+
+    @ApiModelProperty(value = "鍚堝悓缂栧彿", example = "1")
+    @ExcelColumn(name="鍚堝悓缂栧彿",index = 1,width = 10)
+    @TableField(exist = false)
+    private String contractCode;
 
 
     @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
     @TableField(exist = false)
     private String customerNme;
 
+    @ApiModelProperty(value = "瀹㈡埛鍚嶇О锛堜粯娆炬柟锛�", example = "1")
+    @ExcelColumn(name="瀹㈡埛鍚嶇О",index = 0,width = 10)
+    @TableField(exist = false)
+    private String customerName;
 
 
+    @ApiModelProperty(value = "鍒涘缓浜哄悕绉�")
+    @ExcelColumn(name="鍒涘缓浜�",index = 9,width = 10)
+    private String realname;
+
+    @ApiModelProperty(value = "鍏宠仈鎴块棿鏁版嵁", example = "1")
+    @TableField(exist = false)
+    private List<YwContractRoom> ywContractRoomList;
+
+
+    @ApiModelProperty(value = "闄勪欢淇℃伅", example = "1")
+    @TableField(exist = false)
+    private List<Multifile> multifileList;
+
+    @ApiModelProperty(value = "鍏ヨ处鏃ユ湡 - 寮�濮�")
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date payDateStart;
+
+    @ApiModelProperty(value = "鍏ヨ处鏃ユ湡 - 缁撴潫")
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date payDateEnd;
+
+    @ApiModelProperty(value = "妤煎畤鎴块棿", example = "1")
+    @ExcelColumn(name="鎴垮彿",index = 2,width = 10)
+    @TableField(exist = false)
+    private String roomPathName;
+
+    @ApiModelProperty(value = "璐﹀崟缂栧彿", example = "1")
+    @ExcelColumn(name="璐﹀崟缂栧彿",index = 3,width = 16)
+    @TableField(exist = false)
+    private String billCode;
+
+    @ApiModelProperty(value = "鎿嶄綔璁板綍", example = "1")
+    @TableField(exist = false)
+    private List<EditRecordDataVO> editRecordDataVOList;
+
 }
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/EditRecordDataVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/EditRecordDataVO.java
new file mode 100644
index 0000000..8221220
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/EditRecordDataVO.java
@@ -0,0 +1,28 @@
+package com.doumee.dao.business.vo;
+
+import com.doumee.dao.business.model.Approve;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2024/5/23 14:56
+ */
+@Data
+public class EditRecordDataVO {
+
+    @ApiModelProperty(value = "鎿嶄綔鏃堕棿")
+    private Date editTime;
+
+    @ApiModelProperty(value = "鎿嶄綔浜�")
+    private String editUserName;
+
+    @ApiModelProperty(value = "鎿嶄綔澶囨敞")
+    private String editRemark;
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractRevenueService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractRevenueService.java
index 5945c12..410ce06 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractRevenueService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractRevenueService.java
@@ -1,5 +1,6 @@
 package com.doumee.service.business;
 
+import com.doumee.core.model.LoginUserInfo;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
 import com.doumee.dao.business.model.YwContractRevenue;
@@ -63,6 +64,10 @@
      */
     YwContractRevenue findById(Integer id);
 
+    YwContractRevenue getDetail(Integer id);
+
+    void closeRevenue(Integer id, LoginUserInfo loginUserInfo);
+
     /**
      * 鏉′欢鏌ヨ鍗曟潯璁板綍
      *
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractBillServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractBillServiceImpl.java
index 7d4dc16..cd31b01 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractBillServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractBillServiceImpl.java
@@ -8,10 +8,7 @@
 import com.doumee.core.model.PageWrap;
 import com.doumee.core.utils.Constants;
 import com.doumee.core.utils.Utils;
-import com.doumee.dao.business.YwContractBillMapper;
-import com.doumee.dao.business.YwContractRevenueMapper;
-import com.doumee.dao.business.YwContractRoomMapper;
-import com.doumee.dao.business.YwRoomMapper;
+import com.doumee.dao.business.*;
 import com.doumee.dao.business.model.*;
 import com.doumee.dao.system.MultifileMapper;
 import com.doumee.dao.system.model.Multifile;
@@ -53,6 +50,9 @@
     @Autowired
     private SystemDictDataBiz systemDictDataBiz;
 
+    @Autowired
+    private YwContractMapper ywContractMapper;
+
 
 
     @Override
@@ -71,6 +71,14 @@
         ){
             throw new BusinessException(ResponseStatus.BAD_REQUEST);
         }
+        YwContract ywContract = ywContractMapper.selectById(ywContractBill.getContractId());
+        if(Objects.isNull(ywContract)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+        if(Constants.equalsInteger(ywContract.getStatus(),Constants.THREE)){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚堝悓鐘舵�佸凡娴佽浆,鏃犳硶杩涜璇ユ搷浣�");
+        }
+
         LoginUserInfo loginUserInfo = ywContractBill.getLoginUserInfo();
         ywContractBill.setReceivableFee(ywContractBill.getTotleFee());
         ywContractBill.setCreateDate(new Date());
@@ -170,6 +178,7 @@
         if(Objects.isNull(ywContractBill)){
             throw new BusinessException(ResponseStatus.DATA_EMPTY);
         }
+
         //鎴挎簮鏁版嵁
         ywContractBill.setYwContractRoomList(ywContractRoomMapper.selectJoinList(YwContractRoom.class,new MPJLambdaWrapper<YwContractRoom>()
                 .selectAll(YwContractRoom.class)
@@ -183,16 +192,7 @@
                 .eq(YwContractRoom::getContractId,id)
                 .eq(YwContractRoom::getType,Constants.ONE)
         ));
-        //鏀舵敮鏄庣粏
-        ywContractBill.setYwContractRevenueList(
-            ywContractRevenueMapper.selectJoinList(YwContractRevenue.class,new MPJLambdaWrapper<YwContractRevenue>()
-                            .selectAll(YwContractRevenue.class)
-                            .selectAs(YwCustomer::getName,YwContractRevenue::getCustomerNme)
-                            .leftJoin(YwContract.class,YwContract::getId,YwContractRevenue::getContractId)
-                            .leftJoin(YwCustomer.class,YwCustomer::getId,YwContract::getRenterId)
-                    .eq(YwContractRevenue::getBillId,id)
-            )
-        );
+
         //闄勪欢鏁版嵁
         List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
                 .eq(Multifile::getObjId,id)
@@ -246,8 +246,8 @@
                             YwContractBill::getType,model.getType())
                     .eq(Objects.nonNull(model)&&Objects.nonNull(model.getContractId()),
                             YwContractBill::getContractId,model.getContractId())
-                .ge(YwContractBill::getPlanPayDate, Utils.Date.getStart(model.getPlanPayDateStart()))
-                .le(YwContractBill::getPlanPayDate, Utils.Date.getEnd(model.getPlanPayDateEnd())) )
+                .ge(Objects.nonNull(model)&&Objects.nonNull(model.getPlanPayDateStart()),YwContractBill::getPlanPayDate, Utils.Date.getStart(model.getPlanPayDateStart()))
+                .le(Objects.nonNull(model)&&Objects.nonNull(model.getPlanPayDateEnd()),YwContractBill::getPlanPayDate, Utils.Date.getEnd(model.getPlanPayDateEnd())) )
         ;
         this.dealRoomDetail(iPage.getRecords());
         for (YwContractBill ywContractBill:iPage.getRecords()) {
@@ -255,6 +255,16 @@
             ywContractBill.setNeedReceivableFee(
                     ywContractBill.getReceivableFee().subtract(ywContractBill.getActReceivableFee())
             );
+            //鏄惁閫炬湡
+            if(Constants.equalsInteger(ywContractBill.getStatus(),Constants.ZERO) && (Constants.equalsInteger(ywContractBill.getPayStatus(),Constants.ZERO)
+            || Constants.equalsInteger(ywContractBill.getPayStatus(),Constants.TWO)
+            || Constants.equalsInteger(ywContractBill.getPayStatus(),Constants.THREE)
+            || Constants.equalsInteger(ywContractBill.getPayStatus(),Constants.FOUR))
+            && ywContractBill.getEndDate().getTime() < System.currentTimeMillis()){
+                ywContractBill.setIsOverdue(Constants.ONE);
+            }else{
+                ywContractBill.setIsOverdue(Constants.ZERO);
+            }
             //妤煎畤鍚嶇О
             List<YwContractRoom> ywContractRoomList = ywContractBill.getYwContractRoomList();
             StringBuilder roomPathName = new StringBuilder();
@@ -276,7 +286,6 @@
                 }
             }
             ywContractBill.setRoomPathName(roomPathName.toString());
-
         }
 
         return PageData.from(iPage);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractRevenueServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractRevenueServiceImpl.java
index 7a0754c..d637c75 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractRevenueServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractRevenueServiceImpl.java
@@ -7,26 +7,32 @@
 import com.doumee.core.model.PageWrap;
 import com.doumee.core.utils.Constants;
 import com.doumee.core.utils.Utils;
-import com.doumee.dao.business.YwAccountMapper;
-import com.doumee.dao.business.YwContractBillMapper;
-import com.doumee.dao.business.YwContractRevenueMapper;
+import com.doumee.dao.business.*;
 import com.doumee.dao.business.dao.CompanyMapper;
-import com.doumee.dao.business.model.Company;
-import com.doumee.dao.business.model.YwAccount;
-import com.doumee.dao.business.model.YwContractBill;
-import com.doumee.dao.business.model.YwContractRevenue;
+import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.vo.EditRecordDataVO;
+import com.doumee.dao.system.MultifileMapper;
+import com.doumee.dao.system.SystemUserMapper;
+import com.doumee.dao.system.model.Multifile;
+import com.doumee.dao.system.model.SystemUser;
 import com.doumee.service.business.YwContractRevenueService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * 杩愮淮鍚堝悓鏀舵敮娴佹按Service瀹炵幇
@@ -43,12 +49,26 @@
     private YwContractBillMapper ywContractBillMapper;
 
     @Autowired
+    private YwContractMapper ywContractMapper;
+
+    @Autowired
     private CompanyMapper companyMapper;
 
     @Autowired
     private YwAccountMapper ywAccountMapper;
 
+    @Autowired
+    private MultifileMapper multifileMapper;
+
+    @Autowired
+    private YwContractRoomMapper ywContractRoomMapper;
+
+    @Autowired
+    private SystemUserMapper systemUserMapper;
+
+
     @Override
+    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
     public Integer create(YwContractRevenue ywContractRevenue) {
         if(Objects.isNull(ywContractRevenue)
         || Objects.isNull(ywContractRevenue.getActReceivableFee())
@@ -57,12 +77,23 @@
                 || Objects.isNull(ywContractRevenue.getCompanyId())
                 || Objects.isNull(ywContractRevenue.getAccountId())
                 || Objects.isNull(ywContractRevenue.getBillId())
+                || ywContractRevenue.getActReceivableFee().compareTo(BigDecimal.ZERO) <= Constants.ZERO
         ){
              throw new BusinessException(ResponseStatus.BAD_REQUEST);
         }
         YwContractBill ywContractBill = ywContractBillMapper.selectById(ywContractRevenue.getBillId());
         if(Objects.isNull(ywContractBill)){
             throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌璐﹀崟淇℃伅");
+        }
+        if(!Constants.equalsInteger(ywContractBill.getStatus(),Constants.ZERO)){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璐﹀崟鐘舵�佸凡娴佽浆,鏃犳硶杩涜璇ユ搷浣�");
+        }
+        if(!(Constants.equalsInteger(ywContractBill.getPayStatus(),Constants.ZERO)
+        || Constants.equalsInteger(ywContractBill.getPayStatus(),Constants.TWO)
+                || Constants.equalsInteger(ywContractBill.getPayStatus(),Constants.THREE)
+                || Constants.equalsInteger(ywContractBill.getPayStatus(),Constants.FOUR)
+        )){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璐﹀崟缁撴竻鐘舵�佸凡娴佽浆,鏃犳硶杩涜璇ユ搷浣�");
         }
         Company company =companyMapper.selectById(ywContractRevenue.getCompanyId());
         if(Objects.isNull(company)){
@@ -78,15 +109,75 @@
         ywContractRevenue.setIsdeleted(Constants.ZERO);
         ywContractRevenue.setStatus(Constants.ZERO);
         ywContractRevenue.setContractId(ywContractBill.getContractId());
-        ywContractRevenue.setRevenueType(ywContractBill.getBillType());
-        ywContractRevenueMapper.insert(ywContractRevenue);
         //鏍规嵁鏀舵敮鎯呭喌 鏇存柊璐﹀崟鏁版嵁
-
-
-
-
-
-
+        //鏌ヨ褰撳墠璐﹀崟涓� 宸叉敮浠樼殑璐圭敤
+        List<YwContractRevenue> ywContractRevenueList = ywContractRevenueMapper.selectList(new QueryWrapper<YwContractRevenue>().lambda().eq(YwContractRevenue::getIsdeleted,Constants.ZERO)
+                .eq(YwContractRevenue::getStatus,Constants.ZERO)
+        );
+        //宸叉敮浠橀噾棰�
+        BigDecimal payTotal = BigDecimal.ZERO;
+        //寰呮敮浠橀噾棰�
+        BigDecimal waitPayTotal = BigDecimal.ZERO;
+        //鏃犱粯娆捐褰� 鍒欎负鍒濇鏀粯 鏍规嵁璐﹀崟绫诲瀷 鍒ゆ柇鏄敮鍑� / 鏀跺叆
+        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(ywContractRevenueList)){
+            ywContractRevenue.setRevenueType(ywContractBill.getType());
+            if(ywContractRevenue.getActReceivableFee().compareTo(ywContractBill.getReceivableFee())>Constants.ZERO){
+                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇疯緭鍏ユ纭殑閲戦锛�");
+            }else  if(ywContractRevenue.getActReceivableFee().compareTo(ywContractBill.getReceivableFee())==Constants.ZERO){
+                ywContractBill.setPayStatus(Constants.ONE);
+            }else{
+                ywContractBill.setPayStatus(Constants.TWO);
+            }
+        }else{
+            //鑾峰彇宸叉敮浠樼殑鎬婚噾棰� 锛堝彲鑳芥湁鏀跺叆 鏈夋敮鍑猴級
+            payTotal = ywContractRevenueList.stream().map(i->i.getActReceivableFee().multiply(
+                    BigDecimal.valueOf(Constants.equalsInteger(ywContractRevenue.getRevenueType(),Constants.ZERO)?Constants.ONE:-Constants.ONE))
+            ).reduce(BigDecimal.ZERO,BigDecimal::add);
+            //鑾峰彇寰呮敮浠樻閲戦 濡傛灉璐﹀崟绫诲瀷涓烘敮鍑� 鎴� 锛堣处鍗曠被鍨嬩负鏀跺叆 涓� 寰呮敮浠橀噾棰� 灏忎簬 0锛� 鍒欎负鏀粯
+            waitPayTotal = ywContractBill.getReceivableFee().subtract(payTotal);
+            //濡傛灉寰呮敮浠橀噾棰� 澶т簬 0  鍒欐槸 鏀跺叆 鍚﹀垯鏄敮鍑� 鍏朵粬鐘舵�� 涓哄紓甯革紒
+            if(waitPayTotal.compareTo(BigDecimal.ZERO)>Constants.ZERO){
+                ywContractRevenue.setRevenueType(Constants.ZERO);
+            }else if(waitPayTotal.compareTo(BigDecimal.ZERO)<Constants.ZERO){
+                ywContractRevenue.setRevenueType(Constants.ONE);
+            }else{
+                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏀舵敮閲戦寮傚父!璇疯仈绯荤鐞嗗憳");
+            }
+            //寰呮敮浠樼殑娴佹按 濡傛灉涓烘敹鍏� 鍒欐瘮瀵� 閲戦鍊�  濡傛灉鏄敮鍑� 鍒欒幏鍙栫粷瀵瑰�� 杩涜瀵规瘮
+            if(Constants.equalsInteger(ywContractRevenue.getRevenueType(),Constants.ZERO)){
+                //濡傛灉鏀粯閲戦 澶т簬 寰呮敮浠橀噾棰� 鍒欐彁绀哄紓甯� 濡傛灉鏀粯閲戦灏忎簬 寰呮敮浠橀噾棰� 鍒欑姸鎬佷笉鍙樺寲 鍏朵粬鐘舵�� 寮傚父
+                if(waitPayTotal.compareTo(ywContractRevenue.getActReceivableFee())>Constants.ZERO){
+                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇疯緭鍏ユ纭殑閲戦锛�");
+                }else if(waitPayTotal.compareTo(ywContractRevenue.getActReceivableFee())==Constants.ZERO){
+                    ywContractBill.setPayStatus(Constants.ONE);
+                }
+            }else{
+                waitPayTotal = waitPayTotal.abs();
+                if(waitPayTotal.compareTo(ywContractRevenue.getActReceivableFee())>Constants.ZERO){
+                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇疯緭鍏ユ纭殑閲戦锛�");
+                }else if(waitPayTotal.compareTo(ywContractRevenue.getActReceivableFee())==Constants.ZERO){
+                    ywContractBill.setPayStatus(Constants.ONE);
+                }
+            }
+        }
+        ywContractRevenueMapper.insert(ywContractRevenue);
+        ywContractBillMapper.updateById(ywContractBill);
+        //瀛樺偍闄勪欢淇℃伅
+        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ywContractRevenue.getMultifileList())){
+            for (Multifile multifile:ywContractRevenue.getMultifileList()) {
+                if(Objects.isNull(multifile)
+                        || StringUtils.isBlank(multifile.getFileurl())
+                        || StringUtils.isBlank(multifile.getName())){
+                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"闄勪欢淇℃伅閿欒");
+                }
+                multifile.setCreator(loginUserInfo.getId());
+                multifile.setCreateDate(new Date());
+                multifile.setIsdeleted(Constants.ZERO);
+                multifile.setObjType(Constants.MultiFile.FN_CONTRACT_REVENUE_FILE.getKey());
+                multifile.setObjId(ywContractRevenue.getId());
+            }
+            multifileMapper.insert(ywContractRevenue.getMultifileList());
+        }
         return ywContractRevenue.getId();
     }
 
@@ -130,6 +221,120 @@
     }
 
     @Override
+    public YwContractRevenue getDetail(Integer id) {
+        YwContractRevenue ywContractRevenue = ywContractRevenueMapper.selectJoinOne(
+                YwContractRevenue.class,
+                new MPJLambdaWrapper<YwContractRevenue>().selectAll(YwContractRevenue.class)
+                        .selectAs(YwContractBill::getCode,YwContractRevenue::getBillCode)
+                        .selectAs(YwContract::getCode,YwContractRevenue::getContractCode)
+                        .selectAs(YwCustomer::getName,YwContractRevenue::getCustomerName)
+                        .selectAs(SystemUser::getRealname,YwContractRevenue::getRealname)
+                        .leftJoin(YwContractBill.class,YwContractBill::getId,YwContractRevenue::getBillId)
+                        .leftJoin(YwContract.class,YwContract::getId,YwContractBill::getContractId)
+                        .leftJoin(YwCustomer.class,YwCustomer::getId,YwContract::getRenterId)
+                        .leftJoin(SystemUser.class,SystemUser::getId,YwContractRevenue::getCreator)
+                        .eq(YwContractRevenue::getId,id)
+        );
+
+       this.getRecordData(ywContractRevenue);
+
+        return ywContractRevenue;
+    }
+
+    /**
+     * 鎿嶄綔璁板綍
+     * @param ywContractRevenue
+     */
+    public void getRecordData(YwContractRevenue ywContractRevenue){
+        List<EditRecordDataVO> editRecordDataVOList = new ArrayList();
+        //妯℃嫙娴佹按璁板綍
+        if(Objects.nonNull(ywContractRevenue.getCreateDate())){
+            EditRecordDataVO editRecordDataVO = new EditRecordDataVO();
+            editRecordDataVO.setEditRemark("鍒涘缓娴佹按");
+            editRecordDataVO.setEditTime(ywContractRevenue.getCreateDate());
+            SystemUser createUser = systemUserMapper.selectById(ywContractRevenue.getCreator());
+            if(Objects.nonNull(createUser)){
+                editRecordDataVO.setEditUserName(createUser.getRealname());
+            }
+            editRecordDataVOList.add(editRecordDataVO);
+        }
+        if(Objects.nonNull(ywContractRevenue.getEditor())){
+            EditRecordDataVO editRecordDataVO = new EditRecordDataVO();
+            editRecordDataVO.setEditRemark("鍏抽棴娴佹按");
+            editRecordDataVO.setEditTime(ywContractRevenue.getEditDate());
+            SystemUser closeUser = systemUserMapper.selectById(ywContractRevenue.getEditor());
+            if(Objects.nonNull(closeUser)){
+                editRecordDataVO.setEditUserName(closeUser.getRealname());
+            }
+            editRecordDataVOList.add(editRecordDataVO);
+        }
+        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(editRecordDataVOList)){
+            ywContractRevenue.setEditRecordDataVOList(editRecordDataVOList);
+        }
+    }
+
+
+    @Override
+    public void closeRevenue(Integer id,LoginUserInfo loginUserInfo) {
+        YwContractRevenue ywContractRevenue = ywContractRevenueMapper.selectById(id);
+        if(Objects.isNull(ywContractRevenue)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+        YwContractBill ywContractBill = ywContractBillMapper.selectById(ywContractRevenue.getBillId());
+        if(Objects.isNull(ywContractBill)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+        YwContract ywContract = ywContractMapper.selectById(ywContractBill.getContractId());
+        if(Objects.isNull(ywContract)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+        if(Constants.equalsInteger(ywContract.getStatus(),Constants.THREE)){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚堝悓鐘舵�佸凡娴佽浆,鏃犳硶鎿嶄綔");
+        }
+        if(Constants.equalsInteger(ywContractBill.getPayStatus(),Constants.ONE)
+            || Constants.equalsInteger(ywContractBill.getPayStatus(),Constants.TWO)){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璐﹀崟鐘舵�佸凡娴佽浆,鏃犳硶鎿嶄綔");
+        }
+        //鏌ヨ璐﹀崟涓� 鎵�鏈夌殑璐﹀崟
+        List<YwContractRevenue> ywContractRevenueList =  ywContractRevenueMapper.selectList(new QueryWrapper<YwContractRevenue>().lambda().eq(YwContractRevenue::getStatus,Constants.ZERO)
+                        .eq(YwContractRevenue::getIsdeleted,Constants.ZERO)
+                .eq(YwContractRevenue::getBillId,ywContractRevenue.getBillId())
+                .ne(YwContractRevenue::getId,id)
+        );
+        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(ywContractRevenueList)){
+            //鏃犲叾浠栨祦姘磋褰� 鏍规嵁璐﹀崟鍒涘缓绫诲瀷  鍙樻洿鐘舵��
+            //鑷缓璐﹀崟 鏍规嵁璐﹀崟鏀舵敮绫诲瀷杩涜 鍙樻洿鐘舵��
+            if(Constants.equalsInteger(ywContractBill.getType(),Constants.ONE)){
+                if(Constants.equalsInteger(ywContractBill.getBillType(),Constants.ZERO)){
+                    ywContractBill.setPayStatus(Constants.ZERO);
+                }else{
+                    ywContractBill.setPayStatus(Constants.THREE);
+                }
+            }else{
+                //鍚堝悓璐﹀崟 鍙樹负 寰呮敹娆�
+                ywContractBill.setPayStatus(Constants.ZERO);
+            }
+        }else{
+            //瀛樺湪鍏朵粬娴佹按 鍒欑粺涓�鍙樻洿涓� 閮ㄥ垎缁撶畻
+            ywContractBill.setPayStatus(Constants.TWO);
+        }
+
+        ywContractBillMapper.update(null,new UpdateWrapper<YwContractBill>().lambda()
+                .set(YwContractBill::getPayStatus,ywContractBill.getPayStatus())
+                .set(YwContractBill::getEditor,loginUserInfo.getId())
+                .set(YwContractBill::getEditDate," now() ")
+                .eq(YwContractBill::getId,ywContractBill.getId())
+        );
+
+        ywContractRevenueMapper.update(null,new UpdateWrapper<YwContractRevenue>().lambda()
+                .set(YwContractRevenue::getStatus,Constants.ONE)
+                .set(YwContractRevenue::getEditor,loginUserInfo.getId())
+                .set(YwContractRevenue::getEditDate," now() ")
+                .eq(YwContractRevenue::getId,id));
+    }
+
+
+    @Override
     public YwContractRevenue findOne(YwContractRevenue ywContractRevenue) {
         QueryWrapper<YwContractRevenue> wrapper = new QueryWrapper<>(ywContractRevenue);
         return ywContractRevenueMapper.selectOne(wrapper);
@@ -137,67 +342,104 @@
 
     @Override
     public List<YwContractRevenue> findList(YwContractRevenue ywContractRevenue) {
-        QueryWrapper<YwContractRevenue> wrapper = new QueryWrapper<>(ywContractRevenue);
-        return ywContractRevenueMapper.selectList(wrapper);
+        List<YwContractRevenue> ywContractRevenueList = ywContractRevenueMapper.selectJoinList(YwContractRevenue.class,new MPJLambdaWrapper<YwContractRevenue>()
+                .selectAll(YwContractRevenue.class)
+                .selectAs(YwCustomer::getName,YwContractRevenue::getCustomerNme)
+                .leftJoin(YwContract.class,YwContract::getId,YwContractRevenue::getContractId)
+                .leftJoin(YwCustomer.class,YwCustomer::getId,YwContract::getRenterId)
+                .eq(YwContractRevenue::getStatus,Constants.ZERO)
+                .eq(Objects.nonNull(ywContractRevenue) && Objects.nonNull(ywContractRevenue.getBillId()),YwContractRevenue::getBillId,ywContractRevenue.getBillId())
+        );
+        return ywContractRevenueList;
     }
   
     @Override
     public PageData<YwContractRevenue> findPage(PageWrap<YwContractRevenue> pageWrap) {
         IPage<YwContractRevenue> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
-        QueryWrapper<YwContractRevenue> queryWrapper = new QueryWrapper<>();
+        MPJLambdaWrapper<YwContractRevenue> queryWrapper = new MPJLambdaWrapper<>();
         Utils.MP.blankToNull(pageWrap.getModel());
-        if (pageWrap.getModel().getId() != null) {
-            queryWrapper.lambda().eq(YwContractRevenue::getId, pageWrap.getModel().getId());
+        YwContractRevenue model = pageWrap.getModel();
+        IPage<YwContractRevenue> iPage = ywContractRevenueMapper.selectJoinPage(page,YwContractRevenue.class,
+                queryWrapper.selectAll(YwContractRevenue.class)
+                        .selectAs(YwContractBill::getCode,YwContractRevenue::getBillCode)
+                         .selectAs(YwContract::getCode,YwContractRevenue::getContractCode)
+                        .selectAs(YwCustomer::getName,YwContractRevenue::getCustomerName)
+                        .selectAs(SystemUser::getRealname,YwContractRevenue::getRealname)
+                        .leftJoin(YwContractBill.class,YwContractBill::getId,YwContractRevenue::getBillId)
+                        .leftJoin(YwContract.class,YwContract::getId,YwContractBill::getContractId)
+                        .leftJoin(YwCustomer.class,YwCustomer::getId,YwContract::getRenterId)
+                        .leftJoin(SystemUser.class,SystemUser::getId,YwContractRevenue::getCreator)
+                        .eq(YwContractRevenue::getIsdeleted,Constants.ZERO)
+                        .like(Objects.nonNull(model)&&StringUtils.isNotBlank(model.getCustomerNme()),
+                                YwCustomer::getName,model.getCustomerNme())
+                        .eq(Objects.nonNull(model)&&Objects.nonNull(model.getPayType()),
+                                YwContractRevenue::getPayType,model.getPayType())
+                        .eq(Objects.nonNull(model)&&Objects.nonNull(model.getRevenueType()),
+                                YwContractRevenue::getRevenueType,model.getRevenueType())
+                        .ge(Objects.nonNull(model)&&Objects.nonNull(model.getPayDateStart()),YwContractRevenue::getActPayDate, Utils.Date.getStart(model.getPayDateStart()))
+                        .le(Objects.nonNull(model)&&Objects.nonNull(model.getPayDateEnd()),YwContractRevenue::getActPayDate, Utils.Date.getEnd(model.getPayDateEnd())) )
+                ;
+
+        this.dealRoomDetail(iPage.getRecords());
+
+        for (YwContractRevenue ywContractRevenue:iPage.getRecords()) {
+            //妤煎畤鍚嶇О
+            List<YwContractRoom> ywContractRoomList = ywContractRevenue.getYwContractRoomList();
+            StringBuilder roomPathName = new StringBuilder();
+            for (YwContractRoom ywContractRoom:ywContractRoomList) {
+                if(StringUtils.isNotBlank(ywContractRoom.getProjectName())){
+                    roomPathName.append(ywContractRoom.getProjectName()+"/");
+                }
+                if(StringUtils.isNotBlank(ywContractRoom.getBuildingName())){
+                    roomPathName.append(ywContractRoom.getBuildingName()+"/");
+                }
+                if(StringUtils.isNotBlank(ywContractRoom.getFloorName())){
+                    roomPathName.append(ywContractRoom.getFloorName()+"/");
+                }
+                if(StringUtils.isNotBlank(ywContractRoom.getRoomName())){
+                    roomPathName.append(ywContractRoom.getRoomName());
+                }
+                if(StringUtils.isNotBlank(roomPathName)){
+                    roomPathName.append(";");
+                }
+            }
+            ywContractRevenue.setRoomPathName(roomPathName.toString());
         }
-        if (pageWrap.getModel().getCreator() != null) {
-            queryWrapper.lambda().eq(YwContractRevenue::getCreator, pageWrap.getModel().getCreator());
-        }
-        if (pageWrap.getModel().getCreateDate() != null) {
-            queryWrapper.lambda().ge(YwContractRevenue::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
-            queryWrapper.lambda().le(YwContractRevenue::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
-        }
-        if (pageWrap.getModel().getEditor() != null) {
-            queryWrapper.lambda().eq(YwContractRevenue::getEditor, pageWrap.getModel().getEditor());
-        }
-        if (pageWrap.getModel().getEditDate() != null) {
-            queryWrapper.lambda().ge(YwContractRevenue::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
-            queryWrapper.lambda().le(YwContractRevenue::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
-        }
-        if (pageWrap.getModel().getIsdeleted() != null) {
-            queryWrapper.lambda().eq(YwContractRevenue::getIsdeleted, pageWrap.getModel().getIsdeleted());
-        }
-        if (pageWrap.getModel().getRemark() != null) {
-            queryWrapper.lambda().eq(YwContractRevenue::getRemark, pageWrap.getModel().getRemark());
-        }
-        if (pageWrap.getModel().getStatus() != null) {
-            queryWrapper.lambda().eq(YwContractRevenue::getStatus, pageWrap.getModel().getStatus());
-        }
-        if (pageWrap.getModel().getActReceivableFee() != null) {
-            queryWrapper.lambda().eq(YwContractRevenue::getActReceivableFee, pageWrap.getModel().getActReceivableFee());
-        }
-        if (pageWrap.getModel().getActPayDate() != null) {
-            queryWrapper.lambda().ge(YwContractRevenue::getActPayDate, Utils.Date.getStart(pageWrap.getModel().getActPayDate()));
-            queryWrapper.lambda().le(YwContractRevenue::getActPayDate, Utils.Date.getEnd(pageWrap.getModel().getActPayDate()));
-        }
-        if (pageWrap.getModel().getPayType() != null) {
-            queryWrapper.lambda().eq(YwContractRevenue::getPayType, pageWrap.getModel().getPayType());
-        }
-        if (pageWrap.getModel().getCompanyId() != null) {
-            queryWrapper.lambda().eq(YwContractRevenue::getCompanyId, pageWrap.getModel().getCompanyId());
-        }
-        if (pageWrap.getModel().getAccountId() != null) {
-            queryWrapper.lambda().eq(YwContractRevenue::getAccountId, pageWrap.getModel().getAccountId());
-        }
-        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
-            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
-                queryWrapper.orderByDesc(sortData.getProperty());
-            } else {
-                queryWrapper.orderByAsc(sortData.getProperty());
+        return PageData.from(iPage);
+    }
+
+
+    public void dealRoomDetail(List<YwContractRevenue> ywContractRevenueList){
+        //鏌ヨ璐﹀崟涓嬬殑妤煎畤鏁版嵁
+        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ywContractRevenueList)){
+            //鑾峰彇鎵�鏈夋暟鎹�
+            List<Integer> billIdList = ywContractRevenueList.stream().map(i->i.getBillId()).collect(Collectors.toList());
+            if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(billIdList)){
+                List<YwContractRoom> ywContractRoomList  = ywContractRoomMapper.selectJoinList(YwContractRoom.class,new MPJLambdaWrapper<YwContractRoom>()
+                        .selectAll(YwContractRoom.class)
+                        .selectAs(YwProject::getName,YwRoom::getProjectName)
+                        .selectAs(YwFloor::getName,YwRoom::getFloorName)
+                        .selectAs(YwBuilding::getName,YwRoom::getBuildingName)
+                        .selectAs(YwRoom::getName,YwContractRoom::getRoomName)
+                        .leftJoin(YwRoom.class,YwRoom::getId,YwContractRoom::getRoomId)
+                        .leftJoin(YwFloor.class,YwFloor::getId,YwRoom::getFloor)
+                        .leftJoin(YwProject.class,YwProject::getId,YwRoom::getProjectId)
+                        .leftJoin(YwBuilding.class,YwBuilding::getId,YwRoom::getBuildingId)
+                        .in(YwContractRoom::getContractId,billIdList)
+                        .eq(YwContractRoom::getType,Constants.ONE)
+                );
+                if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ywContractRoomList)){
+                    for (YwContractRevenue ywContractRevenue:ywContractRevenueList) {
+                        ywContractRevenue.setYwContractRoomList(
+                                ywContractRoomList.stream().filter(i->Constants.equalsInteger(i.getContractId(),ywContractRevenue.getBillId())).collect(Collectors.toList())
+                        );
+                    }
+                }
             }
         }
-        return PageData.from(ywContractRevenueMapper.selectPage(page, queryWrapper));
     }
 
+
     @Override
     public long count(YwContractRevenue ywContractRevenue) {
         QueryWrapper<YwContractRevenue> wrapper = new QueryWrapper<>(ywContractRevenue);

--
Gitblit v1.9.3