修改资金转账

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

@@ -13,6 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import io.swagger.annotations.Api;
 import com.dk.mdm.service.mac.MacTransferService;
 
+import java.util.Map;
+
 @Api(tags = "资金转账API接口")
 @RestController
 @RequestMapping("/mac/transfer")
@@ -37,6 +39,16 @@ public class MacTransferController {
     }
 
     /**
+     * @desc : 查询转账明细
+     * @author : 付斌
+     * @date : 2023/1/9 10:36
+     */
+    @PostMapping({"select_mac_transfer_info_by_id/{id}"})
+    public ResponseResultVO<Map<String, Object>> selectMacTransferInfoById(@PathVariable String id) {
+        return macTransferService.selectMacTransferInfoById(id);
+    }
+
+    /**
      * @desc   : 通过ID查询
      * @author : 付斌
      * @date   : 2024/3/1 16:01
@@ -69,6 +81,16 @@ public class MacTransferController {
     }
 
     /**
+     * @desc :查询转账明细（编辑用）
+     * @author : 付斌
+     * @date : 2024-02-28 13:24
+     */
+    @PostMapping({"get_mac_transfer_for_update/{id}"})
+    public ResponseResultVO<?> getMacTransferForUpdate(@PathVariable String id) {
+        return macTransferService.getMacTransferForUpdate(id);
+    }
+
+    /**
      * @desc : 作废
      * @author : 付斌
      * @date : 2024-03-08 16:36

src/main/java/com/dk/mdm/mapper/mac/MacTransferItemMapper.java

@@ -2,6 +2,8 @@ package com.dk.mdm.mapper.mac;
 
 import com.dk.mdm.model.pojo.mac.MacTransferItem;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.query.mac.MacTransferItemQuery;
+import com.dk.mdm.model.response.mac.MacTransferItemResponse;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -11,7 +13,12 @@ import java.util.List;
  */
 @Repository
 public interface MacTransferItemMapper extends BaseMapper<MacTransferItem> {
-
+    /**
+     * @desc   : 根据条件进行查询
+     * @author : 付斌
+     * @date   : 2024-03-19 16:13
+     */
+    List<MacTransferItemResponse> selectByCond(MacTransferItemQuery macTransferItemQuery);
     /**
      * @desc :根据主表主键锁定表t_mac_transfer_item的多行数据
      * @author : 付斌

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

@@ -40,7 +40,7 @@
     <sql id="Condition">
         <where>
             <if test="trfId != null and trfId != ''">
-                AND t.trf_id = #{trfId}
+                AND t.trf_id = #{trfId}::uuid
             </if>
             <if test="trfInMac != null and trfInMac != ''">
                 AND t.trf_in_mac = #{trfInMac}
@@ -79,9 +79,21 @@
 
     <!-- 查询表t_mac_transfer_item，（条件查询+分页）列表 -->
     <select id="selectByCond" resultMap="BaseResultMapResponse">
-        SELECT
-        <include refid="Base_Column_List"/>
+        SELECT t.item_id,
+               t.trf_id,
+               t.trf_in_mac,
+               t.trf_out_mac,
+               t.amt_trf,
+               t.remarks,
+               t.make_staff,
+               t.make_time,
+               t.flg_valid,
+               t.cp_id,
+               main.mac_name  as "trfInMacName",
+               maout.mac_name as "trfOutMacName"
         FROM dkic_b.t_mac_transfer_item 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
         <include refid="Condition"/>
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
@@ -97,9 +109,21 @@
 
     <!-- 根据主键查询表t_mac_transfer_item的一行数据 -->
     <select id="selectById" resultMap="BaseResultMapResponse">
-        SELECT
-        <include refid="Base_Column_List"/>
+        SELECT t.item_id,
+               t.trf_id,
+               t.trf_in_mac,
+               t.trf_out_mac,
+               t.amt_trf,
+               t.remarks,
+               t.make_staff,
+               t.make_time,
+               t.flg_valid,
+               t.cp_id,
+               main.mac_name  as "trfInMacName",
+               maout.mac_name as "trfOutMacName"
         FROM dkic_b.t_mac_transfer_item 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
         WHERE t.item_id = #{id}::uuid
     </select>
 

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

@@ -99,6 +99,7 @@
         SELECT t.trf_id,
                t.trf_no,
                t.trf_type,
+               case when t.trf_type = 0 then '期初' else '转账' end as "trfTypeName",
                t.org_id,
                t.staff_id,
                t.acc_date,
@@ -108,8 +109,6 @@
                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"
@@ -138,6 +137,7 @@
         SELECT t.trf_id,
                t.trf_no,
                t.trf_type,
+               case when t.trf_type = 0 then '期初' else '转账' end as "trfTypeName",
                t.org_id,
                t.staff_id,
                t.acc_date,
@@ -147,8 +147,6 @@
                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"

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

@@ -123,6 +123,11 @@ public class MacTransferItemResponse extends PageInfo<MacTransferItemResponse> i
     @ApiModelProperty(value = "企业ID")
     private Integer cpId;
 
+    @ApiModelProperty(value = "转入账户")
+    private String trfInMacName;
+
+    @ApiModelProperty(value = "转出账户")
+    private String trfOutMacName;
 
     private static final long serialVersionUID = 1L;
 

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

@@ -146,11 +146,8 @@ 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 trfTypeName;
 
     @ApiModelProperty(value = "组织名称")
     private String orgName;

src/main/java/com/dk/mdm/service/mac/MacTransferService.java

@@ -20,8 +20,8 @@ import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.pojo.mac.MacTransferItem;
 import com.dk.mdm.model.pojo.mst.MoneyAccount;
 import com.dk.mdm.model.pojo.mst.MoneyAccountItem;
-import com.dk.mdm.model.query.mac.MacTransferQuery;
-import com.dk.mdm.model.response.mac.MacTransferResponse;
+import com.dk.mdm.model.query.mac.*;
+import com.dk.mdm.model.response.mac.*;
 import com.dk.mdm.model.vo.mac.MacTransferVO;
 import com.dk.mdm.model.vo.mac.MacTransferItemVO;
 import com.dk.mdm.service.common.CommonService;
@@ -31,6 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -87,6 +88,22 @@ public class MacTransferService extends BaseService<MacTransfer> {
 	}
 
 	/**
+	 * @desc : 查询转账明细
+	 * @author : 付斌
+	 * @date : 2024-02-28 13:25
+	 */
+	@Pagination
+	public ResponseResultVO<Map<String, Object>> selectMacTransferInfoById(String id) {
+		Map<String, Object> result = new HashMap<>();
+		// 转账明细
+		List<MacTransferItemResponse> macTransferItemResponse = macTransferItemMapper.selectByCond(new MacTransferItemQuery().setTrfId(id));
+		result.put("macTransferItem", macTransferItemResponse);
+
+		// 附件
+		return ResponseResultUtil.success(result);
+	}
+
+	/**
 	 * @desc   : 条件查询
 	 * @author : 付斌
 	 * @date   : 2023/2/29 10:40
@@ -183,8 +200,8 @@ public class MacTransferService extends BaseService<MacTransfer> {
 			if (!macList.contains(macTransferItem.getTrfOutMac())) {
 				macList.add(macTransferItem.getTrfOutMac());
 			}
-			if (!macList.contains(macTransferItem.getTrfOutMac())) {
-				macList.add(macTransferItem.getTrfOutMac());
+			if (!macList.contains(macTransferItem.getTrfInMac())) {
+				macList.add(macTransferItem.getTrfInMac());
 			}
 		}
 
@@ -212,8 +229,8 @@ public class MacTransferService extends BaseService<MacTransfer> {
 				if (!macList.contains(macTransferItem.getTrfOutMac())) {
 					macList.add(macTransferItem.getTrfOutMac());
 				}
-				if (!macList.contains(macTransferItem.getTrfOutMac())) {
-					macList.add(macTransferItem.getTrfOutMac());
+				if (!macList.contains(macTransferItem.getTrfInMac())) {
+					macList.add(macTransferItem.getTrfInMac());
 				}
 			}
 		}
@@ -230,6 +247,23 @@ public class MacTransferService extends BaseService<MacTransfer> {
 	}
 
 	/**
+	 * @desc : 查询转账明细（编辑用）
+	 * @author : 付斌
+	 * @date : 2024-03-02 17:27
+	 */
+	public ResponseResultVO<?> getMacTransferForUpdate(String id) {
+		Map<String, Object> dataInfo = new HashMap<>();
+		MacTransferResponse macTransferResponse = macTransferMapper.selectById(id);
+		dataInfo.put("data", macTransferResponse);
+
+		// 转账明细
+		List<MacTransferItemResponse> macTransferItemResponse = macTransferItemMapper.selectByCond(new MacTransferItemQuery().setTrfId(id));
+		dataInfo.put("dataItem", macTransferItemResponse);
+
+		return ResponseResultUtil.success(dataInfo);
+	}
+
+	/**
 	 * @desc : 作废
 	 * @author : 付斌
 	 * @date : 2024-03-08 16:38
@@ -254,8 +288,8 @@ public class MacTransferService extends BaseService<MacTransfer> {
 			if (!macList.contains(macTransferItem.getTrfOutMac())) {
 				macList.add(macTransferItem.getTrfOutMac());
 			}
-			if (!macList.contains(macTransferItem.getTrfOutMac())) {
-				macList.add(macTransferItem.getTrfOutMac());
+			if (!macList.contains(macTransferItem.getTrfInMac())) {
+				macList.add(macTransferItem.getTrfInMac());
 			}
 		}