|
@@ -81,9 +81,9 @@ public class CustomerApiController {
|
|
|
|
|
|
try {
|
|
|
logger.info("进客户列表时间:"+DateUtils.getTime());
|
|
|
- Long userId = SecurityUtils.getUserId();
|
|
|
+
|
|
|
SysUser sysUser = userService.selectUserById(userId);
|
|
|
- String deptCode = sysUser.getDept().getDeptCode();
|
|
|
+ String deptCode = sysUser.getDept().getDeptCode();*/
|
|
|
|
|
|
|
|
|
|
|
@@ -118,9 +118,9 @@ public class CustomerApiController {
|
|
|
builder.append("\"bool\":{");
|
|
|
builder.append("\"must\":[");
|
|
|
|
|
|
- if(StringUtils.isNotEmpty(deptCode)){
|
|
|
+
|
|
|
builder.append("{\"prefix\":{\"policybelong\":\""+deptCode+"\"}},");
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
if(StringUtils.isNotEmpty(policybelong)){
|
|
|
builder.append("{\"prefix\":{\"policybelong\":\""+policybelong+"\"}},");
|
|
@@ -244,7 +244,7 @@ public class CustomerApiController {
|
|
|
|| StringUtils.isNotEmpty(beginBirthDay) || StringUtils.isNotEmpty(endBirthDay) || StringUtils.isNotEmpty(education)
|
|
|
|| StringUtils.isNotEmpty(PIncomeS) || StringUtils.isNotEmpty(PIncomeE) || (StringUtils.isNotEmpty(gzgw) && "0".equals(gzgw))
|
|
|
|| (StringUtils.isNotEmpty(zcgw) && "0".equals(zcgw)) || StringUtils.isNotEmpty(yx)
|
|
|
- || (StringUtils.isNotEmpty(lp) && "0".equals(lp)) || StringUtils.isNotEmpty(deptCode) ||
|
|
|
+ || (StringUtils.isNotEmpty(lp) && "0".equals(lp)) ||
|
|
|
StringUtils.isNotEmpty(participantsDateS) || StringUtils.isNotEmpty(participantsDateE) ||
|
|
|
StringUtils.isNotEmpty(policybelong) || StringUtils.isNotEmpty(name) || StringUtils.isNotEmpty(mobile)
|
|
|
|| StringUtils.isNotEmpty(fadate)){
|
|
@@ -529,7 +529,7 @@ public class CustomerApiController {
|
|
|
insurancearrangement.add(mp);
|
|
|
}
|
|
|
map.put("insurancearrangement",insurancearrangement);
|
|
|
- scriptRequest = new Request("GET", "/shanglifeecif.partytimeline/_search?pretty=true&sort=sdate:asc&q=partyid:"+scustid);
|
|
|
+ scriptRequest = new Request("GET", "/shanglifeecif.partytimeline/_search?size=100&pretty=true&sort=sdate:asc&q=partyid:"+scustid);
|
|
|
|
|
|
response = restClient.performRequest(scriptRequest);
|
|
|
result = EntityUtils.toString(response.getEntity());
|
|
@@ -778,9 +778,9 @@ public class CustomerApiController {
|
|
|
) {
|
|
|
logger.info("导出进时间:"+DateUtils.getTime());
|
|
|
try{
|
|
|
- Long userId = SecurityUtils.getUserId();
|
|
|
+
|
|
|
SysUser sysUser = userService.selectUserById(userId);
|
|
|
- String deptCode = sysUser.getDept().getDeptCode();
|
|
|
+ String deptCode = sysUser.getDept().getDeptCode();*/
|
|
|
|
|
|
|
|
|
|
|
@@ -815,9 +815,9 @@ public class CustomerApiController {
|
|
|
builder.append("\"bool\":{");
|
|
|
builder.append("\"must\":[");
|
|
|
|
|
|
- if(StringUtils.isNotEmpty(deptCode)){
|
|
|
+
|
|
|
builder.append("{\"prefix\":{\"policybelong\":\""+deptCode+"\"}},");
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
if(StringUtils.isNotEmpty(policybelong)){
|
|
|
builder.append("{\"prefix\":{\"policybelong\":\""+policybelong+"\"}},");
|
|
@@ -941,7 +941,7 @@ public class CustomerApiController {
|
|
|
|| StringUtils.isNotEmpty(beginBirthDay) || StringUtils.isNotEmpty(endBirthDay) || StringUtils.isNotEmpty(education)
|
|
|
|| StringUtils.isNotEmpty(PIncomeS) || StringUtils.isNotEmpty(PIncomeE) || (StringUtils.isNotEmpty(gzgw) && "0".equals(gzgw))
|
|
|
|| (StringUtils.isNotEmpty(zcgw) && "0".equals(zcgw)) || StringUtils.isNotEmpty(yx)
|
|
|
- || (StringUtils.isNotEmpty(lp) && "0".equals(lp)) || StringUtils.isNotEmpty(deptCode) ||
|
|
|
+ || (StringUtils.isNotEmpty(lp) && "0".equals(lp)) ||
|
|
|
StringUtils.isNotEmpty(participantsDateS) || StringUtils.isNotEmpty(participantsDateE) ||
|
|
|
StringUtils.isNotEmpty(policybelong) || StringUtils.isNotEmpty(name) || StringUtils.isNotEmpty(mobile)
|
|
|
|| StringUtils.isNotEmpty(fadate)){
|