zhangwenzan
/
crm_pro-master
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

工商登记开业公海：修改

This commit is contained in:
ZZM 2025-12-26 16:26:06 +08:00
parent d6998f2185
commit caa7a03a88
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/com/kakarote/core/security/util/EsDataEncryptUtil.java
View File

@ -46,7 +46,9 @@ public class EsDataEncryptUtil {
"status",
"planNum",
"checkStatus",
"_id"
"_id",
"website",
"remark"
));
// 检查传入的字段是否不在上述集合中

2
crm/src/main/java/com/kakarote/crm/common/ElasticUtil.java
View File

@ -302,7 +302,7 @@ public class ElasticUtil {
* @param queryBuilder 查询器
*/
public static void textSearch(CrmSearchBO.Search search, BoolQueryBuilder queryBuilder) {
if (search.getValues().size() == 0 && !Arrays.asList(5, 6).contains(search.getSearchEnum().getType())) {
if (search.getValues().isEmpty() && !Arrays.asList(5, 6).contains(search.getSearchEnum().getType())) {
return;
}

8
crm/src/main/java/com/kakarote/crm/service/CrmPageService.java
View File

@ -239,6 +239,9 @@ public interface CrmPageService {
//排序以及查询字段
sort(crmSearchBO, sourceBuilder);
sourceBuilder.query(createQueryBuilder(crmSearchBO));
// 查询语句
String queryString = sourceBuilder.toString();
log.info("Elasticsearch 查询语句: {}", queryString);
return sourceBuilder;
}
@ -391,7 +394,10 @@ public interface CrmPageService {
FieldEnum fieldEnum = FieldEnum.parse(formType);
switch (fieldEnum) {
case TEXTAREA:
search.setName(search.getName() + ".keyword");
// 如果是 remark 字段，不添加 .keyword
if (!"remark".equals(search.getName())) {
search.setName(search.getName() + ".keyword");
}
case TEXT:
case MOBILE:
case EMAIL:

12
crm/src/main/java/com/kakarote/crm/service/impl/CrmCustomerServiceImpl.java
View File

@ -397,6 +397,14 @@ public class CrmCustomerServiceImpl extends BaseServiceImpl<CrmCustomerMapper, C
} else {
crmModel = new CrmModel(CrmEnum.CUSTOMER.getType());
}
// 对行政区划进行处理
if (crmModel.get("remark") != null) {
String xzqhDm = crmModel.get("remark").toString();
String xzqhName = xzqhService.getXzqhName(xzqhDm);
crmModel.replace("remark", xzqhName);
}
// 数据脱敏
return encryptSensitiveData(crmModel);
}
@ -659,8 +667,8 @@ public class CrmCustomerServiceImpl extends BaseServiceImpl<CrmCustomerMapper, C
}else if ("客户详细地址".equals(crmField.getName())){
field.setValue(gsdjxx.getScjydz());
}else if ("客户所在地区".equals(crmField.getName())){
String xzqhName = xzqhService.getXzqhName(gsdjxx.getScjydzxzqhszDm());
field.setValue(xzqhName);
//String xzqhName = xzqhService.getXzqhName(gsdjxx.getScjydzxzqhszDm());
field.setValue(gsdjxx.getXzqhDm());
}else if ("开业日期".equals(crmField.getName())){
field.setValue(gsdjxx.getKyrq());
}else if ("客户名称".equals(crmField.getName())){