From 9f99167aba3720cb731298511f8423b18c08e5a2 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 05 三月 2026 15:51:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java | 89 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 76 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
index af0f61b..95e9999 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
@@ -2,23 +2,30 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.aftersalesservice.dto.AfterSalesServiceExeclDto;
+import com.ruoyi.aftersalesservice.dto.AfterSalesServiceNewDto;
import com.ruoyi.aftersalesservice.pojo.AfterSalesService;
import com.ruoyi.aftersalesservice.service.AfterSalesServiceService;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.equipmentenergyconsumption.pojo.EquipmentEnergyConsumption;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
+import com.ruoyi.sales.dto.SalesLedgerDto;
+import com.ruoyi.sales.service.ISalesLedgerService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @author :yys
@@ -36,31 +43,67 @@
@Autowired
private SysUserMapper sysUserMapper;
+ @Autowired
+ private ISalesLedgerService salesLedgerService;
+
@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);
+ }
+
+ @Log(title = "鍞悗鏈嶅姟-鍙嶉鐧昏", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ @ApiOperation("鍞悗鏈嶅姟-鍙嶉鐧昏")
+ public void export(HttpServletResponse response) {
+ Page page = new Page(-1,-1);
+ AfterSalesServiceNewDto afterSalesService = new AfterSalesServiceNewDto();
+ IPage<AfterSalesServiceNewDto> listPage = afterSalesServiceService.listPage(page, afterSalesService);
+ List<AfterSalesServiceExeclDto> list = new ArrayList<>();
+ listPage.getRecords().forEach(item -> {
+ AfterSalesServiceExeclDto dto = new AfterSalesServiceExeclDto();
+ BeanUtils.copyProperties(item, dto);
+ dto.setStatusName(item.getStatus().toString());
+ list.add(dto);
+ });
+ ExcelUtil<AfterSalesServiceExeclDto> util = new ExcelUtil<AfterSalesServiceExeclDto>(AfterSalesServiceExeclDto.class);
+ util.exportExcel(response, list , "鍙嶉鐧昏");
+ }
+
+ @Log(title = "鍞悗鏈嶅姟-鍞悗澶勭悊", businessType = BusinessType.EXPORT)
+ @PostMapping("/exportTwo")
+ @ApiOperation("鍞悗鏈嶅姟-鍞悗澶勭悊")
+ public void exportTwo(HttpServletResponse response) {
+ Page page = new Page(-1,-1);
+ AfterSalesServiceNewDto afterSalesService = new AfterSalesServiceNewDto();
+ IPage<AfterSalesServiceNewDto> listPage = afterSalesServiceService.listPage(page, afterSalesService);
+ listPage.getRecords().forEach(item -> {
+ item.setStatusName(item.getStatus().toString());
+ });
+ ExcelUtil<AfterSalesServiceNewDto> util = new ExcelUtil<AfterSalesServiceNewDto>(AfterSalesServiceNewDto.class);
+ util.exportExcel(response, listPage.getRecords() , "鍞悗澶勭悊");
}
@PostMapping("/add")
@ApiOperation("鍞悗鏈嶅姟-鏂板")
@Log(title = "鍞悗鏈嶅姟-鏂板", businessType = BusinessType.INSERT)
- public AjaxResult add(@RequestBody AfterSalesService afterSalesService) {
- afterSalesService.setStatus(1);
- SysUser sysUser = sysUserMapper.selectUserById(afterSalesService.getCheckUserId());
- if(sysUser == null) throw new RuntimeException("瀹℃牳浜轰笉瀛樺湪");
- afterSalesService.setCheckNickName(sysUser.getNickName());
- boolean save = afterSalesServiceService.save(afterSalesService);
- return save ? AjaxResult.success() : AjaxResult.error();
+ public AjaxResult add(@RequestBody AfterSalesServiceNewDto afterSalesServiceNewDto) {
+ return afterSalesServiceService.addAfterSalesServiceDto(afterSalesServiceNewDto) ? AjaxResult.success() : AjaxResult.error();
}
@PostMapping("/update")
@ApiOperation("鍞悗鏈嶅姟-淇敼")
@Log(title = "鍞悗鏈嶅姟-淇敼", businessType = BusinessType.UPDATE)
- public AjaxResult update(@RequestBody AfterSalesService afterSalesService) {
- boolean update = afterSalesServiceService.updateById(afterSalesService);
+ public AjaxResult update(@RequestBody AfterSalesServiceNewDto afterSalesServiceNewDto) {
+ if (afterSalesServiceNewDto.getProductModelIdList() != null && afterSalesServiceNewDto.getProductModelIdList().isEmpty() ) {
+ String productModelIds = afterSalesServiceNewDto.getProductModelIdList().stream()
+ .map(String::valueOf)
+ .collect(Collectors.joining(","));
+ afterSalesServiceNewDto.setProductModelIds(productModelIds);
+ }
+ boolean update = afterSalesServiceService.updateById(afterSalesServiceNewDto);
return update ? AjaxResult.success() : AjaxResult.error();
}
@@ -91,4 +134,24 @@
}
+ @GetMapping("listSalesLedger")
+ @ApiOperation("鍞悗鏈嶅姟-鑾峰彇閿�鍞彴璐�")
+ public AjaxResult listSalesLedger(SalesLedgerDto salesLedgerDto, Page page) {
+ IPage<SalesLedgerDto> list = salesLedgerService.listSalesLedger(salesLedgerDto,page);
+ return AjaxResult.success(list);
+ }
+
+
+ @GetMapping("getById")
+ @ApiOperation("鍞悗鏈嶅姟-鏍规嵁id鑾峰彇璇︽儏")
+ public AjaxResult getById(Long id) {
+ return AjaxResult.success(afterSalesServiceService.getAfterSalesServiceNewDtoById(id));
+ }
+
+ @ApiOperation("鍞悗鏈嶅姟-缁熻宸ュ崟鎯呭喌")
+ @GetMapping("count")
+ public AjaxResult count() {
+ return AjaxResult.success(afterSalesServiceService.countAfterSalesService());
+ }
+
}
--
Gitblit v1.9.3