Browse Source

공사시점차금액조정, 리스크점검사유등록 쿼리 수정

SBK 1 year ago
parent
commit
9435b7bbcf

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

@@ -32,7 +32,7 @@
 		     , EMP_PM_NM
 		     , EMP_PM_NM
 		     , EMP_PE_NM
 		     , EMP_PE_NM
 		     , EMP_PS_NM
 		     , EMP_PS_NM
-		     , MDFT_PR
+		     , ZEHR_EMP_NAME_FNC(#{cmpnCd},MDFT_PR) MDFT_PR
      		 , MDFT_DT
      		 , MDFT_DT
 		  FROM 	(
 		  FROM 	(
 					SELECT A.CMPN_CD
 					SELECT A.CMPN_CD

+ 6 - 7
src/main/resources/sqlmap/mappers/co/co0106/CO01060001UMapper.xml

@@ -22,7 +22,7 @@
 			 , A.ORCO_ACT_AMT_NODIFF + DIFF_ORCO_ACT_AMT ORCO_ACT_AMT_NODIFF_SUM -- A+B.최종금액-하자포함
 			 , A.ORCO_ACT_AMT_NODIFF + DIFF_ORCO_ACT_AMT ORCO_ACT_AMT_NODIFF_SUM -- A+B.최종금액-하자포함
 			 , A.ORCO_NAS_ACT_AMT_NODIFF + DIFF_ORCO_NAS_ACT_AMT ORCO_NAS_ACT_AMT_NODIFF_SUM -- A+B.최종금액-하자제외
 			 , A.ORCO_NAS_ACT_AMT_NODIFF + DIFF_ORCO_NAS_ACT_AMT ORCO_NAS_ACT_AMT_NODIFF_SUM -- A+B.최종금액-하자제외
 			 , C.DIFF_RSN -- 차이 발생 사유
 			 , C.DIFF_RSN -- 차이 발생 사유
-			 , C.MDFT_PR -- 최종 수정자
+		     , ZEHR_EMP_NAME_FNC(#{cmpnCd},C.MDFT_PR) MDFT_PR -- 최종 수정자
 			 , TO_CHAR(TO_TIMESTAMP(C.MDFT_DT,'YYYY-MM-DD-HH24:MI:SS'),'YYYY-MM-DD-HH24:MI:SS') MDFT_DT -- 최종 수정일자
 			 , TO_CHAR(TO_TIMESTAMP(C.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
 		  LEFT JOIN CON_PJT_RESN B ON B.CMPN_CD = A.CMPN_CD AND B.STD_YM = A.STD_YM AND B.CC_CD = A.CC_CD
 		  LEFT JOIN CON_PJT_RESN B ON B.CMPN_CD = A.CMPN_CD AND B.STD_YM = A.STD_YM AND B.CC_CD = A.CC_CD
@@ -41,18 +41,17 @@
 		   <![CDATA[
 		   <![CDATA[
 		   AND 
 		   AND 
 		   	(
 		   	(
-		   		C.DIFF_ORCO_CONT_AMT != 0 
-		  	 OR C.DIFF_ORCO_ACT_AMT != 0
-		  	 OR C.DIFF_ORCO_NAS_ACT_AMT != 0
-		  	 OR C.DIFF_RSN IS NOT NULL
+		   	   C.DIFF_ORCO_CONT_AMT != 0 
+		  	OR C.DIFF_ORCO_ACT_AMT != 0
+		  	OR C.DIFF_ORCO_NAS_ACT_AMT != 0
 		   )]]>
 		   )]]>
 		</if>
 		</if>
 		<if test="gubun == 'ISNDIFFAMT'">
 		<if test="gubun == 'ISNDIFFAMT'">
 		   <![CDATA[	  
 		   <![CDATA[	  
 		   AND C.DIFF_ORCO_CONT_AMT = 0 
 		   AND C.DIFF_ORCO_CONT_AMT = 0 
 	  	   AND C.DIFF_ORCO_ACT_AMT = 0 
 	  	   AND C.DIFF_ORCO_ACT_AMT = 0 
-	  	   AND C.DIFF_ORCO_NAS_ACT_AMT = 0 
-	  	   AND C.DIFF_RSN IS NULL]]>
+	  	   AND C.DIFF_ORCO_NAS_ACT_AMT = 0
+	  	   ]]>
 		</if>
 		</if>
 		 ORDER BY A.CCGRP_CD, A.CC_CD
 		 ORDER BY A.CCGRP_CD, A.CC_CD
 	</select>
 	</select>