From 8f4db901aa772a808c243f8a4e39522f6f09d5da Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 21 八月 2025 13:10:22 +0800
Subject: [PATCH] 修改完善3
---
src/main/java/com/ruoyi/warehouse/service/impl/DocumentationBorrowManagementServiceImpl.java | 145 ++++++++++++++++++++++++++++++-----------------
1 files changed, 92 insertions(+), 53 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationBorrowManagementServiceImpl.java b/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationBorrowManagementServiceImpl.java
index 176060c..38b8d5a 100644
--- a/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationBorrowManagementServiceImpl.java
+++ b/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationBorrowManagementServiceImpl.java
@@ -6,9 +6,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto;
+import com.ruoyi.warehouse.dto.DocumentationBorrowManagementDto;
+import com.ruoyi.warehouse.dto.ReturnExportDto;
+import com.ruoyi.warehouse.mapper.DocumentationReturnManagementMapper;
import com.ruoyi.warehouse.pojo.Documentation;
import com.ruoyi.warehouse.pojo.DocumentationBorrowManagement;
+import com.ruoyi.warehouse.pojo.DocumentationReturnManagement;
import com.ruoyi.warehouse.service.DocumentationBorrowManagementService;
import com.ruoyi.warehouse.mapper.DocumentationBorrowManagementMapper;
import com.ruoyi.warehouse.service.DocumentationService;
@@ -17,6 +20,8 @@
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.util.List;
import java.util.stream.Collectors;
@@ -32,6 +37,8 @@
@Autowired
private DocumentationBorrowManagementMapper documentationBorrowManagementMapper;
@Autowired
+ private DocumentationReturnManagementMapper documentationReturnManagementMapper;
+ @Autowired
private DocumentationService documentationService;
@Override
public IPage<DocumentationBorrowManagement> listPage(Page page, DocumentationBorrowManagement documentationBorrowManagement) {
@@ -42,68 +49,98 @@
@Override
public boolean add(DocumentationBorrowManagement documentationBorrowManagement) {
- Long documentationId = documentationBorrowManagement.getDocumentationId();
- String borrowStatus = documentationBorrowManagement.getBorrowStatus();
- Documentation documentation = documentationService.getById(documentationId);
- if (documentation==null){
- System.out.println("鏂囨。涓嶅瓨鍦�");
- return false;
- }
- if ("鍊熷嚭".equals(documentation.getDocStatus())){
- if ("褰掕繕".equals(borrowStatus)){
- documentation.setDocStatus("姝ｅ父");
- documentationService.updateById(documentation);
- documentationBorrowManagementMapper.insert(documentationBorrowManagement);
- return true;
- }else{
- System.out.println("鏂囨。宸插�熷嚭锛屼笉鑳介噸澶嶅�熷嚭");
- return false;
- }
- }else if("姝ｅ父".equals(documentation.getDocStatus())){
- if ("褰掕繕".equals(borrowStatus)){
- System.out.println("鏂囨。宸插綊杩橈紝涓嶈兘閲嶅褰掕繕");
- return false;
- }else if("鍊熷嚭".equals(borrowStatus)){
+ documentationBorrowManagement.setBorrowStatus("鍊熼槄");
+ documentationBorrowManagementMapper.insert(documentationBorrowManagement);
+ Documentation documentation = documentationService.getById(documentationBorrowManagement.getDocumentationId());
+ documentation.setDocStatus("鍊熷嚭");
+ documentationService.updateById(documentation);
+ return true;
+ }
+ @Override
+ public boolean reventdbm(DocumentationReturnManagement documentationReturnManagement) {
+ // 鏇存柊鍊熼槄璁板綍鐘舵�佷负褰掕繕
+ DocumentationBorrowManagement documentationBorrowManagement1 = documentationBorrowManagementMapper.selectById(documentationReturnManagement.getBorrowId());
+
+ DocumentationReturnManagement returnManagement = new DocumentationReturnManagement();
+ returnManagement.setDocumentationId(documentationBorrowManagement1.getDocumentationId());
+ returnManagement.setBorrower(documentationBorrowManagement1.getBorrower());
+ returnManagement.setBorrowPurpose(documentationBorrowManagement1.getBorrowPurpose());
+ returnManagement.setBorrowDate(documentationBorrowManagement1.getBorrowDate());
+ returnManagement.setDueReturnDate(documentationBorrowManagement1.getDueReturnDate());
+ returnManagement.setBorrowStatus("褰掕繕");
+ returnManagement.setBorrowId(documentationReturnManagement.getBorrowId());
+ returnManagement.setReturner(documentationReturnManagement.getReturner());
+ returnManagement.setReturnDate(LocalDate.now());
+ returnManagement.setRemark(documentationReturnManagement.getRemark());
+
+ documentationReturnManagementMapper.insert(returnManagement);
+ documentationBorrowManagement1.setBorrowStatus("褰掕繕");
+ documentationBorrowManagement1.setReturner(documentationReturnManagement.getReturner());
+ documentationBorrowManagement1.setReturnDate(LocalDate.now());
+ documentationBorrowManagementMapper.updateById(documentationBorrowManagement1);
+ // 鏇存柊鏂囨。鐘舵�佷负姝ｅ父
+ Documentation documentation = documentationService.getById(documentationBorrowManagement1.getDocumentationId());
+ documentation.setDocStatus("姝ｅ父");
+ documentationService.updateById(documentation);
+ return true;
+ }
+
+ @Override
+ public boolean reventDeleteByIds(List<Long> ids) {
+ QueryWrapper<DocumentationReturnManagement> queryWrapper = new QueryWrapper<>();
+ queryWrapper.in("id", ids);
+// queryWrapper.eq("borrow_status", "褰掕繕");
+ List<DocumentationReturnManagement> list = documentationReturnManagementMapper.selectList(queryWrapper);
+
+ for (DocumentationReturnManagement documentationReturnManagement : list) {
+
+ try {
+ documentationReturnManagementMapper.deleteById(documentationReturnManagement);
+ DocumentationBorrowManagement documentationBorrowManagement = documentationBorrowManagementMapper.selectById(documentationReturnManagement.getBorrowId());
+ documentationBorrowManagement.setBorrowStatus("鍊熼槄");
+ documentationBorrowManagement.setReturner(null);
+ documentationBorrowManagement.setReturnDate(null);
+ documentationBorrowManagementMapper.updateById(documentationBorrowManagement);
+
+ Documentation documentation = documentationService.getById(documentationReturnManagement.getDocumentationId());
documentation.setDocStatus("鍊熷嚭");
documentationService.updateById(documentation);
- documentationBorrowManagementMapper.insert(documentationBorrowManagement);
- return true;
+ } catch (Exception e) {
+ throw new RuntimeException("鍒犻櫎褰掕繕璁板綍鍜屾枃妗ｇ姸鎬佹椂鍑洪敊", e);
}
- }else{
- System.out.println("鏂囨。鐘舵�佸紓甯�");
- return false;
}
- return false;
+// documentationReturnManagementMapper.deleteBatchIds(ids);
+ return true;
}
-// @Override
-// public boolean updateDBMById(DocumentationBorrowManagement documentationBorrowManagement) {
-// Long id = documentationBorrowManagement.getId();
-//// Long documentationId = documentationBorrowManagement.getDocumentationId();
-// //鏌ヨ鏂囨。鏄惁宸插綊杩�
-// DocumentationBorrowManagement dbm = documentationBorrowManagementMapper.selectById(id);
-//// Long documentationId = dbm.getDocumentationId();
-// if ("褰掕繕".equals(dbm.getBorrowStatus())){
-// System.out.println("鏂囨。宸插綊杩橈紝涓嶈兘鏇存柊");
-// return false;
-// }
-// //鏌ヨ鏂囨。
-// Documentation documentation = documentationService.getById(dbm.getDocumentationId());
-// String docStatus = documentation.getDocStatus();
-// if ("姝ｅ父".equals(docStatus)){
-// System.out.println("鏂囨。宸插綊杩橈紝涓嶈兘鏇存柊");
-// return false;
-// }
-// return false;
-// }
+
+ @Override
+ public void export(HttpServletResponse response, DocumentationBorrowManagement documentationBorrowManagement) {
+ List<DocumentationBorrowManagementDto> documentationBorrowManagements = documentationBorrowManagementMapper.export(documentationBorrowManagement);
+ ExcelUtil<DocumentationBorrowManagementDto> util = new ExcelUtil<>(DocumentationBorrowManagementDto.class);
+ util.exportExcel(response, documentationBorrowManagements, "鏂囨。鍊熼槄-鍊熼槄璁板綍");
+ }
+
+ @Override
+ public void exportrevent(HttpServletResponse response, DocumentationReturnManagement documentationReturnManagement) {
+ List<ReturnExportDto> documentationReturnManagements = documentationReturnManagementMapper.exportrevent(documentationReturnManagement);
+ ExcelUtil<ReturnExportDto> util = new ExcelUtil<>(ReturnExportDto.class);
+ util.exportExcel(response, documentationReturnManagements, "鏂囨。鍊熼槄-褰掕繕璁板綍");
+ }
+
+ @Override
+ public List<DocumentationBorrowManagementDto> listAll() {
+ return documentationBorrowManagementMapper.list(new LambdaQueryWrapper<DocumentationBorrowManagementDto>().eq(DocumentationBorrowManagementDto::getBorrowStatus, "鍊熼槄"));
+ }
@Override
public boolean deleteByIds(List<Long> ids) {
List<DocumentationBorrowManagement> list = documentationBorrowManagementMapper.selectList(new LambdaQueryWrapper<DocumentationBorrowManagement>().in(DocumentationBorrowManagement::getId, ids));
for (DocumentationBorrowManagement documentationBorrowManagement : list) {
- String borrowStatus = documentationBorrowManagement.getBorrowStatus();
- if ("鍊熼槄".equals(borrowStatus)){
- System.out.println("鏂囨。宸插�熷嚭锛屼笉鑳藉垹闄�");
- return false;
+ Documentation documentation = documentationService.getById(documentationBorrowManagement.getDocumentationId());
+ documentation.setDocStatus("姝ｅ父");
+ boolean b = documentationService.updateById(documentation);
+ if (!b){
+ throw new RuntimeException("鏇存柊鏂囨。鐘舵�佸け璐�");
}
}
documentationBorrowManagementMapper.deleteBatchIds(ids);
@@ -111,6 +148,8 @@
}
+
+
}
--
Gitblit v1.9.3