From dd69bfc1fb8e5e28dde754fab7f23bfb1a18faa5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 05 六月 2026 16:58:07 +0800
Subject: [PATCH] config(dev): 更新开发环境配置和文件上传功能 - 调整文件上传路径配置 - 修复OA环境文件链接前缀配置 - 在审批实例服务中添加报销相关数据删除逻辑 - 实现申请人姓名自动填充功能 - 添加文件下载预览路由的正则表达式支持 - 为企业新闻VO添加附件列表兼容别名 - 完善员工入职服务的异常处理 - 新增账户附件管理控制器 - 实现文件上传接口并返回完整文件信息
---
src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 insertions(+), 8 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 5023c99..2e0a0b0 100644
--- a/src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java
+++ b/src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java
@@ -8,9 +8,10 @@
import com.ruoyi.customervisits.mapper.CustomerVisitsMapper;
import com.ruoyi.customervisits.pojo.CustomerVisits;
import com.ruoyi.customervisits.service.CustomerVisitsService;
+import lombok.RequiredArgsConstructor;
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
@@ -18,18 +19,42 @@
*/
@Service
@Slf4j
+@RequiredArgsConstructor
public class CustomerVisitsServiceImpl extends ServiceImpl<CustomerVisitsMapper, CustomerVisits> implements CustomerVisitsService {
- @Autowired
- private CustomerVisitsMapper customerVisitsMapper;
+ private final CustomerVisitsMapper customerVisitsMapper;
@Override
public IPage<CustomerVisits> listPage(Page page, CustomerVisits customerVisits) {
- LambdaQueryWrapper<CustomerVisits> customerVisitsLambdaQueryWrapper = new LambdaQueryWrapper<>();
- if(customerVisits != null && !StringUtils.isEmpty(customerVisits.getCustomerName())){
- customerVisitsLambdaQueryWrapper.like(CustomerVisits::getCustomerName, customerVisits.getCustomerName());
+ LambdaQueryWrapper<CustomerVisits> wrapper = new LambdaQueryWrapper<>();
+
+ if (customerVisits != null) {
+ if (StringUtils.hasText(customerVisits.getCustomerName())) {
+ wrapper.like(CustomerVisits::getCustomerName, customerVisits.getCustomerName());
+ }
+
+ if (StringUtils.hasText(customerVisits.getVisitingPeople())) {
+ wrapper.like(CustomerVisits::getVisitingPeople, customerVisits.getVisitingPeople());
+ }
}
- Page page1 = customerVisitsMapper.selectPage(page, customerVisitsLambdaQueryWrapper);
- return page1;
+
+ return customerVisitsMapper.selectPage(page, wrapper);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean updateCustomerVisit(CustomerVisits customerVisits) {
+ if (customerVisits == null || customerVisits.getId() == null) {
+ return false;
+ }
+
+ if (StringUtils.isEmpty(customerVisits.getCustomerName())
+ || StringUtils.isEmpty(customerVisits.getPurposeVisit())
+ || StringUtils.isEmpty(customerVisits.getVisitAddress())
+ || StringUtils.isEmpty(customerVisits.getPurposeDate())) {
+ return false;
+ }
+
+ return updateById(customerVisits);
}
}
--
Gitblit v1.9.3