# WARNING: head commit changed in the meantime

Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
2024-12-26 10:41 신청 상세 기타사항 오류 수정

src/main/resources/egovframework/sqlmap/config/mappers/mypage/mypage_sql.xml

@@ -197,21 +197,29 @@
 	
 	<!-- 대리인정보 -->
 	<select id="selectAppagent" parameterType="java.util.HashMap" resultType="java.util.HashMap">
-		SELECT RCEPT_NO,
+		/*	mypage.selectAppagent	*/
-				SEQ_NO,
+		SELECT *
-				AGENT_COMPANY,
+		FROM (
-				AGENT_CEO,
+		
-				AGENT_TEL,
+				SELECT RCEPT_NO,
-				AGENT_HP,
+						SEQ_NO,
-				AGENT_EMAIL,
+						AGENT_COMPANY,
-				SPECIAL_TXT,
+						AGENT_CEO,
-				ZIP,
+						AGENT_TEL,
-				ADDR1,
+						AGENT_HP,
-				ADDR2,
+						AGENT_EMAIL,
-				ROAD_ADDR1,
+						SPECIAL_TXT,
-				ROAD_ADDR2
+						ZIP,
-	    FROM C_APPAGENT
+						ADDR1,
-		WHERE RCEPT_NO = #{rceptNo}		  
+						ADDR2,
+						ROAD_ADDR1,
+						ROAD_ADDR2
+			    FROM C_APPAGENT
+				WHERE RCEPT_NO = #{rceptNo}
+				ORDER BY rownum desc		
+		
+			)aa
+		WHERE rownum=1		  
 	</select>
 	
 	<!-- 접수현황 -->
@@ -261,8 +269,8 @@
 				WHEN 'N' THEN '미진행'
 				ELSE ''
 				END AS REGULATING_ORGAN_NAME,
-				CASE FTC_INVESTIGATION || ' (' || (SELECT FTC_NOTE FROM C_RCEPTSTTUS WHERE RCEPT_NO = #{rceptNo}) || ')'
+				CASE FTC_INVESTIGATION
-				WHEN 'Y' THEN '진행'
+				WHEN 'Y' THEN '진행' || ' (' || (SELECT FTC_NOTE FROM C_RCEPTSTTUS WHERE RCEPT_NO = #{rceptNo}) || ')'
 				WHEN 'N' THEN '미진행'
 				ELSE ''
 				END AS FTC_INVESTIGATION_NAME,
@@ -330,6 +338,13 @@
 				P_CONTACT_EMAIL,
 				LAWSUT_CASENUM,
 				LAWSUIT_CHECKSAME,
+				
+				CASE LAWSUIT_CHECKSAME
+					WHEN 'Y' THEN '진행'
+					WHEN 'N' THEN '미진행'
+					ELSE ''
+				END AS LAWSUIT_CHECKSAME_NAME,
+				
 				PAR_AGREEMENT
 	    FROM C_RCEPTSTTUS
 		WHERE RCEPT_NO = #{rceptNo}		  

src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myMediationView.jsp

@@ -469,7 +469,7 @@
             </dd>
             <dt>2. 소송 내용이 조정신청 내용과 동일한가요?</dt>
             <dd>
-              <p class="check_text"><c:out value="${selectRceptsttus.FTC_CORRECT_NAME}"/></p>
+              <p class="check_text"><c:out value="${selectRceptsttus.LAWSUIT_CHECKSAME_NAME}"/></p>
             </dd>
             <dt>3. 타 협의회 조정이 진행중인가요?</dt>
             <dd>