lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合同显示bug修改

Browse Source
This commit is contained in:
lg
2025-12-02 10:10:50 +08:00
parent 4aaf384ce8
commit 3e38cf9abb
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/impl/XzdSubcontractServiceImpl.java
View File

@ -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<XzdSubcontractMapper,
// 阶段状态
item.setJdzt(ZxdEnum.HETONGZTYS.getTypeValue());
Long l = xzdSubcontractChangeService.getBaseMapper().selectCount(new LambdaQueryWrapper<XzdSubcontractChange>().eq(XzdSubcontractChange::getContractCode, item.getId()));
Long l = xzdSubcontractChangeService.getBaseMapper().selectCount(new LambdaQueryWrapper<XzdSubcontractChange>().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<XzdSubcontractTermination>().eq(XzdSubcontractTermination::getContractNumber, item.getId()));
Long l1 = xzdSubcontractTerminationService.getBaseMapper().selectCount(new LambdaQueryWrapper<XzdSubcontractTermination>().eq(XzdSubcontractTermination::getContractNumber, item.getId()).eq(XzdSubcontractTermination::getAuditStatus, BusinessStatusEnum.FINISH.getStatus()));
if (l1 > 0) {
item.setJdzt(ZxdEnum.HETONGZTZZ.getTypeValue());
}

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/jixiehetongxinxi/service/impl/XzdContractMachineryServiceImpl.java
View File

@ -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<XzdContractMach
item.setHttk(list1);
// 阶段状态
item.setJdzt(ZxdEnum.HETONGZTYS.getTypeValue());
Long l = xzdMachineryContractAlterationService.getBaseMapper().selectCount(new LambdaQueryWrapper<XzdMachineryContractAlteration>().eq(XzdMachineryContractAlteration::getContractInformationId, item.getId()));
Long l = xzdMachineryContractAlterationService.getBaseMapper().selectCount(new LambdaQueryWrapper<XzdMachineryContractAlteration>().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<XzdMachineryContractSuspend>().eq(XzdMachineryContractSuspend::getContractInformationId, item.getId()));
Long l1 = xzdMachineryContractSuspendService.getBaseMapper().selectCount(new LambdaQueryWrapper<XzdMachineryContractSuspend>().eq(XzdMachineryContractSuspend::getContractInformationId, item.getId()).eq(XzdMachineryContractSuspend::getAuditStatus, BusinessStatusEnum.FINISH.getStatus()));
if (l1 > 0) {
item.setJdzt(ZxdEnum.HETONGZTZZ.getTypeValue());
}

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java
View File

@ -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<XzdPu
// 阶段状态
item.setJdzt(ZxdEnum.HETONGZTYS.getTypeValue());;
Long l = xzdPurchaseContractAlterationService.getBaseMapper().selectCount(new LambdaQueryWrapper<XzdPurchaseContractAlteration>().eq(XzdPurchaseContractAlteration::getContractInformationId, item.getId()));
Long l = xzdPurchaseContractAlterationService.getBaseMapper().selectCount(new LambdaQueryWrapper<XzdPurchaseContractAlteration>().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<XzdPurchaseContractSuspend>().eq(XzdPurchaseContractSuspend::getContractInformationId, item.getId()));
Long l1 = xzdPurchaseContractSuspendService.getBaseMapper().selectCount(new LambdaQueryWrapper<XzdPurchaseContractSuspend>().eq(XzdPurchaseContractSuspend::getContractInformationId, item.getId()).eq(XzdPurchaseContractSuspend::getAuditStatus, BusinessStatusEnum.FINISH.getStatus()));
if (l1 > 0) {
item.setJdzt(ZxdEnum.HETONGZTZZ.getTypeValue());
}