Browse Source

리스크점검 사유등록 화면 수정

SBK 1 year ago
parent
commit
c07d9b9e83

+ 1 - 0
src/main/java/sgc/portal/co/co0102/dto/CO01020001USearch.java

@@ -24,4 +24,5 @@ public class CO01020001USearch extends BaseSearchDto {
 	private String gubun;     /*금액구분*/
 	private String gubun;     /*금액구분*/
 	private String unit;     /*조회기준*/
 	private String unit;     /*조회기준*/
 	private String resnYn;   /*사유 미 등록 건*/
 	private String resnYn;   /*사유 미 등록 건*/
+	private String processGap;   /*공정율 GAP 기준*/
 }
 }

+ 8 - 2
src/main/java/sgc/portal/co/co0102/model/CO01020001U.java

@@ -23,11 +23,17 @@ public class CO01020001U extends Domain {
 	
 	
 	private String complNm;     /*준공여부 명*/
 	private String complNm;     /*준공여부 명*/
 	private String npyrqRsn;     /*미청구 사유*/
 	private String npyrqRsn;     /*미청구 사유*/
-	private String npyrqRsnYn;     /*미청구 사유 유무 YN*/
 	private String npyrqMeasr;     /*미청구 대책*/
 	private String npyrqMeasr;     /*미청구 대책*/
+	private String npyrqRsnYn;     /*미청구 사유 유무 YN*/
 	private String rcamtRsn;     /*미수금 사유*/
 	private String rcamtRsn;     /*미수금 사유*/
-	private String rcamtRsnYn;     /*미수금 사유 유무 YN*/
 	private String rcamtMeasr;     /*미수금 대책*/
 	private String rcamtMeasr;     /*미수금 대책*/
+	private String rcamtRsnYn;     /*미수금 사유 유무 YN*/
+	private String progActRtRsn;     /*공정율 사유*/ 
+	private String progActRtMeasr;     /*공정율 대책*/ 
+	private String progActRtRsnYn;     /*공정율 사유 유무 YN*/ 
+	private String progActPlanORt;     /*공정율 계획*/ 
+	private String progActORt;     /*공정율 진행율*/ 
+	private String progActORtDiff;     /*공정율 GAP*/ 
 	
 	
 	private String advent;     /*도래*/
 	private String advent;     /*도래*/
 	
 	

+ 33 - 8
src/main/resources/sqlmap/mappers/co/co0102/CO01020001UMapper.xml

@@ -17,15 +17,21 @@
 		     , NON_CTMN
 		     , NON_CTMN
 		     , NON_PYRQ
 		     , NON_PYRQ
 		     , ADVENT
 		     , ADVENT
-		     , EMP_PM_NM
-		     , EMP_PE_NM
-		     , EMP_PS_NM
 		     , NPYRQ_RSN
 		     , NPYRQ_RSN
 		     , NPYRQ_RSN_YN
 		     , NPYRQ_RSN_YN
 		     , NPYRQ_MEASR
 		     , NPYRQ_MEASR
 		     , RCAMT_RSN
 		     , RCAMT_RSN
 		     , RCAMT_RSN_YN
 		     , RCAMT_RSN_YN
 		     , RCAMT_MEASR
 		     , RCAMT_MEASR
+		     , PROG_ACT_RT_RSN
+		     , PROG_ACT_RT_MEASR
+		     , PROG_ACT_RT_RSN_YN
+		     , PROG_ACT_PLAN_O_RT
+		     , PROG_ACT_O_RT
+		     , PROG_ACT_O_RT_DIFF
+		     , EMP_PM_NM
+		     , EMP_PE_NM
+		     , EMP_PS_NM
 		     , MDFT_PR
 		     , MDFT_PR
      		 , MDFT_DT
      		 , MDFT_DT
 		  FROM 	(
 		  FROM 	(
@@ -54,8 +60,14 @@
 					     , DECODE(NVL(E.NPYRQ_RSN,''),'','N','Y') NPYRQ_RSN_YN
 					     , DECODE(NVL(E.NPYRQ_RSN,''),'','N','Y') NPYRQ_RSN_YN
 					     , E.NPYRQ_MEASR
 					     , E.NPYRQ_MEASR
 					     , E.RCAMT_RSN
 					     , E.RCAMT_RSN
-					     , DECODE(NVL(E.RCAMT_RSN,''),'','N','Y') RCAMT_RSN_YN
 					     , E.RCAMT_MEASR
 					     , E.RCAMT_MEASR
+					     , DECODE(NVL(E.RCAMT_RSN,''),'','N','Y') RCAMT_RSN_YN
+					     , E.PROG_ACT_RT_RSN
+					     , E.PROG_ACT_RT_MEASR
+					     , DECODE(NVL(E.PROG_ACT_RT_RSN,''),'','N','Y') 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_O_RT - A.PROG_ACT_PLAN_O_RT,0),2), 'FM990.99'),'.') PROG_ACT_O_RT_DIFF --공정율 GAP  
 					     , E.MDFT_PR 
 					     , E.MDFT_PR 
 					     , TO_CHAR(TO_TIMESTAMP(E.MDFT_DT,'YYYY-MM-DD-HH24:MI:SS'),'YYYY-MM-DD-HH24:MI:SS') MDFT_DT -- 최종 수정일자
 					     , 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
 					  FROM CON_PJT_MST A
