결재상태 다국어 적용

src/main/java/sgc/portal/cd/cd0305/dto/CD03050001USearch.java

@@ -20,5 +20,6 @@ public class CD03050001USearch extends BaseSearchDto {
 	private String covendNm;
 	private String cpltEndDt;
 	private String wkiNo;
+	private String lang;
 	
 }

src/main/resources/sqlmap/mappers/cd/cd0305/CD03050001UMapper.xml

@@ -7,7 +7,10 @@
 		SELECT T1.CMPN_CD /* 회사코드 */
 		     , T1.WKI_SEQ /* 작업지시순번 */
 		     , T1.PRGS_STUS_GB_CD /* 진행상태코드 */
-		     , ZEHR_CODE_NAME_FNC(#{cmpnCd}, 'CD004', T1.PRGS_STUS_GB_CD) AS PRGS_STUS_GB_NM  /* 진행상태명 */
+		     , CASE
+		        WHEN #{lang} = 'ko' THEN COMM2.SPEC_CD_NM
+		        ELSE COMM2.SPEC_CD_NM_ENGS
+		       END AS PRGS_STUS_GB_NM  /* 진행상태명 */
 		     , T1.ENFC_GB_CD /* 작업 시행구분 코드 */
 		     , ZEHR_CODE_NAME_FNC(#{cmpnCd}, 'CD001', T1.ENFC_GB_CD) AS ENFC_GB_NM  /* 작업 시행구분명 */
 		     , T1.WKI_NO /* 작업지시번호 */
@@ -41,15 +44,13 @@
 		     , T3.REQ_CONF_DT /*합의요청일자*/
 		     , T3.LAST_CONF_DT /*최종 확인 일자*/
 		     , T3.WRTE_DT /*확인 작성일자*/
-		     , CASE
-		        WHEN T3.UCT_CNTRT_YN = 'Y' THEN 'UCT_CNTRT_YN' /*단가 기계약단가 여부*/
-		        WHEN T3.UCT_NEW_YN = 'Y' THEN 'UCT_NEW_YN' /*단가 신규단가 여부*/
-		        WHEN T3.UCT_EST_YN = 'Y' THEN 'UCT_EST_YN' /*단가 비교견적 여부*/
-		        WHEN T3.UCT_INJT_YN = 'Y' THEN 'UCT_INJT_YN' /*단가 실투입비적용 여부*/
-		        WHEN T3.UCT_ITPOL_YN = 'Y' THEN 'UCT_ITPOL_YN' /*단가 보간법 여부*/
-		        WHEN T3.UCT_ETC_YN = 'Y' THEN 'UCT_ETC_YN' /*단가 기타내용*/
-		        ELSE ''
-		       END AS UCT_YN /*단가결정*/
+		     , CASE WHEN T3.UCT_CNTRT_YN = 'Y' THEN 'UCT_CNTRT_YN' ELSE '' END AS UCT_CNTRT /*단가 기계약단가*/
+		     , CASE WHEN T3.UCT_NEW_YN = 'Y' THEN 'UCT_NEW_YN' ELSE '' END AS UCT_NEW /*단가 신규단가*/
+		     , CASE WHEN T3.UCT_EST_YN = 'Y' THEN 'UCT_EST_YN' ELSE '' END AS UCT_EST /*단가 비교견적*/
+		     , CASE WHEN T3.UCT_INJT_YN = 'Y' THEN 'UCT_INJT_YN' ELSE '' END AS UCT_INJT /*단가 실투입비적용*/
+		     , CASE WHEN T3.UCT_ITPOL_YN = 'Y' THEN 'UCT_ITPOL_YN' ELSE '' END AS UCT_ITPOL /*단가 보간법*/
+		     , CASE WHEN T3.UCT_ETC_YN = 'Y' THEN 'UCT_ETC_YN' ELSE '' END AS UCT_ETC /*단가 기타*/
+		     , '' AS UCT_YN /*단가결정*/
 		     , T3.UCT_ETC_CN /*단가기타내용*/
 		     , T3.CONF_AMT /*확정금액*/
 		     , T3.ADDDOC_AF_PHOTO_YN /*첨부파일 종료사진 여부*/
@@ -67,6 +68,11 @@
           LEFT OUTER JOIN CON_WKI_CONF T3
             ON T1.CMPN_CD = T3.CMPN_CD
            AND T1.WKI_SEQ = T3.WKI_SEQ
+          LEFT OUTER JOIN SM_COM_COMMCD COMM1
+            ON COMM1.COMM_CD = 'CD004'
+          LEFT OUTER JOIN SM_COM_COMMCD_D COMM2
+            ON COMM1.COMM_CD_ID = COMM2.COMM_CD_ID
+           AND COMM2.SPEC_CD = T1.PRGS_STUS_GB_CD
 		 WHERE 1=1
 		   AND T1.PRGS_STUS_GB_CD IN ('B90', 'B20', 'B21', 'B30', 'B31')
 		<if test="ccgrp != '' and ccgrp != null">

src/main/webapp/ux/cd/cd0305/CD03050001U.xml

@@ -58,6 +58,12 @@
 						<w2:column id="lastConfDt" name="name28" dataType="text"></w2:column>
 						<w2:column id="reqConfDt" name="name33" dataType="text"></w2:column>
 						<w2:column id="wrteDt" name="name29" dataType="text"></w2:column>
+						<w2:column id="uctCntrt" name="기계약단가" dataType="text"></w2:column>
+						<w2:column id="uctNew" name="신규단가" dataType="text"></w2:column>
+						<w2:column id="uctEst" name="비교견적" dataType="text"></w2:column>
+						<w2:column id="uctInjt" name="실투입비적용" dataType="text"></w2:column>
+						<w2:column id="uctItpol" name="보간법" dataType="text"></w2:column>
+						<w2:column id="uctEtc" name="기타" dataType="text"></w2:column>
 						<w2:column id="uctYn" name="단가결정" dataType="text"></w2:column>
 						<w2:column id="uctEtcCn" name="단가기타내용" dataType="text"></w2:column>
 						<w2:column id="confAmt" name="name30" dataType="text"></w2:column>
@@ -327,19 +333,46 @@
                 listCount1.setValue(grdData1.getTotalRow());
                 
                 for (var i=0; i<dsDataList.getRowCount(); i++) {
-                	if (dsDataList.getCellData( i , "uctYn" ) == "UCT_CNTRT_YN") {
-                		dsDataList.setCellData( i , "uctYn" , txtUctCntrtYn.getValue() );
-                	} else if (dsDataList.getCellData( i , "uctYn" ) == "UCT_NEW_YN") {
-                		dsDataList.setCellData( i , "uctYn" , txtUctNewYn.getValue() );
-                	} else if (dsDataList.getCellData( i , "uctYn" ) == "UCT_EST_YN") {
-                		dsDataList.setCellData( i , "uctYn" , txtUctEstYn.getValue() );
-                	} else if (dsDataList.getCellData( i , "uctYn" ) == "UCT_INJT_YN") {
-                		dsDataList.setCellData( i , "uctYn" , txtUctInjtYn.getValue() );
-                	} else if (dsDataList.getCellData( i , "uctYn" ) == "UCT_ITPOL_YN") {
-                		dsDataList.setCellData( i , "uctYn" , txtUctItpolYn.getValue() );
-                	} else if (dsDataList.getCellData( i , "uctYn" ) == "UCT_ETC_YN") {
-                		dsDataList.setCellData( i , "uctYn" , txtUctEtcYn.getValue()+"("+dsDataList.getCellData( i , "uctEtcCn" )+")" );
+                	var uctYn = "";
+                	if (dsDataList.getCellData( i , "uctCntrt" ) == "UCT_CNTRT_YN") {
+                		uctYn = txtUctCntrtYn.getValue();
                 	}
+                	if (dsDataList.getCellData( i , "uctNew" ) == "UCT_NEW_YN") {
+                		if (uctYn.length > 0) {
+                			uctYn = uctYn+", "+txtUctNewYn.getValue();
+                		} else {
+                			uctYn = txtUctNewYn.getValue();
+                		}
+                	}
+                	if (dsDataList.getCellData( i , "uctEst" ) == "UCT_EST_YN") {
+                		if (uctYn.length > 0) {
+                			uctYn = uctYn+", "+txtUctEstYn.getValue();
+                		} else {
+                			uctYn = txtUctEstYn.getValue();
+                		}
+                	}
+                	if (dsDataList.getCellData( i , "uctInjt" ) == "UCT_INJT_YN") {
+                		if (uctYn.length > 0) {
+                			uctYn = uctYn+", "+txtUctInjtYn.getValue();
+                		} else {
+                			uctYn = txtUctInjtYn.getValue();
+                		}
+                	}
+                	if (dsDataList.getCellData( i , "uctItpol" ) == "UCT_ITPOL_YN") {
+                		if (uctYn.length > 0) {
+                			uctYn = uctYn+", "+txtUctItpolYn.getValue();
+                		} else {
+                			uctYn = txtUctItpolYn.getValue();
+                		}
+                	}
+                	if (dsDataList.getCellData( i , "uctEtc" ) == "UCT_ETC_YN") {
+                		if (uctYn.length > 0) {
+                			uctYn = uctYn+", "+txtUctEtcYn.getValue()+"("+dsDataList.getCellData( i , "uctEtcCn" )+")";
+                		} else {
+                			uctYn = txtUctEtcYn.getValue()+"("+dsDataList.getCellData( i , "uctEtcCn" )+")";
+                		}
+                	}
+               		dsDataList.setCellData( i , "uctYn" , uctYn );
                 	var sEtcView2 = "";
                 	var sAdddocAfPhotoYn = dsDataList.getCellData( i , "adddocAfPhotoYn" ) == "Y"?txtAdddocAfPhotoYn.getValue():"";
                 	var sAdddocEtcYn = dsDataList.getCellData( i , "adddocEtcYn" ) == "Y"?txtAdddocEtcYn.getValue()+"("+dsDataList.getCellData( i , "adddocEtcCn" )+")":"";
@@ -563,105 +596,105 @@
 						fixedColumnWithHidden="false" id="grdData1" ignoreCellClick="false" ignoreToggleOnDisabled="false" keyMoveEditMode="true"
 						moveKeyEditMode="true" rowNumHeaderValue="No" rowNumStatusResize="true" rowNumVisible="true" rowNumWidth="35"
 						rowStatusHeaderValue="상태" rowStatusVisible="false" rowStatusWidth="35" scrollByColumn="false" scrollByColumnAdaptive="false"
-						style="height:727px;" summaryAuto="false" useShiftKey="true" visibleRowNum="" readOnly="true" rowStatusLocaleRef="STATUS">
+						style="height:727px;" summaryAuto="false" useShiftKey="true" visibleRowNum="" readOnly="true" rowStatusLocaleRef="STATUS"
+						tooltipDisplay="true" tooltipDisplayColumn="prgsStusGbNm,ccNm,subctConstNm,workNm,causView,uctYn,adddocView,etcView2">
 						<w2:caption style="" id="caption1" value="this is a grid caption."></w2:caption>
 						<w2:header style="" id="header1">
 							<w2:row style="" id="row1">
-								<w2:column removeBorderStyle="false" width="40" inputType="text" id="column12" value="선택" blockSelect="false"
-									displayMode="label" useLocale="true" localeRef="CHKALL">
+								<w2:column removeBorderStyle="false" width="40" inputType="text" id="column12" value="선택"
+									blockSelect="false" displayMode="label" useLocale="true" localeRef="CHKALL" style="">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="180" inputType="text" id="column4" value="작업지시번호" localeRef="CWO_WKI_NO"
-									blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="180" inputType="text" id="column4" value="작업지시번호"
+									localeRef="CWO_WKI_NO" blockSelect="false" displayMode="label" style="">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="120" inputType="text" id="column2" value="진행상태"
-									localeRef="CWO_PRGS_STUS_GB_CD" blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="130" inputType="text" id="column2" value="진행상태"
+									localeRef="CWO_PRGS_STUS_GB_CD" blockSelect="false" displayMode="label" style="">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="80" inputType="text" id="column5" value="작업지시일" localeRef="CWO_WKI_DT"
-									blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="80" inputType="text" id="column5" value="작업지시일"
+									localeRef="CWO_WKI_DT" blockSelect="false" displayMode="label" style="">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="80" inputType="text" id="column6" value="완료기한" localeRef="CWO_CPLT_SRT_DT"
-									blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="80" inputType="text" id="column6" value="완료기한"
+									localeRef="CWO_CPLT_SRT_DT" blockSelect="false" displayMode="label" style="">
 								</w2:column>
 								<w2:column removeBorderStyle="false" width="100" inputType="text" id="column23" value="확인서 제출일자"
-									localeRef="CWC_REQ_CONF_DT" blockSelect="false" displayMode="label">
+									localeRef="CWC_REQ_CONF_DT" blockSelect="false" displayMode="label" style="">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="150" inputType="text" id="column7" value="현장명" localeRef="CWO_CC_NM"
-									blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="150" inputType="text" id="column7" value="현장명"
+									localeRef="CWO_CC_NM" blockSelect="false" displayMode="label" style="">
 								</w2:column>
 								<w2:column removeBorderStyle="false" width="150" inputType="text" id="column8" value="하도급공사명"
-									localeRef="CWO_SUBCT_CONST_NM" blockSelect="false" displayMode="label">
+									localeRef="CWO_SUBCT_CONST_NM" blockSelect="false" displayMode="label" style="">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="150" inputType="text" id="column9" value="작업명" localeRef="CWO_WORK_NM"
-									blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="150" inputType="text" id="column9" value="작업명"
+									localeRef="CWO_WORK_NM" blockSelect="false" displayMode="label" style="">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="120" inputType="text" id="column3" value="시행구분" localeRef="CWO_ENFC_GB_CD"
-									blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="120" inputType="text" id="column3" value="시행구분"
+									localeRef="CWO_ENFC_GB_CD" blockSelect="false" displayMode="label" style="">
 								</w2:column>
 								<w2:column removeBorderStyle="false" width="150" inputType="text" id="column31" value="단가결정구분"
-									localeRef="CWC_UCT_DECISION" blockSelect="false" displayMode="label">
+									localeRef="CWC_UCT_DECISION" blockSelect="false" displayMode="label" style="">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="100" inputType="text" id="column20" value="견적금액" localeRef="CWO_EST_AMT"
-									blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="100" inputType="text" id="column20" value="견적금액"
+									localeRef="CWO_EST_AMT" blockSelect="false" displayMode="label" style="">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="100" inputType="text" id="column33" value="확정금액" localeRef="CWC_CONF_AMT"
-									blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="100" inputType="text" id="column33" value="확정금액"
+									localeRef="CWC_CONF_AMT" blockSelect="false" displayMode="label" style="">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="150" inputType="text" id="column22" value="첨부자료" localeRef="CWO_ADD_DOC"
-									blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="150" inputType="text" id="column22" value="첨부자료"
+									localeRef="CWO_ADD_DOC" blockSelect="false" displayMode="label" style="">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column16" value="파일첨부" localeRef="CWO_ADD_DOC"
-									blockSelect="false" displayMode="label">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column16" value="파일첨부"
+									localeRef="CWO_ADD_DOC" blockSelect="false" displayMode="label" style="">
 								</w2:column>
 							</w2:row>
 						</w2:header>
 						<w2:gBody style="" id="gBody1">
 							<w2:row style="" id="row2">
-								<w2:column removeBorderStyle="false" width="40" inputType="checkbox" id="chk" blockSelect="false" displayMode="label"
-									falseValue="N" trueValue="Y" valueType="other" readOnly="false">
+								<w2:column removeBorderStyle="false" width="40" inputType="checkbox" id="chk" blockSelect="false"
+									displayMode="label" falseValue="N" trueValue="Y" valueType="other" readOnly="false">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="180" inputType="text" id="wkiNo" blockSelect="false" displayMode="label"
-									textAlign="left">
+								<w2:column removeBorderStyle="false" width="180" inputType="text" id="wkiNo" blockSelect="false"
+									displayMode="label" textAlign="left">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="120" inputType="select" id="prgsStusGbCd" blockSelect="false"
+								<w2:column removeBorderStyle="false" width="130" inputType="text" id="prgsStusGbNm" blockSelect="false"
 									displayMode="label" textAlign="center">
-									<w2:choices></w2:choices>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="80" inputType="text" id="wkiDt" blockSelect="false" displayMode="label"
-									displayFormat="####-##-##" textAlign="center">
+								<w2:column removeBorderStyle="false" width="80" inputType="text" id="wkiDt" blockSelect="false"
+									displayMode="label" displayFormat="####-##-##" textAlign="center">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="80" inputType="text" id="cpltEndDt" blockSelect="false" displayMode="label"
-									displayFormat="####-##-##" textAlign="center">
+								<w2:column removeBorderStyle="false" width="80" inputType="text" id="cpltEndDt" blockSelect="false"
+									displayMode="label" displayFormat="####-##-##" textAlign="center">
 									<w2:choices></w2:choices>
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="100" inputType="text" id="reqConfDt" blockSelect="false" displayMode="label"
-									displayFormat="####-##-##" textAlign="center">
+								<w2:column removeBorderStyle="false" width="100" inputType="text" id="reqConfDt" blockSelect="false"
+									displayMode="label" displayFormat="####-##-##" textAlign="center">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="150" inputType="text" id="ccNm" blockSelect="false" displayMode="label"
-									textAlign="left">
+								<w2:column removeBorderStyle="false" width="150" inputType="text" id="ccNm" blockSelect="false"
+									displayMode="label" textAlign="left">
 								</w2:column>
 								<w2:column removeBorderStyle="false" width="150" inputType="text" id="subctConstNm" blockSelect="false"
 									displayMode="label" textAlign="left">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="150" inputType="link" id="workNm" blockSelect="false" displayMode="label"
-									textAlign="left">
+								<w2:column removeBorderStyle="false" width="150" inputType="link" id="workNm" blockSelect="false"
+									displayMode="label" textAlign="left">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="120" inputType="text" id="enfcGbNm" blockSelect="false" displayMode="label"
-									textAlign="center">
+								<w2:column removeBorderStyle="false" width="120" inputType="text" id="enfcGbNm" blockSelect="false"
+									displayMode="label" textAlign="center">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="150" inputType="text" id="uctYn" blockSelect="false" displayMode="label"
-									textAlign="left">
+								<w2:column removeBorderStyle="false" width="150" inputType="text" id="uctYn" blockSelect="false"
+									displayMode="label" textAlign="left">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="100" inputType="text" id="estAmt" blockSelect="false" displayMode="label"
-									textAlign="right" dataType="number" displayFormat="#,###">
+								<w2:column removeBorderStyle="false" width="100" inputType="text" id="estAmt" blockSelect="false"
+									displayMode="label" textAlign="right" dataType="number" displayFormat="#,###">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="100" inputType="text" id="confAmt" blockSelect="false" displayMode="label"
-									textAlign="right" dataType="number" displayFormat="#,###">
+								<w2:column removeBorderStyle="false" width="100" inputType="text" id="confAmt" blockSelect="false"
+									displayMode="label" textAlign="right" dataType="number" displayFormat="#,###">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="150" inputType="text" id="etcView2" blockSelect="false" displayMode="label"
-									textAlign="left">
+								<w2:column removeBorderStyle="false" width="150" inputType="text" id="etcView2" blockSelect="false"
+									displayMode="label" textAlign="left">
 								</w2:column>
-								<w2:column removeBorderStyle="false" width="70" inputType="text" id="atchfileView" blockSelect="false" displayMode="label"
-									textAlign="center">
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="atchfileView" blockSelect="false"
+									displayMode="label" textAlign="center">
 								</w2:column>
 							</w2:row>
 						</w2:gBody>