导出同事特权,增加和修正表字段
This commit is contained in:
@@ -62,6 +62,7 @@ public class LbOrderRowController {
|
||||
@RequestParam(defaultValue = "1") Integer current,
|
||||
@RequestParam(defaultValue = "10") Integer size,
|
||||
@RequestParam(required = false) String isResell,
|
||||
@Parameter(description = "数据类型") @RequestParam(required = false) String dataType,
|
||||
@RequestParam(required = false) String orderSn,
|
||||
@RequestParam(required = false) Long buyerId,
|
||||
@RequestParam(required = false) Long sellerId,
|
||||
@@ -69,7 +70,7 @@ public class LbOrderRowController {
|
||||
@RequestParam(required = false) Long merchandiseId) {
|
||||
Map<String, Object> result =
|
||||
lbOrderRowService.pageQuery(
|
||||
current, size, isResell, orderSn, buyerId, sellerId, status, merchandiseId);
|
||||
current, size, isResell, dataType, orderSn, buyerId, sellerId, status, merchandiseId);
|
||||
Boolean success = (Boolean) result.get("success");
|
||||
if (success != null && success) {
|
||||
return ResponseEntity.ok(result);
|
||||
@@ -88,7 +89,8 @@ public class LbOrderRowController {
|
||||
request.getBuyTimeStart(),
|
||||
request.getBuyTimeEnd(),
|
||||
request.getTenantId(),
|
||||
request.getIsResell());
|
||||
request.getIsResell(),
|
||||
request.getDataType());
|
||||
Boolean success = (Boolean) result.get("success");
|
||||
if (success != null && success) {
|
||||
return ResponseEntity.ok(result);
|
||||
|
||||
@@ -155,6 +155,21 @@ public class LbPurchaseApplyController {
|
||||
return ResponseEntity.badRequest().body(result);
|
||||
}
|
||||
|
||||
@GetMapping("/exportColleagueVip")
|
||||
@Operation(summary = "导出同事特权开通提醒Excel",
|
||||
description = "筛选逻辑与 syncHxrAdminColleagueVip 一致:仅导出申请人当日有进货记录、"
|
||||
+ "且具备同事手机号的可开通记录,列含昵称、手机号、特权开通日期、开通日期")
|
||||
public void exportColleagueVip(
|
||||
@Parameter(description = "申请开始日期(yyyy-MM-dd)", required = true)
|
||||
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate applyDateStart,
|
||||
@Parameter(description = "申请结束日期(yyyy-MM-dd)", required = true)
|
||||
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate applyDateEnd,
|
||||
@Parameter(description = "租户ID", required = true)
|
||||
@RequestParam String tenantId,
|
||||
HttpServletResponse response) {
|
||||
lbPurchaseApplyService.exportColleagueVipExcel(applyDateStart, applyDateEnd, tenantId, response);
|
||||
}
|
||||
|
||||
@GetMapping("/export")
|
||||
@Operation(summary = "导出进货申请Excel", description = "按租户ID与申请日期范围导出,按申请日分组并合并首列")
|
||||
public void export(
|
||||
|
||||
Reference in New Issue
Block a user