mengxu/pusong-crm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
1073413548 2024-09-04 18:03:36 +08:00
parent 69769e0092
commit 46dc374267
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/CancellaApproverServiceImpl.java
View File

@ -61,8 +61,8 @@ public class CancellaApproverServiceImpl extends ApproverAbstractServiceImpl {
.eq(PsTaskAppoint::getContractCode, psApproverRecord.getContractCode())); .eq(PsTaskAppoint::getContractCode, psApproverRecord.getContractCode()));
//审批删除 //审批删除
if(CollectionUtils.isNotEmpty(list)){ if(CollectionUtils.isNotEmpty(list)){
List<Long> ids = list.stream().map(PsTaskMain::getId).toList(); List<String> ids = new java.util.ArrayList<>(list.stream().map(PsTaskMain::getId).map(Object::toString).toList());
if(CollectionUtils.isNotEmpty(lis)){ids.addAll(lis.stream().map(PsTaskAppoint::getId).toList());} if(CollectionUtils.isNotEmpty(lis)){ids.addAll(lis.stream().map(PsTaskAppoint::getId).map(Object::toString).toList());}
baseMapper.update(Wrappers.<PsApproverRecord>lambdaUpdate().set(PsApproverRecord::getDelFlag, "2") baseMapper.update(Wrappers.<PsApproverRecord>lambdaUpdate().set(PsApproverRecord::getDelFlag, "2")
.in(PsApproverRecord::getBusinessId,ids)); .in(PsApproverRecord::getBusinessId,ids));
} }

5
pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java
View File

@ -321,11 +321,14 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService {
info.setContractCode(contractCode); info.setContractCode(contractCode);
//查询合同详细信息 //查询合同详细信息
PsContractInfoVo infoVo = this.queryContractByCode(contractCode); PsContractInfoVo infoVo = this.queryContractByCode(contractCode);
if(StringUtils.equals(CustomerStatusEnum.STOP.getCode(),infoVo.getPsCustomInfoVo().getCustomStatus())){
throw new ServiceException("操作失败，客户已终止合作");
}
//没有任何一笔收款：点击【作废】，直接作废合同 //没有任何一笔收款：点击【作废】，直接作废合同
if(CollectionUtils.isEmpty(infoVo.getContractPayVoList())){ if(CollectionUtils.isEmpty(infoVo.getContractPayVoList())){
info.setIsCancel(CommonStatusEnum.SUCCESS.getCode()); info.setIsCancel(CommonStatusEnum.SUCCESS.getCode());
}else{ }else{
if(StringUtils.isBlank(desc)){throw new ServiceException("请填写作废原因");} if(StringUtils.isBlank(desc)){throw new ServiceException("请填写作废原因");}
//有收款：点击【作废】填写【作废原因】后发起【作废】审批 //有收款：点击【作废】填写【作废原因】后发起【作废】审批
ApproverService service = container.getService(ApproverTypeEnum.CANCELLA.getCode()); ApproverService service = container.getService(ApproverTypeEnum.CANCELLA.getCode());