diff --git a/bonus-admin/src/main/java/com/bonus/web/domain/TransferApplyDto.java b/bonus-admin/src/main/java/com/bonus/web/domain/TransferApplyDto.java index a28163a..94267dc 100644 --- a/bonus-admin/src/main/java/com/bonus/web/domain/TransferApplyDto.java +++ b/bonus-admin/src/main/java/com/bonus/web/domain/TransferApplyDto.java @@ -53,6 +53,7 @@ public class TransferApplyDto { private String auditUserName; private String transfertTime; + /** * 申请时间 */ @@ -67,6 +68,9 @@ public class TransferApplyDto { */ private String auditStatus; + // 接收进度 0.进行中 1.已完成 + private String receiveStatus; + /** * 审批意见 */ diff --git a/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml b/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml index 2c81807..e367508 100644 --- a/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml +++ b/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml @@ -345,6 +345,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dkta.apply_user AS applyUser, dkta.apply_time AS applyTime, dkta.audit_status AS auditStatus, + dkta.receive_status AS receiveStatus, dkta.audit_opinion AS auditOpinion, dkta.transfer_status AS transferStatus, dkta.transfer_time AS transferTime,