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

解决冲突

Browse Source
This commit is contained in:
dfdg
2025-10-18 18:56:03 +08:00
parent 6a0be071b8
commit 83b7b32035
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,10 +150,6 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
lqw.le(bo.getEndDate() != null, XzdPurchaseContractInformation::getDocumentDate, bo.getEndDate());
List<XzdHtglHtbgqd> list4 = xzdHtglHtbgqdService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdHtglHtbgqd>().eq(XzdHtglHtbgqd::getMainDocumentId, item.getId()));
item.setHtbgqds(list4);
List<XzdHtglHthzsj> xzdHtglHthzsjs = xzdHtglHthzsjService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdHtglHthzsj>().eq(XzdHtglHthzsj::getMainDocumentId, item.getId()));
item.setHtghthzsjs(xzdHtglHthzsjs);
lqw.eq(StringUtils.isNotBlank(bo.getContractType()), XzdPurchaseContractInformation::getContractType, bo.getContractType());
lqw.eq(bo.getProject() != null, XzdPurchaseContractInformation::getProject, bo.getProject());
@ -321,6 +317,20 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
xzdSettlementRulesService.saveOrUpdateBatch(bo.getZftk());
bo.getHtzytkyd().setTableName(XzdClassEnum.PURCHASE_CONTRACT_INFORMATION.getClassName());
xzdContractDepositInfoService.saveOrUpdate(bo.getHtzytkyd());
//合同变更清单
xzdHtglHtbgqdService.remove(new LambdaQueryWrapper<XzdHtglHtbgqd>().eq(XzdHtglHtbgqd::getMainDocumentId,bo.getId()));
if (bo.getHtbgqds() != null && !bo.getHtbgqds().isEmpty()) {
bo.getHtbgqds().forEach(item->{item.setMainDocumentId(bo.getId());});
xzdHtglHtbgqdService.saveBatch(bo.getHtbgqds());
}
//汇总数据
xzdHtglHthzsjService.remove(new LambdaQueryWrapper<XzdHtglHthzsj>().eq(XzdHtglHthzsj::getMainDocumentId,bo.getId()));
if (bo.getHtghthzsjs() != null && !bo.getHtghthzsjs().isEmpty()) {
bo.getHtghthzsjs().forEach(item->{item.setMainDocumentId(bo.getId());});
xzdHtglHthzsjService.saveBatch(bo.getHtghthzsjs());
}
return baseMapper.updateById(update) > 0;
}
@ -389,18 +399,6 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
for (XzdPurchaseContractInformationVo item : infos) {
//合同变更清单
xzdHtglHtbgqdService.remove(new LambdaQueryWrapper<XzdHtglHtbgqd>().eq(XzdHtglHtbgqd::getMainDocumentId,bo.getId()));
if (bo.getHtbgqds() != null && !bo.getHtbgqds().isEmpty()) {
bo.getHtbgqds().forEach(item->{item.setMainDocumentId(bo.getId());});
xzdHtglHtbgqdService.saveBatch(bo.getHtbgqds());
}
//汇总数据
xzdHtglHthzsjService.remove(new LambdaQueryWrapper<XzdHtglHthzsj>().eq(XzdHtglHthzsj::getMainDocumentId,bo.getId()));
if (bo.getHtghthzsjs() != null && !bo.getHtghthzsjs().isEmpty()) {
bo.getHtghthzsjs().forEach(item->{item.setMainDocumentId(bo.getId());});
xzdHtglHthzsjService.saveBatch(bo.getHtghthzsjs());
}
//项目名称
if (item.getProject() != null){
@ -488,6 +486,12 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
lambdaQueryWrapper4.eq(XzdContractDepositInfo::getContractDetailsId, item.getId());
XzdContractDepositInfo list3 = xzdContractDepositInfoService.getOne(lambdaQueryWrapper4);
item.setHtzytkyd(list3);
List<XzdHtglHtbgqd> list4 = xzdHtglHtbgqdService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdHtglHtbgqd>().eq(XzdHtglHtbgqd::getMainDocumentId, item.getId()));
item.setHtbgqds(list4);
List<XzdHtglHthzsj> xzdHtglHthzsjs = xzdHtglHthzsjService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdHtglHthzsj>().eq(XzdHtglHthzsj::getMainDocumentId, item.getId()));
item.setHtghthzsjs(xzdHtglHthzsjs);
}
}