支出管理-详情显示收款中的项目信息

src/main/java/cn/ezhizao/project/business/payment/controller/BizPaymentController.java

@@ -313,6 +313,12 @@ public class BizPaymentController extends BaseController {
                 List<BizPayment> payed = paymentService.getListByBean(payemntConditions);
 //                payment.setNonpayment(archiveInput.getAmount().subtract(BigDecimal.valueOf(collections.stream().mapToDouble(v -> v.getAmount().doubleValue()).sum())).compareTo(BigDecimal.ZERO) > 0);
                 payment.setPayedAmount(BigDecimal.valueOf(payed.stream().mapToDouble(v -> v.getAmount().doubleValue()).sum()));
+                BizCollection collection = new BizCollection();
+                collection.setContractId(archiveInput.getId());
+                List<BizCollection> collList = collectionService.getListByBean(collection);
+                if(!CollectionUtils.isEmpty(collList)) {
+                    payment.setCollection(collList.get(0));
+                }
             }
             SysFileStorage fileConditions = new SysFileStorage();
             fileConditions.setMasterId(payment.getId());

src/main/java/cn/ezhizao/project/business/payment/domain/BizPayment.java

@@ -2,6 +2,7 @@ package cn.ezhizao.project.business.payment.domain;
 
 import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
 import cn.ezhizao.framework.web.domain.BaseEntity;
+import cn.ezhizao.project.business.collection.domain.BizCollection;
 import cn.ezhizao.project.system.domain.SysFileStorage;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -185,4 +186,8 @@ public class BizPayment extends BaseEntity {
     private String boss;
     @TableField(exist = false)
     private String party;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "收款信息")
+    private BizCollection collection;
 }

src/main/resources/mybatis/business/BizCollectionMapper.xml

@@ -302,7 +302,7 @@
     <sql id="getListSql">
         SELECT
         ai.boss,ai.party,
-        a.id, a.flow_no, a.subsidiary_id, a.subsidiary, a.subsidiary_name, a.subsidiary_bank_account, a.form_date
+        a.id, a.flow_no, a.subsidiary_id, a.subsidiary, a.subsidiary_name, a.subsidiary_bank_account, a.form_date, a.contract_id
         , a.subsidiary_bank_name, a.company_id, b.name as company_name
         , a.is_new, a.is_project, a.project_name, a.project_no, a.project_main_name
         , a.amount