itfirst/sake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fo bo 머지작업 - 오류수정

Browse Source
This commit is contained in:
jazz
2025-11-28 17:03:25 +09:00
parent a5cf6f509b
commit 672e97f7ee
19 changed files with 81 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/wb/domainserver/domain/gcone/ordr/dlivy/vo/BODlivySrchVO.java
View File

@@ -144,4 +144,5 @@ public class BODlivySrchVO extends AbstractVO {
private String secretKey;
private String srchDatePick;
}

1
src/main/java/com/wb/domainserver/domain/gcone/ordr/rtngudrefnd/vo/BORtngudrefndVO.java
View File

@@ -204,4 +204,5 @@ public class BORtngudrefndVO extends AbstractVO{
private String[] returnProcsStuusCd;
private String serverDv;
private String srchDatePick;
}

1
src/main/java/com/wb/domainserver/domain/gcone/ordr/selngpruf/vo/BOSelngprufVO.java
View File

@@ -173,6 +173,7 @@ public class BOSelngprufVO extends AbstractVO {
private String srchStatus[];
/** 상태 */
private String srchStatusFlag;
private String srchDatePick;
}

28
src/main/java/com/wb/domainserver/domain/mngr/bbs/gnrlsctt/controller/GnrlscttController.java
View File

@@ -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<DataMap> 전체 목록
*/
@Policy(AuthPolicy.PUBLIC)
@RequestMapping(value = "/selectBOBbscttCnAjax", produces = MediaType.APPLICATION_JSON_VALUE)
@ResponseBody
public ResponseEntity<?> selectBOBbscttCnAjax(@RequestBody BOGnrlbbscttVO bbsctt) {
Map<String, Object> 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()
);
}
}

7
src/main/java/com/wb/domainserver/domain/mngr/mbr/controller/MngrMbrController.java
View File

@@ -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,

35
src/main/java/com/wb/domainserver/domain/mngr/ordr/selngpruf/controller/SelngprufController.java
View File

@@ -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<String, Object> 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<DataMap> 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<Map<String, Object>> excelList = new ArrayList<>();
List<DataMap> excelList = new ArrayList<>();
if(resultMap.get("excelList") != null) {
excelList = (List<Map<String, Object>>) resultMap.get("excelList");
excelList = (List<DataMap>) 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<String, Object> dataMap = new HashMap<>();
HashMap<String, Object> map = new HashMap<>();
map = (HashMap<String, Object>) 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());

9
src/main/java/com/wb/domainserver/util/dataaccess/DataMap.java
View File

@@ -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<Object, Object> {
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<Object, Object> {
*/
@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);
}

4
src/main/webapp/WEB-INF/views/crm/bbs/GoodsInqryListRForm.jsp
View File

