采购合同,分包合同,job修改
This commit is contained in:
@ -0,0 +1,72 @@
|
|||||||
|
package org.dromara.job.xzd;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
import com.aizuda.snailjob.client.job.core.annotation.JobExecutor;
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||||
|
import org.dromara.common.sse.dto.SseMessageDto;
|
||||||
|
import org.dromara.common.sse.utils.SseMessageUtils;
|
||||||
|
import org.dromara.xzd.deposit.contractBackletter.domain.XzdGuaranteeInfo;
|
||||||
|
import org.dromara.xzd.deposit.contractBackletter.mapper.XzdGuaranteeInfoMapper;
|
||||||
|
import org.dromara.xzd.deposit.earnestMoney.domain.XzdDepositApplication;
|
||||||
|
import org.dromara.xzd.deposit.earnestMoney.domain.bo.XzdDepositApplicationBo;
|
||||||
|
import org.dromara.xzd.deposit.earnestMoney.mapper.XzdDepositApplicationMapper;
|
||||||
|
import org.dromara.xzd.deposit.earnestMoney.service.IXzdDepositApplicationService;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.scheduling.annotation.Scheduled;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
import java.time.LocalDate;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Component
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class BaohanJob {
|
||||||
|
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private XzdDepositApplicationMapper xzdDepositApplicationMapper;
|
||||||
|
|
||||||
|
|
||||||
|
private final XzdGuaranteeInfoMapper xzdGuaranteeInfoMapper;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// @JobExecutor(name = "clockInMiss")
|
||||||
|
@Scheduled(cron = "0 0 8 1/1 * ?")
|
||||||
|
public void baozhengjinJob() {
|
||||||
|
log.info("保证金缴纳审批日期到期定时任务开始执行");
|
||||||
|
// 查询保证金当天到期的数据
|
||||||
|
List<XzdDepositApplication> xzdDepositApplications = xzdDepositApplicationMapper.selectList(new LambdaQueryWrapper<XzdDepositApplication>().eq(XzdDepositApplication::getDepositDueDate, LocalDate.now()));
|
||||||
|
//组装发送数据
|
||||||
|
for (XzdDepositApplication xzdDepositApplication : xzdDepositApplications) {
|
||||||
|
SseMessageDto sseMessageDto = new SseMessageDto();
|
||||||
|
sseMessageDto.setUserIds(List.of(xzdDepositApplication.getCreateBy()));
|
||||||
|
sseMessageDto.setMessage(xzdDepositApplication.getDocumentSerialNumber()+" "+"保证金日期到期");
|
||||||
|
SseMessageUtils.publishMessage(sseMessageDto);
|
||||||
|
}
|
||||||
|
log.info("保证金缴纳审批日期到期定时任务执行成功");
|
||||||
|
}
|
||||||
|
@Scheduled(cron = "0 0 8 1/1 * ?")
|
||||||
|
public void chengbaohetongbaohanJob() {
|
||||||
|
log.info("承包合同保函日期到期定时任务开始执行");
|
||||||
|
// 查询保证金当天到期的数据
|
||||||
|
List<XzdGuaranteeInfo> xzdGuaranteeInfos = xzdGuaranteeInfoMapper.selectList(new LambdaQueryWrapper<XzdGuaranteeInfo>().eq(XzdGuaranteeInfo::getDueDate, LocalDate.now()));
|
||||||
|
//组装发送数据
|
||||||
|
for (XzdGuaranteeInfo xzdGuaranteeInfo : xzdGuaranteeInfos) {
|
||||||
|
SseMessageDto sseMessageDto = new SseMessageDto();
|
||||||
|
sseMessageDto.setUserIds(List.of(xzdGuaranteeInfo.getCreateBy()));
|
||||||
|
sseMessageDto.setMessage(xzdGuaranteeInfo.getDocumentNumber()+" "+"保函日期到期");
|
||||||
|
SseMessageUtils.publishMessage(sseMessageDto);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
@ -10,6 +10,7 @@ import io.github.linpeilie.annotations.AutoMapper;
|
|||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
import jakarta.validation.constraints.*;
|
import jakarta.validation.constraints.*;
|
||||||
|
import org.dromara.xzd.domain.XzdBusinessChange;
|
||||||
import org.dromara.xzd.domain.XzdContractAdvanceInfo;
|
import org.dromara.xzd.domain.XzdContractAdvanceInfo;
|
||||||
import org.dromara.xzd.domain.XzdContractClause;
|
import org.dromara.xzd.domain.XzdContractClause;
|
||||||
import org.dromara.xzd.domain.XzdDeductionItems;
|
import org.dromara.xzd.domain.XzdDeductionItems;
|
||||||
@ -255,4 +256,9 @@ public class XzdPurchaseContractAlterationBo extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private List<XzdHtglHthzsj> htghthzsjs;
|
private List<XzdHtglHthzsj> htghthzsjs;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 印章信息
|
||||||
|
*/
|
||||||
|
private List<XzdBusinessChange> sealInfo;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -377,5 +377,10 @@ public class XzdPurchaseContractAlterationVo implements Serializable {
|
|||||||
*/
|
*/
|
||||||
private List<XzdHtglHthzsj> htghthzsjs;
|
private List<XzdHtglHthzsj> htghthzsjs;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 印章信息
|
||||||
|
*/
|
||||||
|
private List<XzdBusinessChange> sealInfo;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -25,6 +25,7 @@ import org.dromara.xzd.contractManagement.purchaseManagement.domain.vo.XzdPurcha
|
|||||||
import org.dromara.xzd.contractManagement.purchaseManagement.service.IXzdPurchaseContractInformationService;
|
import org.dromara.xzd.contractManagement.purchaseManagement.service.IXzdPurchaseContractInformationService;
|
||||||
import org.dromara.xzd.domain.*;
|
import org.dromara.xzd.domain.*;
|
||||||
import org.dromara.xzd.domain.dto.QuerCorrespondentDto;
|
import org.dromara.xzd.domain.dto.QuerCorrespondentDto;
|
||||||
|
import org.dromara.xzd.domain.vo.XzdBusinessSealVo;
|
||||||
import org.dromara.xzd.enums.XzdClassEnum;
|
import org.dromara.xzd.enums.XzdClassEnum;
|
||||||
import org.dromara.xzd.service.IXzdContractAdvanceInfoService;
|
import org.dromara.xzd.service.IXzdContractAdvanceInfoService;
|
||||||
import org.dromara.xzd.service.IXzdContractClauseService;
|
import org.dromara.xzd.service.IXzdContractClauseService;
|
||||||
@ -86,6 +87,12 @@ public class XzdPurchaseContractAlterationServiceImpl extends ServiceImpl<XzdPur
|
|||||||
@Autowired
|
@Autowired
|
||||||
private IXzdHtglHthzsjService xzdHtglHthzsjService;
|
private IXzdHtglHthzsjService xzdHtglHthzsjService;
|
||||||
|
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private XzdBusinessChangeServiceImpl xzdBusinessChangeService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private XzdBusinessSealServiceImpl xzdBusinessSealService;
|
||||||
/**
|
/**
|
||||||
* 查询采购合同变更
|
* 查询采购合同变更
|
||||||
*
|
*
|
||||||
@ -104,6 +111,18 @@ public class XzdPurchaseContractAlterationServiceImpl extends ServiceImpl<XzdPur
|
|||||||
|
|
||||||
for (XzdPurchaseContractAlterationVo item : infos) {
|
for (XzdPurchaseContractAlterationVo item : infos) {
|
||||||
|
|
||||||
|
//印章信息
|
||||||
|
LambdaQueryWrapper<XzdBusinessChange> xzdBusinessChangeWrapper = new LambdaQueryWrapper<>();
|
||||||
|
xzdBusinessChangeWrapper.eq(XzdBusinessChange::getContractChangeId, item.getId());
|
||||||
|
List<XzdBusinessChange> xzdBusinessChanges = xzdBusinessChangeService.list(xzdBusinessChangeWrapper);
|
||||||
|
for (XzdBusinessChange businessChange : xzdBusinessChanges) {
|
||||||
|
XzdBusinessSealVo sealVo = xzdBusinessSealService.queryById(businessChange.getBusinessId());
|
||||||
|
if (sealVo != null){
|
||||||
|
businessChange.setSealName(sealVo.getYzName());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
item.setSealInfo(xzdBusinessChanges);
|
||||||
|
|
||||||
|
|
||||||
// 合同编码
|
// 合同编码
|
||||||
if (item.getContractInformationId() != null){
|
if (item.getContractInformationId() != null){
|
||||||
@ -273,6 +292,15 @@ public class XzdPurchaseContractAlterationServiceImpl extends ServiceImpl<XzdPur
|
|||||||
if (flag) {
|
if (flag) {
|
||||||
bo.setId(add.getId());
|
bo.setId(add.getId());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//印章信息
|
||||||
|
if (bo.getSealInfo() != null && !bo.getSealInfo().isEmpty()){
|
||||||
|
for (XzdBusinessChange sealInfo : bo.getSealInfo()) {
|
||||||
|
sealInfo.setContractChangeId(add.getId());
|
||||||
|
sealInfo.setType("8");
|
||||||
|
}
|
||||||
|
xzdBusinessChangeService.saveBatch(bo.getSealInfo());
|
||||||
|
}
|
||||||
//合同变更清单
|
//合同变更清单
|
||||||
if (bo.getHtbgqds() != null && !bo.getHtbgqds().isEmpty()) {
|
if (bo.getHtbgqds() != null && !bo.getHtbgqds().isEmpty()) {
|
||||||
bo.getHtbgqds().forEach(item->{item.setMainDocumentId(add.getId());});
|
bo.getHtbgqds().forEach(item->{item.setMainDocumentId(add.getId());});
|
||||||
@ -335,6 +363,16 @@ public class XzdPurchaseContractAlterationServiceImpl extends ServiceImpl<XzdPur
|
|||||||
});
|
});
|
||||||
iXzdContractClauseService.saveBatch(httk);
|
iXzdContractClauseService.saveBatch(httk);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//印章信息
|
||||||
|
xzdBusinessChangeService.remove(new LambdaQueryWrapper<XzdBusinessChange>().eq(XzdBusinessChange::getContractChangeId, add.getId()));
|
||||||
|
|
||||||
|
|
||||||
|
for (XzdBusinessChange xzdBusinessChange : bo.getSealInfo()) {
|
||||||
|
xzdBusinessChange.setContractChangeId(add.getId());
|
||||||
|
xzdBusinessChange.setType("8");
|
||||||
|
}
|
||||||
|
xzdBusinessChangeService.saveBatch(bo.getSealInfo());
|
||||||
//合同变更清单
|
//合同变更清单
|
||||||
xzdHtglHtbgqdService.remove(new LambdaQueryWrapper<XzdHtglHtbgqd>().eq(XzdHtglHtbgqd::getMainDocumentId,bo.getId()));
|
xzdHtglHtbgqdService.remove(new LambdaQueryWrapper<XzdHtglHtbgqd>().eq(XzdHtglHtbgqd::getMainDocumentId,bo.getId()));
|
||||||
if (bo.getHtbgqds() != null && !bo.getHtbgqds().isEmpty()) {
|
if (bo.getHtbgqds() != null && !bo.getHtbgqds().isEmpty()) {
|
||||||
@ -378,6 +416,9 @@ public class XzdPurchaseContractAlterationServiceImpl extends ServiceImpl<XzdPur
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//印章信息
|
||||||
|
xzdBusinessChangeService.remove(new LambdaQueryWrapper<XzdBusinessChange>().in(XzdBusinessChange::getContractChangeId, ids));
|
||||||
//合同文本-预收款项
|
//合同文本-预收款项
|
||||||
LambdaQueryWrapper<XzdContractAdvanceInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<XzdContractAdvanceInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||||
lambdaQueryWrapper.in(XzdContractAdvanceInfo::getContractDetailsId, ids);
|
lambdaQueryWrapper.in(XzdContractAdvanceInfo::getContractDetailsId, ids);
|
||||||
|
|||||||
@ -9,6 +9,7 @@ import io.github.linpeilie.annotations.AutoMapper;
|
|||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
import jakarta.validation.constraints.*;
|
import jakarta.validation.constraints.*;
|
||||||
|
import org.dromara.xzd.domain.XzdBusinessChange;
|
||||||
import org.dromara.xzd.domain.XzdContractAdvanceInfo;
|
import org.dromara.xzd.domain.XzdContractAdvanceInfo;
|
||||||
import org.dromara.xzd.domain.XzdContractClause;
|
import org.dromara.xzd.domain.XzdContractClause;
|
||||||
import org.dromara.xzd.domain.XzdDeductionItems;
|
import org.dromara.xzd.domain.XzdDeductionItems;
|
||||||
@ -256,5 +257,11 @@ public class XzdSubcontractChangeBo extends BaseEntity {
|
|||||||
private List<XzdHtglHtbgqd> htbgqds;
|
private List<XzdHtglHtbgqd> htbgqds;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 印章信息
|
||||||
|
*/
|
||||||
|
private List<XzdBusinessChange> sealInfo;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -374,6 +374,11 @@ public class XzdSubcontractChangeVo implements Serializable {
|
|||||||
*/
|
*/
|
||||||
private List<XzdHtglHtbgqd> htbgqds;
|
private List<XzdHtglHtbgqd> htbgqds;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 印章信息
|
||||||
|
*/
|
||||||
|
private List<XzdBusinessChange> sealInfo;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -25,14 +25,12 @@ import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.vo.XzdSubcont
|
|||||||
import org.dromara.xzd.contractManagement.fenbaohetongxinxi.service.IXzdSubcontractService;
|
import org.dromara.xzd.contractManagement.fenbaohetongxinxi.service.IXzdSubcontractService;
|
||||||
import org.dromara.xzd.contractManagement.purchaseManagement.service.IXzdPurchaseContractInformationService;
|
import org.dromara.xzd.contractManagement.purchaseManagement.service.IXzdPurchaseContractInformationService;
|
||||||
import org.dromara.xzd.domain.*;
|
import org.dromara.xzd.domain.*;
|
||||||
|
import org.dromara.xzd.domain.vo.XzdBusinessSealVo;
|
||||||
import org.dromara.xzd.enums.XzdClassEnum;
|
import org.dromara.xzd.enums.XzdClassEnum;
|
||||||
import org.dromara.xzd.service.IXzdContractAdvanceInfoService;
|
import org.dromara.xzd.service.IXzdContractAdvanceInfoService;
|
||||||
import org.dromara.xzd.service.IXzdContractClauseService;
|
import org.dromara.xzd.service.IXzdContractClauseService;
|
||||||
import org.dromara.xzd.service.IXzdDeductionItemsService;
|
import org.dromara.xzd.service.IXzdDeductionItemsService;
|
||||||
import org.dromara.xzd.service.impl.XzdContractAdvanceInfoServiceImpl;
|
import org.dromara.xzd.service.impl.*;
|
||||||
import org.dromara.xzd.service.impl.XzdContractClauseServiceImpl;
|
|
||||||
import org.dromara.xzd.service.impl.XzdDeductionItemsServiceImpl;
|
|
||||||
import org.dromara.xzd.service.impl.XzdSettlementRulesServiceImpl;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.context.event.EventListener;
|
import org.springframework.context.event.EventListener;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@ -79,6 +77,12 @@ public class XzdSubcontractChangeServiceImpl extends ServiceImpl<XzdSubcontractC
|
|||||||
@Autowired
|
@Autowired
|
||||||
private IXzdHtglHtbgqdService xzdHtglHtbgqdService;
|
private IXzdHtglHtbgqdService xzdHtglHtbgqdService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private XzdBusinessChangeServiceImpl xzdBusinessChangeService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private XzdBusinessSealServiceImpl xzdBusinessSealService;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询分包合同变更
|
* 查询分包合同变更
|
||||||
@ -97,7 +101,17 @@ public class XzdSubcontractChangeServiceImpl extends ServiceImpl<XzdSubcontractC
|
|||||||
|
|
||||||
private void setValue(List<XzdSubcontractChangeVo> lists) {
|
private void setValue(List<XzdSubcontractChangeVo> lists) {
|
||||||
for (XzdSubcontractChangeVo item : lists) {
|
for (XzdSubcontractChangeVo item : lists) {
|
||||||
|
//印章信息
|
||||||
|
LambdaQueryWrapper<XzdBusinessChange> xzdBusinessChangeWrapper = new LambdaQueryWrapper<>();
|
||||||
|
xzdBusinessChangeWrapper.eq(XzdBusinessChange::getContractChangeId, item.getId());
|
||||||
|
List<XzdBusinessChange> xzdBusinessChanges = xzdBusinessChangeService.list(xzdBusinessChangeWrapper);
|
||||||
|
for (XzdBusinessChange businessChange : xzdBusinessChanges) {
|
||||||
|
XzdBusinessSealVo sealVo = xzdBusinessSealService.queryById(businessChange.getBusinessId());
|
||||||
|
if (sealVo != null){
|
||||||
|
businessChange.setSealName(sealVo.getYzName());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
item.setSealInfo(xzdBusinessChanges);
|
||||||
|
|
||||||
|
|
||||||
// 合同编号名称
|
// 合同编号名称
|
||||||
@ -264,6 +278,15 @@ public class XzdSubcontractChangeServiceImpl extends ServiceImpl<XzdSubcontractC
|
|||||||
});
|
});
|
||||||
iXzdContractClauseService.saveBatch(httk);
|
iXzdContractClauseService.saveBatch(httk);
|
||||||
|
|
||||||
|
//印章信息
|
||||||
|
if (bo.getSealInfo() != null && !bo.getSealInfo().isEmpty()){
|
||||||
|
for (XzdBusinessChange sealInfo : bo.getSealInfo()) {
|
||||||
|
sealInfo.setContractChangeId(add.getId());
|
||||||
|
sealInfo.setType("5");
|
||||||
|
}
|
||||||
|
xzdBusinessChangeService.saveBatch(bo.getSealInfo());
|
||||||
|
}
|
||||||
|
|
||||||
//合同变更清单
|
//合同变更清单
|
||||||
if (bo.getHtbgqds() != null && !bo.getHtbgqds().isEmpty()) {
|
if (bo.getHtbgqds() != null && !bo.getHtbgqds().isEmpty()) {
|
||||||
bo.getHtbgqds().forEach(item->{item.setMainDocumentId(add.getId());});
|
bo.getHtbgqds().forEach(item->{item.setMainDocumentId(add.getId());});
|
||||||
@ -327,6 +350,15 @@ public class XzdSubcontractChangeServiceImpl extends ServiceImpl<XzdSubcontractC
|
|||||||
});
|
});
|
||||||
iXzdContractClauseService.saveBatch(httk);
|
iXzdContractClauseService.saveBatch(httk);
|
||||||
}
|
}
|
||||||
|
//印章信息
|
||||||
|
xzdBusinessChangeService.remove(new LambdaQueryWrapper<XzdBusinessChange>().eq(XzdBusinessChange::getContractChangeId, add.getId()));
|
||||||
|
|
||||||
|
|
||||||
|
for (XzdBusinessChange xzdBusinessChange : bo.getSealInfo()) {
|
||||||
|
xzdBusinessChange.setContractChangeId(add.getId());
|
||||||
|
xzdBusinessChange.setType("5");
|
||||||
|
}
|
||||||
|
xzdBusinessChangeService.saveBatch(bo.getSealInfo());
|
||||||
//合同变更清单
|
//合同变更清单
|
||||||
xzdHtglHtbgqdService.remove(new LambdaQueryWrapper<XzdHtglHtbgqd>().eq(XzdHtglHtbgqd::getMainDocumentId,bo.getId()));
|
xzdHtglHtbgqdService.remove(new LambdaQueryWrapper<XzdHtglHtbgqd>().eq(XzdHtglHtbgqd::getMainDocumentId,bo.getId()));
|
||||||
if (bo.getHtbgqds() != null && !bo.getHtbgqds().isEmpty()) {
|
if (bo.getHtbgqds() != null && !bo.getHtbgqds().isEmpty()) {
|
||||||
@ -371,6 +403,11 @@ public class XzdSubcontractChangeServiceImpl extends ServiceImpl<XzdSubcontractC
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//印章信息
|
||||||
|
xzdBusinessChangeService.remove(new LambdaQueryWrapper<XzdBusinessChange>().in(XzdBusinessChange::getContractChangeId, ids));
|
||||||
|
|
||||||
//合同文本-预收款项
|
//合同文本-预收款项
|
||||||
LambdaQueryWrapper<XzdContractAdvanceInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<XzdContractAdvanceInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||||
lambdaQueryWrapper.in(XzdContractAdvanceInfo::getContractDetailsId, ids);
|
lambdaQueryWrapper.in(XzdContractAdvanceInfo::getContractDetailsId, ids);
|
||||||
|
|||||||
@ -313,4 +313,9 @@ public class XzdSubcontractBo extends BaseEntity {
|
|||||||
private List<XzdHtglHtbgqd> htbgqds;
|
private List<XzdHtglHtbgqd> htbgqds;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 印章信息
|
||||||
|
*/
|
||||||
|
private List<XzdBusinessChange> sealInfo;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -477,4 +477,9 @@ public class XzdSubcontractVo implements Serializable {
|
|||||||
*/
|
*/
|
||||||
private List<XzdHtglHtbgqd> htbgqds;
|
private List<XzdHtglHtbgqd> htbgqds;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 印章信息
|
||||||
|
*/
|
||||||
|
private List<XzdBusinessChange> sealInfo;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -30,6 +30,7 @@ import org.dromara.xzd.contractManagement.purchaseManagement.domain.XzdPurchaseC
|
|||||||
import org.dromara.xzd.contractManagement.purchaseManagement.domain.vo.XzdPurchaseContractInformationVo;
|
import org.dromara.xzd.contractManagement.purchaseManagement.domain.vo.XzdPurchaseContractInformationVo;
|
||||||
import org.dromara.xzd.domain.*;
|
import org.dromara.xzd.domain.*;
|
||||||
import org.dromara.xzd.domain.dto.QuerCorrespondentDto;
|
import org.dromara.xzd.domain.dto.QuerCorrespondentDto;
|
||||||
|
import org.dromara.xzd.domain.vo.XzdBusinessSealVo;
|
||||||
import org.dromara.xzd.enums.XzdClassEnum;
|
import org.dromara.xzd.enums.XzdClassEnum;
|
||||||
import org.dromara.xzd.enums.ZxdEnum;
|
import org.dromara.xzd.enums.ZxdEnum;
|
||||||
import org.dromara.xzd.service.IXzdContractAdvanceInfoService;
|
import org.dromara.xzd.service.IXzdContractAdvanceInfoService;
|
||||||
@ -103,7 +104,13 @@ public class XzdSubcontractServiceImpl extends ServiceImpl<XzdSubcontractMapper,
|
|||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private IXzdHtglHtbgqdService xzdHtglHtbgqdService;
|
private IXzdHtglHtbgqdService xzdHtglHtbgqdService;
|
||||||
private final AreaUtil areaUtil;
|
|
||||||
|
@Autowired
|
||||||
|
private XzdBusinessChangeServiceImpl xzdBusinessChangeService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private XzdBusinessSealServiceImpl xzdBusinessSealService;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询分包合同信息
|
* 查询分包合同信息
|
||||||
@ -141,6 +148,17 @@ public class XzdSubcontractServiceImpl extends ServiceImpl<XzdSubcontractMapper,
|
|||||||
|
|
||||||
private void setValue(List<XzdSubcontractVo> infos) {
|
private void setValue(List<XzdSubcontractVo> infos) {
|
||||||
for (XzdSubcontractVo item : infos) {
|
for (XzdSubcontractVo item : infos) {
|
||||||
|
//印章信息
|
||||||
|
LambdaQueryWrapper<XzdBusinessChange> xzdBusinessChangeWrapper = new LambdaQueryWrapper<>();
|
||||||
|
xzdBusinessChangeWrapper.eq(XzdBusinessChange::getContractChangeId, item.getId());
|
||||||
|
List<XzdBusinessChange> xzdBusinessChanges = xzdBusinessChangeService.list(xzdBusinessChangeWrapper);
|
||||||
|
for (XzdBusinessChange businessChange : xzdBusinessChanges) {
|
||||||
|
XzdBusinessSealVo sealVo = xzdBusinessSealService.queryById(businessChange.getBusinessId());
|
||||||
|
if (sealVo != null){
|
||||||
|
businessChange.setSealName(sealVo.getYzName());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
item.setSealInfo(xzdBusinessChanges);
|
||||||
// //合同文本-预收款项
|
// //合同文本-预收款项
|
||||||
LambdaQueryWrapper<XzdContractAdvanceInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<XzdContractAdvanceInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||||
lambdaQueryWrapper.eq(XzdContractAdvanceInfo::getContractDetailsId, item.getId());
|
lambdaQueryWrapper.eq(XzdContractAdvanceInfo::getContractDetailsId, item.getId());
|
||||||
@ -311,6 +329,15 @@ public class XzdSubcontractServiceImpl extends ServiceImpl<XzdSubcontractMapper,
|
|||||||
bo.getHtzytkyd().setContractDetailsId(add.getId());
|
bo.getHtzytkyd().setContractDetailsId(add.getId());
|
||||||
|
|
||||||
xzdContractDepositInfoService.save(bo.getHtzytkyd());
|
xzdContractDepositInfoService.save(bo.getHtzytkyd());
|
||||||
|
|
||||||
|
//印章信息
|
||||||
|
if (bo.getSealInfo() != null && !bo.getSealInfo().isEmpty()){
|
||||||
|
for (XzdBusinessChange sealInfo : bo.getSealInfo()) {
|
||||||
|
sealInfo.setContractChangeId(add.getId());
|
||||||
|
sealInfo.setType("4");
|
||||||
|
}
|
||||||
|
xzdBusinessChangeService.saveBatch(bo.getSealInfo());
|
||||||
|
}
|
||||||
//合同变更清单
|
//合同变更清单
|
||||||
if (bo.getHtbgqds() != null && !bo.getHtbgqds().isEmpty()) {
|
if (bo.getHtbgqds() != null && !bo.getHtbgqds().isEmpty()) {
|
||||||
bo.getHtbgqds().forEach(item->{item.setMainDocumentId(add.getId());});
|
bo.getHtbgqds().forEach(item->{item.setMainDocumentId(add.getId());});
|
||||||
@ -374,6 +401,16 @@ public class XzdSubcontractServiceImpl extends ServiceImpl<XzdSubcontractMapper,
|
|||||||
});
|
});
|
||||||
iXzdContractClauseService.saveBatch(httk);
|
iXzdContractClauseService.saveBatch(httk);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//印章信息
|
||||||
|
xzdBusinessChangeService.remove(new LambdaQueryWrapper<XzdBusinessChange>().eq(XzdBusinessChange::getContractChangeId, update.getId()));
|
||||||
|
|
||||||
|
|
||||||
|
for (XzdBusinessChange xzdBusinessChange : bo.getSealInfo()) {
|
||||||
|
xzdBusinessChange.setContractChangeId(update.getId());
|
||||||
|
xzdBusinessChange.setType("4");
|
||||||
|
}
|
||||||
|
xzdBusinessChangeService.saveBatch(bo.getSealInfo());
|
||||||
// 支付条款
|
// 支付条款
|
||||||
List<XzdSettlementRules> zftk = bo.getZftk();
|
List<XzdSettlementRules> zftk = bo.getZftk();
|
||||||
xzdSettlementRulesService.getBaseMapper().deleteByMap(hashMap);
|
xzdSettlementRulesService.getBaseMapper().deleteByMap(hashMap);
|
||||||
@ -429,6 +466,9 @@ public class XzdSubcontractServiceImpl extends ServiceImpl<XzdSubcontractMapper,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//印章信息
|
||||||
|
xzdBusinessChangeService.remove(new LambdaQueryWrapper<XzdBusinessChange>().in(XzdBusinessChange::getContractChangeId, ids));
|
||||||
//合同文本-预收款项
|
//合同文本-预收款项
|
||||||
LambdaQueryWrapper<XzdContractAdvanceInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<XzdContractAdvanceInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||||
lambdaQueryWrapper.in(XzdContractAdvanceInfo::getContractDetailsId, ids);
|
lambdaQueryWrapper.in(XzdContractAdvanceInfo::getContractDetailsId, ids);
|
||||||
|
|||||||
@ -337,4 +337,11 @@ public class XzdPurchaseContractInformationBo extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private List<XzdHtglHthzsj> htghthzsjs;
|
private List<XzdHtglHthzsj> htghthzsjs;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 印章信息
|
||||||
|
*/
|
||||||
|
private List<XzdBusinessChange> sealInfo;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -511,6 +511,10 @@ public class XzdPurchaseContractInformationVo implements Serializable {
|
|||||||
*/
|
*/
|
||||||
private List<XzdHtglHthzsj> htghthzsjs;
|
private List<XzdHtglHthzsj> htghthzsjs;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 印章信息
|
||||||
|
*/
|
||||||
|
private List<XzdBusinessChange> sealInfo;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -44,6 +44,7 @@ import org.dromara.xzd.contractManagement.purchaseManagement.mapper.XzdPurchaseC
|
|||||||
import org.dromara.xzd.contractManagement.purchaseManagement.service.IXzdPurchaseContractInformationService;
|
import org.dromara.xzd.contractManagement.purchaseManagement.service.IXzdPurchaseContractInformationService;
|
||||||
import org.dromara.xzd.domain.*;
|
import org.dromara.xzd.domain.*;
|
||||||
import org.dromara.xzd.domain.dto.QuerCorrespondentDto;
|
import org.dromara.xzd.domain.dto.QuerCorrespondentDto;
|
||||||
|
import org.dromara.xzd.domain.vo.XzdBusinessSealVo;
|
||||||
import org.dromara.xzd.domain.vo.XzdContractDetailsVo;
|
import org.dromara.xzd.domain.vo.XzdContractDetailsVo;
|
||||||
import org.dromara.xzd.domain.vo.XzdProjectVo;
|
import org.dromara.xzd.domain.vo.XzdProjectVo;
|
||||||
import org.dromara.xzd.domain.vo.XzdSupplierInfoVo;
|
import org.dromara.xzd.domain.vo.XzdSupplierInfoVo;
|
||||||
@ -113,6 +114,12 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
|
|||||||
|
|
||||||
private final IXzdContractClauseService iXzdContractClauseService;
|
private final IXzdContractClauseService iXzdContractClauseService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private XzdBusinessChangeServiceImpl xzdBusinessChangeService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private XzdBusinessSealServiceImpl xzdBusinessSealService;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -276,6 +283,15 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
|
|||||||
bo.getHtbgqds().forEach(item->{item.setMainDocumentId(add.getId());});
|
bo.getHtbgqds().forEach(item->{item.setMainDocumentId(add.getId());});
|
||||||
xzdHtglHtbgqdService.saveBatch(bo.getHtbgqds());
|
xzdHtglHtbgqdService.saveBatch(bo.getHtbgqds());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//印章信息
|
||||||
|
if (bo.getSealInfo() != null && !bo.getSealInfo().isEmpty()){
|
||||||
|
for (XzdBusinessChange sealInfo : bo.getSealInfo()) {
|
||||||
|
sealInfo.setContractChangeId(add.getId());
|
||||||
|
sealInfo.setType("7");
|
||||||
|
}
|
||||||
|
xzdBusinessChangeService.saveBatch(bo.getSealInfo());
|
||||||
|
}
|
||||||
//汇总数据
|
//汇总数据
|
||||||
if (bo.getHtghthzsjs() != null && !bo.getHtghthzsjs().isEmpty()) {
|
if (bo.getHtghthzsjs() != null && !bo.getHtghthzsjs().isEmpty()) {
|
||||||
bo.getHtghthzsjs().forEach(item->{item.setMainDocumentId(add.getId());});
|
bo.getHtghthzsjs().forEach(item->{item.setMainDocumentId(add.getId());});
|
||||||
@ -344,6 +360,17 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
|
|||||||
bo.getHtzytkyd().setTableName(XzdClassEnum.PURCHASE_CONTRACT_INFORMATION.getClassName());
|
bo.getHtzytkyd().setTableName(XzdClassEnum.PURCHASE_CONTRACT_INFORMATION.getClassName());
|
||||||
xzdContractDepositInfoService.saveOrUpdate(bo.getHtzytkyd());
|
xzdContractDepositInfoService.saveOrUpdate(bo.getHtzytkyd());
|
||||||
|
|
||||||
|
|
||||||
|
//印章信息
|
||||||
|
xzdBusinessChangeService.remove(new LambdaQueryWrapper<XzdBusinessChange>().eq(XzdBusinessChange::getContractChangeId, update.getId()));
|
||||||
|
|
||||||
|
|
||||||
|
for (XzdBusinessChange xzdBusinessChange : bo.getSealInfo()) {
|
||||||
|
xzdBusinessChange.setContractChangeId(update.getId());
|
||||||
|
xzdBusinessChange.setType("7");
|
||||||
|
}
|
||||||
|
xzdBusinessChangeService.saveBatch(bo.getSealInfo());
|
||||||
|
|
||||||
//合同变更清单
|
//合同变更清单
|
||||||
xzdHtglHtbgqdService.remove(new LambdaQueryWrapper<XzdHtglHtbgqd>().eq(XzdHtglHtbgqd::getMainDocumentId,bo.getId()));
|
xzdHtglHtbgqdService.remove(new LambdaQueryWrapper<XzdHtglHtbgqd>().eq(XzdHtglHtbgqd::getMainDocumentId,bo.getId()));
|
||||||
if (bo.getHtbgqds() != null && !bo.getHtbgqds().isEmpty()) {
|
if (bo.getHtbgqds() != null && !bo.getHtbgqds().isEmpty()) {
|
||||||
@ -390,6 +417,10 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//印章信息
|
||||||
|
xzdBusinessChangeService.remove(new LambdaQueryWrapper<XzdBusinessChange>().in(XzdBusinessChange::getContractChangeId, ids));
|
||||||
//合同文本-预收款项
|
//合同文本-预收款项
|
||||||
LambdaQueryWrapper<XzdContractAdvanceInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<XzdContractAdvanceInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||||
lambdaQueryWrapper.in(XzdContractAdvanceInfo::getContractDetailsId, ids);
|
lambdaQueryWrapper.in(XzdContractAdvanceInfo::getContractDetailsId, ids);
|
||||||
@ -439,6 +470,18 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
|
|||||||
public void setValue(List<XzdPurchaseContractInformationVo> infos){
|
public void setValue(List<XzdPurchaseContractInformationVo> infos){
|
||||||
|
|
||||||
for (XzdPurchaseContractInformationVo item : infos) {
|
for (XzdPurchaseContractInformationVo item : infos) {
|
||||||
|
|
||||||
|
//印章信息
|
||||||
|
LambdaQueryWrapper<XzdBusinessChange> xzdBusinessChangeWrapper = new LambdaQueryWrapper<>();
|
||||||
|
xzdBusinessChangeWrapper.eq(XzdBusinessChange::getContractChangeId, item.getId());
|
||||||
|
List<XzdBusinessChange> xzdBusinessChanges = xzdBusinessChangeService.list(xzdBusinessChangeWrapper);
|
||||||
|
for (XzdBusinessChange businessChange : xzdBusinessChanges) {
|
||||||
|
XzdBusinessSealVo sealVo = xzdBusinessSealService.queryById(businessChange.getBusinessId());
|
||||||
|
if (sealVo != null){
|
||||||
|
businessChange.setSealName(sealVo.getYzName());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
item.setSealInfo(xzdBusinessChanges);
|
||||||
//合同文本-预收款项
|
//合同文本-预收款项
|
||||||
LambdaQueryWrapper<XzdContractAdvanceInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<XzdContractAdvanceInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||||
lambdaQueryWrapper.eq(XzdContractAdvanceInfo::getContractDetailsId, item.getId());
|
lambdaQueryWrapper.eq(XzdContractAdvanceInfo::getContractDetailsId, item.getId());
|
||||||
|
|||||||
Reference in New Issue
Block a user