From 436b955086030caec4513022c1f5127470ad2b14 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期日, 28 十二月 2025 20:54:21 +0800
Subject: [PATCH] 修改了对应代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/archiveAllExportController.java | 22 +++++++----
archiveManager/src/main/java/com/ruoyi/mapper/ArchiveRecordsMapper.java | 10 +++++
archiveManager/src/main/java/com/ruoyi/domain/ArchiveRecords.java | 10 +++++
archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialFileSmallVo.java | 5 +-
archiveManager/src/main/java/com/ruoyi/service/impl/ArchiverecordstouserServiceImpl.java | 18 +++++++++
archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java | 20 +++++++--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java | 17 +++++++-
archiveManager/src/main/java/com/ruoyi/domain/DocumentMaterials.java | 4 +
archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialsVo.java | 5 ++
9 files changed, 91 insertions(+), 20 deletions(-)
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/ArchiveRecords.java b/archiveManager/src/main/java/com/ruoyi/domain/ArchiveRecords.java
index a2346dd..4537845 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/ArchiveRecords.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/ArchiveRecords.java
@@ -165,6 +165,16 @@
@TableField(exist = false)
private Long [] ids;
+
+ public String getLiPerson() {
+ return liPerson;
+ }
+
+ public void setLiPerson(String liPerson) {
+ this.liPerson = liPerson;
+ }
+
+ private String liPerson;
@Override
public Date getCreateTime() {
return createTime;
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/DocumentMaterials.java b/archiveManager/src/main/java/com/ruoyi/domain/DocumentMaterials.java
index 002ce80..c30de29 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/DocumentMaterials.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/DocumentMaterials.java
@@ -5,6 +5,7 @@
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.NumberFormatHandler;
@@ -45,7 +46,7 @@
}
/** $column.columnComment */
- @Excel(name = "缂栦换鑰�", headerColor = IndexedColors.BLACK)
+ @Excel(name = "璐ｄ换鑰�", headerColor = IndexedColors.BLACK)
private String creator;
/** $column.columnComment */
@@ -60,6 +61,7 @@
/** $column.columnComment */
// @Excel(name = "椤靛彿", handler = NumberFormatHandler.class, headerColor = IndexedColors.BLACK)
private Long pageNumber;
+ @TableField(exist = false)
@Excel(name = "椤靛彿", height = 10,width = 10,headerColor = IndexedColors.RED, headerBackgroundColor = IndexedColors.WHITE)
private String pageNumberFormatted;
/** $column.columnComment */
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialFileSmallVo.java b/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialFileSmallVo.java
index 8ac93cc..f955e09 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialFileSmallVo.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialFileSmallVo.java
@@ -14,10 +14,11 @@
/** $column.columnComment */
- @Excel(name = "缂栦换鑰�", headerColor = IndexedColors.BLACK)
- private String creator;
+
@Excel(name = "鏂囦欢缂栧彿", headerColor = IndexedColors.BLACK)
private String documentNumber;
+ @Excel(name = "璐ｄ换鑰�", headerColor = IndexedColors.BLACK)
+ private String creator;
/** $column.columnComment */
@Excel(name = "鏂囦欢棰樺悕", headerColor = IndexedColors.BLACK)
private String title;
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialsVo.java b/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialsVo.java
index 7cf33a2..d81dd38 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialsVo.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialsVo.java
@@ -1,5 +1,6 @@
package com.ruoyi.domain.vo;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
@@ -28,8 +29,10 @@
private Date date;
// 椤靛彿锛堝師濮嬫暟鍊硷紝鐢ㄤ簬璁＄畻锛�
private Long pageNumber;
-
+
+
// 鏍煎紡鍖栧悗鐨勯〉鍙凤紝鐢ㄤ簬鏄剧ず鑼冨洿锛屽"38-38"鎴�"23-38"
+ @TableField(exist = false)
@Excel(name = "椤靛彿", height = 10,width = 10,headerColor = IndexedColors.RED, headerBackgroundColor = IndexedColors.WHITE)
private String pageNumberFormatted;
@Excel(name = "澶囨敞", height = 20,width=10,headerColor = IndexedColors.BLACK, headerBackgroundColor = IndexedColors.WHITE)
diff --git a/archiveManager/src/main/java/com/ruoyi/mapper/ArchiveRecordsMapper.java b/archiveManager/src/main/java/com/ruoyi/mapper/ArchiveRecordsMapper.java
index 0f47537..36eb677 100644
--- a/archiveManager/src/main/java/com/ruoyi/mapper/ArchiveRecordsMapper.java
+++ b/archiveManager/src/main/java/com/ruoyi/mapper/ArchiveRecordsMapper.java
@@ -16,6 +16,16 @@
@Mapper
public interface ArchiveRecordsMapper extends BaseMapper<ArchiveRecords> {
+ @Select({
+ "<script>",
+ "select * from (SELECT distinct c.*,a.archive_records_id, if(a.user_id=#{userId}, TRUE, FALSE) as tst,b.user_id FROM archiverecordstouser a inner join sys_user b ON a.user_id = b.user_id inner join archive_records c on c.id=a.archive_records_id ${ew.customSqlSegment} ) as tmp\n" +
+ "where tst=true",
+ "<if test= \"userId !=1 \">",
+ "order by tst desc",
+ "</if>",
+ "</script>"
+ })
+ Page<ArchiveRecords> selectJoinCommonUserPage(Page<ArchiveRecords> page, @Param("userId") Long userId, @Param("ew") LambdaQueryWrapper<ArchiveRecords> queryWrapper);
@Select({
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 b11b386..b423bbc 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java
@@ -136,6 +136,8 @@
if(userId==1)
lqw.orderByDesc(ArchiveRecords::getCreateTime);
+ // else
+ // lqw.eq(userId!=null, ArchiveRecords::getUserId, userId);
System.out.println("ssssssssssssddd0000000000000000");
return lqw;
@@ -163,8 +165,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);
@@ -175,11 +180,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);
@@ -187,7 +193,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"));
@@ -408,7 +418,7 @@
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()
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 29c2849..96d3b7a 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiverecordstouserServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiverecordstouserServiceImpl.java
@@ -18,6 +18,7 @@
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;
@@ -34,6 +35,8 @@
@Service
public class ArchiverecordstouserServiceImpl extends ServiceImpl<ArchiverecordstouserMapper, Archiverecordstouser> implements IArchiverecordstouserService
{
+ @Autowired
+ private IArchiveRecordsService archiveRecordsService;
@Autowired
private SysUserMapper userMapper;
@Autowired
@@ -63,6 +66,21 @@
@Override
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)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java
index df76b7d..38dc7c7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java
@@ -464,16 +464,25 @@
String li_person = "浠囩縺";
String sh_person = "鏇剧憺鑾�";
ArchiveRecords archiveRecords = iArchiveRecordsService.selectArchiveRecordsById(id);
+ if(!StringUtils.isEmpty(archiveRecords.getLiPerson()))
+ li_person = archiveRecords.getLiPerson();
ArchiveProjectName tmp = new ArchiveProjectName();
tmp.setName(archiveRecords.getProjectName());
List<ArchiveProjectName> projectName = iArchiveProjectNameService.selectArchiveProjectNameList(tmp);
if(!projectName.isEmpty())
{
- if(StringUtils.isEmpty(projectName.get(0).getCompanyName()))
+ System.out.println(projectName.get(0).getCompanyName());
+ if(!StringUtils.isEmpty(projectName.get(0).getCompanyName()))
compName = projectName.get(0).getCompanyName();
- if(StringUtils.isEmpty(projectName.get(0).getCreatePerson()))
- li_person = projectName.get(0).getCreatePerson();
+ if(!StringUtils.isEmpty(projectName.get(0).getCreatePerson()))
+ sh_person = projectName.get(0).getCreatePerson();
+
+ System.out.println(compName+"--+"+sh_person);
+
}
+
+
+ System.out.println(compName+"--+"+sh_person);
// pdfGenerateService.generateFileStyleInfo(pdf09Path, aIV.getRecordId(), id);
//鎷垮埌鐩稿叧鏁版嵁
List<DocumentMaterialFileStyle> dmfs = documentMaterialsService.findFileStyleInfo(Math.toIntExact(id));
@@ -507,6 +516,8 @@
hs.put("texPages", texPages);
hs.put("volumeNumber", recordId);
hs.put("company", compName);
+ hs.put("liPerson", li_person);
+ hs.put("shPerson", sh_person);
hs.put("time", cdt);
if (!getLicense()) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/archiveAllExportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/archiveAllExportController.java
index 56375d6..3c6ef8e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/archiveAllExportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/archiveAllExportController.java
@@ -579,15 +579,17 @@
String li_person = "浠囩縺";
String sh_person = "鏇剧憺鑾�";
ArchiveRecords archiveRecords1 = iArchiveRecordsService.selectArchiveRecordsById(ids[i]);
+ if(!StringUtils.isEmpty(archiveRecords1.getLiPerson()))
+ li_person = archiveRecords1.getLiPerson();
ArchiveProjectName tmp = new ArchiveProjectName();
tmp.setName(archiveRecords1.getProjectName());
List<ArchiveProjectName> projectName = iArchiveProjectNameService.selectArchiveProjectNameList(tmp);
if(!projectName.isEmpty())
{
- if(StringUtils.isEmpty(projectName.get(0).getCompanyName()))
+ if(!StringUtils.isEmpty(projectName.get(0).getCompanyName()))
compName = projectName.get(0).getCompanyName();
- if(StringUtils.isEmpty(projectName.get(0).getCreatePerson()))
- li_person = projectName.get(0).getCreatePerson();
+ if(!StringUtils.isEmpty(projectName.get(0).getCreatePerson()))
+ sh_person = projectName.get(0).getCreatePerson();
}
allPages = texPages + picPages + patPages;
hs.put("pages", allPages);
@@ -596,7 +598,8 @@
hs.put("texPages", texPages);
hs.put("volumeNumber", aIV.getRecordId());
hs.put("company", compName);
-
+ hs.put("liPerson", li_person);
+ hs.put("shPerson", sh_person);
hs.put("time", cdt);
if (!getLicense()) {
@@ -1130,15 +1133,17 @@
String li_person = "浠囩縺";
String sh_person = "鏇剧憺鑾�";
ArchiveRecords archiveRecords = iArchiveRecordsService.selectArchiveRecordsById(id);
+ if(!StringUtils.isEmpty(archiveRecords.getLiPerson()))
+ li_person = archiveRecords.getLiPerson();
ArchiveProjectName tmp = new ArchiveProjectName();
tmp.setName(archiveRecords.getProjectName());
List<ArchiveProjectName> projectName = iArchiveProjectNameService.selectArchiveProjectNameList(tmp);
if(!projectName.isEmpty())
{
- if(StringUtils.isEmpty(projectName.get(0).getCompanyName()))
+ if(!StringUtils.isEmpty(projectName.get(0).getCompanyName()))
compName = projectName.get(0).getCompanyName();
- if(StringUtils.isEmpty(projectName.get(0).getCreatePerson()))
- li_person = projectName.get(0).getCreatePerson();
+ if(!StringUtils.isEmpty(projectName.get(0).getCreatePerson()))
+ sh_person = projectName.get(0).getCreatePerson();
}
allPages = texPages + picPages + patPages;
@@ -1148,7 +1153,8 @@
hs.put("texPages", texPages);
hs.put("volumeNumber", aIV.getRecordId());
hs.put("company", compName);
-
+ hs.put("liPerson", li_person);
+ hs.put("shPerson", sh_person);
hs.put("time", cdt);
if (!getLicense()) {
--
Gitblit v1.9.1