@@ -103,21 +115,32 @@
 					   AND A.STD_YM = #{stdYm}
 					   AND A.STD_YM = #{stdYm}
 					   AND A.CC_CD NOT IN (SELECT SPEC_CD FROM SM_COM_COMMCD_D A, SM_COM_COMMCD B WHERE A.COMM_CD_ID = B.COMM_CD_ID AND B.COMM_CD = 'CO004' AND A.USE_YN = 'Y')
 					   AND A.CC_CD NOT IN (SELECT SPEC_CD FROM SM_COM_COMMCD_D A, SM_COM_COMMCD B WHERE A.COMM_CD_ID = B.COMM_CD_ID AND B.COMM_CD = 'CO004' AND A.USE_YN = 'Y')
 					   AND A.CC_CD LIKE '%'||#{ccCd}||'%'
 					   AND A.CC_CD LIKE '%'||#{ccCd}||'%'
+					   
 					<if test="complCd != 'all'">
 					<if test="complCd != 'all'">
 					   AND E.COMPL_CD = #{complCd}
 					   AND E.COMPL_CD = #{complCd}
 					</if>
 					</if>
 					<if test="ccgrpCd != 'all'">
 					<if test="ccgrpCd != 'all'">
 					   AND A.CCGRP_CD = #{ccgrpCd}
 					   AND A.CCGRP_CD = #{ccgrpCd}
 					</if>
 					</if>
-					<if test="gubun == 'CTMN'">
+					<if test="gubun == 'CTMN'">				
 					   AND D.NON_CTMN <![CDATA[>]]> #{unit}
 					   AND D.NON_CTMN <![CDATA[>]]> #{unit}
 					</if>
 					</if>
-					<if test="gubun == 'PYRQ'">
+					<if test="gubun == 'PYRQ'">					
 					   AND NVL(A.SALE_AMT,0) - NVL(B.PYRQ_NAS_AMT,0) <![CDATA[>]]> #{unit}
 					   AND NVL(A.SALE_AMT,0) - NVL(B.PYRQ_NAS_AMT,0) <![CDATA[>]]> #{unit}
 					</if>
 					</if>
 					<if test="gubun == 'all'">
 					<if test="gubun == 'all'">
