Browse Source

客户查询修改

anderx 1 year ago
parent
commit
3605b970d3

+ 2 - 2
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -1612,7 +1612,7 @@ public class AdminCustomerApiController extends BaseApiController{
 			return res;
 		}
 //		res.data(rdService.batchList(file));
-		res.data(customerService.importExcel(file));
-		return res;
+
+		return customerService.importExcel(file);
 	}
 }

+ 1 - 1
src/main/java/com/goafanti/customer/service/CustomerService.java

@@ -587,7 +587,7 @@ public interface CustomerService {
 
 	AdminUserCount getAdminUserCount(String aid, String startTime);
 
-    Object importExcel(MultipartFile file);
+	Result importExcel(MultipartFile file);
 
 	Object getRestrictCustomerByName(String name);
 

+ 11 - 10
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -3102,7 +3102,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		return param;
 	}
 	@Override
-	public Object importExcel(MultipartFile file) {
+	public Result importExcel(MultipartFile file) {
 		NewExcelUtil<InputExcelUser> newExcelUtil=new NewExcelUtil<>(InputExcelUser.class);
 		List<InputExcelUser> list = null;
 		try {
@@ -3110,7 +3110,9 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		} catch (Exception e) {
 			throw new BusinessException(e.getMessage());
 		}
-		return pushUserName(list);
+		List<InputExcelUser> inputExcelUsers = pushUserName(list);
+
+		 return newExcelUtil.exportExcel(inputExcelUsers,"客户数据查询",uploadPath);
 	}
 
 	@Override
@@ -3120,7 +3122,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 
 
 
-	private Object pushUserName(List<InputExcelUser> list) {
+	private List<InputExcelUser> pushUserName(List<InputExcelUser> list) {
 		List<InputExcelUser> res=new ArrayList<>();
 		List<InputExcelUser> list2=new ArrayList<>();
 		int i = 0;
@@ -3136,18 +3138,17 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 								if (ex2.getName()!=null&&excelUser!=null&&excelUser.getName()!=null){
 									if (ex2.getName().equals(excelUser.getName())){
 										excelUser.setType(1);
+										excelUser.setAname(ex2.getAname());
+										excelUser.setStatus(ex2.getStatus());
 										break;
 									}
 								}
 							}
 						}
-						if(excelUser.getType()==null){
-							excelUser.setType(0);
-						}
-						if (excelUser.getType()==1){
-							res.add(excelUser);
-						}
-
+                        if (excelUser != null && excelUser.getType() == null) {
+                            excelUser.setType(0);
+                        }
+                        res.add(excelUser);
 					}
 				}
 				list2.clear();

+ 5 - 5
src/main/resources/props/config_local.properties

@@ -4,13 +4,13 @@ jdbc.driverClassName=com.mysql.jdbc.Driver
 static.host=//static.jishutao.com/1.3.16
 #static.host=//172.16.1.187/1.3.15
 
-#jdbc.url=jdbc\:mysql://localhost:3306/aft20240430?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.url=jdbc\:mysql://localhost:3306/aft20240430?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-#jdbc.username=root
-#jdbc.password=123456
-jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 jdbc.username=root
-jdbc.password=aftdev
+jdbc.password=123456
+#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.username=root
+#jdbc.password=aftdev
 jdbc.validationQuery=SELECT 'x'
 jdbc.initialSize=3
 jdbc.maxActive=20