Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

src/main/resources/egovframework/sqlmap/config/mappers/common/common_sql.xml

@@ -49,7 +49,7 @@
 		CODE_IDXS != '0200000000'
 		AND CODE_PARENT_IDX = '0200000000'
 		AND CODE_STATUS = 'U'
-		<if test='memberDept eq "1004000000"'><!-- 공정거래팀 -->
+		<if test='memberDept eq "1004000000" or memberDept eq "1040000000"'><!-- 공정거래팀, 플랫폼팀 -->
 			AND CODE_IDXS = '0201000000'
 		</if>
 		<if test='memberDept eq "1005000000"'><!-- 가맹거래팀 -->
@@ -79,7 +79,7 @@
 		CODE_IDXS != '0200000000'
 		AND CODE_PARENT_IDX = '0200000000'
 		AND CODE_STATUS = 'U'
-		<if test='memberDept eq "1004000000"'><!-- 공정거래팀 -->
+		<if test='memberDept eq "1004000000" or memberDept eq "1040000000"'><!-- 공정거래팀 -->
 			AND CODE_IDXS != '0201000000'
 		</if>
 		<if test='memberDept eq "1005000000"'><!-- 가맹거래팀 -->
@@ -116,6 +116,7 @@
         WHEN #{caseGubun} = '0206000000' THEN '1106000000'
         END
         AND CODE_STATUS = 'U'
+		ORDER BY CODE_ORDER
 		<!-- WHERE CODE_PARENT_IDX = #{codeParentIdx} -->
 	</select>
 
@@ -317,8 +318,10 @@
 		    CODE_IDXS AS code
 		FROM C_CODE
 		WHERE CODE_IDXS != '5000000000'
+		AND CODE_IDXS != '5011000000'
 		AND CODE_PARENT_IDX = '5000000000'
 		AND CODE_STATUS = 'U'
+		ORDER BY CODE_ORDER
 	</select>
 
 	<!-- 신청사유 combobox -->
@@ -338,6 +341,7 @@
         WHEN #{caseGubun} = '5007000000' THEN '1107000000'
         END
         AND CODE_STATUS = 'U'
+		ORDER BY CODE_ORDER
 		<!-- WHERE CODE_PARENT_IDX = #{codeParentIdx} -->
 	</select>
 
@@ -373,6 +377,7 @@
 		AND CODE_PARENT_IDX = '1000000000'
 		AND CODE_STATUS = 'U'
 		AND CODE_IDXS NOT IN('1001000000','1002000000','1003000000','1010000000','1020000000')
+		ORDER BY CODE_ORDER
 	</select>
 
 	<!-- 자료요구대상 combobox -->
@@ -516,4 +521,58 @@
 		AND CODE_PARENT_IDX = '6000000000'
 		AND CODE_STATUS = 'U'
 	</select>
+	<!-- 기안문 불러오기 -->
+	<select id="commonnanumHisDelSel" parameterType="egovMap" resultType="egovMap">
+		SELECT
+			(SELECT C.CODE_NAME FROM C_CODE C WHERE C.CODE_IDXS = A.CODE_NO) AS DOC_NAME,
+			(SELECT C.CODE_DC FROM C_CODE C WHERE C.CODE_IDXS = A.CODE_NO) AS ORGIN_NAME,
+			(SELECT C.CODE_IDX5 FROM C_CODE C WHERE C.CODE_IDXS = A.CODE_NO) AS DOC_NO,
+			(SELECT C.CODE_ORDER FROM C_CODE C WHERE C.CODE_IDXS = A.CODE_NO) AS CODE_ORDER,
+			A.CASE_NO,
+			A.CODE_NO
+		FROM
+			C_SANCTNHISTORY A
+		WHERE
+			A.CASE_NO = #{caseNo}
+		GROUP BY
+			A.CODE_NO,
+			A.CASE_NO,
+			A.CODE_NO
+		ORDER BY
+			CODE_ORDER ASC
+	</select>
+
+	<!-- 분쟁유형상세 combobox -->
+	<select id="commonTroubleTypeDetail" parameterType="egovMap" resultType="egovMap">
+		SELECT
+		    CODE_NAME AS value,
+		    CODE_IDXS AS code
+		FROM C_CODE
+	   WHERE CODE_IDX1 = '68'
+		 AND CODE_IDX2 = #{codeIdx2}
+		 AND CODE_IDX3 != '00'
+		 AND CODE_STATUS = 'U'
+	</select>
+	
+	<!-- 통지수단 combobox -->
+	<select id="commonNoticeType" parameterType="egovMap" resultType="egovMap">
+		SELECT
+		    CODE_NAME AS value,
+		    CODE_IDXS AS code
+		FROM C_CODE
+	   WHERE CODE_IDX1 = '69'
+		 AND CODE_IDX2 != '00'
+		 AND CODE_STATUS = 'U'
+	</select>
+	
+	<select id="commonCaseGubun4" parameterType="egovMap" resultType="egovMap">
+		SELECT
+		    CODE_NAME AS value,
+		    CODE_IDXS AS code
+		FROM C_CODE
+		WHERE CODE_IDXS != '5000000000'
+		AND CODE_PARENT_IDX = '5000000000'
+		AND CODE_STATUS = 'U'
+		ORDER BY CODE_ORDER
+	</select>
 </mapper>