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 | 105 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 80 insertions(+), 25 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 75a1043..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
@@ -3,8 +3,9 @@
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.dao.business.vo.RetentionCarsVO;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.RetentionMapper;
@@ -54,8 +55,9 @@
@Override
public void deleteById(Integer id) {
- retentionMapper.update(null,new UpdateWrapper<Retention>().lambda().set(Retention::getIsdeleted,Constants.ONE).eq(Retention::getId,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,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()
@@ -216,6 +226,48 @@
}
return PageData.from(retentionIPage);
}
+ @Override
+ public PageData<RetentionCarsVO> findPageForCars(PageWrap<RetentionCarsVO> pageWrap) {
+ IPage<RetentionCarsVO> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ MPJLambdaWrapper<Retention> queryWrapper = new MPJLambdaWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ queryWrapper.select(Retention::getId,Retention::getCarNo,Retention::getCreateDate,Retention::getCarType,Retention::getType)
+ .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->{
+ w.like( Member::getPhone,pageWrap.getModel().getKeyWords())
+ .or().like( Member::getName,pageWrap.getModel().getKeyWords()); })
+ .eq(Retention::getType,3)
+ .eq(Retention::getIsdeleted,Constants.ZERO)
+ .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())
+ .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()),
+ Retention::getCreateDate,pageWrap.getModel().getEndTime());
+ queryWrapper.orderByDesc(Retention::getCreateDate);
+ IPage<RetentionCarsVO> retentionIPage = retentionJoinMapper.selectJoinPage(page, RetentionCarsVO.class, queryWrapper);
+ if(retentionIPage!=null && retentionIPage.getRecords()!=null){
+ for(RetentionCarsVO model : retentionIPage.getRecords()){
+ model.setCompanyName(StringUtils.defaultString(model.getCompanyName(),model.getVisitCompanyName()));
+ }
+ }
+ return PageData.from(retentionIPage);
+ }
@Override
@@ -226,16 +278,13 @@
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());
+ vo.setTypeName(Constants.Status.COMPANY_TYPE_FK.getDes());
+ if(null != obj.getCompanyType()) {
+ if(Constants.ZERO == obj.getCompanyType()){
+ vo.setTypeName(Constants.Status.COMPANY_TYPE_REL.getDes());
+ }else if(Constants.ONE == obj.getCompanyType()) {
+ vo.setTypeName(Constants.Status.COMPANY_TYPE_INTERNAL.getDes());
}
- }else {
- vo.setTypeName("");
}
vo.setName(obj.getName());
vo.setPhone(obj.getPhone());
@@ -248,13 +297,13 @@
return retentionVoList;
}
- private IPage<Retention> getDataInfo(PageWrap<Retention> pageWrap) {
+ private IPage<Retention> getDataInfo(PageWrap<Retention> pageWrap) {
//鏄惁鏄暟瀛�
- boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
- //鏄惁鍖呭惈涓枃
- boolean b = Validator.hasChinese(pageWrap.getModel().getKeyWords());
- //鏄惁鍖呭惈鑻辨枃
- boolean hasWord = ReUtil.contains(PatternPool.WORD, pageWrap.getModel().getKeyWords());
+// boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
+// //鏄惁鍖呭惈涓枃
+// boolean b = Validator.hasChinese(pageWrap.getModel().getKeyWords());
+// //鏄惁鍖呭惈鑻辨枃
+// boolean hasWord = ReUtil.contains(PatternPool.WORD, pageWrap.getModel().getKeyWords());
IPage<Retention> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Retention> queryWrapper = new MPJLambdaWrapper<>();
@@ -263,19 +312,25 @@
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)
- .like(number,Retention::getPhone,pageWrap.getModel().getKeyWords())
- .like((b||hasWord),Retention::getName,pageWrap.getModel().getKeyWords())
+ .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()); })
.eq(Objects.nonNull(pageWrap.getModel().getType()),
Retention::getType,
pageWrap.getModel().getType())
.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