Merge branch 'master' of http://211.38.140.247:3000/sgc/sgc-portal

src/main/resources/sqlmap/mappers/co/co0105/CO01050001UMapper.xml

@@ -200,10 +200,12 @@
 		     , NVL(C.RT_PROG_ACT_O,0) RT_PROG_ACT_O--Actual
 		  FROM CON_PJT_MST A
 		  LEFT JOIN SM_COM_CMPN B ON A.CMPN_CD  = B.CMPN_CD 
-		  LEFT JOIN WC_Z_ETEC_PJT_PROGRESS@ERPSQL C ON C.CD_COMPANY = B.MAP_CMPN_CD AND C.CD_SITE = A.CC_CD AND SUBSTR(C.YM_PROG,0,6) = A.STD_YM 
+		  LEFT JOIN WC_Z_ETEC_PJT_PROGRESS@ERPSQL C ON C.CD_COMPANY = B.MAP_CMPN_CD AND C.CD_SITE = A.CC_CD AND SUBSTR(C.YM_PROG,0,6) = A.STD_YM
+		  LEFT JOIN CON_PJT_RESN D ON A.CMPN_CD = D.CMPN_CD AND A.STD_YM = D.STD_YM AND A.CC_CD = D.CC_CD
 		 WHERE A.CMPN_CD = #{cmpnCd}
 		   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 D.COMPL_CD = '01'
 		<if test="gubun == '02'">
 		   AND ( NVL(C.RT_PROG_PLAN_O,0) > 0 OR NVL(C.RT_PROG_ACT_O,0) > 0 )
 		</if>

src/main/webapp/ux/co/co0103/CO01030001P.xml

@@ -364,7 +364,7 @@
 					<xf:group class="dfbox pt0" id="" style="">
 						<w2:textbox class="df_tit fl" id="" label="프로젝트별공사대장" style=""></w2:textbox>
 						<w2:udc_list_count id="listCount1" />
-						<w2:textbox id="" label="※ 마이너스 금액이 미청구공사 금액 입니다." style="color:#FF0000;font-weight:bold;right:0px;text-indent:4px;position:absolute;"></w2:textbox>
+						<w2:textbox id="" label="※ 매출대비청구 : 마이너스 금액이 미청구공사 금액 입니다." style="color:#FF0000;font-weight:bold;right:0px;text-indent:4px;position:absolute;"></w2:textbox>
 					</xf:group>
 				</xf:group>
 				<xf:group class="gvwbox" id="" style="">

src/main/webapp/ux/co/co0104/CO01040001U.xml

@@ -463,7 +463,7 @@
 					<xf:group class="dfbox pt0" id="" style="">
 						<w2:textbox class="df_tit fl" id="" label="프로젝트별공사대장" style=""></w2:textbox>
 						<w2:udc_list_count id="listCount1" />
-						<w2:textbox id="" label="※ 마이너스 금액이 미청구공사 금액 입니다." style="color:#FF0000;font-weight:bold;right:0px;text-indent:4px;position:absolute;"></w2:textbox>					
+						<w2:textbox id="" label="※ 매출대비청구 : 마이너스 금액이 미청구공사 금액 입니다." style="color:#FF0000;font-weight:bold;right:0px;text-indent:4px;position:absolute;"></w2:textbox>					
 					</xf:group>
 				</xf:group>
 				<xf:group class="gvwbox" id="" style="">