吉安感知网项目-后端
linwei
6 days ago ee70b08a5dc4958591e1aaf7809eca51ca9e2861
add : 吉安支持查询待验收的接口
3 files modified
22 ■■■■ changed files
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdClueEventEntity.java 8 ●●●●● patch | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml 8 ●●●● patch | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdClueEventVO.java 6 ●●●●● patch | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdClueEventEntity.java
@@ -23,6 +23,8 @@
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
import java.util.Date;
/**
 * 事件表(线索事件) 实体类
 *
@@ -102,4 +104,10 @@
    @ApiModelProperty(value = "AI图片的画框数据")
    private String geojson;
    /**
     * 拍摄时间
     */
    @ApiModelProperty(value = "拍摄时间")
    private Date shootTime;
}
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml
@@ -127,10 +127,10 @@
        ce.create_time as distribute_time,
        concat(ce.longitude, ',', ce.latitude) as event_location,
        ce.event_num as event_num,
        tr.shoot_time as shoot_time,
        tr.result_url as event_image_url,
        tr.geojson as geojson,
        tr.attachment_type
        COALESCE(tr.shoot_time, ce.shoot_time) as shoot_time,
        COALESCE(tr.result_url, ce.attach_url) as event_image_url,
        COALESCE(tr.geojson, ce.geojson)  as geojson,
        COALESCE(tr.attachment_type, ce.attachment_type) as attachment_type
        from ja_gd_clue_event ce
        left join blade_user bu on bu.id::VARCHAR = ce.dispose_user::VARCHAR and bu.is_deleted = 0
        left join blade_dept bd on bd.id::VARCHAR = ce.dispose_dept::VARCHAR and bd.is_deleted = 0
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdClueEventVO.java
@@ -174,5 +174,11 @@
    @ApiModelProperty(value = "事件附件类型")
    private Integer attachmentType;
    /**
     * 事件名称
     */
    @ApiModelProperty(value = "事件名称")
    private String eventName;
}