From 1d1d34b48e6e80bea350d805d8ff2564ca226f25 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期一, 19 八月 2024 13:44:17 +0800
Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/product/product-server-administration/V2.0.0
---
src/main/java/com/product/administration/service/CustomerInfoService.java | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/product/administration/service/CustomerInfoService.java b/src/main/java/com/product/administration/service/CustomerInfoService.java
index be0dc83..638814f 100644
--- a/src/main/java/com/product/administration/service/CustomerInfoService.java
+++ b/src/main/java/com/product/administration/service/CustomerInfoService.java
@@ -8,7 +8,6 @@
import com.product.administration.config.CmnConst;
import com.product.administration.service.ide.ICustomerInfoService;
-import com.product.common.lang.StringUtils;
import com.product.core.dao.BaseDao;
import com.product.core.entity.DataTableEntity;
import com.product.core.entity.FieldSetEntity;
@@ -40,23 +39,31 @@
*/
public DataTableEntity listCustomerInfo(Integer cpage,Integer pageSize,FieldSetEntity fse) {
//鏁版嵁鏉冮檺
- /*
- String dataFilter=permissionService.getDataFilter(CmnConst.CREATED_BY) ;
+// String dataFilter=permissionService.getDataFilter(CmnConst.CREATED_BY) ;
//楂樼骇鏌ヨ
String searchFilter=queryFilterService.getQueryFilter(fse);
-
- if(!StringUtils.isEmpty(dataFilter)) {
- if (!StringUtils.isEmpty(searchFilter)) {
- dataFilter+=" AND "+ searchFilter;
- }
- }else {
- if (!StringUtils.isEmpty(searchFilter)) {
- dataFilter=searchFilter;
- }
+ StringBuilder sbSql = new StringBuilder();
+ sbSql.append("SELECT \n");
+ sbSql.append(" A.uuid,A.customer_name, A.customer_manager, A.customer_manager_leader,A.business_agent, \n");
+ sbSql.append(" CONCAT(B.linkman, '-', B.mobile) AS customer_contact \n");
+ sbSql.append("FROM product_project_customer A \n");
+ sbSql.append("LEFT JOIN product_project_customer_sub B ON B.customer_uuid = A.uuid \n");
+ if (!BaseUtil.strIsNull(searchFilter)) {
+ sbSql.append("WHERE ").append(searchFilter);
}
- */
+
+// if(!StringUtils.isEmpty(dataFilter)) {
+// if (!StringUtils.isEmpty(searchFilter)) {
+// dataFilter+=" AND "+ searchFilter;
+// }
+// }else {
+// if (!StringUtils.isEmpty(searchFilter)) {
+// dataFilter=searchFilter;
+// }
+// }
- DataTableEntity dt=baseDao.listTable(CmnConst.product_project_CUSTOMER, null, null, null, null, pageSize, cpage);
+// DataTableEntity dt=baseDao.listTable(CmnConst.product_project_CUSTOMER, searchFilter, null, null, null, pageSize, cpage);
+ DataTableEntity dt = baseDao.listTable(sbSql.toString(), new Object[] {}, pageSize, cpage);
baseDao.loadPromptData(dt);
return dt;
}
@@ -217,6 +224,7 @@
*/
@Transactional
public boolean deleteCustomerInfo(String uuid) throws BaseException{
- return baseDao.delete(CmnConst.product_project_CUSTOMER, "uuid=?", new Object[] {uuid});
+ String[] uuids = uuid.split(",");
+ return baseDao.delete(CmnConst.product_project_CUSTOMER, BaseUtil.buildQuestionMarkFilter(CmnConst.UUID, uuids.length, true), uuids);
}
}
--
Gitblit v1.9.2