@@ -450,7 +450,7 @@
let sopmalCd = $("#sopmalCd").val();
$.ajax({
type: "post",
url: "<c:url value ='/ajax/bbscttAjax/selectBOBbscttCnAjax'/>",
url: "<c:url value ='/mngr/bbs/gnrlsctt/selectBOBbscttCnAjax'/>",
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 적용

4
src/main/webapp/WEB-INF/views/crm/bbs/GoodsRvwListRForm.jsp
View File

@@ -675,7 +675,7 @@
let sopmalCd = $("#sopmalCd").val();
$.ajax({
type: "post",
url: "<c:url value ='/ajax/bbscttAjax/selectBOBbscttCnAjax'/>",
url: "<c:url value ='/mngr/bbs/gnrlsctt/selectBOBbscttCnAjax'/>",
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");

4
src/main/webapp/WEB-INF/views/mngr/bbs/gnrlsctt/GnrlBbscttListRForm.jsp
View File

@@ -588,7 +588,7 @@
let sopmalCd = $("#sopmalCd").val();
$.ajax({
type: "post",
url: "<c:url value ='/ajax/bbscttAjax/selectBOBbscttCnAjax'/>",
url: "<c:url value ='/mngr/bbs/gnrlsctt/selectBOBbscttCnAjax'/>",
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 적용

4
src/main/webapp/WEB-INF/views/mngr/bbs/rvw/RvwListRForm.jsp
View File

@@ -746,7 +746,7 @@
let sopmalCd = $("#sopmalCd").val();
$.ajax({
type: "post",
url: "<c:url value ='/ajax/bbscttAjax/selectBOBbscttCnAjax'/>",
url: "<c:url value ='/mngr/bbs/gnrlsctt/selectBOBbscttCnAjax'/>",
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){

2
src/main/webapp/WEB-INF/views/mngr/ntcn/lgqymssage/MssageLgqySndngUpdtR.jsp
View File

@@ -919,7 +919,7 @@
<tr>
<td>
<fmt:parseDate value="${reqstDate.sndngReqstDt}"
pattern="yyyy-MM-dd'T'HH:mm:ss" var="date"/>
pattern="yyyy-MM-dd HH:mm:ss" var="date"/>
<fmt:formatDate value="${date }" var="formattedDt"
pattern="yyyy-MM-dd HH:mm:ss"/>
<c:out value="${ formattedDt }"/>

4
src/main/webapp/WEB-INF/views/sopmal/csc/BbscttUpdtPopupU.jsp
View File

@@ -376,7 +376,7 @@
let sopmalCd = $("#sopmalCd").val();
$.ajax({
type: "post",
url: "<c:url value ='/ajax/bbscttAjax/selectBOBbscttCnAjax'/>",
url: "<c:url value ='/mngr/bbs/gnrlsctt/selectBOBbscttCnAjax'/>",
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);
}
});

4
src/main/webapp/WEB-INF/views/sopmal/csc/BbscttUpdtU.jsp
View File

@@ -216,7 +216,7 @@
let sopmalCd = $("#sopmalCd").val();
$.ajax({
type: "post",
url: "<c:url value ='/ajax/bbscttAjax/selectBOBbscttCnAjax'/>",
url: "<c:url value ='/mngr/bbs/gnrlsctt/selectBOBbscttCnAjax'/>",
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");
}

4
src/main/webapp/WEB-INF/views/sopmal/mpage/act/MyGoodsQnaDtlUpdtU.jsp
View File

@@ -201,7 +201,7 @@
let sopmalCd = $("#sopmalCd").val();
$.ajax({
type: "post",
url: "<c:url value ='/ajax/bbscttAjax/selectBOBbscttCnAjax'/>",
url: "<c:url value ='/mngr/bbs/gnrlsctt/selectBOBbscttCnAjax'/>",
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);
}
});

4
src/main/webapp/WEB-INF/views/sopmal_m/csc/BbscttDtlR.jsp
View File

@@ -105,7 +105,7 @@
let sopmalCd = $("#sopmalCd").val();
$.ajax({
type: "post",
url: "<c:url value ='/ajax/bbscttAjax/selectBOBbscttCnAjax'/>",
url: "<c:url value ='/mngr/bbs/gnrlsctt/selectBOBbscttCnAjax'/>",
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");

4
src/main/webapp/WEB-INF/views/sopmal_m/csc/BbscttUpdtPopupU.jsp
View File

@@ -200,7 +200,7 @@
let sopmalCd = $("#sopmalCd").val();
$.ajax({
type: "post",
url: "<c:url value ='/ajax/bbscttAjax/selectBOBbscttCnAjax'/>",
url: "<c:url value ='/mngr/bbs/gnrlsctt/selectBOBbscttCnAjax'/>",
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);
}
});

4
src/main/webapp/WEB-INF/views/sopmal_m/csc/BbscttUpdtU.jsp
View File

@@ -251,7 +251,7 @@
let sopmalCd = $("#sopmalCd").val();
$.ajax({
type: "post",
url: "<c:url value ='/ajax/bbscttAjax/selectBOBbscttCnAjax'/>",
url: "<c:url value ='/mngr/bbs/gnrlsctt/selectBOBbscttCnAjax'/>",
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");
}

4
src/main/webapp/WEB-INF/views/sopmal_m/mpage/act/MyGoodsQnaDtlUpdtU.jsp
View File

@@ -240,7 +240,7 @@
let sopmalCd = $("#sopmalCd").val();
$.ajax({
type: "post",
url: "<c:url value ='/ajax/bbscttAjax/selectBOBbscttCnAjax'/>",
url: "<c:url value ='/mngr/bbs/gnrlsctt/selectBOBbscttCnAjax'/>",
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);
}
});