护理类指令预览接口:查询待执行指令调整排序,按照待执行时间正序
This commit is contained in:
parent
e2f79dd50a
commit
adb8b265ae
|
|
@ -226,11 +226,11 @@
|
||||||
CASE
|
CASE
|
||||||
WHEN p.iz_package = 'N' THEN p.directive_name
|
WHEN p.iz_package = 'N' THEN p.directive_name
|
||||||
ELSE directive_name
|
ELSE directive_name
|
||||||
END AS directive_name,
|
END AS directive_name,
|
||||||
CASE
|
CASE
|
||||||
WHEN p.iz_package = 'Y' THEN p.directive_name
|
WHEN p.iz_package = 'Y' THEN p.directive_name
|
||||||
ELSE directive_name
|
ELSE directive_name
|
||||||
END AS package_name,
|
END AS package_name,
|
||||||
p.preview_file,
|
p.preview_file,
|
||||||
p.net_preview_file,
|
p.net_preview_file,
|
||||||
p.preview_file_small,
|
p.preview_file_small,
|
||||||
|
|
@ -251,16 +251,18 @@
|
||||||
p.positioning,
|
p.positioning,
|
||||||
p.positioning_long,
|
p.positioning_long,
|
||||||
p.tag_name,
|
p.tag_name,
|
||||||
STR_TO_DATE(CONCAT(DATE_FORMAT(CURDATE(), '%Y-%m-%d'), ' ', p.start_time), '%Y-%m-%d %H:%i:%s') as start_time,
|
STR_TO_DATE(CONCAT(DATE_FORMAT(CURDATE(), '%Y-%m-%d'), ' ', p.start_time),
|
||||||
STR_TO_DATE(CONCAT(DATE_FORMAT(CURDATE(), '%Y-%m-%d'), ' ', p.end_time), '%Y-%m-%d %H:%i:%s') as end_time,
|
'%Y-%m-%d %H:%i:%s') as start_time,
|
||||||
|
STR_TO_DATE(CONCAT(DATE_FORMAT(CURDATE(), '%Y-%m-%d'), ' ', p.end_time),
|
||||||
|
'%Y-%m-%d %H:%i:%s') as end_time,
|
||||||
p.create_by,
|
p.create_by,
|
||||||
p.create_time,
|
p.create_time,
|
||||||
p.update_by,
|
p.update_by,
|
||||||
p.update_time,
|
p.update_time,
|
||||||
p.sys_org_code,
|
p.sys_org_code,
|
||||||
p.iz_package,
|
p.iz_package,
|
||||||
pd.directive_id AS sub_id,
|
pd.directive_id AS sub_id,
|
||||||
pd.directive_id AS sub_directive_id
|
pd.directive_id AS sub_directive_id
|
||||||
FROM nu_biz_nu_care_directive_plan p
|
FROM nu_biz_nu_care_directive_plan p
|
||||||
LEFT JOIN
|
LEFT JOIN
|
||||||
nu_config_package_directive pd ON p.directive_id = pd.package_id
|
nu_config_package_directive pd ON p.directive_id = pd.package_id
|
||||||
|
|
@ -323,6 +325,7 @@
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
);
|
)
|
||||||
|
ORDER BY STR_TO_DATE(CONCAT(DATE_FORMAT(CURDATE(), '%Y-%m-%d'), ' ', p.start_time), '%Y-%m-%d %H:%i:%s') ASC
|
||||||
</select>
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue