最新版本541200007

jiangping

2025-03-20 3a38c84a8d021600ad555ce8e2b0b03b69d274d5

最新版本541200007

 admin/src/views/business/deviceEvent.vue

@@ -80,7 +80,8 @@
        <el-table-column prop="devName" label="门禁名称" min-width="100px"></el-table-column>
        <el-table-column prop="srcName" label="门禁点" min-width="110px"></el-table-column>
        <el-table-column prop="eventTypeName" label="事件类型" min-width="100px"></el-table-column>
        <el-table-column label="出入类型" min-width="100px">
        <el-table-column label="出入类型" min-width="100px">WMS作业已完成

          <template slot-scope="{row}">
            <span v-if="row.extEventInOut === 1">进</span>
            <span v-if="row.extEventInOut != 1">出</span>
@@ -93,9 +94,6 @@
            </el-image>
          </template>
        </el-table-column>



      </el-table>
      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
      </pagination>

 admin/src/views/business/retention.vue

@@ -72,7 +72,7 @@
            <span>{{ row.deviceName || '-' }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="eventDate" label="进场时间" min-width="140px"></el-table-column>
        <el-table-column prop="eventDate" label="最后进场时间" min-width="140px"></el-table-column>
        <el-table-column label="人脸照片" min-width="100px">
          <template slot-scope="{ row }">
            <el-image v-if="row.faceImgFull != null" style="width: 80px; height: 80px" :src="row.faceImgFull"

 admin/src/views/business/retentionCars.vue

@@ -51,7 +51,7 @@
      </ul>
      <el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="createDate" label="进场时间" min-width="150px"></el-table-column>
        <el-table-column prop="createDate" label="最后进场时间" min-width="150px"></el-table-column>
        <el-table-column prop="carNo" label="车牌号" min-width="100px"></el-table-column>
        <el-table-column prop="companyName" label="组织" min-width="250px">
          <template slot-scope="{ row }">

 admin/src/views/operation/danger/record.vue

@@ -68,7 +68,7 @@
        <el-table-column prop="content" label="问题描述" min-width="150px"></el-table-column>
        <el-table-column prop="memberName" label="提报人" min-width="80px"></el-table-column>
        <el-table-column prop="companyName" show-overflow-tooltip label="所属组织" min-width="150px"></el-table-column>
        <el-table-column prop="createDate" label="提报时间" min-width="150px"></el-table-column>
        <el-table-column prop="submitTime" label="提报时间" min-width="150px"></el-table-column>
        <el-table-column label="处理结果" min-width="100px">
          <template slot-scope="{row}">
            <span class="status-blue" v-if="row.status === 0">待处理</span>
@@ -76,7 +76,9 @@
            <span class="status-red" v-if="row.status === 2">已退回</span>
          </template>
        </el-table-column>
<!--
        <el-table-column prop="editDate" label="操作时间" min-width="150px"></el-table-column>
-->
        <!-- <el-table-column label="操作" min-width="180" fixed="right"> -->
        <el-table-column prop="dealTime" label="处理时间" min-width="150px"></el-table-column>
<!--

 server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java

@@ -1582,7 +1582,7 @@
                            .replace("{会议主题}",StringUtils.defaultString(bookings.getName(),""))
                            .replace("{会议室名称}",StringUtils.defaultString(bookings.getRoomName(),""))
                            .replace("{会议时间段}",StringUtils.defaultString(timeInfo,""))
                            .replace("{会议备注}",StringUtils.defaultString(bookings.getRemark(),"")));
                            .replace("{会议备注}",StringUtils.defaultString(bookings.getRemark(),"无")));
                    smsEmailList.add(smsEmail);
                }
            }
