diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractChangeServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractChangeServiceImpl.java index 9b69516e..6759193e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractChangeServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractChangeServiceImpl.java @@ -31,6 +31,7 @@ import org.dromara.xzd.domain.XzdContractClause; import org.dromara.xzd.domain.XzdDeductionItems; import org.dromara.xzd.domain.vo.XzdBusinessSealVo; import org.dromara.xzd.enums.XzdClassEnum; +import org.dromara.xzd.enums.ZxdEnum; import org.dromara.xzd.service.impl.XzdBusinessChangeServiceImpl; import org.dromara.xzd.service.impl.XzdBusinessSealServiceImpl; import org.dromara.xzd.service.impl.XzdContractClauseServiceImpl; @@ -176,7 +177,7 @@ public class XzdCsContractChangeServiceImpl extends ServiceImpl lambdaQueryWrapper4 = new LambdaQueryWrapper<>(); - lambdaQueryWrapper4.select(XzdBusinessChange::getBusinessId); lambdaQueryWrapper4.eq(XzdBusinessChange::getContractChangeId, vo.getId()); + lambdaQueryWrapper4.eq(XzdBusinessChange::getType, "11"); List list3 = xzdBusinessChangeService.list(lambdaQueryWrapper4); - for (XzdBusinessChange businessChange : list3) { - XzdBusinessSealVo sealVo = xzdBusinessSealService.queryById(businessChange.getBusinessId()); - if (sealVo != null){ - businessChange.setSealName(sealVo.getYzName()); + if (list3 != null && !list3.isEmpty()){ + for (XzdBusinessChange businessChange : list3) { + XzdBusinessSealVo sealVo = xzdBusinessSealService.queryById(businessChange.getBusinessId()); + if (sealVo != null){ + businessChange.setSealName(sealVo.getYzName()); + } } + vo.setSealInfo(list3); } - vo.setSealInfo(list3); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractInformationServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractInformationServiceImpl.java index 577b3c87..f5fda8da 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractInformationServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractInformationServiceImpl.java @@ -34,6 +34,7 @@ import org.dromara.xzd.domain.XzdContractClause; import org.dromara.xzd.domain.XzdDeductionItems; import org.dromara.xzd.domain.vo.XzdBusinessSealVo; import org.dromara.xzd.enums.XzdClassEnum; +import org.dromara.xzd.enums.ZxdEnum; import org.dromara.xzd.service.impl.XzdBusinessChangeServiceImpl; import org.dromara.xzd.service.impl.XzdBusinessSealServiceImpl; import org.dromara.xzd.service.impl.XzdContractClauseServiceImpl; @@ -119,16 +120,18 @@ public class XzdCsContractInformationServiceImpl extends ServiceImpl lambdaQueryWrapper4 = new LambdaQueryWrapper<>(); - lambdaQueryWrapper4.select(XzdBusinessChange::getBusinessId); lambdaQueryWrapper4.eq(XzdBusinessChange::getContractChangeId, vo.getId()); + lambdaQueryWrapper4.eq(XzdBusinessChange::getType, "10"); List list3 = xzdBusinessChangeService.list(lambdaQueryWrapper4); - for (XzdBusinessChange businessChange : list3) { - XzdBusinessSealVo sealVo = xzdBusinessSealService.queryById(businessChange.getBusinessId()); - if (sealVo != null){ - businessChange.setSealName(sealVo.getYzName()); + if (list3 != null && !list3.isEmpty()){ + for (XzdBusinessChange businessChange : list3) { + XzdBusinessSealVo sealVo = xzdBusinessSealService.queryById(businessChange.getBusinessId()); + if (sealVo != null){ + businessChange.setSealName(sealVo.getYzName()); + } } + vo.setSealInfo(list3); } - vo.setSealInfo(list3); } /** @@ -219,7 +222,7 @@ public class XzdCsContractInformationServiceImpl extends ServiceImpl 0; if (flag) { bo.setId(add.getId()); @@ -285,7 +288,7 @@ public class XzdCsContractInformationServiceImpl extends ServiceImpl 0; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractSuspendServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractSuspendServiceImpl.java index 88d95f4a..019afa5d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractSuspendServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractSuspendServiceImpl.java @@ -21,6 +21,7 @@ import org.dromara.xzd.comprehensive.domain.bo.XzdCsContractSuspendBo; import org.dromara.xzd.comprehensive.domain.vo.XzdCsContractSuspendVo; import org.dromara.xzd.comprehensive.mapper.XzdCsContractSuspendMapper; import org.dromara.xzd.comprehensive.service.IXzdCsContractSuspendService; +import org.dromara.xzd.enums.ZxdEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Service; @@ -127,7 +128,7 @@ public class XzdCsContractSuspendServiceImpl extends ServiceImpl