|
@@ -664,11 +664,15 @@ public class SupplyChainController extends BaseController {
|
|
|
export.add(date.getString("deliveryNum"));
|
|
|
export.add(date.getString("deliveryRadio"));
|
|
|
export.add(date.getString("notDeliveryNum"));
|
|
|
+ String userName = supplyChainService.getUserName(date.getLong("promoterId"));
|
|
|
+ if (!Check.isNull(userName)) {
|
|
|
+ export.add(userName);
|
|
|
+ }
|
|
|
exportList.add(export);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- String[] headers = {"达人ID", "达人名称", "订单数", "有效订单数", "有效订单率", "发货数", "发货率", "未发货数"};
|
|
|
+ String[] headers = {"达人ID", "达人名称", "订单数", "有效订单数", "有效订单率", "发货数", "发货率", "未发货数", "绑定人"};
|
|
|
OutputStream os = response.getOutputStream();
|
|
|
ExportExcelUtils eeu = new ExportExcelUtils();
|
|
|
XSSFWorkbook workbook = new XSSFWorkbook();
|
|
@@ -1299,7 +1303,7 @@ public class SupplyChainController extends BaseController {
|
|
|
public TableDataInfo bdTotal(
|
|
|
@ApiParam("开始时间") @RequestParam(value = "orderStartDate", required = false) String orderStartDate,
|
|
|
@ApiParam("结束时间") @RequestParam(value = "orderEndDate", required = false) String orderEndDate,
|
|
|
- @ApiParam("用户ID") @RequestParam(value = "collectSampleId", required = false) Long collectSampleId){
|
|
|
+ @ApiParam("用户ID") @RequestParam(value = "collectSampleId", required = false) Long collectSampleId) {
|
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
|
if (!Check.isNull(orderStartDate)) {
|
|
|
Integer start = DateUtils.getIntegerTime(orderStartDate);
|
|
@@ -1371,5 +1375,4 @@ public class SupplyChainController extends BaseController {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
}
|