From 10dee4b4fb73edda155d06deba6cee215099c298 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 05 三月 2026 09:52:09 +0800
Subject: [PATCH] dev

---
 src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java |   51 +++++++++++++++++++++++++++++++++++----------------
 1 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
index fee8947..15dcfac 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
@@ -2,19 +2,19 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.aftersalesservice.dto.AfterSalesServiceDto;
+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.common.utils.poi.ExcelUtil;
-import com.ruoyi.equipmentenergyconsumption.pojo.EquipmentEnergyConsumption;
 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.purchase.dto.VatDto;
+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;
@@ -25,6 +25,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author :yys
@@ -42,6 +43,9 @@
     @Autowired
     private SysUserMapper sysUserMapper;
 
+    @Autowired
+    private ISalesLedgerService salesLedgerService;
+
     @GetMapping("/listPage")
     @ApiOperation("鍞悗鏈嶅姟-鍒嗛〉鏌ヨ")
     @Log(title = "鍞悗鏈嶅姟-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
@@ -57,14 +61,14 @@
         Page page = new Page(-1,-1);
         AfterSalesService afterSalesService = new AfterSalesService();
         IPage<AfterSalesService> listPage = afterSalesServiceService.listPage(page, afterSalesService);
-        List<AfterSalesServiceDto> list = new ArrayList<>();
+        List<AfterSalesServiceExeclDto> list = new ArrayList<>();
         listPage.getRecords().forEach(item -> {
-            AfterSalesServiceDto dto = new AfterSalesServiceDto();
+            AfterSalesServiceExeclDto dto = new AfterSalesServiceExeclDto();
             BeanUtils.copyProperties(item, dto);
             dto.setStatusName(item.getStatus().toString());
             list.add(dto);
         });
-        ExcelUtil<AfterSalesServiceDto> util = new ExcelUtil<AfterSalesServiceDto>(AfterSalesServiceDto.class);
+        ExcelUtil<AfterSalesServiceExeclDto> util = new ExcelUtil<AfterSalesServiceExeclDto>(AfterSalesServiceExeclDto.class);
         util.exportExcel(response, list , "鍙嶉鐧昏");
     }
 
@@ -85,20 +89,21 @@
     @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();
     }
 
@@ -129,4 +134,18 @@
     }
 
 
+    @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));
+    }
+
 }

--
Gitblit v1.9.3