From a09708582ca65d621d14a8c6a3a22222dd7db0d9 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 13 一月 2025 09:27:47 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 46 +
admin/src/views/stock/check.vue | 9
admin/src/views/stock/in.vue | 42
admin/src/views/statistics/platformRecord.vue | 4
admin/src/views/finance/payments.vue | 13
admin/src/views/stock/components/InEdit.vue | 138 +++
admin/src/views/statistics/platformStatic.vue | 1
admin/src/views/system/smsMessage.vue | 7
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/SmsEmailService.java | 6
admin/src/views/finance/account.vue | 12
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractBillCloudController.java | 19
admin/src/views/stock/components/AssetSel.vue | 125 +++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwTempConfigServiceImpl.java | 191 +++++
admin/src/views/operation/device.vue | 4
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java | 34
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/EmailService.java | 47 +
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/YwTempConfigMapper.java | 13
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/YwCallTempDataVO.java | 39 +
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/dto/YwSmsEmailBillCallDTO.java | 28
server/visits/dmvisit_service/src/main/java/com/doumee/core/excel/ExcelReplaceCommon.java | 90 ++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java | 49 +
admin/src/views/stock/components/InDetail.vue | 164 ++++
server/db/business.yw_temp_config.permissions.sql | 6
/dev/null | 71 -
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwTempConfig.java | 68 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractBillService.java | 17
admin/src/views/finance/company.vue | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwTempConfigService.java | 101 ++
admin/src/views/stock/components/OutEdit.vue | 138 +++
admin/src/views/system/publicMsg.vue | 1
admin/src/views/stock/out.vue | 42
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractBillServiceImpl.java | 391 ++++++++++
admin/src/views/stock/assetList.vue | 1
admin/src/views/stock/record.vue | 1
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/YwContractBillCallDataVO.java | 33
admin/src/views/stock/asset.vue | 9
admin/src/views/stock/query.vue | 3
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwTempConfigCloudController.java | 103 ++
admin/src/views/stock/components/OutDetail.vue | 164 ++++
39 files changed, 2,113 insertions(+), 121 deletions(-)
diff --git a/admin/src/views/finance/account.vue b/admin/src/views/finance/account.vue
index 1d60573..d8b6ae1 100644
--- a/admin/src/views/finance/account.vue
+++ b/admin/src/views/finance/account.vue
@@ -9,7 +9,7 @@
<el-table-column prop="title" label="鏀舵敮鏉＄洰" min-width="100" show-overflow-tooltip />
<el-table-column prop="companyName" label="鏀舵鍏徃" min-width="100" show-overflow-tooltip />
<el-table-column label="璐︽埛绫诲瀷" min-width="100" show-overflow-tooltip>
- <template v-slot="{row}">
+ <template v-slot="{ row }">
<span v-if="row.type == 0">瀵瑰叕</span>
<span v-if="row.type == 1">涓汉</span>
</template>
@@ -19,7 +19,8 @@
<el-table-column prop="bankNo" label="閾惰璐﹀彿" min-width="100" show-overflow-tooltip />
<el-table-column prop="status" label="鐘舵��" min-width="100" show-overflow-tooltip>
<template v-slot="scope">
- <el-switch v-model="scope.row.status" @change="e =>changeStatus(scope.row)" :active-value="0" :inactive-value="1">
+ <el-switch v-model="scope.row.status" @change="e => changeStatus(scope.row)" :active-value="0"
+ :inactive-value="1">
</el-switch>
</template>
</el-table-column>
@@ -117,13 +118,13 @@
this.getList()
})
},
- getCompany(){
+ getCompany() {
companyGetList({
- model: {type: 2},
+ model: { type: 2 },
capacity: 9999,
page: 1
}).then(res => {
- this.queryFormConfig.formItems[1].options = res.records || []
+ this.queryFormConfig.formItems[1].options = res.records || []
})
},
handleEdit(row) {
@@ -156,6 +157,7 @@
},
handleSizeChange(capacity) {
this.pagination.pageSize = capacity
+ this.getList()
}
}
}
diff --git a/admin/src/views/finance/company.vue b/admin/src/views/finance/company.vue
index 5f2b7ee..d8f5aed 100644
--- a/admin/src/views/finance/company.vue
+++ b/admin/src/views/finance/company.vue
@@ -13,7 +13,8 @@
<el-table-column prop="accountNum" label="鏀舵敮璐︽埛鏁伴噺" min-width="100" show-overflow-tooltip />
<el-table-column prop="status" label="鐘舵��" min-width="100" show-overflow-tooltip>
<template v-slot="scope">
- <el-switch v-model="scope.row.status" @change="e => changeStatus(scope.row)" :active-value="0" :inactive-value="1">
+ <el-switch v-model="scope.row.status" @change="e => changeStatus(scope.row)" :active-value="0"
+ :inactive-value="1">
</el-switch>
</template>
</el-table-column>
@@ -132,6 +133,7 @@
},
handleSizeChange(capacity) {
this.pagination.pageSize = capacity
+ this.getList()
}
}
}
diff --git a/admin/src/views/finance/payments.vue b/admin/src/views/finance/payments.vue
index 212bc99..2be18ee 100644
--- a/admin/src/views/finance/payments.vue
+++ b/admin/src/views/finance/payments.vue
@@ -2,7 +2,7 @@
<div class="main_app">
<QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear" />
<div class="mt20">
-<!-- <el-button v-permissions="['business:ywpatrolline:create']">瀵煎嚭</el-button>-->
+ <!-- <el-button v-permissions="['business:ywpatrolline:create']">瀵煎嚭</el-button>-->
</div>
<el-table v-loading="loading" :data="list" stripe>
<el-table-column prop="customerName" label="瀹㈡埛鍚嶇О" min-width="100" show-overflow-tooltip />
@@ -10,7 +10,7 @@
<el-table-column label="鎴垮彿" min-width="100" show-overflow-tooltip>
<template slot-scope="{row}">
<div style="display: flex; flex-direction: column;" v-if="row.roomPathName">
- <span v-for="(item, index) in row.roomPathName.split(';')" :key="index">{{item}}</span>
+ <span v-for="(item, index) in row.roomPathName.split(';')" :key="index">{{ item }}</span>
</div>
</template>
</el-table-column>
@@ -123,7 +123,7 @@
this.getList()
},
methods: {
- isShow (status, contractStatus) {
+ isShow(status, contractStatus) {
if (status === 1) return false
if (contractStatus === '3' || contractStatus === '4') return false
return true
@@ -150,7 +150,7 @@
this.loading = false
})
},
- closeDW (id) {
+ closeDW(id) {
this.$confirm('纭鍏抽棴姝ゆ祦姘村悧?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -161,8 +161,8 @@
this.getList()
})
}).catch(() => {
-
- });
+
+ })
},
handleDel(row) {
let message = `纭鍒犻櫎璇ヨ褰曞悧?`
@@ -185,6 +185,7 @@
},
handleSizeChange(capacity) {
this.pagination.pageSize = capacity
+ this.getList()
}
}
}
diff --git a/admin/src/views/operation/device.vue b/admin/src/views/operation/device.vue
index 9025984..770219c 100644
--- a/admin/src/views/operation/device.vue
+++ b/admin/src/views/operation/device.vue
@@ -21,7 +21,8 @@
</el-table-column>
<el-table-column label="鎿嶄綔" min-width="130" fixed="right">
<template slot-scope="{row}">
- <el-button type="text" @click="handleDetail(row)" v-permissions="['business:category:update']">鏌ョ湅璇︽儏</el-button>
+ <el-button type="text" @click="handleDetail(row)"
+ v-permissions="['business:category:update']">鏌ョ湅璇︽儏</el-button>
<el-button type="text" @click="handleEdit(row)" icon="el-icon-edit"
v-permissions="['business:category:update']">缂栬緫</el-button>
<el-button type="text" @click="handleDel(row)" icon="el-icon-delete"
@@ -146,6 +147,7 @@
},
handleSizeChange(capacity) {
this.pagination.pageSize = capacity
+ this.getList()
}
}
}
diff --git a/admin/src/views/statistics/platformRecord.vue b/admin/src/views/statistics/platformRecord.vue
index 49f98e1..5659e49 100644
--- a/admin/src/views/statistics/platformRecord.vue
+++ b/admin/src/views/statistics/platformRecord.vue
@@ -9,8 +9,7 @@
<el-table-column prop="param1" label="浣滀笟寮�濮�" min-width="100" show-overflow-tooltip />
<el-table-column prop="param2" label="浣滀笟缁撴潫" min-width="100" show-overflow-tooltip />
<el-table-column prop="workTime" label="浣滀笟鏃堕暱" min-width="100" show-overflow-tooltip />
- <el-table-column prop="name"
- label="杩愯緭鍗曞彿/鍚堝悓鍙�" min-width="100" show-overflow-tooltip>
+ <el-table-column prop="name" label="杩愯緭鍗曞彿/鍚堝悓鍙�" min-width="100" show-overflow-tooltip>
<template v-slot="scope">
<span>{{ scope.row.billCode || scope.row.contractNum }}</span>
</template>
@@ -131,6 +130,7 @@
},
handleSizeChange(capacity) {
this.pagination.pageSize = capacity
+ this.getList()
}
}
}
diff --git a/admin/src/views/statistics/platformStatic.vue b/admin/src/views/statistics/platformStatic.vue
index 6bec585..520748a 100644
--- a/admin/src/views/statistics/platformStatic.vue
+++ b/admin/src/views/statistics/platformStatic.vue
@@ -130,6 +130,7 @@
},
handleSizeChange(capacity) {
this.pagination.pageSize = capacity
+ this.getList()
}
}
}
diff --git a/admin/src/views/stock/asset.vue b/admin/src/views/stock/asset.vue
index 3699330..d3880e6 100644
--- a/admin/src/views/stock/asset.vue
+++ b/admin/src/views/stock/asset.vue
@@ -12,7 +12,7 @@
<el-table-column prop="param1" label="澶囨敞" min-width="120" show-overflow-tooltip />
<el-table-column prop="param2" label="鐘舵��" min-width="90" show-overflow-tooltip />
<el-table-column prop="workTime" label="鎿嶄綔" min-width="100" show-overflow-tooltip>
- <template v-slot="{row}">
+ <template v-slot="{ row }">
<span class="primaryColor pointer">鏌ョ湅璇︽儏</span>
<span class="red pointer">鍒犻櫎</span>
</template>
@@ -52,7 +52,7 @@
total: 0,
queryFormConfig: {
formItems: [
- {
+ {
filed: 'carCodeFront',
type: 'input',
label: '浠撳簱鍚嶇О',
@@ -126,11 +126,10 @@
},
handleSizeChange(capacity) {
this.pagination.pageSize = capacity
+ this.getList()
}
}
}
</script>
-<style>
-
-</style>
+<style></style>
diff --git a/admin/src/views/stock/assetList.vue b/admin/src/views/stock/assetList.vue
index 565b04a..b3b5894 100644
--- a/admin/src/views/stock/assetList.vue
+++ b/admin/src/views/stock/assetList.vue
@@ -137,6 +137,7 @@
},
handleSizeChange(capacity) {
this.pagination.pageSize = capacity
+ this.getList()
}
}
}
diff --git a/admin/src/views/stock/check.vue b/admin/src/views/stock/check.vue
index 86c05ec..eaebf2d 100644
--- a/admin/src/views/stock/check.vue
+++ b/admin/src/views/stock/check.vue
@@ -13,7 +13,7 @@
<el-table-column prop="param2" label="鍒涘缓鏃堕棿" min-width="140" show-overflow-tooltip />
<el-table-column prop="workTime" label="鐩樼偣鐘舵��" min-width="80" show-overflow-tooltip />
<el-table-column prop="workTime" label="鎿嶄綔" min-width="140" show-overflow-tooltip>
- <template v-slot="{row}">
+ <template v-slot="{ row }">
<span class="primaryColor pointer">鏌ョ湅璇︽儏</span>
<span class="primaryColor pointer">鍙栨秷</span>
<span class="primaryColor pointer">鍒犻櫎</span>
@@ -51,7 +51,7 @@
total: 0,
queryFormConfig: {
formItems: [
- {
+ {
filed: 'carCodeFront',
type: 'input',
label: '鐩樼偣鍗�',
@@ -125,11 +125,10 @@
},
handleSizeChange(capacity) {
this.pagination.pageSize = capacity
+ this.getList()
}
}
}
</script>
-<style>
-
-</style>
+<style></style>
diff --git a/admin/src/views/stock/components/AssetSel.vue b/admin/src/views/stock/components/AssetSel.vue
new file mode 100644
index 0000000..afbbb23
--- /dev/null
+++ b/admin/src/views/stock/components/AssetSel.vue
@@ -0,0 +1,125 @@
+<template>
+ <GlobalWindow title="閫夋嫨鐗╂枡" :visible.sync="isShowModal" :confirm-working="isLoading" width="900px" @close="close"
+ @confirm="confirm">
+ <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
+ <el-form-item prop="areaType" label="鐗╂枡淇℃伅">
+ <el-input v-model="searchForm.aaa" placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�/鍚嶇О" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item prop="areaIds" label="鐗╂枡鍒嗙被">
+ <el-cascader v-model="searchForm.areaIds" @change="changeSel" placeholder="璇烽�夋嫨鐗╂枡鍒嗙被" clearable
+ :options="cateList" :props="{
+ label: 'name',
+ value: 'id',
+ children: 'childCategoryList'
+ }"></el-cascader>
+ </el-form-item>
+ <span>
+ <el-button type="primary" @click="getList">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ </span>
+ </el-form>
+ <!-- -->
+ <el-table @selection-change="handleSelectionChange" :data="list" stripe>
+ <el-table-column type="selection" width="55" />
+ <el-table-column prop="categoryName" label="鐗╂枡缂栫爜" min-width="100px"></el-table-column>
+ <el-table-column prop="creatorName" label="鐗╂枡鍚嶇О" min-width="80px"></el-table-column>
+ <el-table-column prop="createDate" label="鏉＄爜" min-width="100px"></el-table-column>
+ <el-table-column prop="dealUserName" label="鍝佺墝" min-width="80px"></el-table-column>
+ <el-table-column prop="dealUserName" label="瑙勬牸鍨嬪彿" min-width="80px"></el-table-column>
+ <el-table-column prop="dealUserName" label="鍗曚綅" min-width="80px"></el-table-column>
+ <el-table-column prop="dealUserName" label="搴撳瓨" min-width="80px"></el-table-column>
+ </el-table>
+ <Pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination">
+ </Pagination>
+ </GlobalWindow>
+</template>
+
+<script>
+import BaseOpera from '@/components/base/BaseOpera'
+import GlobalWindow from '@/components/common/GlobalWindow'
+import Pagination from '@/components/common/Pagination'
+import { fetchList as getCateList } from '@/api/business/category.js'
+export default {
+ name: 'OperaCategoryWindow',
+ components: { GlobalWindow, Pagination },
+ data() {
+ return {
+ // 琛ㄥ崟鏁版嵁
+ searchForm: {},
+ pagination: {
+ pageSize: 10,
+ page: 1,
+ total: 0
+ },
+ list: [],
+ selList: [],
+ cateList: [],
+ isShowModal: false,
+ isLoading: false,
+ // 楠岃瘉瑙勫垯
+ rules: {
+ name: [{ required: true, message: '璇疯緭鍏ヤ簩绾у垎绫诲悕绉�', trigger: 'blur' }],
+ },
+ dataList: []
+ }
+ },
+ created() {
+ this.initData()
+ },
+ methods: {
+ confirm() {
+ this.$emit('change', this.selList)
+ this.close()
+ },
+ handleSelectionChange(val) {
+ this.selList = val
+ },
+ getList(page) {
+ const { pagination, searchForm } = this
+ this.listLoading = true
+ if(page){pagination.page = page}
+ fetchList({
+ capacity: pagination.pageSize,
+ page: pagination.page,
+ model: {...searchForm}
+ }).then((res) => {
+ this.listLoading = false
+ this.list = res.records
+ this.pagination.total = res.total || 0
+ }, () => {
+ this.listLoading = false
+ })
+ },
+ initData() {
+ getCateList({
+ model: { type: 3 },
+ capacity: 1000,
+ page: 1,
+ }).then(res => {
+ this.cateList = res.records || []
+ })
+ },
+ changeSel(e) {
+ if (e && e.length == 2) {
+ this.$set(this.searchForm, 'cateId', e[1])
+ } else {
+ this.$set(this.searchForm, 'cateId', '')
+ }
+ },
+ reset() {
+ this.searchForm = {}
+ this.pagination.pageSize = 10
+ this.pagination.page = 1
+ this.getList()
+ },
+ handleSizeChange(capacity) {
+ this.pagination.pageSize = capacity
+ this.getList()
+ },
+ close() {
+ this.isShowModal = false
+ this.$emit('close')
+ },
+ }
+}
+</script>
diff --git a/admin/src/views/stock/components/InDetail.vue b/admin/src/views/stock/components/InDetail.vue
new file mode 100644
index 0000000..ad73ba4
--- /dev/null
+++ b/admin/src/views/stock/components/InDetail.vue
@@ -0,0 +1,164 @@
+<template>
+ <GlobalWindow width="960px" title="鍑哄簱鍗曡鎯�" :visible.sync="visible" :confirm-working="isWorking" @close="close"
+ @confirm="confirm">
+ <div class="main">
+ <div class="title">
+ <span>宸ュ崟璇︽儏</span>
+ </div>
+ <div class="main_content">
+ <div class="list">
+ <div class="item">
+ <div class="la">鍑哄簱浠撳簱</div>
+ <div class="val">{{ info.projectName }}</div>
+ </div>
+ <div class="item">
+ <div class="la">鍑哄簱鏃ユ湡</div>
+ <div class="val">{{ info.categoryName }}</div>
+ </div>
+ <div class="item">
+ <div class="la">鍑哄簱绫诲瀷</div>
+ <div class="val">{{ info.creatorName }}{{ info.creatorCompany ? "-" + info.creatorCompany : '' }}</div>
+ </div>
+ <div class="item">
+ <div class="la">澶勭悊浜�</div>
+ <div class="val">{{ info.creatorPhone || info.creatorMobile }}</div>
+ </div>
+ <div class="item">
+ <div class="la">澶囨敞</div>
+ <div class="val">{{ info.createDate }}</div>
+ </div>
+ </div>
+ </div>
+ <div class="title">鐗╂枡淇℃伅</div>
+ <el-table :data="list" stripe>
+ <el-table-column align="center" type="index" width="55" />
+ <el-table-column prop="creatorName" label="鐗╂枡鍚嶇О" show-overflow-tooltip min-width="80px"></el-table-column>
+ <el-table-column prop="categoryName" label="鐗╂枡缂栫爜" show-overflow-tooltip min-width="100px"></el-table-column>
+ <el-table-column prop="createDate" label="鏉″舰鐮�" show-overflow-tooltip min-width="100px"></el-table-column>
+ <el-table-column prop="dealUserName" label="鍝佺墝" show-overflow-tooltip min-width="80px"></el-table-column>
+ <el-table-column prop="dealUserName" label="鍗曚綅" show-overflow-tooltip min-width="80px"></el-table-column>
+ <el-table-column prop="dealUserName" label="鍑哄簱鏁伴噺" show-overflow-tooltip min-width="80px"></el-table-column>
+ </el-table>
+ </div>
+ </GlobalWindow>
+</template>
+
+<script>
+import GlobalWindow from '@/components/common/GlobalWindow'
+import BaseOpera from '@/components/base/BaseOpera'
+import { detailById, dispatchOrder, dealOrder } from '@/api/workorder/ywWorkorder'
+import { getUserList } from '@/api/system/user'
+import { Message, Loading } from 'element-ui'
+import dayjs from 'dayjs'
+export default {
+ components: {
+ GlobalWindow
+ },
+ extends: BaseOpera,
+ data() {
+ return {
+ id: '',
+ visible: false,
+ info: {},
+ list: []
+
+
+ }
+ },
+ created() {
+ // this.getDetail()
+ },
+ methods: {
+ getDetail() {
+ const { id } = this
+ detailById(id).then(res => {
+ this.info = res
+ })
+ },
+ close() {
+ this.visible = false
+ this.$emit('close')
+ }
+ }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/style/variables.scss';
+
+.main {
+ padding-top: 20px;
+
+ .title {
+ font-weight: 500;
+ font-size: 18px;
+ color: $primary-color;
+ margin-bottom: 10px;
+ display: flex;
+ align-items: center;
+
+ .status {
+ padding: 0 12px;
+ height: 24px;
+ line-height: 24px;
+ border-radius: 2px;
+ border: 1px solid #00BA92;
+ color: #00BA92;
+ font-weight: 400;
+ font-size: 12px;
+ margin-left: 10px;
+ }
+
+ .primaryColor {
+ border: 1px solid rgba(63, 126, 239, .2);
+ background-color: rgba(63, 126, 239, .2);
+ }
+
+ .green {
+ background-color: rgba(83, 183, 148, .2);
+ border: 1px solid rgba(83, 183, 148, .2);
+ }
+
+ .gray {
+ color: #333333;
+ background-color: rgba(128, 128, 128, .2);
+ border: 1px solid rgba(128, 128, 128, .2);
+ }
+ }
+
+ .list {
+ display: flex;
+ flex-wrap: wrap;
+ /* background: #F7F7F7; */
+ border-radius: 2px;
+ padding: 15px 20px;
+ margin-bottom: 16px;
+
+ .item {
+ width: 33.3%;
+ margin-bottom: 14px;
+
+ .la {
+ color: #7f7f7f;
+ margin-bottom: 6px;
+ }
+ }
+
+ .item2 {
+ width: 100%;
+ display: flex;
+ align-items: center;
+
+ .la {
+ margin-bottom: 0;
+ width: 72px;
+ }
+ }
+
+ .max {
+ width: 100%;
+ }
+ }
+
+}
+</style>
diff --git a/admin/src/views/stock/components/InEdit.vue b/admin/src/views/stock/components/InEdit.vue
new file mode 100644
index 0000000..3bc1a30
--- /dev/null
+++ b/admin/src/views/stock/components/InEdit.vue
@@ -0,0 +1,138 @@
+<template>
+ <GlobalWindow title="鏂板缓鍑哄簱鍗�" :visible.sync="isShowModal" :confirm-working="isLoading" width="900px" @close="close"
+ @confirm="confirm">
+ <el-form :model="param" ref="form" :rules="rules">
+ <div class="df_ac">
+ <el-form-item class="w3" label="鍑哄簱浠撳簱" prop="parentId">
+ <el-select :disabled="param.id" v-model="param.parentId" placeholder="涓嶅～涓哄垯涓�绾у垎绫�">
+ <el-option v-for="op in dataList" :key="op.id" :label="op.name" :value="op.id"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item class="w3" label="鍑哄簱鏃ユ湡">
+ <el-date-picker type="date" v-model="param.getDate" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+ placeholder="璇烽�夋嫨鍑哄簱鏃ユ湡"></el-date-picker>
+ </el-form-item>
+ <el-form-item class="w3" label="鍑哄簱绫诲瀷" prop="parentId">
+ <el-select :disabled="param.id" v-model="param.parentId" placeholder="涓嶅～涓哄垯涓�绾у垎绫�">
+ <el-option v-for="op in dataList" :key="op.id" :label="op.name" :value="op.id"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item class="w3" label="澶勭悊浜�" prop="name">
+ <el-input v-model="param.name" v-trim />
+ </el-form-item>
+ <el-form-item class="w6" label="澶囨敞" prop="name">
+ <el-input v-model="param.name" placeholder="璇疯緭鍏�" v-trim />
+ </el-form-item>
+ </div>
+ </el-form>
+ <!-- -->
+ <el-tabs v-model="activeName">
+ <el-tab-pane label="鐗╂枡淇℃伅" name="first"></el-tab-pane>
+ </el-tabs>
+ <el-button type="primary" @click="handleOpenMaterial">閫夋嫨鐗╂枡</el-button>
+ <el-table :data="list" stripe>
+ <el-table-column align="center" label="搴忓彿" type="index" width="50" />
+ <el-table-column prop="creatorName" label="鐗╂枡鍚嶇О" show-overflow-tooltip min-width="80px"></el-table-column>
+ <el-table-column prop="categoryName" label="鐗╂枡缂栫爜" show-overflow-tooltip min-width="90px"></el-table-column>
+ <el-table-column prop="createDate" label="鏉″舰鐮�" show-overflow-tooltip min-width="70px"></el-table-column>
+ <el-table-column prop="dealUserName" label="鍝佺墝" show-overflow-tooltip min-width="70px"></el-table-column>
+ <el-table-column prop="dealUserName" label="鍗曚綅" show-overflow-tooltip min-width="70px"></el-table-column>
+ <el-table-column prop="dealUserName" label="鍑哄簱鏁伴噺" min-width="90px">
+ <template v-slot="{row}">
+ <el-input oninput="value=value.replace(/^(0+)|[^\d]+/g, '').slice(0, 11)" v-model="row.aa" class="w100"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="dealUserName" label="搴撳瓨鏁伴噺" show-overflow-tooltip min-width="80px"></el-table-column>
+ <el-table-column prop="dealUserName" label="鎿嶄綔" min-width="60px">
+ <template v-slot="scope">
+ <span @click="handleDel(scope)" class="red pointer">鍒犻櫎</span>
+ </template>
+ </el-table-column>
+ </el-table>
+ <!-- -->
+ <AssetSel v-if="isShowSel" ref="AssetSelRef" @change="changeSel" @close="isShowSel = false" />
+ </GlobalWindow>
+</template>
+
+<script>
+import GlobalWindow from '@/components/common/GlobalWindow'
+import AssetSel from './AssetSel'
+import { create, fetchCateList, getInfoById } from '@/api/business/category.js'
+export default {
+ name: 'OperaCategoryWindow',
+ components: { GlobalWindow, AssetSel },
+ data() {
+ return {
+ // 琛ㄥ崟鏁版嵁
+ param: {},
+ activeName: 'first',
+ isShowModal: false,
+ isShowSel: false,
+ isLoading: false,
+ // 楠岃瘉瑙勫垯
+ rules: {
+ name: [{ required: true, message: '璇疯緭鍏ヤ簩绾у垎绫诲悕绉�', trigger: 'blur' }],
+ },
+ list: [{}],
+
+ dataList: [],
+ }
+ },
+ created() {
+
+ },
+ methods: {
+ confirm() {
+
+ },
+ getList() {
+ fetchCateList({ type: 5 }).then(res => {
+ this.dataList = res || []
+
+ })
+ },
+ changeSel() {
+
+ },
+ handleDel(val) {
+ const index = val.$index
+ this.list.splice(index, 1)
+
+ },
+ handleOpenMaterial() {
+ this.isShowSel = true
+ this.$nextTick(() => {
+ this.$refs.AssetSelRef.isShowModal = true
+ })
+ },
+ close() {
+ this.isShowModal = false
+ this.$emit('close')
+ },
+ getDetail(id) {
+ getInfoById(id).then(res => {
+ this.param = res
+ })
+ },
+ }
+}
+</script>
+<style lang="scss" scoped>
+.df_ac {
+ display: flex;
+ align-items: center;
+ flex-wrap: wrap;
+
+ .w3 {
+ width: 33.3%;
+ padding: 0 10px;
+ box-sizing: border-box;
+ }
+
+ .w6 {
+ width: 66.6%;
+ padding: 0 10px;
+ box-sizing: border-box;
+ }
+}
+</style>
\ No newline at end of file
diff --git a/admin/src/views/stock/components/OutDetail.vue b/admin/src/views/stock/components/OutDetail.vue
new file mode 100644
index 0000000..ad73ba4
--- /dev/null
+++ b/admin/src/views/stock/components/OutDetail.vue
@@ -0,0 +1,164 @@
+<template>
+ <GlobalWindow width="960px" title="鍑哄簱鍗曡鎯�" :visible.sync="visible" :confirm-working="isWorking" @close="close"
+ @confirm="confirm">
+ <div class="main">
+ <div class="title">
+ <span>宸ュ崟璇︽儏</span>
+ </div>
+ <div class="main_content">
+ <div class="list">
+ <div class="item">
+ <div class="la">鍑哄簱浠撳簱</div>
+ <div class="val">{{ info.projectName }}</div>
+ </div>
+ <div class="item">
+ <div class="la">鍑哄簱鏃ユ湡</div>
+ <div class="val">{{ info.categoryName }}</div>
+ </div>
+ <div class="item">
+ <div class="la">鍑哄簱绫诲瀷</div>
+ <div class="val">{{ info.creatorName }}{{ info.creatorCompany ? "-" + info.creatorCompany : '' }}</div>
+ </div>
+ <div class="item">
+ <div class="la">澶勭悊浜�</div>
+ <div class="val">{{ info.creatorPhone || info.creatorMobile }}</div>
+ </div>
+ <div class="item">
+ <div class="la">澶囨敞</div>
+ <div class="val">{{ info.createDate }}</div>
+ </div>
+ </div>
+ </div>
+ <div class="title">鐗╂枡淇℃伅</div>
+ <el-table :data="list" stripe>
+ <el-table-column align="center" type="index" width="55" />
+ <el-table-column prop="creatorName" label="鐗╂枡鍚嶇О" show-overflow-tooltip min-width="80px"></el-table-column>
+ <el-table-column prop="categoryName" label="鐗╂枡缂栫爜" show-overflow-tooltip min-width="100px"></el-table-column>
+ <el-table-column prop="createDate" label="鏉″舰鐮�" show-overflow-tooltip min-width="100px"></el-table-column>
+ <el-table-column prop="dealUserName" label="鍝佺墝" show-overflow-tooltip min-width="80px"></el-table-column>
+ <el-table-column prop="dealUserName" label="鍗曚綅" show-overflow-tooltip min-width="80px"></el-table-column>
+ <el-table-column prop="dealUserName" label="鍑哄簱鏁伴噺" show-overflow-tooltip min-width="80px"></el-table-column>
+ </el-table>
+ </div>
+ </GlobalWindow>
+</template>
+
+<script>
+import GlobalWindow from '@/components/common/GlobalWindow'
+import BaseOpera from '@/components/base/BaseOpera'
+import { detailById, dispatchOrder, dealOrder } from '@/api/workorder/ywWorkorder'
+import { getUserList } from '@/api/system/user'
+import { Message, Loading } from 'element-ui'
+import dayjs from 'dayjs'
+export default {
+ components: {
+ GlobalWindow
+ },
+ extends: BaseOpera,
+ data() {
+ return {
+ id: '',
+ visible: false,
+ info: {},
+ list: []
+
+
+ }
+ },
+ created() {
+ // this.getDetail()
+ },
+ methods: {
+ getDetail() {
+ const { id } = this
+ detailById(id).then(res => {
+ this.info = res
+ })
+ },
+ close() {
+ this.visible = false
+ this.$emit('close')
+ }
+ }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/style/variables.scss';
+
+.main {
+ padding-top: 20px;
+
+ .title {
+ font-weight: 500;
+ font-size: 18px;
+ color: $primary-color;
+ margin-bottom: 10px;
+ display: flex;
+ align-items: center;
+
+ .status {
+ padding: 0 12px;
+ height: 24px;
+ line-height: 24px;
+ border-radius: 2px;
+ border: 1px solid #00BA92;
+ color: #00BA92;
+ font-weight: 400;
+ font-size: 12px;
+ margin-left: 10px;
+ }
+
+ .primaryColor {
+ border: 1px solid rgba(63, 126, 239, .2);
+ background-color: rgba(63, 126, 239, .2);
+ }
+
+ .green {
+ background-color: rgba(83, 183, 148, .2);
+ border: 1px solid rgba(83, 183, 148, .2);
+ }
+
+ .gray {
+ color: #333333;
+ background-color: rgba(128, 128, 128, .2);
+ border: 1px solid rgba(128, 128, 128, .2);
+ }
+ }
+
+ .list {
+ display: flex;
+ flex-wrap: wrap;
+ /* background: #F7F7F7; */
+ border-radius: 2px;
+ padding: 15px 20px;
+ margin-bottom: 16px;
+
+ .item {
+ width: 33.3%;
+ margin-bottom: 14px;
+
+ .la {
+ color: #7f7f7f;
+ margin-bottom: 6px;
+ }
+ }
+
+ .item2 {
+ width: 100%;
+ display: flex;
+ align-items: center;
+
+ .la {
+ margin-bottom: 0;
+ width: 72px;
+ }
+ }
+
+ .max {
+ width: 100%;
+ }
+ }
+
+}
+</style>
diff --git a/admin/src/views/stock/components/OutEdit.vue b/admin/src/views/stock/components/OutEdit.vue
new file mode 100644
index 0000000..3bc1a30
--- /dev/null
+++ b/admin/src/views/stock/components/OutEdit.vue
@@ -0,0 +1,138 @@
+<template>
+ <GlobalWindow title="鏂板缓鍑哄簱鍗�" :visible.sync="isShowModal" :confirm-working="isLoading" width="900px" @close="close"
+ @confirm="confirm">
+ <el-form :model="param" ref="form" :rules="rules">
+ <div class="df_ac">
+ <el-form-item class="w3" label="鍑哄簱浠撳簱" prop="parentId">
+ <el-select :disabled="param.id" v-model="param.parentId" placeholder="涓嶅～涓哄垯涓�绾у垎绫�">
+ <el-option v-for="op in dataList" :key="op.id" :label="op.name" :value="op.id"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item class="w3" label="鍑哄簱鏃ユ湡">
+ <el-date-picker type="date" v-model="param.getDate" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+ placeholder="璇烽�夋嫨鍑哄簱鏃ユ湡"></el-date-picker>
+ </el-form-item>
+ <el-form-item class="w3" label="鍑哄簱绫诲瀷" prop="parentId">
+ <el-select :disabled="param.id" v-model="param.parentId" placeholder="涓嶅～涓哄垯涓�绾у垎绫�">
+ <el-option v-for="op in dataList" :key="op.id" :label="op.name" :value="op.id"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item class="w3" label="澶勭悊浜�" prop="name">
+ <el-input v-model="param.name" v-trim />
+ </el-form-item>
+ <el-form-item class="w6" label="澶囨敞" prop="name">
+ <el-input v-model="param.name" placeholder="璇疯緭鍏�" v-trim />
+ </el-form-item>
+ </div>
+ </el-form>
+ <!-- -->
+ <el-tabs v-model="activeName">
+ <el-tab-pane label="鐗╂枡淇℃伅" name="first"></el-tab-pane>
+ </el-tabs>
+ <el-button type="primary" @click="handleOpenMaterial">閫夋嫨鐗╂枡</el-button>
+ <el-table :data="list" stripe>
+ <el-table-column align="center" label="搴忓彿" type="index" width="50" />
+ <el-table-column prop="creatorName" label="鐗╂枡鍚嶇О" show-overflow-tooltip min-width="80px"></el-table-column>
+ <el-table-column prop="categoryName" label="鐗╂枡缂栫爜" show-overflow-tooltip min-width="90px"></el-table-column>
+ <el-table-column prop="createDate" label="鏉″舰鐮�" show-overflow-tooltip min-width="70px"></el-table-column>
+ <el-table-column prop="dealUserName" label="鍝佺墝" show-overflow-tooltip min-width="70px"></el-table-column>
+ <el-table-column prop="dealUserName" label="鍗曚綅" show-overflow-tooltip min-width="70px"></el-table-column>
+ <el-table-column prop="dealUserName" label="鍑哄簱鏁伴噺" min-width="90px">
+ <template v-slot="{row}">
+ <el-input oninput="value=value.replace(/^(0+)|[^\d]+/g, '').slice(0, 11)" v-model="row.aa" class="w100"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="dealUserName" label="搴撳瓨鏁伴噺" show-overflow-tooltip min-width="80px"></el-table-column>
+ <el-table-column prop="dealUserName" label="鎿嶄綔" min-width="60px">
+ <template v-slot="scope">
+ <span @click="handleDel(scope)" class="red pointer">鍒犻櫎</span>
+ </template>
+ </el-table-column>
+ </el-table>
+ <!-- -->
+ <AssetSel v-if="isShowSel" ref="AssetSelRef" @change="changeSel" @close="isShowSel = false" />
+ </GlobalWindow>
+</template>
+
+<script>
+import GlobalWindow from '@/components/common/GlobalWindow'
+import AssetSel from './AssetSel'
+import { create, fetchCateList, getInfoById } from '@/api/business/category.js'
+export default {
+ name: 'OperaCategoryWindow',
+ components: { GlobalWindow, AssetSel },
+ data() {
+ return {
+ // 琛ㄥ崟鏁版嵁
+ param: {},
+ activeName: 'first',
+ isShowModal: false,
+ isShowSel: false,
+ isLoading: false,
+ // 楠岃瘉瑙勫垯
+ rules: {
+ name: [{ required: true, message: '璇疯緭鍏ヤ簩绾у垎绫诲悕绉�', trigger: 'blur' }],
+ },
+ list: [{}],
+
+ dataList: [],
+ }
+ },
+ created() {
+
+ },
+ methods: {
+ confirm() {
+
+ },
+ getList() {
+ fetchCateList({ type: 5 }).then(res => {
+ this.dataList = res || []
+
+ })
+ },
+ changeSel() {
+
+ },
+ handleDel(val) {
+ const index = val.$index
+ this.list.splice(index, 1)
+
+ },
+ handleOpenMaterial() {
+ this.isShowSel = true
+ this.$nextTick(() => {
+ this.$refs.AssetSelRef.isShowModal = true
+ })
+ },
+ close() {
+ this.isShowModal = false
+ this.$emit('close')
+ },
+ getDetail(id) {
+ getInfoById(id).then(res => {
+ this.param = res
+ })
+ },
+ }
+}
+</script>
+<style lang="scss" scoped>
+.df_ac {
+ display: flex;
+ align-items: center;
+ flex-wrap: wrap;
+
+ .w3 {
+ width: 33.3%;
+ padding: 0 10px;
+ box-sizing: border-box;
+ }
+
+ .w6 {
+ width: 66.6%;
+ padding: 0 10px;
+ box-sizing: border-box;
+ }
+}
+</style>
\ No newline at end of file
diff --git a/admin/src/views/stock/in.vue b/admin/src/views/stock/in.vue
index e71d95d..ee899e6 100644
--- a/admin/src/views/stock/in.vue
+++ b/admin/src/views/stock/in.vue
@@ -2,7 +2,8 @@
<div class="main_app">
<QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear" />
<div class="mt20">
- <el-button type="primary" @click="handleEx()" v-permissions="['business:ywpatrolline:create']">瀵煎嚭</el-button>
+ <el-button type="primary" @click="handleEdit()" v-permissions="['business:ywpatrolline:create']">鏂板缓鍑哄簱鍗�</el-button>
+ <el-button @click="handleEx()" v-permissions="['business:ywpatrolline:create']">瀵煎嚭</el-button>
</div>
<el-table v-loading="loading" :data="list" stripe>
<el-table-column prop="platformName" label="鍑哄簱鍗曞彿" min-width="120" show-overflow-tooltip />
@@ -13,20 +14,25 @@
<el-table-column prop="param2" label="鎿嶄綔浜�" min-width="90" show-overflow-tooltip />
<el-table-column prop="workTime" label="鎿嶄綔鏃堕棿" min-width="140" show-overflow-tooltip />
<el-table-column prop="workTime" label="鎿嶄綔" min-width="80" show-overflow-tooltip>
- <template v-slot="{row}">
- <span class="primaryColor pointer">鏌ョ湅璇︽儏</span>
+ <template v-slot="{ row }">
+ <span @click="handleDetail(row)" class="primaryColor pointer">鏌ョ湅璇︽儏</span>
</template>
</el-table-column>
</el-table>
<div class="mt20">
<Pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" />
</div>
+ <!-- -->
+ <InEdit v-if="isShowEdit" @close="isShowEdit = false" @success="getList" ref="InEditRef" />
+ <InDetail v-if="isShowDetail" ref="InDetailRef" />
</div>
</template>
<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
+import InEdit from './components/InEdit'
+import InDetail from './components/InDetail'
import dayjs from 'dayjs'
import duration from 'dayjs/plugin/duration'
dayjs.extend(duration)
@@ -34,22 +40,26 @@
export default {
components: {
Pagination,
- QueryForm
+ QueryForm,
+ InEdit,
+ InDetail
},
data() {
return {
loading: false,
+ isShowEdit: false,
+ isShowDetail: false,
pagination: {
pageSize: 10,
page: 1,
total: 0
},
filters: {},
- list: [],
+ list: [{}],
total: 0,
queryFormConfig: {
formItems: [
- {
+ {
filed: 'carCodeFront',
type: 'input',
label: '鍑哄簱鍗曞彿',
@@ -82,6 +92,18 @@
}
})
},
+ handleEdit() {
+ this.isShowEdit = true
+ this.$nextTick(() => {
+ this.$refs.InEditRef.isShowModal = true
+ })
+ },
+ handleDetail() {
+ this.isShowDetail = true
+ this.$nextTick(() => {
+ this.$refs.InDetailRef.visible = true
+ })
+ },
handleEx() { },
getGroupList() {
getPlatformGroupList({ queryData: 0, queryType: 0 }).then(res => {
@@ -97,6 +119,7 @@
getList(page) {
const { pagination, filters } = this
this.loading = true
+ if(page){pagination.page = page}
platformLogPage({
model: {
...filters,
@@ -106,7 +129,7 @@
},
sorts: [{ direction: 'DESC', property: 'param1' }],
capacity: pagination.pageSize,
- page: page || pagination.page,
+ page: page,
}).then(res => {
this.loading = false
this.list = res.records || []
@@ -128,11 +151,10 @@
},
handleSizeChange(capacity) {
this.pagination.pageSize = capacity
+ this.getList()
}
}
}
</script>
-<style>
-
-</style>
+<style></style>
diff --git a/admin/src/views/stock/out.vue b/admin/src/views/stock/out.vue
index e71d95d..07aca66 100644
--- a/admin/src/views/stock/out.vue
+++ b/admin/src/views/stock/out.vue
@@ -2,7 +2,8 @@
<div class="main_app">
<QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear" />
<div class="mt20">
- <el-button type="primary" @click="handleEx()" v-permissions="['business:ywpatrolline:create']">瀵煎嚭</el-button>
+ <el-button type="primary" @click="handleEdit()" v-permissions="['business:ywpatrolline:create']">鏂板缓鍑哄簱鍗�</el-button>
+ <el-button @click="handleEx()" v-permissions="['business:ywpatrolline:create']">瀵煎嚭</el-button>
</div>
<el-table v-loading="loading" :data="list" stripe>
<el-table-column prop="platformName" label="鍑哄簱鍗曞彿" min-width="120" show-overflow-tooltip />
@@ -13,20 +14,25 @@
<el-table-column prop="param2" label="鎿嶄綔浜�" min-width="90" show-overflow-tooltip />
<el-table-column prop="workTime" label="鎿嶄綔鏃堕棿" min-width="140" show-overflow-tooltip />
<el-table-column prop="workTime" label="鎿嶄綔" min-width="80" show-overflow-tooltip>
- <template v-slot="{row}">
- <span class="primaryColor pointer">鏌ョ湅璇︽儏</span>
+ <template v-slot="{ row }">
+ <span @click="handleDetail(row)" class="primaryColor pointer">鏌ョ湅璇︽儏</span>
</template>
</el-table-column>
</el-table>
<div class="mt20">
<Pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" />
</div>
+ <!-- -->
+ <OutEdit v-if="isShowEdit" @close="isShowEdit = false" @success="getList" ref="OutEditRef" />
+ <OutDetail v-if="isShowDetail" ref="OutDetailRef" />
</div>
</template>
<script>
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
+import OutEdit from './components/OutEdit'
+import OutDetail from './components/OutDetail'
import dayjs from 'dayjs'
import duration from 'dayjs/plugin/duration'
dayjs.extend(duration)
@@ -34,22 +40,26 @@
export default {
components: {
Pagination,
- QueryForm
+ QueryForm,
+ OutEdit,
+ OutDetail
},
data() {
return {
loading: false,
+ isShowEdit: false,
+ isShowDetail: false,
pagination: {
pageSize: 10,
page: 1,
total: 0
},
filters: {},
- list: [],
+ list: [{}],
total: 0,
queryFormConfig: {
formItems: [
- {
+ {
filed: 'carCodeFront',
type: 'input',
label: '鍑哄簱鍗曞彿',
@@ -82,6 +92,18 @@
}
})
},
+ handleEdit() {
+ this.isShowEdit = true
+ this.$nextTick(() => {
+ this.$refs.OutEditRef.isShowModal = true
+ })
+ },
+ handleDetail() {
+ this.isShowDetail = true
+ this.$nextTick(() => {
+ this.$refs.OutDetailRef.visible = true
+ })
+ },
handleEx() { },
getGroupList() {
getPlatformGroupList({ queryData: 0, queryType: 0 }).then(res => {
@@ -97,6 +119,7 @@
getList(page) {
const { pagination, filters } = this
this.loading = true
+ if(page){pagination.page = page}
platformLogPage({
model: {
...filters,
@@ -106,7 +129,7 @@
},
sorts: [{ direction: 'DESC', property: 'param1' }],
capacity: pagination.pageSize,
- page: page || pagination.page,
+ page: page,
}).then(res => {
this.loading = false
this.list = res.records || []
@@ -128,11 +151,10 @@
},
handleSizeChange(capacity) {
this.pagination.pageSize = capacity
+ this.getList()
}
}
}
</script>
-<style>
-
-</style>
+<style></style>
diff --git a/admin/src/views/stock/query.vue b/admin/src/views/stock/query.vue
index 7c318d2..3dd9bdb 100644
--- a/admin/src/views/stock/query.vue
+++ b/admin/src/views/stock/query.vue
@@ -2,7 +2,7 @@
<div class="main_app">
<QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear" />
<div class="mt20">
- <el-button type="primary" @click="handleEx()" v-permissions="['business:ywpatrolline:create']">瀵煎嚭</el-button>
+ <el-button @click="handleEx()" v-permissions="['business:ywpatrolline:create']">瀵煎嚭</el-button>
</div>
<el-table v-loading="loading" :data="list" stripe>
<el-table-column prop="platformName" label="璧勪骇缂栫爜" min-width="100" show-overflow-tooltip />
@@ -124,6 +124,7 @@
},
handleSizeChange(capacity) {
this.pagination.pageSize = capacity
+ this.getList()
}
}
}
diff --git a/admin/src/views/stock/record.vue b/admin/src/views/stock/record.vue
index 7f1764b..f7f37f0 100644
--- a/admin/src/views/stock/record.vue
+++ b/admin/src/views/stock/record.vue
@@ -142,6 +142,7 @@
},
handleSizeChange(capacity) {
this.pagination.pageSize = capacity
+ this.getList()
}
}
}
diff --git a/admin/src/views/system/publicMsg.vue b/admin/src/views/system/publicMsg.vue
index 085dbd0..136d910 100644
--- a/admin/src/views/system/publicMsg.vue
+++ b/admin/src/views/system/publicMsg.vue
@@ -145,6 +145,7 @@
},
handleSizeChange(capacity) {
this.pagination.pageSize = capacity
+ this.getList()
}
}
}
diff --git a/admin/src/views/system/smsMessage.vue b/admin/src/views/system/smsMessage.vue
index f3f551f..0dbf752 100644
--- a/admin/src/views/system/smsMessage.vue
+++ b/admin/src/views/system/smsMessage.vue
@@ -3,8 +3,7 @@
<QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear">
</QueryForm>
<div class="pt16 mb10">
- <el-button type="primary" @click="batchStatus(0)"
- v-permissions="['business:platformjob:update']">鎵归噺鍚敤</el-button>
+ <el-button type="primary" @click="batchStatus(0)" v-permissions="['business:platformjob:update']">鎵归噺鍚敤</el-button>
<el-button @click="batchStatus(1)" v-permissions="['business:platformjob:update']">鎵归噺绂佺敤</el-button>
</div>
<el-table @selection-change="handleSelectionChange" class="mb20" v-loading="loading" :data="list" stripe>
@@ -15,7 +14,8 @@
<el-table-column prop="content" label="娑堟伅妯℃澘" min-width="300" show-overflow-tooltip />
<el-table-column label="鐘舵��" width="120" align="center" fixed="right">
<template v-slot="scope">
- <el-switch v-permissions="['business:platformjob:update']" v-model="scope.row.status" @change="changeStatus(scope.row)" :active-value="0" :inactive-value="1">
+ <el-switch v-permissions="['business:platformjob:update']" v-model="scope.row.status"
+ @change="changeStatus(scope.row)" :active-value="0" :inactive-value="1">
</el-switch>
</template>
</el-table-column>
@@ -145,6 +145,7 @@
},
handleSizeChange(capacity) {
this.pagination.pageSize = capacity
+ this.getList()
}
}
}
diff --git a/server/db/business.yw_temp_config.permissions.sql b/server/db/business.yw_temp_config.permissions.sql
new file mode 100644
index 0000000..2e1d879
--- /dev/null
+++ b/server/db/business.yw_temp_config.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:ywtempconfig:create', '鏂板缓鍌即淇℃伅閰嶇疆', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:ywtempconfig:delete', '鍒犻櫎鍌即淇℃伅閰嶇疆', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:ywtempconfig:update', '淇敼鍌即淇℃伅閰嶇疆', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:ywtempconfig:query', '鏌ヨ鍌即淇℃伅閰嶇疆', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:ywtempconfig:exportExcel', '瀵煎嚭鍌即淇℃伅閰嶇疆(Excel)', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
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 29e590d..820bb4d 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
@@ -1,7 +1,10 @@
package com.doumee.core.utils;
+import cn.hutool.core.io.IoUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -9,10 +12,16 @@
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
import io.swagger.models.auth.In;
import org.apache.batik.util.Platform;
+import org.apache.commons.compress.archivers.zip.Zip64Mode;
+import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
+import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
import org.apache.commons.lang3.StringUtils;
import org.springframework.util.CollectionUtils;
+import java.io.File;
+import java.io.FileInputStream;
import java.io.IOException;
+import java.io.OutputStream;
import java.math.BigDecimal;
import java.net.URLDecoder;
import java.text.SimpleDateFormat;
@@ -1528,4 +1537,41 @@
}
}
+ public static void packFilesToZip(List<File> files, OutputStream os) throws IOException {
+ try {
+ ZipArchiveOutputStream zipOutputStream = new ZipArchiveOutputStream(os);
+ zipOutputStream.setUseZip64(Zip64Mode.AsNeeded);
+ for (File file : files) {
+ if(!file.exists()){
+ System.out.println("===鏂囦欢涓嶅瓨鍦�======="+file.getPath());
+ continue;
+ }else{
+ System.out.println("===鏂囦欢瀛樺湪======="+file.getPath());
+ }
+ ZipArchiveEntry entry = new ZipArchiveEntry(file.getName());
+ zipOutputStream.putArchiveEntry(entry);
+ FileInputStream fileInputStream = new FileInputStream(file);
+ byte[] buffer = new byte[1024];
+ int length;
+ while ((length = fileInputStream.read(buffer)) > 0) {
+ zipOutputStream.write(buffer, 0, length);
+ }
+ zipOutputStream.closeArchiveEntry();
+ zipOutputStream.flush();
+ IoUtil.close(fileInputStream);
+ file.delete();
+ }
+ }catch (Exception e){
+ throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR.getCode(),"瀵逛笉璧凤紝涓嬭浇鍘嬬缉鏂囦欢澶辫触");
+ }finally {
+ if (os != null) {
+ try {
+ os.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractBillCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractBillCloudController.java
index ca58ec1..8d6816a 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractBillCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractBillCloudController.java
@@ -10,6 +10,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.YwContractBill;
+import com.doumee.dao.business.vo.YwContractBillCallDataVO;
import com.doumee.dao.business.vo.YwContractBillDataVO;
import com.doumee.service.business.YwContractBillService;
import io.swagger.annotations.Api;
@@ -80,6 +81,16 @@
return ApiResponse.success(ywContractBillService.findPage(pageWrap));
}
+
+ @ApiOperation("閫炬湡璐﹀崟")
+ @PostMapping("/findPageForOverdue")
+ @CloudRequiredPermission("business:ywcontractbill:query")
+ public ApiResponse<PageData<YwContractBill>> findPageForOverdue (@RequestBody PageWrap<YwContractBill> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
+ return ApiResponse.success(ywContractBillService.findPageForOverdue(pageWrap));
+ }
+
+
@ApiOperation("鍙��娆捐处鍗�")
@PostMapping("/getCanBackBill")
@CloudRequiredPermission("business:ywcontractbill:query")
@@ -120,4 +131,12 @@
return ApiResponse.success(ywContractBillService.getWaitDealList(contractId));
}
+
+ @ApiOperation("鑾峰彇鎵归噺鍌即鏁版嵁")
+ @PostMapping("/getNoticeCustomerData")
+ @CloudRequiredPermission("business:ywcontractbill:query")
+ public ApiResponse<List<YwContractBillCallDataVO>> getNoticeCustomerData(@RequestBody List<Integer> billIds,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ return ApiResponse.success(ywContractBillService.getNoticeCustomerData(billIds));
+ }
+
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwTempConfigCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwTempConfigCloudController.java
new file mode 100644
index 0000000..8d9a5d0
--- /dev/null
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwTempConfigCloudController.java
@@ -0,0 +1,103 @@
+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.PageWrap;
+import com.doumee.core.model.PageData;
+import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.model.YwTempConfig;
+import com.doumee.dao.business.vo.YwCallTempDataVO;
+import com.doumee.service.business.YwTempConfigService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+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 2025/01/10 09:43
+ */
+@Api(tags = "鍌即淇℃伅閰嶇疆")
+@RestController
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/ywTempConfig")
+public class YwTempConfigCloudController extends BaseController {
+
+ @Autowired
+ private YwTempConfigService ywTempConfigService;
+
+ @PreventRepeat
+ @ApiOperation("鏂板缓")
+ @PostMapping("/create")
+ @RequiresPermissions("business:ywtempconfig:create")
+ public ApiResponse create(@RequestBody YwTempConfig ywTempConfig) {
+ return ApiResponse.success(ywTempConfigService.create(ywTempConfig));
+ }
+
+ @ApiOperation("鏍规嵁ID鍒犻櫎")
+ @GetMapping("/delete/{id}")
+ @RequiresPermissions("business:ywtempconfig:delete")
+ public ApiResponse deleteById(@PathVariable Integer id) {
+ ywTempConfigService.deleteById(id);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鎵归噺鍒犻櫎")
+ @GetMapping("/delete/batch")
+ @RequiresPermissions("business:ywtempconfig:delete")
+ public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
+ String [] idArray = ids.split(",");
+ List<Integer> idList = new ArrayList<>();
+ for (String id : idArray) {
+ idList.add(Integer.valueOf(id));
+ }
+ ywTempConfigService.deleteByIdInBatch(idList);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鏍规嵁ID淇敼")
+ @PostMapping("/updateById")
+ @RequiresPermissions("business:ywtempconfig:update")
+ public ApiResponse updateById(@RequestBody YwTempConfig ywTempConfig) {
+ ywTempConfigService.updateById(ywTempConfig);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鍒嗛〉鏌ヨ")
+ @PostMapping("/page")
+ @RequiresPermissions("business:ywtempconfig:query")
+ public ApiResponse<PageData<YwTempConfig>> findPage (@RequestBody PageWrap<YwTempConfig> pageWrap) {
+ return ApiResponse.success(ywTempConfigService.findPage(pageWrap));
+ }
+
+ @ApiOperation("瀵煎嚭Excel")
+ @PostMapping("/exportExcel")
+ @RequiresPermissions("business:ywtempconfig:exportExcel")
+ public void exportExcel (@RequestBody PageWrap<YwTempConfig> pageWrap, HttpServletResponse response) {
+ ExcelExporter.build(YwTempConfig.class).export(ywTempConfigService.findPage(pageWrap).getRecords(), "鍌即淇℃伅閰嶇疆", response);
+ }
+
+ @ApiOperation("鏍规嵁ID鏌ヨ")
+ @GetMapping("/{id}")
+ @RequiresPermissions("business:ywtempconfig:query")
+ public ApiResponse findById(@PathVariable Integer id) {
+ return ApiResponse.success(ywTempConfigService.findById(id));
+ }
+
+
+ @ApiOperation("鏍规嵁ID鏌ヨ")
+ @GetMapping("/getCallTemp")
+ @RequiresPermissions("business:ywtempconfig:query")
+ public ApiResponse<YwCallTempDataVO> getCallTemp() {
+ return ApiResponse.success(ywTempConfigService.getCallTemp());
+ }
+
+
+
+}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/ExcelTestDemo.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/ExcelTestDemo.java
deleted file mode 100644
index 555a682..0000000
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/ExcelTestDemo.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.doumee.cloud.board;
-
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.apache.poi.xwpf.usermodel.XWPFParagraph;
-import org.apache.poi.xwpf.usermodel.XWPFRun;
-
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-/**
- * Created by IntelliJ IDEA.
- *
- * @Author : Rk
- * @create 2025/1/3 9:11
- */
-public class ExcelTestDemo {
-
- public static void main(String[] args) {
- modifyWordTemplate("https://bdreport.oss-cn-beijing.aliyuncs.com/xczl/20250103/temp/F0F4B90E185A4A9BA2147841B90F3909.docx", "d://output.docx", "寮犱笁", "Java璇剧▼");
- }
-
- public static void modifyWordTemplate(String templatePath, String outputPath, String name, String product) {
- try (
-// FileInputStream fis = new FileInputStream(templatePath);
- XWPFDocument document = new XWPFDocument(getFileInputStream(templatePath))) {
- // 姝ゅ杩炴帴鍒板悗缁浛鎹㈡楠�
- // 閬嶅巻娈佃惤
- for (XWPFParagraph paragraph : document.getParagraphs()) {
- for (XWPFRun run : paragraph.getRuns()) {
- // 鏇挎崲鍗犱綅绗�
- String text = run.getText(0);
- if (text != null) {
- text = text.replace("{{name}}", name)
- .replace("{{text}}", product);
- run.setText(text, 0); // 閲嶆柊璁剧疆鏂囨湰
- }
- }
- }
- try (FileOutputStream fos = new FileOutputStream(outputPath)) {
- document.write(fos); // 灏嗕慨鏀瑰悗鐨勬枃妗ｅ啓鍏ヨ緭鍑烘祦
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- /*璇诲彇缃戠粶鏂囦欢*/
- public static InputStream getFileInputStream(String path) {
- URL url = null;
- try {
- url = new URL(path);
- HttpURLConnection conn = (HttpURLConnection)url.openConnection();
- //璁剧疆瓒呮椂闂翠负3绉�
- conn.setConnectTimeout(3*1000);
- //闃叉灞忚斀绋嬪簭鎶撳彇鑰岃繑鍥�403閿欒
- conn.setRequestProperty("User-Agent", "Mozilla/4.0 (compatible; MSIE 5.0; Windows NT; DigExt)");
- //寰楀埌杈撳叆娴�
- return conn.getInputStream();
- } catch (Exception e) {
-
- }
- return null;
- }
-
-
-
-}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/excel/ExcelReplaceCommon.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/excel/ExcelReplaceCommon.java
new file mode 100644
index 0000000..9694405
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/excel/ExcelReplaceCommon.java
@@ -0,0 +1,90 @@
+package com.doumee.core.excel;
+
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.model.YwTempConfig;
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.apache.poi.xwpf.usermodel.XWPFParagraph;
+import org.apache.poi.xwpf.usermodel.XWPFRun;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2025/1/3 9:11
+ */
+public class ExcelReplaceCommon {
+
+// public static void main(String[] args) {
+// modifyWordTemplate("https://bdreport.oss-cn-beijing.aliyuncs.com/xczl/20250110/temp/BE9C167EE35C40E78029C68BABBD0EAB.docx", "d://output.docx", "寮犱笁", "Java璇剧▼");
+// }
+
+
+
+
+
+ public static String modifyWordTemplate(String templatePath, List<YwTempConfig> ywTempConfigList,String fileName) {
+ try (
+ XWPFDocument document = new XWPFDocument(getFileInputStream(templatePath))) {
+ // 姝ゅ杩炴帴鍒板悗缁浛鎹㈡楠�
+ // 閬嶅巻娈佃惤
+ for (XWPFParagraph paragraph : document.getParagraphs()) {
+ for (XWPFRun run : paragraph.getRuns()) {
+ // 鏇挎崲鍗犱綅绗�
+ String text = run.getText(0);
+ if (text != null) {
+ for (YwTempConfig ywTempConfig:ywTempConfigList
+ ) {
+ text = text.replace(ywTempConfig.getTitle(), ywTempConfig.getUrl());
+ }
+ run.setText(text, 0); // 閲嶆柊璁剧疆鏂囨湰
+ }
+ }
+ }
+ String path = "d://"+fileName;
+ try (FileOutputStream fos = new FileOutputStream(path)) {
+ document.write(fos); // 灏嗕慨鏀瑰悗鐨勬枃妗ｅ啓鍏ヨ緭鍑烘祦
+ }
+ return path;
+ /*//浜岃繘鍒禣utputStream
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ document.write(baos);//鏂囨。鍐欏叆娴�
+ //OutputStream鍐欏叆InputStream浜岃繘鍒舵祦
+ ByteArrayInputStream in = new ByteArrayInputStream(baos.toByteArray()); */
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏂囦欢杞崲寮傚父!");
+ }
+
+ /*璇诲彇缃戠粶鏂囦欢*/
+ public static InputStream getFileInputStream(String path) {
+ URL url = null;
+ try {
+ url = new URL(path);
+ HttpURLConnection conn = (HttpURLConnection)url.openConnection();
+ //璁剧疆瓒呮椂闂翠负3绉�
+ conn.setConnectTimeout(3*1000);
+ //闃叉灞忚斀绋嬪簭鎶撳彇鑰岃繑鍥�403閿欒
+ conn.setRequestProperty("User-Agent", "Mozilla/4.0 (compatible; MSIE 5.0; Windows NT; DigExt)");
+ //寰楀埌杈撳叆娴�
+ return conn.getInputStream();
+ } catch (Exception e) {
+
+ }
+ return null;
+ }
+
+
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/YwTempConfigMapper.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/YwTempConfigMapper.java
new file mode 100644
index 0000000..0d6d9bf
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/YwTempConfigMapper.java
@@ -0,0 +1,13 @@
+package com.doumee.dao.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.doumee.dao.business.model.YwTempConfig;
+import com.github.yulichang.base.MPJBaseMapper;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2025/01/10 09:43
+ */
+public interface YwTempConfigMapper extends MPJBaseMapper<YwTempConfig> {
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/dto/YwSmsEmailBillCallDTO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/dto/YwSmsEmailBillCallDTO.java
new file mode 100644
index 0000000..4d71839
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/dto/YwSmsEmailBillCallDTO.java
@@ -0,0 +1,28 @@
+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
+public class YwSmsEmailBillCallDTO implements Serializable {
+
+ @ApiModelProperty(value = "鎺ユ敹浜轰富閿�" )
+ private Integer userId;
+
+ @ApiModelProperty(value = "璐﹀崟涓婚敭", example = "1")
+ private Integer billId;
+
+ @ApiModelProperty(value = "鏄惁鍙戦�佺煭鎭� 0=鍚︼紱1=鏄�", example = "1")
+ private Integer sendSms;
+
+ @ApiModelProperty(value = "鏄惁鍙戦�侀偖浠� 0=鍚︼紱1=鏄�", example = "1")
+ private Integer sendEmail;
+
+}
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 1d28bbf..16238e4 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
@@ -148,6 +148,15 @@
@TableField(exist = false)
private String customerName;
+ @ApiModelProperty(value = "瀹㈡埛榛樿鑱旂郴浜�", example = "1")
+ @TableField(exist = false)
+ private Integer customerUserId;
+
+ @ApiModelProperty(value = "瀹㈡埛涓婚敭", example = "1")
+ @TableField(exist = false)
+ private Integer customerId;
+
+
@ApiModelProperty(value = "鍏徃鍚嶇О", example = "1")
@TableField(exist = false)
private String companyName;
@@ -200,6 +209,18 @@
@ExcelColumn(name="鏄惁閫炬湡",index = 9,width = 6,valueMapping = "0=鏈�炬湡锛�1=宸查�炬湡")
private Integer isOverdue;
+ @ApiModelProperty(value = "鍚堝悓鍗曚环锛堝厓锛�", example = "1")
+ @TableField(exist = false)
+ private BigDecimal price;
+
+ @ApiModelProperty(value = "浠樻鍛ㄦ湡绫诲瀷 0=鍏冩瘡骞崇背澶╋紱1=鍏冩瘡骞崇背鏈堬紱2=鍏冩瘡骞崇背骞达紱3=鍏冩瘡澶╋紱4=鍏冩瘡鏈堬紱5=鍏冩瘡骞达紱6=鍏冩瘡鍦猴紱", example = "1")
+ @TableField(exist = false)
+ private Integer circleType;
+
+ @ApiModelProperty(value = "鏉℃绫诲瀷 0绉熻祦鏉℃ 1鐗╀笟鏉℃", example = "1")
+ @TableField(exist = false)
+ private Integer detailType;
+
@ApiModelProperty(value = "闄勪欢淇℃伅", example = "1")
@TableField(exist = false)
private List<Multifile> multifileList;
@@ -212,4 +233,17 @@
@TableField(exist = false)
private List<YwContractRevenue> ywContractRevenueList;
+ @ApiModelProperty(value = "绉熻祦鎬婚潰绉�", example = "1")
+ @TableField(exist = false)
+ private BigDecimal totalArea;
+
+ @ApiModelProperty(value = "绉熻祦鏀粯鏂瑰紡 0=涓�娆℃�т粯娆撅紱1=姣忎笁涓湀涓�浠橈紱2=鍏釜鏈堜竴浠橈紱3=涓�骞翠竴浠�", example = "1")
+ @TableField(exist = false)
+ private Integer zlPayType;
+
+ @ApiModelProperty(value = "鐗╀笟鏀粯鏂瑰紡 0=涓�娆℃�т粯娆撅紱1=姣忎笁涓湀涓�浠橈紱2=鍏釜鏈堜竴浠橈紱3=涓�骞翠竴浠�", example = "1")
+ @TableField(exist = false)
+ private Integer wyPayType;
+
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwTempConfig.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwTempConfig.java
new file mode 100644
index 0000000..586f7e9
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwTempConfig.java
@@ -0,0 +1,68 @@
+package com.doumee.dao.business.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserModel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+
+/**
+ * 鍌即淇℃伅閰嶇疆
+ * @author 姹熻箘韫�
+ * @date 2025/01/10 09:43
+ */
+@Data
+@ApiModel("鍌即淇℃伅閰嶇疆")
+@TableName("`yw_temp_config`")
+public class YwTempConfig extends LoginUserModel {
+
+ @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="鍒涘缓鏃堕棿")
+ @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=閭欢妯℃澘锛�2=绉熻祦閫氱煡闄勪欢锛�3=鍏朵粬閫氱煡闄勪欢锛�4=璐﹀崟鍏抽敭瀛楋紱5=鍚堝悓鍏抽敭瀛楋紱6=鍏朵粬淇℃伅锛�", example = "1")
+ @ExcelColumn(name="绫诲瀷锛�0=鐭伅妯℃澘锛�1=閭欢妯℃澘锛�2=绉熻祦閫氱煡闄勪欢锛�3=鍏朵粬閫氱煡闄勪欢锛�4=璐﹀崟鍏抽敭瀛楋紱5=鍚堝悓鍏抽敭瀛楋紱6=鍏朵粬淇℃伅锛�")
+ private Integer type;
+
+ @ApiModelProperty(value = "鏍囬")
+ @ExcelColumn(name="鏍囬")
+ private String title;
+
+ @ApiModelProperty(value = "鏂囦欢鍦板潃 type = 2/3浣跨敤")
+ @ExcelColumn(name="鏂囦欢鍦板潃 type = 2/3浣跨敤")
+ private String url;
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/YwCallTempDataVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/YwCallTempDataVO.java
new file mode 100644
index 0000000..328badf
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/YwCallTempDataVO.java
@@ -0,0 +1,39 @@
+package com.doumee.dao.business.vo;
+
+import com.doumee.dao.business.model.YwTempConfig;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2025/1/8 15:32
+ */
+@Data
+public class YwCallTempDataVO {
+
+ @ApiModelProperty(value = "鐭伅妯℃澘", example = "1")
+ private YwTempConfig smsTemp;
+
+ @ApiModelProperty(value = "閭欢淇℃伅妯℃澘", example = "1")
+ private YwTempConfig emailTemp;
+
+ @ApiModelProperty(value = "绉熻祦閫氱煡鍗曟ā鏉�", example = "1")
+ private YwTempConfig leaseTemp;
+
+ @ApiModelProperty(value = "鍏朵粬閫氱煡鍗曟ā鏉�", example = "1")
+ private YwTempConfig otherTemp;
+
+ @ApiModelProperty(value = "妯℃澘鍏抽敭瀛� - 璐﹀崟", example = "1")
+ private List<YwTempConfig> billTempList;
+
+ @ApiModelProperty(value = "妯℃澘鍏抽敭瀛� - 鍚堝悓", example = "1")
+ private List<YwTempConfig> contractTempList;
+
+ @ApiModelProperty(value = "妯℃澘鍏抽敭瀛� - 鍏朵粬", example = "1")
+ private List<YwTempConfig> otherTempList;
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/YwContractBillCallDataVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/YwContractBillCallDataVO.java
new file mode 100644
index 0000000..99be349
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/YwContractBillCallDataVO.java
@@ -0,0 +1,33 @@
+package com.doumee.dao.business.vo;
+
+import com.doumee.dao.business.model.Member;
+import com.doumee.dao.business.model.YwContractBill;
+import com.doumee.dao.business.model.YwCustomer;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2025/1/8 15:32
+ */
+@Data
+public class YwContractBillCallDataVO {
+
+ @ApiModelProperty(value = "璐﹀崟涓婚敭", example = "1")
+ private Integer billId;
+
+ @ApiModelProperty(value = "瀹㈡埛鍚嶇О", example = "1")
+ private String customerName;
+
+ @ApiModelProperty(value = "榛樿鑱旂郴浜轰富閿�", example = "1")
+ private Integer userId;
+
+ @ApiModelProperty(value = "鑱旂郴浜哄垪琛�", example = "1")
+ private List<Member> memberList;
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/SmsEmailService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/SmsEmailService.java
index a7cc09d..94f8efa 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/SmsEmailService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/SmsEmailService.java
@@ -98,4 +98,10 @@
long count(SmsEmail smsEmail);
void sendWaitingSmsNotice();
+
+ Integer sendBillSms(String content,String mobile,Integer billId);
+
+ Integer sendEmail(String email,String content,Integer billId);
+
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractBillService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractBillService.java
index b3ad156..bc2952d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractBillService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractBillService.java
@@ -4,8 +4,10 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.YwContractBill;
+import com.doumee.dao.business.vo.YwContractBillCallDataVO;
import com.doumee.dao.business.vo.YwContractBillDataVO;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -91,6 +93,13 @@
PageData<YwContractBill> findPage(PageWrap<YwContractBill> pageWrap);
/**
+ * 閫炬湡璐﹀崟鍒嗛〉
+ * @param pageWrap
+ * @return
+ */
+ PageData<YwContractBill> findPageForOverdue(PageWrap<YwContractBill> pageWrap);
+
+ /**
* 鏉′欢缁熻
*
* @param ywContractBill 瀹炰綋瀵硅薄
@@ -107,6 +116,12 @@
List<YwContractBill> getCanBackBill(YwContractBill model);
-
YwContractBillDataVO getWaitDealList(Integer contractId);
+
+ List<YwContractBillCallDataVO> getNoticeCustomerData(List<Integer> billIds);
+
+ void downloadCallFeeDoc(List<Integer> billIds, LoginUserInfo loginUserInfo, HttpServletResponse response);
+
+
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwTempConfigService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwTempConfigService.java
new file mode 100644
index 0000000..5a967f9
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwTempConfigService.java
@@ -0,0 +1,101 @@
+package com.doumee.service.business;
+
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.model.YwTempConfig;
+import com.doumee.dao.business.vo.YwCallTempDataVO;
+
+import java.util.List;
+
+/**
+ * 鍌即淇℃伅閰嶇疆Service瀹氫箟
+ * @author 姹熻箘韫�
+ * @date 2025/01/10 09:43
+ */
+public interface YwTempConfigService {
+
+ /**
+ * 鍒涘缓
+ *
+ * @param ywTempConfig 瀹炰綋瀵硅薄
+ * @return Integer
+ */
+ Integer create(YwTempConfig ywTempConfig);
+
+ /**
+ * 涓婚敭鍒犻櫎
+ *
+ * @param id 涓婚敭
+ */
+ void deleteById(Integer id);
+
+ /**
+ * 鍒犻櫎
+ *
+ * @param ywTempConfig 瀹炰綋瀵硅薄
+ */
+ void delete(YwTempConfig ywTempConfig);
+
+ /**
+ * 鎵归噺涓婚敭鍒犻櫎
+ *
+ * @param ids 涓婚敭闆�
+ */
+ void deleteByIdInBatch(List<Integer> ids);
+
+ /**
+ * 涓婚敭鏇存柊
+ *
+ * @param ywTempConfig 瀹炰綋瀵硅薄
+ */
+ void updateById(YwTempConfig ywTempConfig);
+
+ /**
+ * 鎵归噺涓婚敭鏇存柊
+ *
+ * @param ywTempConfigs 瀹炰綋闆�
+ */
+ void updateByIdInBatch(List<YwTempConfig> ywTempConfigs);
+
+ /**
+ * 涓婚敭鏌ヨ
+ *
+ * @param id 涓婚敭
+ * @return YwTempConfig
+ */
+ YwTempConfig findById(Integer id);
+
+ /**
+ * 鏉′欢鏌ヨ鍗曟潯璁板綍
+ *
+ * @param ywTempConfig 瀹炰綋瀵硅薄
+ * @return YwTempConfig
+ */
+ YwTempConfig findOne(YwTempConfig ywTempConfig);
+
+ /**
+ * 鏉′欢鏌ヨ
+ *
+ * @param ywTempConfig 瀹炰綋瀵硅薄
+ * @return List<YwTempConfig>
+ */
+ List<YwTempConfig> findList(YwTempConfig ywTempConfig);
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param pageWrap 鍒嗛〉瀵硅薄
+ * @return PageData<YwTempConfig>
+ */
+ PageData<YwTempConfig> findPage(PageWrap<YwTempConfig> pageWrap);
+
+ /**
+ * 鏉′欢缁熻
+ *
+ * @param ywTempConfig 瀹炰綋瀵硅薄
+ * @return long
+ */
+ long count(YwTempConfig ywTempConfig);
+
+ YwCallTempDataVO getCallTemp();
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
index 2edabc8..8a856a8 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
@@ -18,6 +18,7 @@
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.SmsEmailService;
+import com.doumee.service.business.third.EmailService;
import com.doumee.service.business.third.EmayService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -579,4 +580,52 @@
}
}
+
+
+ @Override
+ public Integer sendBillSms(String content,String mobile,Integer billId) {
+ if(StringUtils.isBlank(mobile)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ boolean result= emayService.sendSingleSms(mobile,content);
+ if(!result){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鐭俊鍙戦�佸け璐ワ紝璇风◢鍚庨噸璇曪紒");
+ }
+ SmsEmail smsEmail = new SmsEmail();
+ smsEmail.setIsdeleted(Constants.ZERO);
+ smsEmail.setCreateDate(new Date());
+ smsEmail.setStatus(Constants.ZERO);
+ smsEmail.setType(Constants.ZERO);
+ smsEmail.setTitle("璐﹀崟鍌垂");
+ smsEmail.setObjId(billId);
+ smsEmail.setObjType(Constants.ZERO+"");
+ smsEmail.setContent(content);
+ smsEmailMapper.insert(smsEmail);
+ return smsEmail.getId();
+ }
+
+ @Autowired
+ private EmailService emailService;
+
+ @Override
+ public Integer sendEmail(String email,String content,Integer billId) {
+ if(StringUtils.isBlank(email)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ boolean result= emailService.sendEmail(email,"璐﹀崟鍌垂",content,null);
+ SmsEmail smsEmail = new SmsEmail();
+ smsEmail.setRemark("閭欢鍙戠敓鎴愬姛");
+ if(!result){
+ smsEmail.setRemark("閭欢鍙戠敓澶辫触");
+ }
+ smsEmail.setIsdeleted(Constants.ZERO);
+ smsEmail.setCreateDate(new Date());
+ smsEmail.setStatus(Constants.ONE);
+ smsEmail.setType(Constants.TWO);
+ smsEmail.setObjId(billId);
+ smsEmail.setObjType(Constants.ONE+"");
+ smsEmail.setContent(content);
+ smsEmailMapper.insert(smsEmail);
+ return smsEmail.getId();
+ }
}
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 a320b59..e941edb 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
@@ -2,14 +2,18 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.excel.ExcelReplaceCommon;
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.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.dto.YwSmsEmailBillCallDTO;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.vo.YwContractBillCallDataVO;
import com.doumee.dao.business.vo.YwContractBillDataVO;
import com.doumee.dao.system.MultifileMapper;
import com.doumee.dao.system.model.Multifile;
@@ -20,13 +24,18 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import lombok.extern.java.Log;
import org.apache.commons.lang3.StringUtils;
import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
import java.math.BigDecimal;
+import java.net.URLEncoder;
+import java.nio.charset.Charset;
import java.util.*;
import java.util.stream.Collectors;
@@ -56,6 +65,11 @@
@Autowired
private YwContractMapper ywContractMapper;
+ @Autowired
+ private MemberMapper memberMapper;
+
+ @Autowired
+ private YwTempConfigMapper ywTempConfigMapper;
@Override
@@ -300,6 +314,10 @@
YwContractBill::getPayStatus,model.getPayStatus())
.eq(Objects.nonNull(model)&&Objects.nonNull(model.getType()),
YwContractBill::getType,model.getType())
+ .le(Objects.nonNull(model)&&Objects.nonNull(model.getIsOverdue())&&Constants.equalsInteger(model.getIsOverdue(),Constants.ONE),
+ YwContractBill::getPlanPayDate, DateUtil.getCurrDateTime())
+ .eq(Objects.nonNull(model)&&Objects.nonNull(model.getIsOverdue())&&Constants.equalsInteger(model.getIsOverdue(),Constants.ONE),
+ YwContractBill::getStatus, Constants.ZERO)
.eq(Objects.nonNull(model)&&Objects.nonNull(model.getContractId()),
YwContractBill::getContractId,model.getContractId())
.like(Objects.nonNull(model)&&StringUtils.isNotBlank(model.getContractCode()),
@@ -325,6 +343,78 @@
}else{
ywContractBill.setIsOverdue(Constants.ZERO);
}
+ //妤煎畤鍚嶇О
+ List<YwContractRoom> ywContractRoomList = ywContractBill.getYwContractRoomList();
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ywContractRoomList)){
+ 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(";");
+ }
+ }
+ ywContractBill.setRoomPathName(roomPathName.toString());
+ }
+ }
+
+ return PageData.from(iPage);
+ }
+
+ /**
+ * 閫炬湡璐﹀崟
+ * @param pageWrap
+ * @return
+ */
+ @Override
+ public PageData<YwContractBill> findPageForOverdue(PageWrap<YwContractBill> pageWrap) {
+ IPage<YwContractBill> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ MPJLambdaWrapper<YwContractBill> queryWrapper = new MPJLambdaWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ YwContractBill model = pageWrap.getModel();
+ IPage<YwContractBill> iPage = ywContractBillMapper.selectJoinPage(page,YwContractBill.class,
+ queryWrapper.selectAll(YwContractBill.class)
+ .select(" ( select ifnull( sum( CASE WHEN t.bill_type = 0 and yw.REVENUE_TYPE = 0 THEN yw.ACT_RECEIVABLE_FEE when t.bill_type = 0 and yw.REVENUE_TYPE = 1 then -yw.ACT_RECEIVABLE_FEE when t.bill_type = 1 and yw.REVENUE_TYPE = 0 then -yw.ACT_RECEIVABLE_FEE else yw.ACT_RECEIVABLE_FEE END),0) from yw_contract_revenue yw where yw.bill_id = t.id and yw.status = 0 and yw.isdeleted = 0 ) as actReceivableFee ")
+ .selectAs(YwContract::getCode,YwContractBill::getContractCode)
+ .selectAs(YwCustomer::getName,YwContractBill::getCustomerName)
+ .leftJoin(YwContract.class,YwContract::getId,YwContractBill::getContractId)
+ .leftJoin(YwCustomer.class,YwCustomer::getId,YwContract::getRenterId)
+ .eq(YwContractBill::getIsdeleted,Constants.ZERO)
+ .like(Objects.nonNull(model)&&StringUtils.isNotBlank(model.getCustomerName()),
+ YwCustomer::getName,model.getCustomerName())
+ .eq(Objects.nonNull(model)&&Objects.nonNull(model.getStatus()),
+ YwContractBill::getStatus,model.getStatus())
+ .eq(Objects.nonNull(model)&&Objects.nonNull(model.getBillType()),
+ YwContractBill::getBillType,model.getBillType())
+ .eq(Objects.nonNull(model)&&Objects.nonNull(model.getPayStatus()),
+ YwContractBill::getPayStatus,model.getPayStatus())
+ .in(Objects.nonNull(model)&&Objects.nonNull(model.getPayStatus()),
+ YwContractBill::getPayStatus,Constants.ZERO,Constants.THREE,Constants.TWO,Constants.FOUR)
+ .eq(Objects.nonNull(model)&&Objects.nonNull(model.getType()),
+ YwContractBill::getType,model.getType())
+ .le(Objects.nonNull(model)&&Objects.nonNull(model.getIsOverdue())&&Constants.equalsInteger(model.getIsOverdue(),Constants.ONE),
+ YwContractBill::getPlanPayDate, DateUtil.getCurrDateTime())
+ .eq(Objects.nonNull(model)&&Objects.nonNull(model.getIsOverdue())&&Constants.equalsInteger(model.getIsOverdue(),Constants.ONE),
+ YwContractBill::getStatus, Constants.ZERO)
+ .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()))
+ .orderByDesc(YwContractBill::getId));
+ this.dealRoomDetail(iPage.getRecords());
+ for (YwContractBill ywContractBill:iPage.getRecords()) {
+ //闇�鏀堕噾棰�
+ ywContractBill.setNeedReceivableFee(
+ ywContractBill.getReceivableFee().subtract(ywContractBill.getActReceivableFee())
+ );
//妤煎畤鍚嶇О
List<YwContractRoom> ywContractRoomList = ywContractBill.getYwContractRoomList();
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ywContractRoomList)){
@@ -542,4 +632,305 @@
}
+
+
+ @Override
+ public List<YwContractBillCallDataVO> getNoticeCustomerData(List<Integer> billIds){
+ List<YwContractBillCallDataVO> ywContractBillCallDataVOList = new ArrayList<>();
+ List<YwContractBill> ywContractBillList = ywContractBillMapper.selectJoinList(YwContractBill.class,new MPJLambdaWrapper<YwContractBill>()
+ .selectAll(YwContractBill.class)
+ .selectAs(YwCustomer::getName,YwContractBill::getCustomerName)
+ .selectAs(YwCustomer::getUserId,YwContractBill::getCustomerUserId)
+ .selectAs(YwCustomer::getId,YwContractBill::getCustomerId)
+ .leftJoin(YwContract.class,YwContract::getId,YwContractBill::getContractId)
+ .leftJoin(YwCustomer.class,YwCustomer::getId,YwContract::getRenterId)
+ .in(YwContractBill::getId,billIds)
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(ywContractBillList) ||
+ !Constants.equalsInteger(billIds.size(),ywContractBillList.size())
+ ){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璐﹀崟鏁版嵁閿欒锛岃鍒锋柊閲嶈瘯");
+ }
+ this.dealRoomDetail(ywContractBillList);
+ for (YwContractBill ywContractBill:ywContractBillList) {
+ YwContractBillCallDataVO ywContractBillCallDataVO = new YwContractBillCallDataVO();
+ ywContractBillCallDataVO.setBillId(ywContractBill.getId());
+ ywContractBillCallDataVO.setCustomerName(ywContractBill.getCustomerName());
+ ywContractBillCallDataVO.setUserId(ywContractBill.getCustomerUserId());
+ //鏌ヨ瀹㈡埛涓嬬殑鎵�鏈変汉鍛�
+ ywContractBillCallDataVO.setMemberList(
+ memberMapper.selectList(new QueryWrapper<Member>().lambda().eq(Member::getCustomerId,ywContractBill.getCustomerId())
+ .eq(Member::getIsdeleted,Constants.ZERO))
+ );
+ ywContractBillCallDataVOList.add(ywContractBillCallDataVO);
+ }
+ return ywContractBillCallDataVOList;
+ }
+
+
+ @Override
+ public void downloadCallFeeDoc(List<Integer> billIds, LoginUserInfo loginUserInfo,HttpServletResponse response){
+ try {
+ List<YwContractBill> ywContractBillList = ywContractBillMapper.selectJoinList(YwContractBill.class,new MPJLambdaWrapper<YwContractBill>()
+ .selectAll(YwContractBill.class)
+ .selectAs(YwCustomer::getName,YwContractBill::getCustomerName)
+ .selectAs(YwCustomer::getUserId,YwContractBill::getCustomerUserId)
+ .selectAs(YwCustomer::getId,YwContractBill::getCustomerId)
+ .selectAs(YwContractDetail::getPrice,YwContractBill::getPrice)
+ .selectAs(YwContract::getCompanyId,YwContractBill::getCompanyId)
+ .selectAs(YwContractDetail::getCircleType,YwContractBill::getCircleType)
+ .selectAs(YwContractDetail::getType,YwContractBill::getDetailType)
+ .selectAs(YwContract::getZlPayType,YwContractBill::getZlPayType)
+ .selectAs(YwContract::getWyPayType,YwContractBill::getWyPayType)
+ .select(" ( select ifnull(sum(r.rent_area),0) from yw_room y left join yw_contract_room yr on y.id = yr.room_id where yr.contract_id = t.contract_id and y.IS_INVESTMENT = 0 and yr.type = 0 ) " , YwContractBill::getTotalArea)
+ .leftJoin(YwContract.class,YwContract::getId,YwContractBill::getContractId)
+ .leftJoin(YwCustomer.class,YwCustomer::getId,YwContract::getRenterId)
+ .leftJoin(YwContractDetail.class,YwContractDetail::getId,YwContractBill::getDetailId)
+ .in(YwContractBill::getId,billIds)
+ );
+ List<YwTempConfig> ywTempConfigList = ywTempConfigMapper.selectList(new QueryWrapper<YwTempConfig>().lambda().eq(YwTempConfig::getIsdeleted,Constants.ZERO));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(ywTempConfigList)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌妯℃澘閰嶇疆椤�,璇疯仈绯荤鐞嗗憳");
+ }
+ List<YwTempConfig> tempList = ywTempConfigList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.FOUR)||
+ Constants.equalsInteger(i.getType(),Constants.FIVE)||
+ Constants.equalsInteger(i.getType(),Constants.SIX)).collect(Collectors.toList());
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(tempList)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌妯℃澘閰嶇疆椤�,璇疯仈绯荤鐞嗗憳");
+ }
+ List<File> fileList = new ArrayList<>();
+ for (YwContractBill ywContractBill:ywContractBillList) {
+ this.dealTempData(tempList,ywContractBill,loginUserInfo);
+ String fileName = "鍌垂閫氱煡鍗昣" +ywContractBill.getCode() +"_" + System.currentTimeMillis()+".docx";
+ YwTempConfig ywTempConfig = new YwTempConfig();
+ if(Constants.equalsInteger(ywContractBill.getType(),Constants.ZERO)){
+ Optional<YwTempConfig> optional = ywTempConfigList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.TWO)).findAny();
+ if (optional.isPresent()) {
+ ywTempConfig = optional.get();
+ }
+ }else{
+ Optional<YwTempConfig> optional = ywTempConfigList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)).findAny();
+ if (optional.isPresent()) {
+ ywTempConfig = optional.get();
+ }
+ }
+ if(Objects.isNull(ywTempConfig)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"妯℃澘淇℃伅寮傚父,璇疯仈绯荤鐞嗗憳");
+ }
+ String path = ExcelReplaceCommon.modifyWordTemplate(ywTempConfig.getUrl(),tempList,fileName);
+ File f = new File(path);
+ if(f !=null && f.isFile()){
+ fileList.add(f);
+ }
+ if(fileList == null || fileList.size() == 0){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ }
+ String fileName = "鍌垂閫氱煡鍗�-" +System.currentTimeMillis();
+ String encodeFileName = URLEncoder.encode(fileName, Charset.forName("UTF-8").toString())+".zip";
+ response.setHeader("Content-Disposition","attachment;filename=" + encodeFileName);
+ response.setContentType("application/octet-stream");
+ response.setHeader("eva-opera-type", "download");
+ response.setHeader("eva-download-filename", encodeFileName);
+ Constants.packFilesToZip(fileList,response.getOutputStream());
+ } catch (Exception e) {
+ throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR, e);
+ }
+ }
+
+
+ public void dealTempData(List<YwTempConfig> ywTempConfigList , YwContractBill ywContractBill, LoginUserInfo loginUserInfo){
+ //鏌ヨ鏀舵敮璐﹀彿鏁版嵁
+
+ for (YwTempConfig y:ywTempConfigList) {
+ if(y.getTitle().equals("${璐圭敤鍚嶇О}")&&Objects.nonNull(ywContractBill.getCostType())){
+ //璐圭敤绫诲瀷锛�0=绉熻祦璐癸紱1=鐗╀笟璐癸紱2=绉熻祦鎶奸噾锛�3=鐗╀笟鎶奸噾锛�4=姘寸數璐癸紱5=鏉傞」璐癸紱6=鍏朵粬; 7=淇濊瘉閲�
+ if(Constants.equalsInteger(ywContractBill.getCostType(),Constants.ZERO)){
+ y.setUrl("绉熻祦璐�");
+ }else if(Constants.equalsInteger(ywContractBill.getCostType(),Constants.ONE)){
+ y.setUrl("鐗╀笟璐�");
+ }else if(Constants.equalsInteger(ywContractBill.getCostType(),Constants.TWO)){
+ y.setUrl("绉熻祦鎶奸噾");
+ }else if(Constants.equalsInteger(ywContractBill.getCostType(),Constants.THREE)){
+ y.setUrl("鐗╀笟鎶奸噾");
+ }else if(Constants.equalsInteger(ywContractBill.getCostType(),Constants.FOUR)){
+ y.setUrl("姘寸數璐�");
+ }else if(Constants.equalsInteger(ywContractBill.getCostType(),Constants.FIVE)){
+ y.setUrl("鏉傞」璐�");
+ }else if(Constants.equalsInteger(ywContractBill.getCostType(),Constants.SIX)){
+ y.setUrl("鍏朵粬");
+ }else if(Constants.equalsInteger(ywContractBill.getCostType(),Constants.SEVEN)){
+ y.setUrl("淇濊瘉閲�");
+ }
+ }else if(y.getTitle().equals("${璁¤垂鍛ㄦ湡}")&&Objects.nonNull(ywContractBill.getDetailType())){
+ if(Constants.equalsInteger(ywContractBill.getDetailType(),Constants.ZERO)){
+ //绉熻祦鏀粯鏂瑰紡 0=涓�娆℃�т粯娆撅紱1=姣忎笁涓湀涓�浠橈紱2=鍏釜鏈堜竴浠橈紱3=涓�骞翠竴浠�
+ if(Objects.nonNull(ywContractBill.getZlPayType())){
+ if(Constants.equalsInteger(ywContractBill.getZlPayType(),Constants.ZERO)){
+ y.setUrl("涓�娆℃�т粯娆�");
+ }else if(Constants.equalsInteger(ywContractBill.getZlPayType(),Constants.ONE)){
+ y.setUrl("姣忎笁涓湀涓�浠�");
+ }else if(Constants.equalsInteger(ywContractBill.getZlPayType(),Constants.TWO)){
+ y.setUrl("鍏釜鏈堜竴浠�");
+ }else if(Constants.equalsInteger(ywContractBill.getZlPayType(),Constants.THREE)){
+ y.setUrl("涓�骞翠竴浠�");
+ }
+ }
+ }else{
+ //鐗╀笟鏀粯鏂瑰紡 0=涓�娆℃�т粯娆撅紱1=姣忎笁涓湀涓�浠橈紱2=鍏釜鏈堜竴浠橈紱3=涓�骞翠竴浠�
+ if(Objects.nonNull(ywContractBill.getWyPayType())){
+ if(Constants.equalsInteger(ywContractBill.getWyPayType(),Constants.ZERO)){
+ y.setUrl("涓�娆℃�т粯娆�");
+ }else if(Constants.equalsInteger(ywContractBill.getWyPayType(),Constants.ONE)){
+ y.setUrl("姣忎笁涓湀涓�浠�");
+ }else if(Constants.equalsInteger(ywContractBill.getWyPayType(),Constants.TWO)){
+ y.setUrl("鍏釜鏈堜竴浠�");
+ }else if(Constants.equalsInteger(ywContractBill.getWyPayType(),Constants.THREE)){
+ y.setUrl("涓�骞翠竴浠�");
+ }
+ }
+ }
+ }else if(y.getTitle().equals("${鍗曚环}")&&Objects.nonNull(ywContractBill.getPrice())){
+ y.setUrl(ywContractBill.getPrice().toString());
+ }else if(y.getTitle().equals("${鍗曚綅}")&&Objects.nonNull(ywContractBill.getCircleType())){
+ //浠樻鍛ㄦ湡绫诲瀷 0=鍏冩瘡骞崇背澶�;1=鍏冩瘡骞崇背鏈�;2=鍏冩瘡骞崇背骞�;3=鍏冩瘡澶�;4=鍏冩瘡鏈�;5=鍏冩瘡骞�;6=鍏冩瘡鍦�;
+ if(Constants.equalsInteger(ywContractBill.getCircleType(),Constants.ZERO)){
+ y.setUrl("鍏冩瘡骞崇背澶�");
+ }else if(Constants.equalsInteger(ywContractBill.getCircleType(),Constants.ONE)){
+ y.setUrl("鍏冩瘡骞崇背鏈�");
+ }else if(Constants.equalsInteger(ywContractBill.getCircleType(),Constants.ONE)){
+ y.setUrl("鍏冩瘡骞崇背骞�");
+ } else if(Constants.equalsInteger(ywContractBill.getCircleType(),Constants.ONE)){
+ y.setUrl("鍏冩瘡澶�");
+ } else if(Constants.equalsInteger(ywContractBill.getCircleType(),Constants.ONE)){
+ y.setUrl("鍏冩瘡鏈�");
+ } else if(Constants.equalsInteger(ywContractBill.getCircleType(),Constants.ONE)){
+ y.setUrl("鍏冩瘡骞�");
+ } else if(Constants.equalsInteger(ywContractBill.getCircleType(),Constants.ONE)){
+ y.setUrl("鍏冩瘡鍦�");
+ }
+ }else if(y.getTitle().equals("${搴旀敹鏃ユ湡}")&&Objects.nonNull(ywContractBill.getPlanPayDate())){
+ y.setUrl(DateUtil.formatDate(ywContractBill.getPlanPayDate(),"yyyy-MM-dd"));
+ }else if(y.getTitle().equals("${搴旀敹閲戦}")&&Objects.nonNull(ywContractBill.getReceivableFee())){
+ y.setUrl(ywContractBill.getReceivableFee().toString());
+ }else if(y.getTitle().equals("${璐﹀崟澶囨敞}")){
+ if(StringUtils.isNotBlank(ywContractBill.getRemark())){
+ y.setUrl(ywContractBill.getRemark());
+ }else{
+ y.setUrl("");
+ }
+ }else if(y.getTitle().equals("${绉熷鍚嶇О}")&&StringUtils.isNotBlank(ywContractBill.getCustomerName())){
+ y.setUrl(ywContractBill.getCustomerName());
+ }else if(y.getTitle().equals("${妤煎畤/妤煎眰/鎴挎簮}")){
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ywContractBill.getYwContractRoomList())){
+ StringBuilder roomPathName = new StringBuilder();
+ for (YwContractRoom ywContractRoom:ywContractBill.getYwContractRoomList()) {
+ 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(";");
+ }
+ }
+ y.setUrl(roomPathName.toString());
+ }
+ }else if(y.getTitle().equals("${绉熻祦闈㈢Н}")&&Objects.nonNull(ywContractBill.getTotalArea())){
+ y.setUrl(ywContractBill.getTotalArea().toString());
+ }else if(y.getTitle().equals("${鎵�灞炲叕鍙歌处鎴峰悕绉皚")){
+ y.setUrl("鎵�灞炲叕鍙歌处鎴峰悕绉�");
+ }else if(y.getTitle().equals("${鎵�灞炲叕鍙搁摱琛岃处鍙穧")){
+ y.setUrl("鎵�灞炲叕鍙搁摱琛岃处鍙�");
+ }else if(y.getTitle().equals("${鎵�灞炲叕鍙稿紑鎴烽摱琛寎")){
+ y.setUrl("鎵�灞炲叕鍙稿紑鎴烽摱琛�");
+ }else if(y.getTitle().equals("${閫氱煡鍗曠敓鎴愭棩鏈焳")){
+ y.setUrl(DateUtil.formatDate(new Date(),"yyyy-MM-dd"));
+ }else if(y.getTitle().equals("${褰撳墠鐢ㄦ埛濮撳悕}")){
+ y.setUrl(loginUserInfo.getRealname());
+ }
+ }
+ }
+
+
+ public void sendSmsEmail(List<YwSmsEmailBillCallDTO> ywSmsEmailBillCallDTOList,LoginUserInfo loginUserInfo){
+ if(CollectionUtils.isEmpty(ywSmsEmailBillCallDTOList)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ List<YwTempConfig> ywTempConfigList = ywTempConfigMapper.selectList(new QueryWrapper<YwTempConfig>().lambda().eq(YwTempConfig::getIsdeleted,Constants.ZERO));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(ywTempConfigList)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌妯℃澘閰嶇疆椤�,璇疯仈绯荤鐞嗗憳");
+ }
+ List<YwTempConfig> tempList = ywTempConfigList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.FOUR)||
+ Constants.equalsInteger(i.getType(),Constants.FIVE)||
+ Constants.equalsInteger(i.getType(),Constants.SIX)).collect(Collectors.toList());
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(tempList)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌妯℃澘閰嶇疆椤�,璇疯仈绯荤鐞嗗憳");
+ }
+ for (YwSmsEmailBillCallDTO ywSmsEmailBillCallDTO:ywSmsEmailBillCallDTOList) {
+ if(Objects.isNull(ywSmsEmailBillCallDTO)
+ || Objects.isNull(ywSmsEmailBillCallDTO.getBillId())
+ || Objects.isNull(ywSmsEmailBillCallDTO.getUserId())
+ ||Objects.isNull(ywSmsEmailBillCallDTO.getSendEmail())
+ || Objects.isNull(ywSmsEmailBillCallDTO.getSendSms())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+
+ YwContractBill ywContractBill = ywContractBillMapper.selectJoinOne(YwContractBill.class,new MPJLambdaWrapper<YwContractBill>()
+ .selectAll(YwContractBill.class)
+ .selectAs(YwCustomer::getName,YwContractBill::getCustomerName)
+ .selectAs(YwCustomer::getUserId,YwContractBill::getCustomerUserId)
+ .selectAs(YwCustomer::getId,YwContractBill::getCustomerId)
+ .selectAs(YwContractDetail::getPrice,YwContractBill::getPrice)
+ .selectAs(YwContract::getCompanyId,YwContractBill::getCompanyId)
+ .selectAs(YwContractDetail::getCircleType,YwContractBill::getCircleType)
+ .selectAs(YwContractDetail::getType,YwContractBill::getDetailType)
+ .selectAs(YwContract::getZlPayType,YwContractBill::getZlPayType)
+ .selectAs(YwContract::getWyPayType,YwContractBill::getWyPayType)
+ .select(" ( select ifnull(sum(r.rent_area),0) from yw_room y left join yw_contract_room yr on y.id = yr.room_id where yr.contract_id = t.contract_id and y.IS_INVESTMENT = 0 and yr.type = 0 ) " , YwContractBill::getTotalArea)
+ .leftJoin(YwContract.class,YwContract::getId,YwContractBill::getContractId)
+ .leftJoin(YwCustomer.class,YwCustomer::getId,YwContract::getRenterId)
+ .leftJoin(YwContractDetail.class,YwContractDetail::getId,YwContractBill::getDetailId)
+ .eq(YwContractBill::getId,ywSmsEmailBillCallDTO.getBillId())
+ .last( "limit 1" )
+ );
+ this.dealTempData(tempList,ywContractBill,loginUserInfo);
+ Member member = memberMapper.selectById(ywSmsEmailBillCallDTO.getUserId());
+ if(Objects.isNull(member)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀛樺湪鏈煡璇㈠埌鐨勪汉鍛樹俊鎭�");
+ }
+
+
+ }
+
+
+ for (YwSmsEmailBillCallDTO ywSmsEmailBillCallDTO:ywSmsEmailBillCallDTOList) {
+
+
+
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+ }
+
+
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwTempConfigServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwTempConfigServiceImpl.java
new file mode 100644
index 0000000..e3887f4
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwTempConfigServiceImpl.java
@@ -0,0 +1,191 @@
+package com.doumee.service.business.impl;
+
+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.YwTempConfigMapper;
+import com.doumee.dao.business.model.YwTempConfig;
+import com.doumee.dao.business.vo.YwCallTempDataVO;
+import com.doumee.service.business.YwTempConfigService;
+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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/**
+ * 鍌即淇℃伅閰嶇疆Service瀹炵幇
+ * @author 姹熻箘韫�
+ * @date 2025/01/10 09:43
+ */
+@Service
+public class YwTempConfigServiceImpl implements YwTempConfigService {
+
+ @Autowired
+ private YwTempConfigMapper ywTempConfigMapper;
+
+ @Override
+ public Integer create(YwTempConfig ywTempConfig) {
+ ywTempConfigMapper.insert(ywTempConfig);
+ return ywTempConfig.getId();
+ }
+
+ @Override
+ public void deleteById(Integer id) {
+ ywTempConfigMapper.deleteById(id);
+ }
+
+ @Override
+ public void delete(YwTempConfig ywTempConfig) {
+ UpdateWrapper<YwTempConfig> deleteWrapper = new UpdateWrapper<>(ywTempConfig);
+ ywTempConfigMapper.delete(deleteWrapper);
+ }
+
+ @Override
+ public void deleteByIdInBatch(List<Integer> ids) {
+ if (CollectionUtils.isEmpty(ids)) {
+ return;
+ }
+ ywTempConfigMapper.deleteBatchIds(ids);
+ }
+
+ @Override
+ public void updateById(YwTempConfig ywTempConfig) {
+ ywTempConfigMapper.updateById(ywTempConfig);
+ }
+
+ @Override
+ public void updateByIdInBatch(List<YwTempConfig> ywTempConfigs) {
+ if (CollectionUtils.isEmpty(ywTempConfigs)) {
+ return;
+ }
+ for (YwTempConfig ywTempConfig: ywTempConfigs) {
+ this.updateById(ywTempConfig);
+ }
+ }
+
+ @Override
+ public YwTempConfig findById(Integer id) {
+ return ywTempConfigMapper.selectById(id);
+ }
+
+ @Override
+ public YwTempConfig findOne(YwTempConfig ywTempConfig) {
+ QueryWrapper<YwTempConfig> wrapper = new QueryWrapper<>(ywTempConfig);
+ return ywTempConfigMapper.selectOne(wrapper);
+ }
+
+ @Override
+ public List<YwTempConfig> findList(YwTempConfig ywTempConfig) {
+ QueryWrapper<YwTempConfig> wrapper = new QueryWrapper<>(ywTempConfig);
+ return ywTempConfigMapper.selectList(wrapper);
+ }
+
+ @Override
+ public PageData<YwTempConfig> findPage(PageWrap<YwTempConfig> pageWrap) {
+ IPage<YwTempConfig> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ QueryWrapper<YwTempConfig> queryWrapper = new QueryWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ if (pageWrap.getModel().getId() != null) {
+ queryWrapper.lambda().eq(YwTempConfig::getId, pageWrap.getModel().getId());
+ }
+ if (pageWrap.getModel().getCreator() != null) {
+ queryWrapper.lambda().eq(YwTempConfig::getCreator, pageWrap.getModel().getCreator());
+ }
+ if (pageWrap.getModel().getCreateDate() != null) {
+ queryWrapper.lambda().ge(YwTempConfig::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+ queryWrapper.lambda().le(YwTempConfig::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ }
+ if (pageWrap.getModel().getEditor() != null) {
+ queryWrapper.lambda().eq(YwTempConfig::getEditor, pageWrap.getModel().getEditor());
+ }
+ if (pageWrap.getModel().getEditDate() != null) {
+ queryWrapper.lambda().ge(YwTempConfig::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+ queryWrapper.lambda().le(YwTempConfig::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+ }
+ if (pageWrap.getModel().getIsdeleted() != null) {
+ queryWrapper.lambda().eq(YwTempConfig::getIsdeleted, pageWrap.getModel().getIsdeleted());
+ }
+ if (pageWrap.getModel().getRemark() != null) {
+ queryWrapper.lambda().eq(YwTempConfig::getRemark, pageWrap.getModel().getRemark());
+ }
+ if (pageWrap.getModel().getType() != null) {
+ queryWrapper.lambda().eq(YwTempConfig::getType, pageWrap.getModel().getType());
+ }
+ if (pageWrap.getModel().getTitle() != null) {
+ queryWrapper.lambda().eq(YwTempConfig::getTitle, pageWrap.getModel().getTitle());
+ }
+ if (pageWrap.getModel().getUrl() != null) {
+ queryWrapper.lambda().eq(YwTempConfig::getUrl, pageWrap.getModel().getUrl());
+ }
+ for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+ if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
+ queryWrapper.orderByDesc(sortData.getProperty());
+ } else {
+ queryWrapper.orderByAsc(sortData.getProperty());
+ }
+ }
+ return PageData.from(ywTempConfigMapper.selectPage(page, queryWrapper));
+ }
+
+ @Override
+ public long count(YwTempConfig ywTempConfig) {
+ QueryWrapper<YwTempConfig> wrapper = new QueryWrapper<>(ywTempConfig);
+ return ywTempConfigMapper.selectCount(wrapper);
+ }
+
+
+
+ @Override
+ public YwCallTempDataVO getCallTemp(){
+ YwCallTempDataVO ywCallTempDataVO = new YwCallTempDataVO();
+ List<YwTempConfig> ywTempConfigList = ywTempConfigMapper.selectList(new QueryWrapper<YwTempConfig>().lambda()
+ .eq(YwTempConfig::getIsdeleted, Constants.ZERO));
+ Optional<YwTempConfig> smsOptional = ywTempConfigList.stream().filter(i->Constants.equalsInteger(i.getType(),
+ Constants.ZERO)).findAny();
+ if (smsOptional.isPresent()) {
+ ywCallTempDataVO.setSmsTemp(smsOptional.get());
+ }
+ Optional<YwTempConfig> emailOptional = ywTempConfigList.stream().filter(i->Constants.equalsInteger(i.getType(),
+ Constants.ONE)).findAny();
+ if (emailOptional.isPresent()) {
+ ywCallTempDataVO.setEmailTemp(emailOptional.get());
+ }
+ Optional<YwTempConfig> leaseOptional = ywTempConfigList.stream().filter(i->Constants.equalsInteger(i.getType(),
+ Constants.TWO)).findAny();
+ if (leaseOptional.isPresent()) {
+ ywCallTempDataVO.setLeaseTemp(leaseOptional.get());
+ }
+ Optional<YwTempConfig> otherOptional = ywTempConfigList.stream().filter(i->Constants.equalsInteger(i.getType(),
+ Constants.THREE)).findAny();
+ if (otherOptional.isPresent()) {
+ ywCallTempDataVO.setOtherTemp(otherOptional.get());
+ }
+ ywCallTempDataVO.setContractTempList(
+ ywTempConfigList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.FIVE)).collect(Collectors.toList())
+ );
+ ywCallTempDataVO.setBillTempList(
+ ywTempConfigList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.FOUR)).collect(Collectors.toList())
+ );
+ ywCallTempDataVO.setOtherTempList(
+ ywTempConfigList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.SIX)).collect(Collectors.toList())
+ );
+ return ywCallTempDataVO;
+ }
+
+
+
+
+
+
+
+
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/EmailService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/EmailService.java
new file mode 100644
index 0000000..cdd7a38
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/EmailService.java
@@ -0,0 +1,47 @@
+package com.doumee.service.business.third;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.mail.javamail.MimeMessageHelper;
+import org.springframework.stereotype.Service;
+
+import javax.mail.internet.MimeMessage;
+import java.io.File;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class EmailService {
+ @Autowired
+ private JavaMailSender javaMailSender;//娉ㄥ叆JavaMailSender
+ @Value("${spring.mail.username}")
+ private String fromEmail;
+ public boolean sendEmail(String toEmail, String title, String content, List<Map<String,Object>> fileList) {
+ try {
+ AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
+ context.refresh();
+ MimeMessage message = javaMailSender.createMimeMessage();
+ MimeMessageHelper helper = new MimeMessageHelper(message, true);
+
+ helper.setTo(toEmail);
+ helper.setFrom(fromEmail);
+ helper.setSubject(title);
+ helper.setText(content);
+ if(fileList!=null){
+ for (Map<String,Object> f : fileList){
+ // 璁剧疆闄勪欢
+ helper.addAttachment((String) f.get("name"),new FileSystemResource((File) f.get("file")));
+ }
+ }
+ javaMailSender.send(message);
+ System.out.println("閭欢鍙戦�佹垚鍔燂紒");
+ return true;
+ } catch (Exception e) {
+ e.printStackTrace();
+ return false;
+ }
+ }
+ }
--
Gitblit v1.9.3