From eeeba2bf4bc8911eebb800db2e5bf44ddfd2275d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com> Date: Tue, 21 Oct 2025 10:07:55 +0800 Subject: [PATCH] =?UTF-8?q?10-21-=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/XzdContractAccountServiceImpl.java | 16 ++++---------- ...ContractProgressSettlementServiceImpl.java | 20 +++++------------ ...rkcontractCompletionAdjustServiceImpl.java | 22 +++++++++++-------- 3 files changed, 22 insertions(+), 36 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAccountServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAccountServiceImpl.java index 5bcf7704..73acfab5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAccountServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAccountServiceImpl.java @@ -398,34 +398,26 @@ public class XzdContractAccountServiceImpl extends ServiceImpl jsqdTzs = xzdJsqdTzService.list(queryWrapper); - if (jsqdTzs != null && !jsqdTzs.isEmpty()){ - vo.setJsqd(jsqdTzs); - } + vo.setJsqd(jsqdTzs); //扣款与奖励-扣款 LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); queryWrapper1.eq(XzdJsDeductionItems::getMainDocId, vo.getId()); queryWrapper1.eq(XzdJsDeductionItems::getTableName, "xzd_contract_account"); queryWrapper1.eq(XzdJsDeductionItems::getDetailType, 1L); List xzdJsDeductionItems = xzdJsDeductionItemsService.list(queryWrapper1); - if (xzdJsDeductionItems != null && !xzdJsDeductionItems.isEmpty()){ - vo.setKk(xzdJsDeductionItems); - } + vo.setKk(xzdJsDeductionItems); //扣款与奖励-奖励 LambdaQueryWrapper queryWrapper2 = new LambdaQueryWrapper<>(); queryWrapper2.eq(XzdJsDeductionItems::getMainDocId, vo.getId()); queryWrapper2.eq(XzdJsDeductionItems::getTableName, "xzd_contract_account"); queryWrapper2.eq(XzdJsDeductionItems::getDetailType, 2L); List xzdJsDeductionItems1 = xzdJsDeductionItemsService.list(queryWrapper2); - if (xzdJsDeductionItems1 != null && !xzdJsDeductionItems1.isEmpty()){ - vo.setJl(xzdJsDeductionItems1); - } + vo.setJl(xzdJsDeductionItems1); //质保金归还约定 LambdaQueryWrapper queryWrapper3 = new LambdaQueryWrapper<>(); queryWrapper3.eq(XzdZbjghyd::getMainId, vo.getId()); List xzdZbjghyds = xzdZbjghydService.list(queryWrapper3); - if (xzdZbjghyds != null && !xzdZbjghyds.isEmpty()){ - vo.setZbjghyd(xzdZbjghyds); - } + vo.setZbjghyd(xzdZbjghyds); } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractProgressSettlementServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractProgressSettlementServiceImpl.java index a000aab9..f9bca2ae 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractProgressSettlementServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractProgressSettlementServiceImpl.java @@ -508,42 +508,32 @@ public class XzdContractProgressSettlementServiceImpl extends ServiceImpl list1 = xzdContractInventoryService.list(queryWrapper1); - if (list1 != null){ - vo.setHtnqd(list1); - } + vo.setHtnqd(list1); //变更清单 LambdaQueryWrapper queryWrapper2 = new LambdaQueryWrapper<>(); queryWrapper2.eq(XzdAlterationInventory::getPrimaryMeterId, vo.getId()); List list2 = xzdAlterationInventoryService.list(queryWrapper2); - if (list2 != null){ - vo.setBgzjqd(list2); - } + vo.setBgzjqd(list2); //合同外清单 LambdaQueryWrapper queryWrapper3 = new LambdaQueryWrapper<>(); queryWrapper3.eq(XzdContractInventory::getPrimaryMeterId, vo.getId()); queryWrapper3.eq(XzdContractInventory::getType, "1"); List list3 = xzdContractInventoryService.list(queryWrapper3); - if (list3 != null){ - vo.setHtwqd(list3); - } + vo.setHtwqd(list3); //奖励与扣款-扣款 LambdaQueryWrapper queryWrapper4 = new LambdaQueryWrapper<>(); queryWrapper4.eq(XzdJsDeductionItems::getTableName, "xzd_contract_progress_settlement"); queryWrapper4.eq(XzdJsDeductionItems::getDetailType, 1L); queryWrapper4.eq(XzdJsDeductionItems::getMainDocId, vo.getId()); List list4 = xzdJsDeductionItemsService.list(queryWrapper4); - if (list4 != null){ - vo.setKk(list4); - } + vo.setKk(list4); //奖励与扣款-奖励 queryWrapper4.clear(); queryWrapper4.eq(XzdJsDeductionItems::getTableName, "xzd_contract_progress_settlement"); queryWrapper4.eq(XzdJsDeductionItems::getDetailType, 2L); queryWrapper4.eq(XzdJsDeductionItems::getMainDocId, vo.getId()); List list5 = xzdJsDeductionItemsService.list(queryWrapper4); - if (list5 != null){ - vo.setJl(list5); - } + vo.setJl(list5); } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdWorkcontractCompletionAdjustServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdWorkcontractCompletionAdjustServiceImpl.java index 84c0587d..5e7186ec 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdWorkcontractCompletionAdjustServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdWorkcontractCompletionAdjustServiceImpl.java @@ -24,6 +24,7 @@ import org.dromara.xzd.domain.bo.XzdWorkcontractCompletionAdjustBo; import org.dromara.xzd.domain.vo.XzdWorkcontractCompletionAdjustVo; import org.dromara.xzd.mapper.XzdWorkcontractCompletionAdjustMapper; import org.dromara.xzd.service.IXzdWorkcontractCompletionAdjustService; +import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; import java.util.List; @@ -124,6 +125,7 @@ public class XzdWorkcontractCompletionAdjustServiceImpl extends ServiceImpl 0; @@ -332,27 +342,21 @@ public class XzdWorkcontractCompletionAdjustServiceImpl extends ServiceImpl jsqdTzs = xzdJsqdTzService.list(queryWrapper); - if (jsqdTzs != null && !jsqdTzs.isEmpty()){ - vo.setJsqdTz(jsqdTzs); - } + vo.setJsqdTz(jsqdTzs); //奖励与扣款-奖励 LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); queryWrapper1.eq(XzdJsDeductionItems::getMainDocId, vo.getId()); queryWrapper1.eq(XzdJsDeductionItems::getDetailType, 2L); queryWrapper1.eq(XzdJsDeductionItems::getTableName, "xzd_workcontract_completion_adjust"); List jl = xzdJsDeductionItemsService.list(queryWrapper1); - if (jl != null && !jl.isEmpty()){ - vo.setJl(jl); - } + vo.setJl(jl); //奖励与扣款-扣款 LambdaQueryWrapper queryWrapper2 = new LambdaQueryWrapper<>(); queryWrapper2.eq(XzdJsDeductionItems::getMainDocId, vo.getId()); queryWrapper2.eq(XzdJsDeductionItems::getDetailType, 1L); queryWrapper2.eq(XzdJsDeductionItems::getTableName, "xzd_workcontract_completion_adjust"); List kk = xzdJsDeductionItemsService.list(queryWrapper2); - if (kk != null && !kk.isEmpty()){ - vo.setKk(kk); - } + vo.setKk(kk); } }