r아마란스 결재 변경에 따른 쿼리 수정

src/com/pms/mapper/salesMng.xml

@@ -4689,16 +4689,22 @@ ORDER BY V.PATH2
 			WHERE SALES_REQUEST_MASTER_OBJID = SRM.OBJID
 		) AS PART_NAME,
 		CASE 
+			WHEN AMR.AMARANTH_STATUS = 'complete' THEN 'approvalComplete'
+			WHEN AMR.AMARANTH_STATUS = 'inProcess' THEN 'inProcess'
+			WHEN AMR.AMARANTH_STATUS = 'reject' THEN 'reject'
 			WHEN A.ROUTE_STATUS = 'complete' THEN 'approvalComplete'
 			WHEN A.ROUTE_STATUS = 'inProcess' THEN 'inProcess'
 			WHEN A.ROUTE_STATUS = 'reject' THEN 'reject'
 			ELSE SRM.STATUS
 		END AS STATUS,
 		CASE 
+			WHEN AMR.AMARANTH_STATUS = 'complete' THEN '결재완료'
+			WHEN AMR.AMARANTH_STATUS = 'inProcess' THEN '결재 상신중'
+			WHEN AMR.AMARANTH_STATUS = 'reject' THEN '반려'
 			WHEN A.APPR_STATUS IS NOT NULL THEN A.APPR_STATUS
-			WHEN SRM.STATUS = 'create' THEN '작성중'
-			ELSE ''
+			ELSE '등록중'
 		END AS STATUS_TITLE,
+		COALESCE(AMR.AMARANTH_STATUS, '') AS AMARANTH_STATUS,
 		SRM.WRITER,
 		(SELECT DEPT_NAME||' '||USER_NAME FROM USER_INFO WHERE USER_ID = SRM.WRITER) AS WRITER_NAME,
 		SRM.REGDATE,
@@ -4707,6 +4713,16 @@ ORDER BY V.PATH2
 		A.ROUTE_OBJID
 	FROM 
 		SALES_REQUEST_MASTER SRM
+		LEFT OUTER JOIN (
+			SELECT AA.TARGET_OBJID, AA.STATUS AS AMARANTH_STATUS
+			FROM AMARANTH_APPROVAL AA
+			INNER JOIN (
+				SELECT TARGET_OBJID, MAX(OBJID) AS MAX_OBJID
+				FROM AMARANTH_APPROVAL
+				WHERE TARGET_TYPE = 'PROPOSAL'
+				GROUP BY TARGET_OBJID
+			) AA_MAX ON AA.OBJID = AA_MAX.MAX_OBJID
+		) AMR ON SRM.OBJID::VARCHAR = AMR.TARGET_OBJID
 		LEFT OUTER JOIN (
 			SELECT
 				B.OBJID AS ROUTE_OBJID,
@@ -4755,6 +4771,9 @@ ORDER BY V.PATH2
 	<if test="SEARCH_STATUS != null and !''.equals(SEARCH_STATUS)">
 		AND (
 			CASE 
+				WHEN AMR.AMARANTH_STATUS = 'complete' THEN 'approvalComplete'
+				WHEN AMR.AMARANTH_STATUS = 'inProcess' THEN 'inProcess'
+				WHEN AMR.AMARANTH_STATUS = 'reject' THEN 'reject'
 				WHEN A.ROUTE_STATUS = 'complete' THEN 'approvalComplete'
 				WHEN A.ROUTE_STATUS = 'inProcess' THEN 'inProcess'
 				WHEN A.ROUTE_STATUS = 'reject' THEN 'reject'