From 8c8ff31cdca25f579d3c1f688f46c877bf28aaa1 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 26 五月 2026 16:21:46 +0800
Subject: [PATCH] feat(approve): 重构审批流程配置功能
---
src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java b/src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java
index 6f293d4..4d38d96 100644
--- a/src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java
+++ b/src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java
@@ -2,15 +2,19 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.compensationperformance.pojo.CompensationPerformance;
+import com.ruoyi.common.enums.FileNameType;
+import com.ruoyi.customervisits.dto.CustomerVisitsDto;
import com.ruoyi.customervisits.pojo.CustomerVisits;
import com.ruoyi.customervisits.service.impl.CustomerVisitsServiceImpl;
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.other.service.impl.TempFileServiceImpl;
+import com.ruoyi.sales.service.impl.CommonFileServiceImpl;
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.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -27,11 +31,17 @@
@Autowired
private CustomerVisitsServiceImpl customerVisitsService;
+ @Autowired
+ private TempFileServiceImpl tempFileService;
+
+ @Autowired
+ private CommonFileServiceImpl commonFileService;
+
@GetMapping("/listPage")
@Log(title = "瀹㈡埛鎷滆-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
@ApiOperation("瀹㈡埛鎷滆-鍒嗛〉鏌ヨ")
public AjaxResult listPage(Page page, CustomerVisits customerVisits) {
- IPage<CustomerVisits> listPage = customerVisitsService.listPage(page, customerVisits);
+ IPage<CustomerVisitsDto> listPage = customerVisitsService.listPage(page, customerVisits);
return AjaxResult.success(listPage);
}
@@ -39,8 +49,12 @@
@ApiOperation("瀹㈡埛鎷滆-娣诲姞")
@PostMapping("/add")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult add(@RequestBody CustomerVisits customerVisits) {
+ public AjaxResult add(@RequestBody CustomerVisitsDto customerVisitsDto) throws Exception{
+ CustomerVisits customerVisits = new CustomerVisits();
+ BeanUtils.copyProperties(customerVisitsDto,customerVisits);
boolean save = customerVisitsService.save(customerVisits);
+ // 闄勪欢缁戝畾
+ tempFileService.migrateTempFilesToFormal(customerVisits.getId().longValue(), customerVisitsDto.getTempFileIds(), FileNameType.CUSTOMER_VISITS.getValue());
if (save) {
return AjaxResult.success("娣诲姞鎴愬姛");
}
@@ -50,8 +64,8 @@
@Log(title = "瀹㈡埛鎷滆-缂栬緫", businessType = BusinessType.UPDATE)
@ApiOperation("瀹㈡埛鎷滆-缂栬緫")
@PostMapping("update")
- public AjaxResult updateCustomerVisit(@RequestBody CustomerVisits customerVisits) {
- boolean updateResult = customerVisitsService.updateCustomerVisit(customerVisits);
+ public AjaxResult updateCustomerVisit(@RequestBody CustomerVisitsDto customerVisitsDto) throws Exception{
+ boolean updateResult = customerVisitsService.updateCustomerVisit(customerVisitsDto);
if (updateResult) {
return AjaxResult.success("缂栬緫鎴愬姛");
}
@@ -67,6 +81,8 @@
}
boolean deleteResult = customerVisitsService.removeById(customerId);
if (deleteResult) {
+ // 鍒犻櫎瀵瑰簲鐨勯檮浠�
+ commonFileService.deleteByBusinessId(customerId.longValue(), FileNameType.CUSTOMER_VISITS.getValue());
return AjaxResult.success("鍒犻櫎鎴愬姛");
}
return AjaxResult.error("鍒犻櫎澶辫触");
--
Gitblit v1.9.3