Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-05-27 efcdc8c49b0452d9c7f192ab351da09bf8aafc80

Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

 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
    }
  })
}

 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) {

 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', {

 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

 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

 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>

 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;

 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(() => {

 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','')

 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>

 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"

 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>

 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:

 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) {

 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")

 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 = "性别")

 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")

 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));
    }



 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是")

 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 = "创建时间")

 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> {


}

 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")

 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")

 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 = "名称")

 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 = "人员编码（关联member表)", example = "1")
    @ExcelColumn(name="人员编码（关联member表)")
    private Integer memberId;
    @ApiModelProperty(value = "车辆编码（关联cars)", example = "1")
    @ExcelColumn(name="车辆编码（关联cars)")
    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;

 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")

 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")

 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")

 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")

 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")

 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")

 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 = "使用人数")

 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")

 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 = "处理说明")

 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;
}

 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组织编码")

 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挂失")

 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")

 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;



 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")

 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 = "监控点名称，多个用英文逗号隔开")

 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")

 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 = "请求参数")

 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")

 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")

 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")

 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")

 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")

 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 = "手机号")

 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 = "终止时间")

 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")

 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")

 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 = "停车库海康编码")

 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")

 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")

 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")

 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;

}

 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;

 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;
}

 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;


 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);


    /**

 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());

 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()) {

 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 )

 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;

/**
 * ç†è³ æ“ä½œåŽ†å²è¡¨Service实现
@@ -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

 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)){

 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);

 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());

 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());

 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);
    }
  

 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(), "对不起，入厂时间必须大于当前时间！");//

 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())){

 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())){

 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){