diff --git a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml index 8365aa8d..436b1b60 100644 --- a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml @@ -533,6 +533,34 @@ /* 의뢰상태 검색*/ a.EDU_STATE_CD = #searchEduStateCd# + /*AND a.prcs_aplct_prd_ord_cmplt is null*/ + + AND ( + + CASE + WHEN a.prcs_aplct_prd_ord_cmplt IS NOT NULL THEN ( + SELECT + CODE + FROM + LETTCCMMNDETAILCODE + WHERE + USE_AT = 'Y' + AND CODE_ID = 'VEA002' + AND CODE = ( + SELECT + b.edu_state_cd + FROM + vea_sspn_idmt_trgt b + WHERE + b.sspn_idtmt_trgt_ord = a.prcs_aplct_prd_ord_cmplt + ) + ) + ELSE ( + a.edu_state_cd + ) + END + )=#searchEduStateCd# + /* 교육상태 검색*/ @@ -549,6 +577,33 @@ + + AND( + CASE + WHEN a.prcs_aplct_prd_ord_cmplt IS NOT NULL THEN ( + + SELECT + CODE + FROM + LETTCCMMNDETAILCODE + WHERE + USE_AT = 'Y' + AND CODE_ID = 'VEA002' + AND CODE = ( + SELECT + b.req_state_cd + FROM + vea_sspn_idmt_trgt b + WHERE + b.sspn_idtmt_trgt_ord = a.prcs_aplct_prd_ord_cmplt ) + + ) + WHEN a.EDU_STATE_CD = '20' + AND a.req_state_cd = '20' THEN a.req_state_cd + ELSE ( + a.req_state_cd ) + END )=#searchReqStateCd# + /* 교육상태 검색*/ diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VESttst_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VESttst_MIX_SQL_Tibero.xml index 33c5931d..69869765 100644 --- a/src/main/resources/egovframework/sqlmap/ve/instr/VESttst_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/instr/VESttst_MIX_SQL_Tibero.xml @@ -2136,16 +2136,27 @@ , sum(aa.cnt) AS cnt FROM ( SELECT NVL(a.CMPTNT_ATHRT,'미정') AS CMPTNT_ATHRT - , count(*) AS cnt - FROM vea_sspn_idmt_trgt a - WHERE to_char(a.REQ_PNTTM,'YYYY')=#mngNmbrYr# - /* 병합제거시 주석 제거 할것 - AND a.prcs_aplct_prd_ord_cmplt IS null - */ + , count(*) AS cnt + + FROM + vea_sspn_idmt_trgt a , + ve_edu_aplct b , + ve_prcs_aplct_prd c , + vea_aplct_detail_info d + WHERE + SUBSTRING(c.edu_strt_pnttm, 1, 4)=#mngNmbrYr# + AND b.aprvl_cd = '60' + AND b.prcs_ord = c.prcs_aplct_prd_ord + AND a.sspn_idtmt_trgt_ord = b.rnds_ord + + /* 병합제거시 주석 제거 할것 + AND a.prcs_aplct_prd_ord_cmplt IS null */ AND a.edu_state_cd = #searchEduStateCd# - + + AND b.EDU_APLCT_ORD = d.EDU_APLCT_ORD + AND d.aplct_state_cd = '20' GROUP BY a.CMPTNT_ATHRT )aa LEFT OUTER JOIN @@ -2249,15 +2260,25 @@ substring(req_nmbr,0,1) AS CMPTNT_ATHRT , count(*) AS cnt FROM - vea_sspn_idmt_trgt a - WHERE to_char(a.REQ_PNTTM,'YYYY')=#mngNmbrYr# - - /* 병합제거시 주석 제거 할것 - AND a.prcs_aplct_prd_ord_cmplt IS null */ - - - AND a.edu_state_cd = #searchEduStateCd# - + vea_sspn_idmt_trgt a , + ve_edu_aplct b , + ve_prcs_aplct_prd c , + vea_aplct_detail_info d + WHERE + SUBSTRING(c.edu_strt_pnttm, 1, 4)=#mngNmbrYr# + AND b.aprvl_cd = '60' + AND b.prcs_ord = c.prcs_aplct_prd_ord + AND a.sspn_idtmt_trgt_ord = b.rnds_ord + + /* 병합제거시 주석 제거 할것 + AND a.prcs_aplct_prd_ord_cmplt IS null */ + + + AND a.edu_state_cd = #searchEduStateCd# + + AND b.EDU_APLCT_ORD = d.EDU_APLCT_ORD + AND d.aplct_state_cd = '20' + GROUP BY substring(req_nmbr,0,1) )aa diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml index 741523f2..8d6da2ef 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml @@ -418,8 +418,11 @@ WHERE 1=1 AND a.prcs_ord=b.prcs_ord - + + AND b.prcs_div=#searchStatus# + + $selectPagingListQuery$ @@ -664,7 +667,10 @@ 1=1 AND a.prcs_ord=b.prcs_ord - + + AND b.prcs_div=#searchStatus# + + $selectPagingListQuery$ diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngMdfy.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngMdfy.jsp index 4929c72d..108b0a73 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngMdfy.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngMdfy.jsp @@ -326,7 +326,7 @@ -" /> +
@@ -371,6 +371,13 @@
+ 의뢰번호 + + " /> + + + + 사건번호