tolag3/fairnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet

Browse Source
This commit is contained in:
myname 2025-01-02 17:32:46 +09:00
commit ded8a801d8
14 changed files with 152 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/kcc/com/uss/ion/hld/web/HolidayController.java
View File

@ -138,6 +138,11 @@ public class HolidayController {
LocalDate startDate = LocalDate.parse(std, formatter);
LocalDate endDate = LocalDate.parse(etd, formatter);
//시작일에 하루 더해서 set 해주기 - 시작일이 공휴일 또는 주말인 경우 대비ㄱ
startDate = startDate.plusDays(1);
std = startDate.format(formatter);
holidayVO.setSdt(std);
//공휴일 수
int hldCnt = holidayService.selectHolidayCnt(holidayVO);
@ -149,7 +154,7 @@ public class HolidayController {
workCnt++;
}
}
workCnt = workCnt - hldCnt -1;
workCnt = workCnt - hldCnt;
return new ResponseEntity<Integer>(workCnt, HttpStatus.OK);
}
}

2
src/main/java/kcc/let/cop/bbs/web/EgovBBSAttributeManageController.java
View File

@ -128,7 +128,7 @@ public class EgovBBSAttributeManageController {
if (authority.equals("ROLE_ADMIN") || authority.equals("ROLE_ADR_ADMIN")) bbsAttrMngAuth = true;
}
if (!bbsAttrMngAuth) boardMasterVO.setBbsMngId(user.getId());
/*if (!bbsAttrMngAuth) boardMasterVO.setBbsMngId(user.getId());*/
if(boardMasterVO.getPageUnit() != 10) {
boardMasterVO.setPageUnit(boardMasterVO.getPageUnit());

9
src/main/java/seed/com/user/mypage/WebMyPageController.java
View File

@ -1084,7 +1084,14 @@ private Logger log = Logger.getLogger(this.getClass());
paramMap.put("pageStart", cri.getPageStart());
paramMap.put("perPageNum", cri.getPerPageNum());
paramMap.put("civilType", "law");
paramMap.put("hpDi", session.getAttribute("hpDi"));
paramMap.put("certDi", session.getAttribute("certDi"));
try {
CertVO certVO = certService.selectCert(FairnetUtils.getCertSession(req));
paramMap.put("certId", certVO.getCertId());
}catch(Exception ex) {
ex.printStackTrace();
}
List<Map<String,Object>> data = service2.counselList(paramMap);

2
src/main/resources/egovframework/egovProps/globals_svr.properties
View File

@ -225,7 +225,7 @@ gw.url=https://gwd.unicologx.com
#\ubcf8\uc778\uc778\uc99d \uc11c\ubc84\uc8fc\uc18c
cert.retUrl=23https://fairnet.kofair.or.kr
cert.hpRetUrl=23https://fairnet.kofair.or.kr
cert.hpRetUrl=32https://fairnet.kofair.or.kr
cert.hpSrvNo=012006
#\ub300\uc6a9\ub7c9 innorix license

2
src/main/resources/egovframework/sqlmap/com/uss/ion/hld/Holiday_SQL_Oracle.xml
View File

@ -59,6 +59,6 @@
C_RESTDEINFO A
WHERE
A.DEL_YN = 'N'
AND A.LOCDATE BETWEEN #sdt# AND #edt#
AND TO_DATE(A.LOCDATE, 'YYYYMMDD') BETWEEN TO_DATE(#sdt#, 'YYYYMMDD') AND TO_DATE(#edt#, 'YYYYMMDD')
</select>
</sqlMap>

20
src/main/resources/egovframework/sqlmap/config/mappers/counsel/counsel_sql.xml
View File

@ -129,8 +129,14 @@
FROM C_ONLINE_COUNSEL COC
WHERE CIVIL_TYPE = #{civilType}
AND DEL_YN = 'N'
<if test="hpDi != null and hpDi != ''">
AND APPLCNT_DI = #{hpDi}
<if test="certId != null and certId != '' and certDi != null and certDi != ''">
AND (APPLCNT_DI = #{certId} OR APPLCNT_DI = #{certDi})
</if>
<if test="certId != null and certId != '' and (certDi == null or certDi == '')">
AND APPLCNT_DI = #{certId}
</if>
<if test="certDi != null and certDi != '' and (certId == null or certId == '')">
AND APPLCNT_DI = #{certDi}
</if>
<if test="searchDate1 != null and searchDate1 != ''">
AND TO_CHAR(COUNSEL_REGDATE,'YYYYMMDD') >= TO_CHAR(TO_DATE(replace(#{searchDate1},'-',''),'YYYYMMDD'), 'YYYYMMDD')
@ -183,8 +189,14 @@
FROM C_ONLINE_COUNSEL
WHERE CIVIL_TYPE = #{civilType}
AND DEL_YN = 'N'
<if test="hpDi != null and hpDi != ''">
AND APPLCNT_DI = #{hpDi}
<if test="certId != null and certId != '' and certDi != null and certDi != ''">
AND (APPLCNT_DI = #{certId} OR APPLCNT_DI = #{certDi})
</if>
<if test="certId != null and certId != '' and (certDi == null or certDi == '')">
AND APPLCNT_DI = #{certId}
</if>
<if test="certDi != null and certDi != '' and (certId == null or certId == '')">
AND APPLCNT_DI = #{certDi}
</if>
<if test="searchDate1 != null and searchDate1 != ''">
AND TO_CHAR(COUNSEL_REGDATE,'YYYYMMDD') >= TO_CHAR(TO_DATE(replace(#{searchDate1},'-',''),'YYYYMMDD'), 'YYYYMMDD')

9
src/main/webapp/WEB-INF/jsp/_extra/web/user/board/newsDetail.jsp
View File

@ -11,6 +11,15 @@
$("#moveFrm").submit();
}
}
$(function(){
// 첨부파일 없을 경우 첨부파일 영역 삭제
if($(".view_file_list li").length == 0){
$(".view_file_list").hide();
}
})
</script>
<div class="sub_content">

38
src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myLawCounsel.jsp
View File

@ -104,7 +104,7 @@
$("#counselSeq").remove();
$("#fileFuncType").remove();
$("#page").val(param);
$("#frm").attr("action","/web/user/mypage/case/03/242/myLawCounsel.do");
$("#frm").attr("action","/web/user/mypage/case/03/242/myLawCounselList.do");
$("#frm").submit();
}
}
@ -181,7 +181,7 @@
<!-- table -->
<div class="table_top">
<p class="list_total_number">전체 <span class="color_blue">3,581</span>건(<span class="color_blue">10</span>/400 페이지)</p>
<p class="list_total_number">전체 <span class="color_blue"><c:out value='${pageMaker.totalCount}'/></span>건(<span class="color_blue">${pageMaker.cri.page}</span>/${pageMaker.endPage} 페이지)</p>
</div>
<div class="table_type_cols">
@ -247,6 +247,40 @@
</div>
<!-- //table -->
<ul class="page">
<li class="page_first_li"><a href="javascript:goPage('paging', '1')" class="btn only_icon btn_40 btn_page_first" title="첫 페이지 이동"><i class="icon page_first"></i></a></li>
<c:choose>
<c:when test="${pageMaker.prev}">
<li class="page_prev_li"><a href="javascript:goPage('paging', '${pageMaker.cri.page - 1}')" class="btn only_icon btn_40 btn_page_prev" title="이전 페이지 이동"><i class="icon page_prev"></i></a></li>
</c:when>
<c:otherwise>
<li class="page_prev_li"><a href="javascript:goPage('paging', '${pageMaker.cri.page}')" class="btn only_icon btn_40 btn_page_prev" title="이전 페이지 이동"><i class="icon page_prev"></i></a></li>
</c:otherwise>
</c:choose>
<c:forEach begin="${pageMaker.startPage}" end="${pageMaker.endPage }" var="idx">
<c:choose>
<c:when test="${idx == pageMaker.cri.page }">
<li><a href="javascript:goPage('paging', '${idx}')" class="btn btn_40 active" title="${idx} 페이지 이동">${idx}</a></li>
</c:when>
<c:otherwise>
<li><a href="javascript:goPage('paging', '${idx}')" class="btn btn_40" title="${idx} 페이지 이동">${idx}</a></li>
</c:otherwise>
</c:choose>
</c:forEach>
<c:choose>
<c:when test="${pageMaker.next}">
<li class="page_next_li"><a href="javascript:goPage('paging', '${pageMaker.cri.page + 1}')" class="btn only_icon btn_40 btn_page_next" title="다음 페이지 이동"><i class="icon page_next"></i></a></li>
</c:when>
<c:otherwise>
<li class="page_next_li"><a href="javascript:goPage('paging', '${pageMaker.cri.page}')" class="btn only_icon btn_40 btn_page_next" title="다음 페이지 이동"><i class="icon page_next"></i></a></li>
</c:otherwise>
</c:choose>
<li class="page_last_li"><a href="javascript:goPage('paging', '${pageMaker.endPage}')" class="btn only_icon btn_40 btn_page_last" title="마지막 페이지 이동"><i class="icon page_last"></i></a></li>
</ul>
<form id="frm" name="frm" action="" method="get">
<input type="hidden" name="counselSeq" id="counselSeq" value="">
<input type="hidden" name="page" id="page" value="${pageMaker.cri.page}">

51
src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myMediationList.jsp
View File

@ -39,6 +39,20 @@
function mediationPop(){
window.open('/web/user/mypage/case/01/169/mediationPop.do', 'mediationPop', 'width=710, height=350')
}
function goPage(type, param){
if(type == 'view'){
$("#counselSeq").val(param);
$("#frm").attr("action","/web/user/mypage/case/01/169/myLawCounselDetail.do");
$("#frm").submit();
}else if(type == 'paging'){
$("#counselSeq").remove();
$("#fileFuncType").remove();
$("#page").val(param);
$("#frm").attr("action","/web/user/mypage/case/01/169/myMediationList.do");
$("#frm").submit();
}
}
</script>
<div class="sub_content apl_status_content">
@ -58,14 +72,14 @@
<li><button type="button" onclick="pblEvt.tab(this,'active','ul',$('.tab'),'0')" class="tab active">신청현황</button></li>
<li><button type="button" onclick="pblEvt.tab(this,'active','ul',$('.tab'),'1')" class="tab">임시보관</button></li>
-->
<li><button type="button" onclick="javascript:goList('app');" class="tab active">신청현황</button></li>
<li><button type="button" onclick="javascript:myMediationDetail.doList('app');" class="tab active">신청현황</button></li>
<li><button type="button" onclick="javascript:goList('temp');" class="tab">임시보관</button></li>
</ul>
<div class="tab_contents active">
<div class="table_top">
<p class="list_total_number">전체 <span class="color_blue"><c:out value='${pageMaker.totalCount}'/></span>건 (<span class="color_blue">1</span>/1페이지)</p>
<p class="list_total_number">전체 <span class="color_blue"><c:out value='${pageMaker.totalCount}'/></span>건(<span class="color_blue">${pageMaker.cri.page}</span>/${pageMaker.endPage} 페이지)</p>
<button type="button" class="btn btn_text btn_35 orange_border" onclick="mediationPop();">사건조회</button>
</div>
@ -129,6 +143,39 @@
</table>
</div>
<p class="cf_text">※ 사건접수 완료 후 진행상황은 홈페이지 메뉴 분쟁조정 사건조회에서 조회가 가능합니다.</p>
<ul class="page">
<li class="page_first_li"><a href="javascript:goPage('paging', '1')" class="btn only_icon btn_40 btn_page_first" title="첫 페이지 이동"><i class="icon page_first"></i></a></li>
<c:choose>
<c:when test="${pageMaker.prev}">
<li class="page_prev_li"><a href="javascript:goPage('paging', '${pageMaker.cri.page - 1}')" class="btn only_icon btn_40 btn_page_prev" title="이전 페이지 이동"><i class="icon page_prev"></i></a></li>
</c:when>
<c:otherwise>
<li class="page_prev_li"><a href="javascript:goPage('paging', '${pageMaker.cri.page}')" class="btn only_icon btn_40 btn_page_prev" title="이전 페이지 이동"><i class="icon page_prev"></i></a></li>
</c:otherwise>
</c:choose>
<c:forEach begin="${pageMaker.startPage}" end="${pageMaker.endPage }" var="idx">
<c:choose>
<c:when test="${idx == pageMaker.cri.page }">
<li><a href="javascript:goPage('paging', '${idx}')" class="btn btn_40 active" title="${idx} 페이지 이동">${idx}</a></li>
</c:when>
<c:otherwise>
<li><a href="javascript:goPage('paging', '${idx}')" class="btn btn_40" title="${idx} 페이지 이동">${idx}</a></li>
</c:otherwise>
</c:choose>
</c:forEach>
<c:choose>
<c:when test="${pageMaker.next}">
<li class="page_next_li"><a href="javascript:goPage('paging', '${pageMaker.cri.page + 1}')" class="btn only_icon btn_40 btn_page_next" title="다음 페이지 이동"><i class="icon page_next"></i></a></li>
</c:when>
<c:otherwise>
<li class="page_next_li"><a href="javascript:goPage('paging', '${pageMaker.cri.page}')" class="btn only_icon btn_40 btn_page_next" title="다음 페이지 이동"><i class="icon page_next"></i></a></li>
</c:otherwise>
</c:choose>
<li class="page_last_li"><a href="javascript:goPage('paging', '${pageMaker.endPage}')" class="btn only_icon btn_40 btn_page_last" title="마지막 페이지 이동"><i class="icon page_last"></i></a></li>
</ul>
</div>

4
src/main/webapp/WEB-INF/jsp/_extra/web/user/onlineCounsel/counselStep01.jsp
View File

@ -84,8 +84,8 @@
<div>
<dt class="title blue_border">ICT분쟁조정지원센터</dt>
<dd class="sub_title">전자상거래, 온라인광고분쟁, 정보보호 관련 분쟁조정</dd>
<dd class="organ_tel"><a href="tel:142-246" title="ICT분쟁조정지원센터 전화">142-246</a></dd>
<dd class="organ_site"><a href="https://www.tdrc.kr" target="_blank">www.tdrc.kr</a></dd>
<dd class="organ_tel"><a href="tel:118" title="ICT분쟁조정지원센터 전화">118</a></dd>
<dd class="organ_site"><a href="https://www.ecmc.or.kr/" target="_blank">www.ecmc.or.kr</a></dd>
</div>
</dl>
</div>

22
src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp
View File

@ -293,7 +293,7 @@ $(document).ready(function(){
}); */
$("#stopCalculation").click(function(){
/* $("#stopCalculation").click(function(){
if($("#stopReqDt").val() == ""){
alert("중지 시작일을 입력 해 주세요.");
return false;
@ -312,7 +312,7 @@ $(document).ready(function(){
var stopReqTerm = (stopSubmitDt - stopReqDt) / stopCurrDay;
$("#stopReqTerm").val(stopReqTerm);
});
}); */
/* $("#anwCalculation").click(function(){
if($("#answerReqDt").val() == ""){
@ -377,6 +377,22 @@ $(document).ready(function(){
}
}); */
//중지기간 계산
$("#stopCalculation").click(function(){
if($("#stopReqDt").val() == ""){
alert("중지 시작일을 입력 해 주세요.");
return false;
}
if($("#stopSubmitDt").val() == ""){
alert("중지 종료일을 입력 해 주세요.");
return false;
}
var stopReqDt = $("#stopReqDt").val().replace(/-/gi,"");
var stopSubmitDt = $("#stopSubmitDt").val().replace(/-/gi,"");
returnTerm(stopReqDt,stopSubmitDt,"stopReqTerm");
});
//신청서 보완기간 계산
$("#suppCalculation").click(function(){
@ -4474,6 +4490,8 @@ function returnTerm(sdt,edt,gubun){
success: function(response) {
if(gubun == "appReqTerm"){
$("#appReqTerm").val(response);
}else if(gubun == "stopReqTerm"){
$("#stopReqTerm").val(response);
}else if(gubun == "answerTerm"){
$("#answerTerm").val(response);
}else if(gubun == "pendencyPeriod"){

2
src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
View File

@ -149,7 +149,7 @@
<div class="full_all_menu">
<div class="top_area">
<div class="inner">
<h1 class="logo"><a href="./index.html" title="메인으로 이동"><img src="/kofair_case_seed/usr/images/layout/header_logo.png" alt="한국공정거래조정원 KOREA FAIR TRADE MEDIATION AGENCY"></a></h1>
<h1 class="logo"><a href="/" title="메인으로 이동"><img src="/kofair_case_seed/usr/images/layout/header_logo.png" alt="한국공정거래조정원 KOREA FAIR TRADE MEDIATION AGENCY"></a></h1>
<button type="button" class="btn only_icon btn_menu_close"><i class="icon menu close"></i></button>
</div>
</div>

2
src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
View File

@ -61,7 +61,7 @@ function popupSet(bodyWidth){
var zIndex = 1000 - idx;
var topPosi = idx * 45;
$(this).css({
top: 'calc(10% + '+topPosi+'px)', // 화면 중앙에 위치
top: 'calc(1% + '+topPosi+'px)', // 화면 중앙에 위치
left: '30px', // 각 팝업을 가로로 정렬
/* transform: 'translateY(-50%)', // 세로 중앙 정렬 */
position: 'absolute', // 부모 요소 기준으로 위치 설정

1
src/main/webapp/kofair_case_seed/usr/style/style.css
View File

@ -130,6 +130,7 @@
.list_view_wrap .view_info .view_info_tit{display:inline-block;color:#888;}
.list_view_wrap .view_content{font-size:1.7rem;padding:40px 24px;border-bottom:1px solid #d8d8d8;line-height:1.4;}
.list_view_wrap .view_content *{font-family:'Noto Sans KR', sans-serif !important;font-weight:300;color:#222;transform: skew(-0.1deg);}
.list_view_wrap .view_content a{display:inline-block;}
.list_view_wrap .view_content b{font-weight:600;}
/* box */