diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/impl/XzdSubcontractServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/impl/XzdSubcontractServiceImpl.java index fb038f18..2893fada 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/impl/XzdSubcontractServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/impl/XzdSubcontractServiceImpl.java @@ -19,6 +19,7 @@ import org.dromara.common.utils.BatchNumberGenerator; import org.dromara.system.service.impl.SysOssServiceImpl; import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd; import org.dromara.xzd.comprehensive.service.IXzdHtglHtbgqdService; +import org.dromara.xzd.contractManagement.caigouhetongbiangeng.domain.XzdPurchaseContractAlteration; import org.dromara.xzd.contractManagement.fenbaohetongbiangg.domain.XzdSubcontractChange; import org.dromara.xzd.contractManagement.fenbaohetongbiangg.domain.vo.XzdSubcontractChangeVo; import org.dromara.xzd.contractManagement.fenbaohetongbiangg.service.IXzdSubcontractChangeService; @@ -201,11 +202,11 @@ public class XzdSubcontractServiceImpl extends ServiceImpl().eq(XzdSubcontractChange::getContractCode, item.getId())); + Long l = xzdSubcontractChangeService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(XzdSubcontractChange::getContractCode, item.getId()).eq(XzdSubcontractChange::getAuditStatus, BusinessStatusEnum.FINISH.getStatus())); if (l > 0) { item.setJdzt(ZxdEnum.HETONGZTBG.getTypeValue()); } - Long l1 = xzdSubcontractTerminationService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(XzdSubcontractTermination::getContractNumber, item.getId())); + Long l1 = xzdSubcontractTerminationService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(XzdSubcontractTermination::getContractNumber, item.getId()).eq(XzdSubcontractTermination::getAuditStatus, BusinessStatusEnum.FINISH.getStatus())); if (l1 > 0) { item.setJdzt(ZxdEnum.HETONGZTZZ.getTypeValue()); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/jixiehetongxinxi/service/impl/XzdContractMachineryServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/jixiehetongxinxi/service/impl/XzdContractMachineryServiceImpl.java index 2e430223..108f6b64 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/jixiehetongxinxi/service/impl/XzdContractMachineryServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/jixiehetongxinxi/service/impl/XzdContractMachineryServiceImpl.java @@ -7,6 +7,7 @@ import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.domain.event.ProcessDeleteEvent; import org.dromara.common.core.domain.event.ProcessEvent; import org.dromara.common.core.domain.event.ProcessTaskEvent; +import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.service.XzdContractMachineryService; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.SpringUtils; @@ -19,6 +20,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.dromara.common.utils.BatchNumberGenerator; import org.dromara.system.service.impl.SysOssServiceImpl; +import org.dromara.xzd.contractManagement.caigouhetongbiangeng.domain.XzdPurchaseContractAlteration; import org.dromara.xzd.contractManagement.fenbaohetongbiangg.domain.XzdSubcontractChange; import org.dromara.xzd.contractManagement.fenbaohetongzhongzhi.domain.XzdSubcontractTermination; import org.dromara.xzd.contractManagement.jixiehetongbiang.domain.XzdMachineryContractAlteration; @@ -168,11 +170,11 @@ public class XzdContractMachineryServiceImpl extends ServiceImpl().eq(XzdMachineryContractAlteration::getContractInformationId, item.getId())); + Long l = xzdMachineryContractAlterationService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(XzdMachineryContractAlteration::getContractInformationId, item.getId()).eq(XzdMachineryContractAlteration::getAuditStatus, BusinessStatusEnum.FINISH.getStatus())); if (l > 0) { item.setJdzt(ZxdEnum.HETONGZTBG.getTypeValue()); } - Long l1 = xzdMachineryContractSuspendService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(XzdMachineryContractSuspend::getContractInformationId, item.getId())); + Long l1 = xzdMachineryContractSuspendService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(XzdMachineryContractSuspend::getContractInformationId, item.getId()).eq(XzdMachineryContractSuspend::getAuditStatus, BusinessStatusEnum.FINISH.getStatus())); if (l1 > 0) { item.setJdzt(ZxdEnum.HETONGZTZZ.getTypeValue()); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java index 7171e7bb..a8116902 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java @@ -10,6 +10,7 @@ import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.event.ProcessDeleteEvent; import org.dromara.common.core.domain.event.ProcessEvent; import org.dromara.common.core.domain.event.ProcessTaskEvent; +import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.service.XzdPurchaseContractInformationService; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.SpringUtils; @@ -539,11 +540,11 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl().eq(XzdPurchaseContractAlteration::getContractInformationId, item.getId())); + Long l = xzdPurchaseContractAlterationService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(XzdPurchaseContractAlteration::getContractInformationId, item.getId()).eq(XzdPurchaseContractAlteration::getAuditStatus, BusinessStatusEnum.FINISH.getStatus())); if (l > 0) { item.setJdzt(ZxdEnum.HETONGZTBG.getTypeValue()); } - Long l1 = xzdPurchaseContractSuspendService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(XzdPurchaseContractSuspend::getContractInformationId, item.getId())); + Long l1 = xzdPurchaseContractSuspendService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(XzdPurchaseContractSuspend::getContractInformationId, item.getId()).eq(XzdPurchaseContractSuspend::getAuditStatus, BusinessStatusEnum.FINISH.getStatus())); if (l1 > 0) { item.setJdzt(ZxdEnum.HETONGZTZZ.getTypeValue()); }