From c70d3f2aaf0f576c4d61255c691ad335eb551606 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 24 五月 2024 18:15:52 +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/service/business/impl/hksync/HkSyncParkServiceImpl.java             |    2 
 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarsController.java                                      |    4 
 admin/src/views/business/carsSync.vue                                                                                      |    0 
 admin/src/api/business/parkBook.js                                                                                         |    5 
 admin/src/assets/style/style.scss                                                                                          |    2 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java                  |  129 ++++++
 admin/package-lock.json                                                                                                    |   27 +
 admin/src/api/business/cars.js                                                                                             |    4 
 admin/src/components/business/OperaMemberRoleWindow.vue                                                                    |    4 
 admin/vue.config.js                                                                                                        |    2 
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ParkBookCloudController.java                              |   12 
 admin/src/views/vehicle/cars.vue                                                                                           |  163 ++++++++
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java                          |  228 ++++++++++-
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java                                        |   90 ++-
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java                      |  114 +++++
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/HiddenDangerService.java                           |    4 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarsService.java                                   |    5 
 admin/src/views/vehicle/parkBook.vue                                                                                       |    6 
 admin/src/api/business/member.js                                                                                           |    8 
 admin/src/layouts/TableLayout.vue                                                                                          |    2 
 admin/src/components/business/OperaCarAuthWindow.vue                                                                       |  176 ++++++++
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ParkBook.java                                    |    5 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java                        |   31 
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarsCloudController.java                                  |    6 
 admin/package.json                                                                                                         |    1 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java |    6 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ParkBookService.java                               |    3 
 admin/src/views/business/internalCompany.vue                                                                               |    4 
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerCloudController.java                          |   17 
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java                                |    3 
 admin/src/views/business/internalMember.vue                                                                                |   10 
 admin/src/components/business/OperaCarsWindow.vue                                                                          |  112 +++--
 32 files changed, 1,041 insertions(+), 144 deletions(-)

diff --git a/admin/package-lock.json b/admin/package-lock.json
index b5dd877..f3820ef 100644
--- a/admin/package-lock.json
+++ b/admin/package-lock.json
@@ -10174,6 +10174,30 @@
       "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
       "dev": true
     },
