|
|
|
@@ -103,10 +103,20 @@ public class WxOfflineActivityRecord extends TenantEntity { |
|
|
|
} |
|
|
|
return lotteryNumList; |
|
|
|
} |
|
|
|
@Excel(name = "抽奖券编码", width = 20, orderNum = "9") |
|
|
|
@TableField(exist = false) |
|
|
|
private String lotteryNumStr; |
|
|
|
public String getLotteryNumStr() { |
|
|
|
if(lotteryNumList != null && !lotteryNumList.isEmpty()){ |
|
|
|
return String.join(",", lotteryNumList); |
|
|
|
} |
|
|
|
return lotteryNumStr; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 抽奖券数量 |
|
|
|
*/ |
|
|
|
@Excel(name = "抽奖券数量", width = 20, orderNum = "10") |
|
|
|
@TableField(value = "lottery_count") |
|
|
|
private Integer lotteryCount; |
|
|
|
|
|
|
|
@@ -164,14 +174,14 @@ public class WxOfflineActivityRecord extends TenantEntity { |
|
|
|
/** |
|
|
|
* 审批意见 |
|
|
|
*/ |
|
|
|
@Excel(name = "审核意见", width = 20, orderNum = "10") |
|
|
|
@Excel(name = "审核意见", width = 20, orderNum = "12") |
|
|
|
@TableField(value = "audit_remark") |
|
|
|
private String auditRemark; |
|
|
|
|
|
|
|
/** |
|
|
|
* 审批状态 |
|
|
|
*/ |
|
|
|
@Excel(name = "审核状态", width = 20, orderNum = "9", replace = {"审核中_0", "已审批_1", "已驳回_2", "已退单_3", "已发奖_10"}) |
|
|
|
@Excel(name = "审核状态", width = 20, orderNum = "13", replace = {"审核中_0", "已审批_1", "已驳回_2", "已退单_3", "已发奖_10"}) |
|
|
|
@TableField(value = "audit_status") |
|
|
|
private Integer auditStatus; |
|
|
|
|
|
|
|
@@ -187,7 +197,7 @@ public class WxOfflineActivityRecord extends TenantEntity { |
|
|
|
@TableField(value = "audit_by") |
|
|
|
private Long auditBy; |
|
|
|
|
|
|
|
@Excel(name = "审核人", width = 20, orderNum = "12") |
|
|
|
@Excel(name = "审核人", width = 20, orderNum = "14") |
|
|
|
@TableField(exist = false) |
|
|
|
private String auditByName; |
|
|
|
|
|
|
|
|