|
@@ -87,7 +87,7 @@ public class EsCountService {
|
|
|
valueDTO.setFieldId(countVO.getFieldId());
|
|
|
valueDTO.setFieldValue(Arrays.asList("\""+value+"\""));
|
|
|
customFields.add(valueDTO);
|
|
|
- this.getDatas(searchCondition, "",customFields, null, projectId,
|
|
|
+ this.getDatas(searchCondition, "",customFields, taskId, projectId,
|
|
|
esCountVOS, detailDTOS, esCountDTO, value, map);
|
|
|
}
|
|
|
}
|
|
@@ -99,12 +99,12 @@ public class EsCountService {
|
|
|
} else {
|
|
|
condition = countVO.getField() + " = " + "\""+value+"\"";
|
|
|
}
|
|
|
- this.getDatas(searchCondition, condition, customFields, null, projectId,
|
|
|
+ this.getDatas(searchCondition, condition, customFields, taskId, projectId,
|
|
|
esCountVOS, detailDTOS, esCountDTO, value, map);
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
- this.getDatas(searchCondition, "", customFields, null, projectId, countVOS,
|
|
|
+ this.getDatas(searchCondition, "", customFields, taskId, projectId, countVOS,
|
|
|
detailDTOS, esCountDTO, "", map);
|
|
|
}
|
|
|
esCountDTO.setDetailDTOS(detailDTOS);
|