From e8a0fd29e22c43c2146ffae0564ff03cbf0fc2c4 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 14 十月 2025 09:57:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/JkCustomerService.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/JkCustomerService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/JkCustomerService.java
index 9ff9578..c09153d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/JkCustomerService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/JkCustomerService.java
@@ -1,8 +1,11 @@
package com.doumee.service.business;
+import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.business.model.JkCustomer;
+import org.springframework.web.multipart.MultipartFile;
+
import java.util.List;
/**
@@ -25,7 +28,7 @@
*
* @param id 涓婚敭
*/
- void deleteById(Integer id);
+ void deleteById(Integer id,LoginUserInfo user);
/**
* 鍒犻櫎
@@ -39,7 +42,7 @@
*
* @param ids 涓婚敭闆�
*/
- void deleteByIdInBatch(List<Integer> ids);
+ void deleteByIdInBatch(List<Integer> ids,LoginUserInfo user);
/**
* 涓婚敭鏇存柊
@@ -94,4 +97,8 @@
* @return long
*/
long count(JkCustomer jkCustomer);
+
+ List<JkCustomer> importBatch(MultipartFile file, LoginUserInfo loginUser);
+
+ void checkNullLocation();
}
--
Gitblit v1.9.3