From aed1ef97d6ae1d3961b9a57c767758c9d34e1b93 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 04 三月 2024 14:01:15 +0800
Subject: [PATCH] ERP接口
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 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 0120b49..df96abb 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
@@ -55,7 +55,8 @@
@Override
public void deleteById(Integer id) {
- retentionMapper.deleteById(id);
+ retentionMapper.update(null,new UpdateWrapper<Retention>().lambda().set(Retention::getIsdeleted,Constants.ONE).eq(Retention::getId,id));
+// retentionMapper.deleteById(id);
}
@Override
@@ -200,20 +201,25 @@
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());
+ if(StringUtils.isNotBlank(obj.getFaceImg())){
+ obj.setFaceImgFull(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode()
+ +dataMap.get(Constants.MEMBER_IMG).getCode()
+ +obj.getFaceImg());
+ }
+ if(Objects.nonNull(obj.getType())){
+ if(!obj.getType().equals(Constants.memberType.visitor)){
+ obj.setExcelCompanyName(obj.getCompanyName());
+ }else{
+ obj.setExcelCompanyName(obj.getVisitCompanyName());
+ }
+ }
});
}
return PageData.from(retentionIPage);
}
- /**
- * 瀵煎嚭
- *
- * @param pageWrap 鍒嗛〉瀵硅薄
- * @return PageData<RetentionVo>
- */
+
+ @Override
public List<RetentionVo> findPageExcel(PageWrap<Retention> pageWrap) {
IPage<Retention> retentionInfo = getDataInfo(pageWrap);
List<RetentionVo> retentionVoList = new ArrayList<>();
@@ -235,6 +241,7 @@
vo.setName(obj.getName());
vo.setPhone(obj.getPhone());
vo.setIdcardNo(obj.getIdcardNo());
+ vo.setDeviceName(obj.getDeviceName());
vo.setEventDate(obj.getEventDate());
retentionVoList.add(vo);
}
@@ -253,21 +260,24 @@
IPage<Retention> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Retention> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- queryWrapper.leftJoin(Company.class,Company::getId,Retention::getId);
+ queryWrapper.leftJoin(Company.class,Company::getId,Retention::getCompanyId);
queryWrapper.selectAll(Retention.class)
- .selectAs(Company::getName,Retention::getCompanyName);
- queryWrapper.like(number,Retention::getPhone,pageWrap.getModel().getKeyWords())
+ .selectAs(Company::getName,Retention::getCompanyName)
+ .select(" ( SELECT v.company_name FROM visits v WHERE v.member_id = t.member_id and v.status = "+Constants.VisitStatus.signin+" ORDER BY create_date DESC limit 1 ) as visitCompanyName ");
+ queryWrapper.eq(Retention::getIsdeleted,Constants.ZERO)
+ .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())
+ .and(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
+ p-> p.like(Company::getName, pageWrap.getModel().getCompanyName())
+ .or()
+ .exists(" select 1 from visits v where v.member_id = t.member_id and v.company_name like '%"+pageWrap.getModel().getCompanyName()+"%' and v.status = "+Constants.VisitStatus.signin+""))
.ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
Retention::getEventDate,pageWrap.getModel().getStartTime())
.le(Objects.nonNull(pageWrap.getModel().getEndTime()),
- Retention::getEventDate,pageWrap.getModel().getStartTime());
+ Retention::getEventDate,pageWrap.getModel().getEndTime());
queryWrapper.orderByDesc(Retention::getCreateDate);
IPage<Retention> retentionIPage = retentionJoinMapper.selectJoinPage(page, Retention.class, queryWrapper);
return retentionIPage;
--
Gitblit v1.9.3