qcast3/qcast-api
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

dev #532

Merged
ysCha merged 2 commits from dev into dev-deploy 2026-06-18 17:16:35 +09:00
Conversation 0 Commits 2 Files Changed 1 +15 -11
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fa19726f70 - Show all commits

26
src/main/resources/mappers/estimate/estimateMapper.xml
View File

@ -1578,23 +1578,26 @@
TT.*
FROM
(
SELECT
COUNT(1) OVER() AS TOT_CNT
, ROW_NUMBER() OVER(ORDER BY O.OBJECT_NO DESC, P.PLAN_NO) AS ROW_NUMBER
, O.OBJECT_NO
, O.OBJECT_NAME
, O.SALE_STORE_ID
, S.SALE_STORE_NAME
, P.PLAN_NO
, P.LAST_EDIT_DATETIME
, ISNULL(SP.PREF_NAME, '') AS PREF_NAME
FROM T_OBJECT O WITH (NOLOCK)
SELECT
COUNT(1) OVER() AS TOT_CNT
, ROW_NUMBER() OVER(ORDER BY O.OBJECT_NO DESC, P.PLAN_NO) AS ROW_NUMBER
, O.OBJECT_NO
, O.OBJECT_NAME
, O.SALE_STORE_ID
, S.SALE_STORE_NAME
, P.PLAN_NO
, P.LAST_EDIT_DATETIME
, ISNULL(SP.PREF_NAME, '') AS PREF_NAME
FROM T_OBJECT O WITH (NOLOCK)
INNER JOIN T_OBJECT_INFO OI WITH (NOLOCK)
ON O.OBJECT_NO = OI.OBJECT_NO
INNER JOIN M_SALES_STORE S WITH (NOLOCK)
ON O.SALE_STORE_ID = S.SALE_STORE_ID
INNER JOIN T_PLAN P WITH (NOLOCK)
ON O.OBJECT_NO = P.OBJECT_NO
INNER JOIN T_PLAN_INFO PI WITH (NOLOCK)
ON P.OBJECT_NO = PI.OBJECT_NO
AND P.PLAN_NO = PI.PLAN_NO
<if test='saleStoreId != null and saleStoreId != "T01"'>
INNER JOIN SALES_STORE_CTE T
ON S.SALE_STORE_ID = T.SALE_STORE_ID
@ -1604,6 +1607,7 @@
WHERE OI.SOURCE_ORIGIN = 'QCAST_III'
AND (OI.ORG_DEL_FLG = '0' AND OI.TEMP_FLG = '0')
AND P.DEL_FLG = '0'
AND PI.DOC_NO IS NOT NULL
<if test='schObjectNo != null and schObjectNo != ""'>
AND O.OBJECT_NO LIKE '%' + #{schObjectNo} + '%'
</if>