Commit babbab98 authored by liufan's avatar liufan

优化:设备品种code值转换为文字的方式,由调接口转换改为sql转换

parent a4b63f3d
......@@ -575,18 +575,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
String status = ConstructionEnum.getName.get(integer);
dto2.put(CONSTRUCTIONTYPE, status);
}
if (!ValidationUtil.isEmpty(dto2.get(EQUDEFINE))) {
//转化设备品种名称
String code = dto2.get(EQUDEFINE).toString();
List<EquipmentCategory> equipmentCategoryList = commonService.getEquipmentCategoryList(code, null);
if (!ValidationUtil.isEmpty(equipmentCategoryList)) {
String name = equipmentCategoryList.get(0).getName();
dto2.put(EQUDEFINE, name);
} else {
dto2.put(EQUDEFINE, code);
}
dto2.put(EQUDEFINECODE, code);
}
list.add(dto2);
}
totle = response.getInternalResponse().hits().getTotalHits().value;
......
......@@ -113,6 +113,9 @@ public class ESEquipmentCategoryDto {
private String EQU_DEFINE;
@Field(type = FieldType.Text)
private String EQU_DEFINE_CODE;
@Field(type = FieldType.Text)
private String PRODUCT_NAME;
@Field(type = FieldType.Text)
......
......@@ -97,6 +97,7 @@
USC_UNIT_NAME,
DATE_FORMAT(USC_DATE, '%Y-%m-%d %H:%i:%s') as USC_DATE,
EQU_DEFINE,
EQU_DEFINE_CODE,
PRODUCT_NAME,
BRAND_NAME,
EQU_TYPE,
......
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