리스크점검사유등록 사유 등록 조정, 쿼리 수정

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

@@ -124,27 +124,25 @@
 					<if test="complCd != 'all'">
 					   AND E.COMPL_CD = #{complCd}
 					</if>
-					<if test="ccgrpCd != 'all'">
-					   AND A.CCGRP_CD = #{ccgrpCd}
-					</if>
 					<if test="gubun == 'CTMN'">				
 					   AND D.NON_CTMN <![CDATA[>]]> #{unit}
 					</if>
 					<if test="gubun == 'PYRQ'">					
 					   AND NVL(A.SALE_AMT,0) - NVL(B.PYRQ_NAS_AMT,0) <![CDATA[>]]> #{unit}
 					</if>
-					<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>
 					<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>
 				)
+		 WHERE
+		<if test="gubun == 'all'">										
+		   AND (NON_CTMN <![CDATA[>=]]> #{unit}
+		      OR NON_PYRQ <![CDATA[>=]]> #{unit} ) 
+		</if>		 
 		<if test="resnYn != '' and resnYn != null">
-		 WHERE (NVL(NPYRQ_RSN,'Y') = (CASE WHEN NON_PYRQ != 0 THEN 'Y' ELSE 'N' END) OR NVL(RCAMT_RSN,'Y') = (CASE WHEN NON_CTMN != 0 THEN 'Y' ELSE 'N' END))
+		   AND (NVL(NPYRQ_RSN,'Y') = (CASE WHEN NON_PYRQ != 0 THEN 'Y' ELSE 'N' END) OR NVL(RCAMT_RSN,'Y') = (CASE WHEN NON_CTMN != 0 THEN 'Y' ELSE 'N' END))
 		</if>		
 		 ORDER BY CCGRP_CD, CC_CD
 	</select>

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

@@ -642,7 +642,7 @@
 				</xf:group>
 			</xf:group>
 			<xf:group style="position: relative;height: 80%;" id="" class="lybox">
-				<xf:group class="ly_column col_8">
+				<xf:group class="ly_column col_8" style="height:100%;">
 					<xf:group class="dfbox" id="dfbox1" style="">
 						<xf:group class="dfbox pt0" id="" style="">
 							<w2:textbox class="df_tit fl" id="" label="미청구 미수금 내역" style=""></w2:textbox>
@@ -775,7 +775,7 @@
 							<w2:textbox class="df_tit fl" id="" label="미청구 미수금 공정율 사유, 대책" style=""></w2:textbox>
 						</xf:group>
 					</xf:group>
-					<xf:group class="" id="" style="height:100%;">
+					<xf:group class="" id="" style="height:100%;padding-bottom:-10px;">
 						<xf:group class="w2tb tb" style="position: relative ;width:100%;height:100%;" tagname="table" adaptive="layout"
 							adaptiveThreshold="600">
 							<w2:attributes>
@@ -801,29 +801,29 @@
 								<xf:group class="" tagname="th"></xf:group>
 								<xf:group class="" tagname="th"></xf:group>
 							</xf:group>
-							<xf:group tagname="tr" style="height:8%;">
+							<xf:group tagname="tr" style="height:12%;">
 								<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 tagname="tr" style="height:8%;">
+							<xf:group tagname="tr" style="height:12%;">
 								<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="txtNpyrqMeasr" style="width:100%;" ref="data:dcdataList1.npyrqMeasr"></xf:textarea>
+									<xf:textarea id="txtNpyrqMeasr" style="width:100%;height:100%;" ref="data:dcdataList1.npyrqMeasr"></xf:textarea>
 								</xf:group>
 							</xf:group>
 							<xf:group class="" tagname="tr" style="height:1%;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="height:8%;">
+							<xf:group tagname="tr" style="height:12%;">
 								<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:textarea id="txtRcamtRsn" style="width:100%;height:100%;" ref="data:dcdataList1.rcamtRsn"></xf:textarea>
 								</xf:group>
 							</xf:group>
-							<xf:group tagname="tr" style="height:8%;">
+							<xf:group tagname="tr" style="height:12%;">
 								<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:textarea id="txtRcamtMeasr" style="width:100%;height:100%;" ref="data:dcdataList1.rcamtMeasr"></xf:textarea>
@@ -833,13 +833,13 @@
 								<xf:group class="" tagname="th"></xf:group>
 								<xf:group class="" tagname="th"></xf:group>
 							</xf:group>
-							<xf:group tagname="tr" style="height:8%;">
+							<xf:group tagname="tr" style="height:12%;">
 								<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 tagname="tr" style="height:8%;">
+							<xf:group tagname="tr" style="height:12%;">
 								<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="txtProgActRtMeasr" style="width:100%;height:100%;" ref="data:dcdataList1.progActRtMeasr"></xf:textarea>