Browse Source

소수2째자리 및 쿼리 수정

DESKTOP-P60829B\User 1 year ago
parent
commit
6f962dfb05

+ 2 - 2
src/main/resources/sqlmap/mappers/co/co0105/CO01050001UMapper.xml

@@ -205,10 +205,10 @@
 		   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')		   
 		<if test="gubun == '02'">
 		<if test="gubun == '02'">
-		   AND C.CD_SITE IS NOT NULL 
+		   AND ( NVL(C.RT_PROG_PLAN_O,0) > 0 OR NVL(C.RT_PROG_ACT_O,0) > 0 )
 		</if>
 		</if>
 		<if test="gubun == '03'">
 		<if test="gubun == '03'">
-		   AND C.CD_SITE IS NULL
+		   AND ( NVL(C.RT_PROG_PLAN_O,0) = 0 AND NVL(C.RT_PROG_ACT_O,0) = 0 )
 		</if>
 		</if>
 		 ORDER BY A.CMPN_CD, A.STD_YM, A.CCGRP_CD, A.CC_CD 
 		 ORDER BY A.CMPN_CD, A.STD_YM, A.CCGRP_CD, A.CC_CD 
 	</select>
 	</select>

+ 2 - 2
src/main/webapp/ux/co/co0105/CO01050001P.xml

@@ -324,10 +324,10 @@
 									textAlign="left">
 									textAlign="left">
 								</w2:column>
 								</w2:column>
 								<w2:column removeBorderStyle="false" width="70" inputType="text" id="rtProgPlanO" blockSelect="false" displayMode="label"
 								<w2:column removeBorderStyle="false" width="70" inputType="text" id="rtProgPlanO" blockSelect="false" displayMode="label"
-									dataType="number" textAlign="right" displayFormat="###%">
+									dataType="number" textAlign="right" displayFormat="###.##%">
 								</w2:column>
 								</w2:column>
 								<w2:column removeBorderStyle="false" width="70" inputType="text" id="rtProgActO" blockSelect="false" displayMode="label"
 								<w2:column removeBorderStyle="false" width="70" inputType="text" id="rtProgActO" blockSelect="false" displayMode="label"
-									dataType="number" textAlign="right" displayFormat="###%">
+									dataType="number" textAlign="right" displayFormat="###.##%">
 								</w2:column>
 								</w2:column>
 							</w2:row>
 							</w2:row>
 						</w2:gBody>
 						</w2:gBody>