Browse Source

공사시정차 금액조정 액셀 준공 코드 수정

SBK 1 year ago
parent
commit
82166ee6dc

+ 1 - 1
src/main/java/sgc/portal/co/co0106/model/CO01060001U.java

@@ -14,7 +14,7 @@ public class CO01060001U extends Domain {
 	private String ccgrpNm;     /*프로젝트 그룹명*/
 	private String ccgrpNm;     /*프로젝트 그룹명*/
 	private String ccCd;     /*프로젝트 코드*/
 	private String ccCd;     /*프로젝트 코드*/
 	private String ccNm;     /*프로젝트 명*/
 	private String ccNm;     /*프로젝트 명*/
-	private String complCd;     /*준공 코드*/
+	private String complNm;     /*준공 코드*/
 	private String prjtDt;     /*공사 기간*/
 	private String prjtDt;     /*공사 기간*/
 	private String orcoContAmtNodiff;     /*A. 원금액*/
 	private String orcoContAmtNodiff;     /*A. 원금액*/
 	private String diffOrcoContAmt;     /*B. 차이금액*/
 	private String diffOrcoContAmt;     /*B. 차이금액*/

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

@@ -11,7 +11,7 @@
 		  	 , A.CC_CD -- PJT 공사코드
 		  	 , A.CC_CD -- PJT 공사코드
 		  	 , A.CC_NM -- PJT 명'
 		  	 , A.CC_NM -- PJT 명'
 		  	 , TO_CHAR(TO_DATE(A.PRJT_START_DT,'YYYY/MM/DD'),'YYYY/MM/DD') || '~' || TO_CHAR(TO_DATE(A.PRJT_END_DT,'YYYY/MM/DD'),'YYYY/MM/DD') AS PRJT_DT  -- 공사 기간
 		  	 , TO_CHAR(TO_DATE(A.PRJT_START_DT,'YYYY/MM/DD'),'YYYY/MM/DD') || '~' || TO_CHAR(TO_DATE(A.PRJT_END_DT,'YYYY/MM/DD'),'YYYY/MM/DD') AS PRJT_DT  -- 공사 기간
-			 , B.COMPL_CD --준공여부코드
+			 , B.COMPL_NM --준공여부코드
 			 , A.ORCO_CONT_AMT_NODIFF -- A. 원금액 (당사 도급 공급가 차이금액 미포함)
 			 , A.ORCO_CONT_AMT_NODIFF -- A. 원금액 (당사 도급 공급가 차이금액 미포함)
 			 , NVL(C.DIFF_ORCO_CONT_AMT,0) AS DIFF_ORCO_CONT_AMT -- B. 차이금액 (당사 도급 차이 금액)
 			 , NVL(C.DIFF_ORCO_CONT_AMT,0) AS DIFF_ORCO_CONT_AMT -- B. 차이금액 (당사 도급 차이 금액)
 			 , A.ORCO_CONT_AMT_NODIFF + DIFF_ORCO_CONT_AMT ORCO_CONT_AMT_NODIFF_SUM -- A+B. 최종금액
 			 , A.ORCO_CONT_AMT_NODIFF + DIFF_ORCO_CONT_AMT ORCO_CONT_AMT_NODIFF_SUM -- A+B. 최종금액
@@ -71,14 +71,14 @@
 
 
     <update id="update2" parameterType="map">
     <update id="update2" parameterType="map">
 		UPDATE CON_PJT_RESN
 		UPDATE CON_PJT_RESN
-		   SET COMPL_CD = #{complCd}
-			<if test="complCd == '01'">
-			 , COMPL_NM = '진행'
-			</if>		     
-			<if test="complCd == '02'">
-			 , COMPL_NM = '완료'
+		   SET COMPL_NM = #{complNm}
+			<if test="complNm == '진행'">
+			 , COMPL_CD = '01'
 			</if>
 			</if>
-			 , COMPL_CHG_YN = (SELECT DECODE(A.COMPL_CD, #{complCd},'N','Y') FROM CON_PJT_MST A WHERE A.CMPN_CD = #{cmpnCd} AND A.STD_YM = #{stdYm} AND A.CC_CD = #{ccCd} )
+			<if test="complNm == '완료'">
+			 , COMPL_CD = '02'
+			</if>
+			 , COMPL_CHG_YN = (SELECT DECODE(A.COMPL_NM, #{complNm},'N','Y') FROM CON_PJT_MST A WHERE A.CMPN_CD = #{cmpnCd} AND A.STD_YM = #{stdYm} AND A.CC_CD = #{ccCd} )
 			 , MDFT_DT = SYSDATE
 			 , MDFT_DT = SYSDATE
 		     , MDFT_PR = #{mdftPr}
 		     , MDFT_PR = #{mdftPr}
 		 WHERE CMPN_CD = #{cmpnCd}
 		 WHERE CMPN_CD = #{cmpnCd}

+ 4 - 4
src/main/webapp/ux/co/co0106/CO01060001U.xml

@@ -34,7 +34,7 @@
 						<w2:column id="ccgrpNm" name="본부" dataType="text"></w2:column>
 						<w2:column id="ccgrpNm" name="본부" dataType="text"></w2:column>
 						<w2:column id="ccCd" name="PJT 코드" dataType="text"></w2:column>
 						<w2:column id="ccCd" name="PJT 코드" dataType="text"></w2:column>
 						<w2:column id="ccNm" name="PJT 명" dataType="text"></w2:column>
 						<w2:column id="ccNm" name="PJT 명" dataType="text"></w2:column>
-						<w2:column id="complCd" name="준공여부코드" dataType="text"></w2:column>
+						<w2:column id="complNm" name="준공여부코드" dataType="text"></w2:column>
 						<w2:column id="prjtDt" name="공사기간" dataType="text"></w2:column>
 						<w2:column id="prjtDt" name="공사기간" dataType="text"></w2:column>
 						<w2:column id="orcoContAmtNodiff" name="A. 원금액" dataType="number"></w2:column>
 						<w2:column id="orcoContAmtNodiff" name="A. 원금액" dataType="number"></w2:column>
 						<w2:column id="diffOrcoContAmt" name="B. 차이금액" dataType="number"></w2:column>
 						<w2:column id="diffOrcoContAmt" name="B. 차이금액" dataType="number"></w2:column>
@@ -577,15 +577,15 @@
 									<w2:column width="70" id="ccCd"></w2:column>
 									<w2:column width="70" id="ccCd"></w2:column>
 									<w2:column textAlign="left" width="70" id="ccNm"></w2:column>
 									<w2:column textAlign="left" width="70" id="ccNm"></w2:column>
 									<w2:column width="70" id="prjtDt"></w2:column>
 									<w2:column width="70" id="prjtDt"></w2:column>
-									<w2:column width="70" id="complCd" readOnly="false" inputType="select" allOption="" chooseOption="" ref="">
+									<w2:column width="70" id="complNm" readOnly="false" inputType="select" allOption="" chooseOption="" ref="">
 										<w2:choices>
 										<w2:choices>
 											<w2:item>
 											<w2:item>
 												<w2:label><![CDATA[진행]]></w2:label>
 												<w2:label><![CDATA[진행]]></w2:label>
-												<w2:value><![CDATA[01]]></w2:value>
+												<w2:value><![CDATA[진행]]></w2:value>
 											</w2:item>
 											</w2:item>
 											<w2:item>
 											<w2:item>
 												<w2:label><![CDATA[완료]]></w2:label>
 												<w2:label><![CDATA[완료]]></w2:label>
-												<w2:value><![CDATA[02]]></w2:value>
+												<w2:value><![CDATA[완료]]></w2:value>
 											</w2:item>
 											</w2:item>
 										</w2:choices>
 										</w2:choices>
 									</w2:column>
 									</w2:column>