|
|
@@ -250,25 +250,8 @@
|
|
|
</if>
|
|
|
<choose>
|
|
|
<when test='preview != null and preview == "Y"'>
|
|
|
- AND IFNULL((SELECT DISP_EDDT
|
|
|
- FROM TB_PLAN
|
|
|
- WHERE PLAN_SQ = CASE WHEN INSTR(A.STR_VAR1,'/planning/detail/form') > 0 AND INSTR(A.STR_VAR1,'planSq=') > 0 THEN
|
|
|
- (SUBSTR(A.STR_VAR1,INSTR(A.STR_VAR1,'planSq=') + 7,LENGTH(A.STR_VAR1) + 1))
|
|
|
- ELSE
|
|
|
- NULL
|
|
|
- END
|
|
|
- ),STR_TO_DATE(#{viewDt},'%Y%m%d%H%i%S')
|
|
|
- ) <![CDATA[>=]]> STR_TO_DATE(#{viewDt},'%Y%m%d%H%i%S')
|
|
|
- AND IFNULL((SELECT DISP_STDT
|
|
|
- FROM TB_PLAN
|
|
|
- WHERE PLAN_SQ = CASE WHEN INSTR(A.STR_VAR1,'/planning/detail/form') > 0 AND INSTR(A.STR_VAR1,'planSq=') > 0 THEN
|
|
|
- (SUBSTR(A.STR_VAR1,INSTR(A.STR_VAR1,'planSq=') + 7,LENGTH(A.STR_VAR1) + 1))
|
|
|
- ELSE
|
|
|
- NULL
|
|
|
- END
|
|
|
- ),STR_TO_DATE(#{viewDt},'%Y%m%d%H%i%S')
|
|
|
- ) <![CDATA[<=]]> STR_TO_DATE(#{viewDt},'%Y%m%d%H%i%S')
|
|
|
- ORDER BY CONTENTS_LOC, DISP_ORD, PRE_CONTENTS_SQ
|
|
|
+ AND A.DISP_STDT <![CDATA[<=]]> STR_TO_DATE(#{viewDt},'%Y%m%d%H%i%S')
|
|
|
+ AND A.DISP_EDDT <![CDATA[>=]]> STR_TO_DATE(#{viewDt},'%Y%m%d%H%i%S')
|
|
|
</when>
|
|
|
<otherwise>
|
|
|
AND A.DISP_STDT <![CDATA[<=]]> NOW()
|