供应商

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

@@ -90,6 +90,7 @@ public class MacTransferController {
         return macTransferService.getMacTransferForUpdate(id);
     }
 
+
     /**
      * @desc : 作废
      * @author : 付斌

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

@@ -49,7 +49,33 @@ public class MacTransferResponse extends PageInfo<MacTransferResponse> implement
     @TableField(typeHandler = UuidTypeHandler.class)
     private String trfId;
 
+    /**
+     * 转入账户
+     */
+    @Excel(name = "转入账户")
+    @ApiModelProperty(value = "转入账户")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String trfInMac;
+
+
+    /**
+     * 转出账户
+     */
+    @Excel(name = "转出账户")
+    @ApiModelProperty(value = "转出账户")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String trfOutMac;
+    @ApiModelProperty(value = "转入账户")
+    private String trfInMacName;
 
+    @ApiModelProperty(value = "转出账户")
+    private String trfOutMacName;
+    /**
+     * 转账金额
+     */
+    @Excel(name = "转账金额")
+    @ApiModelProperty(value = "转账金额")
+    private BigDecimal amtTrf;
     /**
      * 转账单号
      */

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

@@ -83,7 +83,22 @@ public class MacTransferService extends BaseService<MacTransfer> {
 	 */
 	@Pagination
 	public ResponseResultVO<PageList<MacTransferResponse>> selectByCond(MacTransferQuery macTransferQuery) {
-		return super.mergeListWithCount(macTransferQuery, macTransferMapper.selectByCond(macTransferQuery),
+		List<MacTransferResponse> list = new ArrayList<>();
+		list = macTransferMapper.selectByCond(macTransferQuery);
+		for(int i =0;i<list.size();i++){ //显示明细第一条的 内容
+			list.get(i).getTrfId();
+			// 转账明细
+			List<MacTransferItemResponse> itemList = macTransferItemMapper.selectByCond(new MacTransferItemQuery().setTrfId(list.get(i).getTrfId()));
+	     if(itemList.size()>0){
+			 list.get(i).setTrfInMac(itemList.get(0).getTrfInMac());
+			 list.get(i).setTrfOutMac(itemList.get(0).getTrfOutMac());
+			 list.get(i).setAmtTrf(itemList.get(0).getAmtTrf());
+			 list.get(i).setTrfInMacName(itemList.get(0).getTrfInMacName());
+			 list.get(i).setTrfOutMacName(itemList.get(0).getTrfOutMacName());
+		 }
+		}
+
+		return super.mergeListWithCount(macTransferQuery, list,
 				macTransferMapper.countByCond(macTransferQuery));
 	}