From ebeecf61232967a9c21ca4aa63ccec8e269b8c0e Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期一, 29 九月 2025 09:13:58 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/archiveSystem
---
archiveManager/src/main/java/com/ruoyi/service/impl/ArchiverecordstouserServiceImpl.java | 121 ++++++++++++++++++++++++++++++++++-----
1 files changed, 104 insertions(+), 17 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 d7b7df3..0bfcf59 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiverecordstouserServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiverecordstouserServiceImpl.java
@@ -1,8 +1,10 @@
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;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -12,16 +14,19 @@
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.IArchiverecordstouserService;
import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
- * 銆愯濉啓鍔熻兘鍚嶇О銆慡ervice涓氬姟灞傚鐞�
+ * 銆愭。妗堝垎閰嶃�慡ervice涓氬姟灞傚鐞�
*
* @author ruoyi
* @date 2025-07-20
@@ -31,17 +36,34 @@
{
@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());
+ //淇濆瓨鐩稿叧鐢ㄦ埛鐨剈serId
+ List<Long> arr = new ArrayList<>();
+ List<SysUser> all = new ArrayList<>();
+
+ if(!StringUtils.isEmpty(archiverecordstouser.getUserName())||!StringUtils.isEmpty(archiverecordstouser.getPhonenumber()))
+ {
+ //鏍规嵁鐢ㄦ埛鍚嶆煡璇㈢敤鎴风浉鍏砳d
+ SysUser sysUser = new SysUser();
+ sysUser.setUserName(archiverecordstouser.getUserName());
+ sysUser.setPhonenumber(archiverecordstouser.getPhonenumber());
+ all = userMapper.selectUserList(sysUser);
+ }
+ arr = all.stream().map(SysUser::getUserId).collect(Collectors.toList());
+ lqw.in(!all.isEmpty(), Archiverecordstouser::getUserId, arr);
+ // System.out.println(archiverecordstouser.getSysUser().getUserName()+"098643");
return lqw;
}
@Override
public int insertRecordToUsers(String recordId, Long[] userIds) {
- // 鏂板鐢ㄦ埛涓庤鑹茬鐞�
+ // 鏂板鐢ㄦ埛涓庢鍗疯褰�
List<Archiverecordstouser> list = new ArrayList<Archiverecordstouser>();
for (Long userId : userIds)
{
@@ -49,6 +71,7 @@
ur.setArchiveRecordsId(recordId);
ur.setUserId(userId);
list.add(ur);
+ break;
}
boolean res = this.saveBatch(list);
if(res)
@@ -86,10 +109,10 @@
return AjaxResult.success(data); }
/**
- * 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鏌ヨ銆愭。妗堝垎閰嶃��
*
- * @param id 銆愯濉啓鍔熻兘鍚嶇О銆戜富閿�
- * @return 銆愯濉啓鍔熻兘鍚嶇О銆�
+ * @param id 銆愭。妗堝垎閰嶃�戜富閿�
+ * @return 銆愭。妗堝垎閰嶃��
*/
@Override
public Archiverecordstouser selectArchiverecordstouserById(Long id)
@@ -98,22 +121,30 @@
}
@Override
+ public boolean selectArchiveRecordUsers(String recordId) {
+ LambdaQueryWrapper<Archiverecordstouser> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(!StringUtils.isEmpty(recordId),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
@@ -123,9 +154,9 @@
}
/**
- * 淇敼銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 淇敼銆愭。妗堝垎閰嶃��
*
- * @param archiverecordstouser 銆愯濉啓鍔熻兘鍚嶇О銆�
+ * @param archiverecordstouser 銆愭。妗堝垎閰嶃��
* @return 缁撴灉
*/
@Override
@@ -135,9 +166,9 @@
}
/**
- * 鎵归噺鍒犻櫎銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鎵归噺鍒犻櫎銆愭。妗堝垎閰嶃��
*
- * @param ids 闇�瑕佸垹闄ょ殑銆愯濉啓鍔熻兘鍚嶇О銆戜富閿�
+ * @param ids 闇�瑕佸垹闄ょ殑銆愭。妗堝垎閰嶃�戜富閿�
* @return 缁撴灉
*/
@Override
@@ -147,9 +178,9 @@
}
/**
- * 鍒犻櫎銆愯濉啓鍔熻兘鍚嶇О銆戜俊鎭�
+ * 鍒犻櫎銆愭。妗堝垎閰嶃�戜俊鎭�
*
- * @param id 銆愯濉啓鍔熻兘鍚嶇О銆戜富閿�
+ * @param id 銆愭。妗堝垎閰嶃�戜富閿�
* @return 缁撴灉
*/
@Override
@@ -157,4 +188,60 @@
{
return 0;
}
+
+ @Override
+ public int deleteArchiverecordstouserByRecordId(String recordId, Long userId) {
+
+ LambdaQueryWrapper<Archiverecordstouser> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(!StringUtils.isEmpty(recordId), Archiverecordstouser::getArchiveRecordsId, recordId)
+ .eq(userId!=null, Archiverecordstouser::getUserId, userId);
+ if(this.remove(lqw))
+ return 1;
+ else
+ return 0;
+ }
+
+ @Override
+ public int queryArchiverecordstouserByRecordId(String recordId, Long userId) {
+ LambdaQueryWrapper<Archiverecordstouser> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(!StringUtils.isEmpty(recordId), Archiverecordstouser::getArchiveRecordsId, recordId)
+ .eq(userId!=null, Archiverecordstouser::getUserId, userId);
+
+ List<Archiverecordstouser> lis = list(lqw);
+ if(!lis.isEmpty())
+ return 1;
+ 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