From f2e783ca6e47761e7daadbac193cf80474d35edd Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 25 五月 2026 13:19:12 +0800
Subject: [PATCH] feat(approve): 重构审批流程配置功能
---
src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java | 282 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 250 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java
index 8872e88..2921463 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java
@@ -4,51 +4,64 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
import com.ruoyi.approve.pojo.ApproveProcess;
-import com.ruoyi.approve.service.IApproveProcessService;
import com.ruoyi.approve.service.impl.ApproveProcessServiceImpl;
-import com.ruoyi.approve.vo.ApproveGetAndUpdateVo;
-import com.ruoyi.approve.vo.ApproveProcessVO;
+import com.ruoyi.approve.bean.vo.ApproveProcessVO;
+import com.ruoyi.basic.mapper.CustomerMapper;
+import com.ruoyi.basic.mapper.ProductModelMapper;
+import com.ruoyi.basic.pojo.Customer;
+import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
-import com.ruoyi.common.utils.uuid.UUID;
import com.ruoyi.framework.security.LoginUser;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.mapper.SysUserMapper;
+import com.ruoyi.sales.dto.QuotationRecordJSON;
import com.ruoyi.sales.dto.SalesQuotationDto;
+import com.ruoyi.sales.mapper.QuotationRecordMapper;
import com.ruoyi.sales.mapper.SalesQuotationMapper;
import com.ruoyi.sales.mapper.SalesQuotationProductMapper;
import com.ruoyi.sales.pojo.SalesQuotation;
import com.ruoyi.sales.pojo.SalesQuotationProduct;
+import com.ruoyi.sales.service.QuotationRecordService;
import com.ruoyi.sales.service.SalesQuotationProductService;
import com.ruoyi.sales.service.SalesQuotationService;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.apache.poi.ss.usermodel.*;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.InputStream;
+import java.math.BigDecimal;
import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
@Service
+@RequiredArgsConstructor
@Transactional(rollbackFor = Exception.class)
public class SalesQuotationServiceImpl extends ServiceImpl<SalesQuotationMapper, SalesQuotation> implements SalesQuotationService {
- @Autowired
- private SalesQuotationMapper salesQuotationMapper;
- @Autowired
- private SalesQuotationProductMapper salesQuotationProductMapper;
- @Autowired
- private SalesQuotationProductService salesQuotationProductService;
+ private final SalesQuotationMapper salesQuotationMapper;
+ private final SalesQuotationProductMapper salesQuotationProductMapper;
+ private final SalesQuotationProductService salesQuotationProductService;
+ private final ApproveProcessServiceImpl approveProcessService;
+ private final CustomerMapper customerMapper;
+ private final SysUserMapper sysUserMapper;
+ private final ProductModelMapper productModelMapper;
+ private final QuotationRecordMapper quotationRecordMapper;
+ private final QuotationRecordService quotationRecordsService;
- @Autowired
- private ApproveProcessServiceImpl approveProcessService;
@Override
public IPage<SalesQuotationDto> listPage(Page page, SalesQuotationDto salesQuotationDto) {
IPage<SalesQuotationDto> salesQuotationDtoIPage = salesQuotationMapper.listPage(page, salesQuotationDto);
- if(CollectionUtils.isEmpty(salesQuotationDtoIPage.getRecords())){
+ if (CollectionUtils.isEmpty(salesQuotationDtoIPage.getRecords())) {
return salesQuotationDtoIPage;
}
salesQuotationDtoIPage.getRecords().forEach(record -> {
@@ -63,11 +76,11 @@
LoginUser loginUser = SecurityUtils.getLoginUser();
SalesQuotation salesQuotation = new SalesQuotation();
BeanUtils.copyProperties(salesQuotationDto, salesQuotation);
- String quotationNo = OrderUtils.countTodayByCreateTime(salesQuotationMapper, "QT","quotation_no");
+ String quotationNo = OrderUtils.countTodayByCreateTime(salesQuotationMapper, "QT", "quotation_no");
salesQuotation.setQuotationNo(quotationNo);
salesQuotation.setStatus("寰呭鎵�");
salesQuotationMapper.insert(salesQuotation);
- if(CollectionUtils.isEmpty(salesQuotationDto.getProducts())){
+ if (CollectionUtils.isEmpty(salesQuotationDto.getProducts())) {
return true;
}
List<SalesQuotationProduct> products = salesQuotationDto.getProducts().stream().map(product -> {
@@ -88,26 +101,38 @@
approveProcessVO.setPrice(salesQuotationDto.getTotalAmount());
try {
approveProcessService.addApprove(approveProcessVO);
- }catch (Exception e){
+ } catch (Exception e) {
log.error("SalesQuotationServiceImpl error:{}", e);
throw new RuntimeException("瀹℃壒澶辫触");
}
return true;
}
+
@Override
public boolean edit(SalesQuotationDto salesQuotationDto) {
SalesQuotation salesQuotation = new SalesQuotation();
BeanUtils.copyProperties(salesQuotationDto, salesQuotation);
- ApproveGetAndUpdateVo vo = new ApproveGetAndUpdateVo();
- if("鎷掔粷".equals(salesQuotationDto.getStatus())){
- vo.setApproveStatus(0);
- salesQuotation.setStatus("寰呭鎵�");
- }
- if(salesQuotationMapper.updateById(salesQuotation)!=1){
+// if ("鎷掔粷".equals(salesQuotationDto.getStatus())) {
+// vo.setApproveStatus(0);
+// salesQuotation.setStatus("寰呭鎵�");
+// }
+ //缂栬緫灏嗗鎵规敼涓哄緟瀹℃壒
+ salesQuotation.setStatus("寰呭鎵�");
+ //灏嗕箣鍓嶆湭瀹℃壒鐨勭粨鏉�
+ LambdaQueryWrapper<ApproveProcess> approveProcessLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ approveProcessLambdaQueryWrapper.eq(ApproveProcess::getApproveType, 6)
+ .eq(ApproveProcess::getApproveReason, salesQuotationDto.getQuotationNo());
+ List<ApproveProcess> approveProcesss = approveProcessService.list(approveProcessLambdaQueryWrapper);
+ approveProcesss.forEach(approveProcess -> {
+ approveProcess.setApproveStatus(4);
+ });
+ approveProcessService.updateBatchById(approveProcesss);
+
+ if (salesQuotationMapper.updateById(salesQuotation) != 1) {
return false;
}
salesQuotationProductMapper.delete(new LambdaQueryWrapper<SalesQuotationProduct>().eq(SalesQuotationProduct::getSalesQuotationId, salesQuotationDto.getId()));
- if(CollectionUtils.isEmpty(salesQuotationDto.getProducts())){
+ if (CollectionUtils.isEmpty(salesQuotationDto.getProducts())) {
return true;
}
List<SalesQuotationProduct> products = salesQuotationDto.getProducts().stream().map(product -> {
@@ -119,27 +144,220 @@
salesQuotationProductService.saveBatch(products);
// 淇敼鎶ヤ环瀹℃壒
- vo.setApproveUserIds(salesQuotationDto.getApproveUserIds());
- vo.setApproveType(6);
- vo.setApproveReason(salesQuotationDto.getQuotationNo());
- approveProcessService.updateApproveUser(vo);
+ ApproveProcessVO approveProcessVO = new ApproveProcessVO();
+ approveProcessVO.setApproveType(6);
+ approveProcessVO.setApproveDeptId(SecurityUtils.getLoginUser().getCurrentDeptId());
+ approveProcessVO.setApproveReason(salesQuotation.getQuotationNo());
+ approveProcessVO.setApproveUserIds(salesQuotationDto.getApproveUserIds());
+ approveProcessVO.setApproveUser(SecurityUtils.getUserId());
+ approveProcessVO.setApproveTime(LocalDate.now().toString());
+ approveProcessVO.setPrice(salesQuotationDto.getTotalAmount());
+ try {
+ approveProcessService.addApprove(approveProcessVO);
+ }catch (Exception e){
+ log.error("SalesQuotationServiceImpl error:{}", e);
+ }
return true;
}
+
@Override
public boolean delete(Long id) {
SalesQuotation salesQuotation = salesQuotationMapper.selectById(id);
- if(salesQuotation==null) return false;
+ if (salesQuotation == null) return false;
salesQuotationMapper.deleteById(id);
salesQuotationProductMapper.delete(new LambdaQueryWrapper<SalesQuotationProduct>().eq(SalesQuotationProduct::getSalesQuotationId, id));
// 鍒犻櫎鎶ヤ环瀹℃壒
ApproveProcess one = approveProcessService.getOne(new LambdaQueryWrapper<ApproveProcess>()
.eq(ApproveProcess::getApproveType, 6)
.eq(ApproveProcess::getApproveReason, salesQuotation.getQuotationNo()));
- if(one != null){
+ if (one != null) {
approveProcessService.delByIds(Collections.singletonList(one.getId()));
}
return true;
}
+ @Override
+ public QuotationRecordJSON importData(MultipartFile file, String approveUserIdsJson) {
+ try (InputStream inputStream = file.getInputStream();
+ Workbook workbook = WorkbookFactory.create(inputStream)) {
+ Sheet sheet = workbook.getNumberOfSheets() > 1 ? workbook.getSheetAt(1) : workbook.getSheetAt(0);
+ DataFormatter dataFormatter = new DataFormatter();
+ QuotationRecordJSON result = new QuotationRecordJSON();
+ // 妯℃澘涓鎴蜂俊鎭浐瀹氬湪绗�2琛�(A2-F2)锛屼笖鍙湁涓�琛�
+ Row customerRow = sheet.getRow(1);
+ List<Customer> customers = customerMapper.selectList(new LambdaQueryWrapper<Customer>()
+ .eq(Customer::getCustomerName, getStringCell(customerRow, 0, dataFormatter)));
+ if (CollectionUtils.isEmpty(customers)) {
+ throw new RuntimeException("瀹㈡埛涓嶅瓨鍦�");
+ }
+ List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
+ .eq(SysUser::getNickName, getStringCell(customerRow, 1, dataFormatter)));
+ if (CollectionUtils.isEmpty(sysUsers)) {
+ throw new RuntimeException("涓氬姟鍛樹笉瀛樺湪");
+ }
+
+ if (customerRow != null) {
+ result.setCustomer(getStringCell(customerRow, 0, dataFormatter));
+ result.setSalesperson(getStringCell(customerRow, 1, dataFormatter));
+ result.setQuotationDate(getStringCell(customerRow, 2, dataFormatter));
+ result.setValidDate(getStringCell(customerRow, 3, dataFormatter));
+ result.setPaymentMethod(getStringCell(customerRow, 4, dataFormatter));
+ result.setRemark(getStringCell(customerRow, 5, dataFormatter));
+ }
+
+ // 妯℃澘涓骇鍝佽〃澶村湪绗�7琛岋紝鏁版嵁浠庣8琛屽紑濮�
+ List<QuotationRecordJSON.ProductJSON> products = new ArrayList<>();
+ int startRow = 7;
+ for (int i = startRow; i <= sheet.getLastRowNum(); i++) {
+ Row row = sheet.getRow(i);
+ if (row == null) {
+ continue;
+ }
+ String product = getStringCell(row, 0, dataFormatter);
+ String specification = getStringCell(row, 1, dataFormatter);
+ List<ProductModel> productModels = productModelMapper.selectList(new LambdaQueryWrapper<ProductModel>()
+ .eq(ProductModel::getModel, specification));
+ if (CollectionUtils.isEmpty(productModels)) {
+ throw new RuntimeException("浜у搧涓嶅瓨鍦�");
+ }
+ ProductModel productModel = productModels.get(0);
+
+ BigDecimal unitPrice = getDecimalCell(row, 2, dataFormatter);
+ if (isBlank(product) && isBlank(specification) && unitPrice == null) {
+ continue;
+ }
+ QuotationRecordJSON.ProductJSON item = new QuotationRecordJSON.ProductJSON();
+ item.setProduct(product);
+ item.setSpecification(specification);
+ item.setUnit(productModel.getUnit());
+ item.setUnitPrice(unitPrice);
+ products.add(item);
+ }
+ result.setProducts(products);
+ // 澶勭悊鎶ヤ环鍗�
+ SalesQuotation salesQuotation = addOrUpdateApproveProcess(result, approveUserIdsJson);
+
+ Integer insertResult = quotationRecordsService.add(salesQuotation.getId(), result);
+ if (insertResult <= 0) {
+ throw new RuntimeException("鎶ヤ环璁板綍鏂板澶辫触");
+ }
+ return result;
+ } catch (Exception e) {
+ throw new RuntimeException("瀵煎叆閿�鍞姤浠锋ā鏉垮け璐ワ細" + e.getMessage(), e);
+ }
+ }
+
+ private SalesQuotation addOrUpdateApproveProcess(QuotationRecordJSON quotationRecordJSON, String approveUserIdsJson) {
+ List<SalesQuotation> salesQuotations = salesQuotationMapper.selectList(new LambdaQueryWrapper<SalesQuotation>()
+ .eq(SalesQuotation::getCustomer, quotationRecordJSON.getCustomer())
+ .eq(SalesQuotation::getStatus, "寰呭鎵�"));
+
+ if (CollectionUtils.isEmpty(salesQuotations)) {
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ SalesQuotation salesQuotation = new SalesQuotation();
+ String quotationNo = OrderUtils.countTodayByCreateTime(salesQuotationMapper, "QT", "quotation_no");
+ salesQuotation.setQuotationNo(quotationNo);
+ salesQuotation.setCustomer(quotationRecordJSON.getCustomer());
+ salesQuotation.setSalesperson(quotationRecordJSON.getSalesperson());
+ salesQuotation.setQuotationDate(LocalDate.parse(quotationRecordJSON.getQuotationDate()));
+ salesQuotation.setValidDate(LocalDate.parse(quotationRecordJSON.getValidDate()));
+ salesQuotation.setPaymentMethod(quotationRecordJSON.getPaymentMethod());
+ salesQuotation.setStatus("寰呭鎵�");
+ BigDecimal totalAmount = quotationRecordJSON.getProducts().stream()
+ .map(QuotationRecordJSON.ProductJSON::getUnitPrice)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ salesQuotation.setTotalAmount(totalAmount);
+ salesQuotationMapper.insert(salesQuotation);
+
+ List<SalesQuotationProduct> products = quotationRecordJSON.getProducts().stream().map(product -> {
+ SalesQuotationProduct salesQuotationProduct = new SalesQuotationProduct();
+ salesQuotationProduct.setProduct(product.getProduct());
+ salesQuotationProduct.setSpecification(product.getSpecification());
+ salesQuotationProduct.setUnit(product.getUnit());
+ salesQuotationProduct.setUnitPrice(product.getUnitPrice().doubleValue());
+ salesQuotationProduct.setSalesQuotationId(salesQuotation.getId());
+ return salesQuotationProduct;
+ }).collect(Collectors.toList());
+ salesQuotationProductService.saveBatch(products);
+ // 鎶ヤ环瀹℃壒
+ ApproveProcessVO approveProcessVO = new ApproveProcessVO();
+ approveProcessVO.setApproveType(6);
+ approveProcessVO.setApproveDeptId(loginUser.getCurrentDeptId());
+ approveProcessVO.setApproveReason(quotationNo);
+ approveProcessVO.setApproveUserIds(approveUserIdsJson);
+ approveProcessVO.setApproveUser(loginUser.getUserId());
+ approveProcessVO.setApproveTime(LocalDate.now().toString());
+ approveProcessVO.setPrice(salesQuotation.getTotalAmount());
+ try {
+ approveProcessService.addApprove(approveProcessVO);
+ } catch (Exception e) {
+ log.error("SalesQuotationServiceImpl error:{}", e);
+ throw new RuntimeException("瀹℃壒澶辫触");
+ }
+ return salesQuotation;
+ } else {
+ if (salesQuotations.size() > 1) {
+ throw new RuntimeException("瀛樺湪澶氫釜寰呭鎵圭殑鎶ヤ环鍗�");
+ } else {
+ SalesQuotation salesQuotation = salesQuotations.get(0);
+ salesQuotation.setSalesperson(quotationRecordJSON.getSalesperson());
+ salesQuotation.setQuotationDate(LocalDate.parse(quotationRecordJSON.getQuotationDate()));
+ salesQuotation.setValidDate(LocalDate.parse(quotationRecordJSON.getValidDate()));
+ salesQuotation.setPaymentMethod(quotationRecordJSON.getPaymentMethod());
+ BigDecimal totalAmount = quotationRecordJSON.getProducts().stream()
+ .map(QuotationRecordJSON.ProductJSON::getUnitPrice)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ salesQuotation.setTotalAmount(totalAmount);
+ salesQuotationMapper.updateById(salesQuotation);
+
+ // 鍒犻櫎鍘熸潵鐨勬姤浠蜂骇鍝�
+ salesQuotationProductMapper.delete(new LambdaQueryWrapper<SalesQuotationProduct>()
+ .eq(SalesQuotationProduct::getSalesQuotationId, salesQuotation.getId()));
+
+ List<SalesQuotationProduct> products = quotationRecordJSON.getProducts().stream().map(product -> {
+ SalesQuotationProduct salesQuotationProduct = new SalesQuotationProduct();
+ salesQuotationProduct.setProduct(product.getProduct());
+ salesQuotationProduct.setSpecification(product.getSpecification());
+ salesQuotationProduct.setUnit(product.getUnit());
+ salesQuotationProduct.setUnitPrice(product.getUnitPrice().doubleValue());
+ salesQuotationProduct.setSalesQuotationId(salesQuotation.getId());
+ return salesQuotationProduct;
+ }).collect(Collectors.toList());
+ salesQuotationProductService.saveBatch(products);
+ return salesQuotation;
+ }
+ }
+ }
+
+ private String getStringCell(Row row, int columnIndex, DataFormatter dataFormatter) {
+ if (row == null) {
+ return null;
+ }
+ Cell cell = row.getCell(columnIndex);
+ if (cell == null) {
+ return null;
+ }
+ if (cell.getCellType() == CellType.NUMERIC && DateUtil.isCellDateFormatted(cell)) {
+ return cell.getLocalDateTimeCellValue().toLocalDate().format(DateTimeFormatter.ISO_LOCAL_DATE);
+ }
+ String value = dataFormatter.formatCellValue(cell);
+ return isBlank(value) ? null : value.trim();
+ }
+
+ private BigDecimal getDecimalCell(Row row, int columnIndex, DataFormatter dataFormatter) {
+ String value = getStringCell(row, columnIndex, dataFormatter);
+ if (isBlank(value)) {
+ return null;
+ }
+ try {
+ return new BigDecimal(value.replace(",", ""));
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+ private boolean isBlank(String value) {
+ return value == null || value.trim().isEmpty();
+ }
}
--
Gitblit v1.9.3