Commit 2dec1289 authored by yajun.zhang's avatar yajun.zhang

优化

parent b58ce219
...@@ -31,13 +31,10 @@ public class ThirdWorkOrderRest { ...@@ -31,13 +31,10 @@ public class ThirdWorkOrderRest {
} }
@PostMapping("/export") @PostMapping("/export")
public JsonResult export(@RequestBody WorkOrderParam param, public JsonResult export(@RequestBody WorkOrderParam param,
// @RequestHeader("account") String account, @RequestHeader(value="account", required=false, defaultValue="") String account,
// @RequestHeader("qg-tenant-id") Integer tenantId @RequestHeader(value="qg-tenant-id", required=false, defaultValue="560761") Integer tenantId
HttpServletRequest request
) { ) {
String account = request.getHeader("account"); return thirdWorkOrderService.export(param,account,tenantId);
String tenantId = request.getHeader("qg-tenant-id");
return thirdWorkOrderService.export(param,account,Integer.parseInt(tenantId));
} }
......
...@@ -223,6 +223,9 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService { ...@@ -223,6 +223,9 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService {
@Override @Override
public JsonResult export(WorkOrderParam param,String account,Integer tenantId) { public JsonResult export(WorkOrderParam param,String account,Integer tenantId) {
if (StringUtils.isBlank(account)){
return JsonResult.buildErrorStateResult("账号名为空");
}
executorService.execute(()->{ executorService.execute(()->{
doExportBusiness(param,account,tenantId); doExportBusiness(param,account,tenantId);
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment