华为云obs;结算货币;
This commit is contained in:
+3
@@ -257,4 +257,7 @@ public class UserShipperPo implements Serializable {
|
|||||||
|
|
||||||
@ApiModelProperty(name = "客户nc编码")
|
@ApiModelProperty(name = "客户nc编码")
|
||||||
private String customerNcCode;
|
private String customerNcCode;
|
||||||
|
|
||||||
|
@ApiModelProperty("结算币种")
|
||||||
|
private String settlementCurrency;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -139,7 +139,7 @@
|
|||||||
b.monthly_settlement_flag,
|
b.monthly_settlement_flag,
|
||||||
a.user_auth_status,
|
a.user_auth_status,
|
||||||
b.original_receipt_flag,
|
b.original_receipt_flag,
|
||||||
b.freight_node,b.customer_nc_code
|
b.freight_node,b.customer_nc_code,b.settlement_currency
|
||||||
FROM "USER" a
|
FROM "USER" a
|
||||||
LEFT JOIN user_shipper b ON a.user_id = b.user_id
|
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
|
left join (select user_id, LISTAGG(DISTINCT r.role_name, '&') WITHIN GROUP(ORDER BY r.role_name) AS roleName
|
||||||
|
|||||||
@@ -206,7 +206,7 @@ public class MenuApi extends BaseController {
|
|||||||
* 文件批量上传到oss
|
* 文件批量上传到oss
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@PostMapping("/batchUpload")
|
/*@PostMapping("/batchUpload")
|
||||||
public AjaxResult batchUpload(@RequestParam("files") List<MultipartFile> files) {
|
public AjaxResult batchUpload(@RequestParam("files") List<MultipartFile> files) {
|
||||||
if (files == null || files.size() == 0) {
|
if (files == null || files.size() == 0) {
|
||||||
return AjaxResult.error("上传文件不能为空");
|
return AjaxResult.error("上传文件不能为空");
|
||||||
@@ -235,6 +235,21 @@ public class MenuApi extends BaseController {
|
|||||||
fileUrls.add(fileUrl);
|
fileUrls.add(fileUrl);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return AjaxResult.success(fileUrls);
|
||||||
|
}*/
|
||||||
|
|
||||||
|
|
||||||
|
@PostMapping("/batchUpload")
|
||||||
|
public AjaxResult batchUpload(@RequestParam("files") List<MultipartFile> files) {
|
||||||
|
if (files == null || files.size() == 0) {
|
||||||
|
return AjaxResult.error("上传文件不能为空");
|
||||||
|
}
|
||||||
|
List<String> fileUrls = new ArrayList<>();
|
||||||
|
for (MultipartFile multipartFile : files) {
|
||||||
|
String fileKey = fileStorageService.uploadFile(multipartFile);
|
||||||
|
fileUrls.add(fileKey);
|
||||||
|
}
|
||||||
|
|
||||||
return AjaxResult.success(fileUrls);
|
return AjaxResult.success(fileUrls);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user