From 9a35e2e3bded439bec2625055860c6f48e52efa7 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期一, 19 一月 2026 10:22:51 +0800
Subject: [PATCH] 旅游修改为家族模块
---
zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountServiceImpl.java | 170 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 130 insertions(+), 40 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 4a34a1e..16ea477 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
@@ -6,25 +6,24 @@
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.core.domain.entity.EsModel;
import com.ruoyi.common.utils.MapUtils;
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 com.ruoyi.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.time.LocalDateTime;
+import java.util.*;
import java.util.stream.Collectors;
+
+import static com.ruoyi.constant.MenuAuthority.*;
/**
* <p>
@@ -44,55 +43,130 @@
private TravelCountService travelCountService;
@Autowired
ZInfoUserService zInfoUserService;
+
+ @Resource
+ ZAuthorityService zAuthorityService;
+
+
+
@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);
- if(travelCount!=null){
- lqw.like(travelCount.getName()!=null,TravelCount::getName,travelCount.getName());
- lqw.like(travelCount.getDestination()!=null,TravelCount::getDestination,travelCount.getDestination());
- lqw.like(travelCount.getProperty()!=null,TravelCount::getProperty,travelCount.getProperty());
- lqw.like(travelCount.getManner()!=null,TravelCount::getManner,travelCount.getManner());
- lqw.like(travelCount.getName()!=null,TravelCount::getName,travelCount.getName());
- 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);
+ //瑕佹煡鑷繁瀹跺涵鐨�
+ ZInfoUser myself = zInfoUserService.getMyself();
+ if (myself == null) {
+ // System.out.println("ssssss");
+ return AjaxResult.success("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
}
- lqw.orderByDesc(TravelCount::getCreateTime);
+ Long familyId = myself.getFamilyId();
+ //鏌ョ湅鐖舵瘝鐨勬暟鎹細
+ Long fatherFaId = 0L;
+ if(myself.getFatherId()!=null)
+ fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId();
+ Long motherFaId = 0L;
+ if(myself.getMomId()!=null)
+ motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId();
- 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;
+ //涔熻鏌ュ埆浜烘巿鏉冪殑
+ List<ZAuthority> authority = zAuthorityService.getAuthority();
+ List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(TRAVEL_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
+ //鍔犱笂鑷繁瀹跺涵鐨刬d
+ idList.add(familyId);
+
+ //鍔犱笂鐖舵瘝瀹舵棌id
+ idList.add(fatherFaId);
+ idList.add(motherFaId);
+ List<Long> fms = zInfoUserService.findByUaidToFaid(myself.getUaid()).stream().map(ZInfoUser::getFamilyId).collect(Collectors.toList());
if(!fms.isEmpty())
- lqw = lqw.in(TravelCount::getUid, fms);
- else
- lqw.eq(TravelCount::getUid,userId);
-// else
-// lqw = buildCondition(zProperty, userId);
+ {
+ idList.addAll(fms);
+ }
+ LambdaQueryWrapper<TravelCount> lqw = buildCondition(travelCount, idList);
- Page<TravelCount> resultPage = page(new Page<>(pageNum, pageSize), lqw);
- resultPage.getRecords().forEach(this::inputTotalData);
- return AjaxResult.success(MapUtils.getResult(resultPage));
+ Page<TravelCount> travelCountPage = new Page<>(pageNum, pageSize);
+ Page<TravelCount> pageResult = page(travelCountPage, lqw);
+
+ List<TravelCount> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
+ HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
+ return AjaxResult.success(data);
}
+ @Override
+ public AjaxResult addData(TravelCount travelCount) {
+ ZInfoUser myself = zInfoUserService.getMyself();
+ Long familyId = myself.getFamilyId();
+
+ if (familyId == null) {
+ throw new RuntimeException("鎮ㄨ繕鏈姞鍏ヤ换浣曞搴�");
+ }
+
+ List<ZAuthority> authority = zAuthorityService.getAuthority();
+ List<Long> familyIdList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(TRAVEL_LIST_ADD)).map(ZAuthority::getFid).collect(Collectors.toList());
+ familyIdList.add(familyId);
+
+ if (travelCount.getFamilyId() != null && !familyIdList.contains(travelCount.getFamilyId())) {
+ throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
+ }
+
+
+ if (travelCount.getFamilyId() == null) {
+ //榛樿娣诲姞鑷繁瀹跺涵鐨勬暟鎹�
+ travelCount.setFamilyId(familyId);
+ }
+
+ if (save(travelCount)) {
+ return AjaxResult.success();
+ } else {
+ return AjaxResult.error();
+ }
+ }
+
+ @Override
+ public AjaxResult updateData(TravelCount travelCount) {
+ ZInfoUser myself = zInfoUserService.getMyself();
+ Long familyId = myself.getFamilyId();
+
+ //鍏堟牴鎹甶d鏌ヨ鍑烘暟鎹殑familyId锛岀湅鐪嬫湁娌℃湁鏉冮檺鎿嶄綔
+ Long dataFamilyId = getById(travelCount.getId()).getFamilyId();
+
+ List<ZAuthority> authority = zAuthorityService.getAuthority();
+ List<Long> familyIdList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(TRAVEL_LIST_UPDATE)).map(ZAuthority::getFid).collect(Collectors.toList());
+ familyIdList.add(familyId);
+
+ if (dataFamilyId != null && !familyIdList.contains(dataFamilyId)) {
+ throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
+ }
+
+
+ if (updateById(travelCount)) {
+ return AjaxResult.success();
+ } else {
+ return AjaxResult.error();
+ }
+ }
/**
* 鎵归噺鍒犻櫎缁熻琛ㄦ暟鎹�
*/
@Override
@Transactional
public void removeData(List<Long> list) {
+
+ List<TravelCount> dataList = this.listByIds(list);
+
+ ZInfoUser myself = zInfoUserService.getMyself();
+ Long familyId = myself.getFamilyId();
+
+ List<ZAuthority> authority = zAuthorityService.getAuthority();
+ List<Long> familyIdList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(TRAVEL_LIST_REMOVE)).map(ZAuthority::getFid).collect(Collectors.toList());
+ familyIdList.add(familyId);
+
+ for (TravelCount data : dataList) {
+ if (!familyIdList.contains(data.getFamilyId())) {
+ throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
+ }
+ }
//鍦ㄥ垹闄ょ粺璁¤〃鏁版嵁涔嬪墠锛岃鍏堝垹闄ゆ槑缁嗚〃鐨勬暟鎹�
travelDetailService.removeBatchByCid(list);
@@ -139,6 +213,22 @@
LambdaQueryWrapper<TravelCount> lqw = new LambdaQueryWrapper<>();
lqw.orderByDesc(TravelCount::getCreateTime);
+ lqw.in(familyIdList != null,TravelCount::getFamilyId, familyIdList);
+ lqw.orderByDesc(TravelCount::getCreateTime);
+
+
+
+ lqw.like(travelCount.getName()!=null,TravelCount::getName,travelCount.getName());
+ lqw.like(travelCount.getDestination()!=null,TravelCount::getDestination,travelCount.getDestination());
+ lqw.like(travelCount.getProperty()!=null,TravelCount::getProperty,travelCount.getProperty());
+ lqw.like(travelCount.getManner()!=null,TravelCount::getManner,travelCount.getManner());
+ lqw.like(travelCount.getName()!=null,TravelCount::getName,travelCount.getName());
+ lqw.like(travelCount.getName()!=null,TravelCount::getName,travelCount.getName());
+ lqw.like(travelCount.getName()!=null,TravelCount::getName,travelCount.getName());
+
+
+
+
if (StringUtils.isNotEmpty(travelCount.getIsHide())) {
lqw.and(wrapper -> wrapper
--
Gitblit v1.9.1