托运方管理新增字段
This commit is contained in:
zhou-hongcheng
+57
@@ -198,6 +198,63 @@ public class UserShipperEntity extends BaseVOEntity {
|
||||
@ApiModelProperty("结算币种")
|
||||
private String settlementCurrency;
|
||||
|
||||
@ApiModelProperty("职务/角色权限字符，控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)")
|
||||
private String roleCode;
|
||||
|
||||
@ApiModelProperty("货主/供应商/客户编码")
|
||||
private String userMemberCode;
|
||||
|
||||
@ApiModelProperty("货主/供应商/客户名称")
|
||||
private String userName;
|
||||
|
||||
@ApiModelProperty("联系人")
|
||||
private String emergencyContactName;
|
||||
|
||||
@ApiModelProperty("联系电话")
|
||||
private String emergencyContactPhone;
|
||||
|
||||
@ApiModelProperty("省市区编码，6位")
|
||||
private Long userAreaCountyId;
|
||||
|
||||
@ApiModelProperty("省事区名称")
|
||||
private String userAreaName;
|
||||
|
||||
@ApiModelProperty("详细地址")
|
||||
private String userAreaAddress;
|
||||
|
||||
@ApiModelProperty("法人代表")
|
||||
private String legalRepresentative;
|
||||
|
||||
@ApiModelProperty("统一编码")
|
||||
private String unifiedCode;
|
||||
|
||||
@ApiModelProperty("注册电话")
|
||||
private String registeredPhone;
|
||||
|
||||
@ApiModelProperty("注册地址")
|
||||
private String registeredAddress;
|
||||
|
||||
@ApiModelProperty("传真")
|
||||
private String fax;
|
||||
|
||||
@ApiModelProperty("付款银行")
|
||||
private String paymentBank;
|
||||
|
||||
@ApiModelProperty("付款账户")
|
||||
private String paymentAccount;
|
||||
|
||||
@ApiModelProperty("发票抬头")
|
||||
private String invoiceTitle;
|
||||
|
||||
@ApiModelProperty("税号")
|
||||
private String taxNumber;
|
||||
|
||||
@ApiModelProperty(name = "邮箱")
|
||||
private String userEmail;
|
||||
|
||||
@ApiModelProperty(name = "备注")
|
||||
private String userRemark;
|
||||
|
||||
@ApiModelProperty(name = "一级组织表ID")
|
||||
private Long topOrganizationId;
|
||||
|
||||
|
||||
+57
@@ -264,4 +264,61 @@ public class UserShipperPo implements Serializable {
|
||||
|
||||
@ApiModelProperty("结算币种")
|
||||
private String settlementCurrency;
|
||||
|
||||
@ApiModelProperty("职务/角色权限字符，控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)")
|
||||
private String roleCodeShipper;
|
||||
|
||||
@ApiModelProperty("货主/供应商/客户编码")
|
||||
private String userMemberCode;
|
||||
|
||||
@ApiModelProperty("货主/供应商/客户名称")
|
||||
private String userNameShipper;
|
||||
|
||||
@ApiModelProperty("联系人")
|
||||
private String emergencyContactName;
|
||||
|
||||
@ApiModelProperty("联系电话")
|
||||
private String emergencyContactPhone;
|
||||
|
||||
@ApiModelProperty("省市区编码，6位")
|
||||
private Long userAreaCountyIdShipper;
|
||||
|
||||
@ApiModelProperty("省事区名称")
|
||||
private String userAreaNameShipper;
|
||||
|
||||
@ApiModelProperty("详细地址")
|
||||
private String userAreaAddressShipper;
|
||||
|
||||
@ApiModelProperty("法人代表")
|
||||
private String legalRepresentative;
|
||||
|
||||
@ApiModelProperty("统一编码")
|
||||
private String unifiedCode;
|
||||
|
||||
@ApiModelProperty("注册电话")
|
||||
private String registeredPhone;
|
||||
|
||||
@ApiModelProperty("注册地址")
|
||||
private String registeredAddress;
|
||||
|
||||
@ApiModelProperty("传真")
|
||||
private String fax;
|
||||
|
||||
@ApiModelProperty("付款银行")
|
||||
private String paymentBank;
|
||||
|
||||
@ApiModelProperty("付款账户")
|
||||
private String paymentAccount;
|
||||
|
||||
@ApiModelProperty("发票抬头")
|
||||
private String invoiceTitle;
|
||||
|
||||
@ApiModelProperty("税号")
|
||||
private String taxNumber;
|
||||
|
||||
@ApiModelProperty(name = "邮箱")
|
||||
private String userEmail;
|
||||
|
||||
@ApiModelProperty(name = "备注")
|
||||
private String userRemarkShipper;
|
||||
}
|
||||
|
||||
+57
@@ -231,4 +231,61 @@ public class UserShipperDO extends UserDO {
|
||||
|
||||
@ApiModelProperty("结算币种")
|
||||
private String settlementCurrency;
|
||||
|
||||
@ApiModelProperty("职务/角色权限字符，控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)")
|
||||
private String roleCode;
|
||||
|
||||
@ApiModelProperty("货主/供应商/客户编码")
|
||||
private String userMemberCode;
|
||||
|
||||
@ApiModelProperty("货主/供应商/客户名称")
|
||||
private String userName;
|
||||
|
||||
@ApiModelProperty("联系人")
|
||||
private String emergencyContactName;
|
||||
|
||||
@ApiModelProperty("联系电话")
|
||||
private String emergencyContactPhone;
|
||||
|
||||
@ApiModelProperty("省市区编码，6位")
|
||||
private Long userAreaCountyId;
|
||||
|
||||
@ApiModelProperty("省事区名称")
|
||||
private String userAreaName;
|
||||
|
||||
@ApiModelProperty("详细地址")
|
||||
private String userAreaAddress;
|
||||
|
||||
@ApiModelProperty("法人代表")
|
||||
private String legalRepresentative;
|
||||
|
||||
@ApiModelProperty("统一编码")
|
||||
private String unifiedCode;
|
||||
|
||||
@ApiModelProperty("注册电话")
|
||||
private String registeredPhone;
|
||||
|
||||
@ApiModelProperty("注册地址")
|
||||
private String registeredAddress;
|
||||
|
||||
@ApiModelProperty("传真")
|
||||
private String fax;
|
||||
|
||||
@ApiModelProperty("付款银行")
|
||||
private String paymentBank;
|
||||
|
||||
@ApiModelProperty("付款账户")
|
||||
private String paymentAccount;
|
||||
|
||||
@ApiModelProperty("发票抬头")
|
||||
private String invoiceTitle;
|
||||
|
||||
@ApiModelProperty("税号")
|
||||
private String taxNumber;
|
||||
|
||||
@ApiModelProperty(name = "邮箱")
|
||||
private String userEmail;
|
||||
|
||||
@ApiModelProperty(name = "备注")
|
||||
private String userRemark;
|
||||
}
|
||||
|
||||
@@ -197,4 +197,62 @@ public class UserShipperDTO extends UserDTO {
|
||||
@ApiModelProperty("结算币种")
|
||||
private String settlementCurrency;
|
||||
|
||||
|
||||
@ApiModelProperty("职务/角色权限字符，控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)")
|
||||
private String roleCode;
|
||||
|
||||
@ApiModelProperty("货主/供应商/客户编码")
|
||||
private String userMemberCode;
|
||||
|
||||
@ApiModelProperty("货主/供应商/客户名称")
|
||||
private String userName;
|
||||
|
||||
@ApiModelProperty("联系人")
|
||||
private String emergencyContactName;
|
||||
|
||||
@ApiModelProperty("联系电话")
|
||||
private String emergencyContactPhone;
|
||||
|
||||
@ApiModelProperty("省市区编码，6位")
|
||||
private Long userAreaCountyId;
|
||||
|
||||
@ApiModelProperty("省事区名称")
|
||||
private String userAreaName;
|
||||
|
||||
@ApiModelProperty("详细地址")
|
||||
private String userAreaAddress;
|
||||
|
||||
@ApiModelProperty("法人代表")
|
||||
private String legalRepresentative;
|
||||
|
||||
@ApiModelProperty("统一编码")
|
||||
private String unifiedCode;
|
||||
|
||||
@ApiModelProperty("注册电话")
|
||||
private String registeredPhone;
|
||||
|
||||
@ApiModelProperty("注册地址")
|
||||
private String registeredAddress;
|
||||
|
||||
@ApiModelProperty("传真")
|
||||
private String fax;
|
||||
|
||||
@ApiModelProperty("付款银行")
|
||||
private String paymentBank;
|
||||
|
||||
@ApiModelProperty("付款账户")
|
||||
private String paymentAccount;
|
||||
|
||||
@ApiModelProperty("发票抬头")
|
||||
private String invoiceTitle;
|
||||
|
||||
@ApiModelProperty("税号")
|
||||
private String taxNumber;
|
||||
|
||||
@ApiModelProperty(name = "邮箱")
|
||||
private String userEmail;
|
||||
|
||||
@ApiModelProperty(name = "备注")
|
||||
private String userRemark;
|
||||
|
||||
}
|
||||
|
||||
@@ -142,7 +142,26 @@
|
||||
b.monthly_settlement_flag,
|
||||
a.user_auth_status,
|
||||
b.original_receipt_flag,
|
||||
b.freight_node,b.customer_nc_code,b.settlement_currency
|
||||
b.freight_node,b.customer_nc_code,b.settlement_currency,
|
||||
b.role_code as roleCodeShipper,
|
||||
b.user_member_code,
|
||||
b.user_name as userNameShipper,
|
||||
b.emergency_contact_name,
|
||||
b.emergency_contact_phone,
|
||||
b.user_area_county_id as userAreaCountyIdShipper,
|
||||
b.user_area_name as userAreaNameShipper,
|
||||
b.user_area_address as userAreaAddressShipper,
|
||||
b.legal_representative,
|
||||
b.unified_code,
|
||||
b.registered_phone,
|
||||
b.registered_address,
|
||||
b.fax,
|
||||
b.payment_bank,
|
||||
b.payment_account,
|
||||
b.invoice_title,
|
||||
b.tax_number,
|
||||
b.user_email,
|
||||
b.user_remark as userRemarkShipper,
|
||||
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