From 5db2e775bde2b19729e14b6ee82e198ec75883b0 Mon Sep 17 00:00:00 2001 From: dbnt-design Date: Fri, 3 Nov 2023 10:04:51 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EB=A9=94=EC=9D=B8=ED=99=94=EB=A9=B4=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=EB=B3=84=20=EA=B2=8C=EC=8B=9C=ED=8C=90=20?= =?UTF-8?q?=EB=B6=84=EB=A6=AC=EC=9E=91=EC=97=85=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/App.js | 1 + .../src/constants/url.js | 5 ++- .../src/css/Custom/customMain.css | 10 ++++++ .../src/pages/main/EgovMain.jsx | 36 +++++++++---------- .../pages/standardCode/StandardCodeList.jsx | 7 ++-- 5 files changed, 37 insertions(+), 22 deletions(-) create mode 100644 egovframe-template-simple-react-contribution/src/css/Custom/customMain.css diff --git a/egovframe-template-simple-react-contribution/src/App.js b/egovframe-template-simple-react-contribution/src/App.js index de4415a..8095686 100644 --- a/egovframe-template-simple-react-contribution/src/App.js +++ b/egovframe-template-simple-react-contribution/src/App.js @@ -7,6 +7,7 @@ import './css/layout.css'; import './css/component.css'; import './css/page.css'; import './css/response.css'; +import './css/Custom/customMain.css' function App() { diff --git a/egovframe-template-simple-react-contribution/src/constants/url.js b/egovframe-template-simple-react-contribution/src/constants/url.js index 220a62b..32ddaa5 100644 --- a/egovframe-template-simple-react-contribution/src/constants/url.js +++ b/egovframe-template-simple-react-contribution/src/constants/url.js @@ -76,10 +76,13 @@ const URL = { ADMIN_MANAGER : "/admin/manager/", // 사이트관리/사이트관리자 암호변경 기능 추가 2023.04.15(토) 김일국 //기준코드 - STANDARD_CODE_LIST : "/standardCode/list", //건설기준코드/리스트 + STANDARD_CODE_LIST : "/standardCode/list/:listCode", //건설기준코드/리스트 STANDARD_CODE_DETAIL : "/standardCode/detail", //건설기준코드/리스트 STANDARD_CODE_VIEWER : "/standardCode/viewer", //건설기준코드/뷰어 STANDARD_CODE_VIEWER_LINK : "/standardCode/viewer/:linkedDocCode", //건설기준코드/뷰어/새 창 링크 + + + } export default URL; \ No newline at end of file diff --git a/egovframe-template-simple-react-contribution/src/css/Custom/customMain.css b/egovframe-template-simple-react-contribution/src/css/Custom/customMain.css new file mode 100644 index 0000000..98cc9d4 --- /dev/null +++ b/egovframe-template-simple-react-contribution/src/css/Custom/customMain.css @@ -0,0 +1,10 @@ +.mainbnt { + height: 35px; + line-height: 35px; + display: block; + background-color: gray; + text-align: center; + border-radius: 13px; + color: white; + margin: 5px; +} \ No newline at end of file diff --git a/egovframe-template-simple-react-contribution/src/pages/main/EgovMain.jsx b/egovframe-template-simple-react-contribution/src/pages/main/EgovMain.jsx index 675d0c0..13f04fc 100644 --- a/egovframe-template-simple-react-contribution/src/pages/main/EgovMain.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/main/EgovMain.jsx @@ -108,24 +108,24 @@ function EgovMain(props) { {/*단순 홈페이지 전자정부 표준프레임워크의 경량환경 내부업무에 대한 최신 정보와 기술을 제공하고 있습니다.*/}

건설기준코드 검색

- - - - - - - - - - - - - - - - - - + 공통코드 + 지반코드 + 구조코드 + 내진코드 + 가설코드 + 교량코드 + 터널코드 + 공동구코드 + 설비코드 + 조경코드 + 건축코드 + 도로코드 + 철도코드 + 하천코드 + 댐코드 + 상수도코드 + 하수도코드 + 농업기반코드 {/* diff --git a/egovframe-template-simple-react-contribution/src/pages/standardCode/StandardCodeList.jsx b/egovframe-template-simple-react-contribution/src/pages/standardCode/StandardCodeList.jsx index 24648f8..fddef50 100644 --- a/egovframe-template-simple-react-contribution/src/pages/standardCode/StandardCodeList.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/standardCode/StandardCodeList.jsx @@ -1,5 +1,5 @@ import React, { useState, useEffect, useCallback, useRef } from 'react'; -import { Link, useLocation } from 'react-router-dom'; +import {Link, useLocation, useParams} from 'react-router-dom'; import * as EgovNet from 'api/egovFetch'; import URL from 'constants/url'; @@ -7,13 +7,14 @@ import { NOTICE_BBS_ID } from 'config'; import { default as EgovLeftNav } from 'components/leftmenu/EgovLeftNavInform'; import EgovPaging from 'components/EgovPaging'; - import { itemIdxByPage } from 'utils/calc'; function StandardCodeList(props) { + const {listCode} = useParams(); console.group("StandardCodeList"); console.log("[Start] StandardCodeList ------------------------------"); console.log("StandardCodeList [props] : ", props); + console.log("listcode----------------------------"+listCode); const location = useLocation(); console.log("StandardCodeList [location] : ", location); @@ -106,7 +107,7 @@ function StandardCodeList(props) { console.log("------------------------------StandardCodeList [End]"); console.groupEnd("StandardCodeList"); return ( -
+
{/* */}
From eb7e6ad202eabd999f6a73fd2a046d566d16e34c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9C=A0=EB=AF=BC=ED=98=95?= Date: Fri, 3 Nov 2023 11:24:34 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EA=B8=B0=EC=A4=80=EC=BD=94=EB=93=9C?= =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20where=EC=A0=88=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/standardCode/StandardCodeList.jsx | 2 +- .../standardCode/StandardCodeController.java | 1 + .../standardCode/entity/TnDocumentInfo.java | 2 + .../mybatisMapper/StandardCodeMapper.xml | 82 +++++++++++-------- 4 files changed, 51 insertions(+), 36 deletions(-) diff --git a/egovframe-template-simple-react-contribution/src/pages/standardCode/StandardCodeList.jsx b/egovframe-template-simple-react-contribution/src/pages/standardCode/StandardCodeList.jsx index fddef50..d2957bb 100644 --- a/egovframe-template-simple-react-contribution/src/pages/standardCode/StandardCodeList.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/standardCode/StandardCodeList.jsx @@ -25,7 +25,7 @@ function StandardCodeList(props) { const bbsId = location.state?.bbsId || NOTICE_BBS_ID; // eslint-disable-next-line no-unused-vars - const [searchCondition, setSearchCondition] = useState(location.state?.searchCondition || { bbsId: bbsId, pageIndex: 1, searchCnd: '0', searchWrd: '' });// 기존 조회에서 접근 했을 시 || 신규로 접근 했을 시 + const [searchCondition, setSearchCondition] = useState(location.state?.searchCondition || { listCode: listCode, pageIndex: 1, searchCnd: '0', searchWrd: '' });// 기존 조회에서 접근 했을 시 || 신규로 접근 했을 시 const [masterBoard, setMasterBoard] = useState({}); const [paginationInfo, setPaginationInfo] = useState({}); diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/StandardCodeController.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/StandardCodeController.java index e600b6c..30e9aca 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/StandardCodeController.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/StandardCodeController.java @@ -110,6 +110,7 @@ public class StandardCodeController extends BaseController { paginationInfo.setPageSize(propertyService.getInt("Globals.pageSize")); System.out.println("@@@ pageIndex : " + tnDocumentInfo.getPageIndex()); + System.out.println("@@@ listCode : " + tnDocumentInfo.getListCode()); tnDocumentInfo.setFirstIndex(paginationInfo.getFirstRecordIndex()); tnDocumentInfo.setLastIndex(paginationInfo.getLastRecordIndex()); diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/entity/TnDocumentInfo.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/entity/TnDocumentInfo.java index 1e9fd2f..a6d3da8 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/entity/TnDocumentInfo.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/entity/TnDocumentInfo.java @@ -101,4 +101,6 @@ public class TnDocumentInfo { private int recordCountPerPage = 10; @Schema(description = "레코드 번호") private int rowNo = 0; + @Schema(description = "") + private String listCode; } \ No newline at end of file diff --git a/kcsc-back-end/src/main/resources/mybatisMapper/StandardCodeMapper.xml b/kcsc-back-end/src/main/resources/mybatisMapper/StandardCodeMapper.xml index f90da37..4346d7c 100644 --- a/kcsc-back-end/src/main/resources/mybatisMapper/StandardCodeMapper.xml +++ b/kcsc-back-end/src/main/resources/mybatisMapper/StandardCodeMapper.xml @@ -5,48 +5,60 @@ + + + and tdi.group_seq = tdg.group_seq + and tdi.kcsc_cd like 'KDS%' + and tdi.last_yn = 'Y' + and tdi.use_yn = 'Y' + + and tdg.group_full_cd like #{listCode} || '%' + + + + \ No newline at end of file From 4133deb020c77388c29997dd4ddb999de7bd974e Mon Sep 17 00:00:00 2001 From: dbnt-design Date: Fri, 3 Nov 2023 16:09:59 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EA=B0=9C=EC=A0=95=EC=9D=B4=EB=A0=A5?= =?UTF-8?q?=EB=AA=A8=EB=8B=AC=EC=B0=BD=EA=B8=B0=EB=8A=A5=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/css/Custom/customMain.css | 5 ++++- .../src/pages/main/EgovMain.jsx | 22 +------------------ .../pages/standardCode/StandardCodeList.jsx | 18 +++++++++++++-- .../standardCode/StandardCodeListModal.js | 17 ++++++++++++++ 4 files changed, 38 insertions(+), 24 deletions(-) create mode 100644 egovframe-template-simple-react-contribution/src/pages/standardCode/StandardCodeListModal.js diff --git a/egovframe-template-simple-react-contribution/src/css/Custom/customMain.css b/egovframe-template-simple-react-contribution/src/css/Custom/customMain.css index 98cc9d4..790c401 100644 --- a/egovframe-template-simple-react-contribution/src/css/Custom/customMain.css +++ b/egovframe-template-simple-react-contribution/src/css/Custom/customMain.css @@ -2,9 +2,12 @@ height: 35px; line-height: 35px; display: block; - background-color: gray; + background-color: #909090; text-align: center; border-radius: 13px; color: white; margin: 5px; +} +.mainbnt:hover{ + background-color: #212121; } \ No newline at end of file diff --git a/egovframe-template-simple-react-contribution/src/pages/main/EgovMain.jsx b/egovframe-template-simple-react-contribution/src/pages/main/EgovMain.jsx index 13f04fc..366602b0 100644 --- a/egovframe-template-simple-react-contribution/src/pages/main/EgovMain.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/main/EgovMain.jsx @@ -107,7 +107,7 @@ function EgovMain(props) { diff --git a/egovframe-template-simple-react-contribution/src/pages/standardCode/StandardCodeList.jsx b/egovframe-template-simple-react-contribution/src/pages/standardCode/StandardCodeList.jsx index d2957bb..5fb3218 100644 --- a/egovframe-template-simple-react-contribution/src/pages/standardCode/StandardCodeList.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/standardCode/StandardCodeList.jsx @@ -9,8 +9,20 @@ import { default as EgovLeftNav } from 'components/leftmenu/EgovLeftNavInform'; import EgovPaging from 'components/EgovPaging'; import { itemIdxByPage } from 'utils/calc'; +import StandardCodeListModal from './StandardCodeListModal' + function StandardCodeList(props) { const {listCode} = useParams(); + const [show, setshow] = useState(false); + const [groupseq,setgroupseq] = useState(); + function showhandling(e){ + const param = e.currentTarget.dataset; + setshow(true); + setgroupseq(param.groupseq); + } + function close () { + setshow(false); + } console.group("StandardCodeList"); console.log("[Start] StandardCodeList ------------------------------"); console.log("StandardCodeList [props] : ", props); @@ -63,7 +75,7 @@ function StandardCodeList(props) { mutListTag.push( {item.docNm}
} +
-
+ ); }); @@ -193,6 +206,7 @@ function StandardCodeList(props) { retrieveList({ ...searchCondition, pageIndex: passedPage, searchCnd: cndRef.current.value, searchWrd: wrdRef.current.value }) }} /> {/* */} +
{/* */} diff --git a/egovframe-template-simple-react-contribution/src/pages/standardCode/StandardCodeListModal.js b/egovframe-template-simple-react-contribution/src/pages/standardCode/StandardCodeListModal.js new file mode 100644 index 0000000..1838a26 --- /dev/null +++ b/egovframe-template-simple-react-contribution/src/pages/standardCode/StandardCodeListModal.js @@ -0,0 +1,17 @@ +import {Button, Modal, ModalBody, ModalFooter, ModalHeader, ModalTitle} from "react-bootstrap"; + + +function StandardCodeListModal({show,groupseq,onClose}){ + //todo 로직추가구현필요 + return( + + + 개정이력 + + + {groupseq} + + + ) +} +export default StandardCodeListModal; \ No newline at end of file