From 44ada835a1eea8829bb79a726fcdafc4e8b67cfc Mon Sep 17 00:00:00 2001
From: liangqitao <12345678>
Date: Tue, 14 Dec 2021 19:02:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=AE=A1=E7=90=86-=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E5=AE=A1=E6=A0=B8=E6=B5=81=E7=A8=8B=EF=BC=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BD=9C=E5=BA=9F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayIncomeContractController.java          | 29 ++++++++++++++++---
 .../impl/PayIncomeContractServiceImpl.java    | 10 +++++++
 .../impl/PaySpendingContractServiceImpl.java  |  6 ++--
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java
index 310aeec0..21dd76f0 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java
@@ -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);
 	 }
 
 	 /**
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
index 7b33a638..a04b23ec 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
@@ -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)){
+
+                }
 
 
             });
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
index ee4edac8..2dee8b6e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
@@ -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();