admin/src/views/business/visits.vue
@@ -68,15 +68,15 @@ <el-table-column prop="status" fixed="right" label="状态" min-width="100px"> <template slot-scope="{row}"> <span style="color: rgba(245, 154, 35, 0.996);" v-if="row.status === 0">待提交审批</span> <span v-if="row.status === 1">审批中</span> <span v-if="row.status === 2">审核通过</span> <span style="color: red;" v-if="row.status === 3">审核不通过</span> <span v-if="row.status === 4">取消</span> <span v-if="row.status === 5">预约成功</span> <span v-if="row.status === 6">预约失败</span> <span v-if="row.status === 7">拜访中</span> <span v-if="row.status === 8">已签离</span> <span v-if="row.status === 9">已失效</span> <span v-if="row.status === 1" style="color: rgba(245, 154, 35, 0.996);">审批中</span> <span v-if="row.status === 2" style="color: rgba(245, 154, 35, 0.996);">审核通过</span> <span style="color: gray;" v-if="row.status === 3" >审核不通过</span> <span v-if="row.status === 4" style="color: gray">取消</span> <span v-if="row.status === 5" style="color: green">预约成功</span> <span v-if="row.status === 6" style="color: gray">预约失败</span> <span v-if="row.status === 7" style="color: green">拜访中</span> <span v-if="row.status === 8" style="color: red">已签离</span> <span v-if="row.status === 9" style="color: gray">已失效</span> </template> </el-table-column> <el-table-column server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
@@ -266,6 +266,9 @@ @ApiModelProperty(value = "关键字,姓名/手机号") @TableField(exist = false) private String keyWords; @ApiModelProperty(value = "公司/组织名称") @TableField(exist = false) private String companyName; @ApiModelProperty(value = "人员类型") @TableField(exist = false) server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
@@ -374,21 +374,23 @@ .selectAs(Member::getIdcardDecode,DeviceEventDTO::getPersonIdcardDecode) .selectAs(Device::getName,DeviceEventDTO::getDevName) .selectAs(Company::getName,DeviceEventDTO::getPersonCompanyName); queryWrapper.like(number, Member::getPhone, pageWrap.getModel().getKeyWords()) .like((b||hasWord),Member::getName, pageWrap.getModel().getKeyWords()) queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),w-> w.like(Member::getName,pageWrap.getModel().getKeyWords()).or().like(Member::getPhone,pageWrap.getModel().getKeyWords())) .eq(StringUtils.equals(pageWrap.getModel().getPersonType(),Constants.TWO+""), Member::getType, pageWrap.getModel().getPersonType()) .eq(Objects.nonNull(pageWrap.getModel().getEventType()), DeviceEvent::getEventType, pageWrap.getModel().getEventType()) .like(Objects.nonNull(pageWrap.getModel().getCompanyName()),Company::getName, pageWrap.getModel().getCompanyName()) .ge(Objects.nonNull(pageWrap.getModel().getStartTime()), DeviceEvent::getCreateDate, pageWrap.getModel().getStartTime()) .le(Objects.nonNull(pageWrap.getModel().getEndTime()), DeviceEvent::getCreateDate, pageWrap.getModel().getEndTime()) .isNull(!StringUtils.isNotBlank(pageWrap.getModel().getPersonType()) && !StringUtils.equals(pageWrap.getModel().getPersonType(),Constants.TWO+""),Member::getId)//除了内部人员都是外来访客 .isNull(StringUtils.isNotBlank(pageWrap.getModel().getPersonType()) && !StringUtils.equals(pageWrap.getModel().getPersonType(),Constants.TWO+""),Member::getId)//除了内部人员都是外来访客 .orderByDesc(DeviceEvent::getCreateDate); queryWrapper.orderByDesc(DeviceEvent::getHappenTime); IPage<DeviceEventDTO> deviceEventDTOIPage = deviceEventJoinMapper.selectJoinPage(page, DeviceEventDTO.class, queryWrapper);
