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());