From 436b955086030caec4513022c1f5127470ad2b14 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期日, 28 十二月 2025 20:54:21 +0800
Subject: [PATCH] 修改了对应代码
---
archiveManager/src/main/java/com/ruoyi/service/impl/ArchiverecordstouserServiceImpl.java | 100 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 76 insertions(+), 24 deletions(-)
diff --git a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiverecordstouserServiceImpl.java b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiverecordstouserServiceImpl.java
index aa4d0cb..96d3b7a 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiverecordstouserServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiverecordstouserServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.service.impl;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
@@ -13,8 +14,11 @@
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.domain.ArchiveRecords;
import com.ruoyi.domain.Archiverecordstouser;
+import com.ruoyi.domain.vo.RecordToUserCount;
import com.ruoyi.mapper.ArchiverecordstouserMapper;
+import com.ruoyi.service.IArchiveRecordsService;
import com.ruoyi.service.IArchiverecordstouserService;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.service.ISysUserService;
@@ -23,7 +27,7 @@
/**
- * 銆愯濉啓鍔熻兘鍚嶇О銆慡ervice涓氬姟灞傚鐞�
+ * 銆愭。妗堝垎閰嶃�慡ervice涓氬姟灞傚鐞�
*
* @author ruoyi
* @date 2025-07-20
@@ -31,13 +35,15 @@
@Service
public class ArchiverecordstouserServiceImpl extends ServiceImpl<ArchiverecordstouserMapper, Archiverecordstouser> implements IArchiverecordstouserService
{
+ @Autowired
+ private IArchiveRecordsService archiveRecordsService;
@Autowired
private SysUserMapper userMapper;
@Autowired
private ISysUserService iSysUserService;
private LambdaQueryWrapper<Archiverecordstouser> buildCondition(Archiverecordstouser archiverecordstouser) {
LambdaQueryWrapper<Archiverecordstouser> lqw = new LambdaQueryWrapper<>();
- lqw.eq(!StringUtils.isEmpty(archiverecordstouser.getArchiveRecordsId()),Archiverecordstouser::getArchiveRecordsId, archiverecordstouser.getArchiveRecordsId());
+ lqw.eq(archiverecordstouser.getArchiveRecordsId()!=null,Archiverecordstouser::getArchiveRecordsId, archiverecordstouser.getArchiveRecordsId());
//淇濆瓨鐩稿叧鐢ㄦ埛鐨剈serId
List<Long> arr = new ArrayList<>();
@@ -59,7 +65,22 @@
@Override
- public int insertRecordToUsers(String recordId, Long[] userIds) {
+ public int insertRecordToUsers(Long recordId, Long[] userIds) {
+
+
+ //鎺堟潈鐢ㄦ埛鐨勫悕绉�,杩欎釜鏄珛妗堜汉
+ String name = "";
+ //鏍规嵁鐢ㄦ埛鍚嶆煡璇㈢敤鎴风浉鍏砳d
+ if(userIds.length>0) {
+ SysUser sysUser = new SysUser();
+ sysUser.setUserId(userIds[0]);
+
+ name = userMapper.selectUserById(userIds[0]).getUserName();
+ }
+ ArchiveRecords archiveRecords = new ArchiveRecords();
+ archiveRecords.setId(recordId);
+ archiveRecords.setLiPerson(name);
+ archiveRecordsService.updateArchiveRecords(archiveRecords);
// 鏂板鐢ㄦ埛涓庢鍗疯褰�
List<Archiverecordstouser> list = new ArrayList<Archiverecordstouser>();
for (Long userId : userIds)
@@ -106,10 +127,10 @@
return AjaxResult.success(data); }
/**
- * 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鏌ヨ銆愭。妗堝垎閰嶃��
*
- * @param id 銆愯濉啓鍔熻兘鍚嶇О銆戜富閿�
- * @return 銆愯濉啓鍔熻兘鍚嶇О銆�
+ * @param id 銆愭。妗堝垎閰嶃�戜富閿�
+ * @return 銆愭。妗堝垎閰嶃��
*/
@Override
public Archiverecordstouser selectArchiverecordstouserById(Long id)
@@ -118,30 +139,30 @@
}
@Override
- public boolean selectArchiveRecordUsers(String recordId) {
+ public boolean selectArchiveRecordUsers(Long recordId) {
LambdaQueryWrapper<Archiverecordstouser> lqw = new LambdaQueryWrapper<>();
- lqw.eq(!StringUtils.isEmpty(recordId),Archiverecordstouser::getArchiveRecordsId, recordId);
+ lqw.eq(recordId!=null,Archiverecordstouser::getArchiveRecordsId, recordId);
List<Archiverecordstouser> lis = list(lqw);
return !lis.isEmpty();
}
@Override
public List<Archiverecordstouser> selectArchiverecordstouserList(Archiverecordstouser archiverecordstouser) {
- return null;
+ return this.list();
}
/**
- * 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
+ * 鏌ヨ銆愭。妗堝垎閰嶃�戝垪琛�
*
- * @param archiverecordstouser 銆愯濉啓鍔熻兘鍚嶇О銆�
- * @return 銆愯濉啓鍔熻兘鍚嶇О銆�
+ * @param archiverecordstouser 銆愭。妗堝垎閰嶃��
+ * @return 銆愭。妗堝垎閰嶃��
*/
/**
- * 鏂板銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鏂板銆愭。妗堝垎閰嶃��
*
- * @param archiverecordstouser 銆愯濉啓鍔熻兘鍚嶇О銆�
+ * @param archiverecordstouser 銆愭。妗堝垎閰嶃��
* @return 缁撴灉
*/
@Override
@@ -151,9 +172,9 @@
}
/**
- * 淇敼銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 淇敼銆愭。妗堝垎閰嶃��
*
- * @param archiverecordstouser 銆愯濉啓鍔熻兘鍚嶇О銆�
+ * @param archiverecordstouser 銆愭。妗堝垎閰嶃��
* @return 缁撴灉
*/
@Override
@@ -163,9 +184,9 @@
}
/**
- * 鎵归噺鍒犻櫎銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鎵归噺鍒犻櫎銆愭。妗堝垎閰嶃��
*
- * @param ids 闇�瑕佸垹闄ょ殑銆愯濉啓鍔熻兘鍚嶇О銆戜富閿�
+ * @param ids 闇�瑕佸垹闄ょ殑銆愭。妗堝垎閰嶃�戜富閿�
* @return 缁撴灉
*/
@Override
@@ -175,9 +196,9 @@
}
/**
- * 鍒犻櫎銆愯濉啓鍔熻兘鍚嶇О銆戜俊鎭�
+ * 鍒犻櫎銆愭。妗堝垎閰嶃�戜俊鎭�
*
- * @param id 銆愯濉啓鍔熻兘鍚嶇О銆戜富閿�
+ * @param id 銆愭。妗堝垎閰嶃�戜富閿�
* @return 缁撴灉
*/
@Override
@@ -187,10 +208,10 @@
}
@Override
- public int deleteArchiverecordstouserByRecordId(String recordId, Long userId) {
+ public int deleteArchiverecordstouserByRecordId(Long recordId, Long userId) {
LambdaQueryWrapper<Archiverecordstouser> lqw = new LambdaQueryWrapper<>();
- lqw.eq(!StringUtils.isEmpty(recordId), Archiverecordstouser::getArchiveRecordsId, recordId)
+ lqw.eq(recordId!=null, Archiverecordstouser::getArchiveRecordsId, recordId)
.eq(userId!=null, Archiverecordstouser::getUserId, userId);
if(this.remove(lqw))
return 1;
@@ -199,9 +220,9 @@
}
@Override
- public int queryArchiverecordstouserByRecordId(String recordId, Long userId) {
+ public int queryArchiverecordstouserByRecordId(Long recordId, Long userId) {
LambdaQueryWrapper<Archiverecordstouser> lqw = new LambdaQueryWrapper<>();
- lqw.eq(!StringUtils.isEmpty(recordId), Archiverecordstouser::getArchiveRecordsId, recordId)
+ lqw.eq(recordId!=null, Archiverecordstouser::getArchiveRecordsId, recordId)
.eq(userId!=null, Archiverecordstouser::getUserId, userId);
List<Archiverecordstouser> lis = list(lqw);
@@ -210,4 +231,35 @@
else
return 0;
}
+
+ @Override
+ public AjaxResult countStatistic(String username, int pageNum, int pageSize) {
+ LambdaQueryWrapper<RecordToUserCount> lqw = new LambdaQueryWrapper<>();
+
+ if(username!=null)
+ lqw.like(!StringUtils.isEmpty(username), RecordToUserCount::getUserName, username);
+
+
+
+
+
+
+ Page<RecordToUserCount> page = new Page<>(pageNum, pageSize);
+
+ // 浣跨敤鑷畾涔夌殑鍒嗛〉鏌ヨ鏂规硶锛屽厛杩炴帴鍐嶅垎椤�
+ Page<RecordToUserCount> pageResult = this.baseMapper.selectRecordToUserPage(page, lqw);
+
+ List<RecordToUserCount> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
+
+ HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
+
+
+ return AjaxResult.success(data);
+
+ }
+
+ @Override
+ public List<RecordToUserCount> findAllRecordToUserCont() {
+ return this.baseMapper.selectRecordToUserAll();
+ }
}
--
Gitblit v1.9.1