|
@@ -50,6 +50,8 @@
|
|
DATE_FORMAT(expect_start_time,'%Y-%m-%d %H:%i:%s') expectStartTime,
|
|
DATE_FORMAT(expect_start_time,'%Y-%m-%d %H:%i:%s') expectStartTime,
|
|
DATE_FORMAT(expect_end_time,'%Y-%m-%d %H:%i:%s') expectEndTime,
|
|
DATE_FORMAT(expect_end_time,'%Y-%m-%d %H:%i:%s') expectEndTime,
|
|
concat(a.expect_start_time,'到',a.expect_end_time) as planTime,
|
|
concat(a.expect_start_time,'到',a.expect_end_time) as planTime,
|
|
|
|
+ case when unix_timestamp(NOW()) > unix_timestamp(expect_end_time) then 1 when unix_timestamp(expect_start_time) > unix_timestamp(NOW()) then 2
|
|
|
|
+ when (unix_timestamp(NOW()) > unix_timestamp(expect_start_time) and unix_timestamp(expect_end_time) > unix_timestamp(NOW()))then 3 end flag,
|
|
a.procedure_no as procedureNo,bo.name bomDesc,
|
|
a.procedure_no as procedureNo,bo.name bomDesc,
|
|
a.status,f.`code` resourceCode ,f.name as resourceDesc
|
|
a.status,f.`code` resourceCode ,f.name as resourceDesc
|
|
from imcs_t_task a
|
|
from imcs_t_task a
|