+    "path": {
+      "version": "0.12.7",
+      "resolved": "https://registry.npmmirror.com/path/-/path-0.12.7.tgz",
+      "integrity": "sha512-aXXC6s+1w7otVF9UletFkFcDsJeO7lSZBPUQhtb5O0xJe8LtYhj/GxldoL09bBj9+ZmE2hNoHqQSFMN5fikh4Q==",
+      "requires": {
+        "process": "^0.11.1",
+        "util": "^0.10.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmmirror.com/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
+        },
+        "util": {
+          "version": "0.10.4",
+          "resolved": "https://registry.npmmirror.com/util/-/util-0.10.4.tgz",
+          "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+          "requires": {
+            "inherits": "2.0.3"
+          }
+        }
+      }
+    },
     "path-browserify": {
       "version": "0.0.1",
       "resolved": "https://registry.npm.taobao.org/path-browserify/download/path-browserify-0.0.1.tgz",
@@ -11044,8 +11068,7 @@
     "process": {
       "version": "0.11.10",
       "resolved": "https://registry.npm.taobao.org/process/download/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-      "dev": true
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
     },
     "process-nextick-args": {
       "version": "2.0.1",
diff --git a/admin/package.json b/admin/package.json
index 326225c..64369f9 100644
--- a/admin/package.json
+++ b/admin/package.json
@@ -22,6 +22,7 @@
     "element-ui": "^2.3.6",
     "js-cookie": "^2.2.1",
     "js-file-download": "^0.4.12",
+    "path": "^0.12.7",
     "qrcodejs2": "0.0.2",
     "vue": "^2.6.11",
     "vue-clipboard2": "^0.3.1",
diff --git a/admin/src/api/business/cars.js b/admin/src/api/business/cars.js
index 648da57..ca31faf 100644
--- a/admin/src/api/business/cars.js
+++ b/admin/src/api/business/cars.js
@@ -23,12 +23,12 @@
 
 // 鍒犻櫎
 export function deleteById (id) {
-  return request.get(`/business/cars/delete/${id}`)
+  return request.get(`/visitsAdmin/cloudService/business/cars/delete/${id}`)
 }
 
 // 鎵归噺鍒犻櫎
 export function deleteByIdInBatch (ids) {
-  return request.get('/business/cars/delete/batch', {
+  return request.get('/visitsAdmin/cloudService/business/cars/delete/batch', {
     params: {
       ids
     }
diff --git a/admin/src/api/business/member.js b/admin/src/api/business/member.js
index 81cadca..3f40252 100644
--- a/admin/src/api/business/member.js
+++ b/admin/src/api/business/member.js
@@ -9,6 +9,14 @@
     trim: true
   })
 }
+export function allList (data) {
+  // return request.post('/business/member/page', data, {
+  //   trim: true
+  // })
+  return request.post('/visitsAdmin/cloudService/business/member/list', data, {
+    trim: true
+  })
+}
 // 閮ㄩ棬淇℃伅鍚屾
 export function memberSync (data) {
   return request.post('/visitsAdmin/cloudService/business/member/syncAll', data)
diff --git a/admin/src/api/business/parkBook.js b/admin/src/api/business/parkBook.js
index e96e725..4cec4a2 100644
--- a/admin/src/api/business/parkBook.js
+++ b/admin/src/api/business/parkBook.js
@@ -11,6 +11,9 @@
 export function create (data) {
   return request.post('/visitsAdmin/cloudService/business/parkBook/create', data)
 }
+export function batchAuth (data) {
+  return request.post('/visitsAdmin/cloudService/business/parkBook/batchAuth', data)
+}
 
 // 淇敼
 export function updateById (data) {
@@ -23,7 +26,7 @@
 
 // 鍒犻櫎
 export function deleteById (id) {
-  return request.get(`/business/parkBook/delete/${id}`)
+  return request.get(`/visitsAdmin/cloudService/business/parkBook/delete/${id}`)
 }
 
 // 鎵归噺鍒犻櫎
diff --git a/admin/src/assets/style/style.scss b/admin/src/assets/style/style.scss
index d3e05e1..533b4b1 100644
--- a/admin/src/assets/style/style.scss
+++ b/admin/src/assets/style/style.scss
@@ -115,7 +115,7 @@
   }
 }
 .tip-warn {
-  margin: 4px 0 12px 0;
+  margin: 4px 0 25px 0;
   font-size: 12px;
   color: #999;
   i {
diff --git a/admin/src/components/business/OperaCarAuthWindow.vue b/admin/src/components/business/OperaCarAuthWindow.vue
new file mode 100644
index 0000000..5cee43c
--- /dev/null
+++ b/admin/src/components/business/OperaCarAuthWindow.vue
@@ -0,0 +1,176 @@
+<template>
+  <GlobalWindow
+      :title="title"
+      width="800px"
+      :visible.sync="visible"
+      :confirm-working="isWorking"
+      @confirm="confirm"
+  >
+    <p class="tip-warn"><i class="el-icon-warning"></i>鎻愰啋锛�<br>
+      1.杞﹁締鏉冮檺閰嶇疆鎴愬姛鍚庯紝鎺堟潈浠诲姟鍗宠繘鍏ユ潈闄愪笅鍙戦槦鍒楋紝鍙墠寰�銆愯溅杈嗘巿鏉冪敵璇疯褰曘�戞煡鐪嬩笅鍙戣繘搴�;<br>
+      2.濡傛灉闇�瑕佹竻绌哄綋鍓嶉�変腑浜哄憳涓嬪彂鏉冮檺锛屼互涓嬨�愭巿鏉冨仠杞﹀満銆戜负绌烘彁浜ゅ嵆鍙��
+    </p>
+    <p class="tip" v-if="form.codes != null">姝ｅ湪涓�<em>銆恵{ form.codes.map(item => `${item}`).join('锛�') }}銆�</em> 閰嶇疆鍋滆溅鍦烘潈闄�</p>
+      <el-form :model="form" ref="form" :rules="rules">
+        <el-form-item label="鎺堟潈鏈夋晥鏈燂細" prop="authTimeType" >
+          <el-radio-group v-model="form.authTimeType">
+            <el-radio :label="0">闀挎湡鏈夋晥</el-radio>
+            <el-radio :label="1">鑷畾涔夋椂闂�</el-radio>
+            <el-radio :label="2">璺熼殢杞︿富</el-radio>
+          </el-radio-group>
+          <div v-if="form.authTimeType ==1" style="margin-top: 10px" >
+            <el-date-picker
+                @change="seleTime"
+                v-model="time"
+                type="datetimerange"
+                format="yyyy-MM-dd HH:mm:ss"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                range-separator="鑷�"
+                start-placeholder="寮�濮嬫棩鏈�"
+                end-placeholder="缁撴潫鏃ユ湡">
+            </el-date-picker>
+          </div>
+        </el-form-item>
+        <el-form-item label="閫夋嫨鍋滆溅搴�" prop="parkIdList">
+          <el-select multiple v-model="form.parkIdList" filterable placeholder="璇烽�夋嫨" clearable>
+            <el-option
+                v-for="item in parks"
+                :key="item.id"
+                :label="item.name"
+                :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 { findList } from '@/api/business/parks'
+export default {
+  name: 'OperaCarsWindow',
+  extends: BaseOpera,
+  components: { GlobalWindow },
+  data () {
+    var validateTime = (rule, value, callback) => {
+      if (this.form.authTimeType == null) {
+        callback(new Error('璇峰～鍐欐纭殑鎺堟潈鏈夋晥鏈熸椂闂�'))
+        return
+      }
+      if (this.form.authTimeType === 1 && (this.form.startTime == null || this.form.endTime == null)) {
+        callback(new Error('璇峰～鍐欐纭殑鎺堟潈鏈夋晥鏈熸椂闂�'))
+        return
+      }
+      callback()
+    }
+    return {
+      // 琛ㄥ崟鏁版嵁
+      form: {
+        ids: [],
+        codes: [],
+        authTimeType: 0,
+        startTime: null,
+        endTime: null,
+        parkIdList: []
+      },
+      time: null,
+      parks: [],
+      // 楠岃瘉瑙勫垯
+      rules: {
+        authTimeType: [
+          { required: true, validator: validateTime, message: '璇烽�変腑闂ㄧ鏈夋晥鏈�' }
+        ]
+
+      },
+      options: []
+    }
+  },
+  created () {
+    this.config({
+      api: '/business/parkBook',
+      'field.id': 'id'
+    })
+  },
+  methods: {
+    confirm () {
+      this.$refs.form.validate((valid) => {
+        if (!valid) {
+          return
+        }
+        if (this.form.parkIdList == null || this.form.parkIdList.length === 0) {
+          this.$dialog.actionConfirm('鎺堟潈鍋滆溅搴撲负绌猴紝鎻愪氦鍚庡嵆娓呴櫎鎵�閫夎溅杈嗗凡鍒嗛厤鐨勫叏閮ㄦ潈闄�,璇疯皑鎱庢搷浣滐紒', '鎮ㄧ‘璁よ繘琛岃鎿嶄綔鍚楋紵')
+            .then(() => {
+              this.confirmDo()
+            })
+            .catch(() => {})
+        } else {
+          this.confirmDo()
+        }
+      })
+    },
+    confirmDo () {
+      // 璋冪敤鏂板缓鎺ュ彛
+      this.isWorking = true
+      this.api.batchAuth({
+        idList: this.form.ids,
+        authTimeType: this.form.authTimeType,
+        startTime: this.form.startTime,
+        endTime: this.form.endTime,
+        parkIdList: this.form.parkIdList
+      })
+        .then(() => {
+          this.visible = false
+          this.$tip.apiSuccess('鎺堟潈鎴愬姛,鍙墠寰�銆愯溅杈嗘巿鏉冪敵璇疯褰曘�戞煡鐪嬩笅鍙戣繘搴�')
+          this.$emit('success')
+        })
+        .catch(e => {
+          // this.$tip.apiFailed(e)
+        })
+        .finally(() => {
+          this.isWorking = false
+        })
+    },
+    seleTime (e) {
+      if (e && e.length >= 2) {
+        this.form.startTime = e[0]
+        this.form.endTime = e[1]
+      } else {
+        this.form.startTime = null
+        this.form.endTime = null
+      }
+    },
+    open (title, ids, names, companyType) {
+      this.title = title
+      this.visible = true
+      this.companyType = companyType
+      // 鏂板缓
+      this.$nextTick(() => {
+        this.$refs.form.resetFields()
+        this.form[this.configData['field.id']] = null
+        this.form.ids = ids
+        this.form.codes = names
+
+        this.loadParks()
+        console.log(names)
+      })
+    },
+    loadParks () {
+      this.parks = []
+      findList({
+        isdeleted: 0
+      })
+        .then(res => {
+          this.parks = res
+        })
+        .catch(e => {
+          this.$message.error('鍔犺浇鍋滆溅搴撲俊鎭け璐�')
+        })
+        .finally(() => {
+          // this.isWorking = false
+        })
+    }
+  }
+}
+</script>
diff --git a/admin/src/components/business/OperaCarsWindow.vue b/admin/src/components/business/OperaCarsWindow.vue
index db06626..3e70371 100644
--- a/admin/src/components/business/OperaCarsWindow.vue
+++ b/admin/src/components/business/OperaCarsWindow.vue
@@ -6,41 +6,28 @@
         :confirm-working="isWorking"
         @confirm="confirm"
     >
-        <el-form :model="form" ref="form" :rules="rules">
-            <el-form-item label="杞︾墝鍙�" prop="code">
-                <el-input v-model="form.code" placeholder="璇疯緭鍏ヨ溅鐗屽彿" v-trim/>
-            </el-form-item>
-            <el-form-item label="鐢ㄦ埛绫诲瀷" prop="code">
-                <el-radio-group v-model="form.code">
-                    <el-radio label="鍐呴儴鍛樺伐"></el-radio>
-                    <el-radio label="鍔冲姟浜哄憳"></el-radio>
-                </el-radio-group>
-            </el-form-item>
-            <el-form-item label="閫夋嫨鐢ㄦ埛" prop="code">
-                <el-select v-model="form.code" filterable placeholder="璇烽�夋嫨">
-                    <el-option
-                        v-for="item in options"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="鎺堟潈鏈夋晥鏈�" prop="code">
-                <el-date-picker
-                    v-model="form.code"
-                    type="daterange"
-                    range-separator="鑷�"
-                    start-placeholder="寮�濮嬫棩鏈�"
-                    end-placeholder="缁撴潫鏃ユ湡">
-                </el-date-picker>
-            </el-form-item>
-            <el-form-item label="鎺堟潈鍋滆溅鍦�" prop="code">
-                <el-radio-group v-model="form.code">
-                    <el-radio label="鍏ㄩ儴鍋滆溅鍦�"></el-radio>
-                    <el-radio label="閮ㄥ垎鍋滆溅鍦�"></el-radio>
-                </el-radio-group>
-            </el-form-item>
+      <el-form :model="form" ref="form" :rules="rules">
+          <el-form-item label="杞︾墝鍙�" prop="code">
+            <el-input v-model="form.code" placeholder="璇疯緭鍏ヨ溅鐗屽彿" v-trim/>
+          </el-form-item>
+          <el-form-item label="杞﹁締绫诲瀷" prop="type">
+            <el-radio-group v-model="form.type" >
+              <el-radio :label="0"  >鍛樺伐杞﹁締</el-radio>
+              <el-radio  :label="1"  >瀹夋嘲鍏姟杞�</el-radio>
+              <el-radio  :label="2"  >瀹夋嘲鐗╂祦杞�</el-radio>
+              <el-radio  :label="3"  >甯傚叕鍙稿叕杞�</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="閫夋嫨杞︿富锛�" prop="memberId">
+            <el-select v-model="form.memberId" filterable 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>
     </GlobalWindow>
 </template>
@@ -48,28 +35,73 @@
 <script>
 import BaseOpera from '@/components/base/BaseOpera'
 import GlobalWindow from '@/components/common/GlobalWindow'
+import { allList } from '@/api/business/member'
 export default {
-  name: 'OperaCarsWindow',
+  name: 'OperaInternalCompanyWindow',
   extends: BaseOpera,
   components: { GlobalWindow },
   data () {
     return {
       // 琛ㄥ崟鏁版嵁
+      memberList: [],
       form: {
         id: null,
-        code: ''
+        code: null,
+        memberId: null,
+        type: 0
       },
       // 楠岃瘉瑙勫垯
       rules: {
-      },
-      options: []
+        code: [
+          { required: true, message: '璇疯緭鍏ヨ溅鐗屽彿' }
+        ],
+        type: [
+          { required: true, message: '璇烽�夋嫨杞﹁締绫诲瀷' }
+        ]
+      }
     }
   },
   created () {
     this.config({
-      api: '/business/parkBook',
+      api: '/business/cars',
       'field.id': 'id'
     })
+  },
+  methods: {
+    open (title, target) {
+      this.title = title
+      this.visible = true
+      this.loadMember()
+      // 鏂板缓缁勭粐
+      if (target == null) {
+        this.$nextTick(() => {
+          this.$refs.form.resetFields()
+          this.form[this.configData['field.id']] = null
+          this.form.type=0
+        })
+        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 => {
+          this.$tip.apiFailed(e)
+        })
+        .finally(() => {
+          this.isWorking = false
+        })
+    }
   }
 }
 </script>
diff --git a/admin/src/components/business/OperaMemberRoleWindow.vue b/admin/src/components/business/OperaMemberRoleWindow.vue
index a581c65..5ed9027 100644
--- a/admin/src/components/business/OperaMemberRoleWindow.vue
+++ b/admin/src/components/business/OperaMemberRoleWindow.vue
@@ -2,7 +2,7 @@
     <GlobalWindow
         :title="title"
         :visible.sync="visible"
-        width="900px"
+        width="70%"
         :confirm-working="isWorking"
         @confirm="confirm"
     >
@@ -145,7 +145,7 @@
         })
             .then(() => {
               this.visible = false
-              this.$tip.apiSuccess('鏂板缓鎴愬姛')
+              this.$tip.apiSuccess('鎺堟潈鎴愬姛锛屽彲鍓嶅線銆愪汉鍛樻巿鏉冭褰曘�戞煡鐪嬩笅鍙戣繘搴�')
               this.$emit('success')
             })
             .catch(e => {
diff --git a/admin/src/layouts/TableLayout.vue b/admin/src/layouts/TableLayout.vue
index 2a12773..8b12acb 100644
--- a/admin/src/layouts/TableLayout.vue
+++ b/admin/src/layouts/TableLayout.vue
@@ -1,4 +1,4 @@
-<template>
+ <template>
   <div class="table-layout">
     <!-- 澶撮儴 -->
 <!--    <div v-if="withBreadcrumb" class="table-header">
diff --git a/admin/src/views/business/cars.vue b/admin/src/views/business/carsSync.vue
similarity index 100%
rename from admin/src/views/business/cars.vue
rename to admin/src/views/business/carsSync.vue
diff --git a/admin/src/views/business/internalCompany.vue b/admin/src/views/business/internalCompany.vue
index 5a29df9..243356f 100644
--- a/admin/src/views/business/internalCompany.vue
+++ b/admin/src/views/business/internalCompany.vue
@@ -50,7 +50,7 @@
                     <template slot-scope="{row}">
                         <el-button type="text" @click="$refs.OperaInternalCompanyWindow.open('缂栬緫浼佷笟淇℃伅',{  id: row.parentId,name:row.parentName,type:row.parentType, companyPath:row.parentCompanyPath}, row)" icon="el-icon-edit" v-permissions="['business:company:update']">缂栬緫</el-button>
                         <el-button type="text" @click="$refs.OperaInternalCompanyWindow.open('鏂板缓瀛愮骇',  row,null)" icon="el-icon-plus">鏂板缓瀛愮骇</el-button>
-                        <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:company:delete']">鍒犻櫎</el-button>
+                        <el-button type="text" @click="deleteById(row)" style="color: red" icon="el-icon-delete" v-permissions="['business:company:delete']">鍒犻櫎</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -196,7 +196,7 @@
         }
       }
       return null
-    },
+    }
   }
 }
 </script>
diff --git a/admin/src/views/business/internalMember.vue b/admin/src/views/business/internalMember.vue
index 3bb796c..57de4cd 100644
--- a/admin/src/views/business/internalMember.vue
+++ b/admin/src/views/business/internalMember.vue
@@ -6,26 +6,26 @@
                 <el-input v-model="searchForm.keyword" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�/宸ュ彿" @keypress.enter.native="search"></el-input>
             </el-form-item>
             <el-form-item label="" prop="hasFace">
-                <el-select v-model="searchForm.hasFace" @keypress.enter.native="search" placeholder="鏄惁鏈変汉鑴�">
+                <el-select v-model="searchForm.hasFace" @keypress.enter.native="search" clearable placeholder="鏄惁鏈変汉鑴�">
                     <el-option label="鏃�" value="0"></el-option>
                     <el-option label="鏈�" value="1"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="" prop="canVisit">
-                <el-select v-model="searchForm.canVisit" @keypress.enter.native="search" placeholder="鍙嫓璁�">
+                <el-select v-model="searchForm.canVisit" clearable @keypress.enter.native="search" placeholder="鍙嫓璁�">
                     <el-option label="鏄�" value="1"></el-option>
                     <el-option label="鍚�" value="0"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="" prop="status">
-                <el-select v-model="searchForm.status" @keypress.enter.native="search" placeholder="鐘舵��">
+                <el-select v-model="searchForm.status" @keypress.enter.native="search" clearable placeholder="鐘舵��">
                     <el-option label="姝ｅ父" value="0"></el-option>
                     <el-option label="绂佺敤" value="1"></el-option>
                     <el-option label="鎷夐粦/鍐荤粨" value="2"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="" prop="hkStatus">
-                <el-select v-model="searchForm.hkStatus" @keypress.enter.native="search" placeholder="娴峰悍鍚屾鐘舵��">
+                <el-select v-model="searchForm.hkStatus" @keypress.enter.native="search" clearable placeholder="娴峰悍鍚屾鐘舵��">
                     <el-option label="寰呭悓姝�" value="0"></el-option>
                     <el-option label="鍚屾鎴愬姛" value="1"></el-option>
                     <el-option label="鍚屾澶辫触" value="2"></el-option>
@@ -170,7 +170,7 @@
                         <el-button type="text" :loading="heading" icon="el-icon-delete" @click="updateHead(row,0)" v-if="row.headStatus ==1 " v-permissions="['business:member:head']">鍙栨秷涓荤</el-button>
                         <el-button type="text" :loading="heading"  icon="el-icon-edit" @click="updateHead(row,1)"  v-if="row.headStatus  == 0"  v-permissions="['business:member:head']">璁句负涓荤</el-button>
                         <el-button type="text"  icon="el-icon-plus" @click="empower(row.id)" v-permissions="['business:empower:create']">閲嶆柊鎺堟潈</el-button>
-                        <el-button  type="text"  icon="el-icon-delete" @click="empower(row.id)" v-permissions="['business:empower:delete']">鍒犻櫎</el-button>
+                        <el-button  type="text"  icon="el-icon-delete" @click="deleteById(row)" style="color: red" v-permissions="['business:member:delete']">鍒犻櫎</el-button>
                     </template>
                 </el-table-column>
             </el-table>
diff --git a/admin/src/views/vehicle/cars.vue b/admin/src/views/vehicle/cars.vue
new file mode 100644
index 0000000..e45c01d
--- /dev/null
+++ b/admin/src/views/vehicle/cars.vue
@@ -0,0 +1,163 @@
+<template>
+    <TableLayout :permissions="['business:member:query']">
+        <!-- 鎼滅储琛ㄥ崟 -->
+        <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="120px" inline>
+            <el-form-item label="杞︾墝鍙�" prop="code">
+                <el-input v-model="searchForm.code" clearable placeholder="璇疯緭鍏ヨ溅鐗屽彿" @keypress.enter.native="search"></el-input>
+            </el-form-item>
+          <el-form-item label="杞︿富濮撳悕/鎵嬫満鍙�" prop="memberName">
+            <el-input v-model="searchForm.memberName" clearable placeholder="杞︿富濮撳悕/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
+          </el-form-item>
+          <el-form-item label="杞︿富閮ㄩ棬" prop="companyName">
+            <el-input v-model="searchForm.companyName" clearable placeholder="杞︿富閮ㄩ棬鍚嶇О" @keypress.enter.native="search"></el-input>
+          </el-form-item>
+          <el-form-item label="鎺堟潈鐘舵��" prop="authStatus">
+            <el-select v-model="searchForm.authStatus" @keypress.enter.native="search" clearable placeholder="鏄惁鎺堟潈">
+              <el-option label="鏄�" value="1"></el-option>
+              <el-option label="鍚�" value="0"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="杞﹁締绫诲瀷" prop="type">
+            <el-select v-model="searchForm.type" @keypress.enter.native="search" clearable placeholder="杞﹁締绫诲瀷">
+              <el-option label="鍛樺伐杞﹁締" value="0"></el-option>
+              <el-option label="瀹夋嘲鍏姟杞�" value="1"></el-option>
+              <el-option label="瀹夋嘲鐗╂祦杞�" value="2"></el-option>
+              <el-option label="甯傚叕鍙稿叕杞�" value="3"></el-option>
+          </el-select>
+          </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:cars:create', 'business:parkBook:create']">
+                <li><el-button type="primary" @click="$refs.operaCarsWindow.open('鏂板缓杞﹁締')" icon="el-icon-plus" v-permissions="['business:cars:create']">鏂板缓</el-button></li>
+                <li><el-button type="primary" @click="startEmpowerBatch" icon="el-icon-plus" v-permissions="['business:parkbook:create']">涓嬪彂鎺堟潈</el-button></li>
+            </ul>
+            <el-table
+                v-loading="isWorking.search"
+                :data="tableData.list"
+                stripe
+                @selection-change="handleSelectionChange"
+            >
+                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column prop="code" label="杞︾墝鍙�" min-width="100px"></el-table-column>
+                <el-table-column label="杞﹁締绫诲瀷" min-width="100px">
+                    <template slot-scope="{row}">
+                      <span v-if="row.type == 0" >鍛樺伐杞﹁締</span>
+                      <span v-if="row.type == 1">瀹夋嘲鍏姟杞�</span>
+                      <span v-if="row.type == 2" >瀹夋嘲鐗╂祦杞�</span>
+                      <span v-if="row.type == 3" >甯傚叕鍙稿叕杞�</span>
+                    </template>
+                </el-table-column>
+              <el-table-column prop="memberName" label="杞︿富濮撳悕"  min-width="100px"></el-table-column>
+              <el-table-column prop="memberPhone" label="杞︿富鎵嬫満鍙�" min-width="100px"></el-table-column>
+              <el-table-column prop="companyName" label="杞︿富缁勭粐" min-width="200px"></el-table-column>
+                <el-table-column label="鏄惁鎺堟潈" align="center" min-width="100px">
+                  <template slot-scope="{row}">
+                    <span v-if="row.authStatus == 1" style="color: green">鏄�</span>
+                    <span v-else style="color: red">鍚�</span>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="parksName" label="宸叉巿鏉冨仠杞﹀満" min-width="200px">
+                  <template slot-scope="{row}">
+                    <div  v-if="row.parkBookList && row.parkBookList.length" >
+                      <span v-for="item in row.parkBookList"  :key="item.id" style="display: block">
+                        <span  :style="(item.hkStatus== 0?'color:#2080f7':(item.hkStatus== 1?'color:green':(item.hkStatus== 2?'color:red':'')))">銆恵{item.hkStatus== 0?'绛夊緟涓嬪彂':(item.hkStatus== 1?'涓嬪彂鎴愬姛':(item.hkStatus== 2?'涓嬪彂澶辫触':''))}}銆� </span>{{item.parksName}}
+                      </span>
+                    </div>
+                    <span  v-if="row.parkBookList ==null ||row.parkBookList.length ==0">-</span>
+                  </template>
+                </el-table-column>
+              <el-table-column label="涓嬪彂鏈夋晥鏈�" min-width="170px">
+                <template slot-scope="{row}">
+                  <div v-if="row.authStatus !=null && row.authStatus == 1 && row.parkBookList!=null && row.parkBookList.length>0">
+                    <div v-if="!row.startTime || !row.endTime">闀挎湡鏈夋晥</div>
+                    <div v-else>
+                      <span>璧凤細{{row.startTime}}</span><br/>
+                      <span>姝細{{row.endTime}}</span>
+                    </div>
+                  </div>
+                  <div v-else >-</div>
+                </template>
+              </el-table-column>
+                <el-table-column prop="editorName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
+                <el-table-column prop="editDate" label="鎿嶄綔鏃堕棿" min-width="100px"></el-table-column>
+              <el-table-column
+                  v-if="containPermissions(['business:member:update', 'business:member:delete','business:empower:create'])"
+                  label="鎿嶄綔"
+                  min-width="250"
+                  fixed="right"
+              >
+                <template slot-scope="{row}">
+                  <el-button type="text" icon="el-icon-edit" @click="$refs.operaCarsWindow.open('缂栬緫杞﹁締淇℃伅',row)" v-permissions="['business:cars:update']">缂栬緫</el-button>
+                  <el-button type="text" icon="el-icon-edit" @click="$refs.operaCarAuthWindow.open('涓嬪彂鎺堟潈',[row.id],[row.code])" v-permissions="['business:parkbook:create']">涓嬪彂鎺堟潈</el-button>
+                  <el-button  type="text"  icon="el-icon-delete" @click="deleteById(row)" style="color: red" v-permissions="['business:empower:delete']">鍒犻櫎</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+            <pagination
+                @size-change="handleSizeChange"
+                @current-change="handlePageChange"
+                :pagination="tableData.pagination"
+            >
+            </pagination>
+        </template>
+        <!-- 鏂板缓/淇敼 -->
+        <OperaCarAuthWindow ref="operaCarAuthWindow" @success="handlePageChange"/>
+        <OperaCarsWindow ref="operaCarsWindow" @success="handlePageChange"/>
+    </TableLayout>
+</template>
+
+<script>
+import BaseTable from '@/components/base/BaseTable'
+import TableLayout from '@/layouts/TableLayout'
+import Pagination from '@/components/common/Pagination'
+import OperaCarsWindow from '@/components/business/OperaCarsWindow'
+import OperaCarAuthWindow from '@/components/business/OperaCarAuthWindow'
+import { sync } from '@/api/business/cars'
+export default {
+  name: 'Cars',
+  extends: BaseTable,
+  components: { TableLayout, Pagination, OperaCarsWindow,OperaCarAuthWindow },
+  data () {
+    return {
+      // 鎼滅储
+      searchForm: {
+        code: '',
+        memberName: '',
+        companyName: '',
+        type:null,
+        authStatus:null
+      }
+    }
+  },
+  created () {
+    this.config({
+      module: '杞﹁締淇℃伅琛�',
+      api: '/business/cars',
+      'field.id': 'id',
+      'field.main': 'id'
+    })
+    this.search()
+  },
+  methods: {
+    // 鍚屾淇℃伅
+    startEmpowerBatch () {
+      if (this.tableData.selectedRows.length === 0) {
+        this.$tip.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�')
+        return
+      }
+      var ids = []
+      var codes = []
+      this.tableData.selectedRows.forEach(item => {
+        ids.push(item.id)
+        codes.push(item.code)
+      })
+      this.$refs.operaCarAuthWindow.open('杞﹁締涓嬪彂鎺堟潈', ids, codes)
+    },
+  }
+}
+</script>
diff --git a/admin/src/views/vehicle/parkBook.vue b/admin/src/views/vehicle/parkBook.vue
index 3a5eae5..5df6009 100644
--- a/admin/src/views/vehicle/parkBook.vue
+++ b/admin/src/views/vehicle/parkBook.vue
@@ -5,11 +5,11 @@
             <el-form-item label="杞︾墝鍙�" prop="carCode">
                 <el-input v-model="searchForm.carCode" placeholder="璇疯緭鍏ヨ溅鐗屽彿" @keypress.enter.native="search"></el-input>
             </el-form-item>
