update-无人机设备调用查询条件

xiebin

2026-02-26 6b41a765938095f4a1c71203de11ab3bfd93224e

update-无人机设备调用查询条件

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdDeviceCallEntity.java

@@ -48,6 +48,11 @@
    @ApiModelProperty(value = "发起任务部门")
    private String taskDepartment;
    /**
     * 任务发起人id
     */
    @ApiModelProperty(value = "任务发起人id")
    private Long taskInitiatorId;
    /**
     * 任务发起人
     */
    @ApiModelProperty(value = "任务发起人")

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdDeviceCallMapper.xml

@@ -25,7 +25,19 @@


    <select id="selectGdDeviceCallPage" resultMap="gdDeviceCallResultMap">
        select * from ja_gd_device_call where is_deleted = 0
        select * from ja_gd_device_call
        <where>
            is_deleted = 0
            <if test="param2.patrolTaskName != null and param2.patrolTaskName != ''">
                and patrol_task_name like concat('%',#{param2.patrolTaskName},'%')
            </if>
            <if test="param2.deviceId != null and param2.deviceId != ''">
                and device_id = #{param2.deviceId}
            </if>
            <if test="param2.taskInitiatorId != null and param2.taskInitiatorId != ''">
                and task_initiator_id = #{param2.taskInitiatorId}
            </if>
        </where>
    </select>



 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/GdDeviceCallPageParam.java

@@ -31,7 +31,7 @@
    /**
     * 任务发起人
     */
    @ApiModelProperty(value = "任务发起人")
    private String taskInitiator;
    @ApiModelProperty(value = "任务发起人id")
    private Long taskInitiatorId;

}

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdDeviceCallServiceImpl.java

@@ -74,6 +74,7 @@
        callEntity.setPatrolTaskName(patrolTask.getPatrolTaskName());
        callEntity.setTaskDepartment(SysCache.getDeptName(patrolTask.getCreateDept()));
        callEntity.setTaskInitiator(UserCache.getUser(patrolTask.getCreateUser()).getName());
        callEntity.setTaskInitiatorId(patrolTask.getCreateUser());
        callEntity.setPlanExecuteTime(patrolTask.getExecuteTime());
        callEntity.setActualExecuteTime(dtos.get(0).getOccurTime());// 第一条数据的发生时间


 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdDeviceCallVO.java

@@ -52,6 +52,11 @@
    @ApiModelProperty(value = "发起任务部门")
    private String taskDepartment;
    /**
     * 任务发起人id
     */
    @ApiModelProperty(value = "任务发起人id")
    private Long taskInitiatorId;
    /**
     * 任务发起人
     */
    @ApiModelProperty(value = "任务发起人")
@@ -59,7 +64,7 @@
    /**
     * 飞行时长
     */
    @ApiModelProperty(value = "飞行时长")
    @ApiModelProperty(value = "飞行时长（秒）")
    private String flightDuration;
    /**
     * 飞行里程（米）