From 27fff67070616dacd6c5af18d07a988d28a04de7 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 02 九月 2025 17:35:58 +0800
Subject: [PATCH] 个人记事本新增结束时间
---
zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountServiceImpl.java | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 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 d728150..046f112 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
@@ -4,22 +4,23 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fasterxml.jackson.annotation.JsonFormat;
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.domain.ZfProperty;
+import com.ruoyi.domain.ZInfoUser;
+import com.ruoyi.domain.ZProperty;
import com.ruoyi.mapper.TravelCountMapper;
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.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -37,12 +38,13 @@
@Autowired
private TravelCountService travelCountService;
-
+ @Autowired
+ ZInfoUserService zInfoUserService;
@Override
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());
@@ -60,6 +62,21 @@
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);
resultPage.getRecords().forEach(this::inputTotalData);
@@ -94,20 +111,21 @@
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)));
}
--
Gitblit v1.9.1