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

liukangdong

2024-06-11 3668d4433f8db668ff506fcfb0488e7f40ff8382

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

 admin/package-lock.json

@@ -13952,6 +13952,14 @@
      "integrity": "sha1-UylVzB6yCKPZkLOp+acFdGV+CPI=",
      "dev": true
    },
    "vue-json-viewer": {
      "version": "2.2.22",
      "resolved": "https://registry.npmmirror.com/vue-json-viewer/-/vue-json-viewer-2.2.22.tgz",
      "integrity": "sha512-3oPH5BxoUWva/qp7wNJj+15FBXyi9Yu5VDW4mCWivjHR1pUpMv34fjqqxML7jh2uOqm1S/3Xks5nQ5JjC5+OWw==",
      "requires": {
        "clipboard": "^2.0.4"
      }
    },
    "vue-loader": {
      "version": "15.9.7",
      "resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-15.9.7.tgz",

 admin/package.json

@@ -26,6 +26,7 @@
    "qrcodejs2": "0.0.2",
    "vue": "^2.6.11",
    "vue-clipboard2": "^0.3.1",
    "vue-json-viewer": "^2.2.22",
    "vue-router": "^3.5.1",
    "vuescroll": "^4.17.3",
    "vuex": "^3.4.0"

 admin/src/api/business/platformInterfaceLog.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
import request from '../../utils/request'

// æŸ¥è¯¢
export function fetchList (data) {
  return request.post('/visitsAdmin/cloudService/business/platformInterfaceLog/page', data, {
    trim: true
  })
}

// åˆ›å»º
export function create (data) {
  return request.post('/visitsAdmin/cloudService/business/platformInterfaceLog/create', data)
}

// ä¿®æ”¹
export function updateById (data) {
  return request.post('/visitsAdmin/cloudService/business/platformInterfaceLog/updateById', data)
}

 admin/src/components/business/OperaInterfaceLogWindow.vue

@@ -1,49 +1,102 @@
<template>
    <GlobalWindow
    <el-dialog
        :title="title"
        width="60%"
        :withFooter="false"
        :visible.sync="visible"
        :confirm-working="isWorking"
        append-to-body
        @confirm="confirm"
    >
        <div class="box">
            {{form.content}}
        </div>
    </GlobalWindow>
      <div class="codeEditBox">
        <json-viewer
            :value="form.formatContent"
            :expand-depth="5"
            copyable
            boxed
            :expanded="false"
            @copied="copyText"
            sort
            :show-array-index="false"
            class="w-100%">
          <template slot="copy">
            <i class="el-icon-document-copy" title="复制">复制代码</i>
          </template>
        </json-viewer>
      </div>
    </el-dialog>
</template>

<script>
  import BaseOpera from '@/components/base/BaseOpera'
  import GlobalWindow from '@/components/common/GlobalWindow'
  export default {
    name: 'OperaInterfaceLogWindow',
    extends: BaseOpera,
    components: { GlobalWindow },
    data () {
      return {
        // è¡¨å•æ•°æ®
        form: {
          content: ''
        },
        // éªŒè¯è§„则
        rules: {
        }
      }
import BaseOpera from '@/components/base/BaseOpera'
import JsonViewer from 'vue-json-viewer'

export default {
  name: 'OperaInterfaceLogWindow',
  extends: BaseOpera,
  components: { JsonViewer },
  data () {
    return {
      // è¡¨å•æ•°æ®
      form: {
        content: '',
        formatContent: {}
      },
      // éªŒè¯è§„则
      rules: {
      },
      copyable: { copyText: 'copy', copiedText: 'copied' }
    }
  },
  created () {
    this.config({
      api: '/business/interfaceLog',
      'field.id': 'id'
    })
  },
  methods: {
    copyText (val) {
      this.$message.success('内容已成功复制到剪切板！')
    },
    created () {
      this.config({
        api: '/business/interfaceLog',
        'field.id': 'id'
    open (title, target) {
      this.title = title
      this.visible = true
      // æ–°å»º
      if (target == null) {
        this.$nextTick(() => {
          this.$refs.form.resetFields()
          this.form[this.configData['field.id']] = null
        })
        return
      }
      // ç¼–辑
      this.$nextTick(() => {
        for (const key in this.form) {
          this.form[key] = target[key]
        }
        try {
          this.form.formatContent = JSON.parse(this.form.content)
        } catch (e) {
          this.form.formatContent = this.form.content
        }
      })
    }
  }
}
</script>

<style lang="scss" scoped>
    .box {
        width: 100%;
        font-size: 15px;
        color: #222222;
        word-wrap: break-word;
    .codeEditBox {
      width: 100%;
      height: 90%;
      overflow:auto;
      display: block;
      border: 1px solid #dcdee2;
      overflow-y: auto;
    }
    ::v-deep .el-dialog__body{height:70vh;overflow-y: auto}
    ::v-deep .el-dialog{height:78vh;overflow: hidden}
    .jv-container {
      //height: 60vh;
    }
</style>

 admin/src/components/common/Menu.vue

@@ -61,7 +61,7 @@
        return
      }
      // ç‚¹å‡»å½“前菜单不做处理
      if (menuConfig.url === this.$route.path && menuConfig.params === this.$route.query.param) {
      if (menuConfig.url === this.$route.path && (menuConfig.params ==null || menuConfig.params==undefined || menuConfig.params=='' ||  menuConfig.params === this.$route.query.param)) {
        return
      }
      if (menuConfig.url == null || menuConfig.url.trim().length === 0) {

 admin/src/views/business/internalMember.vue

@@ -167,9 +167,9 @@
                >
                    <template slot-scope="{row}">
                        <el-button type="text" icon="el-icon-edit" @click="$refs.OperaMemberWindow.open('编辑员工信息',row,department)" v-permissions="['business:empower:update']">编辑</el-button>
                        <el-button type="text" :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-plus" @click="empower(row.id)" v-permissions="['business:empower:create']">重新授权</el-button>
                      <el-button type="text" :loading="heading" style="color: red" icon="el-icon-delete" @click="updateHead(row,0)" v-if="row.headStatus ==1 " v-permissions="['business:member:head']">取消主管</el-button>
                      <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-delete" @click="deleteById(row)" style="color: red" v-permissions="['business:member:delete']">删除</el-button>
                    </template>
                </el-table-column>

 admin/src/views/business/platformInterfaceLog.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,145 @@
<template>
    <TableLayout :permissions="['business:interfacelog:query']">
        <!-- æœç´¢è¡¨å• -->
        <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
            <el-form-item label="接口名称" prop="name">
                <el-input v-model="searchForm.name" placeholder="请输入接口名称" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="类型" prop="type">
                <el-select v-model="searchForm.type" @change="search" 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="startDate">
                <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>
            </el-form-item>
            <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
                <el-radio-button label="0">当天</el-radio-button>
                <el-radio-button label="1">近7天</el-radio-button>
                <el-radio-button label="2">近30天</el-radio-button>
            </el-radio-group>
            <section>
                <el-button type="primary" @click="search">搜索</el-button>
                <el-button @click="reset">重置</el-button>
            </section>
        </el-form>
        <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
        <template v-slot:table-wrap>
            <el-table
                v-loading="isWorking.search"
                :data="tableData.list"
                stripe
            >
                <el-table-column prop="name" label="接口名称" min-width="180px"></el-table-column>
                <el-table-column prop="url" label="地址信息" min-width="180px"></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>
                    </template>
                </el-table-column>
                <el-table-column label="平台" min-width="100px">
                    <template slot-scope="{row}">
                        <span v-if="row.plat == 0">海康安防平台</span>
                        <span v-if="row.plat == 1">ERP系统</span>
                    </template>
                </el-table-column>
                <el-table-column prop="request" label="请求参数" min-width="100px">
                    <template slot-scope="{row}">
                        <el-button type="text" @click="$refs.operaInterfaceLogWindow.open('请求参数', {content: row.request})">查看</el-button>
                    </template>
                </el-table-column>
                <el-table-column prop="repose" label="响应参数" min-width="100px">
                    <template slot-scope="{row}">
                        <el-button type="text" @click="$refs.operaInterfaceLogWindow.open('响应参数', {content: row.repose})">查看</el-button>
                    </template>
                </el-table-column>
                <el-table-column prop="createDate" label="创建时间" min-width="100px"></el-table-column>
            </el-table>
            <pagination
                @size-change="handleSizeChange"
                @current-change="handlePageChange"
                :pagination="tableData.pagination"
            >
            </pagination>
        </template>
        <!-- æ–°å»º/修改 -->
        <OperaInterfaceLogWindow ref="operaInterfaceLogWindow" @success="handlePageChange"/>
    </TableLayout>
</template>

<script>
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaInterfaceLogWindow from '@/components/business/OperaInterfaceLogWindow'
import { timeForMat } from '@/utils/util'
export default {
  name: 'InterfaceLog',
  extends: BaseTable,
  components: { TableLayout, Pagination, OperaInterfaceLogWindow },
  data () {
    return {
      // æœç´¢
      searchForm: {
        name: '',
        type: '',
        endDate: '',
        startDate: '',
        radio: '0'
      },
      time: []
    }
  },
  created () {
    this.config({
      module: '三方平台接口交互记录',
      api: '/business/platformInterfaceLog',
      'field.id': 'id',
      'field.main': 'id'
    })
    this.changeRadio('0')
  },
  methods: {
    changeRadio (e) {
      if (e === '0') {
        this.searchForm.startTime = timeForMat(0)[0]
        this.searchForm.endTime = timeForMat(0)[1]
        this.time = timeForMat(0)
      } else if (e === '1') {
        this.searchForm.startTime = timeForMat(6)[0]
        this.searchForm.endTime = timeForMat(6)[1]
        this.time = timeForMat(6)
      } else if (e === '2') {
        this.searchForm.startTime = timeForMat(29)[0]
        this.searchForm.endTime = timeForMat(29)[1]
        this.time = timeForMat(29)
      }
      this.search()
    },
    seleTime (e) {
      this.searchForm.startDate = e[0]
      this.searchForm.endDate = e[1]
      this.searchForm.radio = null
      this.search()
    },
    reset () {
      this.$refs.searchForm.resetFields()
      this.searchForm.startDate = ''
      this.searchForm.endDate = ''
      this.time = []
      this.search()
    }
  }
}
</script>

 admin/src/views/business/relativeMember.vue

@@ -168,10 +168,10 @@
                >
                    <template slot-scope="{row}">
                        <el-button type="text" icon="el-icon-edit" @click="$refs.OperaMemberWindow.open('编辑员工信息',row,department)" v-permissions="['business:empower:update']">编辑</el-button>
                        <el-button type="text" :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-plus" @click="empower(row.id)" v-permissions="['business:empower:create']">重新授权</el-button>
                      <el-button type="text" :loading="heading" style="color: red" icon="el-icon-delete" @click="updateHead(row,0)" v-if="row.headStatus ==1 " v-permissions="['business:member:head']">取消主管</el-button>
                      <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-delete"   style="color: red" @click="empower(row.id)" v-permissions="['business:empower:delete']">删除</el-button>
                    </template>
                </el-table-column>
            </el-table>

 server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java

@@ -174,8 +174,6 @@
            queryWrapper.eq("1","2");
        }
        queryWrapper.ge(noticesDTO.getStartDate() != null, Notices::getCreateDate, Utils.Date.getStart(noticesDTO.getStartDate() ));
        queryWrapper.le(noticesDTO.getStartDate() != null,  Notices::getCreateDate, Utils.Date.getEnd(noticesDTO.getStartDate() ));
        queryWrapper.ge(noticesDTO.getEndDate() != null, Notices::getCreateDate, Utils.Date.getStart(noticesDTO.getEndDate() ));
        queryWrapper.le(noticesDTO.getEndDate() != null,  Notices::getCreateDate, Utils.Date.getEnd(noticesDTO.getEndDate() ));
        queryWrapper.eq(Objects.nonNull(noticesDTO.getType()),Notices::getType,noticesDTO.getType());
        queryWrapper.eq(StringUtils.isNotBlank(noticesDTO.getTitle()),Notices::getTitle,noticesDTO.getTitle());

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java

@@ -83,16 +83,23 @@



    @ApiOperation(value = "任务中心头部", notes = "H5")
    @ApiOperation(value = "任务中心头部 - H5", notes = "H5")
    @GetMapping("/taskCenterHead")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "isDetail", value = " æ˜¯å¦æŸ¥è¯¢è¯¦ç»† 1是；0否", required = true),
    })
    public ApiResponse<InternalHomeVO> taskCenterHead(@RequestParam Integer isDetail,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        return ApiResponse.success("查询成功",approveService.getHomeData(getLoginUser(token).getMemberId(),isDetail));
        return ApiResponse.success("查询成功",approveService.getHomeDataH5(getLoginUser(token).getMemberId(),isDetail));
    }


    @ApiOperation(value = "任务中心头部 - PC", notes = "PC")
    @PostMapping("/taskCenterHeadPC")
    public ApiResponse<InternalHomeVO> taskCenterHeadPC(@RequestBody NoticesDTO  noticesDTO,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        noticesDTO.setMemberId(getLoginUser(token).getMemberId());
        return ApiResponse.success("查询成功",approveService.getHomeDataPC(noticesDTO));
    }

    @ApiOperation("任务中心分页")
    @PostMapping("/taskPage")
    public ApiResponse<PageData<Notices>> taskPage (@RequestBody PageWrap<NoticesDTO> pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformInterfaceLog.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;
@@ -60,7 +61,7 @@

    @ApiModelProperty(value = "地址信息")
    @ExcelColumn(name="地址信息")
    private Date url;
    private String url;

    @ApiModelProperty(value = "请求参数")
    @ExcelColumn(name="请求参数")
@@ -86,4 +87,11 @@
    @ExcelColumn(name="关联对象编码（多个用英文逗号隔开）")
    private String objId;

    @ApiModelProperty(value = "开始时间")
    @TableField(exist = false)
    private Date startDate;

    @ApiModelProperty(value = "结束时间")
    @TableField(exist = false)
    private Date endDate;
}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ApproveService.java

@@ -5,6 +5,7 @@
import com.doumee.dao.business.dto.ApproveDTO;
import com.doumee.dao.business.model.Approve;
import com.doumee.dao.business.vo.ApproveDataVO;
import com.doumee.dao.system.dto.NoticesDTO;
import com.doumee.dao.web.response.InternalHomeVO;

import java.util.List;
@@ -105,7 +106,9 @@
     * @param memberId
     * @return
     */
    InternalHomeVO getHomeData(Integer memberId,Integer isDetail);
    InternalHomeVO getHomeDataH5(Integer memberId,Integer isDetail);

    InternalHomeVO getHomeDataPC(NoticesDTO noticesDTO);

    void createApproveFlow(Integer tempType,Integer businessId,Integer createMemberId);


 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java

@@ -18,6 +18,7 @@
import com.doumee.dao.business.join.VisitsJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.ApproveDataVO;
import com.doumee.dao.system.dto.NoticesDTO;
import com.doumee.dao.system.join.NoticesJoinMapper;
import com.doumee.dao.system.model.Notices;
import com.doumee.dao.system.model.SystemUser;
@@ -240,7 +241,7 @@
     * @return
     */
    @Override
    public InternalHomeVO getHomeData(Integer memberId,Integer isDetail){
    public InternalHomeVO getHomeDataH5(Integer memberId,Integer isDetail){
        InternalHomeVO internalHomeVO = new InternalHomeVO();
        internalHomeVO.setHomeImg(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.HOME_IMAGE).getCode());
        //任务数据
@@ -280,6 +281,47 @@
    }


    @Override
    public InternalHomeVO getHomeDataPC(NoticesDTO noticesDTO){
        InternalHomeVO internalHomeVO = new InternalHomeVO();
        internalHomeVO.setHomeImg(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.HOME_IMAGE).getCode());
        //任务数据
        List<Notices> noticesList = noticesJoinMapper.
                selectList(new QueryWrapper<Notices>().lambda()
                        .ge(noticesDTO.getStartDate() != null, Notices::getCreateDate, Utils.Date.getStart(noticesDTO.getStartDate() ))
                        .le(noticesDTO.getEndDate() != null,  Notices::getCreateDate, Utils.Date.getEnd(noticesDTO.getEndDate() ))
                        .eq(Notices::getUserId,noticesDTO.getMemberId()).orderByDesc(Notices::getCreateDate)
                );
        internalHomeVO.setTaskNum(noticesList.size());
            if(CollectionUtils.isNotEmpty(noticesList)){
                //待我处理的数据
                internalHomeVO.setNoticeWaitNum(
                        noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),noticesDTO.getMemberId())
                                &&Constants.equalsInteger(i.getStatus(),Constants.ZERO)
                                &&Constants.equalsInteger(i.getSendacopy(),Constants.ZERO)
                        ).count()
                );
                internalHomeVO.setNoticeDealNum(
                        noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),noticesDTO.getMemberId())
                                &&Constants.equalsInteger(i.getStatus(),Constants.ONE)
                                &&Constants.equalsInteger(i.getSendacopy(),Constants.ZERO)
                        ).count()
                );

                internalHomeVO.setNoticeCreateNum(
                        noticesJoinMapper.selectCount(new QueryWrapper<Notices>().lambda().eq(Notices::getParam3,noticesDTO.getMemberId()))
                );

                internalHomeVO.setNoticeCopyNum(
                        noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),noticesDTO.getMemberId())
                                &&Constants.equalsInteger(i.getSendacopy(),Constants.ONE)
                        ).count()
                );
            }

        return internalHomeVO;
    }

    /**
     * åˆ›å»ºå®¡æ‰¹æµç¨‹
     * @param tempType æ¨¡æ¿ç±»åž‹  0非施工人员访客申请 1施工人员访客申请 2访客报备 3公车市内用车 4公车室外用车 5市公司物流车预约

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java

@@ -10,6 +10,7 @@
import com.doumee.dao.business.ApproveParamMapper;
import com.doumee.dao.business.ApproveTemplMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.ApproveParamDataVO;
import com.doumee.service.business.ApproveTemplService;
@@ -17,6 +18,7 @@
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.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,7 +44,7 @@
    @Autowired
    private ApproveParamMapper approveParamMapper;
    @Autowired
    private MemberMapper memberMapper;
    private MemberJoinMapper memberJoinMapper;

    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
@@ -161,8 +163,12 @@
            );
            for (ApproveParam approveParam :approveParamList) {
                if(StringUtils.isNotBlank(approveParam.getObjIds())){
                    approveParam.setMemberList(memberMapper.selectList(new QueryWrapper<Member>()
                            .lambda().eq(Member::getIsdeleted,Constants.ZERO).in(Member::getId,approveParam.getObjIds().split(","))));
                    approveParam.setMemberList(memberJoinMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
                            .selectAll(Member.class)
                            .selectAs(Company::getName,Member::getCompanyName)
                            .leftJoin(Company.class,Company::getId,Member::getCompanyId)
                            .eq(Member::getIsdeleted,Constants.ZERO)
                            .in(Member::getId,approveParam.getObjIds().split(","))));
                }
            }
            model.setParamList(approveParamList);

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java

@@ -123,7 +123,7 @@
                multifileMapper.insert(multifile);
            }
        }
        String title = "[隐患随手拍]提报人-"+hiddenDanger.getLoginUserInfo().getRealname();
        String title = "【隐患随手拍】提报人 - "+hiddenDanger.getLoginUserInfo().getRealname();
        //json数据
        Map<String,Object> jsonMap = new HashMap<>();
        jsonMap.put("area", "发现区域:" + hiddenDangerParam.getName());

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformInterfaceLogServiceImpl.java

@@ -106,23 +106,18 @@
                .eq(pageWrap.getModel().getIsdeleted() != null, PlatformInterfaceLog::getIsdeleted, pageWrap.getModel().getIsdeleted())
                .eq(pageWrap.getModel().getRemark() != null, PlatformInterfaceLog::getRemark, pageWrap.getModel().getRemark())
                .eq(pageWrap.getModel().getType() != null, PlatformInterfaceLog::getType, pageWrap.getModel().getType())
                .eq(pageWrap.getModel().getName() != null, PlatformInterfaceLog::getName, pageWrap.getModel().getName())
                .ge(pageWrap.getModel().getUrl() != null, PlatformInterfaceLog::getUrl, Utils.Date.getStart(pageWrap.getModel().getUrl()))
                .le(pageWrap.getModel().getUrl() != null, PlatformInterfaceLog::getUrl, Utils.Date.getEnd(pageWrap.getModel().getUrl()))
                .like(pageWrap.getModel().getName() != null, PlatformInterfaceLog::getName, pageWrap.getModel().getName())
                .like(pageWrap.getModel().getUrl() != null, PlatformInterfaceLog::getUrl, pageWrap.getModel().getUrl())
                .eq(pageWrap.getModel().getRequest() != null, PlatformInterfaceLog::getRequest, pageWrap.getModel().getRequest())
                .eq(pageWrap.getModel().getRepose() != null, PlatformInterfaceLog::getRepose, pageWrap.getModel().getRepose())
                .eq(pageWrap.getModel().getSuccess() != null, PlatformInterfaceLog::getSuccess, pageWrap.getModel().getSuccess())
                .eq(pageWrap.getModel().getPlat() != null, PlatformInterfaceLog::getPlat, pageWrap.getModel().getPlat())
                .eq(pageWrap.getModel().getObjType() != null, PlatformInterfaceLog::getObjType, pageWrap.getModel().getObjType())
                .eq(pageWrap.getModel().getObjId() != null, PlatformInterfaceLog::getObjId, pageWrap.getModel().getObjId())
                .ge(pageWrap.getModel().getStartDate() != null,PlatformInterfaceLog::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getStartDate()))
                .le(pageWrap.getModel().getEndDate() != null,PlatformInterfaceLog::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getEndDate()))
                .orderByDesc(PlatformInterfaceLog::getCreateDate);
        ;
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        return PageData.from(platformInterfaceLogMapper.selectPage(page, queryWrapper));
    }


 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TrainTimeServiceImpl.java

@@ -193,7 +193,7 @@
            //查询全部相关方人员信息
            List<Member> list =  memberJoinMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
                    .selectAll(Member.class)
                    .leftJoin(Company.class,Company::getId,Member::getId)
                    .leftJoin(Company.class,Company::getId,Member::getCompanyId)
                    .eq(Company::getType,Constants.ZERO)
//                    .in(Company::getId,loginUserInfo.getCompanyIdList() )
                    .eq(Member::getIsdeleted, com.doumee.core.utils.Constants.ZERO));