From 9f2c35bcddcd835efc25ed53d3a9c8816781bb5f Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期二, 27 二月 2024 14:36:42 +0800 Subject: [PATCH] ERP接口 --- server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java | 84 ++++++++++++++++++++++++++++++----------- 1 files changed, 61 insertions(+), 23 deletions(-) diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java index 7b3865d..9189ccb 100644 --- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java +++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java @@ -13,6 +13,7 @@ import com.doumee.dao.business.model.*; import com.doumee.dao.system.SystemDictDataMapper; import com.doumee.dao.system.model.SystemDictData; +import com.doumee.dao.system.vo.RetentionVo; import com.doumee.service.business.RetentionService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -193,7 +194,54 @@ @Override public PageData<Retention> findTrainTimePage(PageWrap<Retention> pageWrap) { + IPage<Retention> retentionIPage = getDataInfo(pageWrap); + if(null != retentionIPage && retentionIPage.getRecords().size() > 0) { + List<String> codes = Arrays.asList(Constants.FTP_RESOURCE_PATH,Constants.MEMBER_IMG); + List<SystemDictData> list = systemDictDataMapper.list(codes); + Map<String,SystemDictData> dataMap = list.stream().collect(Collectors.toMap(SystemDictData::getLabel, Function.identity())); + retentionIPage.getRecords().stream().forEach(obj->{ + if(StringUtils.isNotBlank(obj.getFaceImg())){ + obj.setFaceImgFull(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode() + +dataMap.get(Constants.MEMBER_IMG).getCode() + +obj.getFaceImg()); + } + }); + } + return PageData.from(retentionIPage); + } + + @Override + public List<RetentionVo> findPageExcel(PageWrap<Retention> pageWrap) { + IPage<Retention> retentionInfo = getDataInfo(pageWrap); + List<RetentionVo> retentionVoList = new ArrayList<>(); + if(null != retentionInfo && retentionInfo.getRecords().size() > 0) { + for (Retention obj:retentionInfo.getRecords()) { + RetentionVo vo = new RetentionVo(); + vo.setCompanyName(obj.getCompanyName()); + if(null != obj.getType()) { + if(Constants.ZERO == obj.getType()){ + vo.setTypeName(Constants.Status.LW_FK.getDes()); + }else if(Constants.ONE == obj.getType()) { + vo.setTypeName(Constants.Status.PT_FK.getDes()); + }else { + vo.setTypeName(Constants.Status.NB_FK.getDes()); + } + }else { + vo.setTypeName(""); + } + vo.setName(obj.getName()); + vo.setPhone(obj.getPhone()); + vo.setIdcardNo(obj.getIdcardNo()); + vo.setDeviceName(obj.getDeviceName()); + vo.setEventDate(obj.getEventDate()); + retentionVoList.add(vo); + } + } + return retentionVoList; + } + + private IPage<Retention> getDataInfo(PageWrap<Retention> pageWrap) { //鏄惁鏄暟瀛� boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords()); //鏄惁鍖呭惈涓枃 @@ -206,31 +254,21 @@ Utils.MP.blankToNull(pageWrap.getModel()); queryWrapper.leftJoin(Company.class,Company::getId,Retention::getId); queryWrapper.selectAll(Retention.class) - .selectAs(Company::getName,Retention::getCompanyName); + .selectAs(Company::getName,Retention::getCompanyName); queryWrapper.like(number,Retention::getPhone,pageWrap.getModel().getKeyWords()) - .like((b||hasWord),Retention::getName,pageWrap.getModel().getKeyWords()) - .eq(Objects.nonNull(pageWrap.getModel().getType()), - Retention::getType, - pageWrap.getModel().getType()) - .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()), - Company::getName, - pageWrap.getModel().getCompanyName()) - .ge(Objects.nonNull(pageWrap.getModel().getStartTime()), - Retention::getEventDate,pageWrap.getModel().getStartTime()) - .le(Objects.nonNull(pageWrap.getModel().getEndTime()), - Retention::getEventDate,pageWrap.getModel().getStartTime()); + .like((b||hasWord),Retention::getName,pageWrap.getModel().getKeyWords()) + .eq(Objects.nonNull(pageWrap.getModel().getType()), + Retention::getType, + pageWrap.getModel().getType()) + .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()), + Company::getName, + pageWrap.getModel().getCompanyName()) + .ge(Objects.nonNull(pageWrap.getModel().getStartTime()), + Retention::getEventDate,pageWrap.getModel().getStartTime()) + .le(Objects.nonNull(pageWrap.getModel().getEndTime()), + Retention::getEventDate,pageWrap.getModel().getStartTime()); queryWrapper.orderByDesc(Retention::getCreateDate); IPage<Retention> retentionIPage = retentionJoinMapper.selectJoinPage(page, Retention.class, queryWrapper); - if(null != retentionIPage && retentionIPage.getRecords().size() > 0) { - List<String> codes = Arrays.asList(Constants.FTP_RESOURCE_PATH,Constants.MEMBER_IMG); - List<SystemDictData> list = systemDictDataMapper.list(codes); - Map<String,SystemDictData> dataMap = list.stream().collect(Collectors.toMap(SystemDictData::getLabel, Function.identity())); - retentionIPage.getRecords().stream().forEach(obj->{ - obj.setFaceImg(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode() - +dataMap.get(Constants.MEMBER_IMG).getCode() - +obj.getFaceImg()); - }); - } - return PageData.from(retentionIPage); + return retentionIPage; } } -- Gitblit v1.9.3