Merge remote-tracking branch 'origin/master'

src/main/resources/sqlmap/mappers/co/co0102/CO01020001UMapper.xml

@@ -75,8 +75,8 @@
 					        END PROG_ACT_RT_RSN_YN	 
 					     , ROUND(NVL(A.PROG_ACT_PLAN_O_RT,0),2) PROG_ACT_PLAN_O_RT --공정율계획
 					     , ROUND(NVL(A.PROG_ACT_O_RT,0),2) PROG_ACT_O_RT --공정율  
-					     , RTRIM(TO_CHAR(ROUND(NVL(A.PROG_ACT_PLAN_O_RT - A.PROG_ACT_O_RT,0),2), 'FM990.99'),'.') PROG_ACT_O_RT_DIFF --공정율 GAP  
-					     , E.MDFT_PR 
+					     , ROUND(NVL(A.PROG_ACT_PLAN_O_RT - A.PROG_ACT_O_RT,0),2) PROG_ACT_O_RT_DIFF --공정율 GAP  
+					     , E.MDFT_PR
 					     , TO_CHAR(TO_TIMESTAMP(E.MDFT_DT,'YYYY-MM-DD-HH24:MI:SS'),'YYYY-MM-DD-HH24:MI:SS') MDFT_DT -- 최종 수정일자
 					  FROM CON_PJT_MST A
 					  LEFT JOIN	(

src/main/webapp/ux/co/co0102/CO01020001U.xml

@@ -45,7 +45,7 @@
 						<w2:column id="rcamtRsn" name="미수금 사유" dataType="text"></w2:column>
 						<w2:column id="rcamtMeasr" name="미수금 대책" dataType="text"></w2:column>
 						<w2:column id="rcamtRsnYn" name="미수금 사유 유무 YN" dataType="text"></w2:column>
-						<w2:column id="progActRtRsn" name="공정율 사유" dataType="text"></w2:column> 
+						<w2:column id="progActRtRsn" name="공정율 사유" dataType="text"></w2:column>
 						<w2:column id="progActRtMeasr" name="공정율 대책" dataType="text"></w2:column>
 						<w2:column id="progActRtRsnYn" name="공정율 사유 유무 YN" dataType="text"></w2:column>
 						<w2:column id="progActPlanORt" name="공정율 계획" dataType="text"></w2:column>
@@ -58,7 +58,8 @@
 						<w2:column id="mdftPr" name="최종수정자" dataType="text"></w2:column>
 						<w2:column id="mdftDt" name="최종수정일자" dataType="text"></w2:column>
 					</w2:columnInfo>
-					<w2:data use="false"></w2:data>
+					<w2:data use="false">
+					</w2:data>
 				</w2:dataList>
 				<w2:dataList baseNode="list" repeatNode="map" id="dcComboCcgrp" saveRemovedData="">
 					<w2:columnInfo>
@@ -761,9 +762,9 @@
 									<w2:column width="70" id="npyrqRsnYn" inputType="checkbox" displayMode="label" falseValue="N"
 										trueValue="Y" valueType="other">
 									</w2:column>
-									<w2:column width="70" id="progActPlanORt" textAlign="right" dataType="number" displayFormat="###.##%"></w2:column>
-									<w2:column width="70" id="progActORt" textAlign="right" dataType="number" displayFormat="###.##%"></w2:column>
-									<w2:column width="70" id="progActORtDiff" textAlign="right" dataType="number" displayFormat="###.##%"></w2:column>
+									<w2:column width="70" id="progActPlanORt" textAlign="right" dataType="number" displayFormat="###.##%" excelFormat="#,###.00"></w2:column>
+									<w2:column width="70" id="progActORt" textAlign="right" dataType="number" displayFormat="###.##%" excelFormat="#,###.00"></w2:column>
+									<w2:column width="70" id="progActORtDiff" textAlign="right" dataType="number" displayFormat="###.##%" excelFormat="#,###.00"></w2:column>
 									<w2:column width="70" id="progActRtRsnYn" inputType="checkbox" displayMode="label" falseValue="N"
 										trueValue="Y" valueType="other">
 									</w2:column>