Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-api into feature/qcast-api-002
This commit is contained in:
commit
0c376b8ca9
@ -158,6 +158,9 @@ public class ObjectRequest {
|
|||||||
@Schema(description = "검색 - 정렬순서")
|
@Schema(description = "검색 - 정렬순서")
|
||||||
private String schSortType;
|
private String schSortType;
|
||||||
|
|
||||||
|
@Schema(description = "검색 - 임시저장여부")
|
||||||
|
private String schTempFlg;
|
||||||
|
|
||||||
@Schema(description = "복사 물건번호")
|
@Schema(description = "복사 물건번호")
|
||||||
private String copyObjectNo;
|
private String copyObjectNo;
|
||||||
|
|
||||||
|
|||||||
@ -265,6 +265,9 @@
|
|||||||
AND O.CREATE_DATETIME BETWEEN CONVERT(DATETIME, CONVERT(VARCHAR(10), PARSE(#{schFromDt} AS DATE USING 'en-US')) + ' 00:00:00') AND CONVERT(DATETIME, CONVERT(VARCHAR(10), PARSE(#{schToDt} AS DATE USING 'en-US')) + ' 23:59:59')
|
AND O.CREATE_DATETIME BETWEEN CONVERT(DATETIME, CONVERT(VARCHAR(10), PARSE(#{schFromDt} AS DATE USING 'en-US')) + ' 00:00:00') AND CONVERT(DATETIME, CONVERT(VARCHAR(10), PARSE(#{schToDt} AS DATE USING 'en-US')) + ' 23:59:59')
|
||||||
</when>
|
</when>
|
||||||
</choose>
|
</choose>
|
||||||
|
<if test='schTempFlg != null and schTempFlg != ""'>
|
||||||
|
AND O.TEMP_FLG = #{schTempFlg}
|
||||||
|
</if>
|
||||||
) TT
|
) TT
|
||||||
<if test='startRow != null and startRow != "" and endRow != null and endRow != ""'>
|
<if test='startRow != null and startRow != "" and endRow != null and endRow != ""'>
|
||||||
WHERE TT.ROW_NUMBER BETWEEN #{startRow} AND #{endRow}
|
WHERE TT.ROW_NUMBER BETWEEN #{startRow} AND #{endRow}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user