Merge #109 into master from cc_20260420_export

feat:数量不一致

* cc_20260420_export: (7 commits squashed)

  - feat:提示修改

  - feat:提示修改

  - feat:导出调整

  - feat:管理员查询所有 非管理员权限查询

  - feat:管理员查询所有 非管理员权限查询

  - feat:fix

  - feat:数量不一致

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/109
This commit is contained in:
正新
2026-04-24 09:44:31 +00:00
parent d885635728
commit 7c5a2c858d
28 changed files with 756 additions and 69 deletions

View File

@@ -1,6 +1,7 @@
package com.cool.store.controller.webb;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.LoginUserInfo;
import com.cool.store.request.*;
import com.cool.store.response.AdjustmentOrderResponse;
import com.cool.store.response.ResponseResult;
@@ -61,13 +62,13 @@ public class AdjustmentOrderController {
@PostMapping("/page")
@ApiOperation("分页查询费用调整单")
public ResponseResult<PageInfo<AdjustmentOrderResponse>> page(@RequestBody AdjustmentOrderPageRequest request) {
return ResponseResult.success(adjustmentOrderService.page(request));
return ResponseResult.success(adjustmentOrderService.page(request,CurrentUserHolder.getUserId()));
}
@PostMapping("/getSpecialStatusData")
@ApiOperation("选择关联费用单费用调整单列表")
public ResponseResult<PageInfo<AdjustmentOrderResponse>> getSpecialStatusData(@RequestBody AdjustmentSpecialPageRequest request) {
return ResponseResult.success(adjustmentOrderService.getSpecialStatusData(request));
return ResponseResult.success(adjustmentOrderService.getSpecialStatusData(request, CurrentUserHolder.getUser()));
}

View File

@@ -108,4 +108,22 @@ public class ExportController {
public ResponseResult<Long> tpScoreJournalExport(@RequestBody TpScoreJournalQueryRequest request) {
return ResponseResult.success(exportService.exportTpScoreJournal(request, CurrentUserHolder.getUser()));
}
@PostMapping("/adjustmentOrderExport")
@ApiOperation("费用调整单导出")
public ResponseResult<Long> adjustmentOrderExport(@RequestBody AdjustmentOrderPageRequest request) {
return ResponseResult.success(exportService.exportAdjustmentOrder(request, CurrentUserHolder.getUser()));
}
@PostMapping("/expenseOrderExport")
@ApiOperation("费用单导出")
public ResponseResult<Long> expenseOrderExport(@RequestBody AdjustmentOrderPageRequest request) {
return ResponseResult.success(exportService.exportExpenseOrder(request, CurrentUserHolder.getUser()));
}
@PostMapping("/splitOrderExport")
@ApiOperation("分账单导出")
public ResponseResult<Long> splitOrderExport(@RequestBody SplitOrderPageRequest request) {
return ResponseResult.success(exportService.exportSplitOrder(request, CurrentUserHolder.getUser()));
}
}

View File

@@ -45,7 +45,7 @@ public class MiniAdjustmentOrderController {
@PostMapping("/page")
@ApiOperation("分页查询费用调整单")
public ResponseResult<PageInfo<AdjustmentOrderResponse>> page(@RequestBody AdjustmentOrderPageRequest request) {
return ResponseResult.success(adjustmentOrderService.page(request));
return ResponseResult.success(adjustmentOrderService.page(request,null));
}