From 74de0ec840c0218c3be714be08bd5c016bf0f74e Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 5 Jul 2022 15:53:46 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E6=9B=B4=E6=96=B0=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E5=88=B0=E8=B4=A6=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayConfirmPaymentRecordController.java    | 18 +++++------
 .../impl/PayConfirmPaymentRecordService.java  | 30 +++++++++++++++----
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayConfirmPaymentRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayConfirmPaymentRecordController.java
index 8028f3ab..5da4c470 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayConfirmPaymentRecordController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayConfirmPaymentRecordController.java
@@ -115,18 +115,14 @@ public class PayConfirmPaymentRecordController  extends JeroController<PayConfir
 	}
 
 	/**
-	 * 通过id查询
+	 * 更新所有
 	 */
-	//@AutoLog(value = "-通过id查询")
-	//@ApiOperation(value="-通过id查询", notes="-通过id查询")
-	//@GetMapping(value = "/queryById")
-	//public Result<?> queryById(@RequestParam(name="id") String id) {
-	//	PayConfirmPaymentRecord payConfirmPaymentRecord = payConfirmPaymentRecordService.queryById(id);
-	//	if(payConfirmPaymentRecord==null) {
-	//		return Result.error("未找到对应数据");
-	//	}
-	//	return Result.OK(payConfirmPaymentRecord);
-	//}
+	@ApiOperation(value="-更新所有")
+	@GetMapping(value = "/editAll")
+	public Result<?> editAll() {
+		payConfirmPaymentRecordService.editAll();
+		return Result.OK();
+	}
 
     /**
     * 导出excel
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayConfirmPaymentRecordService.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayConfirmPaymentRecordService.java
index a0caa50e..4dd54d21 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayConfirmPaymentRecordService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayConfirmPaymentRecordService.java
@@ -69,7 +69,9 @@ public class PayConfirmPaymentRecordService extends ServiceImpl<PayConfirmPaymen
             case PayIncomeContractCommon.PROJECT_TYPE1:
 
                 PayCommonProject payCommonProject = payCommonProjectMapper.selectById(projectId);
-
+                if (payCommonProject == null) {
+                    break;
+                }
                 //更新主列表
                 payCommonProject.setConfirmAmount(confirmAmount);
                 payCommonProjectMapper.updateById(payCommonProject);
@@ -78,7 +80,9 @@ public class PayConfirmPaymentRecordService extends ServiceImpl<PayConfirmPaymen
             // 工作组项目
             case PayIncomeContractCommon.PROJECT_TYPE2:
                 PayWorkingGroupSubItem payWorking = payWorkingGroupSubItemMapper.selectById(projectId);
-
+                if (payWorking == null) {
+                    break;
+                }
                 //更新主列表
                 payWorking.setConfirmAmount(confirmAmount);
                 payWorkingGroupSubItemMapper.updateById(payWorking);
@@ -88,7 +92,9 @@ public class PayConfirmPaymentRecordService extends ServiceImpl<PayConfirmPaymen
             case PayIncomeContractCommon.PROJECT_TYPE3:
 
                 PayMeetingSituation meeting = payMeetingSituationMapper.selectById(projectId);
-
+                if (meeting == null) {
+                    break;
+                }
                 //更新主列表
                 meeting.setConfirmAmount(confirmAmount);
                 payMeetingSituationMapper.updateById(meeting);
@@ -98,7 +104,9 @@ public class PayConfirmPaymentRecordService extends ServiceImpl<PayConfirmPaymen
             case PayIncomeContractCommon.PROJECT_TYPE4:
 
                 PayMemberProjectSubitem member = payMemberProjectSubitemMapper.selectById(projectId);
-
+                if (member == null) {
+                    break;
+                }
                 //更新主列表
                 member.setConfirmAmount(confirmAmount);
                 payMemberProjectSubitemMapper.updateById(member);
@@ -108,6 +116,9 @@ public class PayConfirmPaymentRecordService extends ServiceImpl<PayConfirmPaymen
             case PayIncomeContractCommon.PROJECT_TYPE5:
 
                 TbMemberProjectSubitem tbMember = tbMemberProjectSubitemMapper.selectById(projectId);
+                if (tbMember == null) {
+                    break;
+                }
                 //更新主列表
                 tbMember.setConfirmAmount(confirmAmount);
                 tbMemberProjectSubitemMapper.updateById(tbMember);
@@ -116,7 +127,9 @@ public class PayConfirmPaymentRecordService extends ServiceImpl<PayConfirmPaymen
             case PayIncomeContractCommon.PROJECT_TYPE6:
 
                 TbCertificatePayment tbMemberCertificate = certificatePaymentMapper.selectById(projectId);
-
+                if (tbMemberCertificate == null) {
+                    break;
+                }
                 //更新主列表
                 tbMemberCertificate.setConfirmAmount(confirmAmount);
                 certificatePaymentMapper.updateById(tbMemberCertificate);
@@ -132,6 +145,13 @@ public class PayConfirmPaymentRecordService extends ServiceImpl<PayConfirmPaymen
         updateConfirmAmount(payConfirmPaymentRecord);
     }
 
+    public void editAll(){
+        List<PayConfirmPaymentRecord> list = list();
+        for (PayConfirmPaymentRecord payConfirmPaymentRecord : list) {
+            updateConfirmAmount(payConfirmPaymentRecord);
+        }
+    }
+
     public void deleteById(String id) {
         removeById(id);
     }