From 0f44078d297adcbaee7c9a16b4f4d3257d858491 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 07 三月 2025 17:35:14 +0800
Subject: [PATCH] 代码迁移bug解决
---
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessDealServiceImpl.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessDealServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessDealServiceImpl.java
index 2144a7e..b19712c 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessDealServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessDealServiceImpl.java
@@ -57,7 +57,9 @@
String currentMonth = currentDate.format(formatter);
//鏌ヨ鍘嗗彶
ProcessTotaldeal processTotaldeal = processTotaldealMapper.selectOne(Wrappers.<ProcessTotaldeal>lambdaQuery().eq(ProcessTotaldeal::getMonth, currentMonth));
- processDeal.setTotaldealId(processTotaldeal.getId());
+ if(ObjectUtils.isNotEmpty(processTotaldeal)){
+ processDeal.setTotaldealId(processTotaldeal.getId());
+ }
}
return processDealMapper.pageProcessDeal(page, QueryWrappers.queryWrappers(processDeal));
@@ -73,7 +75,9 @@
// 鏍煎紡鍖栧綋鍓嶆棩鏈�
String currentMonth = dealTime.format(formatter);
processTotaldeal= processTotaldealMapper.selectOne(Wrappers.<ProcessTotaldeal>lambdaQuery().eq(ProcessTotaldeal::getMonth,currentMonth));
- processDeal.setTotaldealId(processTotaldeal.getId());
+ if(ObjectUtils.isNotEmpty(processTotaldeal)){
+ processDeal.setTotaldealId(processTotaldeal.getId());
+ }
}else {
processTotaldeal= processTotaldealMapper.selectById(processDeal.getTotaldealId());
}
@@ -95,9 +99,12 @@
public int doProcessDeal(ProcessDeal processDeal) {
if (ObjectUtils.isNotEmpty(processDeal.getNum())) {
ProcessDeal oldProcessDeal = processDealMapper.selectById(processDeal.getId());
- ProcessTotaldeal processTotaldeal = processTotaldealMapper.selectById(processDeal.getTotaldealId());
- processTotaldeal.setTotalNum(processTotaldeal.getTotalNum() - oldProcessDeal.getNum() + processDeal.getNum());
- processTotaldealMapper.updateById(processTotaldeal);
+ if(null != processDeal.getTotaldealId()){
+ ProcessTotaldeal processTotaldeal = processTotaldealMapper.selectById(processDeal.getTotaldealId());
+ int totalNum = ObjectUtils.isEmpty(processTotaldeal) ? 0 : processTotaldeal.getTotalNum();
+ processTotaldeal.setTotalNum(totalNum - oldProcessDeal.getNum() + processDeal.getNum());
+ processTotaldealMapper.updateById(processTotaldeal);
+ }
}
return processDealMapper.updateById(processDeal);
}
--
Gitblit v1.9.3