-					   AND (D.NON_CTMN <![CDATA[>=]]> #{unit} 
-					     OR (NVL(A.SALE_AMT,0) - NVL(B.PYRQ_NAS_AMT,0)) <![CDATA[>=]]> #{unit} ) 
+						<if test="processGap != 0">
+						   <![CDATA[AND ROUND(NVL(A.PROG_ACT_O_RT - A.PROG_ACT_PLAN_O_RT,0),2) <= '-'||#{processGap}]]>
+						</if>
+						<if test="unit != 0">											
+						   AND (D.NON_CTMN <![CDATA[>=]]> #{unit} 
+						     OR (NVL(A.SALE_AMT,0) - NVL(B.PYRQ_NAS_AMT,0)) <![CDATA[>=]]> #{unit} ) 
+						</if>
+					</if>
+					<if test="gubun == 'PAOR'">
+						<if test="processGap != 0">
+						   <![CDATA[AND ROUND(NVL(A.PROG_ACT_O_RT - A.PROG_ACT_PLAN_O_RT,0),2) <= '-'||#{processGap}]]>
+						</if>
 					</if>
 					</if>
 				)
 				)
 		<if test="resnYn != '' and resnYn != null">
 		<if test="resnYn != '' and resnYn != null">
@@ -132,6 +155,8 @@
 		     , NPYRQ_MEASR = #{npyrqMeasr}
 		     , NPYRQ_MEASR = #{npyrqMeasr}
 		     , RCAMT_RSN = #{rcamtRsn}
 		     , RCAMT_RSN = #{rcamtRsn}
 		     , RCAMT_MEASR = #{rcamtMeasr}
 		     , RCAMT_MEASR = #{rcamtMeasr}
+		     , PROG_ACT_RT_RSN = #{progActRtRsn}
+		     , PROG_ACT_RT_MEASR = #{progActRtMeasr}
 		     , MDFT_DT = SYSDATE
 		     , MDFT_DT = SYSDATE
 		     , MDFT_PR = #{mdftPr}
 		     , MDFT_PR = #{mdftPr}
 		 WHERE CMPN_CD = #{cmpnCd}
 		 WHERE CMPN_CD = #{cmpnCd}

+ 94 - 28
src/main/webapp/ux/co/co0102/CO01020001U.xml

@@ -42,14 +42,20 @@
 						<w2:column id="complNm" name="준공여부명" dataType="text"></w2:column>
 						<w2:column id="complNm" name="준공여부명" dataType="text"></w2:column>
 						<w2:column id="npyrqRsn" name="미청구 사유" dataType="text"></w2:column>
 						<w2:column id="npyrqRsn" name="미청구 사유" dataType="text"></w2:column>
 						<w2:column id="npyrqMeasr" name="미청구 대책" dataType="text"></w2:column>
 						<w2:column id="npyrqMeasr" name="미청구 대책" dataType="text"></w2:column>
+						<w2:column id="npyrqRsnYn" name="미청구 사유 유무 YN" dataType="text"></w2:column>
 						<w2:column id="rcamtRsn" name="미수금 사유" dataType="text"></w2:column>
 						<w2:column id="rcamtRsn" name="미수금 사유" dataType="text"></w2:column>
 						<w2:column id="rcamtMeasr" name="미수금 대책" dataType="text"></w2:column>
 						<w2:column id="rcamtMeasr" name="미수금 대책" dataType="text"></w2:column>
-						<w2:column id="advent" name="도래" dataType="text"></w2:column>
-						<w2:column id="npyrqRsnYn" name="미청구 사유 유무 YN" dataType="text"></w2:column>
 						<w2:column id="rcamtRsnYn" name="미수금 사유 유무 YN" 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="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>
+						<w2:column id="progActORt" name="공정율 진행율" dataType="text"></w2:column>
+						<w2:column id="progActORtDiff" name="공정율 GAP" dataType="number"></w2:column>
 						<w2:column id="empPmNm" name="PM" dataType="text"></w2:column>
 						<w2:column id="empPmNm" name="PM" dataType="text"></w2:column>
 						<w2:column id="empPeNm" name="PE" dataType="text"></w2:column>
 						<w2:column id="empPeNm" name="PE" dataType="text"></w2:column>
 						<w2:column id="empPsNm" name="공무" dataType="text"></w2:column>
 						<w2:column id="empPsNm" name="공무" dataType="text"></w2:column>
+						<w2:column id="advent" name="도래" dataType="text"></w2:column>
 						<w2:column id="mdftPr" name="최종수정자" dataType="text"></w2:column>
 						<w2:column id="mdftPr" name="최종수정자" dataType="text"></w2:column>
 						<w2:column id="mdftDt" name="최종수정일자" dataType="text"></w2:column>
 						<w2:column id="mdftDt" name="최종수정일자" dataType="text"></w2:column>
 					</w2:columnInfo>
 					</w2:columnInfo>
@@ -74,6 +80,7 @@
 						<w2:key id="unit" name="조회기준" dataType="text"></w2:key>
 						<w2:key id="unit" name="조회기준" dataType="text"></w2:key>
 						<w2:key id="ccgrpCd1" name="본부" dataType="text"></w2:key>
 						<w2:key id="ccgrpCd1" name="본부" dataType="text"></w2:key>
 						<w2:key id="resnYn" name="사유미등록건" dataType="text"></w2:key>
 						<w2:key id="resnYn" name="사유미등록건" dataType="text"></w2:key>
+						<w2:key id="processGap" name="공정율 GAP 기준" dataType="text"></w2:key>
 					</w2:keyInfo>
 					</w2:keyInfo>
 				</w2:dataMap>
 				</w2:dataMap>
 			</w2:dataCollection>
 			</w2:dataCollection>
@@ -103,18 +110,23 @@
      * 기    능: 화면 초기화(권한 및 공통코드 초기화)
      * 기    능: 화면 초기화(권한 및 공통코드 초기화)
      ***************************************************************************/
      ***************************************************************************/
     scwin.initScreen = function() {
     scwin.initScreen = function() {
-        					
-		comboCommon.setCommonCode([{"code":"CO002","compID":"selCo002"}	//조회기준
+
+  				
+		comboCommon.setCommonCode([{"code":"CO002","compID":"selCo002"}	//조회기준 금액
+								  ,{"code":"CO007","compID":"selCo007"}	//조회기준 GAP
 								  ,{"code":"CO003","compID":""}	//본부조회권한 예외사용자
 								  ,{"code":"CO003","compID":""}	//본부조회권한 예외사용자
         						  ]);
         						  ]);
         						  
         						  
 		udcYm.setValue(dateLib.addDays(dateLib.getCurrentDate('yyyyMMdd'), -15).substring(0, 6));	//기준년월
 		udcYm.setValue(dateLib.addDays(dateLib.getCurrentDate('yyyyMMdd'), -15).substring(0, 6));	//기준년월
 		rdoComplCd.setValue( "01" ); //진행구분
 		rdoComplCd.setValue( "01" ); //진행구분
-		selCo002.setValue( 2 );	//조회기준
+		selCo002.setValue( 2 );	//조회기준 금액
+		selCo007.setValue( 1 );	//조회기준 GAP
 		scwin.getComboCcgrp();	//본부조회
 		scwin.getComboCcgrp();	//본부조회
 		chkResn.setValue( '' );
 		chkResn.setValue( '' );
 		ccPop.hideComp(false,false,false,true,true,true);	//현장udc
 		ccPop.hideComp(false,false,false,true,true,true);	//현장udc
-        scwin.grdSearch();	//조회
+        console.log(document.getElementById("tabc_layout_contents_1811_body_grdData1").clientHeight);
+        rightDiv.setSize( null , document.getElementById("tabc_layout_contents_1811_body_grdData1").clientHeight );
+        scwin.grdSearch();	//조회 
         dcdataList1.setRowPosition( 0 );
         dcdataList1.setRowPosition( 0 );
         
         
         
         
@@ -231,6 +243,14 @@
 	    	txtRcamtMeasr.setDisabled( true );
 	    	txtRcamtMeasr.setDisabled( true );
     	}
     	}
     	
     	
+    	if(dcdataList1.getCellData( info.newRowIndex , "progActORtDiff" ).split("%")[0] < 0){
+    		txtProgActRtRsn.setDisabled( false );
+    		txtProgActRtMeasr.setDisabled( false );
+    	} else {
+    		txtProgActRtRsn.setDisabled( true );
+    		txtProgActRtMeasr.setDisabled( true );
+    	}
+    	
 	};
 	};
 
 
     /***************************************************************************
     /***************************************************************************
@@ -354,8 +374,9 @@
 		}
 		}
 		
 		
     	dcsearchMap1.set( "cmpnCd" 	, scwin.cmpnCd );
     	dcsearchMap1.set( "cmpnCd" 	, scwin.cmpnCd );
-        dcsearchMap1.set( "stdYm" 	, udcYm.getValue() );
+        dcsearchMap1.set( "stdYm" 	, udcYm.getValue());
         dcsearchMap1.set( "unit" 	, tabc_layout_contents_1811_body_CO002.getCellData( selCo002.getSelectedIndex() , "ESBS_CD2" ) );
         dcsearchMap1.set( "unit" 	, tabc_layout_contents_1811_body_CO002.getCellData( selCo002.getSelectedIndex() , "ESBS_CD2" ) );
+        dcsearchMap1.set( "processGap" 	, tabc_layout_contents_1811_body_CO007.getCellData( selCo007.getSelectedIndex() , "ESBS_CD2" ) );
         
         
         ajaxLib.ajax("co/co0102/CO01020001U/list", {
         ajaxLib.ajax("co/co0102/CO01020001U/list", {
             method: "POST",
             method: "POST",
@@ -530,6 +551,10 @@
 											<xf:label><![CDATA[미수금]]></xf:label>
 											<xf:label><![CDATA[미수금]]></xf:label>
 											<xf:value><![CDATA[CTMN]]></xf:value>
 											<xf:value><![CDATA[CTMN]]></xf:value>
 										</xf:item>
 										</xf:item>
+										<xf:item>
+											<xf:label><![CDATA[공정율]]></xf:label>
+											<xf:value><![CDATA[PAOR]]></xf:value>
+										</xf:item>										
 									</xf:choices>
 									</xf:choices>
 								</xf:select1>
 								</xf:select1>
 								<xf:select ref="data:dcsearchMap1.resnYn" appearance="full" ev:onchange="" ev:onviewchange="scwin.search_onviewchange"
 								<xf:select ref="data:dcsearchMap1.resnYn" appearance="full" ev:onchange="" ev:onviewchange="scwin.search_onviewchange"
@@ -572,6 +597,12 @@
 									ev:onviewchange="scwin.search_onviewchange">
 									ev:onviewchange="scwin.search_onviewchange">
 									<xf:choices></xf:choices>
 									<xf:choices></xf:choices>
 								</xf:select1>
 								</xf:select1>
+								<xf:select1 allOption="" appearance="minimal" chooseOption="" direction="auto" disabled="false"
+									disabledClass="w2selectbox_disabled" displayMode="label" id="selCo007" optionOrder="false" selectedData="true"
+									style="position: relative;width: 50%;height: 21px;left:5px;" submenuSize="auto" ref="" chooseOptionLabel="$blank"
+									ev:onviewchange="scwin.search_onviewchange">
+									<xf:choices></xf:choices>
+								</xf:select1>								
 							</xf:group>
 							</xf:group>
 							<xf:group class="w2tb_td" style="text-align:right;" tagname="td">
 							<xf:group class="w2tb_td" style="text-align:right;" tagname="td">
 								(단위:원)
 								(단위:원)
@@ -613,6 +644,10 @@
 									<w2:column width="35" id="rcamtRsnYn" value="사유"></w2:column>
 									<w2:column width="35" id="rcamtRsnYn" value="사유"></w2:column>
 									<w2:column width="120" id="nonPyrq" value="미청구공사"></w2:column>
 									<w2:column width="120" id="nonPyrq" value="미청구공사"></w2:column>
 									<w2:column width="35" id="npyrqRsnYn" value="사유"></w2:column>
 									<w2:column width="35" id="npyrqRsnYn" value="사유"></w2:column>
+									<w2:column width="80" id="progActPlanORt" value="공정율계획"></w2:column>
+									<w2:column width="80" id="progActORt" value="공정율실적"></w2:column>
+									<w2:column width="90" id="progActORtDiff" value="공정율 GAP"></w2:column>
+									<w2:column width="35" id="progActRtRsnYn" value="사유"></w2:column>
 									<w2:column width="100" id="empPmNm" value="PM"></w2:column>
 									<w2:column width="100" id="empPmNm" value="PM"></w2:column>
 									<w2:column width="100" id="empPeNm" value="PE"></w2:column>
 									<w2:column width="100" id="empPeNm" value="PE"></w2:column>
 									<w2:column width="100" id="empPsNm" value="공무"></w2:column>
 									<w2:column width="100" id="empPsNm" value="공무"></w2:column>
@@ -620,6 +655,8 @@
 									<w2:column width="150" id="npyrqMeasr" value="미청구대책"></w2:column>
 									<w2:column width="150" id="npyrqMeasr" value="미청구대책"></w2:column>
 									<w2:column width="150" id="rcamtRsn" value="미수금사유"></w2:column>
 									<w2:column width="150" id="rcamtRsn" value="미수금사유"></w2:column>
 									<w2:column width="150" id="rcamtMeasr" value="미수금대책"></w2:column>
 									<w2:column width="150" id="rcamtMeasr" value="미수금대책"></w2:column>
+									<w2:column width="150" id="progActRtRsn" value="공정율사유"></w2:column>
+									<w2:column width="150" id="progActRtMeasr" value="공정율대책"></w2:column>
 									<w2:column width="100" id="mdftPr" value="최종수정자"></w2:column>
 									<w2:column width="100" id="mdftPr" value="최종수정자"></w2:column>
 									<w2:column width="150" id="mdftDt" value="최종수정일"></w2:column>
 									<w2:column width="150" id="mdftDt" value="최종수정일"></w2:column>
 								</w2:row>
 								</w2:row>
@@ -644,6 +681,12 @@
 									<w2:column width="70" id="npyrqRsnYn" inputType="checkbox" displayMode="label" falseValue="N"
 									<w2:column width="70" id="npyrqRsnYn" inputType="checkbox" displayMode="label" falseValue="N"
 										trueValue="Y" valueType="other">
 										trueValue="Y" valueType="other">
 									</w2:column>
 									</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="progActRtRsnYn" inputType="checkbox" displayMode="label" falseValue="N"
+										trueValue="Y" valueType="other">
+									</w2:column>
 									<w2:column removeBorderStyle="false" width="70" inputType="text" id="empPmNm" blockSelect="false"
 									<w2:column removeBorderStyle="false" width="70" inputType="text" id="empPmNm" blockSelect="false"
 										displayMode="label" textAlign="center">
 										displayMode="label" textAlign="center">
 									</w2:column>
 									</w2:column>
@@ -657,6 +700,8 @@
 									<w2:column width="70" id="npyrqMeasr" inputType="textarea" textAlign="left"></w2:column>
 									<w2:column width="70" id="npyrqMeasr" inputType="textarea" textAlign="left"></w2:column>
 									<w2:column width="70" id="rcamtRsn" inputType="textarea" textAlign="left"></w2:column>
 									<w2:column width="70" id="rcamtRsn" inputType="textarea" textAlign="left"></w2:column>
 									<w2:column width="70" id="rcamtMeasr" inputType="textarea" textAlign="left"></w2:column>
 									<w2:column width="70" id="rcamtMeasr" inputType="textarea" textAlign="left"></w2:column>
+									<w2:column width="70" id="progActRtRsn" inputType="textarea" textAlign="left"></w2:column>
+									<w2:column width="70" id="progActRtMeasr" inputType="textarea" textAlign="left"></w2:column>
 									<w2:column width="70" id="mdftPr" inputType="textarea" textAlign="center"></w2:column>
 									<w2:column width="70" id="mdftPr" inputType="textarea" textAlign="center"></w2:column>
 									<w2:column width="70" id="mdftDt" inputType="textarea" textAlign="center"></w2:column>
 									<w2:column width="70" id="mdftDt" inputType="textarea" textAlign="center"></w2:column>
 								</w2:row>
 								</w2:row>
@@ -686,6 +731,12 @@
 									<w2:column removeBorderStyle="false" width="70" id="footForm05"></w2:column>
 									<w2:column removeBorderStyle="false" width="70" id="footForm05"></w2:column>
 									<w2:column removeBorderStyle="false" width="70" id="footForm05"></w2:column>
 									<w2:column removeBorderStyle="false" width="70" id="footForm05"></w2:column>
 									<w2:column removeBorderStyle="false" width="70" id="footForm05"></w2:column>
 									<w2:column removeBorderStyle="false" width="70" id="footForm05"></w2:column>
+									<w2:column removeBorderStyle="false" width="70" id="footForm05"></w2:column>
+									<w2:column removeBorderStyle="false" width="70" id="footForm04"></w2:column>
+									<w2:column removeBorderStyle="false" width="70" id="footForm05"></w2:column>
+									<w2:column removeBorderStyle="false" width="70" id="footForm05"></w2:column>
+									<w2:column removeBorderStyle="false" width="70" id="footForm05"></w2:column>
+									<w2:column removeBorderStyle="false" width="70" id="footForm05"></w2:column>
 								</w2:row>
 								</w2:row>
 							</w2:footer>
 							</w2:footer>
 						</w2:gridView>
 						</w2:gridView>
@@ -694,62 +745,77 @@
 				<xf:group class="ly_column col_2" style="">
 				<xf:group class="ly_column col_2" style="">
 					<xf:group class="dfbox" id="dfbox2" style="">
 					<xf:group class="dfbox" id="dfbox2" style="">
 						<xf:group class="dfbox pt0" id="" style="">
 						<xf:group class="dfbox pt0" id="" style="">
-							<w2:textbox class="df_tit fl" id="" label="미청구 미수금 사유, 대책" style=""></w2:textbox>
+							<w2:textbox class="df_tit fl" id="" label="미청구 미수금 공정율 사유, 대책" style=""></w2:textbox>
 						</xf:group>
 						</xf:group>
 					</xf:group>
 					</xf:group>
-					<xf:group class="gvwbox" id="" style="">
-						<xf:group class="w2tb tb" id="" style="position: relative ;width:100%;" tagname="table" adaptive="layout"
+					<xf:group class="" id="" style="">
+						<xf:group class="w2tb tb" id="rightDiv" style="position: relative ;width:100%;" tagname="table" adaptive="layout"
 							adaptiveThreshold="600">
 							adaptiveThreshold="600">
 							<w2:attributes>
 							<w2:attributes>
 								<w2:summary></w2:summary>
 								<w2:summary></w2:summary>
 							</w2:attributes>
 							</w2:attributes>
 							<xf:group tagname="caption"></xf:group>
 							<xf:group tagname="caption"></xf:group>
 							<xf:group tagname="colgroup">
 							<xf:group tagname="colgroup">
-								<xf:group style="width:100%;" tagname="col"></xf:group>
+								<xf:group style="width:15%;" tagname="col"></xf:group>
+								<xf:group style="width:85%;" tagname="col"></xf:group>
 							</xf:group>
 							</xf:group>
-							<xf:group tagname="tr" style="">
-								<xf:group class="w2tb_th" style="text-align:center;font-weight:bold;" tagname="th">PJT 명</xf:group>
-							</xf:group>
-							<xf:group tagname="tr" style="">
+							<xf:group tagname="tr" style="height:10%;">
+								<xf:group class="w2tb_th" style="text-align:center;font-weight:bold;padding-left: 0px;" tagname="th">PJT 명</xf:group>		
 								<xf:group class="w2tb_td" style="" tagname="td">
 								<xf:group class="w2tb_td" style="" tagname="td">
 									<xf:output label=""
 									<xf:output label=""
-										style="width:100%;height:135px;font-weight:bold;font-size:20px;text-align:center;background-color:#E0E1E4;" id="txtCcNm"
+										style="font-weight:bold;font-size:20px;background-color:#E0E1E4;text-align:left;padding:5px;height:93%;overflow: hidden;" id="txtCcNm"
 										ref="data:dcdataList1.ccNm">
 										ref="data:dcdataList1.ccNm">
 										<xf:label><![CDATA[]]>
 										<xf:label><![CDATA[]]>
 										</xf:label>
 										</xf:label>
 									</xf:output>
 									</xf:output>
-								</xf:group>
+								</xf:group>														
+							</xf:group>
+							<xf:group class="" tagname="tr" style="height:20px;border-width:1px;border-top-style:solid;border-bottom-style:solid;border-top-color:#C0C0C0;border-bottom-color:#C0C0C0;">
+								<xf:group class="" tagname="th"></xf:group>
+								<xf:group class="" tagname="th"></xf:group>
 							</xf:group>
 							</xf:group>
 							<xf:group tagname="tr" style="">
 							<xf:group tagname="tr" style="">
-								<xf:group class="w2tb_th" style="text-align:center;font-weight:bold;color:#0000FF;" tagname="th">미청구공사 사유</xf:group>
+								<xf:group class="w2tb_th" style="text-align:center;font-weight:bold;padding-left: 0px;color:#0000FF;" tagname="th">미청구<br/>사유</xf:group>
+								<xf:group class="w2tb_td" style="" tagname="td">
+									<xf:textarea id="txtNpyrqRsn" style="width:100%;height: 100%;" ref="data:dcdataList1.npyrqRsn"></xf:textarea>
+								</xf:group>								
 							</xf:group>
 							</xf:group>
 							<xf:group tagname="tr" style="">
 							<xf:group tagname="tr" style="">
+								<xf:group class="w2tb_th" style="text-align:center;font-weight:bold;padding-left: 0px;color:#0000FF;" tagname="th">미청구<br/>대책</xf:group>
 								<xf:group class="w2tb_td" style="" tagname="td">
 								<xf:group class="w2tb_td" style="" tagname="td">
-									<xf:textarea id="txtNpyrqRsn" style="width:100%;height: 100px;" ref="data:dcdataList1.npyrqRsn"></xf:textarea>
+									<xf:textarea id="txtNpyrqMeasr" style="width:100%;height: 100%;" ref="data:dcdataList1.npyrqMeasr"></xf:textarea>
 								</xf:group>
 								</xf:group>
 							</xf:group>
 							</xf:group>
-							<xf:group tagname="tr" style="">
-								<xf:group class="w2tb_th" style="text-align:center;font-weight:bold;color:#0000FF;" tagname="th">미청구공사 대책</xf:group>
+							<xf:group class="" tagname="tr" style="height:7px;border-width:1px;border-top-style:solid;border-bottom-style:solid;border-top-color:#C0C0C0;border-bottom-color:#C0C0C0;">
+								<xf:group class="" tagname="th"></xf:group>
+								<xf:group class="" tagname="th"></xf:group>
 							</xf:group>
 							</xf:group>
 							<xf:group tagname="tr" style="">
 							<xf:group tagname="tr" style="">
+								<xf:group class="w2tb_th" style="text-align:center;font-weight:bold;padding-left: 0px;color:#FF0000;" tagname="th">미수금<br/>사유</xf:group>
 								<xf:group class="w2tb_td" style="" tagname="td">
 								<xf:group class="w2tb_td" style="" tagname="td">
-									<xf:textarea id="txtNpyrqMeasr" style="width:100%;height: 100px;" ref="data:dcdataList1.npyrqMeasr"></xf:textarea>
+									<xf:textarea id="txtRcamtRsn" style="width:100%;height: 100%;" ref="data:dcdataList1.rcamtRsn"></xf:textarea>
 								</xf:group>
 								</xf:group>
 							</xf:group>
 							</xf:group>
 							<xf:group tagname="tr" style="">
 							<xf:group tagname="tr" style="">
-								<xf:group class="w2tb_th" style="text-align:center;font-weight:bold;color:#FF0000;" tagname="th">미수금 사유</xf:group>
-							</xf:group>
-							<xf:group tagname="tr" style="">
+								<xf:group class="w2tb_th" style="text-align:center;font-weight:bold;padding-left: 0px;color:#FF0000;" tagname="th">미수금<br/>대책</xf:group>
 								<xf:group class="w2tb_td" style="" tagname="td">
 								<xf:group class="w2tb_td" style="" tagname="td">
-									<xf:textarea id="txtRcamtRsn" style="width:100%;height: 100px;" ref="data:dcdataList1.rcamtRsn"></xf:textarea>
+									<xf:textarea id="txtRcamtMeasr" style="width:100%;height: 100%;" ref="data:dcdataList1.rcamtMeasr"></xf:textarea>
 								</xf:group>
 								</xf:group>
 							</xf:group>
 							</xf:group>
+							<xf:group class="" tagname="tr" style="height:7px;border-width:1px;border-top-style:solid;border-bottom-style:solid;border-top-color:#C0C0C0;border-bottom-color:#C0C0C0;">
+								<xf:group class="" tagname="th"></xf:group>
+								<xf:group class="" tagname="th"></xf:group>
+							</xf:group>
 							<xf:group tagname="tr" style="">
 							<xf:group tagname="tr" style="">
-								<xf:group class="w2tb_th" style="text-align:center;font-weight:bold;color:#FF0000;" tagname="th">미수금 대책</xf:group>
+								<xf:group class="w2tb_th" style="text-align:center;font-weight:bold;padding-left: 0px;" tagname="th">공정율<br/>사유</xf:group>
+								<xf:group class="w2tb_td" style="" tagname="td">
+									<xf:textarea id="txtProgActRtRsn" style="width:100%;height: 100%;" ref="data:dcdataList1.progActRtRsn"></xf:textarea>
+								</xf:group>
 							</xf:group>
 							</xf:group>
 							<xf:group tagname="tr" style="">
 							<xf:group tagname="tr" style="">
+								<xf:group class="w2tb_th" style="text-align:center;font-weight:bold;padding-left: 0px;" tagname="th">공정율<br/>대책</xf:group>
 								<xf:group class="w2tb_td" style="" tagname="td">
 								<xf:group class="w2tb_td" style="" tagname="td">
-									<xf:textarea id="txtRcamtMeasr" style="width:100%;height: 100px;" ref="data:dcdataList1.rcamtMeasr"></xf:textarea>
+									<xf:textarea id="txtProgActRtMeasr" style="width:100%;height: 100%;" ref="data:dcdataList1.progActRtMeasr"></xf:textarea>
 								</xf:group>
 								</xf:group>
 							</xf:group>
 							</xf:group>
 						</xf:group>
 						</xf:group>