From 455b965c6435b5359bb5c25f2b6810dbc06f5481 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期五, 13 二月 2026 17:56:39 +0800
Subject: [PATCH] Merge branch 'dev_New_kthg' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_kthg
---
src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java b/src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java
index e8cfc1a..d63fcb8 100644
--- a/src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java
+++ b/src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java
@@ -4,12 +4,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.customervisits.mapper.CustomerVisitsMapper;
import com.ruoyi.customervisits.pojo.CustomerVisits;
import com.ruoyi.customervisits.service.CustomerVisitsService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
/**
* @author :yys
@@ -24,8 +26,27 @@
@Override
public IPage<CustomerVisits> listPage(Page page, CustomerVisits customerVisits) {
- LambdaQueryWrapper<CustomerVisits> customerVisitsLambdaQueryWrapper = new LambdaQueryWrapper<CustomerVisits>();
- Page page1 = customerVisitsMapper.selectPage(page, customerVisitsLambdaQueryWrapper);
- return page1;
+ LambdaQueryWrapper<CustomerVisits> customerVisitsLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ if (customerVisits != null && !StringUtils.isEmpty(customerVisits.getCustomerName())) {
+ customerVisitsLambdaQueryWrapper.like(CustomerVisits::getCustomerName, customerVisits.getCustomerName());
+ }
+ return customerVisitsMapper.selectPage(page, customerVisitsLambdaQueryWrapper);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean updateCustomerVisit(CustomerVisits customerVisits) {
+ if (customerVisits == null || customerVisits.getId() == null) {
+ throw new RuntimeException("瀹㈡埛ID涓嶈兘涓虹┖");
+ }
+
+ if (StringUtils.isEmpty(customerVisits.getCustomerName())
+ || StringUtils.isEmpty(customerVisits.getPurposeVisit())
+ || StringUtils.isEmpty(customerVisits.getVisitAddress())
+ || StringUtils.isEmpty(customerVisits.getPurposeDate())) {
+ throw new RuntimeException("瀹㈡埛鍚嶇О銆佹嫓璁跨洰鐨勩�佹嫓璁垮湴鍧�銆佹嫓璁挎椂闂翠笉鑳戒负绌�");
+ }
+
+ return updateById(customerVisits);
}
}
--
Gitblit v1.9.3