From 3b02ada59b793fe7db195bbb39dbc0e533f036d6 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 25 六月 2026 10:26:04 +0800
Subject: [PATCH] fix: 售后查询按照反馈日期排序
---
src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
index 15dcfac..2da2be7 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
@@ -1,5 +1,6 @@
package com.ruoyi.aftersalesservice.controller;
+import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.aftersalesservice.dto.AfterSalesServiceExeclDto;
@@ -49,8 +50,8 @@
@GetMapping("/listPage")
@ApiOperation("鍞悗鏈嶅姟-鍒嗛〉鏌ヨ")
@Log(title = "鍞悗鏈嶅姟-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPage(Page page, AfterSalesService afterSalesService) {
- IPage<AfterSalesService> listPage = afterSalesServiceService.listPage(page, afterSalesService);
+ public AjaxResult listPage(Page page, AfterSalesServiceNewDto afterSalesService) {
+ IPage<AfterSalesServiceNewDto> listPage = afterSalesServiceService.listPage(page, afterSalesService);
return AjaxResult.success(listPage);
}
@@ -59,8 +60,8 @@
@ApiOperation("鍞悗鏈嶅姟-鍙嶉鐧昏")
public void export(HttpServletResponse response) {
Page page = new Page(-1,-1);
- AfterSalesService afterSalesService = new AfterSalesService();
- IPage<AfterSalesService> listPage = afterSalesServiceService.listPage(page, afterSalesService);
+ AfterSalesServiceNewDto afterSalesService = new AfterSalesServiceNewDto();
+ IPage<AfterSalesServiceNewDto> listPage = afterSalesServiceService.listPage(page, afterSalesService);
List<AfterSalesServiceExeclDto> list = new ArrayList<>();
listPage.getRecords().forEach(item -> {
AfterSalesServiceExeclDto dto = new AfterSalesServiceExeclDto();
@@ -77,12 +78,12 @@
@ApiOperation("鍞悗鏈嶅姟-鍞悗澶勭悊")
public void exportTwo(HttpServletResponse response) {
Page page = new Page(-1,-1);
- AfterSalesService afterSalesService = new AfterSalesService();
- IPage<AfterSalesService> listPage = afterSalesServiceService.listPage(page, afterSalesService);
+ AfterSalesServiceNewDto afterSalesService = new AfterSalesServiceNewDto();
+ IPage<AfterSalesServiceNewDto> listPage = afterSalesServiceService.listPage(page, afterSalesService);
listPage.getRecords().forEach(item -> {
item.setStatusName(item.getStatus().toString());
});
- ExcelUtil<AfterSalesService> util = new ExcelUtil<AfterSalesService>(AfterSalesService.class);
+ ExcelUtil<AfterSalesServiceNewDto> util = new ExcelUtil<AfterSalesServiceNewDto>(AfterSalesServiceNewDto.class);
util.exportExcel(response, listPage.getRecords() , "鍞悗澶勭悊");
}
@@ -97,11 +98,14 @@
@ApiOperation("鍞悗鏈嶅姟-淇敼")
@Log(title = "鍞悗鏈嶅姟-淇敼", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody AfterSalesServiceNewDto afterSalesServiceNewDto) {
- if (afterSalesServiceNewDto.getProductModelIdList() != null && afterSalesServiceNewDto.getProductModelIdList().isEmpty() ) {
+ if (afterSalesServiceNewDto.getProductModelIdList() != null && !afterSalesServiceNewDto.getProductModelIdList().isEmpty() ) {
String productModelIds = afterSalesServiceNewDto.getProductModelIdList().stream()
.map(String::valueOf)
.collect(Collectors.joining(","));
afterSalesServiceNewDto.setProductModelIds(productModelIds);
+ }
+ if (afterSalesServiceNewDto.getAfterSalesProductList() != null && !afterSalesServiceNewDto.getAfterSalesProductList().isEmpty()) {
+ afterSalesServiceNewDto.setAfterSalesProducts(JSON.toJSONString(afterSalesServiceNewDto.getAfterSalesProductList()));
}
boolean update = afterSalesServiceService.updateById(afterSalesServiceNewDto);
return update ? AjaxResult.success() : AjaxResult.error();
@@ -148,4 +152,10 @@
return AjaxResult.success(afterSalesServiceService.getAfterSalesServiceNewDtoById(id));
}
+ @ApiOperation("鍞悗鏈嶅姟-缁熻宸ュ崟鎯呭喌")
+ @GetMapping("count")
+ public AjaxResult count() {
+ return AjaxResult.success(afterSalesServiceService.countAfterSalesService());
+ }
+
}
--
Gitblit v1.9.3