打包管理

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);
 	}
 

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 (
         <!-- 普通项目-->

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

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);

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("编辑成功!");
 	}

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("编辑成功!");
 	}