-            <el-form-item label="鍛樺伐濮撳悕/鎵嬫満鍙�" prop="memberName">
+            <el-form-item label="杞︿富濮撳悕/鎵嬫満鍙�" prop="memberName">
                 <el-input v-model="searchForm.memberName" placeholder="璇疯緭鍏ュ憳宸ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
             </el-form-item>
-            <el-form-item label="閮ㄩ棬" prop="companyName">
-                <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ラ儴闂�" @keypress.enter.native="search"></el-input>
+            <el-form-item label="杞︿富缁勭粐" prop="companyName">
+                <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ヨ溅涓荤粍缁�" @keypress.enter.native="search"></el-input>
             </el-form-item>
             <el-form-item label="鍋滆溅搴撳悕绉�" prop="parksName">
                 <el-input v-model="searchForm.parksName" placeholder="璇疯緭鍏ュ仠杞﹀簱鍚嶇О" @keypress.enter.native="search"></el-input>
diff --git a/admin/vue.config.js b/admin/vue.config.js
index ee1ea41..c429385 100644
--- a/admin/vue.config.js
+++ b/admin/vue.config.js
@@ -24,8 +24,6 @@
     }
   },
   configureWebpack: {
-    // provide the app's title in webpack's name field, so that
-    // it can be accessed in index.html to inject the correct title.
     resolve: {
       alias: {
         '@': resolve('src')
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarsController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarsController.java
index 23031c9..3847b84 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarsController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarsController.java
@@ -45,7 +45,7 @@
     @GetMapping("/delete/{id}")
     @RequiresPermissions("business:cars:delete")
     public ApiResponse deleteById(@PathVariable Integer id) {
-        carsService.deleteById(id);
+        carsService.deleteById(id,getLoginUser(null));
         return ApiResponse.success(null);
     }
 
@@ -58,7 +58,7 @@
         for (String id : idArray) {
             idList.add(Integer.valueOf(id));
         }
-        carsService.deleteByIdInBatch(idList);
+        carsService.deleteByIdInBatch(idList,getLoginUser(null));
         return ApiResponse.success(null);
     }
 
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarsCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarsCloudController.java
index 01780ac..ae392f1 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarsCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarsCloudController.java
@@ -38,6 +38,7 @@
     @PostMapping("/create")
     @CloudRequiredPermission("business:cars:create")
     public ApiResponse create(@RequestBody Cars cars,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        cars.setLoginUserInfo(this.getLoginUser(token));
         return ApiResponse.success(carsService.create(cars));
     }
 
@@ -45,7 +46,7 @@
     @GetMapping("/delete/{id}")
     @CloudRequiredPermission("business:cars:delete")
     public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
-        carsService.deleteById(id);
+        carsService.deleteById(id,this.getLoginUser(token));
         return ApiResponse.success(null);
     }
 
@@ -58,7 +59,7 @@
         for (String id : idArray) {
             idList.add(Integer.valueOf(id));
         }
-        carsService.deleteByIdInBatch(idList);
+        carsService.deleteByIdInBatch(idList,this.getLoginUser(token));
         return ApiResponse.success(null);
     }
 
@@ -66,6 +67,7 @@
     @PostMapping("/updateById")
     @CloudRequiredPermission("business:cars:update")
     public ApiResponse updateById(@RequestBody Cars cars,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        cars.setLoginUserInfo(this.getLoginUser(token));
         carsService.updateById(cars);
         return ApiResponse.success(null);
     }
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerCloudController.java
index 9ad1b32..0270a01 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerCloudController.java
@@ -83,4 +83,21 @@
     public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         return ApiResponse.success(hiddenDangerService.findById(id));
     }
+
+    @ApiOperation("闅愭偅澶勭悊")
+    @PostMapping("/dealHiddenDanger")
+    public ApiResponse dealHiddenDanger (@RequestBody HiddenDanger hiddenDanger,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        hiddenDanger.setLoginUserInfo(getLoginUser(token));
+        hiddenDangerService.dealHiddenDanger(hiddenDanger);
+        return ApiResponse.success("鎿嶄綔鎴愬姛");
+    }
+
+    @ApiOperation("闅愭偅杞氦")
+    @PostMapping("/transferHiddenDanger")
+    public ApiResponse transferHiddenDanger (@RequestBody HiddenDanger hiddenDanger,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        hiddenDanger.setLoginUserInfo(getLoginUser(token));
+        hiddenDangerService.transferHiddenDanger(hiddenDanger);
+        return ApiResponse.success("鎿嶄綔鎴愬姛");
+    }
+
 }
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ParkBookCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ParkBookCloudController.java
index 8cc6a8c..3b28614 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ParkBookCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ParkBookCloudController.java
@@ -8,10 +8,12 @@
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
 import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.model.Cars;
 import com.doumee.dao.business.model.ParkBook;
 import com.doumee.service.business.ParkBookService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -35,7 +37,16 @@
     @PostMapping("/create")
     @CloudRequiredPermission("business:parkbook:create")
     public ApiResponse create(@RequestBody ParkBook parkBook,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        parkBook.setLoginUserInfo(this.getLoginUser(token));
         return ApiResponse.success(parkBookService.create(parkBook));
+    }
+    @PreventRepeat
+    @ApiOperation("鎵归噺涓嬪彂鎺堟潈")
+    @PostMapping("/batchAuth")
+    @CloudRequiredPermission("business:parkbook:create")
+    public ApiResponse batchAuth(@RequestBody Cars cars, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        cars.setLoginUserInfo(this.getLoginUser(token));
+        return ApiResponse.success(parkBookService.batchAuth(cars));
     }
 
     @ApiOperation("鏍规嵁ID鍒犻櫎")
@@ -63,6 +74,7 @@
     @PostMapping("/updateById")
     @CloudRequiredPermission("business:parkbook:update")
     public ApiResponse updateById(@RequestBody ParkBook parkBook,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        parkBook.setLoginUserInfo(this.getLoginUser(token));
         parkBookService.updateById(parkBook);
         return ApiResponse.success(null);
     }
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 a477dd9..5707e3d 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
@@ -11,6 +11,7 @@
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 杞﹁締淇℃伅琛�
@@ -29,7 +30,7 @@
 
     @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
     @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
-    private String creator;
+    private Integer creator;
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     @ExcelColumn(name="鍒涘缓鏃堕棿")
@@ -37,15 +38,27 @@
 
     @ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
     @ExcelColumn(name="鏇存柊浜虹紪鐮�")
-    private String edirot;
+    private Integer edirot;
 
     @ApiModelProperty(value = "鏇存柊鏃堕棿")
     @ExcelColumn(name="鏇存柊鏃堕棿")
     private Date editDate;
+    @ApiModelProperty(value = "鎺堟潈寮�濮嬫椂闂�")
+    @ExcelColumn(name="鎺堟潈寮�濮嬫椂闂�")
+    private Date startTime;
+    @ApiModelProperty(value = "鎺堟潈缁撴潫鏃堕棿")
+    @ExcelColumn(name="鎺堟潈缁撴潫鏃堕棿")
+    private Date endTime;
+    @ApiModelProperty(value = "鏈�鍚庝竴娆¤繘鍘傛椂闂�")
+    @ExcelColumn(name="鏈�鍚庝竴娆¤繘鍘傛椂闂�")
+    private Date lastInDate;
 
     @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
     @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
     private Integer isdeleted;
+    @ApiModelProperty(value = "鎺堟潈鏃堕棿绫诲瀷  0闀挎湡鏈夋晥 1鑷畾涔� 2杞︿富鏈夋晥鏈�", example = "1")
+    @ExcelColumn(name="鎺堟潈鏃堕棿绫诲瀷  0闀挎湡鏈夋晥 1鑷畾涔� 2杞︿富鏈夋晥鏈�")
+    private Integer authTimeType;
 
     @ApiModelProperty(value = "澶囨敞")
     @ExcelColumn(name="澶囨敞")
@@ -63,13 +76,10 @@
     @ExcelColumn(name="杞︾墝鍙�")
     private String code;
 
-    @ApiModelProperty(value = "杞﹀簱缂栫爜锛堝叧鑱攑arks)", example = "1")
-    @ExcelColumn(name="杞﹀簱缂栫爜锛堝叧鑱攑arks)")
-    private Integer parkId;
+    @ApiModelProperty(value = "鎺堟潈鍋滆溅缂栫爜闆嗗悎锛堝叧鑱攑arks)", example = "1")
+    @ExcelColumn(name="鎺堟潈鍋滆溅缂栫爜闆嗗悎锛堝叧鑱攑arks)")
+    private String parkId;
 
-    @ApiModelProperty(value = "娴峰悍鏍囪瘑", example = "1")
-    @ExcelColumn(name="娴峰悍鏍囪瘑")
-    private String hkId2;
 
     @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
     @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
@@ -95,38 +105,14 @@
     @ApiModelProperty(value = "鐘舵�� 0绂佺敤 1鍚敤", example = "1")
     @ExcelColumn(name="鐘舵�� 0绂佺敤 1鍚敤")
     private Integer status;
+    @ApiModelProperty(value = "鎺堟潈鐘舵�� 0鍚� 1鏄�", example = "1")
+    @ExcelColumn(name="鎺堟潈鐘舵��  0鍚� 1鏄�")
+    private Integer authStatus;
 
 
     @ApiModelProperty(value = "鎵�灞炲垎缁勭紪鐮侊紙鍏宠仈car_group)", example = "1")
     @ExcelColumn(name="鎵�灞炲垎缁勭紪鐮侊紙鍏宠仈car_group)")
     private Integer groupId;
