Browse Source

10.16修改地区传输id与名称映射

lijianlin/feature-202509231533026-现金管理-收款管理
huangqizhen 1 month ago
parent
commit
d7e324acec
  1. 1
      src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java
  2. 4
      src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java
  3. 2
      src/main/resources/cashMapper/CashRefundMapper.xml

1
src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java

@ -97,6 +97,7 @@ public class CashRecordDone {
private String executorName; private String executorName;
private String refundCurrency; private String refundCurrency;
private String refundAmount; private String refundAmount;
private String marketName;
private String processInstanceId; // 流程实例ID private String processInstanceId; // 流程实例ID
private String currentTaskId; // 当前任务ID private String currentTaskId; // 当前任务ID

4
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.cash.CashRecordDone;
import com.example.demo.domain.vo.coin.Result; import com.example.demo.domain.vo.coin.Result;
import com.example.demo.mapper.cash.CashRefundMapper; import com.example.demo.mapper.cash.CashRefundMapper;
import com.example.demo.service.cash.MarketService;
import com.example.demo.service.cash.RefundService; import com.example.demo.service.cash.RefundService;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
@ -29,13 +28,10 @@ public class CashRefundServiceImpl implements RefundService {
@Autowired @Autowired
private CashRefundMapper cashRefundMapper; private CashRefundMapper cashRefundMapper;
@Autowired
private MarketService marketService;
@Override @Override
public PageInfo<CashCollection> select(Integer pageNum, Integer pageSize,CashRecordDone cashRecordDone) { public PageInfo<CashCollection> select(Integer pageNum, Integer pageSize,CashRecordDone cashRecordDone) {
PageHelper.startPage(pageNum, pageSize); PageHelper.startPage(pageNum, pageSize);
// System.out.println(goldDetail.getMarkets()); // System.out.println(goldDetail.getMarkets());
cashRecordDone.setMarket(String.valueOf(marketService.getMarketById(Integer.valueOf(cashRecordDone.getMarket()))));
List<CashCollection> list = cashRefundMapper.select(cashRecordDone); List<CashCollection> list = cashRefundMapper.select(cashRecordDone);
return new PageInfo<>(list); return new PageInfo<>(list);
} }

2
src/main/resources/cashMapper/CashRefundMapper.xml

@ -139,10 +139,12 @@
a1.admin_name as submitterName, a1.admin_name as submitterName,
a2.admin_name as auditName, a2.admin_name as auditName,
a3.admin_name as executorName a3.admin_name as executorName
m.name as marketName,
from cash_record cr from cash_record cr
left join admin a1 on submitter_id = a1.id left join admin a1 on submitter_id = a1.id
left join admin a2 on audit_id = a2.id left join admin a2 on audit_id = a2.id
left join admin a3 on executor = a3.account left join admin a3 on executor = a3.account
left join market m on m.id = cr.market
<where> <where>
cr.order_type = 2 cr.order_type = 2
<if test="status != null"> <if test="status != null">

Loading…
Cancel
Save