Merge branch 'advc' of http://subsub8729@vcs.iten.co.kr:9999/hylee/offedu into advc

src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java

@@ -764,6 +764,14 @@ public class FndtnEnhanceTrnController {
 			vEPrcsDetailVO.setsTodate(vEPrcsDetailVO.getsTodate().split("T")[0].replaceAll("-", ""));
 			List<VEPrcsDetailVO> vEPrcsDetailVOList = vEPrcsAplctPrdService.selectSchduleManagerList(vEPrcsDetailVO);
 			
+			for (int i=0;i<vEPrcsDetailVOList.size();i++) {
+				
+				if ("-1".equals(vEPrcsDetailVOList.get(i).getSndFlag())) {
+					vEPrcsDetailVOList.get(i).setColor("#828282");	
+				}
+				
+			}
+			
 //	    	modelAndView.addObject("data", vEPrcsDetailVOList);
 //			modelAndView.addObject("result", "success");
 			

src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java

@@ -216,6 +216,11 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable {
 	
 	private String oprtnAtchFileId;	//체험교실 운영지침 안내 파일 ID
 	
+    /**
+     * 라인 배경컬러
+     */
+    private String color;
+	
 	public String getEduPrcsOrd() {
 		return eduPrcsOrd;
 	}
@@ -1050,6 +1055,12 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable {
 	public void setOprtnAtchFileId(String oprtnAtchFileId) {
 		this.oprtnAtchFileId = oprtnAtchFileId;
 	}
+	public String getColor() {
+		return color;
+	}
+	public void setColor(String color) {
+		this.color = color;
+	}
 	
 	
 }

src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml

@@ -1531,6 +1531,7 @@
 			, TO_CHAR(TO_DATE(a.EDU_DDLN_PNTTM, 'YYYY.MM.DD'), 'YYYY-MM-DD') AS "end"	/*종료*/ 
 			, b.PRCS_NM AS title
 			, b.PRCS_CN AS prcsCn 
+			, sign(TO_DATE(a.EDU_STRT_PNTTM,'YYYY.MM.DD') - TO_DATE(sysdate,'YYYY.MM.DD')) AS  sndFlag
 		FROM 
 			ve_prcs_aplct_prd a
 		LEFT JOIN VE_PRCS b