LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合同管理-去掉审核流程，添加作废功能

Browse Source
This commit is contained in:
liangqitao
2021-12-14 19:02:12 +08:00
parent eb040dbe44
commit 44ada835a1
3 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java
+25 -4
View File
@@ -265,9 +265,30 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
@ApiOperation(value="收入合同-关联", notes="收入合同-关联")
@GetMapping(value = "/getAssociated")
public Result<?> getAssociated(@RequestParam("contractId") String contractId) {
List<ProjectOutput> list = payIncomeContractService.getAssociated(contractId);
if(!CollectionUtils.isEmpty(list)){
list.forEach(p->{
PayIncomeContract payIncomeContract = payIncomeContractService.getById(contractId);
if(payIncomeContract==null) {
return Result.error("未找到对应数据");
}
List<ProjectOutput> listProject = new ArrayList<>();
// 获取关联项目id
if(Objects.equals(payIncomeContract.getStatus(),PayIncomeContractCommon.STATUS6)){
LambdaQueryWrapper<PayIncomeContractAssociatedCancellation> queryPayIncomeContractAssociatedCancellation = new LambdaQueryWrapper();
queryPayIncomeContractAssociatedCancellation.eq(PayIncomeContractAssociatedCancellation::getContractId,payIncomeContract.getId());
List<PayIncomeContractAssociatedCancellation> listPayIncomeContractAssociatedCancellation = payIncomeContractAssociatedCancellationService.list(queryPayIncomeContractAssociatedCancellation);
if(!CollectionUtils.isEmpty(listPayIncomeContractAssociatedCancellation)){
List<ProjectOutput> finalListProject = listProject;
listPayIncomeContractAssociatedCancellation.forEach(p->{
String s = JSON.toJSONString(p);
ProjectOutput projectOutput = JSONObject.parseObject(s,ProjectOutput.class);
projectOutput.setId(p.getAssociatedId());
finalListProject.add(projectOutput);
});
}
}else{
listProject = payIncomeContractService.getAssociated(contractId);
}
if(!CollectionUtils.isEmpty(listProject)){
listProject.forEach(p->{
if(!Objects.isNull(p.getChargeUse())){
p.setChargeUse_dictText(sysBaseAPI.translateDict("payment_charge_use",String.valueOf(p.getChargeUse())));
}
@@ -279,7 +300,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
}
});
}
return Result.OK(list);
return Result.OK(listProject);
}
/**
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
+10
View File
@@ -1030,7 +1030,17 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
payIncomeContractAssociatedCancellation.setId(null);
payIncomeContractAssociatedCancellation.setAssociatedId(p.getId());
list.add(payIncomeContractAssociatedCancellation);
if(Objects.equals(p.getProjectType(),PayIncomeContractCommon.PROJECT_TYPE1)){
}else if(Objects.equals(p.getProjectType(),PayIncomeContractCommon.PROJECT_TYPE2)){
}else if(Objects.equals(p.getProjectType(),PayIncomeContractCommon.PROJECT_TYPE3)){
}else if(Objects.equals(p.getProjectType(),PayIncomeContractCommon.PROJECT_TYPE4)){
}else if(Objects.equals(p.getProjectType(),PayIncomeContractCommon.PROJECT_TYPE4)){
}
});
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
+3 -3
View File
@@ -755,9 +755,9 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
if(!Objects.equals(paySpendingContractStatus.getStatus(),PayIncomeContractCommon.STATUS3)){
throw new JeroBootException("支出合同不可归档！");
}
if(Objects.isNull(paySpendingContractAudit.getContractStatus())
|| !Objects.equals(paySpendingContractAudit.getContractStatus(),PayIncomeContractCommon.STATUS5)
|| !Objects.equals(paySpendingContractAudit.getContractStatus(),PayIncomeContractCommon.STATUS6)){
if(!Objects.equals(paySpendingContractAudit.getContractStatus(),PayIncomeContractCommon.STATUS5)
|| Objects.equals(paySpendingContractStatus.getStatus(),PayIncomeContractCommon.STATUS5)
|| Objects.equals(paySpendingContractStatus.getStatus(),PayIncomeContractCommon.STATUS6)){
throw new JeroBootException("支出合同状态不正确！");
}
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();