-
-
-    @ApiModelProperty(value = "鎺堟潈鏃堕棿绫诲瀷  0闀挎湡鏈夋晥 1鑷畾涔� 2杞︿富鏈夋晥鏈�", example = "1")
-    @ExcelColumn(name="鎺堟潈鏃堕棿绫诲瀷  0闀挎湡鏈夋晥 1鑷畾涔� 2杞︿富鏈夋晥鏈�")
-    private Integer authTimeType;
-
-
-    //
-//    @ApiModelProperty(value = "鐘舵�� 0绂佺敤 1鍚敤", example = "1")
-//    @ExcelColumn(name="鐘舵�� 0绂佺敤 1鍚敤")
-//    private Integer status;
-//
-//
-//    @ApiModelProperty(value = "鐘舵�� 0绂佺敤 1鍚敤", example = "1")
-//    @ExcelColumn(name="鐘舵�� 0绂佺敤 1鍚敤")
-//    private Integer status;
-//
-//    @ApiModelProperty(value = "鐘舵�� 0绂佺敤 1鍚敤", example = "1")
-//    @ExcelColumn(name="鐘舵�� 0绂佺敤 1鍚敤")
-//    private Integer status;
-//
-//    @ApiModelProperty(value = "鐘舵�� 0绂佺敤 1鍚敤", example = "1")
-//    @ExcelColumn(name="鐘舵�� 0绂佺敤 1鍚敤")
-//    private Integer status;
-
-
-
 
     @ApiModelProperty(value = "绫诲瀷 0鍛樺伐杞﹁締 1瀹夋嘲鍏姟杞� 2鑷湁鐗╂祦杞�3澶栧崗鐗╂祦杞� 4甯傚叕鍙哥墿娴佽溅 5甯傚叕鍙告敞鍐岃溅杈�", example = "1")
     @ExcelColumn(name="绫诲瀷 0鍛樺伐杞﹁締 1瀹夋嘲鍏姟杞� 2鑷湁鐗╂祦杞�3澶栧崗鐗╂祦杞� 4甯傚叕鍙哥墿娴佽溅 5甯傚叕鍙告敞鍐岃溅杈�")
@@ -134,10 +120,14 @@
 
 
 
-    @ApiModelProperty(value = "鍋滆溅鍦哄悕绉�", example = "1")
-    @ExcelColumn(name="鍋滆溅鍦哄悕绉�")
+    @ApiModelProperty(value = "鍋滆溅鍦哄悕绉伴泦鍚�", example = "1")
+    @ExcelColumn(name="鍋滆溅鍦哄悕绉伴泦鍚�")
     @TableField(exist = false)
     private String parksName;
+    @ApiModelProperty(value = "缂栬緫浜哄鍚�", example = "1")
+    @ExcelColumn(name="缂栬緫浜哄鍚�")
+    @TableField(exist = false)
+    private String editorName;
 
     @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹�  2鍐呴儴浜哄憳", example = "1")
     @ExcelColumn(name="鐢ㄦ埛绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹�  2鍐呴儴浜哄憳")
@@ -148,6 +138,9 @@
     @ExcelColumn(name="濮撳悕")
     @TableField(exist = false)
     private String memberName;
+    @ApiModelProperty(value = "杞︿富娴峰悍缂栫爜", example = "1")
+    @TableField(exist = false)
+    private String memberHkId;
 
     @ApiModelProperty(value = "鎵嬫満鍙�", example = "1")
     @ExcelColumn(name="鎵嬫満鍙�")
@@ -158,5 +151,28 @@
     @ExcelColumn(name="閮ㄩ棬")
     @TableField(exist = false)
     private String companyName;
+    @ApiModelProperty(value = "杞︿富鏄惁鍒犻櫎", example = "1")
+    @TableField(exist = false)
+    private Integer memberDeleted;
+    @ApiModelProperty(value = "杞︿富鎺堟潈鏈夋晥鏈熷紑濮�", example = "1")
+    @TableField(exist = false)
+    private Date memberStartTime;
+    @ApiModelProperty(value = "杞︿富鎺堟潈鏈夋晥鏈熺粨鏉�", example = "1")
+    @TableField(exist = false)
+    private Date memberEndTime;
+    @ApiModelProperty(value = "杞︿富鎺堟潈鐘舵��", example = "1")
+    @TableField(exist = false)
+    private Integer memberAuthStatus;
+
+    @ApiModelProperty(value = "鎺堟潈鍋滆溅鍦虹紪鐮侀泦鍚�", example = "1")
+    @TableField(exist = false)
+    private List<Integer> parkIdList;
+    @ApiModelProperty(value = "杞﹁締缂栫爜闆嗗悎", example = "1")
+    @TableField(exist = false)
+    private List<Integer> idList;
+    @ApiModelProperty(value = "杞﹁締鍖呮湡璁板綍闆嗗悎", example = "1")
+    @TableField(exist = false)
+    private  List<ParkBook> parkBookList;
+
 
 }
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 610f93d..54957fa 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
@@ -137,6 +137,9 @@
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date submitTime;
 
+    @ApiModelProperty(value = "澶勭悊鏃堕棿锛堟暣鏀�/閫�鍥炰娇鐢級")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date dealTime;
 
     @ApiModelProperty(value = "闄勪欢淇℃伅")
     @TableField(exist = false)
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 417ca14..0563086 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
@@ -11,6 +11,7 @@
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 杞﹁締棰勭害璁板綍淇℃伅琛�
@@ -29,7 +30,7 @@
 
     @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
     @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
-    private String creator;
+    private Integer creator;
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     @ExcelColumn(name="鍒涘缓鏃堕棿")
@@ -135,9 +136,7 @@
     @TableField(exist = false)
     private String companyName;
     @ApiModelProperty(value = "鍋滆溅搴撴捣搴风紪鐮�", example = "1")
-    @ExcelColumn(name="鍋滆溅搴撴捣搴风紪鐮�")
     @TableField(exist = false)
     private String parkHkId;
-
 
 }
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarsService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarsService.java
index 168a713..3394126 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarsService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/CarsService.java
@@ -1,5 +1,6 @@
 package com.doumee.service.business;
 
+import com.doumee.core.model.LoginUserInfo;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
 import com.doumee.dao.admin.request.CarsQuery;
@@ -27,7 +28,7 @@
      *
      * @param id 涓婚敭
      */
-    void deleteById(Integer id);
+    void deleteById(Integer id, LoginUserInfo user);
 
     /**
      * 鍒犻櫎
@@ -41,7 +42,7 @@
      *
      * @param ids 涓婚敭闆�
      */
-    void deleteByIdInBatch(List<Integer> ids);
+    void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user);
 
     /**
      * 涓婚敭鏇存柊
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/HiddenDangerService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/HiddenDangerService.java
index 0813a64..c889cc2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/HiddenDangerService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/HiddenDangerService.java
@@ -94,4 +94,8 @@
      * @return long
      */
     long count(HiddenDanger hiddenDanger);
+
+    void dealHiddenDanger(HiddenDanger hiddenDanger);
+
+    void transferHiddenDanger(HiddenDanger hiddenDanger);
 }
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ParkBookService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ParkBookService.java
index 1c9f0c9..a989933 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ParkBookService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ParkBookService.java
@@ -2,6 +2,7 @@
 
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.model.Cars;
 import com.doumee.dao.business.model.ParkBook;
 import java.util.List;
 
@@ -96,4 +97,6 @@
     long count(ParkBook parkBook);
 
     void reUpdate(ParkBook parkBook);
+
+    String batchAuth(Cars parkBook);
 }
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
index d9da2f8..29a5552 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
@@ -4,6 +4,9 @@
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+import com.doumee.core.model.LoginUserInfo;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
 import com.doumee.core.utils.Constants;
@@ -11,18 +14,22 @@
 import com.doumee.dao.admin.request.CarsQuery;
 import com.doumee.dao.admin.response.CarsDTO;
 import com.doumee.dao.business.CarsMapper;
+import com.doumee.dao.business.MemberMapper;
 import com.doumee.dao.business.join.CarJoinMapper;
 import com.doumee.dao.business.join.ParkBookJoinMapper;
 import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.model.SystemUser;
 import com.doumee.service.business.CarsService;
+import com.doumee.service.business.impl.hksync.HkSyncParkServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * 杞﹁締淇℃伅琛⊿ervice瀹炵幇
@@ -37,19 +44,117 @@
 
     @Autowired
     private CarJoinMapper carJoinMapper;
+    @Autowired
+    private MemberMapper memberMapper;
 
     @Autowired
     private ParkBookJoinMapper parkBookJoinMapper;
 
     @Override
