From 459d58762d7b1db5153a610411a56b0ec1decc6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Mon, 13 Sep 2021 12:05:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayPackCompanyController.java   | 18 +++++++++++++-----
 .../pack/mapper/xml/PayPackCompanyMapper.xml   |  1 -
 .../service/IPayPackCompanyProjectService.java |  2 +-
 .../impl/PayPackCompanyProjectServiceImpl.java |  1 +
 .../controller/PayCommonProjectController.java |  1 +
 .../PayWorkingGroupSubItemController.java      |  1 +
 6 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java
index 2449ba65..23e97969 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java
@@ -82,15 +82,13 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
 				input.setPackId(p.getId());
 				PayCommonProject payCommonProject = payPackCompanyService.queryPackListCount(input);
 				if(!Objects.isNull(payCommonProject)){
-					payCommonProject.setReceivableAmount(payCommonProject.getReceivableAmount());
-					payCommonProject.setPaidAmount(payCommonProject.getPaidAmount());
+					p.setReceiptExpense(payCommonProject.getPaidAmount());
 				}else{
-					payCommonProject.setReceivableAmount(new BigDecimal("0.00"));
-					payCommonProject.setPaidAmount(new BigDecimal("0.00"));
+					p.setReceiptExpense(new BigDecimal("0.00"));
 				}
 				// todo 获取开票金额
-
 			});
+			pageList.setRecords(list);
 		}
 		return Result.OK(pageList);
 	}
@@ -209,6 +207,16 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
 				payPackCompany.setEmail(PasswordUtil.decrypt(payContactsManagementTemporary.getEmail()));
 			}
 		}
+		// 获取 打包费用，实际到账金额
+		PayPackCompanyProjectInput input = new PayPackCompanyProjectInput();
+		input.setCompanyId(payPackCompany.getCompanyId());
+		input.setPackId(payPackCompany.getId());
+		PayCommonProject payCommonProject = payPackCompanyService.queryPackListCount(input);
+		if(!Objects.isNull(payCommonProject)){
+			payPackCompany.setReceiptExpense(payCommonProject.getPaidAmount());
+		}else{
+			payPackCompany.setReceiptExpense(new BigDecimal("0.00"));
+		}
 		return Result.OK(payPackCompany);
 	}
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml
index e47584a8..4da2637e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml
@@ -3,7 +3,6 @@
 <mapper namespace="com.jero.pack.mapper.PayPackCompanyMapper">
     <select id="queryPackListCount" resultType="com.jero.project.entity.PayCommonProject">
         SELECT
-        sum(receivable_amount) as receivable_amount,
         sum(paid_amount) as paid_amount
          FROM (
         <!-- 普通项目-->
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyProjectService.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyProjectService.java
index 2d23d8a3..6117860e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyProjectService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyProjectService.java
@@ -39,7 +39,7 @@ public interface IPayPackCompanyProjectService extends IService<PayPackCompanyPr
     * @Return
     * @Exception
     */
-    void addPayPackCompanyProject(PayPackCompanyProject payPackCompanyProject);
+    void addPayPackCompanyProject(PayPackCompanyProject  payPackCompanyProject);
     /**
     * @Description 取消打包
     * @Author  lqt
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java
index ec450178..7df85861 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java
@@ -78,6 +78,7 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
             if(CollectionUtils.isEmpty(list)){
                 throw new JeroBootException("项目下企业不匹配!");
             }
+            payPackCompanyProject.setProjectType(list.get(0).getProjectType());
             payPackCompanyProject.setProjectId(s1);
             payPackCompanyProject.setCome(PackCommon.COME2);
             listPayPackCompanyProject.add(payPackCompanyProject);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
index 558f7677..0aa7272d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
@@ -209,6 +209,7 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 		if(!StringUtils.isBlank(msg)){
 			return Result.error(msg.toString());
 		}
+		// todo 缺少修改应收金额时查询状态，更新状态
 		payCommonProjectService.editPayCommonProject(payCommonProject);
 		return Result.OK("编辑成功!");
 	}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
index 474b9530..d030bfb0 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
@@ -104,6 +104,7 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 		if(!StringUtils.isBlank(msg)){
 			return Result.error(msg.toString());
 		}
+		// todo 缺少修改应收金额时查询状态，更新状态
 		payWorkingGroupSubItemService.editPayWorkingGroupSubItem(payWorkingGroupSubItem);
 		return Result.OK("编辑成功!");
 	}