weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

计费单据获取通用合同

Browse Source
This commit is contained in:
zhou-hongcheng
2026-03-17 21:41:15 +08:00
parent 3f69f0c315
commit 3ad35af34b
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/contractManage/ContractManageApplicationService.java
+11 -4
View File
@@ -420,10 +420,15 @@ public class ContractManageApplicationService {
if(null == contractManagePO){ if(null == contractManagePO){
if(contractType==1){ if(contractType==1){
//仓储合同 //仓储合同
resultContract = contractManagePOList.stream().filter(item -> item.getContractType()==1).findFirst().orElse(null); resultContract = contractManagePOList.stream()
.filter(item ->
item.getContractType()==1 &&
item.getCommonContractFlag() == 1 && item.getContractState() ==2)
.findFirst().orElse(null);
}else{ }else{
//运输合同 //运输合同
resultContract = contractManagePOList.stream().filter(item -> item.getContractType()==2).findFirst().orElse(null); resultContract = contractManagePOList.stream().filter(item -> item.getContractType()==2
&& item.getCommonContractFlag() == 1 && item.getContractState() ==2).findFirst().orElse(null);
} }
}else { }else {
resultContract = contractManagePO; resultContract = contractManagePO;
@@ -431,10 +436,12 @@ public class ContractManageApplicationService {
}else { }else {
if(contractType==1){ if(contractType==1){
//仓储合同 //仓储合同
resultContract = contractManagePOList.stream().filter(contractManagePO -> contractManagePO.getContractType()==1).findFirst().orElse(null); resultContract = contractManagePOList.stream().filter(contractManagePO -> contractManagePO.getContractType()==1
&& contractManagePO.getCommonContractFlag() == 1 && contractManagePO.getContractState() ==2).findFirst().orElse(null);
}else{ }else{
//运输合同 //运输合同
resultContract = contractManagePOList.stream().filter(contractManagePO -> contractManagePO.getContractType()==2).findFirst().orElse(null); resultContract = contractManagePOList.stream().filter(contractManagePO -> contractManagePO.getContractType()==2
&& contractManagePO.getCommonContractFlag() == 1 && contractManagePO.getContractState() ==2).findFirst().orElse(null);
} }
} }
if(null == resultContract){ if(null == resultContract){