Commit 48dd5731 authored by liufan's avatar liufan

优化:设备列表,ES中保存的信息,时间字段格式化显示

parent 113c0a1b
...@@ -3,7 +3,6 @@ package com.yeejoin.amos.boot.module.ymt.api.dto; ...@@ -3,7 +3,6 @@ package com.yeejoin.amos.boot.module.ymt.api.dto;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import org.springframework.data.annotation.Id; import org.springframework.data.annotation.Id;
import org.springframework.data.elasticsearch.annotations.DateFormat;
import org.springframework.data.elasticsearch.annotations.Document; import org.springframework.data.elasticsearch.annotations.Document;
import org.springframework.data.elasticsearch.annotations.Field; import org.springframework.data.elasticsearch.annotations.Field;
import org.springframework.data.elasticsearch.annotations.FieldType; import org.springframework.data.elasticsearch.annotations.FieldType;
...@@ -104,6 +103,6 @@ public class ESEquipmentCategoryDto { ...@@ -104,6 +103,6 @@ public class ESEquipmentCategoryDto {
@Field(type = FieldType.Text) @Field(type = FieldType.Text)
private String USC_UNIT_NAME; private String USC_UNIT_NAME;
@Field(type = FieldType.Date, format = DateFormat.basic_date_time, index = false) @Field(type = FieldType.Text)
private String USC_DATE; private String USC_DATE;
} }
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
CONSTRUCTION_TYPE, CONSTRUCTION_TYPE,
USC_UNIT_CREDIT_CODE, USC_UNIT_CREDIT_CODE,
USC_UNIT_NAME, USC_UNIT_NAME,
USC_DATE DATE_FORMAT(USC_DATE, '%Y-%m-%d %H:%i:%s') as USC_DATE
from idx_biz_view_jg_all from idx_biz_view_jg_all
WHERE SEQUENCE_NBR = #{id} WHERE SEQUENCE_NBR = #{id}
</select> </select>
......
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