OMS-GW推送-商业合作伙伴
This commit is contained in:
+11
@@ -321,4 +321,15 @@ public class UserShipperPo implements Serializable {
|
||||
|
||||
@ApiModelProperty(name = "备注")
|
||||
private String userRemarkShipper;
|
||||
|
||||
@ApiModelProperty(value = "推送状态:1-未推送,2-推送中,3-推送成功,4-推送失败")
|
||||
private Integer pushStatus;
|
||||
|
||||
@ApiModelProperty(value = "推送时间")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date pushTime;
|
||||
|
||||
@ApiModelProperty(value = "推送人ID")
|
||||
private Long pushBy;
|
||||
}
|
||||
|
||||
@@ -161,7 +161,10 @@
|
||||
b.invoice_title,
|
||||
b.tax_number,
|
||||
b.user_email,
|
||||
b.user_remark as userRemarkShipper
|
||||
b.user_remark as userRemarkShipper,
|
||||
b.push_status,
|
||||
b.push_time,
|
||||
b.push_by
|
||||
FROM "USER" a
|
||||
LEFT JOIN user_shipper b ON a.user_id = b.user_id
|
||||
left join (select user_id, LISTAGG(DISTINCT r.role_name, '&') WITHIN GROUP(ORDER BY r.role_name) AS roleName
|
||||
|
||||
Reference in New Issue
Block a user