From efcdc8c49b0452d9c7f192ab351da09bf8aafc80 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 27 五月 2024 18:34:58 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformShowParam.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerLogCloudController.java | 9
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/FormParam.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 18
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java | 20 +
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitReasonServiceImpl.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformQueue.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/HiddenDangerLogJoinMapper.java | 14
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformInterfaceLog.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarDriverServiceImpl.java | 55 ++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveParam.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarEventDTO.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Parks.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java | 14
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ParkBook.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 51 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java | 1
server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java | 1
server/system_gateway/src/main/resources/bootstrap.yml | 1
admin/src/api/business/carDriver.js | 36 ++
admin/src/views/operation/serviceCar/driverConfig.vue | 186 ++++------
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarParks.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/ProblemLogVo.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java | 79 ++++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ProblemLog.java | 2
admin/src/api/business/hiddenDanger.js | 11
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java | 3
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 9
admin/src/components/base/BaseOpera.vue | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncParkServiceImpl.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/CheckVisitedDTO.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitProblemLog.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarDriver.java | 11
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberRole.java | 2
admin/src/api/business/cars.js | 5
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerLog.java | 14
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Tasks.java | 5
admin/src/components/business/OperaCarDriverWindow.vue | 115 ++++++
server/system_service/src/main/java/com/doumee/dao/system/model/Multifile.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitProblems.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java | 8
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 5
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitPark.java | 5
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visitor.java | 5
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java | 1
admin/src/components/business/OperaProblemsWindow.vue | 1
server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarsDTO.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitReason.java | 2
admin/src/views/business/problems.vue | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveTempl.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformLog.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java | 4
admin/src/utils/request.js | 3
admin/src/components/business/OperaHiddenDangerWindow.vue | 216 ++++++++---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 2
admin/src/components/base/BaseTable.vue | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java | 1
admin/src/views/operation/danger/record.vue | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/UserAction.java | 1
74 files changed, 646 insertions(+), 362 deletions(-)
diff --git a/admin/src/api/business/carDriver.js b/admin/src/api/business/carDriver.js
new file mode 100644
index 0000000..66b22c0
--- /dev/null
+++ b/admin/src/api/business/carDriver.js
@@ -0,0 +1,36 @@
+import request from '../../utils/request'
+
+// 鏌ヨ
+export function fetchList (data) {
+ return request.post('/visitsAdmin/cloudService/business/carDriver/page', data, {
+ trim: true
+ })
+}
+export function allList (data) {
+ return request.post('/visitsAdmin/cloudService/business/carDriver/list', data, {
+ trim: true
+ })
+}
+// 鍒涘缓
+export function create (data) {
+ return request.post('/visitsAdmin/cloudService/business/carDriver/create', data)
+}
+
+// 淇敼
+export function updateById (data) {
+ return request.post('/visitsAdmin/cloudService/business/carDriver/updateById', data)
+}
+
+// 鍒犻櫎
+export function deleteById (id) {
+ return request.get(`/visitsAdmin/cloudService/business/carDriver/delete/${id}`)
+}
+
+// 鎵归噺鍒犻櫎
+export function deleteByIdInBatch (ids) {
+ return request.get('/visitsAdmin/cloudService/business/carDriver/delete/batch', {
+ params: {
+ ids
+ }
+ })
+}
diff --git a/admin/src/api/business/cars.js b/admin/src/api/business/cars.js
index ca31faf..a9802ff 100644
--- a/admin/src/api/business/cars.js
+++ b/admin/src/api/business/cars.js
@@ -6,6 +6,11 @@
trim: true
})
}
+export function allList (data) {
+ return request.post('/visitsAdmin/cloudService/business/cars/list', data, {
+ trim: true
+ })
+}
// 鍒涘缓
export function create (data) {
diff --git a/admin/src/api/business/hiddenDanger.js b/admin/src/api/business/hiddenDanger.js
index 6d889e0..77e8ab3 100644
--- a/admin/src/api/business/hiddenDanger.js
+++ b/admin/src/api/business/hiddenDanger.js
@@ -6,6 +6,12 @@
trim: true
})
}
+// 鏌ヨ
+export function findLogList (data) {
+ return request.post('/visitsAdmin/cloudService/business/hiddenDangerLog/findList', data, {
+ trim: true
+ })
+}
// 鍒涘缓
export function create (data) {
@@ -21,7 +27,10 @@
export function deleteById (id) {
return request.get(`/visitsAdmin/cloudService/business/hiddenDanger/delete/${id}`)
}
-
+// 鏍规嵁ID鏌ヨ
+export function detail(id) {
+ return request.get(`/visitsAdmin/cloudService/business/hiddenDanger/${id}`)
+}
// 鎵归噺鍒犻櫎
export function deleteByIdInBatch (ids) {
return request.get('/visitsAdmin/cloudService/business/hiddenDanger/delete/batch', {
diff --git a/admin/src/components/base/BaseOpera.vue b/admin/src/components/base/BaseOpera.vue
index ad852f7..2052fd7 100644
--- a/admin/src/components/base/BaseOpera.vue
+++ b/admin/src/components/base/BaseOpera.vue
@@ -92,7 +92,7 @@
this.$emit('success')
})
.catch(e => {
- this.$tip.apiFailed(e)
+ // this.$tip.apiFailed(e)
})
.finally(() => {
this.isWorking = false
@@ -114,7 +114,7 @@
this.$emit('success')
})
.catch(e => {
- this.$tip.apiFailed(e)
+ // this.$tip.apiFailed(e)
})
.finally(() => {
this.isWorking = false
diff --git a/admin/src/components/base/BaseTable.vue b/admin/src/components/base/BaseTable.vue
index 6df292f..7aea229 100644
--- a/admin/src/components/base/BaseTable.vue
+++ b/admin/src/components/base/BaseTable.vue
@@ -132,7 +132,7 @@
this.tableData.pagination.total = data.total
})
.catch(e => {
- this.$tip.apiFailed(e)
+ // this.$tip.apiFailed(e)
})
.finally(() => {
this.isWorking.search = false
diff --git a/admin/src/components/business/OperaCarDriverWindow.vue b/admin/src/components/business/OperaCarDriverWindow.vue
new file mode 100644
index 0000000..ac8c22b
--- /dev/null
+++ b/admin/src/components/business/OperaCarDriverWindow.vue
@@ -0,0 +1,115 @@
+<template>
+ <GlobalWindow
+ :title="title"
+ width="500px"
+ :visible.sync="visible"
+ :confirm-working="isWorking"
+ @confirm="confirm"
+ >
+ <el-form :model="form" ref="form" :rules="rules">
+ <el-form-item label="閫夋嫨鍙告満锛�" prop="memberId">
+ <el-select v-model="form.memberId" filterable clearable placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in memberList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="閫夋嫨杞﹁締锛�" prop="carId">
+ <el-select v-model="form.carId" filterable clearable placeholder="璇烽�夋嫨杞﹁締">
+ <el-option
+ v-for="item in carList"
+ :key="item.id"
+ :label="item.code"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-form>
+ </GlobalWindow>
+</template>
+
+<script>
+import BaseOpera from '@/components/base/BaseOpera'
+import GlobalWindow from '@/components/common/GlobalWindow'
+import { allList } from '@/api/business/member'
+import { allList as carList } from '@/api/business/cars'
+export default {
+ name: 'OperaCarDriverWindow',
+ extends: BaseOpera,
+ components: { GlobalWindow },
+ data () {
+ return {
+ // 琛ㄥ崟鏁版嵁
+ memberList: [],
+ carList: [],
+ form: {
+ id: null,
+ memberId: null,
+ carId: null
+ },
+ // 楠岃瘉瑙勫垯
+ rules: {
+ memberId: [
+ { required: true, message: '璇烽�夋嫨鍙告満浜哄憳' }
+ ]
+ }
+ }
+ },
+ created () {
+ this.config({
+ api: '/business/carDriver',
+ 'field.id': 'id'
+ })
+ },
+ methods: {
+ open (title, target,type) {
+ this.title = title
+ this.visible = true
+ this.loadMember()
+ this.loadCars()
+ // 鏂板缓缁勭粐
+ if (target == null) {
+ this.$nextTick(() => {
+ this.$refs.form.resetFields()
+ this.form[this.configData['field.id']] = null
+ this.form.type=type
+ })
+ return
+ }
+ // 缂栬緫
+ this.$nextTick(() => {
+ for (const key in this.form) {
+ this.form[key] = target[key]
+ }
+ })
+ },
+ loadMember () {
+ allList({
+ type: 2
+ })
+ .then(res => {
+ this.memberList = res
+ })
+ .catch(e => {
+ })
+ .finally(() => {
+ })
+ },
+ loadCars () {
+ carList({
+ type: 1 //鍏姟杞�
+ })
+ .then(res => {
+ this.carList = res
+ })
+ .catch(e => {
+ })
+ .finally(() => {
+ })
+ }
+ }
+}
+</script>
diff --git a/admin/src/components/business/OperaHiddenDangerWindow.vue b/admin/src/components/business/OperaHiddenDangerWindow.vue
index ae6acc1..6882524 100644
--- a/admin/src/components/business/OperaHiddenDangerWindow.vue
+++ b/admin/src/components/business/OperaHiddenDangerWindow.vue
@@ -1,9 +1,9 @@
<template>
<GlobalWindow
- :title="title"
- :visible.sync="visible"
- @confirm="confirm"
- @close="reject"
+ :title="title"
+ :visible.sync="visible"
+ @confirm="confirm"
+ @close="reject"
>
<div class="modal_wrap">
<div class="modal_content">
@@ -35,20 +35,72 @@
<div class="label">闅愭偅鎻忚堪</div>
<div class="value">{{model.content || ''}}</div>
</div>
- <div class="item">
+ <div class="item" style="width: 100%">
<div class="label">鐜板満鎯呭喌</div>
<div class="value" v-if="model.submitFileList ==null || !model.submitFileList.length">鏃�</div>
<div class="value" v-if="model.submitFileList !=null && model.submitFileList.length">
- <span v-for="item in model.submitFileList" :key="item.id">{{item.fileurlFull}}</span>
+ <div v-for="item in model.submitFileList" :key="item.id" style="display: inline;margin-right: 20px">
+ <video
+ v-if="item.fileurlFull && item.fileurlFull.endsWith('.mp4')"
+ ref="videoRef"
+ autoplay
+ controls
+ preload="auto"
+ style="width: 80px;height: 80px;object-fit: contain;"
+ :src="item.fileurlFull"
+ />
+ <el-image
+ v-else-if="item.fileurlFull"
+ style="width:80px; height: 80px"
+ :src="item.fileurlFull"
+ :preview-src-list="[item.fileurlFull]">
+ </el-image>
+ </div>
</div>
</div>
- <div class="item" v-if="model.status==1">
+ <div class="item" v-if="model.status==1" style="width: 100%">
<div class="label">澶勭悊鍓�</div>
- <div class="value"></div>
+ <div class="value" v-if="model.dealBeforeFileList !=null && model.dealBeforeFileList.length">
+ <div v-for="item in model.dealBeforeFileList" :key="item.id" style="display: inline;margin-right: 20px">
+ <video
+ v-if="item.fileurlFull && item.fileurlFull.endsWith('.mp4')"
+ ref="videoRef"
+ autoplay
+ controls
+ preload="auto"
+ style="width: 80px;height: 80px;object-fit: contain;"
+ :src="item.fileurlFull"
+ />
+ <el-image
+ v-else-if="item.fileurlFull"
+ style="width:80px; height: 80px"
+ :src="item.fileurlFull"
+ :preview-src-list="[item.fileurlFull]">
+ </el-image>
+ </div>
+ </div>
</div>
- <div class="item" v-if="model.status==1">
+ <div class="item" v-if="model.status==1" style="width: 100%">
<div class="label">澶勭悊鍚�</div>
- <div class="value"></div>
+ <div class="value" v-if="model.dealAfterFileList !=null && model.dealAfterFileList.length">
+ <div v-for="item in model.dealAfterFileList" :key="item.id" style="display: inline;margin-right: 20px">
+ <video
+ v-if="item.fileurlFull && item.fileurlFull.endsWith('.mp4')"
+ ref="videoRef"
+ autoplay
+ controls
+ preload="auto"
+ style="width: 80px;height: 80px;object-fit: contain;"
+ :src="item.fileurlFull"
+ />
+ <el-image
+ v-else-if="item.fileurlFull"
+ style="width:80px; height: 80px"
+ :src="item.fileurlFull"
+ :preview-src-list="[item.fileurlFull]">
+ </el-image>
+ </div>
+ </div>
</div>
<div class="item" v-if="model.status==1 || model.status==2">
<div class="label">澶勭悊璇存槑</div>
@@ -60,40 +112,31 @@
<div class="side">
<div class="side_title">瀹℃壒娴佺▼</div>
<div class="list">
- <div class="item">
- <div class="separate"></div>
+ <div class="item" v-for="(item,index) in logList" :key="item.id">
+ <div class="separate" v-if="index < logList.length-1"></div>
<div class="info">
- <i class="el-icon-success icon"></i>
- <img src="" class="avatar" alt="" />
+ <i class="el-icon-success icon" v-if="(model.status ==1) || index < logList.length-1"></i>
+ <i class="el-icon-question icon1" v-if="(model.status==0) && index == logList.length-1"></i>
+ <i class="el-icon-error icon2" v-if="(model.status==2) && index == logList.length-1"></i>
+ <img v-if="item.avatar!=null && item.avatar !=''" :src="item.avatar" class="avatar" alt="" />
+ <img v-if="item.avatar ==null ||item.avatar ==''" src="@/assets/avatar/man.png" class="avatar" alt="" />
<div class="content">
<div class="line">
- <div class="name">鍒樻煇鍒樻煇</div>
- <div class="time">2020-02-02 12:20</div>
- </div>
- <div class="line">
- <div class="company">涓浗绉诲姩鏈夐檺鍏徃</div>
- </div>
- </div>
- </div>
- </div>
- <div class="item">
- <!-- <div v-if="" class="separate"></div> -->
- <div class="info">
- <i class="el-icon-success icon"></i>
- <img src="" class="avatar" alt="" />
- <div class="content">
- <div class="line">
- <div class="name">鍒樻煇鍒樻煇</div>
- <div class="time">2020-02-02 12:20</div>
+ <div class="name">{{ item.title}}</div>
+ <div class="time">{{ item.createDate }}</div>
</div>
<div class="line">
<div class="company">
- 涓浗绉诲姩鏈夐檺鍏徃( <span class="status">宸插悓鎰�</span> )
+ {{ item.createUserName }} {{ item.companyName }}
+ <div style="display: inline" v-if="index == logList.length-1">
+ 锛�<span class="status-green" v-if="model.status==1">宸插鐞�</span>
+ <span class="status-blue" v-if="model.status==0">寰呭鐞�</span>
+ <span class="status-red" v-if="model.status==2">宸查��鍥�</span>锛�
+ </div>
</div>
</div>
</div>
</div>
- <div class="remark">鎻愪氦绾﹀ソ鐨�</div>
</div>
</div>
</div>
@@ -107,16 +150,16 @@
</template>
<!-- 鍚屾剰/鎷掔粷 -->
<el-dialog
- append-to-body
- :title="apprTitle"
- :visible.sync="isShowAppr"
- width="480px"
+ append-to-body
+ :title="apprTitle"
+ :visible.sync="isShowAppr"
+ width="480px"
>
<el-input
- type="textarea"
- :placeholder="apprTitle + '璇存槑锛岄潪蹇呭～'"
- :rows="4"
- v-model="param.explain"
+ type="textarea"
+ :placeholder="apprTitle + '璇存槑锛岄潪蹇呭～'"
+ :rows="4"
+ v-model="param.explain"
/>
<span slot="footer" class="dialog-footer">
<el-button @click="isShowAppr = false">鍙栨秷</el-button>
@@ -125,30 +168,30 @@
</el-dialog>
<!-- 闅愭偅 -->
<el-dialog
- append-to-body
- title="闅愭偅"
- :visible.sync="isShowProblem"
- width="480px"
+ append-to-body
+ title="闅愭偅"
+ :visible.sync="isShowProblem"
+ width="480px"
>
<el-form :model="param" :rules="rules" ref="ruleForm" label-width="100px">
<el-form-item label="閫�鍥炴椂闂�">
<el-date-picker
- class="w300"
- value-format="yyyy-MM-dd"
- type="date"
- placeholder="閫夋嫨鏃ユ湡"
- v-model="param.date"
+ class="w300"
+ value-format="yyyy-MM-dd"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ v-model="param.date"
/>
</el-form-item>
<el-form-item label="鏁存敼鍓�">
<div class="df_ac">
<img src="@/assets/avatar/man.png" />
<el-upload
- class="avatar-uploader"
- action="https://jsonplaceholder.typicode.com/posts/"
- :show-file-list="false"
- :on-success="handleAvatarSuccess"
- :before-upload="beforeAvatarUpload"
+ class="avatar-uploader"
+ action="https://jsonplaceholder.typicode.com/posts/"
+ :show-file-list="false"
+ :on-success="handleAvatarSuccess"
+ :before-upload="beforeAvatarUpload"
>
<img v-if="param.url" :src="param.url" class="avatar" />
<div v-else class="upload_box">
@@ -160,17 +203,17 @@
</el-form-item>
<el-form-item label="閫�鍥炶鏄�">
<el-input
- type="textarea"
- placeholder="璇峰～鍐欒鏄�"
- :rows="4"
- v-model="param.explain"
+ type="textarea"
+ placeholder="璇峰～鍐欒鏄�"
+ :rows="4"
+ v-model="param.explain"
/>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="isShowProblem = false">鍙栨秷</el-button>
<el-button type="primary" @click="isShowProblem = false"
- >纭畾</el-button
+ >纭畾</el-button
>
</span>
</el-dialog>
@@ -178,14 +221,19 @@
</template>
<script>
+import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
+import {findLogList} from "@/api/business/hiddenDanger";
export default {
components: { GlobalWindow },
+ extends: BaseOpera,
data() {
return {
title: '璁垮棰勭害璇︽儏',
visible: false,
+ dataId:null,
model: { },
+ logList:[],
isShowAppr: false,
apprTitle: '鍚屾剰',
param: {},
@@ -193,11 +241,35 @@
rules: {}
}
},
+ created () {
+ this.config({
+ api: '/business/hiddenDanger',
+ 'field.id': 'id'
+ })
+ },
methods: {
+ dealDo(){},
+ backDo(){},
open(title,target){
this.title =title
this.visible=true
- this.model = target
+ this.model = {}
+ this.dataId =target.id
+ this.getDetail()
+ this.getLogList()
+
+ },
+ getLogList(){
+ this.api.findLogList({hiddenDangerId:this.dataId})
+ .then(res =>{
+ this.logList = res
+ })
+ },
+ getDetail(){
+ this.api.detail(this.dataId)
+ .then(res =>{
+ this.model = res
+ })
},
confirm() {
console.log('--')
@@ -213,6 +285,14 @@
</script>
<style lang="scss" scoped>
+.side_title{
+ font-weight: 600;
+ font-size: 18px;
+ color: #111111;
+ margin-bottom: 20px;
+ margin-left: 20px;
+ margin-top: 20px;
+}
.upload_box {
width: 84px;
height: 84px;
@@ -231,6 +311,7 @@
font-size: 12px;
}
}
+
.modal_wrap {
display: flex;
height: 100%;
@@ -248,7 +329,6 @@
margin-bottom: 20px;
margin-top: 30px;
}
-
.info {
.list {
display: flex;
@@ -344,20 +424,26 @@
.separate {
position: absolute;
border-left: 2px dashed #cccccc;
- left: 51px;
+ left: 31px;
height: calc(100% - 24px);
top: 46px;
}
.info {
display: flex;
align-items: center;
- margin-left: 40px;
+ margin-left: 20px;
.icon {
position: relative;
z-index: 11;
color: #53b76f;
font-size: 24px;
}
+ .icon1 {
+ position: relative;
+ z-index: 11;
+ color: deepskyblue;
+ font-size: 24px;
+ }
.avatar {
width: 40px;
height: 40px;
diff --git a/admin/src/components/business/OperaProblemsWindow.vue b/admin/src/components/business/OperaProblemsWindow.vue
index c39b287..f1469dc 100644
--- a/admin/src/components/business/OperaProblemsWindow.vue
+++ b/admin/src/components/business/OperaProblemsWindow.vue
@@ -173,6 +173,7 @@
sortnu: this.form.sortnu,
type: this.form.type,
useType: this.form.useType,
+ score: this.form.score,
objectList: this.form.objectList
})
.then(() => {
diff --git a/admin/src/utils/request.js b/admin/src/utils/request.js
index 19be2e3..9aec747 100644
--- a/admin/src/utils/request.js
+++ b/admin/src/utils/request.js
@@ -50,6 +50,9 @@
return Promise.resolve(response)
}
// 鏈櫥褰�
+ if (response.data.code === 503) {
+ return Promise.reject(new Error('鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庡啀璇�'))
+ }
if (response.data.code === 401) {
if (response.config.autoLogin !== false) {
Cookies.set('dm_user_token','')
diff --git a/admin/src/views/business/problems.vue b/admin/src/views/business/problems.vue
index a628525..2389c84 100644
--- a/admin/src/views/business/problems.vue
+++ b/admin/src/views/business/problems.vue
@@ -42,7 +42,7 @@
<span v-if="row.type === 2">澶氶��</span>
</template>
</el-table-column>
- <el-table-column prop="scroe" label="鍒嗗��" min-width="100px"></el-table-column>
+ <el-table-column prop="score" label="鍒嗗��" min-width="100px"></el-table-column>
<el-table-column prop="sortnu" label="棰樼洰椤哄簭(鍗囧簭)" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
<el-table-column prop="creatorName" label="鍒涘缓浜�" min-width="100px"></el-table-column>
diff --git a/admin/src/views/operation/danger/record.vue b/admin/src/views/operation/danger/record.vue
index 339268a..2ba20b5 100644
--- a/admin/src/views/operation/danger/record.vue
+++ b/admin/src/views/operation/danger/record.vue
@@ -18,7 +18,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="闅愭偅绫诲瀷" prop="typeId">
+ <el-form-item label="闅愭偅绫诲瀷" prop="cateId">
<el-select v-model="searchForm.cateId" placeholder="璇烽�夋嫨闅愭偅绫诲瀷" @keypress.enter.native="search">
<el-option
v-for="item in cateList"
diff --git a/admin/src/views/operation/serviceCar/driverConfig.vue b/admin/src/views/operation/serviceCar/driverConfig.vue
index 481afc5..3878456 100644
--- a/admin/src/views/operation/serviceCar/driverConfig.vue
+++ b/admin/src/views/operation/serviceCar/driverConfig.vue
@@ -1,128 +1,90 @@
<template>
- <div class="main_app">
- <QueryForm
- v-model="filters"
- :query-form-config="queryFormConfig"
- @handleQuery="getList(1)"
- @clear="clear"
- />
- <div class="ml20 mt20">
- <el-button type="primary" @click="handleEdit()">娣诲姞</el-button>
- </div>
- <el-table v-loading="loading" :data="list" stripe>
- <el-table-column
- prop="name"
- 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
- />
- <el-table-column
- prop="name"
- label="鎵嬫満鍙�"
- min-width="80"
- show-overflow-tooltip
- />
- <el-table-column
- prop="name"
- label="鎿嶄綔"
- min-width="80"
- show-overflow-tooltip
+ <TableLayout :permissions="['business:member:query']">
+ <!-- 鎼滅储琛ㄥ崟 -->
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="120px" inline>
+ <el-form-item label="鍙告満濮撳悕/鎵嬫満鍙�" prop="memberName">
+ <el-input v-model="searchForm.memberName" clearable placeholder="璇疯緭鍏ュ徃鏈哄鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <section>
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ <!-- 琛ㄦ牸鍜屽垎椤� -->
+ <template v-slot:table-wrap>
+ <ul class="toolbar" v-permissions="['business:cardriver:create','business:cardriver:delete']">
+ <li><el-button type="primary" @click="$refs.OperaCarDriverWindow.open('鏂板缓鍙告満',null,searchForm.type)" icon="el-icon-plus" v-permissions="['business:cardriver:create']">鏂板缓</el-button></li>
+ <li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:cardriver:delete']">鎵归噺鍒犻櫎</el-button></li>
+ </ul>
+ <el-table
+ v-loading="isWorking.search"
+ :data="tableData.list"
+ stripe
+ @selection-change="handleSelectionChange"
>
- <template v-slot="scope">
- <el-button type="text" @click="handleEdit(scope.row)">缂栬緫</el-button>
- <el-button type="text" class="red" @click="handleDel(scope.row)">鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="getList"
- :pagination="pagination"
- />
- <el-dialog title="閫夋嫨浜哄憳" :visible.sync="isShowEdit" width="480px">
- <el-form
- :model="param"
- :rules="rules"
- ref="ruleForm"
- label-width="100px"
+ <el-table-column type="selection" width="55"></el-table-column>
+ <el-table-column prop="memberName" label="濮撳悕" min-width="150px"></el-table-column>
+ <el-table-column prop="memberPhone" label="鎵嬫満鍙�" min-width="200px"></el-table-column>
+ <el-table-column prop="memberSex" label="鎬у埆" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.memberSex == 1">鐢�</span>
+ <span v-if="row.memberSex == 2">濂�</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="companyName" label="缁勭粐" min-width="260px"></el-table-column>
+ <el-table-column prop="carCode" label="杞︾墝鍙�" min-width="100px"></el-table-column>
+ <el-table-column prop="editDate" label="鎿嶄綔鏃堕棿" min-width="150px"></el-table-column>
+ <el-table-column
+ v-if="containPermissions(['business:cardriver:update', 'business:cardriver:delete' ])"
+ label="鎿嶄綔"
+ min-width="250"
+ fixed="right"
+ >
+ <template slot-scope="{row}">
+ <el-button type="text" icon="el-icon-edit" @click="$refs.OperaCarDriverWindow.open('缂栬緫鍙告満',row,searchForm.type)" v-permissions="['business:cardriver:update']">缂栬緫</el-button>
+ <el-button type="text" icon="el-icon-delete" @click="deleteById(row)" style="color: red" v-permissions="['business:cardriver:delete']">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <pagination
+ @size-change="handleSizeChange"
+ @current-change="handlePageChange"
+ :pagination="tableData.pagination"
>
- <el-form-item label="閫夋嫨缁勭粐" prop="name">
- <el-select placeholder="璇烽�夋嫨锛屽崟閫�" class="w300" filterable>
- <el-option></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="閫夋嫨浜哄憳" prop="name">
- <el-select placeholder="璇烽�夋嫨锛屽崟閫�" class="w300" filterable>
- <el-option></el-option>
- </el-select>
- </el-form-item>
- </el-form>
- <span slot="footer" class="dialog-footer">
- <el-button @click="isShowEdit = false">鍙栨秷</el-button>
- <el-button type="primary" @click="isShowEdit = false">纭畾</el-button>
- </span>
- </el-dialog>
- </div>
+ </pagination>
+ </template>
+ <!-- 鏂板缓/淇敼 -->
+ <OperaCarDriverWindow ref="OperaCarDriverWindow" @success="handlePageChange"/>
+ </TableLayout>
</template>
<script>
+import BaseTable from '@/components/base/BaseTable'
+import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
-import QueryForm from '@/components/common/QueryForm'
+import OperaCarDriverWindow from '@/components/business/OperaCarDriverWindow'
export default {
- components: {
- Pagination,
- QueryForm
- },
+ name: 'areaSet',
+ extends: BaseTable,
+ components: { TableLayout, Pagination, OperaCarDriverWindow },
data () {
return {
- filters: {},
- loading: false,
- queryFormConfig: {
- formItems: [
- {
- filed: 'name',
- type: 'input',
- label: '椹鹃┒鍛樺鍚�'
- }
- ],
- online: true
- },
- pagination: {
- capacity: 10,
- page: 1
- },
- list: [{}],
- total: 0,
- isShowEdit: false,
- param: {},
- rules: {}
+ // 鎼滅储
+ searchForm: {
+ title: ''
+ }
}
},
+ created () {
+ this.config({
+ module: '鍙告満閰嶇疆',
+ api: '/business/carDriver',
+ 'field.id': 'id',
+ 'field.main': 'id'
+ })
+ this.search()
+ },
methods: {
- getList (page) { },
- clear () { },
- handleEdit (row) {
- this.isShowEdit = true
- },
- handleDel () {},
- handleSizeChange (capacity) {
- this.pagination.capacity = capacity
- }
}
}
</script>
-
-<style>
-</style>
diff --git a/server/system_gateway/src/main/resources/bootstrap.yml b/server/system_gateway/src/main/resources/bootstrap.yml
index 69895a9..f9d30bf 100644
--- a/server/system_gateway/src/main/resources/bootstrap.yml
+++ b/server/system_gateway/src/main/resources/bootstrap.yml
@@ -15,6 +15,7 @@
discovery:
server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
namespace: dmvisit
+# namespace: dev_renkang
username: nacos
password: nacos
gateway:
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 8c421d1..9271ca9 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
@@ -386,15 +386,6 @@
return d;
}
- public static boolean equalsObject(Object a, Object b) {
- if (a == null && b == null) {
- return true;
- }
- if (a != null){
- return a.equals(b);
- }
- return false;
- }
public static boolean equalsInteger(Integer a, Integer b) {
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 3efbe3b..01edf42 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
@@ -33,7 +33,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -42,7 +41,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java
index 5ebe99e..09c5017 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java
@@ -48,7 +48,6 @@
private String empNo;
@ApiModelProperty(value = "鐢熸棩")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date birthday;
@ApiModelProperty(value = "鎬у埆")
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerLogCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerLogCloudController.java
index 6b2fe8e..c31a17c 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerLogCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerLogCloudController.java
@@ -16,6 +16,8 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
/**
* @author 姹熻箘韫�
* @since 2024/04/28 16:06
@@ -67,6 +69,13 @@
return ApiResponse.success(hiddenDangerLogService.findPage(pageWrap));
}
+ @ApiOperation("鍒楄〃鏌ヨ")
+ @PostMapping("/findList")
+ @CloudRequiredPermission("business:hiddendangerlog:query")
+ public ApiResponse<List<HiddenDangerLog>> findList (@RequestBody HiddenDangerLog hiddenDangerLog,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ return ApiResponse.success(hiddenDangerLogService.findList(hiddenDangerLog));
+ }
+
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@CloudRequiredPermission("business:hiddendangerlog:exportExcel")
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java
index bd006e1..957db51 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java
@@ -8,12 +8,15 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.model.VisitReason;
import com.doumee.dao.business.model.Visits;
import com.doumee.dao.web.reqeust.CheckVisitedDTO;
import com.doumee.dao.web.response.MemberVO;
import com.doumee.dao.web.response.VisitDetailVO;
+import com.doumee.dao.web.response.VisitRecordVO;
import com.doumee.dao.web.response.WxAuthorizeVO;
import com.doumee.service.business.MemberService;
+import com.doumee.service.business.VisitReasonService;
import com.doumee.service.business.VisitsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -25,6 +28,7 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.util.List;
/**
* Created by IntelliJ IDEA.
@@ -47,6 +51,8 @@
@Autowired
private VisitsService visitsService;
+ @Autowired
+ private VisitReasonService visitReasonService;
@ApiOperation(value = "璁垮寰俊鎺堟潈", notes = "璁垮寰俊鎺堟潈鑾峰彇openId")
@GetMapping("/wxAuthorize")
@@ -61,7 +67,7 @@
@ApiOperation(value = "鏌ヨ琚闂汉淇℃伅", notes = "鏌ヨ琚闂汉淇℃伅")
@PostMapping("/getVisitedMember")
- public ApiResponse<MemberVO> getVisitedMember(@Valid @RequestBody CheckVisitedDTO checkVisitedDTO) {
+ public ApiResponse<List<MemberVO>> getVisitedMember(@Valid @RequestBody CheckVisitedDTO checkVisitedDTO) {
return ApiResponse.success("鏌ヨ鎴愬姛", memberService.getVisitedMember(checkVisitedDTO));
}
@@ -74,10 +80,18 @@
}
+ @ApiOperation(value = "鏉ヨ浜嬬敱", notes = "鏉ヨ浜嬬敱")
+ @PostMapping("/visitReason")
+ public ApiResponse<List<VisitReason>> visitReason() {
+ return ApiResponse.success("鏌ヨ鎴愬姛", visitReasonService.findList(null));
+ }
+
+
+
@ApiOperation(value = "璁垮璁板綍璇︽儏", notes = "璁垮璁板綍璇︽儏")
@GetMapping("/detail")
- public ApiResponse<VisitDetailVO> detail(@RequestParam Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
- return ApiResponse.success("鏌ヨ鎴愬姛", visitsService.getVisitDetail(id,getLoginUser(token).getMemberId()));
+ public ApiResponse<VisitDetailVO> detail(@RequestParam Integer id) {
+ return ApiResponse.success("鏌ヨ鎴愬姛", visitsService.getVisitDetail(id,null));
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarEventDTO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarEventDTO.java
index 525e3ca..d36521a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarEventDTO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarEventDTO.java
@@ -28,7 +28,6 @@
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarsDTO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarsDTO.java
index a17938b..1f1cf88 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarsDTO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarsDTO.java
@@ -52,12 +52,10 @@
@ApiModelProperty(value = "寮�濮嬫椂闂�")
@ExcelColumn(name="寮�濮嬫椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date startTime;
@ApiModelProperty(value = "缁撴潫鏃堕棿")
@ExcelColumn(name="缁撴潫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date endTime;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/HiddenDangerLogJoinMapper.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/HiddenDangerLogJoinMapper.java
new file mode 100644
index 0000000..dbe7355
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/HiddenDangerLogJoinMapper.java
@@ -0,0 +1,14 @@
+package com.doumee.dao.business.join;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.doumee.dao.business.model.HiddenDangerLog;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
+
+/**
+ * @author 姹熻箘韫�
+ * @since 2024/04/28 16:06
+ */
+public interface HiddenDangerLogJoinMapper extends MPJJoinMapper<HiddenDangerLog> {
+
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java
index f9545d1..39429ee 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java
@@ -34,7 +34,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
@@ -43,7 +42,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveParam.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveParam.java
index 8147a87..d4405dc 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveParam.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveParam.java
@@ -32,7 +32,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +40,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveTempl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveTempl.java
index 3735f00..f590794 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveTempl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveTempl.java
@@ -34,7 +34,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -43,7 +42,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -54,8 +52,8 @@
@ExcelColumn(name="澶囨敞")
private String remark;
- @ApiModelProperty(value = "鍚嶇О 0闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 1闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 2璁垮鎶ュ 3鍏溅甯傚唴鐢ㄨ溅 4鍏溅瀹ゅ鐢ㄨ溅 5甯傚叕鍙哥墿娴佽溅棰勭害", example = "1")
- @ExcelColumn(name="鍚嶇О 0闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 1闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 2璁垮鎶ュ 3鍏溅甯傚唴鐢ㄨ溅 4鍏溅瀹ゅ鐢ㄨ溅 5甯傚叕鍙哥墿娴佽溅棰勭害")
+ @ApiModelProperty(value = "鍚嶇О 0闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 1鏂藉伐浜哄憳璁垮鐢宠 2璁垮鎶ュ 3鍏溅甯傚唴鐢ㄨ溅 4鍏溅瀹ゅ鐢ㄨ溅 5甯傚叕鍙哥墿娴佽溅棰勭害", example = "1")
+ @ExcelColumn(name="鍚嶇О 0闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 1鏂藉伐浜哄憳璁垮鐢宠 2璁垮鎶ュ 3鍏溅甯傚唴鐢ㄨ溅 4鍏溅瀹ゅ鐢ㄨ溅 5甯傚叕鍙哥墿娴佽溅棰勭害")
private Integer type;
@ApiModelProperty(value = "鍚嶇О")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarDriver.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarDriver.java
index 697a993..de60b29 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarDriver.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarDriver.java
@@ -33,7 +33,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
@@ -42,7 +41,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -68,10 +66,19 @@
@ApiModelProperty(value = "浜哄憳缂栫爜锛堝叧鑱攎ember琛�)", example = "1")
@ExcelColumn(name="浜哄憳缂栫爜锛堝叧鑱攎ember琛�)")
private Integer memberId;
+ @ApiModelProperty(value = "杞﹁締缂栫爜锛堝叧鑱攃ars)", example = "1")
+ @ExcelColumn(name="杞﹁締缂栫爜锛堝叧鑱攃ars)")
+ private Integer carId;
@ApiModelProperty(value = "鍙告満濮撳悕", example = "1")
@TableField(exist = false)
private String memberName;
+ @ApiModelProperty(value = "杞︾墝鍙�", example = "1")
+ @TableField(exist = false)
+ private String carCode;
+ @ApiModelProperty(value = "鍙告満鎬у埆 1鐢� 2濂�", example = "1")
+ @TableField(exist = false)
+ private Integer memberSex;
@ApiModelProperty(value = "鍙告満缁勭粐鍚嶇О", example = "1")
@TableField(exist = false)
private String companyName;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java
index 4a32b5d..df004fe 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java
@@ -34,7 +34,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -43,7 +42,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarParks.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarParks.java
index 1747d16..7cd9ff9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarParks.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarParks.java
@@ -64,7 +64,6 @@
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
@ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date hkDate;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
@@ -73,7 +72,6 @@
@ApiModelProperty(value = "杞﹀簱鍒涘缓鏃堕棿")
@ExcelColumn(name="杞﹀簱鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date parkCreateDate;
@ApiModelProperty(value = "鐖惰溅搴撶紪鐮�", example = "1")
@@ -82,7 +80,6 @@
@ApiModelProperty(value = "杞﹀簱鏇存柊鏃堕棿")
@ExcelColumn(name="杞﹀簱鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date parkEditDate;
@ApiModelProperty(value = "ERP鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触", example = "1")
@@ -91,7 +88,6 @@
@ApiModelProperty(value = "ERP鏈�杩戝悓姝ユ椂闂�")
@ExcelColumn(name="ERP鏈�杩戝悓姝ユ椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date erpDate;
@ApiModelProperty(value = "鐘舵�� 0绂佺敤 1鍚敤", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java
index 0180d89..e27c71a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java
@@ -81,7 +81,6 @@
@ApiModelProperty(value = "瀹℃壒鏃堕棿(鏈�杩戜竴娆★級")
@ExcelColumn(name="瀹℃壒鏃堕棿(鏈�杩戜竴娆★級")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date checkDate;
@ApiModelProperty(value = "瀹℃壒浜�(鏈�杩戜竴娆★級", example = "1")
@@ -102,7 +101,6 @@
@ApiModelProperty(value = "鍙栨秷鏃堕棿")
@ExcelColumn(name="鍙栨秷鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date cancelTime;
@ApiModelProperty(value = "鍙栨秷浜�", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java
index 5707e3d..1189b13 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java
@@ -87,7 +87,6 @@
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
@ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date hkDate;
@ApiModelProperty(value = "褰掑睘浜虹紪鐮�", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java
index 8b3eb02..ee69b57 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java
@@ -33,7 +33,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
@@ -42,7 +41,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -67,7 +65,6 @@
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
@ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date hkDate;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
index 3342563..12c131f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
@@ -33,7 +33,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -42,7 +41,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java
index ff2c1fc..ee75464 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java
@@ -34,7 +34,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
@@ -43,7 +42,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -96,7 +94,6 @@
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
@ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date hkDate;
@ApiModelProperty(value = "浣跨敤浜烘暟")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/FormParam.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/FormParam.java
index 3075eb7..f411c85 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/FormParam.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/FormParam.java
@@ -32,7 +32,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +40,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java
index 54957fa..8112d11 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java
@@ -80,7 +80,6 @@
@ApiModelProperty(value = "澶勭悊鏃堕棿")
@ExcelColumn(name="澶勭悊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date checkDate;
@ApiModelProperty(value = "澶勭悊璇存槑")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerLog.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerLog.java
index abc5612..f40cf32 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerLog.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDangerLog.java
@@ -1,5 +1,6 @@
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;
@@ -32,7 +33,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +41,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -80,4 +79,15 @@
@ExcelColumn(name="鎿嶄綔鍚庡唴瀹�")
private String afterContent;
+ @ApiModelProperty(value = "鎿嶄綔浜�")
+ @TableField(exist = false)
+ private String createUserName;
+
+ @ApiModelProperty(value = "鎿嶄綔浜哄ご鍍�")
+ @TableField(exist = false)
+ private String avatar;
+
+ @ApiModelProperty(value = "鎿嶄綔缁勭粐淇℃伅")
+ @TableField(exist = false)
+ private String companyName;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
index 31dd657..3516b64 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -84,7 +84,6 @@
private String name;
@ApiModelProperty(value = "璁垮骞撮緞")
@ExcelColumn(name="璁垮骞撮緞")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date birthday;
@ApiModelProperty(value = "鎵嬫満鍙�")
@@ -138,7 +137,6 @@
@ApiModelProperty(value = "椋炰功鏈�杩戝悓姝ユ椂闂�")
@ExcelColumn(name="椋炰功鏈�杩戝悓姝ユ椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date fsDate;
@ApiModelProperty(value = "娴峰悍鏍囪瘑", example = "1")
@@ -154,7 +152,6 @@
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
@ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date hkDate;
@ApiModelProperty(value = "鍦ㄨ亴鐘舵�� 0鍦ㄨ亴 1绂昏亴", example = "1")
@@ -166,7 +163,6 @@
@ApiModelProperty(value = "ERP鍚屾鏃堕棿")
@ExcelColumn(name="ERP鍚屾鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date erpDate;
@ApiModelProperty(value = "ERP鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
@@ -179,7 +175,6 @@
@ApiModelProperty(value = "閽夐拤鍚屾鏃堕棿")
@ExcelColumn(name="閽夐拤鍚屾鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date ddDate;
@ApiModelProperty(value = "閽夐拤P鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
@@ -204,7 +199,6 @@
@ApiModelProperty(value = "闂ㄧ瑙掕壊鎺堟潈鏃堕棿")
@ExcelColumn(name="闂ㄧ瑙掕壊鎺堟潈鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date roleDate;
@ApiModelProperty(value = "ERP缁勭粐缂栫爜")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java
index c8f3f64..9ba7cc5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java
@@ -90,7 +90,6 @@
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
@ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date hkDate;
@ApiModelProperty(value = "鐘舵�� 0绂佺敤 1鍚敤 2閫�鍗� 3鎸傚け")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberRole.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberRole.java
index 1338577..64f13e6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberRole.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberRole.java
@@ -33,7 +33,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
@@ -42,7 +41,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ParkBook.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ParkBook.java
index 0563086..c018e02 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ParkBook.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ParkBook.java
@@ -81,12 +81,10 @@
@ApiModelProperty(value = "寮�濮嬫椂闂�")
@ExcelColumn(name="寮�濮嬫椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date startTime;
@ApiModelProperty(value = "缁撴潫鏃堕棿")
@ExcelColumn(name="缁撴潫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date endTime;
@ApiModelProperty(value = "浜哄憳缂栫爜", example = "1")
@@ -107,7 +105,6 @@
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
@ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date hkDate;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Parks.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Parks.java
index 0bd1c1a..a1ccc0e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Parks.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Parks.java
@@ -65,7 +65,6 @@
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
@ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date hkDate;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
@@ -74,7 +73,6 @@
@ApiModelProperty(value = "杞﹀簱鍒涘缓鏃堕棿")
@ExcelColumn(name="杞﹀簱鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date parkCreateDate;
@ApiModelProperty(value = "鐖惰溅搴撶紪鐮�", example = "1")
@@ -83,7 +81,6 @@
@ApiModelProperty(value = "杞﹀簱鏇存柊鏃堕棿")
@ExcelColumn(name="杞﹀簱鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date parkEditDate;
@ApiModelProperty(value = "ERP鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触", example = "1")
@@ -92,7 +89,6 @@
@ApiModelProperty(value = "ERP鏈�杩戝悓姝ユ椂闂�")
@ExcelColumn(name="ERP鏈�杩戝悓姝ユ椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date erpDate;
@ApiModelProperty(value = "鐘舵�� 0绂佺敤 1鍚敤", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
index 6790608..3b3b815 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
@@ -96,7 +96,6 @@
@ApiModelProperty(value = "鏈�鍚庝簨浠舵帹閫佹椂闂�")
@ExcelColumn(name="鏈�鍚庝簨浠舵帹閫佹椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date lastEventTime;
@ApiModelProperty(value = "鐩戞帶鐐瑰悕绉帮紝澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java
index bf2d6ac..f2a4792 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java
@@ -32,7 +32,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +40,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformInterfaceLog.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformInterfaceLog.java
index 116f9b0..52e20b5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformInterfaceLog.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformInterfaceLog.java
@@ -32,7 +32,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +40,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -62,7 +60,6 @@
@ApiModelProperty(value = "鍦板潃淇℃伅")
@ExcelColumn(name="鍦板潃淇℃伅")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date url;
@ApiModelProperty(value = "璇锋眰鍙傛暟")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
index 6038402..57def92 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
@@ -33,7 +33,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -42,7 +41,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -103,7 +101,6 @@
@ApiModelProperty(value = "骞挎挱鎻愰啋涓嬪彂鏃堕棿")
@ExcelColumn(name="骞挎挱鎻愰啋涓嬪彂鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date broadcastHkdate;
@ApiModelProperty(value = "骞挎挱鎻愰啋涓嬪彂澶囨敞")
@@ -112,7 +109,6 @@
@ApiModelProperty(value = "绛惧埌鏃堕棿")
@ExcelColumn(name="绛惧埌鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date signDate;
@ApiModelProperty(value = "绛惧埌鏂瑰紡 0app绛惧埌 1鎵爜绛惧埌", example = "1")
@@ -129,7 +125,6 @@
@ApiModelProperty(value = "鍙彿鏃堕棿")
@ExcelColumn(name="鍙彿鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date callDate;
@ApiModelProperty(value = "鍙彿浜虹紪鐮�", example = "1")
@@ -142,17 +137,14 @@
@ApiModelProperty(value = "寮�濮嬩綔涓氭椂闂�")
@ExcelColumn(name="寮�濮嬩綔涓氭椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date startDate;
@ApiModelProperty(value = "浣滀笟瀹屾垚鏃堕棿锛堟渶缁堟椂闂达級")
@ExcelColumn(name="浣滀笟瀹屾垚鏃堕棿锛堟渶缁堟椂闂达級")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date doneDate;
@ApiModelProperty(value = "寮傚父鎸傝捣鏃堕棿")
@ExcelColumn(name="寮傚父鎸傝捣鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date errorDate;
@ApiModelProperty(value = "寮傚父鎸傝捣浜虹紪鐮�", example = "1")
@@ -165,7 +157,6 @@
@ApiModelProperty(value = "鏈堝彴杞氦鏃堕棿")
@ExcelColumn(name="鏈堝彴杞氦鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date transPlatformDate;
@ApiModelProperty(value = "鏈堝彴杞氦澶勭悊浜�", example = "1")
@@ -178,12 +169,10 @@
@ApiModelProperty(value = "杞﹁締杩涘巶鏃堕棿")
@ExcelColumn(name="杞﹁締杩涘巶鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date inDate;
@ApiModelProperty(value = "杞﹁締绂诲巶鏃堕棿")
@ExcelColumn(name="杞﹁締绂诲巶鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date outDate;
@ApiModelProperty(value = "绂诲巶鏂瑰紡 0鑷姩绂诲巶 1鎵嬪姩绂诲満", example = "1")
@@ -196,7 +185,6 @@
@ApiModelProperty(value = "杞﹁締绂诲巶涓嬪彂鏃堕棿")
@ExcelColumn(name="杞﹁締绂诲巶涓嬪彂鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date outHkdate;
@ApiModelProperty(value = "杞﹁締绂诲巶涓嬪彂澶囨敞")
@@ -213,7 +201,6 @@
@ApiModelProperty(value = "杞﹁締杩涘巶涓嬪彂鏃堕棿")
@ExcelColumn(name="杞﹁締杩涘巶涓嬪彂鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date inHkdate;
@ApiModelProperty(value = "浣滀笟绫诲瀷 0鑷湁杞﹀嵏璐� 1鑷湁杞﹁璐� 2澶栧崗杞﹀嵏璐� 3澶栧崗杞﹁璐� 4甯傚叕鍙稿鍗忚溅鍗歌揣", example = "1")
@@ -238,7 +225,6 @@
@ApiModelProperty(value = "浣滃簾鏃堕棿")
@ExcelColumn(name="浣滃簾鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date cancelDate;
@ApiModelProperty(value = "浣滃簾澶勭悊浜虹紪鐮�", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformLog.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformLog.java
index cb741cd..c1054d7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformLog.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformLog.java
@@ -32,7 +32,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +40,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformQueue.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformQueue.java
index daf98c0..54ee843 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformQueue.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformQueue.java
@@ -32,7 +32,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +40,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformShowParam.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformShowParam.java
index f6bbf54..d379665 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformShowParam.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformShowParam.java
@@ -32,7 +32,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +40,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ProblemLog.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ProblemLog.java
index 980c631..0bc8c13 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ProblemLog.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ProblemLog.java
@@ -36,7 +36,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -45,7 +44,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
index 8004aed..87a786e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
@@ -30,7 +30,6 @@
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
@@ -63,7 +62,6 @@
private String name;
@ApiModelProperty(value = "璁垮骞撮緞")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date birthday;
@ApiModelProperty(value = "鎵嬫満鍙�")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Tasks.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Tasks.java
index 49cd331..f7fc2ff 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Tasks.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Tasks.java
@@ -32,7 +32,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
@@ -41,7 +40,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -74,7 +72,6 @@
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
@ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date hkDate;
@ApiModelProperty(value = "鏈�杩戞煡璇换鍔℃墽琛岀粨鏋滐紙鏌ヨ杩涘害缁撴灉杩斿洖json锛�")
@@ -83,12 +80,10 @@
@ApiModelProperty(value = "浠诲姟涓嬭浇瀹屾垚鏃堕棿")
@ExcelColumn(name="浠诲姟涓嬭浇瀹屾垚鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date hkDoneDate;
@ApiModelProperty(value = "缁堟鍘熷洜")
@ExcelColumn(name="缁堟鍘熷洜")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date stopInfo;
@ApiModelProperty(value = "缁堟鏃堕棿")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java
index 323741e..7c50037 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/TrainTime.java
@@ -35,7 +35,6 @@
private Integer edirot;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/UserAction.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/UserAction.java
index a18a979..e75339c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/UserAction.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/UserAction.java
@@ -41,7 +41,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitPark.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitPark.java
index 62bdfb4..2a4c837 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitPark.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitPark.java
@@ -32,7 +32,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +40,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -78,17 +76,14 @@
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
@ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date hkDate;
@ApiModelProperty(value = "寮�濮嬫椂闂�")
@ExcelColumn(name="寮�濮嬫椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date startTime;
@ApiModelProperty(value = "缁撴潫鏃堕棿")
@ExcelColumn(name="缁撴潫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date endTime;
@ApiModelProperty(value = "鍋滆溅搴撴捣搴风紪鐮�")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitProblemLog.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitProblemLog.java
index df9ee7e..e81e128 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitProblemLog.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitProblemLog.java
@@ -33,7 +33,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -42,7 +41,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitProblems.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitProblems.java
index 6b1d2d3..ffb2042 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitProblems.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitProblems.java
@@ -33,7 +33,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -42,7 +41,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitReason.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitReason.java
index 7d09133..787c4d4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitReason.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/VisitReason.java
@@ -32,7 +32,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +40,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visitor.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visitor.java
index 9365943..47560e7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visitor.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visitor.java
@@ -33,7 +33,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -42,7 +41,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -75,7 +73,6 @@
@ApiModelProperty(value = "璁垮骞撮緞")
@ExcelColumn(name="璁垮骞撮緞")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date birthday;
@ApiModelProperty(value = "鎵嬫満鍙�")
@@ -120,7 +117,6 @@
@ApiModelProperty(value = "鏈�杩戠櫥褰曟椂闂�")
@ExcelColumn(name="鏈�杩戠櫥褰曟椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date lastLoginDate;
@ApiModelProperty(value = "鐧诲綍娆℃暟", example = "1")
@@ -136,7 +132,6 @@
@ApiModelProperty(value = "鏈�鍚庝竴娆＄鍒版椂闂�")
@ExcelColumn(name="鏈�鍚庝竴娆＄鍒版椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date lastVisitDate;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
index 077a8ad..bf78546 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
@@ -78,7 +78,6 @@
private String name;
@ApiModelProperty(value = "璁垮骞撮緞")
@ExcelColumn(name="璁垮骞撮緞")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date birthday;
@ApiModelProperty(value = "鎵嬫満鍙�")
@ExcelColumn(name="鎵嬫満鍙�")
@@ -154,7 +153,6 @@
@ApiModelProperty(value = "鍒濆鏃堕棿")
@ExcelColumn(name="鍒濆鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date checkDate;
@ApiModelProperty(value = "鍒濆澶囨敞")
@@ -167,7 +165,6 @@
@ApiModelProperty(value = "缁堝鏃堕棿")
@ExcelColumn(name="缁堝鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date endCheckDate;
@ApiModelProperty(value = "缁堝澶囨敞")
@@ -215,7 +212,6 @@
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
@ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date hkDate;
@ApiModelProperty(value = "ERP鐢宠璁板綍缂栫爜")
@@ -234,6 +230,10 @@
@ApiModelProperty(value = "鏉ユ簮绫诲瀷锛�0=鏈郴缁燂紱1=ERP", example = "1")
private Integer sourceType;
+ @ApiModelProperty(value = "鏂藉伐浜嬬敱")
+ @ExcelColumn(name="鏂藉伐浜嬬敱")
+ private String constructionReason;
+
@ApiModelProperty(value = "鏅�氳瀹㈢敵璇烽殢璁夸汉鍛�")
@TableField(exist = false)
private List<Visits> withUserList;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/ProblemLogVo.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/ProblemLogVo.java
index 3376a7e..43c66a0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/ProblemLogVo.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/ProblemLogVo.java
@@ -32,6 +32,5 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/CheckVisitedDTO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/CheckVisitedDTO.java
index 1d9cbdb..49291cc 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/CheckVisitedDTO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/CheckVisitedDTO.java
@@ -15,7 +15,6 @@
@Data
public class CheckVisitedDTO {
- @NotBlank(message = "鎵嬫満鍙锋湭褰曞叆")
@ApiModelProperty(value = "鎵嬫満鍙�")
private String mobile;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
index 883b71d..796bded 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
@@ -177,7 +177,7 @@
- MemberVO getVisitedMember(CheckVisitedDTO checkVisitedDTO);
+ List<MemberVO> getVisitedMember(CheckVisitedDTO checkVisitedDTO);
/**
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
index 19b9c4b..da0ec66 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
@@ -227,7 +227,7 @@
/**
* 鍒涘缓瀹℃壒娴佺▼
- * @param tempType 妯℃澘绫诲瀷 0闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 1闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 2璁垮鎶ュ 3鍏溅甯傚唴鐢ㄨ溅 4鍏溅瀹ゅ鐢ㄨ溅 5甯傚叕鍙哥墿娴佽溅棰勭害
+ * @param tempType 妯℃澘绫诲瀷 0闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 1鏂藉伐浜哄憳璁垮鐢宠 2璁垮鎶ュ 3鍏溅甯傚唴鐢ㄨ溅 4鍏溅瀹ゅ鐢ㄨ溅 5甯傚叕鍙哥墿娴佽溅棰勭害
* @param businessId 涓氬姟涓婚敭 鏍规嵁 tempType
* @param createMemberId 鎻愪氦娴佺▼浜哄憳
*/
@@ -241,7 +241,7 @@
.last(" limit 1 ")
);
if(Objects.isNull(approveTempl)){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌閰嶇疆妯℃澘");
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌瀹℃壒娴侀厤缃ā鏉�");
}
//鏌ヨ閰嶇疆娴佺▼
List<ApproveParam> approveParamAllList = approveParamMapper.selectList(new QueryWrapper<ApproveParam>()
@@ -305,6 +305,7 @@
approve.setIsEndCheck((i+1) == approveParamList.size()?Constants.ONE:Constants.ZERO);
approve.setObjId(businessId);
approve.setLevel(i+1);
+ approve.setObjType(approveTempl.getType());
approve.setApproveType(approveParam.getApproveType());
approve.setDriverParam(approveParam.getDriverParam());
approve.setAddrParam(approveParam.getAddrParam());
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarDriverServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarDriverServiceImpl.java
index b8558f1..598ad6c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarDriverServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarDriverServiceImpl.java
@@ -9,10 +9,7 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CarDriverMapper;
import com.doumee.dao.business.MemberMapper;
-import com.doumee.dao.business.model.CarDriver;
-import com.doumee.dao.business.model.CarUseBook;
-import com.doumee.dao.business.model.Company;
-import com.doumee.dao.business.model.Member;
+import com.doumee.dao.business.model.*;
import com.doumee.service.business.CarDriverService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -20,6 +17,7 @@
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.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -59,12 +57,18 @@
.eq(CarDriver::getIsdeleted, Constants.ZERO))>0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇ュ徃鏈哄凡缁忛厤缃紝鏃犻渶閲嶆柊閰嶇疆锛�");
}
+ if(carDriver.getCarId()!=null && carDriverMapper.selectCount(new QueryWrapper<CarDriver>().lambda()
+ .eq(CarDriver::getCarId,carDriver.getCarId())
+ .eq(CarDriver::getIsdeleted, Constants.ZERO))>0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇ヨ溅杈嗗凡缁忛厤缃紝鏃犻渶閲嶆柊閰嶇疆锛�");
+ }
carDriver.setCreateDate(new Date());
carDriver.setCreator(loginUserInfo.getId());
carDriver.setEditDate(new Date());
carDriver.setEdirot(loginUserInfo.getId());
carDriver.setCompanyId(member.getCompanyId());
carDriver.setStatus(Constants.ZERO);
+ carDriver.setIsdeleted(Constants.ZERO);
carDriverMapper.insert(carDriver);
return carDriver.getId();
}
@@ -94,9 +98,36 @@
if(loginUserInfo == null){
loginUserInfo = carDriver.getLoginUserInfo();
}
+ if(carDriverMapper.selectById(carDriver.getId()) == null){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY );
+ }
+ Member member = memberMapper.selectById(carDriver.getMemberId());
+ if(member == null
+ ||Constants.equalsInteger(member.getIsdeleted(),Constants.ONE)
+ ||!Constants.equalsInteger(member.getType(),Constants.TWO)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇ュ徃鏈轰俊鎭笉瀛樺湪锛岃杩斿洖鍒锋柊椤甸潰閲嶈瘯锛�");
+ }
+ if(carDriverMapper.selectCount(new QueryWrapper<CarDriver>().lambda()
+ .eq(CarDriver::getMemberId,carDriver.getMemberId())
+ .ne(CarDriver::getId,carDriver.getId())
+ .eq(CarDriver::getIsdeleted, Constants.ZERO))>0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇ュ徃鏈哄凡缁忛厤缃紝鏃犻渶閲嶆柊閰嶇疆锛�");
+ }
+ if(carDriver.getCarId()!=null && carDriverMapper.selectCount(new QueryWrapper<CarDriver>().lambda()
+ .eq(CarDriver::getCarId,carDriver.getCarId())
+ .ne(CarDriver::getId,carDriver.getId())
+ .eq(CarDriver::getIsdeleted, Constants.ZERO))>0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇ヨ溅杈嗗凡缁忛厤缃紝鏃犻渶閲嶆柊閰嶇疆锛�");
+ }
carDriver.setEditDate(new Date());
carDriver.setEdirot(loginUserInfo.getId());
- carDriverMapper.updateById(carDriver);
+ carDriverMapper.update(null,new UpdateWrapper<CarDriver>().lambda()
+ .eq(CarDriver::getId,carDriver.getId())
+ .set(CarDriver::getMemberId,carDriver.getMemberId())
+ .set(CarDriver::getCarId,carDriver.getCarId())
+ .set(CarDriver::getEdirot,carDriver.getEdirot())
+ .set(CarDriver::getEditDate,carDriver.getEditDate())
+ );
}
@Override
@@ -114,9 +145,12 @@
MPJLambdaWrapper<CarDriver> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(CarDriver.class);
queryWrapper.selectAs(Member::getName,CarDriver::getMemberName);
+ queryWrapper.selectAs(Member::getSex,CarDriver::getMemberSex);
queryWrapper.selectAs(Member::getPhone,CarDriver::getMemberPhone);
+ queryWrapper.selectAs(Cars::getCode,CarDriver::getCarCode);
queryWrapper.selectAs(Company::getCompanyNamePath,CarDriver::getCompanyName);
- queryWrapper.leftJoin(Member.class,Member::getId,CarUseBook::getMemberId)
+ queryWrapper.leftJoin(Member.class,Member::getId,CarDriver::getMemberId)
+ .leftJoin(Cars.class,Cars::getId,CarDriver::getCarId)
.leftJoin(Company.class,Company::getId,Member::getCompanyId)
.eq(CarDriver::getId,id)
.last("limit 1");
@@ -141,10 +175,13 @@
MPJLambdaWrapper<CarDriver> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
queryWrapper.selectAll(CarDriver.class);
+ queryWrapper.selectAs(Cars::getCode,CarDriver::getCarCode);
queryWrapper.selectAs(Member::getName,CarDriver::getMemberName);
+ queryWrapper.selectAs(Member::getSex,CarDriver::getMemberSex);
queryWrapper.selectAs(Member::getPhone,CarDriver::getMemberPhone);
queryWrapper.selectAs(Company::getCompanyNamePath,CarDriver::getCompanyName);
- queryWrapper.leftJoin(Member.class,Member::getId,CarUseBook::getMemberId)
+ queryWrapper.leftJoin(Member.class,Member::getId,CarDriver::getMemberId)
+ .leftJoin(Cars.class,Cars::getId,CarDriver::getCarId)
.leftJoin(Company.class,Company::getId,Member::getCompanyId);
queryWrapper
.eq(pageWrap.getModel().getId() != null, CarDriver::getId, pageWrap.getModel().getId())
@@ -154,12 +191,14 @@
.eq(pageWrap.getModel().getEdirot() != null, CarDriver::getEdirot, pageWrap.getModel().getEdirot())
.ge(pageWrap.getModel().getEditDate() != null, CarDriver::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()))
.le(pageWrap.getModel().getEditDate() != null, CarDriver::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()))
- .eq(pageWrap.getModel().getIsdeleted() != null, CarDriver::getIsdeleted, pageWrap.getModel().getIsdeleted())
+ .eq( CarDriver::getIsdeleted, Constants.ZERO)
.eq(pageWrap.getModel().getRemark() != null, CarDriver::getRemark, pageWrap.getModel().getRemark())
.eq(pageWrap.getModel().getSortnum() != null, CarDriver::getSortnum, pageWrap.getModel().getSortnum())
.eq(pageWrap.getModel().getCompanyId() != null, CarDriver::getCompanyId, pageWrap.getModel().getCompanyId())
.eq(pageWrap.getModel().getStatus() != null, CarDriver::getStatus, pageWrap.getModel().getStatus())
.eq(pageWrap.getModel().getMemberId() != null, CarDriver::getMemberId, pageWrap.getModel().getMemberId())
+ .and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getName,pageWrap.getModel().getMemberName())
+ .or().like(Member::getPhone,pageWrap.getModel().getMemberName()))
.orderByDesc(CarDriver::getCreateDate );
;
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
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 f62d26d..1e84509 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
@@ -287,7 +287,7 @@
if(model == null || Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝缁勭粐淇℃伅涓嶅瓨鍦▇");
}
- if( Constants.equalsObject(Constants.ONE,model.getType())&& Constants.equalsObject(Constants.ZERO,company.getType())){
+ if( Constants.equalsInteger(Constants.ONE,model.getType())&& Constants.equalsInteger(Constants.ZERO,company.getType())){
//濡傛灉鐢卞唴閮ㄧ粍缁囧垏鎹㈡垚鍐呴儴缁勭粐锛屾帓鏌ヤ笅绾х粍缁囨槸鍚︽湁鍐呴儴缁勭粐
if(companyJoinMapper.selectCount(new QueryWrapper<Company>().lambda()
.eq(Company::getIsdeleted,Constants.ZERO )
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java
index c9e8154..312a77c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java
@@ -1,20 +1,33 @@
package com.doumee.service.business.impl;
+import com.doumee.biz.system.SystemDictDataBiz;
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.HiddenDangerLogMapper;
+import com.doumee.dao.business.HiddenDangerMapper;
+import com.doumee.dao.business.dao.CompanyMapper;
+import com.doumee.dao.business.join.HiddenDangerLogJoinMapper;
+import com.doumee.dao.business.model.Company;
+import com.doumee.dao.business.model.HiddenDanger;
import com.doumee.dao.business.model.HiddenDangerLog;
+import com.doumee.dao.business.model.Member;
+import com.doumee.dao.system.SystemUserMapper;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.HiddenDangerLogService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.List;
+import java.util.Objects;
/**
* 鐞嗚碃鎿嶄綔鍘嗗彶琛⊿ervice瀹炵幇
@@ -26,6 +39,21 @@
@Autowired
private HiddenDangerLogMapper hiddenDangerLogMapper;
+
+ @Autowired
+ private HiddenDangerMapper hiddenDangerMapper;
+
+ @Autowired
+ private HiddenDangerLogJoinMapper hiddenDangerLogJoinMapper;
+
+ @Autowired
+ private SystemUserMapper systemUserMapper;
+
+ @Autowired
+ private CompanyMapper companyMapper;
+
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
@Override
public Integer create(HiddenDangerLog hiddenDangerLog) {
@@ -80,8 +108,55 @@
@Override
public List<HiddenDangerLog> findList(HiddenDangerLog hiddenDangerLog) {
- QueryWrapper<HiddenDangerLog> wrapper = new QueryWrapper<>(hiddenDangerLog);
- return hiddenDangerLogMapper.selectList(wrapper);
+ List<HiddenDangerLog> hiddenDangerLogList = hiddenDangerLogJoinMapper.selectJoinList(HiddenDangerLog.class,
+ new MPJLambdaWrapper<HiddenDangerLog>()
+ .selectAll(HiddenDangerLog.class)
+ .selectAs(SystemUser::getRealname,HiddenDangerLog::getCreateUserName)
+ .selectAs(SystemUser::getAvatar,HiddenDangerLog::getAvatar)
+ .selectAs(Company::getCompanyNamePath,HiddenDangerLog::getCompanyName)
+ .leftJoin(SystemUser.class,SystemUser::getId,HiddenDangerLog::getCreator)
+ .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
+ .eq(Objects.nonNull(hiddenDangerLog.getHiddenDangerId()),HiddenDangerLog::getHiddenDangerId,hiddenDangerLog.getHiddenDangerId())
+ .eq(Objects.isNull(hiddenDangerLog.getHiddenDangerId()),"1",2)
+ .eq(HiddenDangerLog::getIsdeleted, Constants.ZERO)
+ .orderByAsc(HiddenDangerLog::getCreateDate)
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(hiddenDangerLogList)){
+ HiddenDanger hiddenDanger = hiddenDangerMapper.selectById(hiddenDangerLog.getHiddenDangerId());
+ if(Objects.isNull(hiddenDanger)){
+ return null;
+ }
+ HiddenDangerLog newBean = new HiddenDangerLog();
+ newBean.setCreateUserName("-");
+ newBean.setCompanyName("-");
+ newBean.setTitle("闅愭偅澶勭悊");
+ newBean.setAvatar("-");
+
+ if(hiddenDanger.getStatus().equals(Constants.ZERO)){
+ //涓嬩竴姝ュ鐞嗕汉
+ SystemUser systemUser = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda().eq(SystemUser::getMemberId,hiddenDanger.getCheckUserId()));
+ if(Objects.nonNull(systemUser)){
+ newBean.setCreateUserName(systemUser.getRealname());
+ newBean.setAvatar(systemUser.getAvatar());
+ Company company = companyMapper.selectById(systemUser.getCompanyId());
+ if(Objects.nonNull(company)){
+ newBean.setCompanyName(company.getCompanyNamePath());
+ }
+ }
+ }
+ hiddenDangerLogList.add(newBean);
+
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+
+ for (HiddenDangerLog bean:hiddenDangerLogList) {
+ if(StringUtils.isNotBlank(bean.getAvatar())){
+ bean.setAvatar(path + bean.getAvatar());
+ }
+ }
+ }
+
+ return hiddenDangerLogList;
}
@Override
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java
index 955607d..d0ad267 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java
@@ -118,7 +118,7 @@
loginUserInfo = model.getLoginUserInfo();
}
HiddenDangerParam hiddenDangerParam = hiddenDangerParamMapper.selectById(model.getId());
- if(hiddenDangerParam == null || Constants.equalsObject(hiddenDangerParam.getIsdeleted(),Constants.ONE)){
+ if(hiddenDangerParam == null || Constants.equalsInteger(hiddenDangerParam.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇ラ厤缃俊鎭笉瀛樺湪锛岃杩斿洖鍒锋柊椤甸潰閲嶈瘯锛�");
}
if(Constants.equalsInteger(hiddenDangerParam.getType(),Constants.ZERO)){
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
index 523e0f1..d5d3be5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
@@ -84,6 +84,7 @@
hiddenDangerLog.setIsdeleted(Constants.ZERO);
hiddenDangerLog.setCreateDate(new Date());
hiddenDangerLog.setCreator(hiddenDanger.getCreator());
+ hiddenDangerLog.setTitle("闅愭偅鎻愪氦");
hiddenDangerLog.setHiddenDangerId(hiddenDanger.getId());
hiddenDangerLog.setObjType(Constants.ZERO);
hiddenDangerLogMapper.insert(hiddenDangerLog);
@@ -148,20 +149,23 @@
.select("t1.name", HiddenDanger::getMemberName)
.select("t1.phone",HiddenDanger::getMemberPhone)
.select("t2.name",HiddenDanger::getCheckorName)
- .select("t3.phone",HiddenDanger::getCheckorPhone)
+ .select("t2.phone",HiddenDanger::getCheckorPhone)
.select("t4.company_name_path",HiddenDanger::getCompanyName);
queryWrapper.leftJoin(Member.class,Member::getId,HiddenDanger::getMemberId)
- .leftJoin("company t4 on t1.company_id=t4.id")
.leftJoin(Member.class,Member::getId,HiddenDanger::getCheckUserId)
- .leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId);
+ .leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId)
+ .leftJoin("company t4 on t1.company_id=t4.id");
queryWrapper
.eq(HiddenDanger::getId, id).last("limit 1");
HiddenDanger model = hiddenDangerMapper.selectJoinOne(HiddenDanger.class,queryWrapper);
- if(model ==null || Constants.equalsObject(model.getIsdeleted(),Constants.ONE)){
+ if(model ==null || Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
initFiles(model);
+
+
+
return model;
}
private void initFiles(HiddenDanger unionChange) {
@@ -172,8 +176,8 @@
,Constants.MultiFile.HIDDEN_DANGER_DEAL_AFTER.getKey()}))
.eq(Multifile::getIsdeleted,Constants.ZERO));
if(multifiles!=null){
- String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()
- +systemDictDataBiz.queryByCode(Constants.OSS,Constants.HIDDEN_DANGER_FILE).getCode();
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.FTP,Constants.HIDDEN_DANGER_FILE).getCode();
for(Multifile f : multifiles){
if(StringUtils.isBlank(f.getFileurl())){
continue;
@@ -339,6 +343,7 @@
hiddenDangerLog.setCreateDate(new Date());
hiddenDangerLog.setCreator(hiddenDanger.getCreator());
hiddenDangerLog.setHiddenDangerId(hiddenDanger.getId());
+ hiddenDangerLog.setTitle(hiddenDanger.getStatus().equals(Constants.ONE)?"闅愭偅澶勭悊":"闅愭偅杞氦");
hiddenDangerLog.setObjType(hiddenDanger.getStatus().equals(Constants.ONE)?Constants.FOUR:Constants.TWO);
hiddenDangerLogMapper.insert(hiddenDangerLog);
}
@@ -379,6 +384,7 @@
hiddenDangerLog.setIsdeleted(Constants.ZERO);
hiddenDangerLog.setCreateDate(new Date());
hiddenDangerLog.setCreator(hiddenDanger.getCreator());
+ hiddenDangerLog.setTitle("闅愭偅閫�鍥�");
hiddenDangerLog.setHiddenDangerId(hiddenDanger.getId());
hiddenDangerLog.setObjType(Constants.ONE);
hiddenDangerLogMapper.insert(hiddenDangerLog);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 987e74d..2ba9c75 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -167,6 +167,7 @@
user.setSalt(salt);
// 鍒涘缓鐢ㄦ埛璁板綍
user.setType(insert.getType());
+ user.setAvatar(insert.getFaceImg());
user.setUsername(insert.getPhone());
user.setEmpNo(insert.getCode());
user.setRealname(insert.getName());
@@ -444,11 +445,15 @@
member.setHkOrgId(company.getHkId());
isNeedUpdateUser = true;
}
+ if(StringUtils.isNotBlank(model.getFaceImg())){
+ isNeedUpdateUser=true;
+ }
if(isNeedUpdateUser){
//鏇存柊绯荤粺鐢ㄦ埛璐﹀彿淇℃伅
systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda()
.set(SystemUser::getUpdateUser,member.getLoginUserInfo().getId())
.set(SystemUser::getUpdateTime,new Date())
+ .set(StringUtils.isNotBlank(model.getFaceImg()),SystemUser::getAvatar,member.getFaceImg())
.set(StringUtils.isNotBlank(model.getPhone()),SystemUser::getMobile,member.getPhone())
.set(StringUtils.isNotBlank(model.getName()),SystemUser::getRealname,member.getName())
.set(model.getCompanyId() !=null,SystemUser::getCompanyId,member.getCompanyId())
@@ -568,7 +573,7 @@
}else{
if( ! (Constants.equalsInteger(memberRole.getTimeType(),Constants.ZERO)
||Constants.equalsInteger(memberRole.getTimeType(),Constants.TWO)
- || (Constants.equalsObject(memberRole.getTimeType(),Constants.ONE)
+ || (Constants.equalsInteger(memberRole.getTimeType(),Constants.ONE)
&& memberRole.getStartTime() !=null && memberRole.getEndTime() != null ))){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
@@ -579,7 +584,7 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈夋晥鏈熸埅姝㈡棩鏈熶笉鑳藉皬浜庡紑濮嬫椂闂达紒");
}
}
- if(Constants.equalsObject(memberRole.getTimeType(),Constants.ZERO) ){
+ if(Constants.equalsInteger(memberRole.getTimeType(),Constants.ZERO) ){
memberRole.setStartTime(null);
memberRole.setEndTime(null);
}
@@ -947,10 +952,10 @@
if(model ==null) {
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝浜哄憳淇℃伅涓嶅瓨鍦紒");
}
- if(!Constants.equalsObject(model.getIsdeleted(),Constants.ONE)){
+ if(!Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鍙湁閽堝绂昏亴浜哄憳鍙繘琛岃鎿嶄綔锛�");
}
- if(Constants.equalsObject(model.getHkStatus(),Constants.ONE)){
+ if(Constants.equalsInteger(model.getHkStatus(),Constants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ヤ汉鍛樺凡琚垹闄わ紒");
}
if(StringUtils.isBlank(model.getHkId())){
@@ -965,7 +970,7 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝浜哄憳淇℃伅涓嶅瓨鍦紒");
}
if(model.getCompanyId()!=null) {
- if(Constants.equalsObject(member.getHeadStatus(),Constants.ONE)){
+ if(Constants.equalsInteger(member.getHeadStatus(),Constants.ONE)){
//濡傛灉鏄彇娑堜富绠�
companyMapper.update(null,new UpdateWrapper<Company>().lambda()
.eq(Company::getId,model.getCompanyId())
@@ -1314,7 +1319,7 @@
// .eq(Member::getStatus,Constants.Status.ENABLE.getValue())
// .eq(Member::getType,Constants.memberType.internal)
.eq(pageWrap.getModel().getHkStatus()!=null,Member::getHkStatus,pageWrap.getModel().getHkStatus())
- .orderByDesc(!Constants.equalsObject(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getCreateDate)
+ .orderByDesc(!Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getCreateDate)
.orderByDesc(Constants.equalsInteger(pageWrap.getModel().getIsdeleted(),Constants.ONE),Member::getEditDate);
if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin())==DataSyncConfig.origin.erp){
queryWrapper.eq( StringUtils.isNotBlank(pageWrap.getModel().getErpOrgId()),Member::getErpOrgId,pageWrap.getModel().getErpOrgId());
@@ -1624,30 +1629,24 @@
@Override
- public MemberVO getVisitedMember(CheckVisitedDTO checkVisitedDTO){
- Integer validType = Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.BEVISITED_USER_VALID).getCode());
- if(Objects.isNull(checkVisitedDTO)||StringUtils.isBlank(checkVisitedDTO.getMobile())||(validType.equals(Constants.ONE)&&StringUtils.isBlank(checkVisitedDTO.getName()))){
- throw new BusinessException(ResponseStatus.BAD_REQUEST);
- }
- Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
- .eq(Member::getPhone,checkVisitedDTO.getMobile())
- .eq(validType.equals(Constants.ONE),Member::getName,checkVisitedDTO.getName())
+ public List<MemberVO> getVisitedMember(CheckVisitedDTO checkVisitedDTO){
+ List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
+ .eq(StringUtils.isNotBlank(checkVisitedDTO.getMobile()),Member::getPhone,checkVisitedDTO.getMobile())
+ .eq(StringUtils.isNotBlank(checkVisitedDTO.getName()),Member::getName,checkVisitedDTO.getName())
.eq(Member::getIsdeleted,Constants.ZERO)
-// .eq(Member::getStatus,Constants.ZERO)
+ .eq(Member::getStatus,Constants.ZERO)
.eq(Member::getCanVisit,Constants.ONE)
- .eq(Member::getType,Constants.memberType.internal)
- .last(" limit 1 ")
+ .eq(Member::getType,Constants.memberType.internal)
);
- MemberVO memberVO = new MemberVO();
- if(!Objects.isNull(member)){
- if(!member.getStatus().equals(Constants.ZERO)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"琚浜鸿处鍙峰紓甯革紝璇风‘璁ゅ悗鍐嶈瘯");
+ List<MemberVO> memberVOList = new ArrayList<>();
+ if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberList)) {
+ for (Member member:memberList) {
+ MemberVO memberVO = new MemberVO();
+ BeanUtils.copyProperties(member,memberVO);
+ memberVOList.add(memberVO);
}
- BeanUtils.copyProperties(member,memberVO);
- }else{
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"璇锋牳瀹炶璁夸汉淇℃伅!");
}
- return memberVO;
+ return memberVOList;
}
@@ -1888,7 +1887,7 @@
if(company == null){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛岀粍缁囧悕绉般��"+model.getCompanyName()+"銆戜笉瀛樺湪锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
}
- if(companyType != null && !Constants.equalsObject(companyType,company.getType())){
+ if(companyType != null && !Constants.equalsInteger(companyType,company.getType())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛岀粍缁囧悕绉般��"+model.getCompanyName()+"銆戠被鍨嬩笉姝ｇ‘锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
}
String candNo = DESUtil.encrypt(Constants.EDS_PWD, model.getIdcardNo());
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java
index 62e9b04..f41237c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java
@@ -105,6 +105,7 @@
}
update.setAnswer(problems.getAnswer());
update.setSortnu(problems.getSortnu());
+ update.setScore(problems.getScore());
update.setType(problems.getType());
update.setScore(problems.getScore());
update.setUseType(problems.getUseType());
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitReasonServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitReasonServiceImpl.java
index 8b6d77b..e21b168 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitReasonServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitReasonServiceImpl.java
@@ -98,6 +98,7 @@
@Override
public List<VisitReason> findList(VisitReason visitReason) {
QueryWrapper<VisitReason> wrapper = new QueryWrapper<>(visitReason);
+ wrapper.eq("isdeleted",Constants.ZERO);
return visitReasonMapper.selectList(wrapper);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index 922d615..4942c39 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -616,13 +616,15 @@
}
//璁垮鎶ュ
if(visits.getType().equals(Constants.TWO)
- && (StringUtils.isBlank( visits.getName())
+ && (StringUtils.isBlank( visits.getName())
|| StringUtils.isBlank( visits.getPhone())
|| StringUtils.isBlank( visits.getCompanyName()))
|| StringUtils.isBlank( visits.getCarNos())
- || Objects.isNull( visits.getMemberNum())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝淇℃伅濉啓涓嶆纭紒");
+ }else if(visits.getType().equals(Constants.ONE) && StringUtils.isBlank(visits.getConstructionReason())){
+
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝鏈～鍐欐柦宸ヤ簨鐢憋紒");
}
if(visits.getEndtime().getTime() < System.currentTimeMillis()){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝鍏ュ巶鏃堕棿蹇呴』澶т簬褰撳墠鏃堕棿锛�");//
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
index 1ba7e34..cf669bf 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
@@ -565,7 +565,7 @@
continue;
}
HKConstants.OPERA_TYPE flag = HKConstants.OPERA_TYPE.ADD;
- if(Constants.equalsObject(c.getIsdeleted(),Constants.ONE)){
+ if(Constants.equalsInteger(c.getIsdeleted(),Constants.ONE)){
flag = HKConstants.OPERA_TYPE.DEL;
}
if(addTaskData(c,taskId,flag.getKey())){
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncParkServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncParkServiceImpl.java
index 9fc3a6c..b68b0b4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncParkServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncParkServiceImpl.java
@@ -75,7 +75,7 @@
private void dealParkBookBiz(ParkBook c,Date date) {
try {
- if(Constants.equalsObject(c.getIsdeleted(),Constants.ONE)) {
+ if(Constants.equalsInteger(c.getIsdeleted(),Constants.ONE)) {
//濡傛灉鍙栨秷棰勭害锛屽垯杩涜鍙栨秷鍖呮湡
if(StringUtils.isNotBlank(c.getParkHkId())
&& StringUtils.isNotBlank(c.getCarCode())){
@@ -109,7 +109,7 @@
@Override
public void syncParkBookBySingleModel(ParkBook c) {
- if(Constants.equalsObject(c.getIsdeleted(),Constants.ONE)){
+ if(Constants.equalsInteger(c.getIsdeleted(),Constants.ONE)){
//濡傛灉鍙栨秷棰勭害锛屽垯杩涜鍙栨秷鍖呮湡
if(StringUtils.isNotBlank(c.getParkHkId())
&& StringUtils.isNotBlank(c.getCarCode())){
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
index 7765f13..a8ab55b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
@@ -477,7 +477,7 @@
}
if(Constants.equalsInteger(member.getIsdeleted(),Constants.ZERO)){
-// && Constants.equalsObject(member.getHkStatus(),Constants.ONE)){
+// && Constants.equalsInteger(member.getHkStatus(),Constants.ONE)){
List<Integer> deviceIds =new ArrayList<>();//鏂拌澶囩紪鐮侀泦鍚�
List<Empower> list = new ArrayList<>();//鏂版巿鏉冭褰曢泦鍚�
//濡傛灉鐢ㄦ埛鏄悓姝ユ捣搴锋垚鍔燂紝娣诲姞甯︿笅鍙戞潈闄愶紙鍙鐞嗘柊澧炴垨鑰呯紪杈戠殑锛�
@@ -544,7 +544,7 @@
List<Integer> deviceIds =new ArrayList<>();//鏂拌澶囩紪鐮侀泦鍚�
List<Empower> list = new ArrayList<>();//鏂版巿鏉冭褰曢泦鍚�
if(Constants.equalsInteger(member.getIsdeleted(),Constants.ZERO)
- && Constants.equalsObject(member.getHkStatus(),Constants.ONE)){
+ && Constants.equalsInteger(member.getHkStatus(),Constants.ONE)){
//濡傛灉鐢ㄦ埛鏄悓姝ユ捣搴锋垚鍔燂紝娣诲姞甯︿笅鍙戞潈闄愶紙鍙鐞嗘柊澧炴垨鑰呯紪杈戠殑锛�
List<Device> deviceList = deviceMapper.selectList(new QueryWrapper<Device>().lambda().in(Device::getId,addDoorIds));
if(deviceList == null || deviceList.size() == 0){
--
Gitblit v1.9.3