diff --git a/src/main/java/kcc/com/uss/ion/hld/web/HolidayController.java b/src/main/java/kcc/com/uss/ion/hld/web/HolidayController.java index 22c0d105..a27d828e 100644 --- a/src/main/java/kcc/com/uss/ion/hld/web/HolidayController.java +++ b/src/main/java/kcc/com/uss/ion/hld/web/HolidayController.java @@ -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(workCnt, HttpStatus.OK); } } diff --git a/src/main/java/kcc/let/cop/bbs/web/EgovBBSAttributeManageController.java b/src/main/java/kcc/let/cop/bbs/web/EgovBBSAttributeManageController.java index 84ff86c8..7a95cf9a 100644 --- a/src/main/java/kcc/let/cop/bbs/web/EgovBBSAttributeManageController.java +++ b/src/main/java/kcc/let/cop/bbs/web/EgovBBSAttributeManageController.java @@ -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()); diff --git a/src/main/java/seed/com/user/mypage/WebMyPageController.java b/src/main/java/seed/com/user/mypage/WebMyPageController.java index 569e527a..3c55c691 100644 --- a/src/main/java/seed/com/user/mypage/WebMyPageController.java +++ b/src/main/java/seed/com/user/mypage/WebMyPageController.java @@ -1084,8 +1084,15 @@ 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> data = service2.counselList(paramMap); PageMaker pageMaker = new PageMaker(); diff --git a/src/main/resources/egovframework/egovProps/globals_svr.properties b/src/main/resources/egovframework/egovProps/globals_svr.properties index aaf9a122..37bde846 100644 --- a/src/main/resources/egovframework/egovProps/globals_svr.properties +++ b/src/main/resources/egovframework/egovProps/globals_svr.properties @@ -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 diff --git a/src/main/resources/egovframework/sqlmap/com/uss/ion/hld/Holiday_SQL_Oracle.xml b/src/main/resources/egovframework/sqlmap/com/uss/ion/hld/Holiday_SQL_Oracle.xml index 28dec813..38c6d9a6 100644 --- a/src/main/resources/egovframework/sqlmap/com/uss/ion/hld/Holiday_SQL_Oracle.xml +++ b/src/main/resources/egovframework/sqlmap/com/uss/ion/hld/Holiday_SQL_Oracle.xml @@ -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') diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/counsel/counsel_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/counsel/counsel_sql.xml index e781706f..b1abb4c6 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/counsel/counsel_sql.xml +++ b/src/main/resources/egovframework/sqlmap/config/mappers/counsel/counsel_sql.xml @@ -129,8 +129,14 @@ FROM C_ONLINE_COUNSEL COC WHERE CIVIL_TYPE = #{civilType} AND DEL_YN = 'N' - - AND APPLCNT_DI = #{hpDi} + + AND (APPLCNT_DI = #{certId} OR APPLCNT_DI = #{certDi}) + + + AND APPLCNT_DI = #{certId} + + + AND APPLCNT_DI = #{certDi} 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' - - AND APPLCNT_DI = #{hpDi} + + AND (APPLCNT_DI = #{certId} OR APPLCNT_DI = #{certDi}) + + + AND APPLCNT_DI = #{certId} + + + AND APPLCNT_DI = #{certDi} AND TO_CHAR(COUNSEL_REGDATE,'YYYYMMDD') >= TO_CHAR(TO_DATE(replace(#{searchDate1},'-',''),'YYYYMMDD'), 'YYYYMMDD') diff --git a/src/main/webapp/WEB-INF/jsp/_extra/web/user/board/newsDetail.jsp b/src/main/webapp/WEB-INF/jsp/_extra/web/user/board/newsDetail.jsp index 8ea2bbf4..888e5685 100644 --- a/src/main/webapp/WEB-INF/jsp/_extra/web/user/board/newsDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/_extra/web/user/board/newsDetail.jsp @@ -11,6 +11,15 @@ $("#moveFrm").submit(); } } + + $(function(){ + + // 첨부파일 없을 경우 첨부파일 영역 삭제 + if($(".view_file_list li").length == 0){ + $(".view_file_list").hide(); + } + + })
diff --git a/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myLawCounsel.jsp b/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myLawCounsel.jsp index c15f2c90..ce37d64d 100644 --- a/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myLawCounsel.jsp +++ b/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myLawCounsel.jsp @@ -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 @@
-

전체 3,581건(10/400 페이지)

+

전체 건(${pageMaker.cri.page}/${pageMaker.endPage} 페이지)

@@ -246,6 +246,40 @@
+ +
    + +
    • + + +
    • +     + +
    • +     +     + + + + +
  • ${idx}
    • +     + +
  • ${idx}
    • +     +     +     + + + +
    • +     + +
    • +     +     +
    • +
diff --git a/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myMediationList.jsp b/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myMediationList.jsp index c7d30045..cd617614 100644 --- a/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myMediationList.jsp +++ b/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myMediationList.jsp @@ -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(); + } + }
@@ -58,14 +72,14 @@
    • --> -
    • +
    • -

    전체 건 (1/1페이지)

    +

    전체 건(${pageMaker.cri.page}/${pageMaker.endPage} 페이지)

    @@ -129,6 +143,39 @@

    ※ 사건접수 완료 후 진행상황은 홈페이지 메뉴 분쟁조정 사건조회에서 조회가 가능합니다.

    +
      + +
      • + + +
      • +       + +
      • +       +       + + + + +
    • ${idx}
      • +       + +
    • ${idx}
      • +       +       +       + + + +
      • +       + +
      • +       +       +
      • +
    diff --git a/src/main/webapp/WEB-INF/jsp/_extra/web/user/onlineCounsel/counselStep01.jsp b/src/main/webapp/WEB-INF/jsp/_extra/web/user/onlineCounsel/counselStep01.jsp index b23d1882..05f0b211 100644 --- a/src/main/webapp/WEB-INF/jsp/_extra/web/user/onlineCounsel/counselStep01.jsp +++ b/src/main/webapp/WEB-INF/jsp/_extra/web/user/onlineCounsel/counselStep01.jsp @@ -84,8 +84,8 @@
    ICT분쟁조정지원센터
    전자상거래, 온라인광고분쟁, 정보보호 관련 분쟁조정
    -
    142-246
    -
    www.tdrc.kr
    +
    118
    +
    www.ecmc.or.kr
    \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp index f55ccdba..e5f43406 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp @@ -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,7 +377,23 @@ $(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(){ if($("#appReqDt").val() == ""){ @@ -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"){ diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp index 7a928a9b..ec2f3798 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp @@ -149,7 +149,7 @@
    -

    한국공정거래조정원 KOREA FAIR TRADE MEDIATION AGENCY

    +

    한국공정거래조정원 KOREA FAIR TRADE MEDIATION AGENCY

    diff --git a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp index c72e50fe..fad6df7e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp @@ -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', // 부모 요소 기준으로 위치 설정 diff --git a/src/main/webapp/kofair_case_seed/usr/style/style.css b/src/main/webapp/kofair_case_seed/usr/style/style.css index 02f45c2c..132113de 100644 --- a/src/main/webapp/kofair_case_seed/usr/style/style.css +++ b/src/main/webapp/kofair_case_seed/usr/style/style.css @@ -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 */