From 3eb37463a952fb69d586769ca660886b956cb016 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 30 十二月 2025 12:24:40 +0800
Subject: [PATCH] 人物搜索 新加所有家族模块
---
zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountServiceImpl.java | 144 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 136 insertions(+), 8 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountServiceImpl.java
index 02ec17f..4a34a1e 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountServiceImpl.java
@@ -2,21 +2,29 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.MapUtils;
-import com.ruoyi.domain.TravelCount;
-import com.ruoyi.domain.TravelDetail;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.domain.*;
+import com.ruoyi.domain.dto.zfEventdto;
import com.ruoyi.mapper.TravelCountMapper;
+import com.ruoyi.service.ModuleSearchable;
import com.ruoyi.service.TravelCountService;
import com.ruoyi.service.TravelDetailService;
+import com.ruoyi.service.ZInfoUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -27,19 +35,20 @@
* @since 2023-10-06
*/
@Service
-public class TravelCountServiceImpl extends ServiceImpl<TravelCountMapper, TravelCount> implements TravelCountService {
+public class TravelCountServiceImpl extends ServiceImpl<TravelCountMapper, TravelCount> implements TravelCountService, ModuleSearchable {
@Autowired
private TravelDetailService travelDetailService;
@Autowired
private TravelCountService travelCountService;
-
+ @Autowired
+ ZInfoUserService zInfoUserService;
@Override
- public AjaxResult selectDataList(Long userId, Integer pageNum, Integer pageSize,TravelCount travelCount) {
+ public AjaxResult selectDataList(Long userId, Integer pageNum, Integer pageSize, TravelCount travelCount, String happenStartTime, String happenEndTime) {
//璁剧疆鏌ヨ鏉′欢
LambdaQueryWrapper<TravelCount> lqw = new LambdaQueryWrapper<>();
- lqw.eq(TravelCount::getUid,userId);
+ // lqw.eq(TravelCount::getUid,userId);
if(travelCount!=null){
lqw.like(travelCount.getName()!=null,TravelCount::getName,travelCount.getName());
lqw.like(travelCount.getDestination()!=null,TravelCount::getDestination,travelCount.getDestination());
@@ -49,7 +58,28 @@
lqw.like(travelCount.getName()!=null,TravelCount::getName,travelCount.getName());
lqw.like(travelCount.getName()!=null,TravelCount::getName,travelCount.getName());
}
+ if(happenStartTime!=null){
+ lqw.gt(TravelCount::getStartTime,happenStartTime);
+ }
+ if(happenEndTime!=null){
+ lqw.lt(TravelCount::getEndTime,happenEndTime);
+ }
+ lqw.orderByDesc(TravelCount::getCreateTime);
+
+
+ System.out.println("--sdfdsf000sfssssssssssssssssss");
+ //鏍规嵁userId鏌ヨ鍒癷nfouser鐨剈aid
+ ZInfoUser zInfoUser = zInfoUserService.getInfoBysysId(userId);
+ //鎷垮埌鎵�鏈夌殑sysid
+ List<Long> fms = zInfoUserService.findByUaidToFaid(zInfoUser.getUaid()).stream().map(ZInfoUser::getSysId).collect(Collectors.toList());
+// LambdaQueryWrapper<TravelCount> lqw;
+ if(!fms.isEmpty())
+ lqw = lqw.in(TravelCount::getUid, fms);
+ else
+ lqw.eq(TravelCount::getUid,userId);
+// else
+// lqw = buildCondition(zProperty, userId);
Page<TravelCount> resultPage = page(new Page<>(pageNum, pageSize), lqw);
@@ -85,21 +115,119 @@
double eatTotal = 0;
double stayTotal = 0;
double travelTotal = 0;
-
+ double shopTotal = 0;
//鎶婃墍鏈夎缁嗘暟鎹殑璐圭敤鍊肩疮鍔犺捣鏉�
for (TravelDetail detail : travelDetailList) {
entranceTotal+=detail.getEntrance();
eatTotal+=detail.getEat();
stayTotal+=detail.getStay();
travelTotal+=detail.getTravel();
+ shopTotal += detail.getShop();
}
travelCount.setEntranceTotal(entranceTotal);
travelCount.setEatTotal(eatTotal);
travelCount.setStayTotal(stayTotal);
travelCount.setTravelTotal(travelTotal);
-
+ travelCount.setShopTotal(shopTotal);
DecimalFormat df = new DecimalFormat("0.00");
travelCount.setTotalPrice(Double.parseDouble(df.format(entranceTotal+eatTotal+travelCount.getGroupTotal()+stayTotal+travelTotal)));
}
+
+
+ private LambdaQueryWrapper<TravelCount> buildCondition(TravelCount travelCount, List<Long> familyIdList) {
+ LambdaQueryWrapper<TravelCount> lqw = new LambdaQueryWrapper<>();
+ lqw.orderByDesc(TravelCount::getCreateTime);
+
+ if (StringUtils.isNotEmpty(travelCount.getIsHide())) {
+
+ lqw.and(wrapper -> wrapper
+ .ne(TravelCount::getIsHide, "鏄�")
+ .or()
+ .isNull(TravelCount::getIsHide)
+ );
+ }
+ if (travelCount.getHasAttachment() != null && travelCount.getHasAttachment().equals("鏄�")) {
+ lqw.apply("url IS NOT NULL AND url != ''");
+ }
+// lqw.in(StringUtils.isNotEmpty(travelCount.getCompanionList()),travelCount::getCompanion,travelCount.getCompanionList());
+// if (travelCount.getYear() != 0) {
+// System.out.println("pppppppppppppppppppppppppppppppppppppppppppppppppppp"+travelCount.getYear());
+// lqw.apply("YEAR(happen_time) = {0}", travelCount.getYear());
+// }
+
+ if (CollectionUtils.isNotEmpty(travelCount.getCompanionList())) {
+ List<String> companionList = travelCount.getCompanionList();
+
+ // 娓呯悊鍜屽幓閲�
+ companionList = companionList.stream()
+ .map(String::trim)
+ .filter(s -> !s.isEmpty())
+ .distinct()
+ .collect(Collectors.toList());
+
+ if (!companionList.isEmpty()) {
+ // 纭繚鎵�鏈夊弬涓庝汉閮藉湪companion瀛楁涓�
+ for (String companion : companionList) {
+ lqw.apply("FIND_IN_SET({0}, REPLACE(REPLACE(companion, ' ', ''), '锛�', ',')) > 0",
+ companion);
+ }
+ }
+ }
+
+ System.out.println("鏌ヨ鏉′欢: " + lqw.getCustomSqlSegment());
+
+ return lqw;
+ }
+
+ @Override
+ public String getModuleCode() {
+ return "鏃呮父";
+ }
+
+ @Override
+// @Cacheable(value = "economy_search", key = "T(String).format('2045_%s_%s_%s_%s',#companion != null ? #companion : 'null',#happenStartTime != null ? #happenStartTime.getTime() : 0,#happenEndTime != null ? #happenEndTime.getTime() : 0,#hasAttachment != null ? #hasAttachment : 'null')")
+ public List<?> search(String companion, Date happenStartTime, Date happenEndTime, String hasAttachment) {
+ TravelCount travelCount = new TravelCount();
+ travelCount.setCompanion(companion);
+
+
+ String[] split = companion.split(",");
+ List<String> list = Arrays.asList(split);
+
+ travelCount.setCompanionList(list);
+ travelCount.setHasAttachment(hasAttachment);
+ travelCount.setIsHide("鍚�");
+
+ System.out.println("[[[[[[[["+travelCount);
+
+ return dataList(travelCount);
+ }
+
+ public List<zfEventdto> dataList(TravelCount travelCount) {
+
+ LambdaQueryWrapper<TravelCount> lqw = buildCondition(travelCount, null);
+
+ List<TravelCount> beanRecords = list(lqw);
+
+
+
+ return encapData(beanRecords);
+ }
+
+ public List<zfEventdto> encapData(List<TravelCount> lis)
+ {
+ List<zfEventdto> daoRes = new ArrayList<>() ;
+ for(TravelCount obj : lis)
+ {
+ zfEventdto atd = new zfEventdto();
+ atd.setId(Math.toIntExact(obj.getId()));
+ atd.setModule("鏃呮父");
+ atd.setName(obj.getCompanion());
+ atd.setCreateTime(obj.getCreateTime());
+ daoRes.add(atd);
+ }
+ return daoRes;
+ }
+
}
--
Gitblit v1.9.1