From bc46f9370b6ea7a4592eed2827f4f0368e4ba3b5 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 26 十一月 2024 09:42:23 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/AreasServiceImpl.java | 458 ++++++++++
admin/src/api/bill.js | 13
admin/src/views/finance/components/flowingWater.vue | 373 ++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/AreasMapper.java | 12
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java | 17
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 ++++++-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java | 257 +++++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Areas.java | 109 ++
admin/.env.test | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/AreasCloudController.java | 115 ++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/dto/AreasDto.java | 23
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/AreasService.java | 124 ++
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
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java | 41
23 files changed, 2,329 insertions(+), 343 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 0e40100..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
@@ -118,6 +118,7 @@
public static final String ERP ="ERP" ;
public static final Integer THREE =3 ;
public static final Integer FOUR =4 ;
+ public static final Integer SEVEN =7 ;
public static final Integer FIVE =5 ;
public static final String ORG_USER_ORIGIN = "ORG_USER_ORIGIN";
public static final String VIRTUAL_CARD_INDEX = "02098469790";
@@ -1251,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/AreasCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/AreasCloudController.java
new file mode 100644
index 0000000..480b024
--- /dev/null
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/AreasCloudController.java
@@ -0,0 +1,115 @@
+package com.doumee.cloud.admin;
+
+import com.doumee.api.BaseController;
+import com.doumee.core.annotation.excel.ExcelExporter;
+import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.dto.AreasDto;
+import com.doumee.dao.business.model.Areas;
+import com.doumee.service.business.AreasService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/02/15 08:55
+ */
+@Api(tags = "鐪佸競鍖轰俊鎭〃")
+@RestController
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/areas")
+public class AreasCloudController extends BaseController {
+
+ @Autowired
+ private AreasService areasService;
+
+ @PreventRepeat
+ @ApiOperation("鏂板缓")
+ @PostMapping("/create")
+ @RequiresPermissions("business:areas:create")
+ public ApiResponse create(@RequestBody Areas areas,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ areas.setLoginUserInfo(getLoginUser(token));
+ return ApiResponse.success(areasService.create(areas));
+ }
+
+ @ApiOperation("鏍规嵁ID鍒犻櫎")
+ @GetMapping("/delete/{id}")
+ @RequiresPermissions("business:areas:delete")
+ public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ areasService.deleteById(id);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鎵归噺鍒犻櫎")
+ @GetMapping("/delete/batch")
+ @RequiresPermissions("business:areas:delete")
+ 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) {
+ idList.add(Integer.valueOf(id));
+ }
+ areasService.deleteByIdInBatch(idList);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鏍规嵁ID淇敼")
+ @PostMapping("/updateById")
+ @RequiresPermissions("business:areas:update")
+ public ApiResponse updateById(@RequestBody Areas areas,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ areas.setLoginUserInfo(getLoginUser(token));
+ areasService.updateById(areas);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鍒嗛〉鏌ヨ")
+ @PostMapping("/page")
+// @RequiresPermissions("business:areas:query")
+ public ApiResponse<PageData<Areas>> findPage (@RequestBody PageWrap<Areas> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ return ApiResponse.success(areasService.findPage(pageWrap));
+ }
+
+ @ApiOperation("鍏ㄩ儴鏍戝舰鏌ヨ")
+ @PostMapping("/treeList")
+// @RequiresPermissions("business:areas:query")
+ public ApiResponse<List<Areas>> treeList (@RequestBody AreasDto pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ Areas a = new Areas();
+ BeanUtils.copyProperties(pageWrap,a);
+ return ApiResponse.success(areasService.findList(a));
+ }
+ @ApiOperation("鏍规嵁鐖惰妭鐐规煡涓�")
+ @PostMapping("/listByParentId")
+// @RequiresPermissions("business:areas:query")
+ public ApiResponse<List<Areas>> listByParentId (@RequestBody AreasDto pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ Areas a = new Areas();
+ BeanUtils.copyProperties(pageWrap,a);
+// PageWrap<Areas> wrap = new PageWrap<>();
+// wrap.setPage(Constants.ONE);
+// wrap.setCapacity(9999);
+// wrap.setModel(a);
+ return ApiResponse.success(areasService.listByParentId(a));
+ }
+ @ApiOperation("瀵煎嚭Excel")
+ @PostMapping("/exportExcel")
+ @RequiresPermissions("business:areas:exportExcel")
+ public void exportExcel (@RequestBody PageWrap<Areas> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ ExcelExporter.build(Areas.class).export(areasService.findPage(pageWrap).getRecords(), "鐪佸競鍖轰俊鎭〃", response);
+ }
+
+ @ApiOperation("鏍规嵁ID鏌ヨ")
+ @GetMapping("/{id}")
+ @RequiresPermissions("business:areas:query")
+ public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ return ApiResponse.success(areasService.findById(id));
+ }
+}
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/AreasMapper.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/AreasMapper.java
new file mode 100644
index 0000000..6e66e24
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/AreasMapper.java
@@ -0,0 +1,12 @@
+package com.doumee.dao.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.doumee.dao.business.model.Areas;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/02/15 08:55
+ */
+public interface AreasMapper extends BaseMapper<Areas> {
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/dto/AreasDto.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/dto/AreasDto.java
new file mode 100644
index 0000000..12db167
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/dto/AreasDto.java
@@ -0,0 +1,23 @@
+package com.doumee.dao.business.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author Eva.Caesar Liu
+ * @date 2023/02/14 11:14
+ */
+@Data
+@ApiModel("鐪佸競鍖烘煡璇㈠弬鏁�")
+public class AreasDto implements Serializable {
+
+ @ApiModelProperty(value = "鍚嶇О" )
+ private String name;
+ @ApiModelProperty(value = "绫诲瀷 0鐪� 1甯� 2鍖哄幙", example = "1")
+ private Integer type;
+ @ApiModelProperty(value = "鐖惰妭鐐圭紪鐮�", example = "1")
+ private Integer parentId;
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Areas.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Areas.java
new file mode 100644
index 0000000..4176a9d
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Areas.java
@@ -0,0 +1,109 @@
+package com.doumee.dao.business.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 com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserModel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鐪佸競鍖轰俊鎭〃
+ * @author 姹熻箘韫�
+ * @date 2023/02/15 08:55
+ */
+@Data
+@ApiModel("鐪佸競鍖轰俊鎭〃")
+@TableName("`areas`")
+public class Areas extends LoginUserModel implements Cloneable{
+
+ @ApiModelProperty(value = "涓婚敭", example = "1")
+ @ExcelColumn(name="涓婚敭")
+ @TableId(value = "id",type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
+ @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
+ private Integer creator;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @ExcelColumn(name="鍒涘缓鏃堕棿")
+ private Date createDate;
+
+ @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
+ @ExcelColumn(name="鏇存柊浜虹紪鐮�")
+ private Integer editor;
+
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ @ExcelColumn(name="鏇存柊鏃堕棿")
+ private Date editDate;
+
+ @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
+ private Integer isdeleted;
+
+ @ApiModelProperty(value = "鍚嶇О")
+ @ExcelColumn(name="鍚嶇О")
+ private String name;
+
+ @ApiModelProperty(value = "澶囨敞")
+ @ExcelColumn(name="澶囨敞")
+ private String info;
+
+ @ApiModelProperty(value = "琛屾斂鍖轰唬鐮�")
+ @ExcelColumn(name="琛屾斂鍖轰唬鐮�")
+ private String code;
+
+ @ApiModelProperty(value = "鐖剁骇缂栫爜锛堝叧鑱攁reas琛級", example = "1")
+ @ExcelColumn(name="鐖剁骇缂栫爜锛堝叧鑱攁reas琛級")
+ private Integer parentId;
+
+ @ApiModelProperty(value = "绫诲瀷 0鐪� 1甯� 2鍖哄幙", example = "1")
+ @ExcelColumn(name="绫诲瀷 0鐪� 1甯� 2鍖哄幙")
+ private Integer type;
+ @ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
+ @ExcelColumn(name="鎺掑簭鐮�")
+ private Integer sortnum;
+
+ @TableField(exist = false)
+ private List<Areas> childList;
+ @TableField(exist = false)
+ private Integer provinceId;
+ @TableField(exist = false)
+ private String provinceName;
+ @TableField(exist = false)
+ private Integer cityId;
+ @TableField(exist = false)
+ private String cityName;
+ //瀹炵幇Cloneable鐨刢lone鏂规硶锛屽皢clone瀹氫箟涓簆ublic
+ public Areas clone() {
+ try {
+ return (Areas) super.clone();
+ } catch (CloneNotSupportedException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+ @Override
+ public String toString() {
+ return "Areas{" +
+ "id=" + id +
+ ", creator=" + creator +
+ ", createDate=" + createDate +
+ ", editor=" + editor +
+ ", editDate=" + editDate +
+ ", isdeleted=" + isdeleted +
+ ", name='" + name + '\'' +
+ ", info='" + info + '\'' +
+ ", code='" + code + '\'' +
+ ", parentId=" + parentId +
+ ", type=" + type +
+ '}';
+ }
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java
index 99b45fa..7247bdf 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java
@@ -50,8 +50,8 @@
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
- @ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
+ @ApiModelProperty(value = "鍚堝悓鎽樿")
+ @ExcelColumn(name="鍚堝悓鎽樿")
private String remark;
@ApiModelProperty(value = "鐘舵�� 0寰呮墽琛� 1鎵ц涓� 2宸插埌鏈� 3宸查��绉�", example = "1")
@@ -119,6 +119,10 @@
@ApiModelProperty(value = "閫�绉熷師鍥�")
@ExcelColumn(name="閫�绉熷師鍥�")
private String btInfo;
+
+ @ApiModelProperty(value = "閫�绉熸憳瑕�")
+ @ExcelColumn(name="閫�绉熸憳瑕�")
+ private String btRemark;
@ApiModelProperty(value = "閫�绉熸棩鏈�")
@ExcelColumn(name="閫�绉熸棩鏈�")
@@ -222,8 +226,17 @@
@ApiModelProperty(value = "鏌ヨ缁撴潫鏃堕棿")
@TableField(exist = false)
private Date queryEndTime;
+ @ApiModelProperty(value = "閫�娆惧叧闂处鍗曟暟")
+ @TableField(exist = false)
+ private int btCLoseBill;
+ @ApiModelProperty(value = "閫�娆炬湭缁撴竻璐﹀崟鏁�")
+ @TableField(exist = false)
+ private int btWaitBill;
@ApiModelProperty(value = "閫�绉熸椂鏂板鐨勬敹浠樻璐﹀崟")
@TableField(exist = false)
private List<YwContractBill> addBillList;
+ @ApiModelProperty(value = "褰撳墠鏀寔閫�娆句慨鏀归噾棰濈殑璐﹀崟闆嗗悎")
+ @TableField(exist = false)
+ private List<YwContractBill> canBackRentBills;
}
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 4d1a770..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=鍏朵粬 ", example = "1")
- @ExcelColumn(name="璐圭敤绫诲瀷",index = 8,width = 6,valueMapping = "0=绉熻祦璐癸紱1=鐗╀笟璐癸紱2=绉熻祦鎶奸噾锛�3=鐗╀笟璇侀噾锛�4=姘寸數璐癸紱5=鏉傞」璐癸紱6=鍏朵粬;")
+ @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/AreasService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/AreasService.java
new file mode 100644
index 0000000..5248c94
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/AreasService.java
@@ -0,0 +1,124 @@
+package com.doumee.service.business;
+
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.model.Areas;
+
+import java.util.List;
+
+/**
+ * 鐪佸競鍖轰俊鎭〃Service瀹氫箟
+ * @author 姹熻箘韫�
+ * @date 2023/02/15 08:55
+ */
+public interface AreasService {
+
+ /**
+ * 鍒涘缓
+ *
+ * @param areas 瀹炰綋瀵硅薄
+ * @return Integer
+ */
+ Integer create(Areas areas);
+
+ /**
+ * 涓婚敭鍒犻櫎
+ *
+ * @param id 涓婚敭
+ */
+ void deleteById(Integer id);
+
+ /**
+ * 鍒犻櫎
+ *
+ * @param areas 瀹炰綋瀵硅薄
+ */
+ void delete(Areas areas);
+
+ /**
+ * 鎵归噺涓婚敭鍒犻櫎
+ *
+ * @param ids 涓婚敭闆�
+ */
+ void deleteByIdInBatch(List<Integer> ids);
+
+ /**
+ * 涓婚敭鏇存柊
+ *
+ * @param areas 瀹炰綋瀵硅薄
+ */
+ void updateById(Areas areas);
+
+ /**
+ * 鎵归噺涓婚敭鏇存柊
+ *
+ * @param areass 瀹炰綋闆�
+ */
+ void updateByIdInBatch(List<Areas> areass);
+
+ /**
+ * 涓婚敭鏌ヨ
+ *
+ * @param id 涓婚敭
+ * @return Areas
+ */
+ Areas findById(Integer id);
+
+ /**
+ * 鏍规嵁id鍜宼ype鏌ヨ瀵硅薄淇℃伅
+ * @param id
+ * @param type null 鏌ヨ鍏ㄩ儴 0鐪佷唤 1鍩庡競 2鍖哄煙
+ * @return
+ */
+ Areas findById(Integer id,Integer type);
+
+
+ Areas findByName(String name,Integer type);
+ Areas findByNameAndParentId(String name,Integer type,Integer parentId);
+
+ List<Areas> findByParentId(Integer type,Integer parentId);
+
+ List<Areas> findChildByParentId(Integer id,List<Areas> list);
+
+ boolean isAreaValid(String proName,String cityName,String areaName);
+
+ /**
+ * 鏉′欢鏌ヨ鍗曟潯璁板綍
+ *
+ * @param areas 瀹炰綋瀵硅薄
+ * @return Areas
+ */
+ Areas findOne(Areas areas);
+
+ /**
+ * 鏉′欢鏌ヨ
+ *
+ * @param areas 瀹炰綋瀵硅薄
+ * @return List<Areas>
+ */
+ List<Areas> findList(Areas areas);
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param pageWrap 鍒嗛〉瀵硅薄
+ * @return PageData<Areas>
+ */
+ PageData<Areas> findPage(PageWrap<Areas> pageWrap);
+
+ /**
+ * 鏉′欢缁熻
+ *
+ * @param areas 瀹炰綋瀵硅薄
+ * @return long
+ */
+ long count(Areas areas);
+
+ void cacheData();
+
+ Areas findByCityAndArea(String cityName, String areasName);
+
+ String getAddress(Integer cityId,Integer areaId);
+
+ List<Areas> listByParentId(Areas model);
+}
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/AreasServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/AreasServiceImpl.java
new file mode 100644
index 0000000..1b2ed39
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/AreasServiceImpl.java
@@ -0,0 +1,458 @@
+package com.doumee.service.business.impl;
+
+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.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+import com.doumee.core.model.LoginUserInfo;
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.AreasMapper;
+import com.doumee.dao.business.model.Areas;
+import com.doumee.service.business.AreasService;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/**
+ * 鐪佸競鍖轰俊鎭〃Service瀹炵幇
+ * @author 姹熻箘韫�
+ * @date 2023/02/15 08:55
+ */
+@Service
+public class AreasServiceImpl implements AreasService {
+ public static List<Areas> ALL_AREA_LIST;
+ public static List<Areas> PROVINCE_LIST;
+ public static List<Areas> CITY_LIST;
+ public static List<Areas> AREA_LIST;
+ public static List<Areas> ALL_AREA_TREE;
+
+ @Autowired
+ private AreasMapper areasMapper;
+
+ @Override
+ public Integer create(Areas areas) {
+ LoginUserInfo user = areas.getLoginUserInfo();
+/*
+
+ if (Objects.isNull(areas.getParentId())){
+ areas.setType(Constants.ZERO);
+ }else {
+ Areas parentArea = areasMapper.selectById(areas.getParentId());
+ if (Objects.isNull(parentArea)){
+ areas.setType(Constants.ZERO);
+ }else {
+ areas.setType(parentArea.getType()+Constants.ONE);
+ }
+ }*/
+ areas.setCreateDate(new Date());
+ areas.setEditDate(new Date());
+ areas.setCreator(user.getId());
+ areas.setEditor(user.getId());
+ areas.setIsdeleted(Constants.ZERO);
+ areasMapper.insert(areas);
+ //鍒锋柊缂撳瓨鏁版嵁
+ cacheData();
+ return areas.getId();
+ }
+
+ @Override
+ public void deleteById(Integer id) {
+ areasMapper.deleteById(id);
+ //鍒锋柊缂撳瓨鏁版嵁
+ cacheData();
+ }
+
+ @Override
+ public void delete(Areas areas) {
+ UpdateWrapper<Areas> deleteWrapper = new UpdateWrapper<>(areas);
+ areasMapper.delete(deleteWrapper);
+ //鍒锋柊缂撳瓨鏁版嵁
+ cacheData();
+ }
+
+ @Override
+ public void deleteByIdInBatch(List<Integer> ids) {
+ if (CollectionUtils.isEmpty(ids)) {
+ return;
+ }
+ areasMapper.deleteBatchIds(ids);
+ //鍒锋柊缂撳瓨鏁版嵁
+ cacheData();
+ }
+
+ @Override
+ public void updateById(Areas areas) {
+
+ UpdateWrapper<Areas> wrapper = new UpdateWrapper<>();
+ wrapper.lambda().eq(Areas::getId,areas.getId());
+ Areas update = new Areas();
+ update.setName(areas.getName());
+ update.setSortnum(areas.getSortnum());
+ areasMapper.update(update,wrapper);
+ //鍒锋柊缂撳瓨鏁版嵁
+ cacheData();
+ }
+
+ @Override
+ public void updateByIdInBatch(List<Areas> areass) {
+ if (CollectionUtils.isEmpty(areass)) {
+ return;
+ }
+ for (Areas areas: areass) {
+ this.updateById(areas);
+ }
+ //鍒锋柊缂撳瓨鏁版嵁
+ cacheData();
+ }
+
+ @Override
+ public Areas findById(Integer id) {
+ if(ALL_AREA_LIST!=null){
+ for(Areas a : ALL_AREA_LIST){
+ if(Constants.equalsInteger(a.getId(),id)){
+ return a;
+ }
+ }
+ }
+ // return areasMapper.selectById(id);
+ return null;
+ }
+ @Override
+ public Areas findById(Integer id,Integer type) {
+ List<Areas> list = null;
+ if(type == null){
+ list = ALL_AREA_LIST;
+ }else if(Constants.equalsInteger(type,Constants.ZERO)){
+ list = PROVINCE_LIST;
+ }else if(Constants.equalsInteger(type,Constants.ONE)){
+ list = CITY_LIST;
+ } else if (Constants.equalsInteger(type,Constants.TWO)){
+ list = AREA_LIST;
+ }
+ if(list!=null){
+ for(Areas a : list){
+ if(Constants.equalsInteger(a.getId(),id)){
+ return a;
+ }
+ }
+ }
+ return null;
+ }
+
+
+ @Override
+ public Areas findByName(String name,Integer type){
+ List<Areas> list = null;
+ if(type == null){
+ list = ALL_AREA_LIST;
+ }else if(Constants.equalsInteger(type,Constants.ZERO)){
+ list = PROVINCE_LIST;
+ }else if(Constants.equalsInteger(type,Constants.ONE)){
+ list = CITY_LIST;
+ } else if (Constants.equalsInteger(type,Constants.TWO)){
+ list = AREA_LIST;
+ }
+ if(list!=null){
+ for(Areas a : list){
+ if(StringUtils.equals(name,a.getName())){
+ return a;
+ }
+ }
+ }
+ return null;
+ }
+ @Override
+ public Areas findByNameAndParentId(String name,Integer type,Integer parentId){
+ List<Areas> list = null;
+ if(type == null){
+ list = ALL_AREA_LIST;
+ }else if(Constants.equalsInteger(type,Constants.ZERO)){
+ list = PROVINCE_LIST;
+ }else if(Constants.equalsInteger(type,Constants.ONE)){
+ list = CITY_LIST;
+ } else if (Constants.equalsInteger(type,Constants.TWO)){
+ list = AREA_LIST;
+ }
+ if(list!=null){
+ for(Areas a : list){
+ if(StringUtils.equals(name,a.getName()) && Constants.equalsInteger(parentId,a.getParentId())){
+ return a;
+ }
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public List<Areas> findByParentId(Integer type, Integer parentId) {
+
+ List<Areas> list = null;
+ if(type == null){
+ list = ALL_AREA_LIST;
+ }else if(Constants.equalsInteger(type,Constants.ZERO)){
+ list = PROVINCE_LIST;
+ }else if(Constants.equalsInteger(type,Constants.ONE)){
+ list = CITY_LIST;
+ } else if (Constants.equalsInteger(type,Constants.TWO)){
+ list = AREA_LIST;
+ }
+ if(list!=null){
+ return list.stream().filter(s->Constants.equalsInteger(s.getParentId(),parentId)).collect(Collectors.toList());
+ }
+ return null;
+ }
+
+ @Override
+ public List<Areas> findChildByParentId(Integer id,List<Areas> list){
+ List<Areas> result =null;
+ if(list == null){
+ list = ALL_AREA_LIST;
+ }
+ if(list!=null && list.size()>0){
+ for(Areas model :list){
+ if(Constants.equalsInteger(id,model.getParentId())){
+ if(result == null){
+ result = new ArrayList<>();
+ }
+ result.add(model );
+ }
+ }
+ }
+ return result;
+ }
+
+ @Override
+ public boolean isAreaValid(String proName,String cityName,String areaName){
+ Areas pro = findByName(proName,Constants.ZERO);
+ if(pro == null){
+ return false;
+ }
+ Areas city = findByName(proName,Constants.ONE);
+ if(city == null && !Constants.equalsInteger(city.getParentId(),pro.getId())){
+ return false;
+ }
+ Areas area = findByName(proName,Constants.TWO);
+ if(area == null && !Constants.equalsInteger(area.getParentId(),city.getId())){
+ return false;
+ }
+ return false;
+ }
+ @Override
+ public Areas findOne(Areas areas) {
+ QueryWrapper<Areas> wrapper = new QueryWrapper<>(areas);
+ return areasMapper.selectOne(wrapper);
+ }
+
+ @Override
+ public List<Areas> findList(Areas areas) {
+ List<Areas> list = null;
+ Integer type =areas.getType();
+ if(type == null){
+ list = ALL_AREA_LIST;
+ }else if(Constants.equalsInteger(type,Constants.ZERO)){
+ list = PROVINCE_LIST;
+ }else if(Constants.equalsInteger(type,Constants.ONE)){
+ list = CITY_LIST;
+ } else if (Constants.equalsInteger(type,Constants.TWO)){
+ list = AREA_LIST;
+ }
+ List<Areas> result = null;
+ if(StringUtils.isNotBlank(areas.getName())){
+ for(Areas a : list){
+ if(StringUtils.contains(a.getName(),areas.getName())){
+ if(result == null){
+ result = new ArrayList<>();
+ }
+ result.add(a);
+ }
+ }
+ return result;
+ }
+ return list;
+ }
+
+ @Override
+ public List<Areas> listByParentId(Areas areas) {
+ List<Areas> list = null;
+ Integer type =areas.getType();
+ if(type == null){
+ list = ALL_AREA_LIST;
+ }else if(Constants.equalsInteger(type,Constants.ZERO)){
+ list = PROVINCE_LIST;
+ }else if(Constants.equalsInteger(type,Constants.ONE)){
+ list = CITY_LIST;
+ } else if (Constants.equalsInteger(type,Constants.TWO)){
+ list = AREA_LIST;
+ }
+ List<Areas> result = null;
+ if(list!=null){
+ for(Areas a : list){
+ if(result == null){
+ result = new ArrayList<>();
+ }
+ if( areas.getParentId() == null
+ ||(areas.getParentId() !=null) && Constants.equalsInteger(a.getParentId(),areas.getParentId())){
+ Areas t = new Areas();
+ BeanUtils.copyProperties(a,t);
+ t.setChildList(null);
+ result.add(t);
+ }
+ }
+ }
+ return result;
+ }
+ @Override
+ public void cacheData() {
+ Areas a = new Areas();
+ a.setIsdeleted(Constants.ZERO);
+ ALL_AREA_LIST = null;
+ PROVINCE_LIST =null;
+ CITY_LIST=null;
+ AREA_LIST = null;
+ ALL_AREA_TREE = null;
+ ALL_AREA_LIST = areasMapper.selectList(new QueryWrapper<>(a).lambda().orderByDesc(Areas::getSortnum));
+ if(ALL_AREA_LIST!=null){
+ for(Areas model : ALL_AREA_LIST){
+ if(Constants.equalsInteger(model.getType(),Constants.ZERO)){
+ if(PROVINCE_LIST == null){
+ PROVINCE_LIST = new ArrayList<>();
+ }
+ PROVINCE_LIST.add(model);
+ }else if(Constants.equalsInteger(model.getType(),Constants.ONE)){
+ if(CITY_LIST == null){
+ CITY_LIST = new ArrayList<>();
+ }
+ CITY_LIST.add(model);
+ if(model.getParentId() != null){
+ Areas p = findById(model.getParentId());
+ if(p!=null ){
+ model.setProvinceId(p.getId());
+ model.setProvinceName(p.getName());
+ }
+ }
+ }else if(Constants.equalsInteger(model.getType(),Constants.TWO)){
+ if(AREA_LIST == null){
+ AREA_LIST = new ArrayList<>();
+ }
+ AREA_LIST.add(model);
+ Areas city = findById(model.getParentId());
+ if(city!=null ){
+ model.setCityId(city.getId());
+ model.setCityName(city.getName());
+ if(city!=null && city.getParentId()!=null){
+ Areas p = findById(city.getParentId());
+ if(p!=null ){
+ model.setProvinceId(p.getId());
+ model.setProvinceName(p.getName());
+ }
+ }
+ }
+ }
+ }
+ }
+ if(CITY_LIST!=null){
+ for(Areas aa : CITY_LIST){
+ aa.setChildList(findChildByParentId(aa.getId(), AREA_LIST));
+ }
+ }
+ if(PROVINCE_LIST!=null){
+ for(Areas aa : PROVINCE_LIST){
+ aa.setChildList(findChildByParentId(aa.getId(),CITY_LIST));
+ }
+ }
+ System.out.println("=================");
+ }
+
+ @Override
+ public PageData<Areas> findPage(PageWrap<Areas> pageWrap) {
+ IPage<Areas> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ QueryWrapper<Areas> queryWrapper = new QueryWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ if (pageWrap.getModel().getId() != null) {
+ queryWrapper.lambda().eq(Areas::getId, pageWrap.getModel().getId());
+ }
+
+ if (pageWrap.getModel().getCreator() != null) {
+ queryWrapper.lambda().eq(Areas::getCreator, pageWrap.getModel().getCreator());
+ }
+ if (pageWrap.getModel().getCreateDate() != null) {
+ queryWrapper.lambda().ge(Areas::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+ queryWrapper.lambda().le(Areas::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ }
+ if (pageWrap.getModel().getEditor() != null) {
+ queryWrapper.lambda().eq(Areas::getEditor, pageWrap.getModel().getEditor());
+ }
+ if (pageWrap.getModel().getEditDate() != null) {
+ queryWrapper.lambda().ge(Areas::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+ queryWrapper.lambda().le(Areas::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+ }
+ if (pageWrap.getModel().getIsdeleted() != null) {
+ queryWrapper.lambda().eq(Areas::getIsdeleted, pageWrap.getModel().getIsdeleted());
+ }
+ if (pageWrap.getModel().getName() != null) {
+ queryWrapper.lambda().eq(Areas::getName, pageWrap.getModel().getName());
+ }
+ if (pageWrap.getModel().getInfo() != null) {
+ queryWrapper.lambda().eq(Areas::getInfo, pageWrap.getModel().getInfo());
+ }
+ if (pageWrap.getModel().getCode() != null) {
+ queryWrapper.lambda().eq(Areas::getCode, pageWrap.getModel().getCode());
+ }
+ if (pageWrap.getModel().getParentId() != null) {
+ queryWrapper.lambda().eq(Areas::getParentId, pageWrap.getModel().getParentId());
+ }
+ if (pageWrap.getModel().getType() != null) {
+ queryWrapper.lambda().eq(Areas::getType, pageWrap.getModel().getType());
+ }
+ for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+ if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
+ queryWrapper.orderByDesc(sortData.getProperty());
+ } else {
+ queryWrapper.orderByAsc(sortData.getProperty());
+ }
+ }
+ return PageData.from(areasMapper.selectPage(page, queryWrapper));
+ }
+
+ @Override
+ public long count(Areas areas) {
+ QueryWrapper<Areas> wrapper = new QueryWrapper<>(areas);
+ return areasMapper.selectCount(wrapper);
+ }
+
+ @Override
+ public Areas findByCityAndArea(String cityName, String areasName) {
+ Areas city = findByName(cityName,Constants.ONE);
+ if(city !=null){
+ return findByNameAndParentId(areasName,Constants.TWO,city.getId());
+ }
+ return null;
+ }
+
+ @Override
+ public String getAddress(Integer cityId,Integer areaId){
+ Areas cityAreas = findById(cityId, Constants.ONE);
+ Areas areas = findById(areaId, Constants.TWO);
+
+ String cityName = Optional.ofNullable(cityAreas)
+ .map(s -> s.getProvinceName() + s.getName())
+ .orElseThrow(() -> new BusinessException(ResponseStatus.BAD_REQUEST));
+ String areaName = Optional.ofNullable(areas).map(s -> s.getName()).orElse("");
+
+ return cityName+areaName;
+ }
+}
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);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
index 4d2465c..e8e6bbc 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
@@ -71,7 +71,6 @@
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
public Integer create(YwContract model) {
isParamValidCreated(model);
-
model.setCreator(model.getLoginUserInfo().getId());
model.setIsdeleted(Constants.ZERO);
model.setCreateDate(new Date());
@@ -79,12 +78,89 @@
model.setEditDate(model.getCreateDate());
model.setEditor(model.getCreator());
model.setStatus(Constants.ZERO);//寰呮墽琛�
+ model.setRemark(getRemarlByParam(model));
ywContractMapper.insert(model);
dealDetailListBiz(model);//澶勭悊鏉℃淇℃伅
dealMultifileBiz(model);//澶勭悊闄勪欢淇℃伅
dealLogBiz(model,Constants.YwLogType.CONTRACT_CREATE,null,null);//璁板綍鏂板缓鏃ュ織
return model.getId();
}
+
+ private String getRemarlByParam(YwContract model) {
+
+ String str = "";
+ YwContractDetail zl = model.getZlDetailList()!=null&&model.getZlDetailList().size()>0?model.getZlDetailList().get(0):null;
+ YwContractDetail yw = model.getWyDetailList()!=null&&model.getWyDetailList().size()>0?model.getWyDetailList().get(0):null;
+ //璧风鏃�2024/06/01锛岀璧佹暟涓�500銕°�傞鏈熺璧佷笁鏈堜竴浠橈紝绉熼噾鍗曚环35鍏�/銕÷锋湀銆傞鏈熺墿涓氫笁鏈堜竴浠橈紝鐗╀笟鍗曚环4.3鍏�/銕÷锋湀
+ String str0 = "鍚堝悓鎽樿锛氳捣绉熸棩{param1}锛岀璧佹暟涓簕param2}銕°�傞鏈熺璧亄param3}锛岀閲戝崟浠穥param4}鍏儃param5}銆傞鏈熺墿涓歿param6}锛岀墿涓氬崟浠穥param7}{param8}";
+ String str1 = "鍚堝悓鎽樿锛氳捣绉熸棩{param1}锛岀璧佹暟涓簕param2}銕°�傞鏈熺璧亄param3}锛岀閲戝崟浠穥param4}鍏儃param5}銆�";
+ String str2 = "鍚堝悓鎽樿锛氳捣绉熸棩{param1}锛岄鏈熺墿涓歿param6}锛岀墿涓氬崟浠穥param7}鍏儃param8}";
+ if(Constants.equalsInteger(model.getType(),Constants.ZERO)){
+ str= str0;
+ }
+ if(Constants.equalsInteger(model.getType(),Constants.ONE)){
+ str= str1;
+ }
+ if(Constants.equalsInteger(model.getType(),Constants.TWO)){
+ str= str2;
+ }
+ str = str.replace("{param1}",DateUtil.getDateLongSlash(model.getStartDate()))
+ .replace("{param2}",model.getTotalArea().intValue()+"")
+ .replace("{param3}",getPayTypeByNum(model.getZlPayType()))
+ .replace("{param4}",zl!=null&&zl.getPrice()!=null?(zl.getPrice().intValue()+""):"0")
+ .replace("{param5}",getPayTypeByNum(model.getWyPayType()))
+ .replace("{param6}",getUnitTypeByNum(zl))
+ .replace("{param7}",zl!=null&&yw.getPrice()!=null?(zl.getPrice().intValue()+""):"0")
+ .replace("{param8}",getUnitTypeByNum(yw));
+ return str;
+ }
+ private String getbackRentRemarkByParam(YwContract model) {
+ BigDecimal fee = Constants.formatBigdecimal(model.getBtFee());
+ String str = "閫�绉熸憳瑕侊細鍓╀綑鏈粨娓呰处鍗晎param1}浠斤紝鍏抽棴璐﹀崟{param2}浠姐�愰��绉熸棩{param3}锛岄��绉熻垂鐢ㄥ悎璁￠渶{param4}{param5}鍏冦�傘��";
+ str = str.replace("{param1}",model.getBtWaitBill()+"")
+ .replace("{param2}",DateUtil.getDateLongSlash(model.getBtDate()))
+ .replace("{param3}",fee.compareTo(new BigDecimal(0)) >=0?"鏀�":"浠�")
+ .replace("{param4}",(fee.compareTo(new BigDecimal(0)) >=0?
+ Constants.formatBigdecimal(model.getBtFee()).intValue()
+ :(Constants.formatBigdecimal(model.getBtFee()).intValue() * -1))+"" );
+ return str;
+ }
+
+ private CharSequence getUnitTypeByNum(YwContractDetail zl) {
+ if(zl==null){
+ return "";
+ }
+ // 浠樻鍛ㄦ湡绫诲瀷 0=鍏冩瘡骞崇背澶╋紱1=鍏冩瘡骞崇背鏈堬紱2=鍏冩瘡骞崇背骞达紱3=鍏冩瘡澶╋紱4=鍏冩瘡鏈堬紱5=鍏冩瘡骞达紱6=鍏冩瘡鍦猴紱
+ int zlPayType = Constants.formatIntegerNum(zl.getCircleType());
+ if(zlPayType == 1){
+ return "鍏�/銕÷锋湀";
+ }else if(zlPayType == 2){
+ return "鍏�/銕÷峰ぉ";
+ }else if(zlPayType == 3){
+ return "鍏�/澶�";
+ }else if(zlPayType == 4){
+ return "鍏�/鏈�";
+ }else if(zlPayType == 5){
+ return "鍏�/骞�";
+ }else if(zlPayType == 6){
+ return "鍏�/鍦�";
+ }
+ return "鍏�/銕÷峰ぉ";
+ }
+
+ private CharSequence getPayTypeByNum(Integer zlPayType) {
+ //绉熻祦鏀粯鏂瑰紡 0=涓�娆℃�т粯娆撅紱1=姣忎笁涓湀涓�浠橈紱2=鍏釜鏈堜竴浠橈紱3=涓�骞翠竴浠�
+ if(zlPayType == 1){
+ return "3涓湀涓�浠�";
+ }else if(zlPayType == 2){
+ return "6涓湀涓�浠�";
+ }else if(zlPayType == 3){
+ return "1骞翠竴浠�";
+ }
+ return "涓�娆℃�т粯娆�";
+ }
+
+
/**
* 閫�绉熸彁浜�
* @param param
@@ -94,6 +170,8 @@
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
public Integer backRent(YwContract param){
isParamValidBackRent(param);
+ param.setEditDate(new Date());
+ param.setEditor(param.getLoginUserInfo().getId());
//澶勭悊
dealBackRentBillBiz(param);
YwContract update = new YwContract();
@@ -107,12 +185,152 @@
update.setBtType(param.getBtType());
update.setBtUserId(param.getBtUserId());
update.setBtFee(param.getBtFee());
+ update.setBtRemark(getbackRentRemarkByParam(param));
ywContractMapper.updateById(update);
dealLogBiz(param,Constants.YwLogType.CONTRACT_BACK,null,null);
return param.getId();
}
private void dealBackRentBillBiz(YwContract param) {
+ //鏌ヨ鍚堝悓鍏ㄩ儴璐﹀崟淇℃伅
+ List<YwContractBill> closeBills = new ArrayList<>();//甯﹀叧闂�
+ List<YwContractBill> newBills = new ArrayList<>();//鏂扮殑璐﹀崟
+ List<YwContractBill> noBills = new ArrayList<>();//涓嶉渶瑕佺粨绠楃殑璐﹀崟
+ List<YwContractBill> yjBills = new ArrayList<>();//鎶奸噾璐﹀崟
+ List<YwContractBill> canBills = new ArrayList<>();//鍙��绉熶慨鏀规暟鎹�
+ List<YwContractBill> allBills = ywContractBillMapper.selectList(new QueryWrapper<YwContractBill>().
+ select("*," +
+ "( select ifnull(sum(yw.ACT_RECEIVABLE_FEE),0) from yw_contract_revenue yw where yw.bill_id = yw_contract_bill.id and yw.status = 0 and yw.isdeleted = 0 ) as actReceivableFee " )
+ .lambda().
+ eq(YwContractBill::getIsdeleted,Constants.ZERO)
+ .eq(YwContractBill::getContractId,param.getId()));
+ if(allBills!=null && allBills.size()>0){
+ for(YwContractBill bill: allBills){
+ //浠樻鐘舵�侊細0=寰呮敹娆撅紱1=宸茬粨娓咃紱2=閮ㄥ垎缁撴竻锛�3=寰呬粯娆撅紱4=寰呴��娆撅紱5=宸插叧闂�
+ // 濡傛灉鏄娂閲戞垨鑰呬繚璇侀噾锛屼笉鏀寔閫�娆撅紝淇濇寔鍘熸潵鐨勭姸鎬侊紝 0=绉熻祦璐癸紱1=鐗╀笟璐癸紱2=绉熻祦鎶奸噾锛�3=鐗╀笟鎶奸噾锛�4=姘寸數璐癸紱5=鏉傞」璐癸紱6=鍏朵粬;7=淇濊瘉閲�
+ if(Constants.equalsInteger(Constants.THREE,bill.getCostType())
+ || Constants.equalsInteger(Constants.FOUR,bill.getCostType())
+ ||Constants.equalsInteger(Constants.SEVEN,bill.getCostType())){
+ //鎶奸噾鍜屼繚璇侀噾
+ yjBills.add(bill);
+ continue;
+ }
+ if(Constants.equalsInteger(bill.getPayStatus(),Constants.ZERO)
+ ||Constants.equalsInteger(bill.getPayStatus(),Constants.THREE)){
+ if(bill.getStartDate().getTime()>param.getEditDate().getTime()){
+ //濡傛灉杩樻病寮�濮嬶紝璐﹀崟鐩存帴鍏抽棴
+ closeBills.add(bill);
+ noBills.add(bill);
+ }else{
+ canBills.add(bill);
+ }
+ }else if(Constants.equalsInteger(bill.getPayStatus(),Constants.ONE) ){
+ if(bill.getEndDate().getTime()<param.getEditDate().getTime()){
+ //濡傛灉宸茬粨娓咃紝璐﹀崟鐩存帴鍏抽棴
+ noBills.add(bill);
+ }else{
+ canBills.add(bill);
+ }
+ }else if(Constants.equalsInteger(bill.getPayStatus(),Constants.TWO) ){
+ canBills.add(bill);
+ }
+ }
+ }
+ if(closeBills.size()>0){
+ //鐩存帴鍏抽棴鍏抽棴璐﹀崟
+ for(YwContractBill b : closeBills){
+ b.setStatus(Constants.ONE);
+ b.setEditDate(param.getEditDate());
+ b.setEditor(param.getEditor());
+ //鍏抽棴璁㈠崟
+ ywContractBillMapper.updateById(b);
+ }
+ }
+ int yjNoBills =0;
+ if(yjBills.size()>0){
+ // 濡傛灉鏄娂閲戞垨鑰呬繚璇侀噾锛屼笉鏀寔閫�娆撅紝淇濇寔鍘熸潵鐨勭姸鎬侊紝 0=绉熻祦璐癸紱1=鐗╀笟璐癸紱2=绉熻祦鎶奸噾锛�3=鐗╀笟鎶奸噾锛�4=姘寸數璐癸紱5=鏉傞」璐癸紱6=鍏朵粬;7=淇濊瘉閲�
+ for(YwContractBill bill : yjBills){
+ if(!Constants.equalsInteger(bill.getPayStatus(),Constants.ONE) ){
+ //濡傛灉鏄湭缁撴竻鎶奸噾
+ yjNoBills ++;
+ }
+ }
+ }
+ BigDecimal totalBackFee = new BigDecimal(0);
+ if(canBills.size()>0){
+ //鐩存帴鍏抽棴鍏抽棴璐﹀崟
+ for(YwContractBill b : canBills){
+ BigDecimal fee = new BigDecimal(0);
+ YwContractBill editBill = getEditBillFromListByParam(b,param.getCanBackRentBills());
+ if(editBill != null){
+ //浠樻鐘舵�侊細0=寰呮敹娆撅紱1=宸茬粨娓咃紱2=閮ㄥ垎缁撴竻锛�3=寰呬粯娆撅紱4=寰呴��娆撅紱5=宸插叧闂�
+ //濡傛灉璐﹀崟淇℃伅鍋氫簡缂栬緫锛岄噾棰濊绠� 瀹炴敹閲戦 鍜� 淇敼鍚庡簲鏀堕噾棰濅綔瀵规瘮锛屽垽鏂槸鍚﹀簲璇ラ��娆�
+ fee = Constants.formatBigdecimal(b.getActReceivableFee()).subtract(editBill.getReceivableFee());
+ if(fee.compareTo(new BigDecimal(0))== 0){
+ //濡傛灉璐圭敤姝ｅソ锛屽垯淇敼璐﹀崟淇℃伅涓哄凡缁撴竻
+ b.setStatus(Constants.ONE);
+ }else if(fee.compareTo(new BigDecimal(0))> 0){
+ //濡傛灉闇�瑕佽繘琛岄��娆撅紝鏇存柊璐﹀崟淇℃伅涓哄緟閫�娆�
+ b.setStatus(Constants.FOUR);
+ }else if(fee.compareTo(new BigDecimal(0)) < 0){
+ //濡傛灉璐﹀崟杩樻湁娆惧緟鏀讹紝鍒欎繚鎸佺姸鎬佷笉鍙�
+ }
+ }
+ b.setEditDate(param.getEditDate());
+ b.setEditor(param.getEditor());
+ b.setBtActDate(param.getBtActDate());
+ b.setBtDate(param.getBtDate());
+ b.setBtFee(fee);
+ b.setBtInfo(param.getBtInfo());
+ b.setBtUserId(param.getBtUserId());
+ b.setBtSignDate(param.getBtSignDate());
+ b.setBtType(param.getBtType());
+ //鍏抽棴璁㈠崟
+ ywContractBillMapper.updateById(b);
+ totalBackFee = totalBackFee.add(fee);//绱閫�娆鹃噾棰�
+ }
+ }
+ if(param.getAddBillList()!=null && param.getAddBillList().size()>0){
+ for(YwContractBill addBill : param.getAddBillList()){
+ addBill.setIsdeleted(Constants.ZERO);
+ addBill.setContractId(param.getId());
+ addBill.setType(Constants.ONE);
+ addBill.setStatus(Constants.ZERO);
+ if(Constants.equalsInteger(addBill.getBillType(),Constants.ZERO)){
+ //濡傛灉鏄敹娆�
+ totalBackFee = totalBackFee.add(Constants.formatBigdecimal(addBill.getActReceivableFee()));
+ addBill.setPayStatus(Constants.ZERO);
+ addBill.setBtFee(Constants.formatBigdecimal(addBill.getActReceivableFee()));
+ }else{
+ //濡傛灉鏄粯娆�
+ addBill.setPayStatus(Constants.THREE);
+ addBill.setBtFee(Constants.formatBigdecimal(addBill.getActReceivableFee()).multiply(new BigDecimal(-1)));
+ }
+ totalBackFee = totalBackFee.add(Constants.formatBigdecimal(addBill.getBtFee()));
+ addBill.setEditDate(param.getEditDate());
+ addBill.setEditor(param.getEditor());
+ addBill.setBtActDate(param.getBtActDate());
+ addBill.setBtDate(param.getBtDate());
+ addBill.setBtInfo(param.getBtInfo());
+ addBill.setBtUserId(param.getBtUserId());
+ addBill.setBtSignDate(param.getBtSignDate());
+ addBill.setBtType(param.getBtType());
+ newBills.add(addBill);
+ }
+ ywContractBillMapper.insert(param.getAddBillList());//鎵归噺鎻掑叆鏁版嵁
+ }
+ param.setBtWaitBill(canBills.size() + newBills.size()+yjNoBills);//鏈竻绠楃殑璐﹀崟鏁伴噺
+ param.setBtCLoseBill(closeBills.size());
+ param.setBtFee(totalBackFee);
+ }
+
+ private YwContractBill getEditBillFromListByParam(YwContractBill b, List<YwContractBill> canBackRentBills) {
+ for(YwContractBill d : canBackRentBills){
+ if(Constants.equalsInteger(b.getId(),d.getId())){
+ return d;
+ }
+ }
+ return null;
}
private void isParamValidBackRent(YwContract param) {
@@ -138,11 +356,14 @@
if(bill.getCostType() == null
||bill.getFeeType() == null
||bill.getReceivableFee() == null
+ ||bill.getReceivableFee().compareTo(new BigDecimal(0)) < 1
||bill.getCompanyId() == null
||bill.getPlanPayDate() == null
- ||(Constants.equalsInteger(bill.getFeeType(),Constants.ZERO)
+ ||bill.getBillType() == null
+ ||(Constants.equalsInteger(bill.getBillType(),Constants.ZERO)
+ &&Constants.equalsInteger(bill.getFeeType(),Constants.ZERO)
&& (bill.getStartDate() ==null || bill.getEndDate() ==null) )){
-
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇锋寜瑕佹眰濉啓鑷缓璐﹀崟淇℃伅锛�");
}
}
}
@@ -626,6 +847,10 @@
if(rooms.size() != rooms.size()){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝瀛樺湪鏃犳晥鐨勬埧婧愪俊鎭紒");
}
+ model.setTotalArea(new BigDecimal(0));
+ for(YwRoom r : rooms){
+ model.setTotalArea(model.getTotalArea().add(Constants.formatBigdecimal(r.getArea())));
+ }
YwCustomer customer = customerMapper.selectById(model.getRenterId());
if(customer ==null || Constants.equalsInteger(customer.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝閫夋嫨绉熷淇℃伅涓嶅瓨鍦紝璇疯繑鍥炲埛鏂伴噸璇曪紒");
@@ -762,6 +987,32 @@
.eq( YwContractBill::getContractId,model.getId())
.eq(YwContractBill::getIsdeleted,Constants.ZERO)
.orderByAsc(YwContractBill::getSortnum,YwContractBill::getCreateDate)));
+ model.setCanBackRentBills(new ArrayList<>());
+ long nowStart = Utils.Date.getStart(new Date()).getTime();
+ long nowEnd = Utils.Date.getEnd(new Date()).getTime();
+ if(model.getBillList()!=null && model.getBillList().size()>0){
+ for(YwContractBill bill: model.getBillList()){
+ //浠樻鐘舵�侊細0=寰呮敹娆撅紱1=宸茬粨娓咃紱2=閮ㄥ垎缁撴竻锛�3=寰呬粯娆撅紱4=寰呴��娆撅紱5=宸插叧闂�
+ if(Constants.equalsInteger(bill.getPayStatus(),Constants.ZERO)
+ ||Constants.equalsInteger(bill.getPayStatus(),Constants.THREE)){
+ if(bill.getStartDate().getTime()>nowEnd){
+ //濡傛灉杩樻病寮�濮嬶紝璐﹀崟鐩存帴鍏抽棴
+ continue;
+ }
+ model.getCanBackRentBills().add(bill);
+
+ }else if(Constants.equalsInteger(bill.getPayStatus(),Constants.ONE) ){
+ if(bill.getEndDate().getTime()<nowStart){
+ //濡傛灉宸茬粨娓咃紝璐﹀崟鐩存帴鍏抽棴
+ continue;
+ }
+ model.getCanBackRentBills().add(bill);
+ }else if(Constants.equalsInteger(bill.getPayStatus(),Constants.TWO) ){
+ model.getCanBackRentBills().add(bill);
+ }
+ }
+ }
+
}
return model;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java
index f4c95e9..6c1d69a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java
@@ -79,11 +79,12 @@
if(StringUtils.isBlank(multifile.getFileurl())){
continue;
}
- multifile.setCreateDate(new Date());
+ multifile.setCreateDate(model.getCreateDate());
+ multifile.setEditDate(model.getCreateDate());
multifile.setCreator(model.getEditor());
multifile.setIsdeleted(Constants.ZERO);
multifile.setObjId(model.getId());
- multifile.setCreator(model.getCreator());
+ multifile.setEditor(model.getCreator());
multifile.setObjType(Constants.MultiFile.YW_WORKORDER_PROBLEM.getKey());
multifile.setSortnum(i+1);
fileList.add(multifile);
@@ -169,7 +170,9 @@
if(model ==null || Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝宸ュ崟淇℃伅涓嶅瓨鍦紒");
}
- if(!Constants.equalsInteger(model.getDealStatus(),Constants.ZERO) && !Constants.equalsInteger(model.getDealStatus(),Constants.ONE)){
+ if(!Constants.equalsInteger(model.getDealStatus(),Constants.ZERO)
+// && !Constants.equalsInteger(model.getDealStatus(),Constants.ONE)
+ ){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝宸ュ崟鐘舵�佸凡娴佽浆锛屼笉鏀寔褰撳墠鎿嶄綔锛�");
}
@@ -200,10 +203,10 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝宸ュ崟鐘舵�佸凡娴佽浆锛屼笉鏀寔褰撳墠鎿嶄綔锛�");
}
- SystemUser user = systemUserMapper.selectById(ywWorkorder.getDealUserId());
- if(user ==null || (user.getDeleted()!=null&& user.getDeleted() )){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅涓嶅瓨鍦紒");
- }
+// SystemUser user = systemUserMapper.selectById(ywWorkorder.getDealUserId());
+// if(user ==null || (user.getDeleted()!=null&& user.getDeleted() )){
+// throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅涓嶅瓨鍦紒");
+// }
YwWorkorder update = new YwWorkorder();
update.setId(model.getId());
update.setEditDate(new Date());
@@ -211,8 +214,30 @@
update.setDealStatus(Constants.TWO);
update.setDealUserId(update.getEditor());
update.setDealDate(update.getEditDate());
- update.setDealInfo(ywWorkorder.getDispatchInfo());
+ update.setDealInfo(ywWorkorder.getDealInfo());
ywWorkorderMapper.updateById(update);
+
+ List<Multifile> fileList = new ArrayList<>();
+ if(ywWorkorder.getDealFileList()!=null && ywWorkorder.getDealFileList().size()>0){
+ for (int i = 0; i < ywWorkorder.getDealFileList().size(); i++) {
+ Multifile multifile = ywWorkorder.getDealFileList().get(i);
+ if(StringUtils.isBlank(multifile.getFileurl())){
+ continue;
+ }
+ multifile.setCreateDate(update.getEditDate());
+ multifile.setCreator(update.getEditor());
+ multifile.setEditDate(update.getEditDate());
+ multifile.setIsdeleted(Constants.ZERO);
+ multifile.setObjId(model.getId());
+ multifile.setEditor(update.getEditor());
+ multifile.setObjType(Constants.MultiFile.YW_WORKORDER_DEAL.getKey());
+ multifile.setSortnum(i+1);
+ fileList.add(multifile);
+ }
+ }
+ if(fileList.size()>0){
+ multifileMapper.insert(fileList);
+ }
dealLogBiz(model,Constants.YwLogType.WORKORDER_DEAL,ywWorkorder.getLoginUserInfo().getRealname(),null);//璁板綍鏂板缓鏃ュ織
}
@Override
--
Gitblit v1.9.3