rev:平板作业管理测试修改
This commit is contained in:
@@ -42,7 +42,7 @@ public interface SchBaseTaskMapper extends BaseMapper<SchBaseTask> {
|
||||
* end_time: 结束时间
|
||||
* }
|
||||
*/
|
||||
List<JSONObject> queryPdaHistoryTask(JSONObject whereJson);
|
||||
List<JSONObject> queryPdaHistoryTask(@Param("param") JSONObject whereJson);
|
||||
|
||||
/**
|
||||
* 获取载具任务
|
||||
|
||||
@@ -99,7 +99,8 @@
|
||||
<select id="queryPdaHistoryTask" resultType="com.alibaba.fastjson.JSONObject">
|
||||
SELECT
|
||||
task.*,
|
||||
config.config_name
|
||||
config.config_name,
|
||||
SUBSTR(task.create_time,1,10) AS task_time
|
||||
FROM
|
||||
sch_base_task task
|
||||
INNER JOIN sch_base_taskconfig config ON task.config_code = config.config_code
|
||||
@@ -116,12 +117,12 @@
|
||||
|
||||
<if test="param.start_time != null and param.start_time != ''">
|
||||
AND
|
||||
task.create_time > #{param.start_time}
|
||||
SUBSTR(task.create_time,1,10) >= #{param.start_time}
|
||||
</if>
|
||||
|
||||
<if test="param.end_time != null and param.end_time != ''">
|
||||
AND
|
||||
#{param.end_time} > task.create_time
|
||||
#{param.end_time} >= SUBSTR(task.create_time,1,10)
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
Reference in New Issue
Block a user