-    public Integer create(Cars cars) {
-        carsMapper.insert(cars);
-        return cars.getId();
+    public Integer create(Cars model) {
+        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        if(loginUserInfo == null){
+            loginUserInfo = model.getLoginUserInfo();
+        }
+        if(StringUtils.isBlank(model.getCode())
+            ||model.getType()==null
+            ||model.getType()<0
+            ||model.getType()>3
+        ){
+            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
+        }
+        if(model.getMemberId()!=null){
+            //妫�鏌ヨ溅涓讳俊鎭�
+            Member member =memberMapper.selectOne(new QueryWrapper<Member>().lambda()
+                    .eq(Member::getId,model.getMemberId() )
+                    .eq(Member::getType,Constants.TWO )
+                    .eq(Member::getIsdeleted,Constants.ZERO)
+                    .last("limit 1"));
+            if(member == null){
+                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝杞︿富淇℃伅涓嶅瓨鍦紝璇疯繑鍥炲埛鏂伴噸璇�!");
+            }
+            model.setMemberHkId(member.getHkId());
+        }
+        //妫�鏌ヨ溅鐗屽彿鏄惁閲嶅
+        if(carsMapper.selectCount(new QueryWrapper<Cars>().lambda()
+                .eq(Cars::getCode,model.getCode() )
+                .eq(Cars::getIsdeleted,Constants.ZERO )
+        ) >0){
+            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝杞﹁締宸茬粡褰曞叆锛屼笉鑳介噸澶嶅綍鍏�!");
+        }
+        model.setType(Constants.formatIntegerNum(model.getType()));
+        model.setCreateDate(new Date());
+        model.setCreator(loginUserInfo.getId());
+        model.setEditDate(new Date());
+        model.setEdirot(loginUserInfo.getId());
+        model.setStatus(Constants.ZERO);
+        model.setIsdeleted(Constants.ZERO);
+        model.setHkStatus(Constants.ZERO);
+        model.setAuthStatus(Constants.ZERO);
+        model.setRemark("");
+//        model.setHkDate(model.getCreateDate());
+//        model.setHkId(UUID.randomUUID().toString().replace("-",""));
+        carsMapper.insert(model);
+
+        return model.getId();
     }
 
     @Override
-    public void deleteById(Integer id) {
-        carsMapper.deleteById(id);
+    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+    public void deleteById(Integer id, LoginUserInfo user) {
+        Cars car = carJoinMapper.selectById(id);
+        if(car ==null ||Constants.equalsInteger(car.getIsdeleted(),Constants.ONE)){
+            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝杞﹁締淇℃伅涓嶅瓨鍦紒");
+
+        }
+        Date date = new Date();
+        //鍒犻櫎宸叉巿鏉冧笅鍙戠殑鍖呮湡鎺堟潈
+        dealCancelBookBiz(car.getCode(),date);
+        Cars model = new Cars();
+        model.setEditDate(date);
+        model.setEdirot(user.getId());
+        model.setId(id);
+        model.setIsdeleted(Constants.ONE);
+        carsMapper.update(null,new UpdateWrapper<Cars>().lambda()
+                .eq(Cars::getId,model.getId())
+                .set(Cars::getStartTime,null)
+                .set(Cars::getEndTime,null)
+                .set(Cars::getAuthStatus,Constants.ZERO)
+                .set(Cars::getIsdeleted,Constants.ONE)
+                .set(Cars::getEditDate,model.getEditDate())
+                .set(Cars::getEdirot,model.getEdirot())
+        );
+        carsMapper.updateById(model);
+    }
+    public   boolean  dealCancelBookBiz(String code,Date date){
+
+        List<ParkBook> parkBooks = parkBookJoinMapper.selectJoinList(ParkBook.class,new MPJLambdaWrapper<ParkBook>()
+                .selectAll(ParkBook.class )
+                .selectAs(Parks::getHkId,ParkBook::getParkHkId )
+                .leftJoin(Parks.class,Parks::getId,ParkBook::getParkId)
+                .eq(ParkBook::getCarCode,code)
+                .eq(ParkBook::getIsdeleted,Constants.ZERO ));
+        if(parkBooks !=null){
+            for(ParkBook c : parkBooks){
+                //濡傛灉鍙栨秷棰勭害锛屽垯杩涜鍙栨秷鍖呮湡
+                if(StringUtils.isNotBlank(c.getParkHkId())
+                        && StringUtils.isNotBlank(c.getCarCode())){
+                    boolean result = HkSyncParkServiceImpl.cancelParkBookHk(c);
+                    if(!result){
+                        throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍙栨秷宸蹭笅鍙戞巿鏉冨け璐ワ紝璇疯仈绯荤鐞嗗憳澶勭悊~");
+                    }
+                    c.setHkStatus(Constants.ONE);
+                    c.setRemark("鍙栨秷鍖呮湡鎴愬姛");
+                }else{
+                    c.setHkStatus(Constants.TWO);//涓嬪彂澶辫触
+                    c.setRemark("鏃犳晥鍋滆溅鍦烘巿鏉冧笅鍙戯紝鍙栨秷鍖呮湡澶辫触锛岀洿鎺ュ垹闄よ褰�");
+                }
+                c.setHkDate(date);
+                c.setIsdeleted(Constants.ONE);
+                parkBookJoinMapper.updateById(c);
+            }
+        }
+        return true;
     }
 
     @Override
@@ -59,16 +164,74 @@
     }
 
     @Override
-    public void deleteByIdInBatch(List<Integer> ids) {
+    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+    public void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user) {
         if (CollectionUtils.isEmpty(ids)) {
             return;
         }
-        carsMapper.deleteBatchIds(ids);
+        for(Integer id : ids){
+            deleteById(id,user);
+        }
     }
 
     @Override
-    public void updateById(Cars cars) {
-        carsMapper.updateById(cars);
+    public void updateById(Cars model) {
+        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        if(loginUserInfo == null){
+            loginUserInfo = model.getLoginUserInfo();
+        }
+        if(StringUtils.isBlank(model.getCode())
+                ||model.getId()==null
+                ||model.getType()==null
+                ||model.getType()<0
+                ||model.getType()>3
+        ){
+            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
+        }
+        Cars car = carJoinMapper.selectById(model.getId());
+        if(car ==null ||Constants.equalsInteger(car.getIsdeleted(),Constants.ONE)){
+            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝杞﹁締淇℃伅涓嶅瓨鍦紒");
+
+        }
+        if(model.getMemberId()!=null){
+            //妫�鏌ヨ溅涓讳俊鎭�
+            Member member =memberMapper.selectOne(new QueryWrapper<Member>().lambda()
+                    .eq(Member::getId,model.getMemberId() )
+                    .eq(Member::getType,Constants.TWO )
+                    .eq(Member::getIsdeleted,Constants.ZERO)
+                    .last("limit 1"));
+            if(member == null){
+                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝杞︿富淇℃伅涓嶅瓨鍦紝璇疯繑鍥炲埛鏂伴噸璇�!");
+            }
+            model.setMemberHkId(member.getHkId());
+        }
+        //妫�鏌ヨ溅鐗屽彿鏄惁閲嶅
+        if(carsMapper.selectCount(new QueryWrapper<Cars>().lambda()
+                .eq(Cars::getCode,model.getCode() )
+                .ne(Cars::getId,model.getId() )
+                .eq(Cars::getIsdeleted,Constants.ZERO )
+        ) >0){
+            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝杞﹁締宸茬粡褰曞叆锛屼笉鑳介噸澶嶅綍鍏�!");
+        }
+        model.setType(Constants.formatIntegerNum(model.getType()));
+        model.setEditDate(new Date());
+        model.setEdirot(loginUserInfo.getId());
+        model.setIsdeleted(Constants.ZERO);
+        model.setHkStatus(Constants.ZERO);
+        model.setRemark("");
+        model.setAuthStatus(Constants.ZERO);
+        dealCancelBookBiz(model.getCode(),model.getEditDate());
+        carsMapper.update(null,new UpdateWrapper<Cars>().lambda()
+                .eq(Cars::getId,model.getId())
+                .set(Cars::getAuthStatus,Constants.ZERO)
+                .set(Cars::getType,model.getType())
+                .set(Cars::getCode,model.getCode())
+                .set(Cars::getEditDate,model.getEditDate())
+                .set(Cars::getEdirot,model.getEdirot())
+                .set(Cars::getMemberId,model.getMemberId())
+                .set(Cars::getStartTime,null)
+                .set(Cars::getEndTime,null)
+        );
     }
 
     @Override
@@ -103,31 +266,56 @@
     public PageData<Cars> findPage(PageWrap<Cars> pageWrap) {
         IPage<Cars> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
         MPJLambdaWrapper<Cars> queryWrapper = new MPJLambdaWrapper<>();
-
         queryWrapper.selectAll(Cars.class);
-        queryWrapper.selectAs(Parks::getName,Cars::getParksName);
         queryWrapper.selectAs(Member::getType,Cars::getMemberType);
         queryWrapper.selectAs(Member::getName,Cars::getMemberName);
+        queryWrapper.selectAs(SystemUser::getRealname,Cars::getEditorName);
         queryWrapper.selectAs(Member::getPhone,Cars::getMemberPhone);
-        queryWrapper.selectAs(Company::getName,Cars::getCompanyName);
-
-        queryWrapper.leftJoin(Parks.class,Parks::getId,Cars::getParkId);
+        queryWrapper.selectAs(Company::getCompanyNamePath,Cars::getCompanyName);
         queryWrapper.leftJoin(Member.class,Member::getId,Cars::getMemberId);
+        queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Cars::getEdirot);
         queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
-
-
         queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getName,pageWrap.getModel().getMemberName())
                 .or().like(Member::getPhone,pageWrap.getModel().getMemberName()));
-        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName());
+        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getCompanyNamePath,pageWrap.getModel().getCompanyName());
         queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getMemberType()),Member::getType,pageWrap.getModel().getMemberType());
         queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCode()),Cars::getCode,pageWrap.getModel().getCode());
         queryWrapper.eq(Cars::getIsdeleted,Constants.ZERO);
-
+        queryWrapper.eq(pageWrap.getModel().getType()!=null,Cars::getType,pageWrap.getModel().getType());
+        queryWrapper.eq(pageWrap.getModel().getAuthStatus()!=null,Cars::getAuthStatus,pageWrap.getModel().getAuthStatus());
         queryWrapper.orderByDesc(Cars::getCreateDate);
         IPage<Cars> result = carJoinMapper.selectJoinPage(page, Cars.class,queryWrapper);
+        if(result!=null && result.getRecords()!=null && result.getRecords().size()>0){
+            List<String> codes = new ArrayList<>();
+            for(Cars cars :result.getRecords()){
+                codes.add(cars.getCode());
+            }
+            List<ParkBook> parkBooks = parkBookJoinMapper.selectJoinList(ParkBook.class,new MPJLambdaWrapper<ParkBook>()
+                    .selectAll(ParkBook.class)
+                    .selectAs(Parks::getName,ParkBook::getParksName)
+                    .leftJoin(Parks.class,Parks::getId,ParkBook::getParkId)
+                    .in(ParkBook::getCarCode,codes)
+                    .eq(ParkBook::getIsdeleted,Constants.ZERO) );
+            for(Cars cars :result.getRecords()){
+               cars.setParkBookList(getParkbookListByCode(cars.getCode(),parkBooks));
+            }
+        }
         return PageData.from(result);
     }
 
