Commit 2a6c4dec authored by danfuman's avatar danfuman

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司
parents b2c15b4a 652df105
...@@ -52,10 +52,6 @@ public class DCustomerServiceImpl extends ServiceImpl<DCustomerMapper, DCustomer ...@@ -52,10 +52,6 @@ public class DCustomerServiceImpl extends ServiceImpl<DCustomerMapper, DCustomer
//项目合作数量 //项目合作数量
item.setProjectCooperationCount(vo.getProjectCooperationCount()); item.setProjectCooperationCount(vo.getProjectCooperationCount());
showCustomerClass(item); showCustomerClass(item);
//关键字标红
if (!ObjectUtils.isEmpty(bo.getCustomerName())) {
item.setCustomerName(StringUtils.markInRed(item.getCustomerName(), bo.getCustomerName()));
}
try { try {
Map<String, Object> map = opportunityRadarService.enterpriseByName(item.getCustomerName()); Map<String, Object> map = opportunityRadarService.enterpriseByName(item.getCustomerName());
if (!ObjectUtils.isEmpty(map.get("data"))) { if (!ObjectUtils.isEmpty(map.get("data"))) {
...@@ -66,6 +62,10 @@ public class DCustomerServiceImpl extends ServiceImpl<DCustomerMapper, DCustomer ...@@ -66,6 +62,10 @@ public class DCustomerServiceImpl extends ServiceImpl<DCustomerMapper, DCustomer
} catch (Exception e) { } catch (Exception e) {
// //
} }
//关键字标红
if (!ObjectUtils.isEmpty(bo.getCustomerName())) {
item.setCustomerName(StringUtils.markInRed(item.getCustomerName(), bo.getCustomerName()));
}
}); });
} }
return TableDataInfo.build(page); return TableDataInfo.build(page);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment