2024-02-20 16:24 성인 신청기관 강사료 수정 처리

src/main/java/kcc/let/utl/fcc/service/VisitEduTransUtil.java

@@ -70,7 +70,12 @@ public class VisitEduTransUtil {
 				System.out.println(t.getDivCd());
 				System.out.println(t.getLrnTm());
 				
-				if (i_feeSum4Dp<=0)	i_feeSum4Dp	=	VisitEduTransUtil._calcInstrFee(t.getDivCd(), t.getLrnTm());	
+				if (i_feeSum4Dp<=0)	{
+					//지급기관이 신청기관이면 비용이 0로 처리한다.
+					if (!"02".equals(t.getFeeInsttCd())) {
+						i_feeSum4Dp	=	VisitEduTransUtil._calcInstrFee(t.getDivCd(), t.getLrnTm());	
+					}
+				}
 				
 				t.setFeeSum4Dp(Integer.toString(i_feeSum4Dp));						
 			} catch (Exception e) {	e.printStackTrace();											}

src/main/java/kcc/ve/cmm/VeInstrFeeMng.java

@@ -274,14 +274,15 @@ public class VeInstrFeeMng {
 				i_lrnTm	=	i_lrnTm	-	60;	//기본 시간제외
 			}
 			*/
-			
+					
-			
+			if (!"02".equals(vEInstrFeeAcmdtVO.getFeeInsttCd())) {
-			System.out.println(" @@@@@@@@@@@@@@@@@@@@@@  instrFee :   "+instrFee);
+				System.out.println(" @@@@@@@@@@@@@@@@@@@@@@  instrFee :   "+instrFee);
-			vEInstrFeeAcmdtVO.setInstrFee(Integer.toString(instrFee));
+				vEInstrFeeAcmdtVO.setInstrFee(Integer.toString(instrFee));				
-			
+			}
 		}
 		
 		
+		
 		// 강사료 합계
 		int instrFeeSum = Integer.parseInt(vEInstrFeeAcmdtVO.getInstrFee())
 				+ Integer.parseInt(vEInstrFeeAcmdtVO.getSpecialWorkAllow())

src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrAsgnmVO.java

@@ -123,6 +123,8 @@ public class VEInstrAsgnmVO extends ComDefaultVO implements Serializable {
 	private String	insttNm;		//기관명
 	private String	hopeSbjct;		//희망주제
 	
+	private String	feeInsttCd;		//강사료계산용	
+	
 	private String	checkTop;		//거주 시도 일치여부
 	private String	checkTopSum;	//순위 계산을 위한 총합계
 	
@@ -844,5 +846,11 @@ public class VEInstrAsgnmVO extends ComDefaultVO implements Serializable {
 	public void setToEduChasiOrd(String toEduChasiOrd) {
 		this.toEduChasiOrd = toEduChasiOrd;
 	}
+	public String getFeeInsttCd() {
+		return feeInsttCd;
+	}
+	public void setFeeInsttCd(String feeInsttCd) {
+		this.feeInsttCd = feeInsttCd;
+	}
 	
 }

src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/TrgtExcelReader.java

@@ -54,6 +54,13 @@ public class TrgtExcelReader {
 						System.out.println(row.getCell(2));
 						
 						String vntInfo[] = getCellValue(row.getCell(2)).split("형제");
+						
+						System.out.println("row.getCell(2)=="+i);
+						System.out.println(vntInfo.length);
+						System.out.println(vntInfo[0]);
+						System.out.println(vntInfo[1]);
+						
+						
 						cndtnTrgtMngVO.setVntYear( vntInfo[0] ); // 사건번호 년
 						cndtnTrgtMngVO.setVntNmbr( vntInfo[1] ); // 사건번호 번호
 						cndtnTrgtMngVO.setCmptntAthrt( getCellValue(row.getCell(3)));

src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml

@@ -291,6 +291,7 @@
 			hstryCd ,
 			hstryUserId,
 			insttNm,
+			feeInsttCd ,
 			instrFeeSbmtYn ,
 			instrFee ,
 			specialWorkAllow ,
@@ -314,6 +315,7 @@
 					c.edu_slct_area_cd  AS eduSlctAreaCd ,
 					c.schol_instt_nm    AS scholInsttNm ,
 					c.instt_nm			AS insttNm,
+					c.FEE_INSTT_CD AS	feeInsttCd,
 					'' AS hstryCd,
 					'' AS hstryUserId,
 					d.sbmt_yn			AS instrFeeSbmtYn ,
@@ -391,6 +393,7 @@
 					c.edu_slct_area_cd  AS eduSlctAreaCd ,
 					c.schol_instt_nm    AS scholInsttNm ,
 					c.instt_nm			AS insttNm,
+					c.FEE_INSTT_CD AS	feeInsttCd,
 					d.hstry_cd          AS hstryCd ,
 					d.user_id			AS hstryUserId,
 					e.sbmt_yn			AS instrFeeSbmtYn ,

src/main/resources/egovframework/sqlmap/ve/asgnm/VEInstrFee_SQL_Tibero.xml

@@ -130,6 +130,7 @@
 		SELECT 
 			A.EDU_APLCT_ORD											AS eduAplctOrd
 			, A.EDU_CHASI_ORD										AS eduChasiOrd
+			, E.FEE_INSTT_CD										AS feeInsttCd
 			, B.INSTR_FEE_ORD										AS instrFeeOrd
 			, A.USER_ID											AS userId
 			,(SELECT AA.ADDR FROM VE_INSTR_DETAIL AA WHERE 1=1 AND AA.USER_ID =  A.USER_ID	AND aa.instr_div=e.lctr_div_cd	AND aa.use_yn='Y'	LIMIT 1) AS instrRsdnc

src/main/webapp/WEB-INF/jsp/cmm/sym/ccm/EgovCcmCmmnCodeTree.jsp

@@ -579,7 +579,7 @@ function fn_save_menuInfo(menuNo) {
 								<tr>
 									<th><span>코드</span></th>
 									<td>
-										<input type="text" name="menuNo" id="menuNo" maxlength="6"/>
+										<input type="text" name="menuNo" id="menuNo" maxlength="20"/>
 										<input type="hidden" id="tmp_Id" name="tmp_Id"/><!-- 이전코드 No --> 
 									</td>
 								</tr>

src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/newEduPrfrmMngList.jsp

@@ -155,7 +155,7 @@
 					<ul class="cont_nav">
 						<li class="home"><a href="/"><i></i></a></li>
 						<li>
-							<p>청소년 찾아가는 저작권 교육</p>
+							<p>성인 찾아가는 저작권 교육</p>
 						</li>
 						<li><span class="cur_nav">교육실적통계</span></li>
 					</ul>