Merge branch 'master' of http://118.219.150.34:50501/DBNT/kcscDev into thkim
commit
855eea9820
Binary file not shown.
|
Before Width: | Height: | Size: 8.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 9.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 6.8 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 14 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.0 KiB After Width: | Height: | Size: 2.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
|
|
@ -7,30 +7,36 @@ function EgovFooter() {
|
|||
}else{
|
||||
return (
|
||||
<div className="footer">
|
||||
<div className="upper">
|
||||
<div className="row up">
|
||||
<div className="col-2 left"><span>건설기준코드 <br />건설기준위원회 <br />정보제공 <br /></span>센터소개</div>
|
||||
<div className="col-10 right"><span>건설기준코드 안내 | 건설기준코드 검색 | (구)건설기준 검색<br />
|
||||
진행현황 | 위원회 일정<br />
|
||||
공지사항 | Q&A | 수요조사 | 주요행사 | 건설교육안내 | 기술자료 | 보도자료 | 관련사이트 | API서비스 | 영문기준 제공 | 건설기준용어 | 건설기준 연구 <br /></span>
|
||||
인사말 | 연혁 | 홍보자료 | 주요업무 | 찾아오시는길
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div className="inner">
|
||||
<h1>
|
||||
<Link to="">
|
||||
국가건설 기준센터
|
||||
{/*<img className="w" src="/assets/images/logo_footer_w.png" alt="" />
|
||||
<img className="m" src="/assets/images/logo_footer_m.png" alt="" />*/}
|
||||
</Link>
|
||||
<img className="w" src="/assets/images/copy3.png" alt="" />
|
||||
</h1>
|
||||
<div className="info">
|
||||
<p>
|
||||
대표문의메일 : kcsc@kict.re.kr <span className="m_hide">|</span><br className="m_show" /> 대표전화 : 0000-0000 (000-0000-0000)<br />
|
||||
호환성확인 : 000-0000-0000 | 교육문의 : 0000-0000-0000
|
||||
상호명 : 한국건설기술연구원 <span className="m_hide">|</span> 대표자 : 김병석 | 대표메일 : kcsc@kict.re.kr<br />
|
||||
사업자등록번호 : 229-82-01135 | 주소 : 경기도 고양시 일산서구 고양대로 283(대화동)
|
||||
</p>
|
||||
<p className="copy">Copyright © 2021 Ministry Of The Interior And Safety. All Rights Reserved.</p>
|
||||
<p className="copy">Copyright © 2011 KOREA INSTITUTE of CIVIL ENGINEERING and BUILDING TECHNOLOGY. All Rights Reserved.</p>
|
||||
</div>
|
||||
<div className="right_col">
|
||||
<Link to="">
|
||||
<img className="w" src="/assets/images/banner_w_01.png" alt="" />
|
||||
<img className="m" src="/assets/images/banner_m_01.png" alt="" />
|
||||
</Link>
|
||||
<Link to="">
|
||||
<img className="w" src="/assets/images/banner_w_02.png" alt="" />
|
||||
<img className="m" src="/assets/images/banner_m_02.png" alt="" />
|
||||
</Link>
|
||||
{/*<Link to="">*/}
|
||||
{/* <img className="w" src="/assets/images/banner_w_01.png" alt="" />*/}
|
||||
{/* <img className="m" src="/assets/images/banner_m_01.png" alt="" />*/}
|
||||
{/*</Link>*/}
|
||||
{/*<Link to="">*/}
|
||||
{/* <img className="w" src="/assets/images/banner_w_02.png" alt="" />*/}
|
||||
{/* <img className="m" src="/assets/images/banner_m_02.png" alt="" />*/}
|
||||
{/*</Link>*/}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -71,21 +71,34 @@ function EgovHeader({ loginUser, onChangeLogin }) {
|
|||
<div className="header">
|
||||
<div className="inner">
|
||||
<h1 className="logo">
|
||||
<Link to={URL.MAIN} className="w">국가건설기준센터</Link>{/*<img src="/assets/images/logo_w.png" alt="국가건설기준센터" />*/}
|
||||
<Link to={URL.MAIN} className="m">국가건설기준센터</Link>{/*<img src="/assets/images/logo_m.png" alt="국가건설기준센터" />*/}
|
||||
<Link to={URL.MAIN} className="w">
|
||||
<div className="logotop"><img src="/assets/images/copy.png" alt="국가건설기준센터" /></div><img src="/assets/images/logo.png" alt="국가건설기준센터" /></Link>
|
||||
<Link to={URL.MAIN} className="m"><img src="/assets/images/logo_m.png" alt="국가건설기준센터" /></Link>{/*<img src="/assets/images/logo_m.png" alt="국가건설기준센터" />*/}
|
||||
</h1>
|
||||
|
||||
<div className="gnb">
|
||||
<h2 className="blind">주메뉴</h2>
|
||||
<ul>
|
||||
<li><NavLink to={URL.STANDARD_CODE_INFO} className={({ isActive }) => (isActive ? "cur" : "")}>건설기준코드</NavLink></li>
|
||||
{/*<li><NavLink to={URL.ABOUT} className={({ isActive }) => (isActive ? "cur" : "")}>사이트소개</NavLink></li>*/}
|
||||
<li><NavLink to={URL.INTRO} className={({ isActive }) => (isActive ? "cur" : "")}>정보마당</NavLink></li>
|
||||
<li><NavLink to={URL.SUPPORT} className={({ isActive }) => (isActive ? "cur" : "")}>고객지원</NavLink></li>
|
||||
<li><NavLink to={URL.INFORM} className={({ isActive }) => (isActive ? "cur" : "")}>알림마당</NavLink></li>
|
||||
{sessionUserSe ==='ACC_TP01' &&
|
||||
<li><NavLink to={URL.ADMIN} className={({ isActive }) => (isActive ? "cur" : "")}>사이트관리</NavLink></li>
|
||||
}
|
||||
<div className="row ">
|
||||
<div className="w-100">
|
||||
<form className="form-inline">
|
||||
<div className="input-group w-75" style={{ border: "2px solid #1c488f", borderRadius: "20px", padding: "10px", width: "fit-content" }}>
|
||||
<input type="text" className="form-control border-0" placeholder="검색어를 입력하세요." />
|
||||
<div className="input-group-append">
|
||||
<button type="button" className="topsearch"></button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
{/*<li><NavLink to={URL.STANDARD_CODE_INFO} className={({ isActive }) => (isActive ? "cur" : "")}>건설기준코드</NavLink></li>*/}
|
||||
{/*/!*<li><NavLink to={URL.ABOUT} className={({ isActive }) => (isActive ? "cur" : "")}>사이트소개</NavLink></li>*!/*/}
|
||||
{/*<li><NavLink to={URL.INTRO} className={({ isActive }) => (isActive ? "cur" : "")}>정보마당</NavLink></li>*/}
|
||||
{/*<li><NavLink to={URL.SUPPORT} className={({ isActive }) => (isActive ? "cur" : "")}>고객지원</NavLink></li>*/}
|
||||
{/*<li><NavLink to={URL.INFORM} className={({ isActive }) => (isActive ? "cur" : "")}>알림마당</NavLink></li>*/}
|
||||
{/*{sessionUserSe ==='ACC_TP01' &&*/}
|
||||
{/* <li><NavLink to={URL.ADMIN} className={({ isActive }) => (isActive ? "cur" : "")}>사이트관리</NavLink></li>*/}
|
||||
{/*}*/}
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,16 +5,17 @@ body {min-width: 1400px;}
|
|||
.header {position: relative;}
|
||||
.header::after {content: ""; display: block; position: absolute; left: 0; bottom: 0; width: 100%; height: 1px; background: #dedede;}
|
||||
.header > .inner {position: relative; width: 1400px; height: 150px; margin: 0 auto; padding: 0 50px;}
|
||||
.header h1 {display: inline-block; margin-top: 62px;}
|
||||
.header h1 {display: inline-block; margin-top: 32px;}
|
||||
.header h1 a,
|
||||
.header h1 img {display: block;}
|
||||
.header .logo .m {display: none;}
|
||||
.header .user_info {position: absolute; right: 50px; top: 20px; line-height: 30px;}
|
||||
.header .logo .logotop {display: flex; width: 220px; justify-content: flex-end;}
|
||||
.header .user_info {position: absolute; right: 50px; top: 10px; line-height: 30px;}
|
||||
.header .user_info .person {display: inline-block; color: #169bd5; font-weight: 500;}
|
||||
.header .user_info .person::before {content: ""; display: inline-block; width: 22px; height: 22px; margin-right: 7px; background: url(css/images/ico_person.png) no-repeat; background-size: contain; vertical-align: -4px;}
|
||||
.header .user_info .btn {margin-left: 14px; padding: 0 20px; border-radius: 15px; color: #fff; font-size: 14px; line-height: 30px; background: #169bd5;}
|
||||
|
||||
.header .gnb {position: absolute; left: 430px; top: 78px; width: 920px;}
|
||||
.header .gnb {position: absolute; left: 430px; top: 50px; width: 920px;}
|
||||
.header .gnb ul {font-size: 0; text-align: center;}
|
||||
.header .gnb ul::after {content: ""; display: block; clear: both;}
|
||||
.header .gnb ul li {float: left;}
|
||||
|
|
@ -22,11 +23,13 @@ body {min-width: 1400px;}
|
|||
.header .gnb ul li a {color: #666; font-size: 20px; font-weight: 700; letter-spacing: -0.25px;}
|
||||
.header .gnb ul li a.cur {color: #222;}
|
||||
|
||||
.header .right_a {position: absolute; right: 50px; top: 75px;}
|
||||
.header .right_a {position: absolute; right: 50px; top: 65px;}
|
||||
.header .right_a .btn {width: 30px; height: 30px; font-size: 0; background: url(css/images/ico_allmenu.png) no-repeat right; background-size: 22px 18px;}
|
||||
.header .right_a .btn.active {background: url(css/images/ico_allmenu_close.png) no-repeat right; background-size: 22px 18px;}
|
||||
.header .right_a .btn.mobile {display: none;}
|
||||
|
||||
.header .topsearch {width: 25px; height: 27px; background: url(css/images/ico_search_b.png) no-repeat; margin: 5px;}
|
||||
|
||||
/* All menu */
|
||||
.all_menu {transition: transform .2s ease-in-out, opacity .2s ease-in-out; transform-origin: top; z-index: 10;}
|
||||
.all_menu.Mobile {display: none;}
|
||||
|
|
@ -75,14 +78,18 @@ body {min-width: 1400px;}
|
|||
.location ul li a.home::before {content: ""; display: block; position: absolute; left: 0; top: 3px; width: 14px; height: 13px; background: url(css/images/ico_home.png) no-repeat;}
|
||||
|
||||
|
||||
.footer {position: relative; height: 180px;}
|
||||
.footer {position: relative; background-color: #2c394b; }
|
||||
.footer .upper {width: 100%; background-color: #384556; font-size: 12px;}
|
||||
.footer .upper .up {width: 1400px; margin: 0 auto; padding: 10px 50px; }
|
||||
.footer .upper .up .left {text-align: right; color: #B4B5B7; font-weight: 700;}
|
||||
.footer .upper .up .right {color: #96A1AE; }
|
||||
.footer::before {content: ""; display: block; position: absolute; left: 0; top: 0; width: 100%; height: 1px; background: #ccc;}
|
||||
.footer .inner {position: relative; width: 1400px; margin: 0 auto; padding: 0 50px;}
|
||||
.footer .inner::after {content: ""; display: block; clear: both;}
|
||||
.footer h1 {float: left; width: 220px; padding-top: 50px;}
|
||||
.footer h1 {float: left; width: 220px; padding-top: 20px;}
|
||||
.footer h1 .m {display: none;}
|
||||
.footer .info {float: left; padding-top: 44px; color: #888; font-size: 16px; line-height: 26px;}
|
||||
.footer .info .copy {margin-top: 12px;}
|
||||
.footer .info {float: left; padding: 14px 10px; color: #888; font-size: 13px; }
|
||||
.footer .info .copy {padding-top: 5px;}
|
||||
.footer .info .m_show {display: none;}
|
||||
.footer .right_col {position: absolute; right: 0; top: 73px; font-size: 0;}
|
||||
.footer .right_col a {display: inline-block; margin-right: 60px; vertical-align: top;}
|
||||
|
|
|
|||
|
|
@ -6,12 +6,15 @@ import URL from 'constants/url';
|
|||
import { default as EgovLeftNav } from 'components/leftmenu/EgovLeftNavAdmin';
|
||||
import * as EgovNet from "../../../api/egovFetch";
|
||||
import Modal from "react-bootstrap/Modal";
|
||||
import SurveyModal from "./survey/SurveyModal";
|
||||
import QuestionModal from "./survey/QuestionModal";
|
||||
|
||||
|
||||
function Survey({}) {
|
||||
|
||||
const [listTag, setListTag] = useState([]);
|
||||
const [show, setShow] = useState(false);
|
||||
const [modalSize, setModalSize] = useState("md");
|
||||
const [modalBody, setModalBody] = useState();
|
||||
|
||||
const handleClose = () => setShow(false);
|
||||
|
|
@ -34,7 +37,7 @@ function Survey({}) {
|
|||
<div className={"list_item"} key={"surveyListDiv_"+index}>
|
||||
<div>{item.svyTitle}</div>
|
||||
<div>{item.svyStartDt}~{item.svyEndDt}</div>
|
||||
<div><button className={"btn btn_blue_h31 px-1"}>질문관리</button></div>
|
||||
<div><button className={"btn btn_blue_h31 px-1"} onClick={()=>{editSurveyQt(item)}}>질문관리</button></div>
|
||||
<div></div>
|
||||
<div><button className={"btn btn_blue_h31 px-1"}>설문지 보기</button></div>
|
||||
<div><button className={"btn btn_blue_h31 px-1"}>통계 보기</button></div>
|
||||
|
|
@ -56,9 +59,16 @@ function Survey({}) {
|
|||
);
|
||||
},[]);
|
||||
|
||||
function editSurvey(){
|
||||
function editSurvey(item){
|
||||
handleShow();
|
||||
setModalBody(<></>);
|
||||
setModalSize("md")
|
||||
setModalBody(<SurveyModal savedInfo={item} reloadFunction={retrieveList}></SurveyModal>);
|
||||
}
|
||||
|
||||
function editSurveyQt(item){
|
||||
handleShow();
|
||||
setModalSize("xl")
|
||||
setModalBody(<QuestionModal svySeq={item.svySeq}></QuestionModal>);
|
||||
}
|
||||
|
||||
useEffect(()=>{
|
||||
|
|
@ -104,7 +114,7 @@ function Survey({}) {
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<Modal show={show} onHide={handleClose} keyboard={false}>
|
||||
<Modal size={modalSize} show={show} onHide={handleClose} keyboard={false} scrollable>
|
||||
{modalBody}
|
||||
</Modal>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,141 @@
|
|||
import React, {useEffect, useState} from "react";
|
||||
import Modal from "react-bootstrap/Modal";
|
||||
import Row from "react-bootstrap/Row";
|
||||
import Col from "react-bootstrap/Col";
|
||||
import Form from "react-bootstrap/Form";
|
||||
import Table from "react-bootstrap/Table";
|
||||
import * as EgovNet from "api/egovFetch";
|
||||
|
||||
function QuestionModal({svySeq}){
|
||||
|
||||
const [qtTag, setQtTag] = useState([]);
|
||||
const [itemTag, setItemTag] = useState([]);
|
||||
|
||||
function getSurveyQt(){
|
||||
EgovNet.requestFetch(
|
||||
'/admin/survey/edit-qt?svySeq='+svySeq,
|
||||
{
|
||||
method: "GET"
|
||||
},
|
||||
(resp) => {
|
||||
|
||||
const temp = [];
|
||||
resp.result.qtList.forEach(function (qt, index){
|
||||
temp.push(
|
||||
<tr>
|
||||
<td className={"clickable"} onClick={()=>selectQt(qt.itemList)}>
|
||||
<Form.Control type={"text"} defaultValue={qt.qtTitle}/>
|
||||
</td>
|
||||
</tr>
|
||||
)
|
||||
})
|
||||
setQtTag(temp);
|
||||
|
||||
},
|
||||
function (resp) {
|
||||
console.log("err response : ", resp);
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
function selectQt(itemList){
|
||||
const temp = [];
|
||||
itemList.forEach(function (item, index){
|
||||
temp.push(
|
||||
<tr>
|
||||
<td>
|
||||
<Form.Control type={"text"} defaultValue={item.itemNm}/>
|
||||
</td>
|
||||
</tr>
|
||||
)
|
||||
})
|
||||
setItemTag(temp);
|
||||
}
|
||||
|
||||
function addQt(){
|
||||
const temp = [...qtTag]
|
||||
temp.push(
|
||||
<tr>
|
||||
<td>
|
||||
<Form.Control type={"text"}/>
|
||||
</td>
|
||||
</tr>
|
||||
)
|
||||
setQtTag(temp)
|
||||
}
|
||||
|
||||
function addItem(){
|
||||
const temp = [...itemTag]
|
||||
temp.push(
|
||||
<tr>
|
||||
<td>
|
||||
<Form.Control type={"text"}/>
|
||||
</td>
|
||||
</tr>
|
||||
)
|
||||
setItemTag(temp)
|
||||
}
|
||||
|
||||
function editSurveyQt(e){
|
||||
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
getSurveyQt()
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<>
|
||||
<Modal.Header closeButton>
|
||||
<Modal.Title>질문관리</Modal.Title>
|
||||
</Modal.Header>
|
||||
<Modal.Body>
|
||||
<Row>
|
||||
<Col xs={6}>
|
||||
<Table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>질문</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{qtTag}
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td>
|
||||
<button className={"btn btn_blue_h31"} onClick={addQt}>추가</button>
|
||||
</td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</Table>
|
||||
</Col>
|
||||
<Col xs={6}>
|
||||
<Table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>보기</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{itemTag}
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td>
|
||||
<button className={"btn btn_blue_h31"} onClick={addItem}>추가</button>
|
||||
</td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</Table>
|
||||
</Col>
|
||||
</Row>
|
||||
</Modal.Body>
|
||||
<Modal.Footer>
|
||||
<button type="button" className={"btn btn_blue_h31 px-3"}>저장</button>
|
||||
</Modal.Footer>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
export default QuestionModal;
|
||||
|
|
@ -0,0 +1,107 @@
|
|||
import React from "react";
|
||||
import Modal from "react-bootstrap/Modal";
|
||||
import Form from "react-bootstrap/Form";
|
||||
import Row from "react-bootstrap/Row";
|
||||
import Col from "react-bootstrap/Col";
|
||||
import * as EgovNet from "api/egovFetch";
|
||||
import CODE from "constants/code";
|
||||
|
||||
function SurveyModal({savedInfo, reloadFunction}){
|
||||
|
||||
function editSurvey(e){
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
const form = e.target;
|
||||
const info = {
|
||||
menuId: form.menuId.value,
|
||||
menuTitle: form.menuTitle.value,
|
||||
menuGroup: form.menuGroup.value,
|
||||
menuLevel: form.menuLevel.value,
|
||||
menuSort: form.menuSort.value,
|
||||
menuUrl: form.menuUrl.value,
|
||||
menuTypeCd: form.menuTypeCd.value,
|
||||
}
|
||||
EgovNet.requestFetch(
|
||||
'/admin/config/menu-mgt',
|
||||
{
|
||||
method: "PUT",
|
||||
headers: {
|
||||
'Content-type': 'application/json'
|
||||
},
|
||||
body: JSON.stringify(info)
|
||||
},
|
||||
(resp) => {
|
||||
if (Number(resp.resultCode) === Number(CODE.RCV_SUCCESS)) {
|
||||
alert("저장되었습니다.")
|
||||
reloadFunction();
|
||||
}else if(Number(resp.resultCode) === Number(CODE.RCV_ERROR_AUTH)){
|
||||
console.log("토큰 갱신중.")
|
||||
}else{
|
||||
alert(resp.resultMessage)
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<Modal.Header closeButton>
|
||||
<Modal.Title>
|
||||
{savedInfo!==undefined?savedInfo?.svyTitle:'설문 생성'}
|
||||
</Modal.Title>
|
||||
</Modal.Header>
|
||||
<Modal.Body>
|
||||
<Form onSubmit={(e) =>{editSurvey(e)}} noValidate>
|
||||
<Form.Group as={Row} className="mb-3">
|
||||
<Form.Label column sm={3}>
|
||||
제목
|
||||
</Form.Label>
|
||||
<Col sm={9}>
|
||||
<Form.Control type="email" name="svyTitle" required defaultValue={savedInfo?.svyTitle} />
|
||||
</Col>
|
||||
</Form.Group>
|
||||
<Form.Group as={Row} className="mb-3">
|
||||
<Form.Label column sm={3}>
|
||||
설명
|
||||
</Form.Label>
|
||||
<Col sm={9}>
|
||||
<Form.Control as={"textarea"} name="svyDesc" rows={3} defaultValue={savedInfo?.svyDesc}/>
|
||||
</Col>
|
||||
</Form.Group>
|
||||
<Form.Group as={Row} className="mb-3">
|
||||
<Form.Label column sm={3}>
|
||||
시작일
|
||||
</Form.Label>
|
||||
<Col sm={9}>
|
||||
<Form.Control type="text" name="svyStartDt" required defaultValue={savedInfo?.svyStartDt} />
|
||||
</Col>
|
||||
</Form.Group>
|
||||
<Form.Group as={Row} className="mb-3">
|
||||
<Form.Label column sm={3}>
|
||||
종료일
|
||||
</Form.Label>
|
||||
<Col sm={9}>
|
||||
<Form.Control type="text" name="svyEndDt" required defaultValue={savedInfo?.svyEndDt} />
|
||||
</Col>
|
||||
</Form.Group>
|
||||
<Form.Group as={Row} className="mb-3">
|
||||
<Form.Label column sm={3}>
|
||||
첨부파일
|
||||
</Form.Label>
|
||||
<Col sm={9}>
|
||||
<Form.Control type="text" name="fileGrpId" selectedValue={savedInfo?.fileGrpId}/>
|
||||
</Col>
|
||||
</Form.Group>
|
||||
<Row className="mb-3">
|
||||
<Col xs={10}></Col>
|
||||
<Col xs={2}>
|
||||
<button type="submit" className={"btn btn_blue_h31 px-3"}>저장</button>
|
||||
</Col>
|
||||
</Row>
|
||||
</Form>
|
||||
</Modal.Body>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
export default SurveyModal;
|
||||
|
|
@ -1,9 +1,10 @@
|
|||
package com.dbnt.kcscbackend.admin.contents.survey;
|
||||
|
||||
import com.dbnt.kcscbackend.admin.contents.survey.entity.TnSurvey;
|
||||
import com.dbnt.kcscbackend.admin.contents.survey.service.AdminSurveyService;
|
||||
import com.dbnt.kcscbackend.auth.entity.LoginVO;
|
||||
import com.dbnt.kcscbackend.config.common.ResultVO;
|
||||
import com.dbnt.kcscbackend.config.util.ClientUtils;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.security.core.annotation.AuthenticationPrincipal;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
|
@ -22,7 +23,7 @@ public class AdminSurveyController {
|
|||
private final AdminSurveyService adminSurveyService;
|
||||
|
||||
@RequestMapping(method = RequestMethod.GET, value = "/list")
|
||||
public ResultVO getSurveyList(HttpServletRequest request, @AuthenticationPrincipal LoginVO user) throws Exception{
|
||||
public ResultVO getSurveyList() throws Exception{
|
||||
|
||||
ResultVO resultVO = new ResultVO();
|
||||
Map<String, Object> resultMap = new HashMap<>();
|
||||
|
|
@ -30,4 +31,24 @@ public class AdminSurveyController {
|
|||
resultVO.setResult(resultMap);
|
||||
return resultVO;
|
||||
}
|
||||
|
||||
@RequestMapping(method = RequestMethod.GET, value = "/edit")
|
||||
public ResultVO surveyEdit(TnSurvey survey) throws Exception{
|
||||
|
||||
ResultVO resultVO = new ResultVO();
|
||||
Map<String, Object> resultMap = new HashMap<>();
|
||||
resultMap.put("survey", adminSurveyService.selectSurvey(survey));
|
||||
resultVO.setResult(resultMap);
|
||||
return resultVO;
|
||||
}
|
||||
|
||||
@RequestMapping(method = RequestMethod.GET, value = "/edit-qt")
|
||||
public ResultVO surveyEditQt(TnSurvey survey) throws Exception{
|
||||
|
||||
ResultVO resultVO = new ResultVO();
|
||||
Map<String, Object> resultMap = new HashMap<>();
|
||||
resultMap.put("qtList", adminSurveyService.selectSurveyQt(survey));
|
||||
resultVO.setResult(resultMap);
|
||||
return resultVO;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,12 +6,11 @@ import lombok.Setter;
|
|||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Id;
|
||||
import javax.persistence.Table;
|
||||
import javax.persistence.*;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
|
|
@ -41,4 +40,7 @@ public class TnSurveyQt {
|
|||
private String etcYn;
|
||||
@Column(name = "old_seq")
|
||||
private Integer oldSeq;
|
||||
|
||||
@Transient
|
||||
private List<TnSurveyQtItem> itemList = new ArrayList<>();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,5 +3,8 @@ package com.dbnt.kcscbackend.admin.contents.survey.repository;
|
|||
import com.dbnt.kcscbackend.admin.contents.survey.entity.TnSurveyQtItem;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface TnSurveyQtItemRepository extends JpaRepository<TnSurveyQtItem, Integer> {
|
||||
List<TnSurveyQtItem> findByQtSeqInOrderByQtItemSeq(List<Integer> qtSeqList);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,5 +3,8 @@ package com.dbnt.kcscbackend.admin.contents.survey.repository;
|
|||
import com.dbnt.kcscbackend.admin.contents.survey.entity.TnSurveyQt;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface TnSurveyQtRepository extends JpaRepository<TnSurveyQt, Integer> {
|
||||
List<TnSurveyQt> findBySvySeqOrderByQtSeq(Integer svySeq);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,15 @@
|
|||
package com.dbnt.kcscbackend.admin.contents.survey.service;
|
||||
|
||||
import com.dbnt.kcscbackend.admin.contents.survey.entity.TnSurvey;
|
||||
import com.dbnt.kcscbackend.admin.contents.survey.entity.TnSurveyQt;
|
||||
import com.dbnt.kcscbackend.admin.contents.survey.entity.TnSurveyQtItem;
|
||||
import com.dbnt.kcscbackend.admin.contents.survey.repository.TnSurveyQtItemRepository;
|
||||
import com.dbnt.kcscbackend.admin.contents.survey.repository.TnSurveyQtRepository;
|
||||
import com.dbnt.kcscbackend.admin.contents.survey.repository.TnSurveyRepository;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
|
|
@ -19,4 +22,25 @@ public class AdminSurveyService {
|
|||
public List<TnSurvey> selectSurveyList() {
|
||||
return surveyRepository.findAllByOrderBySvySeqDesc();
|
||||
}
|
||||
|
||||
public TnSurvey selectSurvey(TnSurvey survey) {
|
||||
return surveyRepository.findById(survey.getSvySeq()).orElse(null);
|
||||
}
|
||||
|
||||
public List<TnSurveyQt> selectSurveyQt(TnSurvey survey) {
|
||||
List<TnSurveyQt> qtList = qtRepository.findBySvySeqOrderByQtSeq(survey.getSvySeq());
|
||||
List<Integer> qtSeqList = new ArrayList<>();
|
||||
for(TnSurveyQt qt: qtList){
|
||||
qtSeqList.add(qt.getQtSeq());
|
||||
}
|
||||
List<TnSurveyQtItem> itemList = itemRepository.findByQtSeqInOrderByQtItemSeq(qtSeqList);
|
||||
for(TnSurveyQt qt: qtList){
|
||||
for(TnSurveyQtItem item: itemList){
|
||||
if(qt.getQtSeq().equals(item.getQtSeq())){
|
||||
qt.getItemList().add(item);
|
||||
}
|
||||
}
|
||||
}
|
||||
return qtList;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue