# WARNING: head commit changed in the meantime

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

g/w 기안문 내용 수정

src/main/java/seed/com/gtm/base/GwBaseController.java

@@ -1232,7 +1232,14 @@ public class GwBaseController {
 		
 		try {
 			//수신자 to 제목까지
-			if ("3-1".equals(p_jobID)) {	//하도급 착수보고
+			if (false					
+					||	"1-1".equals(p_jobID)	//공정거래 - 0201000000
+					||	"2-1".equals(p_jobID)	//가맹점사업거래 - 0202000000
+					|| 	"3-1".equals(p_jobID)	//하도급거래 - 0203000000
+					|| 	"4-1".equals(p_jobID)	//대규모유통거래 - 0204000000
+					|| 	"5-1".equals(p_jobID)	//약관거래 - 0205000000
+					|| 	"6-1".equals(p_jobID)	//대리점거래 - 0206000000
+					) {	//하도급 착수보고
 				v_ret	=	this.makeXBY1(p_data1, p_caseApplcntData, p_caseRespondentData);
 
 			}else if (false					
@@ -1304,7 +1311,7 @@ public class GwBaseController {
 					|| 	"5-6".equals(p_jobID)	//약관거래 - 0205000000
 					|| 	"6-6".equals(p_jobID)	//대리점거래 - 0206000000					
 					) {	//하도급 공정위접수통지
-				v_ret	=	this.makeXBY6(p_data1, p_caseApplcntData, p_caseRespondentData, p_jobID);
+				v_ret	=	this.makeXBY6(p_data1, p_caseApplcntData, p_caseRespondentData, p_jobID, p_title);
 
 			}else if (false 
 					//출석요구
@@ -2655,7 +2662,8 @@ public class GwBaseController {
 			EgovMap p_data1, 
 			List<?> p_caseApplcntData, 
 			List<?> p_caseRespondentData,
-			String p_jobID
+			String p_jobID,
+			String p_title
 			) {
 		String v_ret	=	"";
 		
@@ -2673,11 +2681,11 @@ public class GwBaseController {
 					|| 	"6-6".equals(p_jobID)	//대리점거래 - 0206000000		
 				 */
 				if ("1-6".equals(p_jobID)) {
-					v_ret	=	v_ret	+	"수신자     내부결재<br/>";
+					v_ret	=	v_ret	+	"수신자     광주지방공정거래사무소장(경쟁과장)<br/>";
 				}else if ("2-6".equals(p_jobID)) {
 					v_ret	=	v_ret	+	"수신자     서울지방공정거래사무소장(가맹유통팀장)<br/>";
 				}else if ("3-6".equals(p_jobID)) {
-					v_ret	=	v_ret	+	"수신자     서울지방공정거래사무소장<br/>";
+					v_ret	=	v_ret	+	"수신자     광주지방공정거래사무소장(하도급과장)<br/>";				
 				}else if ("6-6".equals(p_jobID)) {
 					v_ret	=	v_ret	+	"수신자     서울지방공정거래사무소장(경쟁과장)<br/>";
 				}else{
@@ -2707,14 +2715,37 @@ public class GwBaseController {
 			}else if ("6-6".equals(p_jobID)) {
 				v_ret	=	v_ret	+"그 사실을 「대리점거래의 공정화에 관한 법률」 제19조 제4항의 ";
 			}else {
-				v_ret	=	v_ret	+"그 사실을 「가맹사업거래의 공정화에 관한 법률」 제22조 제4항의 ";	
+				v_ret	=	v_ret	+"그 사실을 관련 ";	
 			}
 			
 			v_ret	=	v_ret	+"규정에 따라 붙임 분쟁조정신청서 사본을 첨부하여 통지합니다.";
 			v_ret	=	v_ret	+"<br/><br/>";
 			v_ret	=	v_ret	+"붙임  분쟁조정신청서 사본 1부.  끝.";
 			
+			
+			//관인
+			v_ret	=	v_ret	+"<br/><br/><br/><br/><br/>";
+			
+			v_ret	=	v_ret	+	this.TableHeaderWithBorderNAlign("0","center");
+			String[] s_Arr_21	=	{"한국공정거래조정원"};
+			v_ret	=	v_ret	+this.makeTrTdWithFontNoBorder(s_Arr_21,"24");
+			//String[] s_Arr_22	=	{p_data1.get("caseGubunNm").toString()};
+			String[] s_Arr_22	=	{p_title};
+			
+			v_ret	=	v_ret	+this.makeTrTdWithFontNoBorder(s_Arr_22,"24");
+			
+			String[] s_Arr_24	=	{""};
+			v_ret	=	v_ret	+this.makeTrTdWithFontNoBorder(s_Arr_24,"24");
+			v_ret	=	v_ret	+this.makeTrTdWithFontNoBorder(s_Arr_24,"24");
+			v_ret	=	v_ret	+this.makeTrTdWithFontNoBorder(s_Arr_24,"24");
+			v_ret	=	v_ret	+this.makeTrTdWithFontNoBorder(s_Arr_24,"24");
+			v_ret	=	v_ret	+this.makeTrTdWithFontNoBorder(s_Arr_24,"24");
+			v_ret	=	v_ret	+this.makeTrTdWithFontNoBorder(s_Arr_24,"24");
+			
+			v_ret	=	v_ret	+	this.TableFooter();
+
 			v_ret	=	v_ret	+	this.bodyFooter();
+			
 		}catch(Exception ex) {
 			ex.printStackTrace();
 		}

src/main/resources/egovframework/sqlmap/config/mappers/trublprocessmng/trublprocessmng_sql.xml

@@ -186,6 +186,50 @@
       AND A.DEL_YN = 'N'
       AND A.RCEPT_NO IS NOT NULL
       AND A.CASE_END = 'N'
+      
+      <if test="groupType == '3-1'">
+      /*	착수보고서	*/
+      		AND A.STATE_PRO = '0401000000'    
+
+			AND 0>=(SELECT count(*) 
+   				FROM C_SANCTNHISTORY
+   				WHERE case_no =a.CASE_NO 
+   					AND code_no like '5%01000000'
+   					AND RESULT IS NOT null)      		  	
+      </if><if test="groupType == '3-12'">
+      /*	조사보고서	*/	
+      		AND A.STATE_PRO = '0404000000'
+      		      	
+      		AND A.MEDIATION_BIG IS NOT NULL
+      		AND A.MEDIATION_SMALL IS NOT NULL
+      		
+			AND 0>=(SELECT count(*) 
+   				FROM C_SANCTNHISTORY
+   				WHERE case_no =a.CASE_NO 
+   					AND code_no like '5%12000000'
+   					AND RESULT IS NOT null)      		
+      		
+      </if><if test="groupType == '3-11'">
+      /*	종료보고서	*/
+      		AND A.STATE_PRO = '0404000000'
+      		
+      		AND A.MEDIATION_BIG IS NOT NULL
+      		AND A.MEDIATION_SMALL IS NOT NULL      		    
+			AND A.MEDIATION_REQ_AMOUNT IS NOT NULL
+			AND A.MEDIATION_AMOUNT IS NOT NULL
+			AND A.FEE_MONEY IS NOT NULL
+			AND A.POST_MONEY IS NOT NULL
+			AND A.LAWYER_MONEY IS NOT NULL
+			AND A.COURT_MONEY IS NOT NULL
+			AND A.RESULT_MONEY IS NOT NULL	      		 
+      		
+			AND 0>=(SELECT count(*) 
+   				FROM C_SANCTNHISTORY
+   				WHERE case_no =a.CASE_NO 
+   					AND code_no like '5%11000000'
+   					AND RESULT IS NOT null)           		 	
+      </if>         
+      
       <if test='memberPosition neq "0915000000"'>
         <choose>
           <when test="memberPosition eq '0910000000' or memberPosition eq '0903000000' or (memberPosition eq '0913000000' and memberDept eq '1010000000')">

src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp

@@ -3408,7 +3408,7 @@ function nanumApi_back(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4,
 function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4,
 		obj5, obj6, obj7, obj8, obj9, obj10, obj11, obj12, obj13, obj14, obj15){
 
-	//alert(jobID+":"+codeNo+":"+nanumSubject);
+	alert(jobID+":"+codeNo+":"+nanumSubject);
 	
 	if(jobID != '')$("#jobID").val(jobID);
 	if(codeNo != '')$("#codeNo").val(codeNo);
@@ -3490,24 +3490,44 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4,
 						//$("#docIdImsi").val(r.data.docId);
 						
 						//alert(jobID+":"+codeNo+":"+nanumSubject);
+						/*
+											||	"1-6".equals(p_jobID)	//공정거래 - 0201000000
+					||	"2-6".equals(p_jobID)	//가맹점사업거래 - 0202000000
+					|| 	"3-6".equals(p_jobID)	//하도급거래 - 0203000000
+					|| 	"4-6".equals(p_jobID)	//대규모유통거래 - 0204000000
+					|| 	"5-6".equals(p_jobID)	//약관거래 - 0205000000
+					|| 	"6-6".equals(p_jobID)	//대리점거래 - 0206000000
+					*/	
 						
-						if (jobID=='1-76'){		//공정 당사자 통지
+						if (jobID=='1-76'		//공정 당사자 통지
+							|| jobID=='1-6'		//공정 접수 통지
+							){		
 							//alert("340");
 							$("#nanumViewFrm #formIdView").val('340');	//공정 관인
 
-						}else if (jobID=='2-76'){							
+						}else if (jobID=='2-76'
+							|| jobID=='2-6'		//접수 통지
+							){							
 							$("#nanumViewFrm #formIdView").val('341');	//가맹 관인							
 
-						}else if (jobID=='3-76'){
+						}else if (jobID=='3-76'
+							|| jobID=='3-6'		//접수 통지
+							){
 							$("#nanumViewFrm #formIdView").val('342');	//하도급 관인
 
-						}else if (jobID=='4-76'){
+						}else if (jobID=='4-76'
+							|| jobID=='4-6'		//접수 통지
+							){
 							$("#nanumViewFrm #formIdView").val('343');	//대규모 관인							
 
-						}else if (jobID=='5-76'){
+						}else if (jobID=='5-76'
+							|| jobID=='5-6'		//접수 통지
+							){
 							$("#nanumViewFrm #formIdView").val('344');	//약관 관인
 														
-						}else if (jobID=='6-76'){
+						}else if (jobID=='6-76'
+							|| jobID=='6-6'		//접수 통지
+							){
 							$("#nanumViewFrm #formIdView").val('345');	//대리점 관인
 							
 						}else{	//관인이 없는 경우