Просмотр исходного кода

付款管理-列表查询余额增加A-B账户表余额

ZhangWenQiang 5 лет назад
Родитель
Сommit
f920057e89

+ 7 - 0
happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgpayment/entity/HlgPayment.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.jeecg.modules.hlgaccount.entity.HlgAccount;
+import org.jeecg.modules.hlgcpmanager.entity.HlgCpAccount;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
@@ -166,4 +167,10 @@ public class HlgPayment implements Serializable {
      */
     @TableField(exist = false)
     private Integer isAllSuccess;
+
+    /**
+     * 平台账户表
+     */
+    @TableField(exist = false)
+    private HlgCpAccount hlgCpAccount;
 }

+ 3 - 1
happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgpayment/mapper/xml/HlgPaymentMapper.xml

@@ -24,13 +24,15 @@
 		a.del_flag AS "delFlag",
 		com.company_name AS "companyName",
 		sub.name AS "subcontractorName",
-		acc.balance AS "hlgAccount.balance"
+		acc.balance AS "hlgAccount.balance",
+		cpa.balance AS "hlgCpAccount.balance"
 	</sql>
 
     <sql id="hlgPaymentJoins">
 		LEFT JOIN hlg_company com ON com.id = a.company_id
 		LEFT JOIN hlg_subcontractor sub ON sub.id = a.subcontractor_id
 		LEFT JOIN hlg_account acc ON acc.company_id = a.company_id and acc.subcontractor_id = a.subcontractor_id
+		LEFT JOIN hlg_cp_account cpa ON cpa.company_id = a.company_id
     </sql>