feature/jp-0331 #526

Open
jungpyo2001 wants to merge 998 commits from feature/jp-0331 into main
Showing only changes of commit 9f04d01e68 - Show all commits

View File

@ -18,7 +18,7 @@
AND U.CATEGORY = UI.CATEGORY AND U.CATEGORY = UI.CATEGORY
WHERE U.OBJECT_NO = #{objectNo} WHERE U.OBJECT_NO = #{objectNo}
<if test="planNo != null and planNo != ''"> <if test="planNo != null and planNo != ''">
AND U.PLAN_NO = #{planNo} AND UI.PLAN_NO = #{planNo}
</if> </if>
<if test='(planNo == null or planNo == "" ) and planNoNullChkFlg == "1"'> <if test='(planNo == null or planNo == "" ) and planNoNullChkFlg == "1"'>
AND UI.PLAN_NO IS NULL AND UI.PLAN_NO IS NULL
@ -55,7 +55,7 @@
AND UI.PLAN_NO = #{planNo} AND UI.PLAN_NO = #{planNo}
</if> </if>
<if test='(planNo == null or planNo == "" ) and planNoNullChkFlg == "1"'> <if test='(planNo == null or planNo == "" ) and planNoNullChkFlg == "1"'>
AND U.PLAN_NO IS NULL AND UI.PLAN_NO IS NULL
</if> </if>
<if test="no != null and no != ''"> <if test="no != null and no != ''">
AND U.NO = #{no} AND U.NO = #{no}
@ -83,7 +83,6 @@
, DEL_FLG , DEL_FLG
, LAST_EDIT_DATETIME , LAST_EDIT_DATETIME
, LAST_EDIT_USER , LAST_EDIT_USER
, PLAN_NO
) VALUES ( ) VALUES (
#{objectNo} #{objectNo}
, #{no} , #{no}
@ -94,7 +93,6 @@
, 0 , 0
, GETDATE() , GETDATE()
, #{userId} , #{userId}
, #{planNo}
) )
</insert> </insert>