Merge branch 'tolag3'

src/main/java/kcc/kccadr/adjreqmgr/service/AdjReqMgrVO.java

@@ -183,6 +183,12 @@ public class AdjReqMgrVO extends ComDefaultVO implements Serializable{
 
 	private String apprId;
 	
+	private String apprCn;	// 수수료 내용
+	
+	private String apprFrstRegisterId;	// 수수료 등록자
+	
+	private String apprLastUpdusrId;	// 수수료 수정자
+
 	private String mltApprSeq;
 
 	private String rejectCd;
@@ -1104,5 +1110,25 @@ public class AdjReqMgrVO extends ComDefaultVO implements Serializable{
 	public void setAccTy(String accTy) {
 		this.accTy = accTy;
 	}
+	public String getApprCn() {
+		return apprCn;
+	}
+	public void setApprCn(String apprCn) {
+		this.apprCn = apprCn;
+	}
+	public String getApprFrstRegisterId() {
+		return apprFrstRegisterId;
+	}
+	public void setApprFrstRegisterId(String apprFrstRegisterId) {
+		this.apprFrstRegisterId = apprFrstRegisterId;
+	}
+	public String getApprLastUpdusrId() {
+		return apprLastUpdusrId;
+	}
+	public void setApprLastUpdusrId(String apprLastUpdusrId) {
+		this.apprLastUpdusrId = apprLastUpdusrId;
+	}
+	
+	
 	
 }

src/main/java/kcc/kccadr/adjreqmgr/service/impl/AdjReqMgrDAO.java

@@ -143,5 +143,9 @@ public class AdjReqMgrDAO  extends EgovAbstractDAO {
 		return update("AdjReqMgrDAO.insertAdrMmsSend", egovMap);
 	}
 
+	// 수수료 내용 update
+    public void updateAdrMgrMasterDetailApprCn(AdjReqMgrVO adjReqMgrVO) throws Exception {
+    	update("adjReqMgrDAO.updateAdrMgrMasterDetailApprCn", adjReqMgrVO);
+    }
     
 }

src/main/java/kcc/kccadr/adjreqmgr/service/impl/AdjReqMgrServiceImpl.java

@@ -459,6 +459,9 @@ public class AdjReqMgrServiceImpl   extends EgovAbstractServiceImpl implements A
 				adjReqMgrDAO.insertAdjReqMgrRegPaymentSave(model);
 				sn++;
 			}
+			searchVO.setApprFrstRegisterId(searchVO.getFrstRegisterId());
+			searchVO.setApprLastUpdusrId(searchVO.getFrstRegisterId());
+			adjReqMgrDAO.updateAdrMgrMasterDetailApprCn(searchVO);
 		}
     	
     	return sn;

src/main/resources/egovframework/sqlmap/kccadr/adjReqMgr/AdjReqMgr_SQL_Mysql.xml

@@ -890,6 +890,17 @@
 		)
 	</update>
 	
+	<update id="adjReqMgrDAO.updateAdrMgrMasterDetailApprCn" parameterClass="AdjReqMgrVO">
+	
+		UPDATE adr_mgr_detail
+		SET    appr_cn                = #apprCn# ,
+		       appr_frst_regist_pnttm = now() ,
+		       appr_frst_register_id  = #apprFrstRegisterId# ,
+		       appr_last_updt_pnttm   = now() ,
+		       appr_last_updusr_id    = #apprLastUpdusrId#
+		WHERE  adr_seq                = #adrSeq#
+	
+	</update>
 	
 
 </sqlMap>

src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/popup/adjReqMgrRegPaymentPopup.jsp

@@ -201,6 +201,20 @@
 				</tr>
 				</tbody>
 			</table>
+			
+			<table class="pop_tbType02">
+				<colgroup>
+					<col style="width: 20%;">
+					<col style="width: auto;">
+				</colgroup>
+				<tbody>
+					<tr>
+						<th>내용</th>
+						<td><textarea name="apprCn" id="apprCn" cols="30" rows="5"></textarea></td>
+					</tr>
+				</tbody>
+			</table>
+			
 			<div class="btn_wrap btn_layout04">
 				<p>납부계좌구분
 					<input type="radio" name="payment[0].accTy" id="accTy1" value="10" />우리은행 1005-802-193838