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

src/main/java/kcc/com/uss/ion/cu/service/CaseUtilVO.java

@@ -19,6 +19,8 @@ public class CaseUtilVO extends ComDefaultVO implements Serializable{
 	public String pendencyPeriod =""; 				//처리기간
 	public String firstEndDt =""; 					//1차 협의회 개최일
 	public String secondEndDt =""; 					//2차 협의회 개최일
+	public String dblrtEndYn =""; 					//심의사건 1차 협의회에서 종료 여부
+	
 	
 	public String getCaseNo() {
 		return caseNo;
@@ -86,6 +88,12 @@ public class CaseUtilVO extends ComDefaultVO implements Serializable{
 	public void setSecondEndDt(String secondEndDt) {
 		this.secondEndDt = secondEndDt;
 	}
+	public String getDblrtEndYn() {
+		return dblrtEndYn;
+	}
+	public void setDblrtEndYn(String dblrtEndYn) {
+		this.dblrtEndYn = dblrtEndYn;
+	}
 	
 	
 

src/main/java/kcc/com/uss/ion/cu/service/Impl/CaseUtilServiceImpl.java

@@ -36,7 +36,9 @@ public class CaseUtilServiceImpl extends EgovAbstractServiceImpl implements Case
 		HolidayVO holidayVO = new HolidayVO();
 		
 		/*사건번호로 심의 안건 조회 후 있는 경우  - 1차 협의회 개최일을 조정 종요일로 계산, 2차 협의회 개최일을 조정 종료일2로
-		심의 안건이 없는 경우 현재 협의회 개최일을 조정 종료일로*/
+		심의 안건이 없는 경우 현재 협의회 개최일을 조정 종료일로
+		심의 안건만 있지만, 수정의결이면서 결과가 심의가 아닌 경우 1차 협의회에서 종료 처리
+		*/
 		
 			for(String caseNo : caseUtilVO.getCaseNoArray()) {
 				try {
@@ -55,7 +57,7 @@ public class CaseUtilServiceImpl extends EgovAbstractServiceImpl implements Case
 					int stopReqTerm = (caseVO.getStopReqTerm() == null || caseVO.getStopReqTerm().trim().isEmpty()) ? 0 : Integer.parseInt(caseVO.getStopReqTerm().trim());
 					int appReqTerm = (caseVO.getAppReqTerm() == null || caseVO.getAppReqTerm().trim().isEmpty()) ? 0 : (Integer.parseInt(caseVO.getAppReqTerm().trim()) > 21 ? 21 : Integer.parseInt(caseVO.getAppReqTerm().trim()));
 					
-					if("Y".equals(caseVO.getDblrtYn())) {											//심의 안건이 있던 경우 firstEndDtStr 사용
+					if("Y".equals(caseVO.getDblrtYn()) && !"Y".equals(caseVO.getDblrtEndYn())) {	//심의 안건이 있던 경우 firstEndDtStr 사용
 						String SecondendDateStr = endDate.format(outputFormatter);					//SecondendDateStr : 'YYYY-MM-DD HH:MM'(2차 보고일)
 						endDate = LocalDate.parse(firstEndDtStr, MediationEndDateFormatter);
 						caseVO.setSecondEndDt(SecondendDateStr);

src/main/resources/egovframework/sqlmap/com/uss/ion/cu/CaseUtil_SQL_Oracle.xml

@@ -18,16 +18,31 @@
 				THEN 'Y'
 				ELSE 'N' 
 			END							AS dblrtYn,
+			CASE
+				WHEN NVL(jcd.MEDIATION_SMALL, '') NOT IN ('0616000000', '0617000000', '0618000000') 
+					 AND NVL(jcd.MOD_RESOLUTION, '') = 'Y'
+					 THEN 'Y'
+					 ELSE 'N'
+					 END AS dblrtEndYn,
 			ccm.FIX_DAY					AS firstEndDt
 		FROM C_MASTER cm
 		LEFT JOIN (
-			SELECT
+					SELECT
-				cd.CASE_NO,
+						CASE_NO,
-				MIN(cd.CFRNC_NO) AS CFRNC_NO
+						MEDIATION_SMALL,
-			FROM
+						MOD_RESOLUTION,
-				C_DLBRTMTR cd
+						CFRNC_NO
-			GROUP BY cd.CASE_NO
+					FROM (
-		) jcd
+						SELECT
+							cd.CASE_NO,
+							cd.MEDIATION_SMALL,
+							cd.MOD_RESOLUTION,
+							cd.CFRNC_NO,
+							ROW_NUMBER() OVER (PARTITION BY cd.CASE_NO ORDER BY cd.CFRNC_NO) AS rn
+						FROM
+							C_DLBRTMTR cd
+						) WHERE rn = 1
+				) jcd
 		ON	cm.CASE_NO = jcd.CASE_NO
 		LEFT JOIN
 			C_CFRNCMANAGE ccm

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

@@ -97,24 +97,25 @@
 		CODE_IDXS != '0200000000'
 		AND CODE_PARENT_IDX = '0200000000'
 		AND CODE_STATUS = 'U'
-		<if test='memberDept eq "1004000000" or memberDept eq "1040000000" or memberDept eq "1043000000" or memberDept eq "1042000000"'><!-- 공정거래팀, 플랫폼팀 -->
+		<!-- 250421 - 거래유형, 신청사유 변경 막으면서, 본인소속도 조회 허용 -->
+		<!-- <if test='memberDept eq "1004000000" or memberDept eq "1040000000" or memberDept eq "1043000000" or memberDept eq "1042000000"'>공정거래팀, 플랫폼팀
 			AND CODE_IDXS != '0201000000'
 		</if>
-		<if test='memberDept eq "1005000000"'><!-- 가맹거래팀 -->
+		<if test='memberDept eq "1005000000"'>가맹거래팀
 			AND CODE_IDXS != '0202000000'
 		</if>
-		<if test='memberDept eq "1006000000" or memberDept eq "1007000000"'><!-- 건설하도급팀, 제조하도급팀 -->
+		<if test='memberDept eq "1006000000" or memberDept eq "1007000000"'>건설하도급팀, 제조하도급팀
 			AND CODE_IDXS != '0203000000'
 		</if>
-		<if test='memberDept eq "1008000000" or memberDept eq "1041000000"'><!-- 약관팀 -->
+		<if test='memberDept eq "1008000000" or memberDept eq "1041000000"'>약관팀
 			AND CODE_IDXS != '0205000000'
 		</if>
-		<if test='memberDept eq "1030000000"'><!-- 유통팀 -->
+		<if test='memberDept eq "1030000000"'>유통팀
 			AND CODE_IDXS != '0204000000'
 		</if>
-		<if test='memberDept eq "1009000000"'><!-- 대리점팀 -->
+		<if test='memberDept eq "1009000000"'>대리점팀
 			AND CODE_IDXS != '0206000000'
-		</if>
+		</if> -->
 	</select>
 
 

src/main/resources/egovframework/sqlmap/config/mappers/trublreqstmng/trublreqstmng_sql.xml

@@ -1321,10 +1321,18 @@
   <update id="trublreqstmngDeptConfirm2" parameterType="egovMap">
     UPDATE C_RCEPTMST
     SET
+    <if test="caseGubun != null and caseGubun != ''">
     CASE_GUBUN = #{caseGubun},
+    </if>
+    <if test="caseReason1 != null and caseReason1 != ''">
     CASE_REASON1 = #{caseReason1},
+    </if>
+    <if test="caseReason2 != null and caseReason2 != ''">
     CASE_REASON2 = #{caseReason2},
+    </if>
+    <if test="caseReason3 != null and caseReason3 != ''">
     CASE_REASON3 = #{caseReason3},
+    </if>
     SCCHF_ASSIGN = #{presidentAssign},
     SCCHF_ASSIGN_DT = SYSDATE,
     TIMHDER_ASSIGN = #{presidentAssign}
@@ -1359,10 +1367,18 @@
   <update id="trublreqstmngDeptConfirm4" parameterType="egovMap">
     UPDATE C_RCEPTMST
     SET
+    <if test="caseGubun != null and caseGubun != ''">
     CASE_GUBUN = #{caseGubun},
+    </if>
+    <if test="caseReason1 != null and caseReason1 != ''">
     CASE_REASON1 = #{caseReason1},
+    </if>
+    <if test="caseReason2 != null and caseReason2 != ''">
     CASE_REASON2 = #{caseReason2},
+    </if>
+    <if test="caseReason3 != null and caseReason3 != ''">
     CASE_REASON3 = #{caseReason3},
+    </if>
     SCCHF_ASSIGN = #{presidentAssign},
     TIMHDER_ASSIGN = #{presidentAssign}
     ,FTC_CHECK =

src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportEdit.jsp

@@ -138,6 +138,7 @@ var gubunList = $("#caseGubun option");
 }
 
 var simlist = new Array();
+var simEndlist = new Array();
 //심의안건 셋팅
 function loadSimData(){
 	var url = "";
@@ -187,6 +188,11 @@ function loadSimData(){
 				html = '<option value="3" onclick="nanumCall2(\'3\', \'분쟁조정협의회 출석요구\', \''+v.caseNo+'\');">'+v.caseNo+' 출석요구</option>'
 				$("#trublcfrncmngSelect").append(html);
 				
+				//심의에서 끝나는 사건 처리 - 수정의결이면서 소분류 결과가 심의 관련이 아닌 경우
+				if(v.modResolution == 'Y' && (v.mediationSmallSim != '0616000000' && v.mediationSmallSim != '0617000000' && v.mediationSmallSim != '0618000000')){
+					simEndlist.push(v.caseNo);
+				}
+				
 			});
 			$("#arrListsim").val(simlist);
 		}else{
@@ -1102,13 +1108,13 @@ function StateProUpdt(statePro){
 function resultGo(){
 	if(confirm("종료통지 단계로 넘어가시겠습니까?")){
 			//보고안건 사건들 조정종료일, 처리기간 자동 저장
-			if(bogolist.length != 0){
+			if(bogolist.length != 0 || simEndlist.length != 0){
-				$("#caseNoArray").val(bogolist);
+				$("#caseNoArray").val(bogolist.concat(simEndlist));
 				$("#mediationEndDt").val($("#fixDay").val());
 				var url = "/gtm/caseUtil/updateAutoEndDtAjax.do";
 				var param = jQuery('#dateFrm').serialize();
 				XHR2(url, param, function(r){
-					if(r.result == 'success'){
+					/* if(r.result == 'success'){
 						var url = "";
 						$("#statePro").val('0503000000');
 						//$("#masterStatePro").val('0405000000');
@@ -1123,7 +1129,7 @@ function resultGo(){
 					}else{
 						alert(r.failCaseNo+" 오류 발생하였습니다. 담당자에게 문의 바랍니다.");
 						return false;
-					}
+					} */
 				});
 			}
 		

src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublreqstmng/administView.jsp

@@ -148,11 +148,11 @@ $(document).ready(function(){
 			return false;
 		}
 		
-		if($("#caseReason1").val() == ""){
+		/* if($("#caseReason1").val() == ""){
 			alert("신청사유를 선택해 주세요");
 			$("#caseReason1").focus();
 			return false;
-		}
+		} */
 		
 		/* if($("#caseReason1").val() == "" && $("#caseReason2").val() == "" && $("#caseReason3").val() == ""){
 			alert("신청사유는 한개 이상 선택 해 주세요.");
@@ -186,11 +186,11 @@ $(document).ready(function(){
 			return false;
 		}
 		
-		if($("#caseReason1").val() == ""){
+		/* if($("#caseReason1").val() == ""){
 			alert("신청사유를 선택해 주세요");
 			$("#caseReason1").focus();
 			return false;
-		}
+		} */
 		
 		$("#type").val("U");
 		var param = jQuery('#frm').serialize();
@@ -231,11 +231,11 @@ $(document).ready(function(){
 			return false;
 		}
 		
-		if($("#caseReason1").val() == ""){
+		/* if($("#caseReason1").val() == ""){
 			alert("신청사유를 선택해 주세요");
 			$("#caseReason1").focus();
 			return false;
-		}
+		} */
 		
 		/* if($("#caseReason1").val() == "" && $("#caseReason2").val() == "" && $("#caseReason3").val() == ""){
 			alert("신청사유는 한개 이상 선택 해 주세요.");
@@ -505,7 +505,8 @@ $(document).ready(function(){
 	});
 	
 	/* 부서변경 시 조정유형도 selected 처리 */
-	$("#presidentAssign").change(function(){
+	/* 250418 - 담당자 요청으로 부서 변경 시 조정유형, 신청유형 변경 막기 */
+	/* $("#presidentAssign").change(function(){
 		
 		var presidentAssignVal = "";
 		if($("#presidentAssign").val() == '${SeedConstants.GONGJEONG1}' || $("#presidentAssign").val() == '${SeedConstants.GONGJEONG2}'
@@ -558,7 +559,7 @@ $(document).ready(function(){
 		resnCombo();
 		showConsignmentGubun();
 		
-	});
+	}); */
 	
 	
 	/*=========초기값 셋팅========*/
@@ -717,13 +718,17 @@ $(document).ready(function(){
 	
 		/*=========초기값 셋팅 END========*/
 	
-	
+		/* 250418 - 담당자 요청으로 부서 변경 시 조정유형, 신청유형 변경 막기 */
+		$("#caseGubun").attr("disabled", true);
+		$("#caseReason1").attr("disabled", true);
+		$("#caseReason2").attr("disabled", true);
+		$("#caseReason3").attr("disabled", true);
 });
 
 
 //조정유형
 function caseGubunCombo(){
-	var url = "";
+ 	var url = "";
 	$("#type").val("L");
 	var param = jQuery('#frm').serialize();
 	url = "/gtm/case/common/ajax/CaseGubun.do";
@@ -731,6 +736,7 @@ function caseGubunCombo(){
 		var objList = $("#caseGubun");
 		var sel = "";
 		ajaxCombo(r.data, objList, sel);
+		
 	});
 }