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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
김현욱
2025-11-28 15:25:34 +09:00
parent 262d5a163a daef889533
commit a5cf6f509b
18 changed files with 305 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/wb/domainserver/domain/admin/ntcn/email/controller/MaEmailController.java
View File

@@ -131,7 +131,7 @@ public class MaEmailController {
content.put("boCtrlMap", service.selectBOMaEmailSndngListInqire(bOMaEmailSrchVO));
content.put("BOMaEmailSrchVO", bOMaEmailSrchVO);
model.addAttribute("resultSrchMap", content);
model.addAttribute("resultListMap", content);
// responseHandler.handleResponse(
// sendToResrc.ofPost(RESRC.GCONEBO, "/admin/ntcn/email/selectBOMaEmailSndngListInqire", maEmailSrchVO),
// model,

2
src/main/java/com/wb/domainserver/domain/admin/ntcn/sms/controller/MaSmsController.java
View File

@@ -151,7 +151,7 @@ public class MaSmsController {
content.put("mssageMap", service.selectBOSmsSndngListInqire(bOMaMssageSrchVO));
content.put("bOMaMssageSrchVO", bOMaMssageSrchVO);
model.addAttribute("resultMap", content);
model.addAttribute("resultListMap", content);
// responseHandler.handleResponse(
// sendToResrc.ofPost(RESRC.GCONEBO, "/admin/ntcn/mssage/selectBOSmsSndngListInqire", maSmsSrchVO),
// model,

10
src/main/java/com/wb/domainserver/domain/admin/ntcn/stl/controller/MaStlMssageController.java
View File

@@ -214,9 +214,9 @@ public class MaStlMssageController {
// );
/*엑셀 데이터 set*/
List<Map<String, Object>> excelList = new ArrayList<>();
Map<String, Object> excelMap = (Map<String, Object>) resultMap.get("strInfo");
excelList = (List<Map<String, Object>>) excelMap.get("chargeList");
List<DataMap> excelList = new ArrayList<>();
DataMap excelMap = (DataMap) resultMap.get("strInfo");
excelList = (List<DataMap>) excelMap.get("chargeList");
//엑셀 다운로드 다운로드 시간
Date date = new Date();
@@ -231,8 +231,8 @@ public class MaStlMssageController {
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 = (DataMap) excelList.get(i);
/*데이터 set*/
dataMap.put("itme01", num.subtract(BigInteger.valueOf(i)));

4
src/main/java/com/wb/domainserver/domain/admin/stats/marktAnals/controller/MaMarktAnalsController.java
View File

@@ -55,9 +55,9 @@ public class MaMarktAnalsController {
*/
@Policy(AuthPolicy.RESTRICTED)
@RequestMapping(value = "/selectAdminMbrNdMlgStats")
public String selectAdminMbrMlg(ModelMap model, DataMap vo) {
public String selectAdminMbrMlg(ModelMap model) {
MarktAnalsVO mavo = new MarktAnalsVO();
DataMap vo = new DataMap();
// 응답 메세지 객체
Map<String, Object> content = new HashMap<>();

39
src/main/java/com/wb/domainserver/domain/admin/sys/authgrp/controller/MaAuthgrpController.java
View File

@@ -173,23 +173,34 @@ public class MaAuthgrpController {
public String selectAuthGrpRegistForm(BOMaAuthgrpVO vo, ModelMap model) {
DataMap content = new DataMap();
PaginationInfo paginationInfo = new PaginationInfo();
paginationInfo.setCurrentPageNo(vo.getPageIndex());
paginationInfo.setRecordCountPerPage(vo.getPageUnit());
paginationInfo.setPageSize(paginationProperties.getPageSize());
vo.setPaginationInfo(paginationInfo);
vo.setFirstIndex(paginationInfo.getFirstRecordIndex());
vo.setLastIndex(paginationInfo.getLastRecordIndex());
vo.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
content.put("paramVO", vo);
List<DataMap> srchList = new ArrayList<>();
DataMap srchMap = new DataMap();
srchMap.put("srchAuthorNm", vo.getSrchAuthorNm());
srchMap.put("srchSysDvCd", vo.getSrchSysDvCd());
srchMap.put("pageUnit", vo.getPageUnit());
srchMap.put("pageIndex", vo.getPageIndex());
srchMap.put("pageDv", vo.getPageDv());
srchList.add(srchMap);
List<DataMap> authGrlList = new ArrayList<>();
authGrlList = service.selectBOAuthGrpList(vo);
content.put("resultList", authGrlList);
if(!vo.getAuthorId().isEmpty()) {
DataMap authGrlMap = new DataMap();
authGrlMap = service.selectBOAuthGrpUpdtForm(vo);
authGrlList.add(authGrlMap);
}
content.put("paginationInfo", vo.getPaginationInfo());
// 공통코드 호출
BOMaComncdVO bOMaComncdVO = new BOMaComncdVO();
bOMaComncdVO.setGroupCd("SYS_DV"); // 시스템구분(SYS_DV)
List<?> sysDvList = boMaComncdService.selectBOCommcdDetailList(bOMaComncdVO);
bOMaComncdVO.setGroupCd("FNCT_DV"); // 기능구분(FNCT_DV)
List<?> fnctDvList = boMaComncdService.selectBOCommcdDetailList(bOMaComncdVO);
content.put("srchList", srchList);
content.put("mbrGradList", authGrlList);
content.put("paramVO", vo);
content.put("sysDvList", sysDvList);
content.put("fnctDvList", fnctDvList);
model.addAttribute("resultMap", content);
// responseHandler.handleResponse(

4
src/main/java/com/wb/domainserver/domain/admin/sys/author/controller/MaAuthorController.java
View File

@@ -2,6 +2,8 @@ package com.wb.domainserver.domain.admin.sys.author.controller;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import com.wb.domainserver.common.msg.GconeMessageSource;
import com.wb.domainserver.common.mvc.tags.ui.pagination.PaginationInfo;
import com.wb.domainserver.common.prop.PaginationProperties;
@@ -103,6 +105,8 @@ public class MaAuthorController {
// );
ObjectMapper objectMapper = new ObjectMapper();
objectMapper.registerModule(new JavaTimeModule());
objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
try {
resultMap.put("cgn036", objectMapper.writeValueAsString(resultMap.get("cgn036")));

1
src/main/java/com/wb/domainserver/domain/admin/sys/fnct/vo/BOFnctVO.java
View File

@@ -74,6 +74,7 @@ public class BOFnctVO extends AbstractVO {
/* 권한메뉴기능고유번호 */
private String authorMenuFnctInnb;
private String pageDv;
}

16
src/main/java/com/wb/domainserver/domain/admin/user/mngr/controller/MAJobUserController.java
View File

@@ -1,6 +1,8 @@
package com.wb.domainserver.domain.admin.user.mngr.controller;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import com.wb.domainserver.common.msg.GconeMessageSource;
import com.wb.domainserver.common.mvc.tags.ui.pagination.PaginationInfo;
import com.wb.domainserver.common.prop.PaginationProperties;
@@ -110,6 +112,8 @@ public class MAJobUserController {
// sendToResrc.ofPost(RESRC.GCONEBO, "/admin/user/mngr/selectBOJobUserListInqireForm",vo)
// );
ObjectMapper objectMapper = new ObjectMapper();
objectMapper.registerModule(new JavaTimeModule());
objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
try {
resultMap.put("cgn036", objectMapper.writeValueAsString(resultMap.get("cgn036")));
@@ -187,6 +191,8 @@ public class MAJobUserController {
// sendToResrc.ofPost(RESRC.GCONEBO, "/admin/user/mngr/selectBOJobUserRegistForm",vo)
// );
ObjectMapper objectMapper = new ObjectMapper();
objectMapper.registerModule(new JavaTimeModule());
objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
try {
resultMap.put("managerCodeList", objectMapper.writeValueAsString(resultMap.get("managerCodeList")));
resultMap.put("emailCode", objectMapper.writeValueAsString(resultMap.get("emailCode")));
@@ -298,6 +304,8 @@ public class MAJobUserController {
// sendToResrc.ofPost(RESRC.GCONEBO, "/admin/user/mngr/selectBOJobUserUpdtForm",vo)
// );
ObjectMapper objectMapper = new ObjectMapper();
objectMapper.registerModule(new JavaTimeModule());
objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
try {
resultMap.put("managerCodeList", objectMapper.writeValueAsString(resultMap.get("managerCodeList")));
resultMap.put("emailCode", objectMapper.writeValueAsString(resultMap.get("emailCode")));
@@ -594,9 +602,9 @@ public class MAJobUserController {
headerMap.put("itme08", "로그인 보안");
headerMap.put("itme09", "최종접속일시");
List<Map<String, Object>> excelList = new ArrayList<>();
List<DataMap> excelList = new ArrayList<>();
if(resultMap != null) {
excelList = (List<Map<String, Object>>) resultMap.get("excelList");
excelList = (List<DataMap>) resultMap.get("excelList");
}
//엑셀 항목에 출력될 내용 설정
@@ -605,8 +613,8 @@ public class MAJobUserController {
if(excelList != null) {
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);
String ip2fas = "";
String fas = map.get("mblphonCrtfcAt").toString();

3
src/main/java/com/wb/domainserver/domain/admin/user/mngr/vo/BOJobUserVO.java
View File

@@ -113,4 +113,7 @@ public class BOJobUserVO extends AbstractVO {
/** 비밀번호변경 여부 */
private String mbrPwdChngAt;
// private String juscrbStrtDt;
// private String juscrbEndDt;
}

7
src/main/java/com/wb/domainserver/domain/gcone/goods/goods/vo/BOGoodsVO.java
View File

@@ -1,7 +1,7 @@
package com.wb.domainserver.domain.gcone.goods.goods.vo;
import com.wb.domainserver.domain.comm.vo.AbstractVO;
import com.wb.domainserver.domain.sopmal.goods.vo.GoodsAdditionVO;
import com.wb.domainserver.domain.mngr.goods.goodsmngr.vo.*;
import com.wb.domainserver.domain.sopmal.goods.vo.GoodsIconVO;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
@@ -41,6 +41,8 @@ public class BOGoodsVO extends AbstractVO {
/** 상품명 */
@NotBlank(message = "상품명")
private String goodsNm;
/** 입점상품명 */
private String tentMarktGoodsNm;
/** ? */
private String textMarktGoodsNm;
/** 부가세 */
@@ -620,5 +622,6 @@ public class BOGoodsVO extends AbstractVO {
/** 옵션관계번호 배열 */
private String[] optnRelateNbs;
/** 상품 목록을 퍼올릴 영역 */
private String selectedArea;
}

6
src/main/java/com/wb/domainserver/domain/mngr/mngrstr/controller/MngrStrController.java
View File

@@ -354,10 +354,10 @@ public class MngrStrController {
String kakaoKey = "";
if(content.containsKey("BOMngrStrVO")){
Map<String, Object> paramVO = (Map<String, Object>) content.get("BOMngrStrVO");
BOMngrStrVO paramVO = (BOMngrStrVO) content.get("BOMngrStrVO");
if(!ObjectUtils.isEmpty(paramVO.get("sopmalCd"))){
kakaoKey = kakaoProperties.getKeyForDomain(paramVO.get("sopmalCd").toString());
if(!ObjectUtils.isEmpty(paramVO.getSopmalCd())){
kakaoKey = kakaoProperties.getKeyForDomain(paramVO.getSopmalCd().toString());
}
}

48
src/main/java/com/wb/domainserver/exception/advice/GlobalExceptionControllerAdvice.java
View File

@@ -4,19 +4,31 @@ import com.wb.domainserver.exception.code.ErrCode;
import com.wb.domainserver.exception.WnbtException;
import com.wb.domainserver.exception.WnbtRestException;
import com.wb.domainserver.exception.WnbtWebClientException;
import com.wb.domainserver.realm.RealmContextHolder;
import com.wb.domainserver.response.WnbtResponse;
import com.wb.domainserver.response.WnbtResponseBody;
import com.wb.domainserver.util.CookieUtils;
import io.jsonwebtoken.Header;
import io.jsonwebtoken.JwtException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.security.oauth2.client.ClientAuthorizationRequiredException;
import org.springframework.util.MethodInvoker;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.Mapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.multipart.MaxUploadSizeExceededException;
import org.springframework.web.servlet.ModelAndView;
import java.io.IOException;
import java.util.Map;
@Slf4j
@ControllerAdvice
public class GlobalExceptionControllerAdvice {
@@ -35,14 +47,25 @@ public class GlobalExceptionControllerAdvice {
}
@ExceptionHandler(value = WnbtRestException.class)
@RequestMapping(produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<WnbtResponse> ajaxErrorHandler(HttpServletRequest req, HttpServletResponse res, WnbtRestException e){
WnbtResponse wnbtResponse = WnbtResponse.builder()
.statusCode(res.getStatus())
.requestUrl(String.valueOf(req.getRequestURL()))
.resBody(new WnbtResponseBody(e.getMessage()))
.resBody(new WnbtResponseBody(e, e.getMessage()))
.build();
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY).body(wnbtResponse);
int errCode = 500;
if(StringUtils.hasText(e.getCode())){
errCode = Integer.parseInt(e.getCode());
}
return ResponseEntity
.status(errCode)
.contentType(MediaType.APPLICATION_JSON)
.body(wnbtResponse);
// return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY).body(wnbtResponse);
//422 : 서버가 요청을 이해하고 요청 문법도 올바르지만 요청된 지시를 따를 수 없음을 나타냄
//요청 데이터에 대해 validation 처리를 하면서 적합하지 않은 데이터를 받았을 때 반환
}
@@ -82,4 +105,25 @@ public class GlobalExceptionControllerAdvice {
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY).body(wnbtResponse);
}
/** 해당 exception handler에 오는 경우 토큰 변조로 간주하고
* 로그아웃 처리를 위해 로그인 관련 쿠키 및 logout으로 redirect 처리하여
* 재로그인 유도
*/
@ExceptionHandler(value = JwtException.class)
public void JwtException(HttpServletRequest request, HttpServletResponse response, JwtException e) throws IOException {
log.error(e.getMessage(), e);
String realm = RealmContextHolder.getRealm().toLowerCase();
Map<String, String> cookiePath = CookieUtils.loginCookiePath();
//리프레쉬 토큰 삭제
CookieUtils.deleteCookie("RFT", cookiePath.get("RFTPath"), request, response);
//엑세스토큰 삭제
CookieUtils.deleteCookie("ACT", cookiePath.get("ACTPath"), request, response);
//토큰만료 검증쿠키 삭제
CookieUtils.deleteCookie("token_expire", cookiePath.get("ACTPath"), request, response);
response.setStatus(HttpStatus.UNAUTHORIZED.value());
response.sendRedirect("/"+realm+"/logout");
}
}

4
src/main/java/com/wb/domainserver/response/WnbtResponseBody.java
View File

@@ -27,14 +27,16 @@ public class WnbtResponseBody {
.setSerializationInclusion(JsonInclude.Include.NON_NULL); // null 값 제외
public WnbtResponseBody(Object result) {
try{
this.result = OBJECT_MAPPER.writeValueAsString(result);
} catch (JsonProcessingException e) {
log.error(e.getMessage());
throw new WnbtRestException(ErrorCode.INTERNAL_SERVER_ERROR);
}
}
public WnbtResponseBody(WnbtRestException ex, Object result) {
this.result = result;
}

2
src/main/resources/mybatis/xml/mapper/gcone/goods/goods/BOGoodsMapper.xml
View File

@@ -1991,7 +1991,7 @@
<!-- 상품/사은품(MAIN TABLE) 등록 -->
<insert id="insertBOGoods" parameterType="com.wb.domainserver.domain.gcone.goods.goods.vo.BOGoodsVO">
<selectKey order="BEFORE" keyProperty="goodsInnb" resultType="java.lang.Integer">
<selectKey order="BEFORE" keyProperty="goodsInnb" resultType="java.lang.String">
<![CDATA[
SELECT IFNULL(MAX(GOODS_INNB), 0)+1
FROM GC_GOODS

77
src/main/resources/static/admin/css/style.css
View File

@@ -1673,7 +1673,7 @@ gap-0 {
width: 13px;
height: 13px;
}
.icon_word-badge08 {
.icon_word-badge08, .icon_word-badge_naver {
background-image: url("../images/icon_word-badge08.png");
width: 13px;
height: 13px;
@@ -1683,6 +1683,81 @@ gap-0 {
width: 13px;
height: 13px;
}
.icon_word-badge10 {
background-image: url("../images/icon_word-badge10.png");
width: 18px;
height: 18px;
}
.icon_word-badge11 {
background-image: url("../images/icon_word-badge11.png");
width: 18px;
height: 18px;
}
.icon_word-badge12 {
background-image: url("../images/icon_word-badge12.png");
width: 13px;
height: 13px;
}
.icon_word-badge13 {
background-image: url("../images/icon_word-badge13.png");
width: 13px;
height: 13px;
}
.icon_word-badge14 {
background-image: url("../images/icon_word-badge14.png");
width: 13px;
height: 13px;
}
.icon_word-badge15 {
background-image: url("../images/icon_word-badge15.png");
width: 18px;
height: 18px;
}
.icon_word-badge16 {
background-image: url("../images/icon_word-badge16.png");
width: 13px;
height: 13px;
}
.icon_word-badge_kcp {
background-image: url("../images/icon_word-badge_kcp.png");
width: 14px;
height: 14px;
}
.icon_word-badge_pos {
background-image: url("../images/icon_word-badge_pos.png");
width: 26px;
height: 14px;
}
.icon_word-badge_payco {
background-image: url("../images/icon_word-badge_payco.png");
width: 14px;
height: 14px;
}
.icon_word-badge_toss {
background-image: url("../images/icon_word-badge_toss.png");
width: 14px;
height: 14px;
}
.icon_word-badge_gcpay {
background-image: url("../images/icon_word-badge_gcpay.png");
width: 14px;
height: 14px;
}
.icon_word-badge_kakao {
background-image: url("../images/icon_word-badge_kakao.png");
width: 14px;
height: 14px;
}
.icon_word-badge-mileage {
background-image: url("../images/icon_word-badge-mileage.png");
width: 14px;
height: 14px;
}
.icon_word-badge-point {
background-image: url("../images/icon_word-badge-point.png");
width: 14px;
height: 14px;
}
.icon_gift-badge {
background-image: url("../images/icon_gift-badge.png");
width: 14px;

171
src/main/resources/static/mngr/css/style.css
View File

@@ -6445,23 +6445,27 @@ main {
}
}
.text-order-recept {
color: #DA6525;
color: #E3A600;
}
.text-order-confirm {
color: #EA8729;
color: #7CB614;
}
.text-order-prep {
color: #ECB22A;
color: #27A40E;
}
.text-order-export {
color: #3061C2;
}
.text-order-delivery {
color: #3CAB50;
color: #8B41B7;
}
.text-order-complete {
color: #1c7ed6;
color: #C84172;
}
.text-order-gray {
@@ -6476,22 +6480,25 @@ main {
border-radius: 4px;
}
.order-status-badge.recept {
background-color: #DA6525;
background-color: #E3A600;
}
.order-status-badge.confirm {
background-color: #EA8729;
background-color: #7CB614;
}
.order-status-badge.prep {
background-color: #ECB22A;
background-color: #27A40E;
}
.order-status-badge.export {
background-color: #3061C2;
}
.order-status-badge.gray {
background-color: #979b9d;
}
.order-status-badge.delivery {
background-color: #3CAB50;
background-color: #8B41B7;
}
.order-status-badge.complete {
background-color: #1c7ed6;
background-color: #C84172;
}
.order-status-badge.black {
background-color: #3a3a37;
@@ -6499,43 +6506,53 @@ main {
.btn.recept {
color: #ffffff;
background-color: #DA6525;
background-color: #E3A600;
font-weight: 500;
}
.btn.recept:hover {
background-color: #cd5f23;
background-color: #ca9503;
}
.btn.confirm {
color: #ffffff;
background-color: #EA8729;
background-color: #7CB614;
font-weight: 500;
}
.btn.confirm:hover {
background-color: #e97f1b;
background-color: #7cb214;
}
.btn.prep {
color: #ffffff;
background-color: #ECB22A;
background-color: #27A40E;
font-weight: 500;
}
.btn.prep:hover {
background-color: #ebad1c;
background-color: #27a20e;
}
.btn.export {
color: #ffffff;
background-color: #3061C2;
font-weight: 500;
}
.btn.export:hover {
background-color: #3061c0;
}
.btn.delivery {
color: #ffffff;
background-color: #3CAB50;
background-color: #8B41B7;
font-weight: 500;
}
.btn.delivery:hover {
background-color: #38a04b;
background-color: #8b40b5;
}
.btn.complete {
color: #ffffff;
background-color: #1c7ed6;
background-color: #C84172;
font-weight: 500;
}
.btn.complete:hover {
background-color: #1a76c8;
background-color: #c84170;
}
.btn.gray {
color: #ffffff;
@@ -6547,38 +6564,41 @@ main {
}
.btn.delivery {
color: #ffffff;
background-color: #3CAB50;
background-color: #8B41B7;
font-weight: 500;
}
.btn.delivery:hover {
background-color: #38a04b;
background-color: #8b41b5;
}
.btn.complete {
color: #ffffff;
background-color: #1c7ed6;
background-color: #C84172;
font-weight: 500;
}
.btn.complete:hover {
background-color: #1a76c8;
background-color: #c84170;
}
.table.order-section .order-section__header {
border-bottom: 2px solid #dee2e6;
}
.table.order-section .order-section__header.recept {
border-color: #DA6525;
border-color: #E3A600;
}
.table.order-section .order-section__header.confirm {
border-color: #EA8729;
border-color: #7CB614;
}
.table.order-section .order-section__header.prep {
border-color: #ECB22A;
border-color: #27A40E;
}
.table.order-section .order-section__header.export {
border-color: #3061C2;
}
.table.order-section .order-section__header.delivery {
border-color: #3CAB50;
border-color: #8B41B7;
}
.table.order-section .order-section__header.complete {
border-color: #1c7ed6;
border-color: #C84172;
}
.table.order-section .order-section__header.gray {
border-color: #979b9d;
@@ -6704,19 +6724,22 @@ main {
transform: translateX(calc(-50% - 36px));
}
.order-step.recept {
background-color: #DA6525;
background-color: #E3A600;
}
.order-step.confirm {
background-color: #EA8729;
background-color: #7CB614;
}
.order-step.prep {
background-color: #ECB22A;
background-color: #27A40E;
}
.order-step.export {
background-color: #3061C2;
}
.order-step.delivery {
background-color: #3CAB50;
background-color: #8B41B7;
}
.order-step.complete {
background-color: #1c7ed6;
background-color: #C84172;
}
.order-step.gray {
background-color: #979b9d;
@@ -6743,22 +6766,25 @@ main {
word-break: break-all;
}
.order-number__content.recept {
color: #DA6525;
color: #E3A600;
}
.order-number__content.confirm {
color: #EA8729;
color: #7CB614;
}
.order-number__content.prep {
color: #ECB22A;
color: #27A40E;
}
.order-number__content.export {
color: #3061C2;
}
.order-number__content.gray {
color: #979b9d;
}
.order-number__content.delivery {
color: #3CAB50;
color: #8B41B7;
}
.order-number__content.complete {
color: #1c7ed6;
color: #C84172;
}
.order-number__btn-container {
display: inline-flex;
@@ -7262,22 +7288,25 @@ main {
color: #16191d;
}
.table.vertical td.order-detail-status.recept em {
color: #DA6525;
color: #E3A600;
}
.table.vertical td.order-detail-status.gray em {
color: #979b9d;
}
.table.vertical td.order-detail-status.confirm em {
color: #EA8729;
color: #7CB614;
}
.table.vertical td.order-detail-status.prep em {
color: #ECB22A;
color: #27A40E;
}
.table.vertical td.order-detail-status.export em {
color: #3061C2;
}
.table.vertical td.order-detail-status.delivery em {
color: #3CAB50;
color: #8B41B7;
}
.table.vertical td.order-detail-status.complete em {
color: #1c7ed6;
color: #C84172;
}
.order-detail-status__inner {
@@ -7434,6 +7463,16 @@ main {
border-top: 1px solid #f1f3f5;
}
.sendOut-info__reseller_erp td {
background-color: rgba(196, 250, 177, 0.9) !important;
}
.sendOut-info__reseller_erp td.table-empty-cell::before {
border-top: 1px solid #c4fab1;
}
.sendOut-info__reseller_erp td.table-empty-cell::after {
border-top: 1px solid #c4fab1;
}
.sendOut-orderDetail-trigger::after {
position: relative;
top: 3px;
@@ -7575,31 +7614,39 @@ main {
/* 주문 상태코드별 색 추가 add by jws */
.order-status-badge.ordr-sttus15 {
background-color: #DA6525;
background-color: #E3A600;
}
.order-status-badge.ordr-sttus25 {
background-color: #EA8729;
background-color: #7CB614;
}
.order-status-badge.ordr-sttus35 {
background-color: #ECB22A;
background-color: #27A40E;
}
.order-status-badge.ordr-sttus50 {
background-color: #3061C2;
}
.order-status-badge.ordr-sttus55 {
background-color: #3061C2;
}
.order-status-badge.ordr-sttus60 {
background-color: #3CAB50;
background-color: #8B41B7;
}
.order-status-badge.ordr-sttus65 {
background-color: #3CAB50;
background-color: #8B41B7;
}
.order-status-badge.ordr-sttus70 {
background-color: #1c7ed6;
background-color: #C84172;
}
.order-status-badge.ordr-sttus75 {
background-color: #1c7ed6;
background-color: #C84172;
}
.order-status-badge.ordr-sttus95 {
@@ -7611,31 +7658,39 @@ main {
}
.table.vertical td.order-detail-status.ordr-sttus15 em {
color: #DA6525;
color: #E3A600;
}
.table.vertical td.order-detail-status.ordr-sttus25 em {
color: #EA8729;
color: #7CB614;
}
.table.vertical td.order-detail-status.ordr-sttus35 em {
color: #ECB22A;
color: #27A40E;
}
.table.vertical td.order-detail-status.ordr-sttus50 em {
color: #3061C2;
}
.table.vertical td.order-detail-status.ordr-sttus55 em {
color: #3061C2;
}
.table.vertical td.order-detail-status.ordr-sttus60 em {
color: #3CAB50;
color: #8B41B7;
}
.table.vertical td.order-detail-status.ordr-sttus65 em {
color: #3CAB50;
color: #8B41B7;
}
.table.vertical td.order-detail-status.ordr-sttus70 em {
color: #1c7ed6;
color: #C84172;
}
.table.vertical td.order-detail-status.ordr-sttus75 em {
color: #1c7ed6;
color: #C84172;
}
.table.vertical td.order-detail-status.ordr-sttus95 em {

4
src/main/webapp/WEB-INF/views/admin/use/mngr/maJobUserListInqireRForm.jsp
View File

@@ -60,8 +60,8 @@
if (datePick != '') {
$(datePick).trigger('click');
} else {
$('#juscrbStrtDt').val('<c:out value="${resultMap.paramVO.juscrbStrtDt}"/>');
$('#juscrbEndDt').val('<c:out value="${resultMap.paramVO.juscrbEndDt}"/>');
$('#juscrbStrtDt').val('<c:out value="${resultMap.paramVO.srchStartDate}"/>');
$('#juscrbEndDt').val('<c:out value="${resultMap.paramVO.srchEndDate}"/>');
}
$('#srchStr').val('<c:out value="${resultMap.paramVO.srchStr}"/>');

4
src/main/webapp/WEB-INF/views/comm/admin/Include.jsp
View File

@@ -46,7 +46,7 @@
<%-- JS --%>
<script src="//t1.daumcdn.net/mapjsapi/bundle/postcode/prod/postcode.v2.js"></script>
<%--<script src="/webjars/jquery/3.7.1/jquery.min.js"></script>--%>
<script src="/admin/vendor/jquery-3.7.1.min.js""></script>
<script src="/admin/vendor/jquery-3.7.1.min.js"></script>
<%--<script src="/webjars/jquery-nice-select/1.1.0/js/jquery.nice-select.min.js"></script> --%>
<script src="/admin/vendor/jquery-nice-select/jquery.nice-select.min.js"></script>
<%--<script src="/webjars/jquery-ui/jquery-ui.min.js"></script>--%>
@@ -66,7 +66,7 @@
<script src="<c:url value='/jchartfx/js/jchartfx.coreVector.js'/>"></script>
<script src="<c:url value='/admin/js/script.js'/>" defer></script> <!-- ADMIN 스크립트 함수 -->
<script src="<c:url value='/js/gcone.js'/>"></script> <!-- 공통 스크립트 함수 -->
<script src="<c:url value='/js/mngr/gcone.js'/>"></script> <!-- 공통 스크립트 함수 -->
<meta name="robots" content="noindex,nofollow">
<script type="text/javascript">
$.ajaxSetup({