From a856cfc04747d4d8f3605168531b253240d2e87c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 27 十一月 2024 08:55:07 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 39 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/AreasServiceImpl.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractCloudController.java | 18
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwProject.java | 15
admin/package-lock.json | 18
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InitServiceImpl.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwLinePoint.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractRoomServiceImpl.java | 30 +
server/system_service/src/main/java/com/doumee/dao/system/model/Multifile.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolPoint.java | 8
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolPointServiceImpl.java | 35
admin/src/api/business/areas.js | 43 ++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskServiceImpl.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwProjectService.java | 5
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/AreasCloudController.java | 20
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractRoomCloudController.java | 11
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolSchemeServiceImpl.java | 7
admin/src/views/business/areas.vue | 166 ++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDevice.java | 18
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/ProjectDataVO.java | 33 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractService.java | 6
admin/src/components/business/OperaAreasWindow.vue | 94 ++++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java | 21 +
admin/src/components/business/OperaInternalCompanyWindow.vue | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java | 231 ++++++++--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java | 115 +++++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwProjectCloudController.java | 11
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDeviceRecord.java | 4
admin/src/views/business/internalCompany.vue | 14
server/system_service/src/main/java/com/doumee/dao/system/MultifileMapper.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolLineServiceImpl.java | 7
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractBillServiceImpl.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractRoomService.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 4
admin/src/views/business/internalMember.vue | 8
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/ProjectTree.java | 93 ++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwDeviceServiceImpl.java | 44 -
37 files changed, 990 insertions(+), 156 deletions(-)
diff --git a/admin/package-lock.json b/admin/package-lock.json
index 70ff946..4adea74 100644
--- a/admin/package-lock.json
+++ b/admin/package-lock.json
@@ -6,7 +6,7 @@
"dependencies": {
"@amap/amap-jsapi-loader": {
"version": "1.0.1",
- "resolved": "https://registry.npmjs.org/@amap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.1.tgz",
+ "resolved": "https://registry.npmmirror.com/@amap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.1.tgz",
"integrity": "sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw=="
},
"@babel/code-frame": {
@@ -2917,7 +2917,7 @@
},
"ansi-styles": {
"version": "4.3.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+ "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"optional": true,
@@ -2927,7 +2927,7 @@
},
"chalk": {
"version": "4.1.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+ "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"optional": true,
@@ -2938,7 +2938,7 @@
},
"color-convert": {
"version": "2.0.1",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"optional": true,
@@ -2948,21 +2948,21 @@
},
"color-name": {
"version": "1.1.4",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
"dev": true,
"optional": true
},
"has-flag": {
"version": "4.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true,
"optional": true
},
"loader-utils": {
"version": "2.0.4",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+ "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
"integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
"dev": true,
"optional": true,
@@ -2983,7 +2983,7 @@
},
"supports-color": {
"version": "7.2.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+ "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
"optional": true,
@@ -2993,7 +2993,7 @@
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.8.3",
- "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
+ "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
"integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
"dev": true,
"optional": true,
diff --git a/admin/src/api/business/areas.js b/admin/src/api/business/areas.js
new file mode 100644
index 0000000..803018f
--- /dev/null
+++ b/admin/src/api/business/areas.js
@@ -0,0 +1,43 @@
+import request from '../../utils/request'
+
+// 鏌ヨ
+export function fetchList (data) {
+ // return request.post('/visitsAdmin/cloudService/business/areas/treeList', data, {
+ // trim: true
+ // })
+ return request.post('/visitsAdmin/cloudService/business/areas/page', data, {
+ trim: true
+ })
+}
+export function listByParentId (data) {
+ return request.post('/visitsAdmin/cloudService/business/areas/listByParentId', data)
+}
+
+// 鍒涘缓
+export function create (data) {
+ return request.post('/visitsAdmin/cloudService/business/areas/create', data)
+}
+
+// 淇敼
+export function updateById (data) {
+ return request.post('/visitsAdmin/cloudService/business/areas/updateById', data)
+}
+
+// 鏍戝舰
+export function treeList (data) {
+ return request.post('/visitsAdmin/cloudService/business/areas/listByParentId', data)
+}
+
+// 鍒犻櫎
+export function deleteById (id) {
+ return request.get(`/visitsAdmin/cloudService/business/areas/delete/${id}`)
+}
+
+// 鎵归噺鍒犻櫎
+export function deleteByIdInBatch (ids) {
+ return request.get('/visitsAdmin/cloudService/business/areas/delete/batch', {
+ params: {
+ ids
+ }
+ })
+}
diff --git a/admin/src/components/business/OperaAreasWindow.vue b/admin/src/components/business/OperaAreasWindow.vue
new file mode 100644
index 0000000..fea3c84
--- /dev/null
+++ b/admin/src/components/business/OperaAreasWindow.vue
@@ -0,0 +1,94 @@
+<template>
+ <GlobalAlertWindow
+ :title="title"
+ :visible.sync="visible"
+ :confirm-working="isWorking"
+ @confirm="confirm"
+ >
+ <el-form :model="form" ref="form" label-width="100px" label-suffix="锛�" :rules="rules">
+ <el-form-item :label="form.type==0?'甯傚悕绉�':'鍘垮尯鍚嶇О'" prop="name">
+ <el-input v-model="form.name" :placeholder="form.type==0?'杈撳叆甯傚悕绉�':'杈撳叆鍘垮尯鍚嶇О'" v-trim/>
+ </el-form-item>
+ <el-form-item label="鎺掑簭鐮�" prop="sortnum">
+ <el-input v-model="form.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜" v-trim/>
+ </el-form-item>
+ </el-form>
+ </GlobalAlertWindow>
+</template>
+
+<script>
+import BaseOpera from '@/components/base/BaseOpera'
+import GlobalAlertWindow from '@/components/common/GlobalAlertWindow'
+export default {
+ name: 'OperaAreasWindow',
+ extends: BaseOpera,
+ components: { GlobalAlertWindow },
+ data () {
+ return {
+ // 琛ㄥ崟鏁版嵁
+ form: {
+ id: null,
+ parentId: null,
+ name: null,
+ sortnum: '0',
+ type: '',
+ },
+ // 楠岃瘉瑙勫垯
+ rules: {
+ }
+ }
+ },
+ created () {
+ this.config({
+ api: '/business/areas',
+ 'field.id': 'id'
+ })
+ },
+ methods: {
+ // 纭鏂板缓
+ __confirmCreate () {
+ this.$refs.form.validate((valid) => {
+ if (!valid) {
+ return
+ }
+ // 璋冪敤鏂板缓鎺ュ彛
+ this.isWorking = true
+ this.api.create(this.form)
+ .then(() => {
+ this.visible = false
+ this.$message.success('鏂板缓鎴愬姛')
+ this.$emit('success', this.form.parentId)
+ })
+ .catch(e => {
+ this.$message.error(e)
+ })
+ .finally(() => {
+ this.isWorking = false
+ })
+ })
+ },
+ // 纭淇敼
+ __confirmEdit () {
+ this.$refs.form.validate((valid) => {
+ if (!valid) {
+ return
+ }
+ // 璋冪敤鏂板缓鎺ュ彛
+ this.isWorking = true
+ this.api.updateById(this.form)
+ .then(() => {
+ this.visible = false
+ this.$message.success('淇敼鎴愬姛')
+ this.$emit('success', this.form.parentId)
+ })
+ .catch(e => {
+ this.$message.error(e)
+ })
+ .finally(() => {
+ this.isWorking = false
+ })
+ })
+ }
+ },
+}
+</script>
diff --git a/admin/src/components/business/OperaInternalCompanyWindow.vue b/admin/src/components/business/OperaInternalCompanyWindow.vue
index ad001b2..9198f65 100644
--- a/admin/src/components/business/OperaInternalCompanyWindow.vue
+++ b/admin/src/components/business/OperaInternalCompanyWindow.vue
@@ -17,7 +17,7 @@
</el-form-item>
<el-form-item label="缁勭粐绫诲瀷" prop="type">
<el-radio-group v-model="form.type" :disabled="form.parentType == 0">
- <el-radio :label="0">鐩稿叧鏂圭粍缁�</el-radio>
+<!-- <el-radio :label="0">鐩稿叧鏂圭粍缁�</el-radio>-->
<el-radio :label="1">鍐呴儴缁勭粐</el-radio>
</el-radio-group>
</el-form-item>
@@ -74,7 +74,7 @@
console.log(target)
this.form= {
id: null,
- type: 0,
+ type: 1,
name: '',
parentId: null,
disable: false,
diff --git a/admin/src/views/business/areas.vue b/admin/src/views/business/areas.vue
new file mode 100644
index 0000000..0908620
--- /dev/null
+++ b/admin/src/views/business/areas.vue
@@ -0,0 +1,166 @@
+<template>
+ <TableLayout :permissions="['business:areas:query']">
+ <!-- 琛ㄦ牸鍜屽垎椤� -->
+ <template v-slot:table-wrap>
+ <el-table
+ ref="table"
+ v-loading="isWorking.search"
+ :data="tableData.list"
+ lazy
+ :load="load"
+ :tree-props="{ children: 'childList', hasChildren: 'hasChildren' }"
+ row-key="id"
+ stripe
+ border
+ :header-row-class-name="'table-header'"
+ class="doumee-element-table"
+ @selection-change="handleSelectionChange"
+ >
+ <el-table-column prop="name" label="鍦板尯鍚嶇О" min-width="100px"></el-table-column>
+ <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" align="center" min-width="140px"></el-table-column>
+ <el-table-column prop="sortnum" label="鎺掑簭鐮�" align="center" min-width="140px"></el-table-column>
+ <el-table-column
+ v-if="containPermissions(['business:areas:update', 'business:areas:create', 'business:areas:delete'])"
+ label="鎿嶄綔"
+ align="center"
+ min-width="220"
+ fixed="right"
+ >
+ <template slot-scope="{ row }">
+ <el-button type="text" @click="edit(row)" v-permissions="['business:areas:update']">缂栬緫</el-button>
+ <el-button v-if="row.type!=2" type="text" @click="createChild(row)" v-permissions="['business:areas:create']">鏂板缓{{ row.type==0 ? '甯�' : '鍖哄幙' }}</el-button>
+ <el-button type="text" @click="deleteById(row)" v-permissions="['business:areas:delete']">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </template>
+ <!-- 鏂板缓/淇敼 -->
+ <OperaAreasWindow ref="operaAreasWindow" @success="update"/>
+ </TableLayout>
+</template>
+
+<script>
+import BaseTable from '@/components/base/BaseTable'
+import TableLayout from '@/layouts/TableLayout'
+import Pagination from '@/components/common/Pagination'
+import OperaAreasWindow from '@/components/business/OperaAreasWindow'
+import { listByParentId } from '@/api/business/areas'
+export default {
+ name: 'Areas',
+ extends: BaseTable,
+ components: { TableLayout, Pagination, OperaAreasWindow },
+ data () {
+ return {
+ // 鎼滅储
+ searchForm: {
+ type: 0,
+ parentId: ''
+ },
+ treeMaps: new Map(),
+ parentId: null
+ }
+ },
+ created () {
+ this.config({
+ module: '鐪佸競鍖轰俊鎭〃',
+ api: '/business/areas',
+ 'field.id': 'id',
+ 'field.main': 'id'
+ })
+ this.search()
+ },
+ methods: {
+
+ // 椤电爜鍙樻洿澶勭悊
+ handlePageChange (pageIndex) {
+
+ this.isWorking.search = true
+ listByParentId(this.searchForm)
+ .then(data => {
+ this.tableData.list = this.dataAddBool(data)
+ })
+ .catch(e => {
+ console.log(e)
+ this.$tip.error('鎿嶄綔澶辫触')
+ })
+ .finally(() => {
+ this.isWorking.search = false
+ })
+ },
+ dataAddBool(array) {
+ if(array==null){
+ return []
+ }
+ array.forEach(item => {
+ item.hasChildren = item.type != 2
+ // item.childList = item.childList && this.dataAddBool(item.childList)
+ })
+ return array
+ },
+ load(tree, treeNode, resolve) {
+ this.treeMaps.set(tree.id, { tree, treeNode, resolve })
+ listByParentId({ parentId: tree.id, type: tree.type + 1 })
+ .then(data => {
+ resolve(this.dataAddBool(data || []))
+ })
+ .catch(e => {
+ console.log(e)
+ this.$tip.error('鎿嶄綔澶辫触')
+ })
+ .finally(() => {
+ this.isWorking.search = false
+ })
+ },
+ refreshLoadTree(parentId) {
+ if (this.treeMaps.get(parentId)) {
+ const { tree, treeNode, resolve } = this.treeMaps.get(parentId)
+ this.$set(this.$refs.table.store.states.lazyTreeNodeMap, parentId, [])
+ if (tree) { // 閲嶆柊鎵ц鐖惰妭鐐瑰姞杞藉瓙绾ф搷浣�
+ this.load(tree, treeNode, resolve)
+ if (tree.parentId) { // 鑻ュ瓨鍦ㄧ埛鐖风粨鐐癸紝鍒欐墽琛岀埛鐖疯妭鐐瑰姞杞藉瓙绾ф搷浣滐紝闃叉鏈�鍚庝竴涓瓙鑺傜偣琚垹闄ゅ悗鐖惰妭鐐逛笉鏄剧ず鍒犻櫎鎸夐挳
+ const a = this.treeMaps.get(tree.parentId)
+ this.load(a.tree, a.treeNode, a.resolve)
+ }
+ }
+ } else {
+ this.handlePageChange()
+ }
+ },
+ deleteById (row, childConfirm = true) {
+ // let message = `纭鍒犻櫎${this.module}銆�${row[this.configData['field.main']]}銆戝悧?`
+ let message = `纭鍒犻櫎璇ヨ褰曞悧?`
+ if (childConfirm && row.childList != null && row.childList.length > 0) {
+ // message = `纭鍒犻櫎${this.module}銆�${row[this.configData['field.main']]}銆戝強鍏跺瓙${this.module}鍚�?`
+ message = `纭鍒犻櫎璇ヨ褰曞強鍏跺瓙鏁版嵁鍚�?`
+ }
+ this.$dialog.deleteConfirm(message)
+ .then(() => {
+ this.isWorking.delete = true
+ this.api.deleteById(row[this.configData['field.id']])
+ .then(() => {
+ this.$tip.apiSuccess('鍒犻櫎鎴愬姛')
+ this.refreshLoadTree(row.parentId)
+ })
+ .catch(e => {
+ console.log(e)
+ this.$tip.error('鎿嶄綔澶辫触')
+ })
+ .finally(() => {
+ this.isWorking.delete = false
+ })
+ })
+ .catch(() => {})
+ },
+ edit(row) {
+ // this.parentId = row.type==0 ? null : row.type==1 ? '缂栬緫甯�' : '缂栬緫鍖哄幙'
+ this.$refs.operaAreasWindow.open(row.type==0 ? '缂栬緫鐪�' : row.type==1 ? '缂栬緫甯�' : '缂栬緫鍖哄幙', row)
+ },
+ createChild(row) {
+ this.$refs.operaAreasWindow.open(row.type == 0 ? '鏂板缓甯�' : '鏂板缓鍘垮尯', { parentId: row.id, name: '', type: row.type + 1 })
+ },
+ update(parentId) {
+ this.refreshLoadTree(parentId)
+ }
+ }
+}
+</script>
diff --git a/admin/src/views/business/internalCompany.vue b/admin/src/views/business/internalCompany.vue
index 60279db..82e522b 100644
--- a/admin/src/views/business/internalCompany.vue
+++ b/admin/src/views/business/internalCompany.vue
@@ -17,8 +17,8 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:company:create', 'business:company:sync']">
- <li><el-button type="primary" v-permissions="['business:company:create']" @click="$refs.OperaInternalCompanyWindow.open('鏂板缓浼佷笟',null,null)">鏂板缓</el-button></li>
- <li><el-button @click="sort('top')" :loading="sorting" icon="el-icon-sort-up" v-permissions="['business:company:sort']">涓婄Щ</el-button></li>
+ <li><el-button type="primary" v-permissions="['business:company:create']" @click="$refs.OperaInternalCompanyWindow.open('鏂板缓缁勭粐',null,null)">鏂板缓</el-button></li>
+ <li><el-button @click="sort('top')" :loaing="sorting" icon="el-icon-sort-up" v-permissions="['business:company:sort']">涓婄Щ</el-button></li>
<li><el-button @click="sort('bottom')" :loading="sorting" icon="el-icon-sort-down" v-permissions="['business:company:sort']">涓嬬Щ</el-button></li>
<li><el-button type="primary" v-permissions="['business:company:sync']" :loading="loading" @click="synchronous()">鍚屾</el-button></li>
</ul>
@@ -29,8 +29,7 @@
:tree-props="{children: 'childList',hasChildren: 'hasChildren'}"
row-key="id"
@selection-change="handleSelectionChange"
- default-expand-all
- >
+ default-expand-all>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="name" label="缁勭粐鍚嶇О" min-width="100px"></el-table-column>
<el-table-column prop="name" label="缁勭粐绫诲瀷" min-width="80px">
@@ -45,10 +44,9 @@
<el-table-column
label="鎿嶄綔"
width="230"
- fixed="right"
- >
+ fixed="right">
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.OperaInternalCompanyWindow.open('缂栬緫浼佷笟淇℃伅',{ id: row.parentId,name:row.parentName,type:row.parentType, companyPath:row.parentCompanyPath}, row)" icon="el-icon-edit" v-permissions="['business:company:update']">缂栬緫</el-button>
+ <el-button type="text" @click="$refs.OperaInternalCompanyWindow.open('缂栬緫缁勭粐淇℃伅',{ id: row.parentId,name:row.parentName,type:row.parentType, companyPath:row.parentCompanyPath}, row)" icon="el-icon-edit" v-permissions="['business:company:update']">缂栬緫</el-button>
<el-button type="text" @click="$refs.OperaInternalCompanyWindow.open('鏂板缓瀛愮骇', row,null)" icon="el-icon-plus">鏂板缓瀛愮骇</el-button>
<el-button type="text" @click="deleteById(row)" style="color: red" icon="el-icon-delete" v-permissions="['business:company:delete']">鍒犻櫎</el-button>
</template>
@@ -83,7 +81,7 @@
},
created () {
this.config({
- module: '浼佷笟淇℃伅琛�',
+ module: '缁勭粐淇℃伅琛�',
api: '/business/company',
'field.id': 'id',
'field.main': 'id'
diff --git a/admin/src/views/business/internalMember.vue b/admin/src/views/business/internalMember.vue
index 20b95b9..98ae806 100644
--- a/admin/src/views/business/internalMember.vue
+++ b/admin/src/views/business/internalMember.vue
@@ -53,7 +53,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:member:delete', 'business:member:create,business:empower:create']">
-
+
<li><el-button type="primary"
@click="$refs.OperaMemberWindow.open('鏂板缓鍛樺伐', null, department, searchForm.companyType)" icon="el-icon-plus"
v-permissions="['business:member:create']">鏂板缓鍛樺伐</el-button></li>
@@ -118,7 +118,7 @@
</el-switch>
</template>
</el-table-column>
- <el-table-column label="鏄惁鍙嫓璁�">
+<!-- <el-table-column label="鏄惁鍙嫓璁�">
<template slot-scope="{row}">
<el-switch @change="changeCanvisit($event, row)" v-model="row.canVisit" active-color="#13ce66"
inactive-color="#ff4949" :active-value="1" :inactive-value="0">
@@ -162,7 +162,7 @@
<el-button @click="$refs.cardOpeningRecord.open('寮�鍗¤褰�', row.id)" type="text">{{ row.memberCardCount ||
'0'}}</el-button>
</template>
- </el-table-column>
+ </el-table-column>-->
<el-table-column prop="editorName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
<el-table-column prop="editDate" label="鏈�鍚庢搷浣滄椂闂�" min-width="150px"></el-table-column>
<el-table-column
@@ -171,6 +171,8 @@
<template slot-scope="{row}">
<el-button type="text" icon="el-icon-edit" @click="$refs.OperaMemberWindow.open('缂栬緫鍛樺伐淇℃伅', row, department)"
v-permissions="['business:empower:update']">缂栬緫</el-button>
+<!-- <el-button type="text" icon="el-icon-plus" @click="empower(row.id)"
+ v-permissions="['business:empower:create']">閲嶆柊鎺堟潈</el-button>-->
<el-button type="text" :loading="heading" style="color: red" icon="el-icon-delete"
@click="updateHead(row, 0)" v-if="row.headStatus == 1"
v-permissions="['business:member:head']">鍙栨秷涓荤</el-button>
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 336d44e..960ad0d 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
@@ -184,6 +184,45 @@
public static final String TIMEOUT_WARNING = "TIMEOUT_WARNING";
// FTP鏂囦欢鏈嶅姟鍣ㄨ祫婧愯闂湴鍧�
+ /**
+ * 浠樻鍛ㄦ湡绫诲瀷 0=鍏冩瘡骞崇背澶╋紱1=鍏冩瘡骞崇背鏈堬紱2=鍏冩瘡骞崇背骞达紱3=鍏冩瘡澶╋紱4=鍏冩瘡鏈堬紱5=鍏冩瘡骞达紱6=鍏冩瘡鍦猴紱
+ * @param circleType
+ * @return
+ */
+ public static String getUnitTypeByNum(Integer circleType) {
+
+ int zlPayType = Constants.formatIntegerNum(circleType);
+ if(zlPayType == 1){
+ return "鍏�/銕÷锋湀";
+ }else if(zlPayType == 2){
+ return "鍏�/銕÷峰ぉ";
+ }else if(zlPayType == 3){
+ return "鍏�/澶�";
+ }else if(zlPayType == 4){
+ return "鍏�/鏈�";
+ }else if(zlPayType == 5){
+ return "鍏�/骞�";
+ }else if(zlPayType == 6){
+ return "鍏�/鍦�";
+ }
+ return "鍏�/銕÷峰ぉ";
+ }
+
+ /**
+ * 鍛ㄦ湡鏀粯鏂瑰紡 0=涓�娆℃�т粯娆撅紱1=姣忎笁涓湀涓�浠橈紱2=鍏釜鏈堜竴浠橈紱3=涓�骞翠竴浠�
+ * @param zlPayType
+ * @return
+ */
+ public static String getPayTypeByNum(Integer zlPayType) {
+ if(zlPayType == 1){
+ return "3涓湀涓�浠�";
+ }else if(zlPayType == 2){
+ return "6涓湀涓�浠�";
+ }else if(zlPayType == 3){
+ return "1骞翠竴浠�";
+ }
+ return "涓�娆℃�т粯娆�";
+ }
public static String getRandom6Num( ) {
Random random = new Random();
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/MultifileMapper.java b/server/system_service/src/main/java/com/doumee/dao/system/MultifileMapper.java
index 1b1d62b..cedffeb 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/MultifileMapper.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/MultifileMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.system.model.Multifile;
+import com.github.yulichang.base.MPJBaseMapper;
import java.util.List;
@@ -9,6 +10,6 @@
* @author 姹熻箘韫�
* @date 2023/05/04 18:18
*/
-public interface MultifileMapper extends BaseMapper<Multifile> {
+public interface MultifileMapper extends MPJBaseMapper<Multifile> {
}
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/Multifile.java b/server/system_service/src/main/java/com/doumee/dao/system/model/Multifile.java
index add8c58..b0a6fb3 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/Multifile.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/Multifile.java
@@ -79,6 +79,9 @@
@TableField(exist = false)
private String fileurlFull;
+ @ApiModelProperty(value = "鍒涘缓浜哄悕绉�")
+ @TableField(exist = false)
+ private String userName;
@ApiModelProperty(value = "鍐呯綉鏂囦欢鍦板潃")
@TableField(exist = false)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/AreasCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/AreasCloudController.java
index 480b024..6c0f5a8 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/AreasCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/AreasCloudController.java
@@ -1,6 +1,7 @@
package com.doumee.cloud.admin;
import com.doumee.api.BaseController;
+import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
@@ -12,7 +13,6 @@
import com.doumee.service.business.AreasService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -36,7 +36,7 @@
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
- @RequiresPermissions("business:areas:create")
+ @CloudRequiredPermission("business:areas:create")
public ApiResponse create(@RequestBody Areas areas,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
areas.setLoginUserInfo(getLoginUser(token));
return ApiResponse.success(areasService.create(areas));
@@ -44,7 +44,7 @@
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
- @RequiresPermissions("business:areas:delete")
+ @CloudRequiredPermission("business:areas:delete")
public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
areasService.deleteById(id);
return ApiResponse.success(null);
@@ -52,7 +52,7 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
- @RequiresPermissions("business:areas:delete")
+ @CloudRequiredPermission("business:areas:delete")
public ApiResponse deleteByIdInBatch(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
String [] idArray = ids.split(",");
List<Integer> idList = new ArrayList<>();
@@ -65,7 +65,7 @@
@ApiOperation("鏍规嵁ID淇敼")
@PostMapping("/updateById")
- @RequiresPermissions("business:areas:update")
+ @CloudRequiredPermission("business:areas:update")
public ApiResponse updateById(@RequestBody Areas areas,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
areas.setLoginUserInfo(getLoginUser(token));
areasService.updateById(areas);
@@ -74,14 +74,14 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
-// @RequiresPermissions("business:areas:query")
+// @CloudRequiredPermission("business:areas:query")
public ApiResponse<PageData<Areas>> findPage (@RequestBody PageWrap<Areas> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(areasService.findPage(pageWrap));
}
@ApiOperation("鍏ㄩ儴鏍戝舰鏌ヨ")
@PostMapping("/treeList")
-// @RequiresPermissions("business:areas:query")
+// @CloudRequiredPermission("business:areas:query")
public ApiResponse<List<Areas>> treeList (@RequestBody AreasDto pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
Areas a = new Areas();
BeanUtils.copyProperties(pageWrap,a);
@@ -89,7 +89,7 @@
}
@ApiOperation("鏍规嵁鐖惰妭鐐规煡涓�")
@PostMapping("/listByParentId")
-// @RequiresPermissions("business:areas:query")
+// @CloudRequiredPermission("business:areas:query")
public ApiResponse<List<Areas>> listByParentId (@RequestBody AreasDto pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
Areas a = new Areas();
BeanUtils.copyProperties(pageWrap,a);
@@ -101,14 +101,14 @@
}
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
- @RequiresPermissions("business:areas:exportExcel")
+ @CloudRequiredPermission("business:areas:exportExcel")
public void exportExcel (@RequestBody PageWrap<Areas> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
ExcelExporter.build(Areas.class).export(areasService.findPage(pageWrap).getRecords(), "鐪佸競鍖轰俊鎭〃", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
- @RequiresPermissions("business:areas:query")
+ @CloudRequiredPermission("business:areas:query")
public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(areasService.findById(id));
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractCloudController.java
index 73abf9f..9896571 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractCloudController.java
@@ -9,6 +9,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.YwContract;
+import com.doumee.dao.business.model.YwContractBill;
import com.doumee.service.business.YwContractService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -39,6 +40,14 @@
public ApiResponse create(@RequestBody YwContract ywContract,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
ywContract.setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(ywContractService.create(ywContract));
+ }
+ @PreventRepeat
+ @ApiOperation("鏍规嵁鍙傛暟棰勭敓鎴愯处鍗曚俊鎭�")
+ @PostMapping("/getBillList")
+ @CloudRequiredPermission("business:ywcontract:create")
+ public ApiResponse< List<YwContractBill> > getBillList(@RequestBody YwContract ywContract, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ ywContract.setLoginUserInfo(this.getLoginUser(token));
+ return ApiResponse.success(ywContractService.getBillList(ywContract));
}
@PreventRepeat
@ApiOperation("閫�绉�")
@@ -87,6 +96,15 @@
return ApiResponse.success(ywContractService.findPage(pageWrap));
}
+
+ @ApiOperation("鍒楄〃")
+ @PostMapping("/list")
+ @CloudRequiredPermission("business:ywcontract:query")
+ public ApiResponse<List<YwContract>> list (@RequestBody YwContract model,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ return ApiResponse.success(ywContractService.findList(model));
+ }
+
+
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@CloudRequiredPermission("business:ywcontract:exportExcel")
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractRoomCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractRoomCloudController.java
index 735b99e..d412d4d 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractRoomCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractRoomCloudController.java
@@ -93,6 +93,17 @@
pageWrap.setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(ywContractRoomService.findList(pageWrap));
}
+
+
+ @ApiOperation("鏌ヨ鍚堝悓鎴栬处鍗曟埧闂翠俊鎭�")
+ @PostMapping("/getContractRoom")
+ @CloudRequiredPermission("business:ywcontractroom:query")
+ public ApiResponse<List<YwContractRoom>> getContractRoom (@RequestBody YwContractRoom pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ pageWrap.setLoginUserInfo(this.getLoginUser(token));
+ return ApiResponse.success(ywContractRoomService.getContractRoom(pageWrap));
+ }
+
+
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@CloudRequiredPermission("business:ywcontractroom:query")
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwProjectCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwProjectCloudController.java
index f71ff2c..02e8e94 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwProjectCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwProjectCloudController.java
@@ -9,6 +9,7 @@
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.YwProject;
import com.doumee.dao.business.model.YwRoom;
+import com.doumee.dao.business.vo.ProjectDataVO;
import com.doumee.service.business.YwProjectService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -85,6 +86,16 @@
return ApiResponse.success(ywProjectService.findPage(pageWrap));
}
+
+ @ApiOperation("椤圭洰鏍�")
+ @PostMapping("/tree")
+ @CloudRequiredPermission("business:ywproject:query")
+ public ApiResponse<List<ProjectDataVO>> tree (@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ return ApiResponse.success(ywProjectService.projectTree());
+ }
+
+
+
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@CloudRequiredPermission("business:ywproject:exportExcel")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java
index 7247bdf..e7ecb22 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java
@@ -142,6 +142,18 @@
@ApiModelProperty(value = "绉熻祦鏉℃鎶奸噾锛堝厓锛�", example = "1")
@ExcelColumn(name="绉熻祦鏉℃鎶奸噾锛堝厓锛�")
private BigDecimal zlDeposit;
+ @ApiModelProperty(value = "棣栨湡绉熻祦鏉℃鍗曚环锛堝厓锛�", example = "1")
+ @ExcelColumn(name="棣栨湡绉熻祦鏉℃鍗曚环锛堝厓锛�")
+ private BigDecimal zlFirstPrice;
+ @ApiModelProperty(value = "棣栨湡绉熻祦鏉℃浠锋牸鍗曚綅", example = "1")
+ @ExcelColumn(name="棣栨湡绉熻祦鏉℃浠锋牸鍗曚綅")
+ private Integer zlFirstCircle;
+ @ApiModelProperty(value = "鐗╀笟绉熻祦鏉℃鍗曚环锛堝厓锛�", example = "1")
+ @ExcelColumn(name="鐗╀笟绉熻祦鏉℃鍗曚环锛堝厓锛�")
+ private BigDecimal wyFirstPrice;
+ @ApiModelProperty(value = "鐗╀笟绉熻祦鏉℃浠锋牸鍗曚綅", example = "1")
+ @ExcelColumn(name="鐗╀笟绉熻祦鏉℃浠锋牸鍗曚綅")
+ private Integer wyFirstCircle;
@ApiModelProperty(value = "绉熻祦鏀粯鏂瑰紡 0=涓�娆℃�т粯娆撅紱1=姣忎笁涓湀涓�浠橈紱2=鍏釜鏈堜竴浠橈紱3=涓�骞翠竴浠�", example = "1")
@ExcelColumn(name="绉熻祦鏀粯鏂瑰紡 0=涓�娆℃�т粯娆撅紱1=姣忎笁涓湀涓�浠橈紱2=鍏釜鏈堜竴浠橈紱3=涓�骞翠竴浠�")
@@ -232,7 +244,16 @@
@ApiModelProperty(value = "閫�娆炬湭缁撴竻璐﹀崟鏁�")
@TableField(exist = false)
private int btWaitBill;
+ @ApiModelProperty(value = "鐢熸垚璐﹀崟绫诲瀷 0绉熻祦璐﹀崟 1鐗╀笟璐﹀崟")
+ @TableField(exist = false)
+ private int billType;
+ @ApiModelProperty(value = "绉熻祦绉熻祦鏉℃浠锋牸鍗曚綅锛屾蹇靛悕绉�", example = "1")
+ @TableField(exist = false)
+ private String zlFirstCircleStr;
+ @ApiModelProperty(value = "鐗╀笟绉熻祦鏉℃浠锋牸鍗曚綅锛屾蹇靛悕绉�", example = "1")
+ @TableField(exist = false)
+ private String wyFirstCircleStr;
@ApiModelProperty(value = "閫�绉熸椂鏂板鐨勬敹浠樻璐﹀崟")
@TableField(exist = false)
private List<YwContractBill> addBillList;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDevice.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDevice.java
index cff24ae..99f3efe 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDevice.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDevice.java
@@ -68,7 +68,7 @@
@ApiModelProperty(value = "璁惧鍨嬪彿", example = "1")
@ExcelColumn(name="璁惧鍨嬪彿")
- private Integer modelNo;
+ private String modelNo;
@ApiModelProperty(value = "鎵�灞炲垎绫荤紪鐮侊紙绠＄悊category锛�", example = "1")
@ExcelColumn(name="鎵�灞炲垎绫荤紪鐮侊紙绠＄悊category锛�")
@@ -80,8 +80,7 @@
@ApiModelProperty(value = "渚涘簲鍟�")
@ExcelColumn(name="渚涘簲鍟�")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date company;
+ private String supplier;
@ApiModelProperty(value = "杩愮淮鍐呭")
@ExcelColumn(name="杩愮淮鍐呭")
@@ -103,7 +102,16 @@
@TableField(exist = false)
private String realName;
- @ApiModelProperty(value = "闄勪欢淇℃伅")
+ @ApiModelProperty(value = "鍥剧墖鍦板潃")
@TableField(exist = false)
- private Multifile multifile;
+ private String fileUrl;
+
+ @ApiModelProperty(value = "鍥剧墖鍦板潃鍏ㄨ矾寰�")
+ @TableField(exist = false)
+ private String fileFullUrl;
+
+
+// @ApiModelProperty(value = "闄勪欢淇℃伅")
+// @TableField(exist = false)
+// private Multifile multifile;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDeviceRecord.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDeviceRecord.java
index 9cacb9e..f9c5638 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDeviceRecord.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDeviceRecord.java
@@ -33,14 +33,14 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿",index = 5, dateFormat = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwLinePoint.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwLinePoint.java
index 54cc29c..cdabeb9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwLinePoint.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwLinePoint.java
@@ -73,5 +73,7 @@
@TableField(exist = false)
private String pointName;
-
+ @ApiModelProperty(value = "宸℃鐐圭紪鐮�")
+ @TableField(exist = false)
+ private String code;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolPoint.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolPoint.java
index e1e0d05..8b69a5e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolPoint.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolPoint.java
@@ -107,9 +107,13 @@
@TableField(exist = false)
private String deviceName;
- @ApiModelProperty(value = "闄勪欢淇℃伅")
+ @ApiModelProperty(value = "闄勪欢鍦板潃")
@TableField(exist = false)
- private Multifile multifile;
+ private String fileUrl;
+
+ @ApiModelProperty(value = "闄勪欢鍏ㄨ矾寰勫湴鍧�")
+ @TableField(exist = false)
+ private String fileFullUrl;
@ApiModelProperty(value = "杩囨护鏁版嵁")
@TableField(exist = false)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwProject.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwProject.java
index 7fc920c..dd0675c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwProject.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwProject.java
@@ -82,5 +82,20 @@
@ApiModelProperty(value = "鍙嫑鍟嗘埧婧愭暟")
@TableField(exist = false)
private Integer roomeRentNum;
+ @ApiModelProperty(value = "鍩庡競鍚嶇О")
+ @TableField(exist = false)
+ private String cityName;
+ @ApiModelProperty(value = "鍖哄煙鍚嶇О")
+ @TableField(exist = false)
+ private String areaName;
+ @ApiModelProperty(value = "鍩庡競绶ㄧ⒓")
+ @TableField(exist = false)
+ private Integer cityId;
+ @ApiModelProperty(value = "鐪佷唤鍚嶇О")
+ @TableField(exist = false)
+ private String provinceName;
+ @ApiModelProperty(value = "鐪乮d")
+ @TableField(exist = false)
+ private Integer provinceId;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/ProjectDataVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/ProjectDataVO.java
new file mode 100644
index 0000000..f292cb0
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/ProjectDataVO.java
@@ -0,0 +1,33 @@
+package com.doumee.dao.business.vo;
+
+import com.doumee.dao.business.model.Approve;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2024/5/23 14:56
+ */
+@Data
+public class ProjectDataVO {
+
+ @ApiModelProperty(value = "涓氬姟涓婚敭")
+ private Integer id;
+
+ @ApiModelProperty(value = "涓氬姟鍚嶇О")
+ private String name;
+
+ @ApiModelProperty(value = "鐖剁骇涓婚敭")
+ private Integer pId;
+
+ @ApiModelProperty(value = "绾у埆")
+ private Integer lv;
+
+ @ApiModelProperty(value = "瀛愰泦鏁版嵁")
+ private List<ProjectDataVO> projectDataVOList;
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/ProjectTree.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/ProjectTree.java
new file mode 100644
index 0000000..98080fe
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/ProjectTree.java
@@ -0,0 +1,93 @@
+package com.doumee.dao.business.vo;
+
+import com.doumee.config.DataSyncConfig;
+import com.doumee.core.utils.Constants;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2023/7/13 10:40
+ */
+public class ProjectTree {
+
+ // 淇濆瓨鍙備笌鏋勫缓鏍戝舰鐨勬墍鏈夋暟鎹紙閫氬父鏁版嵁搴撴煡璇㈢粨鏋滐級
+ public List<ProjectDataVO> nodeList = new ArrayList<>();
+
+
+
+ /**
+ * 鏋勯�犳柟娉�
+ * @param nodeList 灏嗘暟鎹泦鍚堣祴鍊肩粰nodeList锛屽嵆鎵�鏈夋暟鎹綔涓烘墍鏈夎妭鐐广��
+ */
+ public ProjectTree(List<ProjectDataVO> nodeList){
+ this.nodeList = nodeList;
+ }
+
+
+ /**
+ * 鑾峰彇闇�鏋勫缓鐨勬墍鏈夋牴鑺傜偣锛堥《绾ц妭鐐癸級 "0"
+ * @return 鎵�鏈夋牴鑺傜偣List闆嗗悎
+ */
+ public List<ProjectDataVO> getRootNode(){
+ // 淇濆瓨鎵�鏈夋牴鑺傜偣锛堟墍鏈夋牴鑺傜偣鐨勬暟鎹級
+ List<ProjectDataVO> rootNodeList = new ArrayList<>();
+ // treeNode锛氭煡璇㈠嚭鐨勬瘡涓�鏉℃暟鎹紙鑺傜偣锛�
+ for (ProjectDataVO treeNode : nodeList){
+ if (Objects.isNull(treeNode.getPId()) && Constants.equalsInteger(treeNode.getLv(),Constants.ZERO)) {
+ // 鏄紝娣诲姞
+ rootNodeList.add(treeNode);
+ }
+ }
+ return rootNodeList;
+ }
+
+
+ /**
+ * 鏍规嵁姣忎竴涓《绾ц妭鐐癸紙鏍硅妭鐐癸級杩涜鏋勫缓鏍戝舰缁撴瀯
+ * @return 鏋勫缓鏁存５鏍�
+ */
+ public List<ProjectDataVO> buildTree(){
+ // treeNodes锛氫繚瀛樹竴涓《绾ц妭鐐规墍鏋勫缓鍑烘潵鐨勫畬鏁存爲褰�
+ List<ProjectDataVO> treeNodes = new ArrayList<ProjectDataVO>();
+ // getRootNode()锛氳幏鍙栨墍鏈夌殑鏍硅妭鐐�
+ for (ProjectDataVO treeRootNode : getRootNode()) {
+ // 灏嗛《绾ц妭鐐硅繘琛屾瀯寤哄瓙鏍�
+ treeRootNode = buildChildTree(treeRootNode);
+ // 瀹屾垚涓�涓《绾ц妭鐐规墍鏋勫缓鐨勬爲褰紝澧炲姞杩涙潵
+ treeNodes.add(treeRootNode);
+ }
+ return treeNodes;
+ }
+
+ /**
+ * 閫掑綊-----鏋勫缓瀛愭爲褰㈢粨鏋�
+ * @param pNode 鏍硅妭鐐癸紙椤剁骇鑺傜偣锛�
+ * @return 鏁存５鏍�
+ */
+ public ProjectDataVO buildChildTree(ProjectDataVO pNode){
+ List<ProjectDataVO> childTree = new ArrayList<ProjectDataVO>();
+ // nodeList锛氭墍鏈夎妭鐐归泦鍚堬紙鎵�鏈夋暟鎹級
+ for (ProjectDataVO treeNode : nodeList) {
+ // 鍒ゆ柇褰撳墠鑺傜偣鐨勭埗鑺傜偣ID鏄惁绛変簬鏍硅妭鐐圭殑ID锛屽嵆褰撳墠鑺傜偣涓哄叾涓嬬殑瀛愯妭鐐�
+ if (!Objects.isNull(treeNode.getPId())
+ && Constants.equalsInteger(treeNode.getPId(),pNode.getId())
+ && Constants.equalsInteger((treeNode.getLv() - 1 ),pNode.getLv())
+ ) {
+ // 鍐嶉�掑綊杩涜鍒ゆ柇褰撳墠鑺傜偣鐨勬儏鍐碉紝璋冪敤鑷韩鏂规硶
+ childTree.add(buildChildTree(treeNode));
+ }
+ }
+ // for寰幆缁撴潫锛屽嵆鑺傜偣涓嬫病鏈変换浣曡妭鐐癸紝鏍戝舰鏋勫缓缁撴潫锛岃缃爲缁撴灉
+ pNode.setProjectDataVOList(childTree);
+ return pNode;
+ }
+
+
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractRoomService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractRoomService.java
index 23e6024..3aa5a39 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractRoomService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractRoomService.java
@@ -79,6 +79,9 @@
* @return List<YwContractRoom>
*/
List<YwContractRoom> findList(YwContractRoom ywContractRoom);
+
+ List<YwContractRoom> getContractRoom(YwContractRoom ywContractRoom);
+
/**
* 鍒嗛〉鏌ヨ
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractService.java
index 58af13f..819febd 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractService.java
@@ -4,6 +4,8 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.YwContract;
+import com.doumee.dao.business.model.YwContractBill;
+
import java.util.List;
/**
@@ -20,7 +22,7 @@
* @return Integer
*/
Integer create(YwContract ywContract);
-
+ List<YwContractBill> getBillList(YwContract ywContract);
/**
* 涓婚敭鍒犻櫎
*
@@ -97,4 +99,6 @@
long count(YwContract ywContract);
Integer backRent(YwContract ywContract);
+
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwProjectService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwProjectService.java
index f8a8923..d4232c7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwProjectService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwProjectService.java
@@ -4,6 +4,8 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.YwProject;
+import com.doumee.dao.business.vo.ProjectDataVO;
+
import java.util.List;
/**
@@ -95,4 +97,7 @@
* @return long
*/
long count(YwProject ywProject);
+
+
+ List<ProjectDataVO> projectTree();
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/AreasServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/AreasServiceImpl.java
index 1b2ed39..2416bac 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/AreasServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/AreasServiceImpl.java
@@ -21,6 +21,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import javax.annotation.PostConstruct;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -316,6 +317,7 @@
return result;
}
@Override
+ @PostConstruct
public void cacheData() {
Areas a = new Areas();
a.setIsdeleted(Constants.ZERO);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 4cdd677..ca0ccf9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -340,7 +340,7 @@
.setSql("hk_company_path=REPLACE(hk_company_path,'"+ model.getCompanyNamePath()+"','"+newName+"')")
.likeRight(Company::getCompanyPath,model.getCompanyPath()));
//涓嬪彂娴峰悍瀹夐槻骞冲彴
- if(StringUtils.isNotBlank(model.getHkId())){
+ /* if(StringUtils.isNotBlank(model.getHkId())){
if(!editHkOrg(company)){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝缁勭粐鍚屾涓嬪彂澶辫触锛岃绋嶅悗閲嶈瘯");
}
@@ -348,7 +348,7 @@
if(!addHkOrg(company)){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝缁勭粐鍚屾涓嬪彂澶辫触锛岃绋嶅悗閲嶈瘯");
}
- }
+ }*/
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InitServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InitServiceImpl.java
index 918b813..50529ff 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InitServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InitServiceImpl.java
@@ -26,7 +26,7 @@
@Autowired
private InterfaceLogService interfaceLogService;
- @PostConstruct
+// @PostConstruct
public int initHkConfig(){
ArtemisConfig.host = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_HOST).getCode();
ArtemisConfig.appKey = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_APPKEY).getCode();
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 cd31b01..1ee8e66 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
@@ -12,6 +12,7 @@
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.MultifileMapper;
import com.doumee.dao.system.model.Multifile;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.YwContractBillService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -194,7 +195,10 @@
));
//闄勪欢鏁版嵁
- List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
+ List<Multifile> multifileList = multifileMapper.selectJoinList(Multifile.class,new MPJLambdaWrapper<Multifile>()
+ .selectAll(Multifile.class)
+ .selectAs(SystemUser::getRealname,Multifile::getUserName)
+ .leftJoin(SystemUser.class,SystemUser::getId,Multifile::getCreator)
.eq(Multifile::getObjId,id)
.eq(Multifile::getObjType,Constants.MultiFile.FN_CONTRACT_BILL_FILE.getKey()));
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractRoomServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractRoomServiceImpl.java
index 521d552..8b4a5c7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractRoomServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractRoomServiceImpl.java
@@ -5,17 +5,19 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.YwContractRoomMapper;
-import com.doumee.dao.business.model.YwContractRoom;
+import com.doumee.dao.business.model.*;
import com.doumee.service.business.YwContractRoomService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.List;
+import java.util.Objects;
/**
* 杩愮淮鍚堝悓鎴挎簮鍏宠仈淇℃伅琛⊿ervice瀹炵幇
@@ -84,7 +86,31 @@
QueryWrapper<YwContractRoom> wrapper = new QueryWrapper<>(ywContractRoom);
return ywContractRoomMapper.selectList(wrapper);
}
-
+
+
+
+ @Override
+ public List<YwContractRoom> getContractRoom(YwContractRoom ywContractRoom){
+ List<YwContractRoom> ywContractRoomList = ywContractRoomMapper.selectJoinList(YwContractRoom.class,new MPJLambdaWrapper<YwContractRoom>()
+ .selectAll(YwContractRoom.class)
+ .selectAs(YwProject::getName, YwRoom::getProjectName)
+ .selectAs(YwFloor::getName,YwRoom::getFloorName)
+ .selectAs(YwBuilding::getName,YwRoom::getBuildingName)
+ .selectAs(YwRoom::getName,YwContractRoom::getRoomName)
+ .leftJoin(YwRoom.class,YwRoom::getId,YwContractRoom::getRoomId)
+ .leftJoin(YwFloor.class,YwFloor::getId,YwRoom::getFloor)
+ .leftJoin(YwProject.class,YwProject::getId,YwRoom::getProjectId)
+ .leftJoin(YwBuilding.class,YwBuilding::getId,YwRoom::getBuildingId)
+ .eq(Objects.nonNull(ywContractRoom.getType()),YwContractRoom::getType,ywContractRoom.getType())
+ .eq(Objects.nonNull(ywContractRoom.getContractId()),YwContractRoom::getContractId,ywContractRoom.getContractId()))
+ ;
+ return ywContractRoomList;
+
+ }
+
+
+
+
@Override
public PageData<YwContractRoom> findPage(PageWrap<YwContractRoom> pageWrap) {
IPage<YwContractRoom> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
index e8e6bbc..7a3838f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
@@ -85,6 +85,124 @@
dealLogBiz(model,Constants.YwLogType.CONTRACT_CREATE,null,null);//璁板綍鏂板缓鏃ュ織
return model.getId();
}
+ @Override
+ public List<YwContractBill> getBillList(YwContract model){
+ isParamValidForBill(model);
+ model.setCreateDate(new Date());
+ model.setEditDate(model.getCreateDate());
+ dealDetailListBiz(model);//澶勭悊鏉℃淇℃伅
+ return model.getBillList();
+ }
+
+ private void isParamValidForBill(YwContract model) {
+ if(model.getStartDate() == null
+ ||model.getEndDate() == null
+ ||model.getProjectId() == null
+ ||model.getCompanyId() == null
+ ||model.getRoundedUp() == null
+ ||model.getRoomIds() == null
+ ||model.getRoomIds().size() == 0
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇锋寜椤甸潰瑕佹眰濉啓鍚堝悓淇℃伅");
+ }
+ if(model.getEndDate().getTime()<= model.getStartDate().getTime()){
+
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鍚堝悓鏈夋晥鏈熺粨鏉熸椂闂翠笉寰楁棭浜庡紑濮嬫椂闂达紒");
+ }
+
+ if(model.getBillType() ==0 ){
+ //濡傛灉鐢熸垚绉熻祦鏉℃
+ if( model.getZlDeposit() == null
+ ||model.getZlPayType() == null
+ || model.getZlPayType()>3
+ || model.getZlPayType()<0
+ ||model.getZlDetailList()==null
+ ||model.getZlDetailList().size() ==0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇锋寜椤甸潰瑕佹眰濉啓绉熻祦鏉℃淇℃伅");
+ }
+ if(!(model.getZlFreeEndDate()==null && model.getZlFreeStartDate()==null) && (
+ (model.getZlFreeEndDate()!=null && model.getZlFreeStartDate()==null)
+ ||(model.getZlFreeEndDate()==null && model.getZlFreeStartDate()!=null)
+ ||model.getZlFreeEndDate().getTime()<= model.getZlFreeStartDate().getTime())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨姝ｇ‘鐨勭璧佹潯娆惧厤绉熸湡淇℃伅锛�");
+ }
+ for(YwContractDetail d :model.getZlDetailList()){
+ if( d.getStartDate() == null
+ ||d.getEndDate() == null
+ ||d.getPrice() == null
+ ||d.getCircleType() == null
+ || d.getCircleType()>6
+ || d.getCircleType()<0
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇锋寜椤甸潰瑕佹眰濉啓绉熻祦鏉℃淇℃伅!");
+ }
+ if(d.getEndDate().getTime()<= d.getStartDate().getTime()){
+
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绉熻祦鏉℃鏈夋晥鏈熺粨鏉熸椂闂翠笉寰楁棭浜庡紑濮嬫椂闂达紒");
+ }
+ if(!Constants.equalsInteger(model.getWyPayType(),Constants.ZERO) &&
+ Constants.equalsInteger(d.getCircleType(),Constants.SIX)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绉熻祦鏉℃鍙湁閫夋嫨涓�娆℃�т粯娆炬椂锛屾墠鑳介�夋嫨璇ユ寜姣忓満鏀惰垂锛�");
+ }
+ }
+ }
+ if(model.getBillType() == 1 ){
+ //濡傛灉鐢熸垚鐗╀笟鏉℃
+ if( model.getWyDeposit() == null
+ ||model.getWyPayType() == null
+ || model.getWyPayType()>3
+ || model.getWyPayType()<0
+ ||model.getWyDetailList()==null
+ ||model.getWyDetailList().size() ==0
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇锋寜椤甸潰瑕佹眰濉啓鐗╀笟鏉℃淇℃伅");
+ }
+ if(!(model.getWyFreeEndDate()==null && model.getWyFreeStartDate()==null) && (
+ (model.getWyFreeEndDate()!=null && model.getWyFreeStartDate()==null)
+ ||(model.getWyFreeEndDate()==null && model.getWyFreeStartDate()!=null)
+ ||model.getWyFreeEndDate().getTime()<= model.getWyFreeStartDate().getTime())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨姝ｇ‘鐨勭墿涓氭潯娆惧厤绉熸湡淇℃伅锛�");
+ }
+ for(YwContractDetail d :model.getWyDetailList()){
+ if( d.getStartDate() == null
+ ||d.getEditDate() == null
+ ||d.getPrice() == null
+ ||d.getCircleType() == null
+ || d.getCircleType()>6
+ || d.getCircleType()<0
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇锋寜椤甸潰瑕佹眰濉啓鐗╀笟鏉℃淇℃伅!");
+ }
+ if(d.getEndDate().getTime()<= d.getStartDate().getTime()){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鐗╀笟鏉℃鏈夋晥鏈熺粨鏉熸椂闂翠笉寰楁棭浜庡紑濮嬫椂闂达紒");
+ }
+ if(!Constants.equalsInteger(model.getWyPayType(),Constants.ZERO) &&
+ Constants.equalsInteger(d.getCircleType(),Constants.SIX)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鐗╀笟鏉℃鍙湁閫夋嫨涓�娆℃�т粯娆炬椂锛屾墠鑳介�夋嫨璇ユ寜姣忓満鏀惰垂锛�");
+ }
+ }
+ }
+
+ YwProject project = projectMapper.selectById(model.getCompanyId());
+ if(project ==null || Constants.equalsInteger(project.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨姝ｇ‘鐨勯」鐩俊鎭紒");
+ }
+ List<YwRoom> rooms = roomMapper.selectList(new QueryWrapper<YwRoom>().lambda()
+ .eq(YwRoom::getIsdeleted,Constants.ZERO)
+ .in(YwRoom::getId,model.getRoomIds())
+ .eq(YwRoom::getProjectId,model.getProjectId()) );
+ if(rooms ==null || rooms.size()==0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨瀵瑰簲椤圭洰涓嬫纭殑鎴挎簮淇℃伅");
+ }
+ if(rooms.size() != rooms.size()){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝瀛樺湪鏃犳晥鐨勬埧婧愪俊鎭紒");
+ }
+ model.setTotalArea(new BigDecimal(0));
+ for(YwRoom r : rooms){
+ model.setTotalArea(model.getTotalArea().add(Constants.formatBigdecimal(r.getArea())));
+ }
+ }
private String getRemarlByParam(YwContract model) {
@@ -106,12 +224,12 @@
}
str = str.replace("{param1}",DateUtil.getDateLongSlash(model.getStartDate()))
.replace("{param2}",model.getTotalArea().intValue()+"")
- .replace("{param3}",getPayTypeByNum(model.getZlPayType()))
+ .replace("{param3}",Constants.getPayTypeByNum(model.getZlPayType()))
.replace("{param4}",zl!=null&&zl.getPrice()!=null?(zl.getPrice().intValue()+""):"0")
- .replace("{param5}",getPayTypeByNum(model.getWyPayType()))
- .replace("{param6}",getUnitTypeByNum(zl))
+ .replace("{param5}",Constants.getPayTypeByNum(model.getWyPayType()))
+ .replace("{param6}",Constants.getUnitTypeByNum(zl!=null?zl.getCircleType():null))
.replace("{param7}",zl!=null&&yw.getPrice()!=null?(zl.getPrice().intValue()+""):"0")
- .replace("{param8}",getUnitTypeByNum(yw));
+ .replace("{param8}",Constants.getUnitTypeByNum(yw!=null?yw.getCircleType():null));
return str;
}
private String getbackRentRemarkByParam(YwContract model) {
@@ -126,39 +244,6 @@
return str;
}
- private CharSequence getUnitTypeByNum(YwContractDetail zl) {
- if(zl==null){
- return "";
- }
- // 浠樻鍛ㄦ湡绫诲瀷 0=鍏冩瘡骞崇背澶╋紱1=鍏冩瘡骞崇背鏈堬紱2=鍏冩瘡骞崇背骞达紱3=鍏冩瘡澶╋紱4=鍏冩瘡鏈堬紱5=鍏冩瘡骞达紱6=鍏冩瘡鍦猴紱
- int zlPayType = Constants.formatIntegerNum(zl.getCircleType());
- if(zlPayType == 1){
- return "鍏�/銕÷锋湀";
- }else if(zlPayType == 2){
- return "鍏�/銕÷峰ぉ";
- }else if(zlPayType == 3){
- return "鍏�/澶�";
- }else if(zlPayType == 4){
- return "鍏�/鏈�";
- }else if(zlPayType == 5){
- return "鍏�/骞�";
- }else if(zlPayType == 6){
- return "鍏�/鍦�";
- }
- return "鍏�/銕÷峰ぉ";
- }
-
- private CharSequence getPayTypeByNum(Integer zlPayType) {
- //绉熻祦鏀粯鏂瑰紡 0=涓�娆℃�т粯娆撅紱1=姣忎笁涓湀涓�浠橈紱2=鍏釜鏈堜竴浠橈紱3=涓�骞翠竴浠�
- if(zlPayType == 1){
- return "3涓湀涓�浠�";
- }else if(zlPayType == 2){
- return "6涓湀涓�浠�";
- }else if(zlPayType == 3){
- return "1骞翠竴浠�";
- }
- return "涓�娆℃�т粯娆�";
- }
/**
@@ -399,7 +484,9 @@
details.add(d);
}
}
- ywContractDetailMapper.insert(details);//鎵归噺鎻掑叆鏉℃淇℃伅淇℃伅
+ if(model.getId()!=null){
+ ywContractDetailMapper.insert(details);//鎵归噺鎻掑叆鏉℃淇℃伅淇℃伅
+ }
//澶勭悊璐﹀崟淇℃伅
dealBillListBiz(model,details);
}
@@ -410,26 +497,27 @@
* @param details
*/
private void dealBillListBiz(YwContract model, List<YwContractDetail> details) {
- List<YwContractBill> billList = new ArrayList<>();
+ List<YwContractBill> billList1 = new ArrayList<>();
+ List<YwContractBill> billList2 = new ArrayList<>();
if(Constants.equalsInteger(model.getType(),Constants.ZERO )
|| Constants.equalsInteger(model.getType(),Constants.ONE)){
//濡傛灉鏈夌璧佹潯娆�
if(Constants.formatBigdecimal(model.getZlDeposit()).compareTo(new BigDecimal(0))>0){
//濡傛灉鏈夌璧佹娂閲�
- billList.add(initDepoistBill(Constants.THREE,model));
+ billList1.add(initDepoistBill(Constants.THREE,model));
}
if(Constants.equalsInteger(model.getZlPayType(), Constants.ZERO)){
//濡傛灉鏄竴娆℃�т粯娓�
- billList.addAll(getBillsByParamOnce(model,details,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
+ billList1.addAll(getBillsByParamOnce(model,details,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
}else if(Constants.equalsInteger(model.getZlPayType(), Constants.ONE)){
//濡傛灉姣忎笁涓湀涓�浠�
- billList.addAll(getBillsByParam3Months(model,details,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
+ billList1.addAll(getBillsByParam3Months(model,details,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
}else if(Constants.equalsInteger(model.getZlPayType(), Constants.TWO)){
//濡傛灉鍏釜鏈堜竴浠�
- billList.addAll(getBillsByParam6Months(model,details,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
+ billList1.addAll(getBillsByParam6Months(model,details,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
}else if(Constants.equalsInteger(model.getZlPayType(), Constants.THREE)){
//濡傛灉涓�骞翠竴浠�
- billList.addAll(getBillsByParam1Year(model,details,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
+ billList1.addAll(getBillsByParam1Year(model,details,model.getZlFreeStartDate(),model.getZlFreeEndDate()));
}
}
if(Constants.equalsInteger(model.getType(),Constants.ZERO )
@@ -437,27 +525,38 @@
//濡傛灉鐗╀笟鏉℃
if(Constants.formatBigdecimal(model.getWyDeposit()).compareTo(new BigDecimal(0))>0){
//濡傛灉鏈夌璧佹娂閲�
- billList.add(initDepoistBill(Constants.FOUR,model));
+ billList2.add(initDepoistBill(Constants.FOUR,model));
}
if(Constants.equalsInteger(model.getWyPayType(), Constants.ZERO)){
//濡傛灉鏄竴娆℃�т粯娓�
- billList.addAll(getBillsByParamOnce(model,details,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
+ billList2.addAll(getBillsByParamOnce(model,details,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
}else if(Constants.equalsInteger(model.getWyPayType(), Constants.ONE)){
//濡傛灉姣忎笁涓湀涓�浠�
- billList.addAll(getBillsByParam3Months(model,details,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
+ billList2.addAll(getBillsByParam3Months(model,details,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
}else if(Constants.equalsInteger(model.getWyPayType(), Constants.TWO)){
//濡傛灉鍏釜鏈堜竴浠�
- billList.addAll(getBillsByParam6Months(model,details,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
+ billList2.addAll(getBillsByParam6Months(model,details,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
}else if(Constants.equalsInteger(model.getWyPayType(), Constants.THREE)){
//濡傛灉涓�骞翠竴浠�
- billList.addAll(getBillsByParam1Year(model,details,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
+ billList2.addAll(getBillsByParam1Year(model,details,model.getWyFreeStartDate(),model.getWyFreeEndDate()));
}
}
- for(int i=0;i<billList.size();i++){
- billList.get(i).setSortnum(i+1);
- }
- ywContractBillMapper.insert(billList);
+ if(model.getBillType() == 0){
+ model.setBillList(billList1);
+ }else if(model.getBillType() == 0){
+ model.setBillList(billList2);
+ }
+ if(model.getId()!=null){
+ for(int i=0;i<billList1.size();i++){
+ billList1.get(i).setSortnum(i+1);
+ }
+ for(int i=0;i<billList2.size();i++){
+ billList2.get(i).setSortnum(i+1);
+ }
+ ywContractBillMapper.insert(billList1);
+ ywContractBillMapper.insert(billList2);
+ }
}
private YwContractBill initDepoistBill(int type, YwContract model) {
@@ -787,12 +886,15 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇锋寜椤甸潰瑕佹眰濉啓绉熻祦鏉℃淇℃伅!");
}
if(d.getEndDate().getTime()<= d.getStartDate().getTime()){
-
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绉熻祦鏉℃鏈夋晥鏈熺粨鏉熸椂闂翠笉寰楁棭浜庡紑濮嬫椂闂达紒");
}
if(!Constants.equalsInteger(model.getWyPayType(),Constants.ZERO) &&
Constants.equalsInteger(d.getCircleType(),Constants.SIX)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绉熻祦鏉℃鍙湁閫夋嫨涓�娆℃�т粯娆炬椂锛屾墠鑳介�夋嫨璇ユ寜姣忓満鏀惰垂锛�");
+ }
+ if(model.getZlFirstCircle() == null){//棣栨湡淇℃伅
+ model.setZlFirstPrice(d.getPrice());
+ model.setZlFirstCircle(d.getCircleType());
}
}
}
@@ -829,6 +931,11 @@
if(!Constants.equalsInteger(model.getWyPayType(),Constants.ZERO) &&
Constants.equalsInteger(d.getCircleType(),Constants.SIX)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鐗╀笟鏉℃鍙湁閫夋嫨涓�娆℃�т粯娆炬椂锛屾墠鑳介�夋嫨璇ユ寜姣忓満鏀惰垂锛�");
+ }
+ if(model.getWyFirstCircle() == null){
+ //棣栨湡淇℃伅
+ model.setWyFirstPrice(d.getPrice());
+ model.setWyFirstCircle(d.getCircleType());
}
}
}
@@ -952,7 +1059,8 @@
.eq(YwRoom::getIsdeleted,Constants.ZERO)
.exists("(select a.id from yw_contract_room a where a.isdeleted=1 and a.room_id=t.id and a.contract_id="+model.getId()+")");
model.setRoomList(roomMapper.selectJoinList(YwRoom.class,rw));
-
+ model.setWyFirstCircleStr(Constants.getUnitTypeByNum(model.getWyFirstCircle()));
+ model.setZlFirstCircleStr(Constants.getUnitTypeByNum(model.getZlFirstCircle()));
//鏌ヨ绉熻硟鏉℃淇℃伅
MPJLambdaWrapper<YwContractDetail> dw = new MPJLambdaWrapper<>();
dw.selectAll(YwContractDetail.class )
@@ -1026,7 +1134,9 @@
@Override
public List<YwContract> findList(YwContract ywContract) {
- QueryWrapper<YwContract> wrapper = new QueryWrapper<>(ywContract);
+ QueryWrapper<YwContract> wrapper = new QueryWrapper<>();
+ wrapper.lambda().eq(YwContract::getIsdeleted,Constants.ZERO);
+ wrapper.lambda().in(YwContract::getStatus,Constants.ZERO,Constants.ONE,Constants.TWO);
return ywContractMapper.selectList(wrapper);
}
@@ -1142,7 +1252,14 @@
queryWrapper.ge(Objects.nonNull(pageWrap.getModel().getQueryStartTime()), YwContract::getStartDate, pageWrap.getModel().getQueryStartTime())
.le(Objects.nonNull(pageWrap.getModel().getQueryEndTime()), YwContract::getEndDate, pageWrap.getModel().getQueryEndTime());
queryWrapper.orderByDesc(YwContract::getCreateDate );
- return PageData.from(ywContractMapper.selectJoinPage(page, YwContract.class,queryWrapper));
+ PageData<YwContract> data = PageData.from(ywContractMapper.selectJoinPage(page, YwContract.class,queryWrapper));
+ if(data!=null && data.getRecords()!=null){
+ for(YwContract model : data.getRecords()){
+ model.setWyFirstCircleStr(Constants.getUnitTypeByNum(model.getWyFirstCircle()));
+ model.setZlFirstCircleStr(Constants.getUnitTypeByNum(model.getZlFirstCircle()));
+ }
+ }
+ return data;
}
@Override
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwDeviceServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwDeviceServiceImpl.java
index 1b4b13a..11080ec 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwDeviceServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwDeviceServiceImpl.java
@@ -64,27 +64,20 @@
if(ywDeviceMapper.selectCount(new QueryWrapper<YwDevice>().lambda().eq(YwDevice::getIsdeleted,Constants.ZERO).eq(YwDevice::getCode,ywDevice.getCode()))>Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁惧缂栧彿閲嶅!");
}
-// if(StringUtils.isBlank(ywDevice.getCode())){
-// String code = this.getMaxAutoMaticDeviceCode();
-// while (ywDeviceMapper.selectCount(new QueryWrapper<YwDevice>().lambda().eq(YwDevice::getIsdeleted,Constants.ZERO).eq(YwDevice::getCode,code))>Constants.ZERO){
-// code = this.getMaxAutoMaticDeviceCode();
-// }
-// ywDevice.setCode(code);
-// }else{
-//
-// }
ywDevice.setCreateDate(new Date());
ywDevice.setCreator(loginUserInfo.getId());
ywDevice.setIsdeleted(Constants.ZERO);
ywDeviceMapper.insert(ywDevice);
- if(Objects.nonNull(ywDevice.getMultifile())){
- ywDevice.getMultifile().setCreator(loginUserInfo.getId());
- ywDevice.getMultifile().setCreateDate(new Date());
- ywDevice.getMultifile().setIsdeleted(Constants.ZERO);
- ywDevice.getMultifile().setObjType(Constants.MultiFile.FN_DEVICE_FILE.getKey());
- ywDevice.getMultifile().setObjId(ywDevice.getId());
- multifileMapper.insert(ywDevice.getMultifile());
+ if(Objects.nonNull(ywDevice.getFileUrl())){
+ Multifile multifile = new Multifile();
+ multifile.setCreator(loginUserInfo.getId());
+ multifile.setCreateDate(new Date());
+ multifile.setIsdeleted(Constants.ZERO);
+ multifile.setObjType(Constants.MultiFile.FN_DEVICE_FILE.getKey());
+ multifile.setObjId(ywDevice.getId());
+ multifile.setFileurl(ywDevice.getFileUrl());
+ multifileMapper.insert(multifile);
}
return ywDevice.getId();
@@ -135,13 +128,15 @@
.eq(Multifile::getObjId,ywDevice.getId())
.eq(Multifile::getObjType,Constants.MultiFile.FN_DEVICE_FILE.getKey())
);
- if(Objects.nonNull(ywDevice.getMultifile())){
- ywDevice.getMultifile().setCreator(loginUserInfo.getId());
- ywDevice.getMultifile().setCreateDate(new Date());
- ywDevice.getMultifile().setIsdeleted(Constants.ZERO);
- ywDevice.getMultifile().setObjType(Constants.MultiFile.FN_DEVICE_FILE.getKey());
- ywDevice.getMultifile().setObjId(ywDevice.getId());
- multifileMapper.insert(ywDevice.getMultifile());
+ if(Objects.nonNull(ywDevice.getFileUrl())){
+ Multifile multifile = new Multifile();
+ multifile.setCreator(loginUserInfo.getId());
+ multifile.setCreateDate(new Date());
+ multifile.setIsdeleted(Constants.ZERO);
+ multifile.setObjType(Constants.MultiFile.FN_DEVICE_FILE.getKey());
+ multifile.setObjId(ywDevice.getId());
+ multifile.setFileurl(ywDevice.getFileUrl());
+ multifileMapper.insert(multifile);
}
@@ -169,8 +164,7 @@
if(Objects.nonNull(multifile)){
String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+systemDictDataBiz.queryByCode(Constants.FTP,Constants.YW_DEVICE).getCode();
- multifile.setFileurlFull(path + multifile.getFileurl());
- ywDevice.setMultifile(multifile);
+ ywDevice.setFileFullUrl(path + multifile.getFileurl());
}
return ywDevice;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolLineServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolLineServiceImpl.java
index f5b6603..54dea5a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolLineServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolLineServiceImpl.java
@@ -68,7 +68,7 @@
ywLinePoint.setCreateDate(new Date());
ywLinePoint.setCreator(loginUserInfo.getId());
ywLinePoint.setIsdeleted(Constants.ZERO);
- ywLinePoint.setLineId(ywLinePoint.getId());
+ ywLinePoint.setLineId(ywPatrolLine.getId());
}
ywLinePointMapper.insert(ywLinePointList);
return ywPatrolLine.getId();
@@ -117,7 +117,7 @@
){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"宸℃鐐归厤缃敊璇�");
}
- ywLinePoint.setLineId(ywLinePoint.getId());
+ ywLinePoint.setLineId(ywPatrolLine.getId());
ywLinePoint.setCreateDate(new Date());
ywLinePoint.setCreator(loginUserInfo.getId());
ywLinePoint.setIsdeleted(Constants.ZERO);
@@ -148,7 +148,8 @@
List<YwLinePoint> ywLinePointList = ywLinePointMapper.selectJoinList(YwLinePoint.class,new MPJLambdaWrapper<YwLinePoint>()
.selectAll(YwLinePoint.class)
.selectAs(YwPatrolPoint::getName,YwLinePoint::getPointName)
- .leftJoin(YwPatrolLine.class,YwPatrolLine::getId,YwLinePoint::getPointId)
+ .selectAs(YwPatrolPoint::getCode,YwLinePoint::getCode)
+ .leftJoin(YwPatrolPoint.class,YwPatrolPoint::getId,YwLinePoint::getPointId)
.eq(YwLinePoint::getLineId,id)
.orderByAsc(YwLinePoint::getSortnum)
);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolPointServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolPointServiceImpl.java
index 948ccf5..4265e5c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolPointServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolPointServiceImpl.java
@@ -65,13 +65,15 @@
ywPatrolPointMapper.insert(ywPatrolPoint);
- if(Objects.nonNull(ywPatrolPoint.getMultifile())){
- ywPatrolPoint.getMultifile().setCreator(loginUserInfo.getId());
- ywPatrolPoint.getMultifile().setCreateDate(new Date());
- ywPatrolPoint.getMultifile().setIsdeleted(Constants.ZERO);
- ywPatrolPoint.getMultifile().setObjType(Constants.MultiFile.FN_PATROL_POINT_FILE.getKey());
- ywPatrolPoint.getMultifile().setObjId(ywPatrolPoint.getId());
- multifileMapper.insert(ywPatrolPoint.getMultifile());
+ if(Objects.nonNull(ywPatrolPoint.getFileUrl())){
+ Multifile multifile = new Multifile();
+ multifile.setCreator(loginUserInfo.getId());
+ multifile.setCreateDate(new Date());
+ multifile.setIsdeleted(Constants.ZERO);
+ multifile.setObjType(Constants.MultiFile.FN_PATROL_POINT_FILE.getKey());
+ multifile.setObjId(ywPatrolPoint.getId());
+ multifile.setFileurl(ywPatrolPoint.getFileUrl());
+ multifileMapper.insert(multifile);
}
return ywPatrolPoint.getId();
@@ -123,13 +125,15 @@
.eq(Multifile::getObjType,Constants.MultiFile.FN_PATROL_POINT_FILE.getKey())
);
- if(Objects.nonNull(ywPatrolPoint.getMultifile())){
- ywPatrolPoint.getMultifile().setCreator(loginUserInfo.getId());
- ywPatrolPoint.getMultifile().setCreateDate(new Date());
- ywPatrolPoint.getMultifile().setIsdeleted(Constants.ZERO);
- ywPatrolPoint.getMultifile().setObjType(Constants.MultiFile.FN_PATROL_POINT_FILE.getKey());
- ywPatrolPoint.getMultifile().setObjId(ywPatrolPoint.getId());
- multifileMapper.insert(ywPatrolPoint.getMultifile());
+ if(Objects.nonNull(ywPatrolPoint.getFileUrl())){
+ Multifile multifile = new Multifile();
+ multifile.setCreator(loginUserInfo.getId());
+ multifile.setCreateDate(new Date());
+ multifile.setIsdeleted(Constants.ZERO);
+ multifile.setObjType(Constants.MultiFile.FN_PATROL_POINT_FILE.getKey());
+ multifile.setObjId(ywPatrolPoint.getId());
+ multifile.setFileurl(ywPatrolPoint.getFileUrl());
+ multifileMapper.insert(multifile);
}
}
@@ -157,8 +161,7 @@
if(Objects.nonNull(multifile)){
String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+systemDictDataBiz.queryByCode(Constants.FTP,Constants.YW_PATROL).getCode();
- multifile.setFileurlFull(path + multifile.getFileurl());
- ywPatrolPoint.setMultifile(multifile);
+ ywPatrolPoint.setFileFullUrl(path + multifile.getFileurl());
}
return ywPatrolPoint;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolSchemeServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolSchemeServiceImpl.java
index d85a2fe..6f532e1 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolSchemeServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolSchemeServiceImpl.java
@@ -26,6 +26,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.*;
@@ -51,6 +52,7 @@
private RedisTemplate<String, Object> redisTemplate;
@Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
public Integer create(YwPatrolScheme ywPatrolScheme) {
if(Objects.isNull(ywPatrolScheme)
|| StringUtils.isBlank(ywPatrolScheme.getTitle())
@@ -122,9 +124,10 @@
//姣忔湀鏍规嵁鏃ユ湡鐢熸垚 鏍规嵁鏃ユ湡鑾峰彇鏄摢澶�
List<String> days = Arrays.asList(ywPatrolScheme.getCircleDays().split(","));
String dayStr = DateUtil.getFomartDate(schemeDate,"dd");
- if(Objects.isNull(days.stream().filter(i->StringUtils.equals(i,dayStr)).findFirst().get())){
+ Optional<String> optional = days.stream().filter(i->StringUtils.equals(i,dayStr)).findAny();
+ if(Objects.isNull(optional)){
return;
- };
+ }
}
String schemeDateStr = DateUtil.getDate(schemeDate,"yyyy-MM-dd");
//鏌ヨ褰撳ぉ鏄惁鐢熸垚杩囨暟鎹�
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskServiceImpl.java
index 3bfe5a0..ec9f16f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskServiceImpl.java
@@ -121,6 +121,7 @@
YwPatrolTask model = pageWrap.getModel();
queryWrapper.selectAll(YwPatrolTask.class)
.selectAs(YwPatrolScheme::getCode,YwPatrolTask::getPlanCode)
+ .selectAs(YwPatrolScheme::getTitle,YwPatrolTask::getPlanTitle)
.selectAs(SystemUser::getRealname,YwPatrolTask::getUserName)
.leftJoin(SystemUser.class,SystemUser::getId,YwPatrolTask::getDealUserId)
.leftJoin(YwPatrolScheme.class,YwPatrolScheme::getId,YwPatrolTask::getSchemeId)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java
index 5e27677..7c9d35f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java
@@ -5,18 +5,27 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.YwBuildingMapper;
+import com.doumee.dao.business.YwFloorMapper;
import com.doumee.dao.business.YwProjectMapper;
-import com.doumee.dao.business.model.Company;
-import com.doumee.dao.business.model.YwProject;
+import com.doumee.dao.business.YwRoomMapper;
+import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.vo.CompanyTree;
+import com.doumee.dao.business.vo.ProjectDataVO;
+import com.doumee.dao.business.vo.ProjectTree;
+import com.doumee.service.business.AreasService;
import com.doumee.service.business.YwProjectService;
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.checkerframework.checker.units.qual.A;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -30,6 +39,17 @@
@Autowired
private YwProjectMapper ywProjectMapper;
+ @Autowired
+ private AreasService areasService;
+
+ @Autowired
+ private YwFloorMapper ywFloorMapper;
+
+ @Autowired
+ private YwRoomMapper ywRoomMapper;
+
+ @Autowired
+ private YwBuildingMapper ywBuildingMapper;
@Override
public Integer create(YwProject model) {
@@ -154,7 +174,22 @@
queryWrapper.lambda().eq(YwProject::getAddr, pageWrap.getModel().getAddr());
}
queryWrapper.lambda().orderByDesc(YwProject::getCreateDate);
- return PageData.from(ywProjectMapper.selectPage(page, queryWrapper));
+ PageData<YwProject> data = PageData.from(ywProjectMapper.selectPage(page, queryWrapper));
+ if(data!=null && data.getRecords()!=null){
+ for(YwProject model :data.getRecords()){
+ if(model.getAreaId()!=null){
+ Areas a = areasService.findById(model.getAreaId(),Constants.TWO);
+ if(a != null){
+ model.setAreaName(a.getName());
+ model.setCityId(a.getCityId());
+ model.setCityName(a.getCityName());
+ model.setProvinceId(a.getProvinceId());
+ model.setProvinceName(a.getProvinceName());
+ }
+ }
+ }
+ }
+ return data;
}
@Override
@@ -162,4 +197,78 @@
QueryWrapper<YwProject> wrapper = new QueryWrapper<>(ywProject);
return ywProjectMapper.selectCount(wrapper);
}
+
+
+ @Override
+ public List<ProjectDataVO> projectTree(){
+ List<ProjectDataVO> projectDataVOList = new ArrayList<>();
+ List<YwProject> ywProjectList = ywProjectMapper.selectList(new QueryWrapper<YwProject>().lambda()
+ .eq(YwProject::getIsdeleted,Constants.ZERO)
+ .eq(YwProject::getStatus,Constants.ZERO)
+ .orderByAsc(YwProject::getSortnum)
+ );
+ for (YwProject ywProject:ywProjectList) {
+ ProjectDataVO projectDataVO = new ProjectDataVO();
+ BeanUtils.copyProperties(ywProject,projectDataVO);
+ projectDataVO.setLv(Constants.ZERO);
+ projectDataVOList.add(projectDataVO);
+ }
+
+ List<YwBuilding> ywBuildingList = ywBuildingMapper.selectList(new QueryWrapper<YwBuilding>().lambda()
+ .eq(YwBuilding::getIsdeleted,Constants.ZERO)
+ .eq(YwBuilding::getStatus,Constants.ZERO)
+ .orderByAsc(YwBuilding::getSortnum)
+ );
+
+ for (YwBuilding data:ywBuildingList) {
+ ProjectDataVO projectDataVO = new ProjectDataVO();
+ BeanUtils.copyProperties(data,projectDataVO);
+ projectDataVO.setPId(data.getProjectId());
+ projectDataVO.setLv(Constants.ONE);
+ projectDataVOList.add(projectDataVO);
+ }
+
+
+ List<YwFloor> ywFloorList = ywFloorMapper.selectList(new QueryWrapper<YwFloor>().lambda()
+ .eq(YwFloor::getIsdeleted,Constants.ZERO)
+ .eq(YwFloor::getStatus,Constants.ZERO)
+ .orderByAsc(YwFloor::getSortnum)
+ );
+
+ for (YwFloor data:ywFloorList) {
+ ProjectDataVO projectDataVO = new ProjectDataVO();
+ BeanUtils.copyProperties(data,projectDataVO);
+ projectDataVO.setPId(data.getBuildingId());
+ projectDataVO.setLv(Constants.TWO);
+ projectDataVOList.add(projectDataVO);
+ }
+
+
+
+ List<YwRoom> ywRoomList = ywRoomMapper.selectList(new QueryWrapper<YwRoom>().lambda()
+ .eq(YwRoom::getIsdeleted,Constants.ZERO)
+ .eq(YwRoom::getStatus,Constants.ZERO)
+ .orderByAsc(YwRoom::getSortnum)
+ );
+
+
+ for (YwRoom data:ywRoomList) {
+ ProjectDataVO projectDataVO = new ProjectDataVO();
+ BeanUtils.copyProperties(data,projectDataVO);
+ projectDataVO.setName(data.getCode());
+ projectDataVO.setPId(data.getFloor());
+ projectDataVO.setLv(Constants.THREE);
+ projectDataVOList.add(projectDataVO);
+ }
+
+ ProjectTree treeBuild = new ProjectTree(projectDataVOList);
+ projectDataVOList = treeBuild.buildTree();
+ return projectDataVOList;
+
+ }
+
+
+
+
+
}
--
Gitblit v1.9.3