diff --git a/src/main/java/com/wb/domainserver/domain/gcone/ordr/dlivy/vo/BODlivySrchVO.java b/src/main/java/com/wb/domainserver/domain/gcone/ordr/dlivy/vo/BODlivySrchVO.java index 621d7b0b..6fea89e4 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/ordr/dlivy/vo/BODlivySrchVO.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/ordr/dlivy/vo/BODlivySrchVO.java @@ -144,4 +144,5 @@ public class BODlivySrchVO extends AbstractVO { private String secretKey; + private String srchDatePick; } diff --git a/src/main/java/com/wb/domainserver/domain/gcone/ordr/rtngudrefnd/vo/BORtngudrefndVO.java b/src/main/java/com/wb/domainserver/domain/gcone/ordr/rtngudrefnd/vo/BORtngudrefndVO.java index 1fe3d75f..d1585f5f 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/ordr/rtngudrefnd/vo/BORtngudrefndVO.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/ordr/rtngudrefnd/vo/BORtngudrefndVO.java @@ -204,4 +204,5 @@ public class BORtngudrefndVO extends AbstractVO{ private String[] returnProcsStuusCd; private String serverDv; + private String srchDatePick; } diff --git a/src/main/java/com/wb/domainserver/domain/gcone/ordr/selngpruf/vo/BOSelngprufVO.java b/src/main/java/com/wb/domainserver/domain/gcone/ordr/selngpruf/vo/BOSelngprufVO.java index ade785bf..a3b2f13a 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/ordr/selngpruf/vo/BOSelngprufVO.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/ordr/selngpruf/vo/BOSelngprufVO.java @@ -173,6 +173,7 @@ public class BOSelngprufVO extends AbstractVO { private String srchStatus[]; /** 상태 */ private String srchStatusFlag; + private String srchDatePick; } diff --git a/src/main/java/com/wb/domainserver/domain/mngr/bbs/gnrlsctt/controller/GnrlscttController.java b/src/main/java/com/wb/domainserver/domain/mngr/bbs/gnrlsctt/controller/GnrlscttController.java index a364ef1c..40bbab67 100644 --- a/src/main/java/com/wb/domainserver/domain/mngr/bbs/gnrlsctt/controller/GnrlscttController.java +++ b/src/main/java/com/wb/domainserver/domain/mngr/bbs/gnrlsctt/controller/GnrlscttController.java @@ -49,9 +49,7 @@ import org.springframework.ui.ModelMap; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.CookieValue; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.*; import java.math.BigDecimal; import java.math.BigInteger; @@ -1892,5 +1890,27 @@ public class GnrlscttController { return sb.toString(); } - + /** + * 게시글 내용조회 + * + * @param bbsctt 파라미터VO + * @return List 전체 목록 + */ + @Policy(AuthPolicy.PUBLIC) + @RequestMapping(value = "/selectBOBbscttCnAjax", produces = MediaType.APPLICATION_JSON_VALUE) + @ResponseBody + public ResponseEntity selectBOBbscttCnAjax(@RequestBody BOGnrlbbscttVO bbsctt) { + Map content = new HashMap<>(); + DataMap result = boGnrlbbscttService.selectBOBbscttCn(bbsctt); + if (result != null) { + content.put("result", result); + } else { + content.put("result", "none"); + } + return ResponseEntity.ok( + WnbtResponse.builder() + .resBody(new WnbtResponseBody(content)) + .build() + ); + } } \ No newline at end of file diff --git a/src/main/java/com/wb/domainserver/domain/mngr/mbr/controller/MngrMbrController.java b/src/main/java/com/wb/domainserver/domain/mngr/mbr/controller/MngrMbrController.java index eae48271..b3a184b3 100644 --- a/src/main/java/com/wb/domainserver/domain/mngr/mbr/controller/MngrMbrController.java +++ b/src/main/java/com/wb/domainserver/domain/mngr/mbr/controller/MngrMbrController.java @@ -199,7 +199,6 @@ public class MngrMbrController { public String selectMbrListInqire(ModelMap model,BOMbrSrchVO vo, @CookieValue(value = "authSopmalCd") String authSopmalCd){ vo.setSopmalCd(authSopmalCd); //BO 회원 목록조회 API 결과를 Map으로 변환하여 설정 - AnonymousUser user = MemberJwtContextHolder.getMemberInfo(); if("01".equals(user.getSysDvCd())){ @@ -236,7 +235,7 @@ public class MngrMbrController { content.put("resultMap", service.selectBOMbrListInqire(vo)); content.put("appen", appen); - model.addAttribute("resultMap", content); + model.addAttribute("resultListMap", content); // responseHandler.handleResponse( // sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/mbr/mbr/selectBOMbrListInqire", vo), // model, @@ -461,7 +460,7 @@ public class MngrMbrController { String accmlPrearngeSum = boMlgService.selectBOAccmlPrearngeSum(boMlgSrchVO); content.put("accmlPrearngeSum", accmlPrearngeSum); - model.addAttribute("resultMap", content); + model.addAttribute("resultListMap", content); // responseHandler.handleResponse( // sendToResrc.ofPost(RESRC.GCONEBO,"/gcone/mbr/mlg/selectBOMlgManagePopupForm", mlgSrchVO), // model, @@ -576,7 +575,7 @@ public class MngrMbrController { content.put("resultMap", service.selectBOMbrListInqire(vo)); content.put("appen", appen); - model.addAttribute("resultMap", content); + model.addAttribute("resultListMap", content); // responseHandler.handleResponse( // sendToResrc.ofPost(RESRC.GCONEBO,"/gcone/mbr/mbr/selectBOMbrListInqire", vo), // model, diff --git a/src/main/java/com/wb/domainserver/domain/mngr/ordr/selngpruf/controller/SelngprufController.java b/src/main/java/com/wb/domainserver/domain/mngr/ordr/selngpruf/controller/SelngprufController.java index 7fc51ec3..d647c9db 100644 --- a/src/main/java/com/wb/domainserver/domain/mngr/ordr/selngpruf/controller/SelngprufController.java +++ b/src/main/java/com/wb/domainserver/domain/mngr/ordr/selngpruf/controller/SelngprufController.java @@ -1,6 +1,8 @@ package com.wb.domainserver.domain.mngr.ordr.selngpruf.controller; import com.wb.domainserver.common.msg.GconeMessageSource; +import com.wb.domainserver.common.mvc.tags.ui.pagination.PaginationInfo; +import com.wb.domainserver.common.prop.PaginationProperties; import com.wb.domainserver.domain.admin.sys.comncd.service.BOMaComncdService; import com.wb.domainserver.domain.admin.sys.comncd.vo.BOMaComncdVO; import com.wb.domainserver.domain.gcone.ordr.selngpruf.service.BOSelngprufService; @@ -62,6 +64,8 @@ public class SelngprufController { /** 공통 메시지 처리를 위한 메시지 객체 */ @Autowired private GconeMessageSource gconeMessageSource; + @Autowired + private PaginationProperties paginationProperties; @Autowired private BOSelngprufService service; @@ -126,28 +130,29 @@ public class SelngprufController { vo.setSopmalCd(authSopmalCd); AnonymousUser user = MemberJwtContextHolder.getMemberInfo(); -// log.debug("SopmalCd : "+user.getSopmalCd()); -// vo.setSopmalCd(user.getSopmalCd()); if("01".equals(user.getSysDvCd())){ vo.setSopmalCd(user.getSopmalCd()); } - // 응답 메세지 객체 Map content = new HashMap<>(); - // 공통코드 호출 - BOMaComncdVO bOMaComncdVO = new BOMaComncdVO(); - bOMaComncdVO.setGroupCd("REQST_DV"); // 신청구분코드 - List reqstDvList = bOMaComncdService.selectBOCommcdDetailList(bOMaComncdVO); + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(vo.getPageIndex()); + paginationInfo.setRecordCountPerPage(vo.getPageUnit()); + paginationInfo.setPageSize(paginationProperties.getPageSize()); - bOMaComncdVO.setGroupCd("ISSU_STTUS"); // 발급상태코드 - List issuSttusList = bOMaComncdService.selectBOCommcdDetailList(bOMaComncdVO); + vo.setPaginationInfo(paginationInfo); + vo.setFirstIndex(paginationInfo.getFirstRecordIndex()); + vo.setLastIndex(paginationInfo.getLastRecordIndex()); + vo.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); + List resultList = service.selectBOSelngPrufListInqire(vo); + + content.put("resultList", resultList); content.put("paramVO", vo); - content.put("reqstDvList", reqstDvList); - content.put("issuSttusList", issuSttusList); + content.put("paginationInfo", vo.getPaginationInfo()); model.addAttribute("resultMap", content); // responseHandler.handleResponse( @@ -454,9 +459,9 @@ public class SelngprufController { // ); - List> excelList = new ArrayList<>(); + List excelList = new ArrayList<>(); if(resultMap.get("excelList") != null) { - excelList = (List>) resultMap.get("excelList"); + excelList = (List) resultMap.get("excelList"); } //엑셀 항목에 출력될 내용 설정 @@ -470,8 +475,8 @@ public class SelngprufController { BigInteger num = BigInteger.valueOf(excelList.size()); for (int i = 0; i < excelList.size(); i++ ) { HashMap dataMap = new HashMap<>(); - HashMap map = new HashMap<>(); - map = (HashMap) excelList.get(i); + DataMap map = new DataMap(); + map = excelList.get(i); setleAmt = (int) Double.parseDouble(map.get("setleAmt").toString()); splpric = (int) Double.parseDouble(map.get("splpric").toString()); diff --git a/src/main/java/com/wb/domainserver/util/dataaccess/DataMap.java b/src/main/java/com/wb/domainserver/util/dataaccess/DataMap.java index 1e717871..f180c252 100644 --- a/src/main/java/com/wb/domainserver/util/dataaccess/DataMap.java +++ b/src/main/java/com/wb/domainserver/util/dataaccess/DataMap.java @@ -2,10 +2,13 @@ package com.wb.domainserver.util.dataaccess; import org.apache.commons.collections4.map.ListOrderedMap; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; + public class DataMap extends ListOrderedMap { private static final long serialVersionUID = 6723434363565852261L; - + private DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); /** * key 에 대하여 Camel Case 변환하여 super.put * (ListOrderedMap) 을 호출한다. @@ -19,6 +22,10 @@ public class DataMap extends ListOrderedMap { */ @Override public Object put(Object key, Object value) { + /*일시 자료형인경우 00분00초 정보를 변환이 안되어 추가*/ + if(value instanceof LocalDateTime){ + value = formatter.format((LocalDateTime)value); + } return super.put(CamelUtil.convert2CamelCase((String) key), value); } diff --git a/src/main/webapp/WEB-INF/views/crm/bbs/GoodsInqryListRForm.jsp b/src/main/webapp/WEB-INF/views/crm/bbs/GoodsInqryListRForm.jsp index 2ee28a3b..a0a22912 100644 --- a/src/main/webapp/WEB-INF/views/crm/bbs/GoodsInqryListRForm.jsp +++ b/src/main/webapp/WEB-INF/views/crm/bbs/GoodsInqryListRForm.jsp @@ -450,7 +450,7 @@ let sopmalCd = $("#sopmalCd").val(); $.ajax({ type: "post", - url: "", + url: "", contentType: 'application/json', data: JSON.stringify({ bbsId: bbsId, @@ -458,7 +458,7 @@ sopmalCd: sopmalCd }), success: function (data) { - let cn = data.result.cn; + let cn = JSON.parse(data.resBody.result).result.cn; $("#" + divId).html(cn); if (actionDv === 'U') { //ckeditor 적용 diff --git a/src/main/webapp/WEB-INF/views/crm/bbs/GoodsRvwListRForm.jsp b/src/main/webapp/WEB-INF/views/crm/bbs/GoodsRvwListRForm.jsp index ea358434..f1084e34 100644 --- a/src/main/webapp/WEB-INF/views/crm/bbs/GoodsRvwListRForm.jsp +++ b/src/main/webapp/WEB-INF/views/crm/bbs/GoodsRvwListRForm.jsp @@ -675,7 +675,7 @@ let sopmalCd = $("#sopmalCd").val(); $.ajax({ type: "post", - url: "", + url: "", contentType: 'application/json', data: JSON.stringify({ bbsId: bbsId, @@ -683,7 +683,7 @@ sopmalCd: sopmalCd }), success: function (data) { - let cn = data.result.cn; + let cn = JSON.parse(data.resBody.result).result.cn; if (actionDv === 'R') { $("#cnDiv").html(cn); $("#cnDiv").addClass("ck-content"); diff --git a/src/main/webapp/WEB-INF/views/mngr/bbs/gnrlsctt/GnrlBbscttListRForm.jsp b/src/main/webapp/WEB-INF/views/mngr/bbs/gnrlsctt/GnrlBbscttListRForm.jsp index f8581beb..130a00af 100644 --- a/src/main/webapp/WEB-INF/views/mngr/bbs/gnrlsctt/GnrlBbscttListRForm.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/bbs/gnrlsctt/GnrlBbscttListRForm.jsp @@ -588,7 +588,7 @@ let sopmalCd = $("#sopmalCd").val(); $.ajax({ type: "post", - url: "", + url: "", contentType: 'application/json', data: JSON.stringify({ bbsId:bbsId, @@ -596,7 +596,7 @@ sopmalCd:sopmalCd }), success: function (data) { - let cn = data.result.cn; + let cn = JSON.parse(data.resBody.result).result.cn; $("#" + divId).html(cn); if (actionDv === 'U') { //ckeditor 적용 diff --git a/src/main/webapp/WEB-INF/views/mngr/bbs/rvw/RvwListRForm.jsp b/src/main/webapp/WEB-INF/views/mngr/bbs/rvw/RvwListRForm.jsp index f753a20e..c26de011 100644 --- a/src/main/webapp/WEB-INF/views/mngr/bbs/rvw/RvwListRForm.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/bbs/rvw/RvwListRForm.jsp @@ -746,7 +746,7 @@ let sopmalCd = $("#sopmalCd").val(); $.ajax({ type: "post", - url: "", + url: "", contentType: 'application/json', data: JSON.stringify({ bbsId: bbsId, @@ -754,7 +754,7 @@ sopmalCd: sopmalCd }), success: function (data) { - let cn = data.result.cn; + let cn = JSON.parse(data.resBody.result).result.cn; $("#" + divId).html(cn); if (actionDv !== 'U') { if($("#" + divId).find(".review_text").length > 0){ diff --git a/src/main/webapp/WEB-INF/views/mngr/ntcn/lgqymssage/MssageLgqySndngUpdtR.jsp b/src/main/webapp/WEB-INF/views/mngr/ntcn/lgqymssage/MssageLgqySndngUpdtR.jsp index 2343b12e..3f3cadef 100644 --- a/src/main/webapp/WEB-INF/views/mngr/ntcn/lgqymssage/MssageLgqySndngUpdtR.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/ntcn/lgqymssage/MssageLgqySndngUpdtR.jsp @@ -919,7 +919,7 @@ + pattern="yyyy-MM-dd HH:mm:ss" var="date"/> diff --git a/src/main/webapp/WEB-INF/views/sopmal/csc/BbscttUpdtPopupU.jsp b/src/main/webapp/WEB-INF/views/sopmal/csc/BbscttUpdtPopupU.jsp index 12e16d34..3efa4c42 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/csc/BbscttUpdtPopupU.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/csc/BbscttUpdtPopupU.jsp @@ -376,7 +376,7 @@ let sopmalCd = $("#sopmalCd").val(); $.ajax({ type: "post", - url: "", + url: "", contentType: 'application/json', data: JSON.stringify({ bbsId: bbsId, @@ -384,7 +384,7 @@ sopmalCd: sopmalCd }), success: function (data) { - let cn = data.result.cn; + let cn = JSON.parse(data.resBody.result).result.cn; $("#cnBbsUpdt").val(cn); } }); diff --git a/src/main/webapp/WEB-INF/views/sopmal/csc/BbscttUpdtU.jsp b/src/main/webapp/WEB-INF/views/sopmal/csc/BbscttUpdtU.jsp index 5ddea667..417294af 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/csc/BbscttUpdtU.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/csc/BbscttUpdtU.jsp @@ -216,7 +216,7 @@ let sopmalCd = $("#sopmalCd").val(); $.ajax({ type: "post", - url: "", + url: "", contentType: 'application/json', data: JSON.stringify({ bbsId: bbsId, @@ -224,7 +224,7 @@ sopmalCd: sopmalCd }), success: function (data) { - let cn = data.result.cn; + let cn = JSON.parse(data.resBody.result).result.cn; $("#cnBbsUpdt").val(cn); $("#cnBbsUpdt").addClass("ck-content"); } diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/act/MyGoodsQnaDtlUpdtU.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/act/MyGoodsQnaDtlUpdtU.jsp index 075ab867..7632dcfc 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/mpage/act/MyGoodsQnaDtlUpdtU.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/act/MyGoodsQnaDtlUpdtU.jsp @@ -201,7 +201,7 @@ let sopmalCd = $("#sopmalCd").val(); $.ajax({ type: "post", - url: "", + url: "", contentType: 'application/json', data: JSON.stringify({ bbsId: bbsId, @@ -209,7 +209,7 @@ sopmalCd: sopmalCd }), success: function (data) { - let cn = data.result.cn; + let cn = JSON.parse(data.resBody.result).result.cn; $("#cnBbsUpdt").val(cn); } }); diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/csc/BbscttDtlR.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/csc/BbscttDtlR.jsp index 4b32c12a..c6ecf455 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/csc/BbscttDtlR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/csc/BbscttDtlR.jsp @@ -105,7 +105,7 @@ let sopmalCd = $("#sopmalCd").val(); $.ajax({ type: "post", - url: "", + url: "", contentType: 'application/json', data: JSON.stringify({ bbsId: bbsId, @@ -113,7 +113,7 @@ sopmalCd: sopmalCd }), success: function (data) { - let cn = data.result.cn; + let cn = JSON.parse(data.resBody.result).result.cn; $("#cnDiv").html(cn); if ($("#regusrDvCd").val() === '01' || $("#regusrDvCd").val() === '99') { $("#cnDiv").css("white-space", "pre-wrap"); diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/csc/BbscttUpdtPopupU.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/csc/BbscttUpdtPopupU.jsp index 1cad9867..2338e820 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/csc/BbscttUpdtPopupU.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/csc/BbscttUpdtPopupU.jsp @@ -200,7 +200,7 @@ let sopmalCd = $("#sopmalCd").val(); $.ajax({ type: "post", - url: "", + url: "", contentType: 'application/json', data: JSON.stringify({ bbsId: bbsId, @@ -208,7 +208,7 @@ sopmalCd: sopmalCd }), success: function (data) { - let cn = data.result.cn; + let cn = JSON.parse(data.resBody.result).result.cn; $("#cnBbsUpdt").val(cn); } }); diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/csc/BbscttUpdtU.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/csc/BbscttUpdtU.jsp index 0b1ffaec..bdf93677 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/csc/BbscttUpdtU.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/csc/BbscttUpdtU.jsp @@ -251,7 +251,7 @@ let sopmalCd = $("#sopmalCd").val(); $.ajax({ type: "post", - url: "", + url: "", contentType: 'application/json', data: JSON.stringify({ bbsId: bbsId, @@ -259,7 +259,7 @@ sopmalCd: sopmalCd }), success: function (data) { - let cn = data.result.cn; + let cn = JSON.parse(data.resBody.result).result.cn; $("#cnBbsUpdt").val(cn); $("#cnBbsUpdt").addClass("ck-content"); } diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/act/MyGoodsQnaDtlUpdtU.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/act/MyGoodsQnaDtlUpdtU.jsp index 9edac410..8c7b3af5 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/act/MyGoodsQnaDtlUpdtU.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/act/MyGoodsQnaDtlUpdtU.jsp @@ -240,7 +240,7 @@ let sopmalCd = $("#sopmalCd").val(); $.ajax({ type: "post", - url: "", + url: "", contentType: 'application/json', data: JSON.stringify({ bbsId: bbsId, @@ -248,7 +248,7 @@ sopmalCd: sopmalCd }), success: function (data) { - let cn = data.result.cn; + let cn = JSON.parse(data.resBody.result).result.cn; $("#cnBbsUpdt").val(cn); } });