diff --git a/src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java b/src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java index b171961..0adb9aa 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java +++ b/src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java @@ -97,6 +97,7 @@ public class CashRecordDone { private String executorName; private String refundCurrency; private String refundAmount; + private String marketName; private String processInstanceId; // 流程实例ID private String currentTaskId; // 当前任务ID diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java index 4a0be2e..a3b192c 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java @@ -5,7 +5,6 @@ import com.example.demo.domain.vo.cash.CashCollection; import com.example.demo.domain.vo.cash.CashRecordDone; import com.example.demo.domain.vo.coin.Result; import com.example.demo.mapper.cash.CashRefundMapper; -import com.example.demo.service.cash.MarketService; import com.example.demo.service.cash.RefundService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -29,13 +28,10 @@ public class CashRefundServiceImpl implements RefundService { @Autowired private CashRefundMapper cashRefundMapper; - @Autowired - private MarketService marketService; @Override public PageInfo select(Integer pageNum, Integer pageSize,CashRecordDone cashRecordDone) { PageHelper.startPage(pageNum, pageSize); // System.out.println(goldDetail.getMarkets()); - cashRecordDone.setMarket(String.valueOf(marketService.getMarketById(Integer.valueOf(cashRecordDone.getMarket())))); List list = cashRefundMapper.select(cashRecordDone); return new PageInfo<>(list); } diff --git a/src/main/resources/cashMapper/CashRefundMapper.xml b/src/main/resources/cashMapper/CashRefundMapper.xml index ff7bcd0..7532bc6 100644 --- a/src/main/resources/cashMapper/CashRefundMapper.xml +++ b/src/main/resources/cashMapper/CashRefundMapper.xml @@ -139,10 +139,12 @@ a1.admin_name as submitterName, a2.admin_name as auditName, a3.admin_name as executorName + m.name as marketName, from cash_record cr left join admin a1 on submitter_id = a1.id left join admin a2 on audit_id = a2.id left join admin a3 on executor = a3.account + left join market m on m.id = cr.market cr.order_type = 2