From 5de5db24efe1b25896c37f395124a207584bcb38 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期四, 01 一月 2026 21:25:54 +0800
Subject: [PATCH] 修改了对应代码
---
archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java | 67 +++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 13 deletions(-)
diff --git a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java
index 8e31b4c..db56713 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java
@@ -15,13 +15,13 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ArchiveRecords;
-import com.ruoyi.domain.Archiverecordstouser;
import com.ruoyi.domain.vo.AnalysisResult;
import com.ruoyi.domain.vo.ArchiveInfoVo;
import com.ruoyi.domain.vo.ArchiveRecordSmall;
import com.ruoyi.mapper.ArchiveRecordsMapper;
import com.ruoyi.mapper.ArchiverecordstouserMapper;
import com.ruoyi.service.IArchiveRecordsService;
+import com.ruoyi.service.IArchiverecordstouserService;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -41,6 +41,9 @@
// @Autowired
// private ArchiveRecordsMapper archiveRecordsMapper;
+
+ @Autowired
+ private IArchiverecordstouserService archiverecordstouserService;
@Autowired
private ArchiverecordstouserMapper archiverecordstouserMapper;
@@ -130,9 +133,29 @@
// .eq(zfProperty.getHappenTime()!=null,ZfProperty::getHappenTime,zfProperty.getHappenTime())
// .between(zfProperty.getHappenStartTime() != null && zfProperty.getHappenEndTime() != null, ZfProperty::getHappenTime, zfProperty.getHappenStartTime(), zfProperty.getHappenEndTime());
// lqw.orderByDesc(ZfProperty::getCreateTime);
- if(userId==1)
+ if(archiveRecords.getOrderByColumn()==null) {
+ if (userId == 1)
- lqw.orderByDesc(ArchiveRecords::getCreateTime);
+ lqw.orderByDesc(ArchiveRecords::getCreateTime);
+ }else
+ {
+ System.out.println(archiveRecords.getOrderByColumn());
+ if("recordId".equals(archiveRecords.getOrderByColumn())) {
+ if (archiveRecords.getIsAsc().equals("asc"))
+ lqw.orderByAsc(ArchiveRecords::getRecordId);
+ else
+ lqw.orderByDesc(ArchiveRecords::getRecordId);
+ }
+ if("recordStatus".equals(archiveRecords.getOrderByColumn()))
+ {
+ if (archiveRecords.getIsAsc().equals("asc"))
+ lqw.orderByAsc(ArchiveRecords::getRecordStatus);
+ else
+ lqw.orderByDesc(ArchiveRecords::getRecordStatus);
+ }
+ }
+ // else
+ // lqw.eq(userId!=null, ArchiveRecords::getUserId, userId);
System.out.println("ssssssssssssddd0000000000000000");
return lqw;
@@ -160,8 +183,11 @@
Page<ArchiveRecords> page = new Page<>(pageNum, pageSize);
// 浣跨敤鑷畾涔夌殑鍒嗛〉鏌ヨ鏂规硶锛屽厛杩炴帴鍐嶅垎椤�
- Page<ArchiveRecords> pageResult = this.baseMapper.selectJoinUserPage(page, userid, lqw);
-
+ Page<ArchiveRecords> pageResult = new Page<>();
+ if(userid==1)
+ pageResult = this.baseMapper.selectJoinUserPage(page, userid, lqw);
+ else
+ pageResult = this.baseMapper.selectJoinCommonUserPage(page, userid, lqw);
//selectJoinUserPage(page, lqw);
@@ -172,11 +198,12 @@
// log.info("浠庢暟鎹簱涓煡鍒扮殑涓�:{}", beanRecords);
// return markOwnData(familyId, fatherFaId, motherFaId, beanRecords);
-
+ List<ArchiveRecords> beanUserRecords = new ArrayList<>();
beanRecords.forEach(record ->{
if(record.isArchiveRecordsId()!=null&&record.getUserId()==userid)
{
record.setOwnData(true);
+ beanUserRecords.add(record);
}
else
record.setOwnData(false);
@@ -184,7 +211,11 @@
//涓嶆槸绠＄悊鍛樿繘琛屾帓搴�
// if(userid != 1)
// Collections.sort(beanRecords, Comparator.comparing(ArchiveRecords::isOwnData));
- HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
+ HashMap<String, Object> data = new HashMap<>();
+ if(userid==1)
+ data = MapUtils.getResult(pageResult, beanRecords);
+ else
+ data = MapUtils.getResult(pageResult, beanUserRecords);
// System.out.println(data.get("data"));
// System.out.println(data.get("pageNum"));
// System.out.println(data.get("total"));
@@ -373,14 +404,24 @@
@Override
public int updateArchiveById(String status, Long id) {
- this.baseMapper.updateStatusById(status, id);
+ LocalDateTime time = LocalDateTime.now();
+
+ Date date = Date.from(time.atZone(ZoneId.systemDefault()).toInstant());
+ // 鑾峰彇褰撳墠鐢ㄦ埛ID
+ Long userId = SecurityUtils.getUserId();
+ // 鍙互鍦ㄨ繖閲屼娇鐢╱serId杩涜鎺堟潈鎿嶄綔
+ archiverecordstouserService.deleteArchiverecordstouserByRecordId(id, userId);
+ this.baseMapper.updateStatusById(status, id, date);
return 0;
}
@Override
public int updateStatusByIds(Long[] ids) {
+ LocalDateTime time = LocalDateTime.now();
+
+ Date date = Date.from(time.atZone(ZoneId.systemDefault()).toInstant());
for(Long id : ids)
- this.baseMapper.updateStatusById("褰曞叆瀹屾垚",id);
+ this.baseMapper.updateStatusById("褰曞叆瀹屾垚",id, date);
return 0;
}
@@ -394,14 +435,13 @@
}
+ @Override
public AjaxResult mySave(ArchiveRecords archiveRecords) {
-
-
- //妫�鏌ユ槸鍚︽湁閲嶅鏁版嵁鎻掑叆
+ // 妫�鏌ユ槸鍚︽湁閲嶅鏁版嵁鎻掑叆
LambdaQueryWrapper<ArchiveRecords> lqw = new LambdaQueryWrapper<>();
lqw.eq(!StringUtils.isEmpty(archiveRecords.getRecordId()), ArchiveRecords::getRecordId,archiveRecords.getRecordId());
List<ArchiveRecords> list = list(lqw);
- if (list.size() > 0) {
+ if (!list.isEmpty()) {
// throw new RuntimeException("璇峰嬁鏂板閲嶅鏁版嵁");
//濡傛灉鏈夐噸澶嶆暟鎹紝鍒欐牴鎹畆ecordId杩涜鏁版嵁淇敼
// if()
@@ -430,3 +470,4 @@
return this.baseMapper.whether(recordId);
}
}
+
--
Gitblit v1.9.1