资金转账

src/main/java/com/dk/mdm/controller/mac/MacTransferController.java

@@ -1,5 +1,6 @@
 package com.dk.mdm.controller.mac;
 
+import com.dk.common.controller.BaseController;
 import com.dk.mdm.model.pojo.mac.MacTransfer;
 import com.dk.common.service.BaseService;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -10,8 +11,8 @@ import com.dk.mdm.service.mac.MacTransferService;
 
 @Api(tags = "资金转账API接口")
 @RestController
-@RequestMapping("/transfer")
-public class MacTransferController {
+@RequestMapping("/mac/transfer")
+public class MacTransferController extends BaseController<MacTransfer> {
 
     public BaseService<MacTransfer> getService() {
         return macTransferService;

src/main/java/com/dk/mdm/mapper/mac/MacTransferMapper.xml

@@ -126,10 +126,14 @@
                t.make_time,
                t.flg_valid,
                t.cp_id,
+               main.mac_name        as "trfInMacName",
+               maout.mac_name       as "trfOutMacName",
                tmo.org_name         as "orgName",
                tms.staff_name       as "staffName",
                makestaff.staff_name as "makeStaffName"
         FROM dkic_b.t_mac_transfer as t
+                 left join dkic_b.t_mst_money_account as main on main.mac_id = t.trf_in_mac
+                 left join dkic_b.t_mst_money_account as maout on maout.mac_id = t.trf_out_mac
                  left join dkic_b.t_mst_org tmo on t.org_id = tmo.org_id
                  left join dkic_b.t_mst_staff tms on t.staff_id = tms.staff_id
                  left join dkic_b.t_mst_staff as makestaff on t.make_staff = makestaff.staff_id
@@ -143,6 +147,8 @@
     <select id="countByCond" resultType="Long">
         SELECT count(1)
         FROM dkic_b.t_mac_transfer as t
+                 left join dkic_b.t_mst_money_account as main on main.mac_id = t.trf_in_mac
+                 left join dkic_b.t_mst_money_account as maout on maout.mac_id = t.trf_out_mac
                  left join dkic_b.t_mst_org tmo on t.org_id = tmo.org_id
                  left join dkic_b.t_mst_staff tms on t.staff_id = tms.staff_id
                  left join dkic_b.t_mst_staff as makestaff on t.make_staff = makestaff.staff_id
@@ -151,10 +157,33 @@
 
     <!-- 根据主键查询表t_mac_transfer的一行数据 -->
     <select id="selectById" resultMap="BaseResultMapResponse">
-        SELECT
-        <include refid="Base_Column_List"/>
-        FROM dkic_b.t_mac_transfer
-        WHERE trf_id = #{trfId}::uuid
+        SELECT t.trf_id,
+               t.trf_no,
+               t.trf_type,
+               t.org_id,
+               t.staff_id,
+               t.trf_in_mac,
+               t.trf_out_mac,
+               t.amt_trf,
+               t.acc_date,
+               t.remarks,
+               t.annex_paths,
+               t.make_staff,
+               t.make_time,
+               t.flg_valid,
+               t.cp_id,
+               main.mac_name        as "trfInMacName",
+               maout.mac_name       as "trfOutMacName",
+               tmo.org_name         as "orgName",
+               tms.staff_name       as "staffName",
+               makestaff.staff_name as "makeStaffName"
+        FROM dkic_b.t_mac_transfer as t
+                 left join dkic_b.t_mst_money_account as main on main.mac_id = t.trf_in_mac
+                 left join dkic_b.t_mst_money_account as maout on maout.mac_id = t.trf_out_mac
+                 left join dkic_b.t_mst_org tmo on t.org_id = tmo.org_id
+                 left join dkic_b.t_mst_staff tms on t.staff_id = tms.staff_id
+                 left join dkic_b.t_mst_staff as makestaff on t.make_staff = makestaff.staff_id
+        WHERE trf_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_mac_transfer的一行数据 -->

src/main/java/com/dk/mdm/model/response/mac/MacTransferResponse.java

@@ -172,6 +172,11 @@ public class MacTransferResponse extends PageInfo<MacTransferResponse> implement
     @ApiModelProperty(value = "企业ID")
     private Integer cpId;
 
+    @ApiModelProperty(value = "转入账户")
+    private String trfInMacName;
+
+    @ApiModelProperty(value = "转出账户")
+    private String trfOutMacName;
 
     @ApiModelProperty(value = "组织名称")
     private String orgName;