日志操作

jy-business/src/main/java/com/jy/business/capital/dao/CapitalAccountDao.java

@@ -54,12 +54,15 @@ public class CapitalAccountDao extends BaseDao<CapitalAccountMapper, CapitalAcco
      */
     public CapitalAccountVo getDetail(Long id) {
         CapitalAccountTable ca = CapitalAccountTable.ca;
+        CorporationTable c = CorporationTable.c;
 
         return sql(CapitalAccountVo.class)
                 .select(
-                        ca.all
+                        ca.all,
+                        c.name.as(CapitalAccountVo::getCorporationName)
                 )
                 .from(ca)
+                .leftJoin(c).on(ca.corporationId.eq(c.id))
                 .where(
                         ca.id.eq(id)
                 )

jy-business/src/main/java/com/jy/business/capital/dao/CapitalTransactionsDao.java

@@ -60,12 +60,23 @@ public class CapitalTransactionsDao extends BaseDao<CapitalTransactionsMapper, C
      */
     public CapitalTransactionsVo getDetail(Long id) {
         CapitalTransactionsTable ct = CapitalTransactionsTable.ct;
+        CapitalAccountTable ca = CapitalAccountTable.ca;
+        CorporationTable c = CorporationTable.c;
+        CorporationShopTable cs = CorporationShopTable.cs;
 
         return sql(CapitalTransactionsVo.class)
                 .select(
-                        ct.all
+                        ct.all,
+                        ca.accountAlias.as(CapitalTransactionsVo::getAccountAlias),
+                        ca.amount.as(CapitalTransactionsVo::getBalance),
+                        ca.initialAmount.as(CapitalTransactionsVo::getInitialAmount),
+                        c.name.as(CapitalTransactionsVo::getCorporationName),
+                        cs.name.as(CapitalTransactionsVo::getCorporationShopName)
                 )
                 .from(ct)
+                .leftJoin(ca).on(ct.capitalAccountId.eq(ca.id))
+                .leftJoin(c).on(ca.corporationId.eq(c.id))
+                .leftJoin(cs).on(cs.id.eq(ct.corporationShopId))
                 .where(
                         ct.id.eq(id)
                 )

jy-business/src/main/java/com/jy/business/capital/model/dto/CapitalTransactionsDto.java

@@ -31,9 +31,9 @@ public class CapitalTransactionsDto extends CapitalTransactions {
     private Integer hasContract;
 
     /**
-     * 账户别名
+     * 资金账号
      */
-    @LogTag(alias = "账户别名")
+    @LogTag(alias = "资金账号")
     private String accountAlias;
 
     /**

jy-business/src/main/java/com/jy/business/corporation/dao/CorporationShopDao.java

@@ -46,12 +46,15 @@ public class CorporationShopDao extends BaseDao<CorporationShopMapper, Corporati
      */
     public CorporationShopVo getDetail(Long id) {
         CorporationShopTable cs = CorporationShopTable.cs;
+        CorporationTable c = CorporationTable.c;
 
         return sql(CorporationShopVo.class)
                 .select(
-                        cs.all
+                        cs.all,
+                        c.name.as(CorporationShopVo::getCorporationName)
                 )
                 .from(cs)
+                .leftJoin(c).on(c.id.eq(cs.corporationId))
                 .where(
                         cs.id.eq(id)
                 )

jy-business/src/main/java/com/jy/business/payment/dao/PaymentRequestsDao.java

@@ -85,20 +85,32 @@ public class PaymentRequestsDao extends BaseDao<PaymentRequestsMapper, PaymentRe
     public PaymentRequestsVo getDetail(Long id) {
         PaymentRequestsTable pr = PaymentRequestsTable.pr;
 
+        // 公司信息
+        CorporationTable c = CorporationTable.c;
         // 部门
         SysDeptTable sd = SysDeptTable.sd;
         // 用户
         SysUserTable su = SysUserTable.su;
+        // 资金账户
+        CapitalAccountTable ca = CapitalAccountTable.ca;
+        // 店铺信息
+        CorporationShopTable cs = CorporationShopTable.cs;
 
         return sql(PaymentRequestsVo.class)
                 .select(
                         pr.all,
+                        c.name.as(PaymentRequestsVo::getCorporationName),
                         sd.name.as(PaymentRequestsVo::getDeptName),
-                        su.nickname.as(PaymentRequestsVo::getUserName)
+                        su.nickname.as(PaymentRequestsVo::getUserName),
+                        ca.accountAlias.as(PaymentRequestsVo::getCapitalAccountName),
+                        cs.name.as(PaymentRequestsVo::getCorporationShopName)
                 )
                 .from(pr)
+                .leftJoin(c).on(pr.corporationId.eq(c.id))
                 .leftJoin(sd).on(pr.deptId.eq(sd.id))
                 .leftJoin(su).on(pr.createUser.eq(su.id))
+                .leftJoin(ca).on(pr.capitalAccountId.eq(ca.id))
+                .leftJoin(cs).on(pr.corporationShopId.eq(cs.id))
                 .where(
                         pr.id.eq(id)
                 )

jy-business/src/main/java/com/jy/business/payment/model/entity/PaymentRequestsDetail.java

@@ -34,10 +34,15 @@ public class PaymentRequestsDetail extends BaseIdPo {
     /**
      * 合同id
      */
-    @LogTag(alias = "关联合同", extendedType = LogTagExtendedType.COMPLEX)
     private Long contractId;
 
     /**
+     * 合同号
+     */
+    @LogTag(alias = "关联合同")
+    private String contractNo;
+
+    /**
      * 费用类型
      */
     @LogTag(alias = "费用类型", extendedType = LogTagExtendedType.DICT, dictCode = "expense_type")