@@ -1608,7 +1608,7 @@
                            .replace("{参会人员姓名}",StringUtils.defaultString(systemUser.getRealname(),""))
                            .replace("{会议主题}",StringUtils.defaultString(bookings.getName(),""))
                            .replace("{会议室名称}",StringUtils.defaultString(bookings.getRoomName(),""))
                            .replace("{会议备注}",StringUtils.defaultString(bookings.getRemark(),""))
                            .replace("{会议备注}",StringUtils.defaultString(bookings.getRemark(),"无"))
                            .replace("{会议时间段}",StringUtils.defaultString(timeInfo,"")));
                    smsEmailList.add(smsEmail);
                }

 server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java

@@ -20,7 +20,7 @@
    @GetMapping("/timer/empower/syncEmpowerResultData")
    ApiResponse syncEmpowerResultData();
    @ApiOperation("【访客系统】定时重新下发失败的授权数据")
    @GetMapping("/timer/empower/syncEmpowerFailData")
    @GetMapping("/timeempowerr//syncEmpowerFailData")
     ApiResponse syncEmpowerFailData();
    @ApiOperation("【访客系统】定时刷新人员设备授权")
    @GetMapping("/timer/empower/syncEmpowerData")

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

@@ -476,8 +476,8 @@

                .and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getName,pageWrap.getModel().getMemberName())
                        .or().like(Member::getPhone,pageWrap.getModel().getMemberName()))
                .ge(Objects.nonNull(pageWrap.getModel().getQueryStartTime()), HiddenDanger::getCreateDate,pageWrap.getModel().getQueryStartTime())
                .le(Objects.nonNull(pageWrap.getModel().getQueryEndTime()),HiddenDanger::getCreateDate,pageWrap.getModel().getQueryEndTime())
                .ge(Objects.nonNull(pageWrap.getModel().getQueryStartTime()), HiddenDanger::getSubmitTime,pageWrap.getModel().getQueryStartTime())
                .le(Objects.nonNull(pageWrap.getModel().getQueryEndTime()),HiddenDanger::getSubmitTime,pageWrap.getModel().getQueryEndTime())
                .orderByDesc(Visits::getCreateDate)
        ;
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {

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

@@ -606,7 +606,7 @@
        saveUserActionBiz(member,loginUserInfo,Constants.UserActionType.DELETE,userActionJoinMapper,JSONObject.toJSONString(member));
        List<Cars> carsList = carsMapper.selectList(new QueryWrapper<Cars>().lambda()
                .eq(Cars::getMemberId,member.getId())
                .eq(Cars::getIsdeleted,Constants.ONE)
                .eq(Cars::getIsdeleted,Constants.ZERO)
                .eq(Cars::getAuthStatus,Constants.ONE)//已授权包期的车辆
        );
        if ((carsMapper!=null && carsList.size()>0)){

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

@@ -185,22 +185,23 @@
        if(finishAnswerDTO.getUseType().equals(Constants.ZERO)&&StringUtils.isNotBlank(finishAnswerDTO.getUserId())){
            Member member = memberMapper.selectById(finishAnswerDTO.getUserId());
            if(Objects.isNull(member)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到劳务人员");
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到访客人员");
            }
            if(!member.getType().equals(Constants.memberType.driver)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非劳务人员类型，答题失败");
            }
            /*if(!member.getType().equals(Constants.memberType.driver)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非访客人员类型，答题失败");
            }*/
            if(!member.getStatus().equals(Constants.ZERO)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，账号已经" + (member.getStatus().equals(Constants.ONE)?"禁用":"拉黑/删除") );
            }
            problemLog.setName(member.getName());
            problemLog.setPhone(member.getPhone());
            problemLog.setCompanyId(member.getCompanyId());
            Company company = companyMapper.selectById(member.getCompanyId());
            problemLog.setCompanyName(member.getVisitCompanyName());
           /* Company company = companyMapper.selectById(member.getCompanyId());
            if(Objects.isNull(company)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到劳务人员公司");
            }
            problemLog.setCompanyName(company.getName());
            problemLog.setCompanyName(company.getName());*/
        }
        this.problemLogMapper.insert(problemLog);
        return problemLog.getId();