+    private List<ParkBook> getParkbookListByCode(String code, List<ParkBook> parkBooks) {
+        List<ParkBook> list =null;
+        for(ParkBook p : parkBooks){
+            if(StringUtils.equals(p.getCarCode(),code)){
+                if(list == null){
+                    list = new ArrayList<>();
+                }
+                list.add(p);
+            }
+        }
+        return  list;
+    }
+
     @Override
     public long count(Cars cars) {
         QueryWrapper<Cars> wrapper = new QueryWrapper<>(cars);
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 b1f71a3..347a265 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
@@ -11,17 +11,20 @@
 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.HiddenDangerParamMapper;
 import com.doumee.dao.business.MemberMapper;
 import com.doumee.dao.business.model.*;
 import com.doumee.dao.system.MultifileMapper;
 import com.doumee.dao.system.model.Multifile;
+import com.doumee.service.business.HiddenDangerLogService;
 import com.doumee.service.business.HiddenDangerService;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.*;
@@ -46,11 +49,14 @@
     @Autowired
     private HiddenDangerParamMapper hiddenDangerParamMapper;
 
+    @Autowired
+    private HiddenDangerLogMapper hiddenDangerLogMapper;
+
 
     @Override
     public Integer create(HiddenDanger hiddenDanger) {
         if(Objects.isNull(hiddenDanger)
-            || Objects.isNull(hiddenDanger.getCreator())
+            || Objects.isNull(hiddenDanger.getLoginUserInfo())
             || Objects.isNull(hiddenDanger.getAreaId())
             || Objects.isNull(hiddenDanger.getCateId())
             || Objects.isNull(hiddenDanger.getApplyCheckUserId())
@@ -65,6 +71,7 @@
         if(Objects.isNull(hiddenDangerParam)){
             throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌闅愭偅鍖哄煙");
         }
+        hiddenDanger.setCreator(hiddenDanger.getLoginUserInfo().getId());
         hiddenDanger.setAreaName(hiddenDangerParam.getName());
         hiddenDanger.setStatus(Constants.ZERO);
         if(StringUtils.isBlank(hiddenDangerParam.getMemberIds())
@@ -72,6 +79,15 @@
             throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"闅愭偅鍖哄煙涓庡鐞嗕汉涓嶅尮閰�");
         }
         hiddenDangerMapper.insert(hiddenDanger);
+        //瀛樺偍 鎿嶄綔鏃ュ織
+        HiddenDangerLog hiddenDangerLog = new HiddenDangerLog();
+        hiddenDangerLog.setIsdeleted(Constants.ZERO);
+        hiddenDangerLog.setCreateDate(new Date());
+        hiddenDangerLog.setCreator(hiddenDanger.getCreator());
+        hiddenDangerLog.setHiddenDangerId(hiddenDanger.getId());
+        hiddenDangerLog.setObjType(Constants.ZERO);
+        hiddenDangerLogMapper.insert(hiddenDangerLog);
+
         List<Multifile> multifiles  = hiddenDanger.getMultifileList();
         if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifiles)){
             for (int i = 0; i < multifiles.size(); i++) {
@@ -258,4 +274,115 @@
         QueryWrapper<HiddenDanger> wrapper = new QueryWrapper<>(hiddenDanger);
         return hiddenDangerMapper.selectCount(wrapper);
     }
+
+
+
+    @Override
+    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+    public void dealHiddenDanger(HiddenDanger hiddenDanger){
+        if(Objects.isNull(hiddenDanger)
+            || Objects.isNull(hiddenDanger.getId())
+            || Objects.isNull(hiddenDanger.getDealTime())
+            || Objects.isNull(hiddenDanger.getLoginUserInfo())
+            || Objects.isNull(hiddenDanger.getStatus())
+            ){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST);
+        }
+        HiddenDanger model = hiddenDangerMapper.selectById(hiddenDanger.getId());
+        if(Objects.isNull(model)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌闅愭偅鏁版嵁");
+        }
+        if (!model.getStatus().equals(Constants.ZERO)) {
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�佸凡娴佽浆!");
+        }
+        if (!model.getCheckUserId().equals(hiddenDanger.getEditor())) {
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"澶勭悊浜洪潪褰撳墠浜哄憳锛�");
+        }
+        if(!(hiddenDanger.getStatus().equals(Constants.ONE)||hiddenDanger.getStatus().equals(Constants.TWO))){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓氬姟绫诲瀷閿欒锛�");
+        }
+        //鏁存敼鍓嶆枃浠�
+        if(hiddenDanger.getStatus().equals(Constants.ONE)){
+            List<Multifile> beforList = hiddenDanger.getDealBeforeFileList();
+            if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(beforList)){
+                for (int i = 0; i < beforList.size(); i++) {
+                    Multifile multifile = beforList.get(i);
+                    multifile.setCreateDate(new Date());
+                    multifile.setCreator(hiddenDanger.getEditor());
+                    multifile.setIsdeleted(Constants.ZERO);
+                    multifile.setObjId(hiddenDanger.getId());
+                    multifile.setObjType(Constants.multifileObjType.one);
+                    multifile.setSortnum(i+1);
+                    multifileMapper.insert(multifile);
+                }
+            }
+        }
+        List<Multifile> afterList = hiddenDanger.getDealAfterFileList();
+        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(afterList)){
+            for (int i = 0; i < afterList.size(); i++) {
+                Multifile multifile = afterList.get(i);
+                multifile.setCreateDate(new Date());
+                multifile.setCreator(hiddenDanger.getEditor());
+                multifile.setIsdeleted(Constants.ZERO);
+                multifile.setObjId(hiddenDanger.getId());
+                multifile.setObjType(Constants.multifileObjType.two);
+                multifile.setSortnum(i+1);
+                multifileMapper.insert(multifile);
+            }
+        }
+        hiddenDanger.setEditor(hiddenDanger.getLoginUserInfo().getId());
+        hiddenDanger.setEditDate(new Date());
+        hiddenDangerMapper.updateById(hiddenDanger);
+        //瀛樺偍 鎿嶄綔鏃ュ織
+        HiddenDangerLog hiddenDangerLog = new HiddenDangerLog();
+        hiddenDangerLog.setIsdeleted(Constants.ZERO);
+        hiddenDangerLog.setCreateDate(new Date());
+        hiddenDangerLog.setCreator(hiddenDanger.getCreator());
+        hiddenDangerLog.setHiddenDangerId(hiddenDanger.getId());
+        hiddenDangerLog.setObjType(hiddenDanger.getStatus().equals(Constants.ONE)?Constants.FOUR:Constants.TWO);
+        hiddenDangerLogMapper.insert(hiddenDangerLog);
+    }
+
+
+    @Override
+    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+    public void transferHiddenDanger(HiddenDanger hiddenDanger){
+        if(Objects.isNull(hiddenDanger)
+                || Objects.isNull(hiddenDanger.getId())
+                || Objects.isNull(hiddenDanger.getDealTime())
+                || Objects.isNull(hiddenDanger.getLoginUserInfo())
+                || Objects.isNull(hiddenDanger.getCheckUserId())
+        ){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST);
+        }
+        HiddenDanger model = hiddenDangerMapper.selectById(hiddenDanger.getId());
+        if(Objects.isNull(model)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌闅愭偅鏁版嵁");
+        }
+        if (!model.getStatus().equals(Constants.ZERO)) {
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�佸凡娴佽浆!");
+        }
+        if (!model.getCheckUserId().equals(hiddenDanger.getEditor())) {
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"澶勭悊浜洪潪褰撳墠浜哄憳锛�");
+        }
+        if(!(hiddenDanger.getStatus().equals(Constants.ONE)||hiddenDanger.getStatus().equals(Constants.TWO))){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓氬姟绫诲瀷閿欒锛�");
+        }
+        if(model.getCheckUserId().equals(hiddenDanger.getCheckUserId())){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏃犳硶杞氦缁欒嚜宸�");
+        }
+        hiddenDanger.setEditor(hiddenDanger.getLoginUserInfo().getId());
+        hiddenDanger.setEditDate(new Date());
+        hiddenDangerMapper.updateById(hiddenDanger);
+        //瀛樺偍 鎿嶄綔鏃ュ織
+        HiddenDangerLog hiddenDangerLog = new HiddenDangerLog();
+        hiddenDangerLog.setIsdeleted(Constants.ZERO);
+        hiddenDangerLog.setCreateDate(new Date());
+        hiddenDangerLog.setCreator(hiddenDanger.getCreator());
+        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 f394837..987e74d 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
@@ -202,6 +202,7 @@
         insert.setCanVisit(Constants.ZERO);//榛樿涓嶅彲璁块棶
         insert.setAuthStatus(Constants.ZERO);
         insert.setName(member.getName());
+        insert.setHkId(UUID.randomUUID().toString().replace("-",""));
         insert.setHkStatus(Constants.ONE);
         insert.setSex(Constants.getSexByCardNo( member.getIdcardNo()));//鏍规嵁韬唤璇佸彿鑾峰彇鎬у埆
         insert.setBirthday( DateUtil.fromStringToDate("yyyyMMdd",IdcardUtil.getBirthByIdCard(member.getIdcardNo())));
@@ -472,6 +473,10 @@
         }
         member.setHkId(model.getHkId());
         member.setFaceId(model.getFaceId());//浜鸿劯缂栫爜
+        if(StringUtils.equals(model.getFaceImg(),member.getFaceImg())){
+            //濡傛灉浜鸿劯娌″彉鍖�
+            member.setFaceImg(null);
+        }
         return model;
     }
 
@@ -529,9 +534,7 @@
     }
 
     @Override
