From 1c20c8231980a8d4b91688ff8641a06d3b2f68ab Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 14 十月 2025 16:34:22 +0800
Subject: [PATCH] 改bug
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
index a7b6d61..e3dbf9d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
@@ -202,6 +202,14 @@
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.setTypeName(Constants.Status.COMPANY_TYPE_FK.getDes());
+ if(null != obj.getCompanyType()) {
+ if(Constants.ZERO == obj.getCompanyType()){
+ obj.setTypeName(Constants.Status.COMPANY_TYPE_REL.getDes());
+ }else if(Constants.ONE == obj.getCompanyType()) {
+ obj.setTypeName(Constants.Status.COMPANY_TYPE_INTERNAL.getDes());
+ }
+ }
if(StringUtils.isNotBlank(obj.getFaceImg())){
obj.setFaceImgFull(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode()
+dataMap.get(Constants.MEMBER_IMG).getCode()
@@ -227,8 +235,10 @@
.leftJoin(Member.class,Member::getId,Retention::getMemberId)
.leftJoin(Member.class,Member::getId,Retention::getMemberId)
.leftJoin(Company.class,Company::getId,Member::getCompanyId)
+ .leftJoin(Category.class,Category::getId,Retention::getCategoryId)
.selectAs(Company::getCompanyNamePath,Retention::getCompanyName)
.selectAs(Member::getName,Retention::getName)
+ .selectAs(Category::getName,Retention::getCategoryName)
.selectAs(Member::getPhone,Retention::getPhone)
.selectAs(Member::getVisitCompanyName,Retention::getVisitCompanyName)
.and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),w->{
@@ -239,10 +249,12 @@
.and(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
p-> p.like(Company::getName, pageWrap.getModel().getCompanyName())
.or().like(Member::getVisitCompanyName, pageWrap.getModel().getCompanyName()))
- .eq(Objects.nonNull(pageWrap.getModel().getCarType()),
- Retention::getCarType,pageWrap.getModel().getCarType())
+// .eq(Objects.nonNull(pageWrap.getModel().getCarType()),
+// Retention::getCarType,pageWrap.getModel().getCarType())
.like(Objects.nonNull(pageWrap.getModel().getCarNo()),
Retention::getCarNo,pageWrap.getModel().getCarNo())
+ .like(Objects.nonNull(pageWrap.getModel().getCategoryName()),
+ Retention::getCategoryName,pageWrap.getModel().getCategoryName())
.ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
Retention::getCreateDate,pageWrap.getModel().getStartTime())
.le(Objects.nonNull(pageWrap.getModel().getEndTime()),
@@ -267,7 +279,7 @@
RetentionVo vo = new RetentionVo();
vo.setCompanyName(obj.getCompanyName());
vo.setTypeName(Constants.Status.COMPANY_TYPE_FK.getDes());
- if(null != obj.getType()) {
+ if(null != obj.getCompanyType()) {
if(Constants.ZERO == obj.getCompanyType()){
vo.setTypeName(Constants.Status.COMPANY_TYPE_REL.getDes());
}else if(Constants.ONE == obj.getCompanyType()) {
@@ -285,7 +297,7 @@
return retentionVoList;
}
- private IPage<Retention> getDataInfo(PageWrap<Retention> pageWrap) {
+ private IPage<Retention> getDataInfo(PageWrap<Retention> pageWrap) {
//鏄惁鏄暟瀛�
// boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
// //鏄惁鍖呭惈涓枃
@@ -300,8 +312,11 @@
queryWrapper.selectAll(Retention.class)
.selectAs(Company::getName,Retention::getCompanyName)
.selectAs(Company::getType,Retention::getCompanyType)
- .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)
+ .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 ")
+ .selectAs(Category::getBizType,Retention::getBizType)
+ .leftJoin(Category.class,Category::getId,Retention::getCategoryId)
+ .eq(Retention::getIsdeleted,Constants.ZERO)
+// .eq(Company::getIsdeleted,Constants.ZERO)
.and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),w->{
w.like( Retention::getPhone,pageWrap.getModel().getKeyWords())
.or().like( Retention::getName,pageWrap.getModel().getKeyWords()); })
@@ -311,9 +326,11 @@
.isNull(Objects.nonNull(pageWrap.getModel().getQueryUserType())&&Constants.equalsInteger(pageWrap.getModel().getQueryUserType(),Constants.ZERO),
Retention::getCompanyId)
.eq(Objects.nonNull(pageWrap.getModel().getQueryUserType())&&Constants.equalsInteger(pageWrap.getModel().getQueryUserType(),Constants.ONE),
- Company::getType,Constants.ZERO)
+ Retention::getType,Constants.FOUR)
.eq(Objects.nonNull(pageWrap.getModel().getQueryUserType())&&Constants.equalsInteger(pageWrap.getModel().getQueryUserType(),Constants.TWO),
- Company::getType,Constants.ONE)
+ Retention::getType,Constants.TWO)
+ .eq(Objects.nonNull(pageWrap.getModel().getBizType()),
+ Category::getBizType,pageWrap.getModel().getBizType())
//杩囨护杞﹁締鏁版嵁
.ne(Retention::getType,3)
.and(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
--
Gitblit v1.9.3