server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/LaborEmpowerDTO.java
@@ -25,7 +25,6 @@ @ApiModelProperty(value = "ç»ææ¶é´") private Date endTime; @ApiModelProperty(value = "ä¸åæ¹å¼") private Integer sendType; server/dmvisit_service/src/main/java/com/doumee/dao/admin/request/VisitEventQuery.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,41 @@ package com.doumee.dao.admin.request; import com.doumee.core.annotation.excel.ExcelColumn; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; /** * @author T14 */ @Data @ApiModel("访客/è½¦è¾ æ¥è¯¢") public class VisitEventQuery { @ApiModelProperty(value = "车çå·") private String carNo; @ApiModelProperty(value = "å§å/ææºå·") private String keyWords; @ApiModelProperty(value = "å ¬å¸/é¨é¨åç§°") private String companyName; @ApiModelProperty(value = "人åç±»å") private String memberType; @ApiModelProperty(value = "äºä»¶æºç±»å") @ExcelColumn(name="äºä»¶æºç±»å") private String srcType; @ApiModelProperty(value = "äºä»¶ç±»å") private String eventType; @ApiModelProperty(value = "å¼å§æ¶é´") private Date startTime; @ApiModelProperty(value = "ç»ææ¶é´") private Date endTime; } server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarEventDTO.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,176 @@ package com.doumee.dao.admin.response; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; import java.util.Date; /** * @author T14 */ @Data @ApiModel("å车åºäºä»¶æ¨éè®°å½è¡¨") public class CarEventDTO { @ApiModelProperty(value = "主é®") private Integer id; @ApiModelProperty(value = "å建人ç¼ç ") private Integer creator; @ApiModelProperty(value = "å建æ¶é´") private Date createDate; @ApiModelProperty(value = "æ´æ°äººç¼ç ") private Integer editor; @ApiModelProperty(value = "æ´æ°æ¶é´") @JsonFormat(pattern = "yyyy-MM-dd") private Date editDate; @ApiModelProperty(value = "æ¯å¦å é¤0å¦ 1æ¯") private Integer isdeleted; @ApiModelProperty(value = "夿³¨") private String remark; @ApiModelProperty(value = "äºä»¶å¯ä¸æ è¯ï¼åä¸äºä»¶è¥ä¸æ¥å¤æ¬¡ï¼å䏿¥äºä»¶çeventIdç¸å") private String eventId; @ApiModelProperty(value = "äºä»¶æºç¼å·ï¼ç©çè®¾å¤æ¯èµæºç¼å·") private String srcIndex; @ApiModelProperty(value = "äºä»¶æºç±»å") private String srcType; @ApiModelProperty(value = "äºä»¶æºåç§°") private String srcName; @ApiModelProperty(value = "äºä»¶ç±»å") private String eventType; @ApiModelProperty(value = "äºä»¶ç¶æ,0-ç¬æ¶ 1-å¼å§2-忢4-äºä»¶èå¨ç»ææ´æ°5-äºä»¶å¾ç弿¥ä¸ä¼ ") private Integer status; @ApiModelProperty(value = "èå²è¶ æ¶æ¶é´") private String timeout; @ApiModelProperty(value = "äºä»¶åçæ¶é´ï¼è®¾å¤æ¶é´") private String happenTime; @ApiModelProperty(value = "äºä»¶åççäºä»¶æºç¶è®¾å¤") private String srcParentIndex; @ApiModelProperty(value = "æ¯å¦é»ååæ è¯ï¼1-é»åå 0-éé»ååï¼") private String alarmCar; @ApiModelProperty(value = "车è¾å±æ§åç§°") private String carAttributeName; @ApiModelProperty(value = "å¡å·") private String cardNo; /**å ³è人åä¿¡æ¯**/ @ApiModelProperty(value = "ææºå·") private String personPhone; @ApiModelProperty(value = "人åç±»å") private String personType; @ApiModelProperty(value = "人å身份è¯å·") private String personIdcardDecode; @ApiModelProperty(value = "人åç»ç»å ¬å¸") private String personCompanyName; @ApiModelProperty(value = "å§å") private String personName; @ApiModelProperty(value = "äºä»¶å·,1:å线äºä»¶2:ä¸ä¼ å¾ç3:å ¥åº4:åºåº5:车çç«æ£6:å¾çéä¼ ") private Integer eventCmd; @ApiModelProperty(value = "äºä»¶ç¼å·") private String eventIndex; @ApiModelProperty(value = "åºå ¥å£ç¼å·") private String gateIndex; @ApiModelProperty(value = "åºå ¥å£åç§°") private String gateName; @ApiModelProperty(value = "æ¾è¡æé") private Integer releaseAuth; @ApiModelProperty(value = "æ¾è¡åå ") private Integer releaseReason; @ApiModelProperty(value = "æ¾è¡ç»æ") private Integer releaseResult; @ApiModelProperty(value = "æ°ä½ç³»æ¾è¡ç»æ") private Integer releaseResultEx; @ApiModelProperty(value = "æ¾è¡æ¹å¼") private Integer releaseWay; @ApiModelProperty(value = "è¿åºåºç±»åï¼0ï¼è¿åºï¼1ï¼åºåº") private Integer inoutType; @ApiModelProperty(value = "车çå·") private String plateNos; @ApiModelProperty(value = "车è¾ä¸»åç") private Integer mainLogo; @ApiModelProperty(value = "å车åºç¼å·") private String parkIndex; @ApiModelProperty(value = "å车åºåç§°") private String parkName; @ApiModelProperty(value = "车çé¢è²") private String plateColor; @ApiModelProperty(value = "车ç置信度") private BigDecimal plateBelieve; @ApiModelProperty(value = "车çç±»å") private Integer plateType; @ApiModelProperty(value = "车éç¼å·") private String roadwayIndex; @ApiModelProperty(value = "车éåç§°") private String roadwayName; @ApiModelProperty(value = "车éç±»å 1ï¼å ¥åºè½¦é 2ï¼åºåºä¸æ¶è´¹è½¦é 3ï¼åºåºç¼´è´¹è½¦é 4ï¼ä¸å¤®ç¼´è´¹è½¦é") private Integer roadwayType; @ApiModelProperty(value = "车è¾ååç") private Integer subLogo; @ApiModelProperty(value = "ååç年款") private Integer subModel; @ApiModelProperty(value = "æ¶é´ ISOæ ¼å¼") private String timestr; @ApiModelProperty(value = "车è¾å±æ§") private Integer vehicleClass; @ApiModelProperty(value = "车è¾é¢è²") private Integer vehicleColor; @ApiModelProperty(value = "车è¾ç±»å") private Integer vehicleType; @ApiModelProperty(value = "车è¾å¾ç") private String vehiclePicUrl; @ApiModelProperty(value = "车çå¾ç") private String platePicUrl; @ApiModelProperty(value = "å¾çæå¡å¨ç¼å·") private String svrIndex; } server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/ProblemDTO.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,35 @@ package com.doumee.dao.admin.response; import com.doumee.core.annotation.excel.ExcelColumn; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; /** * @author T14 */ @Data @ApiModel("è¯é¢ä¿¡æ¯è¡¨") public class ProblemDTO { @ApiModelProperty(value = "é¢ç®") private String title; @ApiModelProperty(value = "é项éå") private String options; @ApiModelProperty(value = "æ£ç¡®çæ¡") private String answer; @ApiModelProperty(value = "æåºç ") private Integer sortnu; @ApiModelProperty(value = "ç±»å 0åé 1å¤é ") private Integer type; @ApiModelProperty(value = "åå¼") private BigDecimal score; } server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/VisitEventDTO.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,134 @@ package com.doumee.dao.admin.response; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; /** * @author T14 */ @Data @ApiModel("访客äºä»¶æ¨éè®°å½è¡¨") public class VisitEventDTO { @ApiModelProperty(value = "主é®") private Integer id; @ApiModelProperty(value = "å建人ç¼ç ") private Integer creator; @ApiModelProperty(value = "å建æ¶é´") private Date createDate; @ApiModelProperty(value = "æ´æ°äººç¼ç ") private Integer editor; @ApiModelProperty(value = "æ´æ°æ¶é´") private Date editDate; @ApiModelProperty(value = "æ¯å¦å é¤0å¦ 1æ¯") private Integer isdeleted; @ApiModelProperty(value = "夿³¨") private String remark; @ApiModelProperty(value = "äºä»¶å¯ä¸æ è¯ï¼åä¸äºä»¶è¥ä¸æ¥å¤æ¬¡ï¼å䏿¥äºä»¶çeventIdç¸å") private String eventId; @ApiModelProperty(value = "äºä»¶æºç¼å·ï¼ç©çè®¾å¤æ¯èµæºç¼å·") private String srcIndex; @ApiModelProperty(value = "äºä»¶æºç±»å") private String srcType; @ApiModelProperty(value = "äºä»¶æºåç§°") private String srcName; @ApiModelProperty(value = "äºä»¶ç±»å") private String eventType; @ApiModelProperty(value = "äºä»¶ç¶æ,0-ç¬æ¶1-å¼å§2-忢4-äºä»¶èå¨ç»ææ´æ°5-äºä»¶å¾ç弿¥ä¸ä¼ ") private Integer status; @ApiModelProperty(value = "èå²è¶ æ¶æ¶é´") private String timeout; @ApiModelProperty(value = "äºä»¶åçæ¶é´ï¼è®¾å¤æ¶é´") private String happenTime; @ApiModelProperty(value = "äºä»¶åççäºä»¶æºç¶è®¾å¤") private String srcParentIndex; @ApiModelProperty(value = "访客Isï¼,对åºè®¿å®¢æ¥è®¿è®°å½ä¸çorderIdåæ®µ") private String visitorId; @ApiModelProperty(value = "ææºå·") private String personPhone; @ApiModelProperty(value = "人åç±»å") private String personType; @ApiModelProperty(value = "人å身份è¯å·") private String personIdcardDecode; @ApiModelProperty(value = "人åç»ç»å ¬å¸") private String personCompanyName; @ApiModelProperty(value = "å§å") private String personName; @ApiModelProperty(value = "æ§å« 1-ç·2-女") private Integer sex; @ApiModelProperty(value = "è¯ä»¶ç±»å 111身份è¯") private String idType; @ApiModelProperty(value = "è¯ä»¶å· ") private String idNo; @ApiModelProperty(value = "被访é®äººå§å") private String beVisitedPersonName; @ApiModelProperty(value = "被访é®äººæå±ç»ç»") private String beVisitedPersonOrg; @ApiModelProperty(value = "æ¥è®¿åä½") private String visitorWorkUint; @ApiModelProperty(value = "访客éªè¯ç ") private String visitorCode; @ApiModelProperty(value = "æ¥è®¿äºç±") private String purpose; @ApiModelProperty(value = "è¯ä»¶ç¾åæºå ³") private String signOrg; @ApiModelProperty(value = "ç¦»å¼æ¶é´") private String startTime; @ApiModelProperty(value = "ææºå·ç ") private String endTime; @ApiModelProperty(value = "车çå·") private String carNo; @ApiModelProperty(value = "ç §çuri") private String photoUrl; @ApiModelProperty(value = "ææå¾uri") private String captureUrl; @ApiModelProperty(value = "å¾çå卿å¡å¨å¯ä¸æ è¯") private String svrIndexCode; @ApiModelProperty(value = "被访é®äººid") private String beVisitedPersonId; @ApiModelProperty(value = "被访é®äººæå±ç»ç»id") private String beVisitedPersonOrgId; } server/dmvisit_service/src/main/java/com/doumee/dao/business/join/CarEventJoinMapper.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,12 @@ package com.doumee.dao.business.join; import com.doumee.dao.business.model.CarEvent; import com.github.yulichang.base.mapper.MPJJoinMapper; import org.springframework.stereotype.Repository; /** * @author T14 */ @Repository public interface CarEventJoinMapper extends MPJJoinMapper<CarEvent> { } server/dmvisit_service/src/main/java/com/doumee/dao/business/join/VisitEventJoinMapper.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,12 @@ package com.doumee.dao.business.join; import com.doumee.dao.business.model.VisitEvent; import com.github.yulichang.base.mapper.MPJJoinMapper; import org.springframework.stereotype.Repository; /** * @author T14 */ @Repository public interface VisitEventJoinMapper extends MPJJoinMapper<VisitEvent> { } server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Problems.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 io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -30,6 +31,11 @@ @ExcelColumn(name="å建人ç¼ç ") private Integer creator; @ApiModelProperty(value = "å建人åç§°") @ExcelColumn(name="å建人åç§°") @TableField(exist = false) private String creatorName; @ApiModelProperty(value = "å建æ¶é´") @ExcelColumn(name="å建æ¶é´") @JsonFormat(pattern = "yyyy-MM-dd") server/dmvisit_service/src/main/java/com/doumee/service/business/CarEventService.java
@@ -2,6 +2,8 @@ import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.dao.admin.request.VisitEventQuery; import com.doumee.dao.admin.response.CarEventDTO; import com.doumee.dao.business.model.CarEvent; import java.util.List; @@ -93,4 +95,12 @@ * @return long */ long count(CarEvent carEvent); /** * å页æ¥è¯¢ * * @param pageWrap å页对象 * @return PageData<CarEvent> */ PageData<CarEventDTO> findVisitCarPage(PageWrap<VisitEventQuery> pageWrap); } server/dmvisit_service/src/main/java/com/doumee/service/business/ProblemsService.java
@@ -94,4 +94,11 @@ * @return long */ long count(Problems problems); /** * è·åä¸åç¨æ·ç±»åçé¢ç® * @param useType * @return */ List<Problems> findListByUseType(Integer useType); } server/dmvisit_service/src/main/java/com/doumee/service/business/VisitEventService.java
@@ -2,6 +2,8 @@ import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.dao.admin.request.VisitEventQuery; import com.doumee.dao.admin.response.VisitEventDTO; import com.doumee.dao.business.model.VisitEvent; import java.util.List; @@ -94,4 +96,15 @@ * @return long */ long count(VisitEvent visitEvent); /** * å页æ¥è¯¢ * * @param pageWrap å页对象 * @return PageData<VisitEvent> */ PageData<VisitEventDTO> findVisitPage(PageWrap<VisitEventQuery> pageWrap); } server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
@@ -1,15 +1,23 @@ package com.doumee.service.business.impl; import cn.hutool.core.lang.PatternPool; import cn.hutool.core.lang.Validator; import cn.hutool.core.util.ReUtil; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Utils; import com.doumee.dao.admin.request.VisitEventQuery; import com.doumee.dao.admin.response.CarEventDTO; import com.doumee.dao.business.CarEventMapper; import com.doumee.dao.business.model.CarEvent; import com.doumee.dao.business.join.CarEventJoinMapper; import com.doumee.dao.business.model.*; import com.doumee.service.business.CarEventService; 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; @@ -26,6 +34,9 @@ @Autowired private CarEventMapper carEventMapper; @Autowired private CarEventJoinMapper carEventJoinMapper; @Override public Integer create(CarEvent carEvent) { @@ -250,4 +261,49 @@ QueryWrapper<CarEvent> wrapper = new QueryWrapper<>(carEvent); return carEventMapper.selectCount(wrapper); } @Override public PageData<CarEventDTO> findVisitCarPage(PageWrap<VisitEventQuery> pageWrap) { //æ¯å¦æ¯æ°å boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords()); //æ¯å¦å å«ä¸æ boolean b = Validator.hasChinese(pageWrap.getModel().getKeyWords()); //æ¯å¦å å«è±æ boolean hasWord = ReUtil.contains(PatternPool.WORD, pageWrap.getModel().getKeyWords()); IPage<VisitEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity()); MPJLambdaWrapper<CarEvent> queryWrapper = new MPJLambdaWrapper<>(); Utils.MP.blankToNull(pageWrap.getModel()); queryWrapper.leftJoin(Cars.class,Cars::getCode,CarEvent::getPlateNos) .leftJoin(Member.class,Member::getId,Cars::getMemberId) .leftJoin(Company.class,Company::getId,Member::getCompanyId); queryWrapper.selectAll(CarEvent.class) .selectAs(Member::getType,CarEventDTO::getPersonType) .selectAs(Member::getPhone,CarEventDTO::getPersonPhone) .selectAs(Member::getIdcardDecode,CarEventDTO::getPersonIdcardDecode) .selectAs(Member::getName,CarEventDTO::getPersonName) .selectAs(Company::getName,CarEventDTO::getPersonCompanyName); queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCarNo()), CarEvent::getCardNo, pageWrap.getModel().getCarNo()) .like(number, Member::getPhone, pageWrap.getModel().getKeyWords()) .like((b || hasWord), Member::getPhone, pageWrap.getModel().getKeyWords()) .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()), Company::getName, pageWrap.getModel().getCompanyName()) .eq(StringUtils.isNotBlank(pageWrap.getModel().getMemberType()), Member::getType, pageWrap.getModel().getMemberType()) .eq(StringUtils.isNotBlank(pageWrap.getModel().getSrcType()), CarEvent::getSrcType, pageWrap.getModel().getSrcType()); IPage<CarEventDTO> carEventDTOIPage = carEventJoinMapper.selectJoinPage(page, CarEventDTO.class, queryWrapper); return PageData.from(carEventDTOIPage); } } server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceEventServiceImpl.java
@@ -320,10 +320,10 @@ .ge(Objects.nonNull(pageWrap.getModel().getStartTime()), DeviceEvent::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getStartTime())) .le(Objects.nonNull(pageWrap.getModel().getStartTime()), .le(Objects.nonNull(pageWrap.getModel().getEndTime()), DeviceEvent::getCreateDate, Utils.Date.getDayEnd(pageWrap.getModel().getEndTime())); queryWrapper.orderByDesc(DeviceEvent::getHappenTime); IPage<DeviceEventDTO> deviceEventDTOIPage = deviceEventJoinMapper.selectJoinPage(page, DeviceEventDTO.class, queryWrapper); return PageData.from(deviceEventDTOIPage); } server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java
@@ -133,13 +133,8 @@ if (pageWrap.getModel().getUseType() != null) { queryWrapper.lambda().eq(Problems::getUseType, pageWrap.getModel().getUseType()); } for(PageWrap.SortData sortData: pageWrap.getSorts()) { if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) { queryWrapper.orderByDesc(sortData.getProperty()); } else { queryWrapper.orderByAsc(sortData.getProperty()); } } queryWrapper.lambda().orderByAsc(Problems::getCreateDate); queryWrapper.select("problems.*, (select REALNAME from system_user where system_user.id = problems.CREATOR) as creatorName"); return PageData.from(problemsMapper.selectPage(page, queryWrapper)); } @@ -148,4 +143,10 @@ QueryWrapper<Problems> wrapper = new QueryWrapper<>(problems); return problemsMapper.selectCount(wrapper); } @Override public List<Problems> findListByUseType(Integer useType) { return null; } } server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
@@ -1,20 +1,32 @@ package com.doumee.service.business.impl; import cn.hutool.core.lang.PatternPool; import cn.hutool.core.lang.Validator; import cn.hutool.core.util.ReUtil; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Utils; import com.doumee.dao.admin.request.VisitEventQuery; import com.doumee.dao.admin.response.VisitEventDTO; import com.doumee.dao.business.VisitEventMapper; import com.doumee.dao.business.join.VisitEventJoinMapper; import com.doumee.dao.business.model.Company; import com.doumee.dao.business.model.DeviceEvent; import com.doumee.dao.business.model.Member; import com.doumee.dao.business.model.VisitEvent; import com.doumee.service.business.VisitEventService; 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 +38,9 @@ @Autowired private VisitEventMapper visitEventMapper; @Autowired private VisitEventJoinMapper visitEventJoinMapper; @Override public Integer create(VisitEvent visitEvent) { @@ -211,4 +226,55 @@ QueryWrapper<VisitEvent> wrapper = new QueryWrapper<>(visitEvent); return visitEventMapper.selectCount(wrapper); } @Override public PageData<VisitEventDTO> findVisitPage(PageWrap<VisitEventQuery> pageWrap) { //æ¯å¦æ¯æ°å boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords()); //æ¯å¦å å«ä¸æ boolean b = Validator.hasChinese(pageWrap.getModel().getKeyWords()); //æ¯å¦å å«è±æ boolean hasWord = ReUtil.contains(PatternPool.WORD, pageWrap.getModel().getKeyWords()); IPage<VisitEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity()); MPJLambdaWrapper<VisitEvent> queryWrapper = new MPJLambdaWrapper<>(); queryWrapper.leftJoin(Member.class,Member::getId,VisitEvent::getVisitorId) .leftJoin(Company.class,Company::getId,Member::getCompanyId); queryWrapper.selectAll(VisitEvent.class) .selectAs(Member::getPhone,VisitEventDTO::getPersonPhone) .selectAs(Member::getType,VisitEventDTO::getPersonType) .selectAs(Member::getIdcardDecode,VisitEventDTO::getPersonIdcardDecode) .selectAs(Company::getName,VisitEventDTO::getPersonCompanyName); queryWrapper.like(number, Member::getPhone, pageWrap.getModel().getKeyWords()) .like((b ||hasWord), Member::getPhone, pageWrap.getModel().getKeyWords()) .like(StringUtils.isNotBlank(pageWrap.getModel().getCarNo()), Member::getPhone, pageWrap.getModel().getKeyWords()) .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()), Company::getName, pageWrap.getModel().getCompanyName()) .eq(StringUtils.isNotBlank(pageWrap.getModel().getSrcType()), VisitEvent::getSrcType, pageWrap.getModel().getSrcType()) .eq(StringUtils.isNotBlank(pageWrap.getModel().getEventType()), VisitEvent::getEventType, pageWrap.getModel().getEventType()) .ge(Objects.nonNull(pageWrap.getModel().getStartTime()), VisitEvent::getHappenTime, Utils.Date.getStart(pageWrap.getModel().getStartTime())) .le(Objects.nonNull(pageWrap.getModel().getEndTime()), VisitEvent::getHappenTime, Utils.Date.getDayEnd(pageWrap.getModel().getEndTime())); queryWrapper.orderByDesc(VisitEvent::getHappenTime); IPage<VisitEventDTO> visitEventDTOIPage = visitEventJoinMapper.selectJoinPage(page, VisitEventDTO.class, queryWrapper); return PageData.from(visitEventDTOIPage); } }