-    public void deleteById(Integer id,LoginUserInfo user) {
-        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
-
+    public void deleteById(Integer id,LoginUserInfo loginUserInfo) {
         Member member=new Member();
         member.setId(id);
         member.setIsdeleted(Constants.ZERO);
@@ -586,12 +589,12 @@
                 //濡傛灉鍛樺伐淇℃伅涓嶅悎娉曠洿鎺ヨ烦杩�
                continue;
             }
+            if(StringUtils.isNotBlank(member.getFaceId()) || !Constants.equalsInteger(member.getFaceStatus(),Constants.ONE)){
+                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鐢ㄦ埛銆�"+member.getName()+"銆戠殑浜鸿劯淇℃伅涓嶆弧瓒虫巿鏉冩潯浠讹紝璇疯繑鍥炲畬鍠勫悗鍐嶈繘琛岃鎿嶄綔锛�");
+            }
             member.setStartTime(memberRole.getStartTime());
             member.setEndTime(memberRole.getEndTime());
             Integer ischange = getRoleIdByParam(memberRole.getRoleIds(),member,memberRoleMapper,deviceRoleMapper);
-            if(ischange == 0){
-                return;//鏈彂鐜版潈闄愬彉鍖栵紝鐩存帴杩斿洖
-            }
             if(memberRole.getRoleIds()!=null && memberRole.getRoleIds().length>0 && StringUtils.isBlank(member.getRoleId())){
                 throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鏈煡璇㈠埌鏈夋晥闂ㄧ缁勬暟鎹�");
             }
@@ -1830,17 +1833,20 @@
     private void dealHkUserBizBatch(List<Member> newList) {
         List<String> hkIds = new ArrayList<>();
         try {
-            memberMapper.insertBatchSomeColumn(newList);
-            List<SystemUser> userList = new ArrayList<>();
             for(Member insert: newList){
                 if(dealHkUserBiz(insert)){
                     //鍒涘缓绯荤粺鐧婚檰璐﹀彿锛堥粯璁ゆ棤浠讳綍瑙掕壊锛�
-                    if(Constants.equalsInteger(insert.getCompanyType(),Constants.ONE)){
-                        //濡傛灉鏄唴閮ㄧ粍缁囦汉鍛橈紝鏂板绯荤粺鐧婚檰璐﹀彿
-                        userList.add(createSystemUser(insert));
-                    }
                 }else{
                     throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅銆�"+insert.getName()+"銆戝悓姝ュ畨闃插钩鍙板け璐ワ紝璇风◢鍚庨噸璇曪紒");
+                }
+            }
+            memberMapper.insertBatchSomeColumn(newList);
+            List<SystemUser> userList = new ArrayList<>();
+            for(Member insert: newList){
+                //鍒涘缓绯荤粺鐧婚檰璐﹀彿锛堥粯璁ゆ棤浠讳綍瑙掕壊锛�
+                if(Constants.equalsInteger(insert.getCompanyType(),Constants.ONE)){
+                    //濡傛灉鏄唴閮ㄧ粍缁囦汉鍛橈紝鏂板绯荤粺鐧婚檰璐﹀彿
+                    userList.add(createSystemUser(insert));
                 }
             }
             if(userList.size()>0){
@@ -1852,7 +1858,6 @@
             throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍛樺伐淇℃伅瀵煎叆澶辫触锛岃绋嶅悗閲嶈瘯锛�");
         }
     }
-
     private Member checkModelParam(MemberImport model, List<Member> newList
             ,int index
             ,LoginUserInfo loginUserInfo
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java
index c12d4e2..e2b08a6 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java
@@ -7,7 +7,9 @@
 import com.doumee.core.model.PageWrap;
 import com.doumee.core.utils.Constants;
 import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.CarsMapper;
 import com.doumee.dao.business.ParkBookMapper;
+import com.doumee.dao.business.ParksMapper;
 import com.doumee.dao.business.join.ParkBookJoinMapper;
 import com.doumee.dao.business.model.*;
 import com.doumee.service.business.ParkBookService;
@@ -21,10 +23,13 @@
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 杞﹁締棰勭害璁板綍淇℃伅琛⊿ervice瀹炵幇
@@ -37,7 +42,11 @@
     @Autowired
     private ParkBookMapper parkBookMapper;
     @Autowired
+    private CarsMapper carsMapper;
+    @Autowired
     private HkSyncParkServiceImpl hkSyncParkService;
+    @Autowired
+    private ParksMapper parksMapper;
 
     @Autowired
     private ParkBookJoinMapper parkBookJoinMapper;
@@ -112,6 +121,111 @@
        }
         hkSyncParkService.syncParkBookBySingleModel(model);
     }
+    @Override
+    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+    public   String batchAuth(Cars cars) {
+        if(cars.getIdList() == null || cars.getIdList() == null
+                ||cars.getAuthTimeType() == null
+                ||cars.getAuthTimeType()>2
+                ||cars.getAuthTimeType()<0 ){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST);
+        }
+        MPJLambdaWrapper<Cars> queryWrapper = new MPJLambdaWrapper<>();
+        queryWrapper.selectAll(Cars.class);
+        queryWrapper.selectAs(Member::getStartTime,Cars::getMemberStartTime);
+        queryWrapper.selectAs(Member::getEndTime,Cars::getMemberEndTime);
+        queryWrapper.selectAs(Member::getIsdeleted,Cars::getMemberDeleted);
+        queryWrapper.selectAs(Member::getAuthStatus,Cars::getMemberAuthStatus);
+        queryWrapper.leftJoin(Member.class,Member::getId,Cars::getMemberId);
+        queryWrapper.eq(Cars::getIsdeleted,Constants.ZERO)
+                .in(Cars::getId,cars.getIdList());
+        List<Cars> carsList = carsMapper.selectList( queryWrapper);
+       if(carsList== null || carsList.size() ==0){
+           throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"杞﹁締淇℃伅鏈夎锛岃杩斿洖鍒锋柊椤甸潰閲嶈瘯锛�");
+       }
+        List<Parks> parksList = null;
+       if(cars.getParkIdList()!=null && cars.getParkIdList().size() > 0){
+           MPJLambdaWrapper<Parks> queryWrapper1 = new MPJLambdaWrapper<>();
+           queryWrapper1.selectAll(Parks.class);
+           queryWrapper1.eq(Parks::getIsdeleted,Constants.ZERO)
+                   .in(Parks::getId,cars.getParkIdList());
+          parksList = parksMapper.selectList( queryWrapper1);
+           if(parksList== null || parksList.size() ==0){
+               throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鍋滆溅鍦轰俊鎭湁璇紝璇疯繑鍥炲埛鏂伴〉闈㈤噸璇曪紒");
+           }
+       }
+
+        if(Constants.equalsInteger(cars.getAuthTimeType(),Constants.ONE)){
+            if( cars.getStartTime() ==null || cars.getEndTime() == null ){
+                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇峰～鍐欐纭殑鏈夋晥鏈熻寖鍥�");
+            }
+            if( cars.getEndTime().getTime() < System.currentTimeMillis()){
+                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈夋晥鏈熸埅姝㈡棩鏈熶笉鑳藉皬浜庡綋鍓嶆椂闂达紒");
+            }
+            if(cars.getEndTime().getTime() <= cars.getStartTime().getTime()){
+                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈夋晥鏈熸埅姝㈡棩鏈熶笉鑳藉皬浜庡紑濮嬫椂闂达紒");
+            }
+        }
+       Date date = new Date();
+       for(Cars model : carsList){
+           Date startTime = cars.getStartTime();
+           Date endTime = cars.getEndTime();
+           if(Constants.equalsInteger(cars.getAuthTimeType(),Constants.TWO)){
+                if(!Constants.equalsInteger(model.getMemberAuthStatus(),Constants.ONE)){
+                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝杞﹁締銆�"+model.getCode()+"銆戣溅涓诲皻鏈巿鏉冮棬绂佷俊鎭紝鎺堟潈鏃犳硶銆愯窡闅忚溅涓汇�戞湁鏁堟湡锛�");
+                }
+                startTime = model.getMemberStartTime();
+                endTime=model.getMemberEndTime();
+           }
+           model.setAuthTimeType(cars.getAuthTimeType());
+           model.setStartTime(startTime);
+           model.setEndTime(endTime);
+           dealCarAuthByModel(model,cars.getLoginUserInfo(),parksList,date);
+           model.setAuthStatus(Constants.ONE);//宸叉巿鏉�
+           carsMapper.update(null,new UpdateWrapper<Cars>().lambda()
+                   .eq(Cars::getId,model.getId())
+                   .set(Cars::getEditDate,date)
+                   .set(Cars::getEdirot,cars.getLoginUserInfo().getId())
+                   .set(Cars::getAuthStatus,Constants.ONE)
+                   .set(Cars::getStartTime,startTime)
+                   .set(Cars::getEndTime,endTime)
+           );
+       }
+       return  "鎺堟潈鎴愬姛";
+
+    }
+
+    private int dealCarAuthByModel(Cars model, LoginUserInfo loginUserInfo, List<Parks> parksList,Date date) {
+        //鍒犻櫎杞﹂噺搴撹褰曟暟鎹�
+        parkBookMapper.update(null,new UpdateWrapper<ParkBook>().lambda()
+                .eq(ParkBook::getCarCode,model.getCode())
+                .set(ParkBook::getIsdeleted,Constants.ONE)
+                .set(ParkBook::getHkStatus,Constants.ZERO)
+        );
+        if(org.apache.commons.collections.CollectionUtils.isNotEmpty(parksList)){
+            List<ParkBook> parkBookList = new ArrayList<>();
+            for (Parks parks:parksList) {
+                ParkBook parkBook = new ParkBook();
+                parkBook.setIsdeleted(Constants.ZERO);
+                parkBook.setCreateDate(date);
+                parkBook.setCreator(loginUserInfo.getId());
+                parkBook.setEditor(loginUserInfo.getId());
+                parkBook.setEditDate(date);
+                parkBook.setCarCode(model.getCode());
+                parkBook.setParkId(parks.getId());
+                parkBook.setOrigin(Constants.ZERO);
+                parkBook.setStartTime(model.getStartTime());
+                parkBook.setEndTime(model.getEndTime());
+                parkBook.setTimeType(model.getAuthTimeType());
+                parkBook.setMemberId(model.getMemberId());
+                parkBook.setHkStatus(Constants.ZERO);
+                parkBook.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
+                parkBookList.add(parkBook);
+            }
+            parkBookMapper.insertBatchSomeColumn(parkBookList);
+        }
+        return 0;
+    }
 
     @Override
     public ParkBook findOne(ParkBook parkBook) {
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 c10c289..9fc3a6c 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
@@ -152,7 +152,7 @@
             return  false;
         }
     }
-    private boolean cancelParkBookHk(ParkBook c) {
+    public static boolean cancelParkBookHk(ParkBook c) {
         CarChargeDelRequest param = new CarChargeDelRequest();
         param.setPlateNo(c.getCarCode());
         param.setParkSyscode(c.getParkHkId());
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 a6ea67e..7765f13 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
@@ -861,12 +861,14 @@
         model.setOrgIndexCode(c.getHkOrgId());
         model.setJobNo(c.getCode());
         model.setPhoneNo(c.getPhone());
-        model.setCertificateNo(DESUtil.decrypt(Constants.EDS_PWD, c.getIdcardNo()));
+        if(StringUtils.isNotBlank(c.getIdcardNo())){
+            model.setCertificateNo(DESUtil.decrypt(Constants.EDS_PWD, c.getIdcardNo()));
+        }
         model.setCertificateType(HKConstants.CertificateType.SHENFENZHENG.getKey()+"");
         model.setPersonId(type == 0 ?UUID.randomUUID().toString().replace("-", ""):c.getHkId());
         model.setGender(Constants.formatIntegerNum(c.getSex())+"");
         model.setPersonName(c.getName());
-        if(type== 0 && StringUtils.isNotBlank(c.getFaceImg())){
+        if(StringUtils.isNotBlank(c.getFaceImg())){
             model.setFaces(new ArrayList<>());
             UserAddFaceRequest face = new UserAddFaceRequest();
             String imageBase = ImageBase64Util.Image2Base64(path+c.getFaceImg());

--
Gitblit v1.9.3