From 22efacd7994f8ea9a7ef8485575ade9729a0e5a2 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 22 四月 2025 17:53:25 +0800
Subject: [PATCH] zjh20250422
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 35 +++++++++++------------------------
1 files changed, 11 insertions(+), 24 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 401de6d..8b39ed1 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -844,17 +844,7 @@
}
- /**
- * 瀵煎嚭浣撴璁板綍鍒楄〃
- */
- @Log(title = "浣撴璁板綍", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- @ApiOperation(value = "瀵煎嚭浣撴璁板綍鍒楄〃")
- public void export(HttpServletResponse response, TjOrder tjOrder) {
- List<TjOrder> list = tjOrderService.selectExportOrderList(tjOrder);
- ExcelUtil<TjOrder> util = new ExcelUtil<TjOrder>(TjOrder.class);
- util.exportExcel(response, list, "浣撴璁板綍鏁版嵁");
- }
+
@PostMapping("/exportOrderList")
@ApiOperation(value = "瀵煎嚭浣撴璁板綍鍒楄〃")
@@ -869,6 +859,7 @@
@ApiParam(value = "鎶ュ憡寮�濮嬫椂闂�") @RequestParam(required = false) Date bgbeginTime,
@ApiParam(value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam(required = false) Date bgendTime,
@ApiParam(value = "鍗曚綅") @RequestParam(required = false) String dw,
+ @ApiParam(value = "褰撳墠椤垫垨鍏ㄩ儴鏁版嵁") @RequestParam(required = false) String dqyorqbsj,
HttpServletResponse response) {
List<Long> cusIds = null;
if (null != name) {
@@ -992,9 +983,15 @@
}
wq.orderByDesc(TjOrder::getCreateTime);
- Page<TjOrder> page2 = tjOrderService.page(page1, wq);
- List<TjOrder> list = page2.getRecords();
- if (list != null) {
+
+ List<TjOrder> list =null;
+ if(StringUtil.isNotBlank(dqyorqbsj) && dqyorqbsj.equals("1")){
+ list = tjOrderService.list(wq);
+ }else {
+ Page<TjOrder> page2 = tjOrderService.page(page1, wq);
+ list = page2.getRecords();
+ }
+ if (!list.isEmpty()) {
for (TjOrder order : list) {
TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
if (null != tjCustomer) {
@@ -4093,16 +4090,6 @@
@GetMapping(value = "newgetTransitionList")
@ApiOperation(value = "鏈�鏂版煡璇㈣繃娓¤〃鏁版嵁")
public AjaxResult newgetTransitionList(@RequestParam @ApiParam(value = "瀹㈡埛id") String cusId) {
-// String pacId = transitionService.getTbTransitionPacId(cusId);
-// if(StringUtil.isNotBlank(pacId)){
-// //琛ュ樊浠�
-// List<Map<String,Object>> cjMaps = groupingProService.huoquxiangmuchajia(pacId, cusId);
-// if(null !=cjMaps && !cjMaps.isEmpty()){
-// for (Map<String, Object> cjMap : cjMaps) {
-// transitionService.buxiangmuchajia(cusId,pacId,cjMap.get("xmid").toString(),new BigDecimal(cjMap.get("cj").toString()));
-// }
-// }
-// }
List<TbTransition> list = transitionService.newgetTransitionList(cusId);
return AjaxResult.success(list);
}
--
Gitblit v1.8.0