From 27f5356ba11e2400aac493502f1c5ba1fb47775b Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期二, 14 十月 2025 16:55:48 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/archiveSystem
---
archiveManager/src/main/java/com/ruoyi/mapper/ArchiveRecordsMapper.java | 3 +++
archiveManager/src/main/java/com/ruoyi/service/IArchiveRecordsService.java | 1 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveRecordsController.java | 8 ++++++++
archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java | 5 +++++
4 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/archiveManager/src/main/java/com/ruoyi/mapper/ArchiveRecordsMapper.java b/archiveManager/src/main/java/com/ruoyi/mapper/ArchiveRecordsMapper.java
index a0eb72a..0f47537 100644
--- a/archiveManager/src/main/java/com/ruoyi/mapper/ArchiveRecordsMapper.java
+++ b/archiveManager/src/main/java/com/ruoyi/mapper/ArchiveRecordsMapper.java
@@ -52,4 +52,7 @@
@Select("select ROW_NUMBER() OVER (ORDER BY record_id) AS num, filing_number, concat_ws(\" \", inquiry_number,record_id) as inqrid, case_title, public_attribute, (select count(*) as cnt from document_materials where record_id=ar.id) as cnt, remarks from archive_records as ar \n" +
"${ew.customSqlSegment}")
public List<ArchiveRecordSmall> selectByIds(@Param("ew") LambdaQueryWrapper<ArchiveRecords> queryWrapper);
+
+ @Select("SELECT COALESCE(SUM(IF(url IS NULL AND file_style != '鏂囧瓧鏉愭枡', 1, 0)), 0) = 0 AS result from document_materials where `record_id` = #{recordId}")
+ boolean whether(@Param("recordId") Long recordId);
}
diff --git a/archiveManager/src/main/java/com/ruoyi/service/IArchiveRecordsService.java b/archiveManager/src/main/java/com/ruoyi/service/IArchiveRecordsService.java
index fc61139..cd3dd9a 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/IArchiveRecordsService.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/IArchiveRecordsService.java
@@ -89,6 +89,7 @@
public int updateStatusByIds(Long [] ids);
public List<ArchiveRecordSmall> findByIds(ArchiveRecords archiveRecords);
+ boolean whether(@Param("recordId") Long recordId);
}
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 85c14e6..b7a0777 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java
@@ -20,6 +20,7 @@
import com.ruoyi.mapper.ArchiveRecordsMapper;
import com.ruoyi.mapper.ArchiverecordstouserMapper;
import com.ruoyi.service.IArchiveRecordsService;
+import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@@ -352,4 +353,8 @@
}
}
+ @Override
+ public boolean whether(@Param("recordId") Long recordId){
+ return this.baseMapper.whether(recordId);
+ }
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveRecordsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveRecordsController.java
index 3574437..f50a90b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveRecordsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveRecordsController.java
@@ -200,4 +200,12 @@
ExcelUtil<ArchiveRecordModelOther> util = new ExcelUtil<>(ArchiveRecordModelOther.class);
util.exportExcel(response,list,"妗ｆ淇℃伅瀵煎叆妯℃澘");
}
+
+ @PreAuthorize("@ss.hasPermi('system:records:list')")
+ @Log(title = "鏄惁鍏佽鎻愪氦", businessType = BusinessType.IMPORT)
+ @GetMapping(value = "/whether/{recordId}")
+ public AjaxResult whether(@PathVariable("recordId") Long recordId)
+ {
+ return AjaxResult.success( archiveRecordsService.whether(recordId));
+ }
}
--
Gitblit v1.9.1