From 0388d54af57e8d3d4a99554501b232ca572b50c6 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 12 十月 2026 17:48:51 +0800
Subject: [PATCH] 客户满意度新增附件与委托单关联；供应商管理新增附件；标准物质接收、记录、验收模块调整；委托单新增已完成列表接口（满意度下拉用）；管理记录服务调整
---
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordVerifyServiceImpl.java | 46 ++++++++++++++++++++++------------------------
1 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordVerifyServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordVerifyServiceImpl.java
index a49d7b0..2b494da 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordVerifyServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordVerifyServiceImpl.java
@@ -53,28 +53,14 @@
@Override
public IPage<ManageRecordVerify> pageManageRecordVerify(Page page, ManageRecordVerify manageRecordVerify) {
if (ObjectUtils.isEmpty(manageRecordVerify.getManageRecordTotalId())) {
- //鑾峰彇褰撳墠骞翠唤
- LocalDate currentDate = LocalDate.now();
- // 瀹氫箟鏃ユ湡鏍煎紡
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy");
- // 鏍煎紡鍖栧綋鍓嶆棩鏈�
- String currentMonth = currentDate.format(formatter);
- //鏌ヨ鍘嗗彶
- ManageRecordTotal manageRecordTotal = manageRecordTotalMapper.selectOne(Wrappers.<ManageRecordTotal>lambdaQuery().eq(ManageRecordTotal::getYear, currentMonth));
- manageRecordVerify.setManageRecordTotalId(manageRecordTotal.getId());
+ manageRecordVerify.setManageRecordTotalId(getOrCreateCurrentYearTotal().getId());
}
return manageRecordVerifyMapper.pageManageRecordVerify(page, QueryWrappers.queryWrappers(manageRecordVerify));
}
@Override
public int addManageRecordVerify(ManageRecordVerify manageRecordVerify) {
- //鑾峰彇褰撳墠骞翠唤
- LocalDate currentDate = LocalDate.now();
- // 瀹氫箟鏃ユ湡鏍煎紡
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy");
- // 鏍煎紡鍖栧綋鍓嶆棩鏈�
- String currentMonth = currentDate.format(formatter);
- ManageRecordTotal manageRecordTotal = manageRecordTotalMapper.selectOne(Wrappers.<ManageRecordTotal>lambdaQuery().eq(ManageRecordTotal::getYear, currentMonth));
+ ManageRecordTotal manageRecordTotal = getOrCreateCurrentYearTotal();
manageRecordVerify.setManageRecordTotalId(manageRecordTotal.getId());
manageRecordVerifyMapper.insert(manageRecordVerify);
manageRecordTotal.setTotalNum(1 + manageRecordTotal.getTotalNum());
@@ -86,7 +72,10 @@
ManageRecordVerify manageRecordVerify = manageRecordVerifyMapper.selectById(id);
manageRecordVerifyMapper.deleteById(id);
ManageRecordTotal manageRecordTotal = manageRecordTotalMapper.selectById(manageRecordVerify.getManageRecordTotalId());
- manageRecordTotal.setTotalNum(manageRecordTotal.getTotalNum() - 1);
+ if (manageRecordTotal == null) {
+ return 0;
+ }
+ manageRecordTotal.setTotalNum((manageRecordTotal.getTotalNum() == null ? 0 : manageRecordTotal.getTotalNum()) - 1);
return manageRecordTotalMapper.updateById(manageRecordTotal);
}
@@ -94,13 +83,7 @@
public int exportManageRecordVerify(MultipartFile file) {
List<ManageRecordVerify> manageRecordVerifyList = new ArrayList<>();
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
- //鑾峰彇褰撳墠骞翠唤
- LocalDate currentDate = LocalDate.now();
- // 瀹氫箟鏃ユ湡鏍煎紡
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy");
- // 鏍煎紡鍖栧綋鍓嶆棩鏈�
- String currentMonth = currentDate.format(formatter);
- ManageRecordTotal manageRecordTotal = manageRecordTotalMapper.selectOne(Wrappers.<ManageRecordTotal>lambdaQuery().eq(ManageRecordTotal::getYear, currentMonth));
+ ManageRecordTotal manageRecordTotal = getOrCreateCurrentYearTotal();
try {
InputStream inputStream = file.getInputStream();
XWPFDocument document = new XWPFDocument(inputStream);
@@ -154,4 +137,19 @@
}
return 0;
}
+
+ // 骞村害姹囨�昏褰曞師鏈敱姣忓勾 1 鏈� 1 鏃ョ殑瀹氭椂浠诲姟鍒涘缓锛屼换鍔℃湭鍚敤鏃舵澶勫厹搴曡嚜鍔ㄨˉ寤猴紝閬垮厤鍙� id 鏃舵姤绌烘寚閽�
+ private ManageRecordTotal getOrCreateCurrentYearTotal() {
+ String year = String.valueOf(LocalDate.now().getYear());
+ ManageRecordTotal manageRecordTotal = manageRecordTotalMapper.selectOne(Wrappers.<ManageRecordTotal>lambdaQuery().eq(ManageRecordTotal::getYear, year));
+ if (manageRecordTotal == null) {
+ manageRecordTotal = new ManageRecordTotal();
+ manageRecordTotal.setYear(year);
+ manageRecordTotal.setTotalNum(0);
+ manageRecordTotalMapper.insert(manageRecordTotal);
+ } else if (manageRecordTotal.getTotalNum() == null) {
+ manageRecordTotal.setTotalNum(0);
+ }
+ return manageRecordTotal;
+ }
}
--
Gitblit v1.9.3