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 243c0c5..02ca0df 100644 --- a/egovframe-template-simple-react-contribution/src/css/Custom/customMain.css +++ b/egovframe-template-simple-react-contribution/src/css/Custom/customMain.css @@ -46,14 +46,14 @@ .code_list .result .List_Codes >div:nth-child(7){ font-size: 14px; } -.codelistcontent{ - padding: 0 0; - width: 80%; +.codeListContent{ + padding: 10px 0; + width: 100%; } .StandardCodeList{ max-width: 100%; } -.listtablediv{ +.listTableDiv{ padding: 0 !important; } .vieweratag{ diff --git a/egovframe-template-simple-react-contribution/src/css/layout.css b/egovframe-template-simple-react-contribution/src/css/layout.css index 8c8df07..71f4785 100644 --- a/egovframe-template-simple-react-contribution/src/css/layout.css +++ b/egovframe-template-simple-react-contribution/src/css/layout.css @@ -50,7 +50,7 @@ body {min-width: 1400px;} .c_wrap .layout {display: table; width: 100%; table-layout: fixed; padding-bottom: 20px;} /* added by lim padding-bottom: 20px; */ /* sub navigation */ -.c_wrap .layout .nav {display: table-cell; width: 220px; vertical-align: top;} /* changed by lim width: 260px; */ +/*.c_wrap .layout .nav {display: table-cell; width: 220px; vertical-align: top;}*/ /* changed by lim width: 260px; */ .c_wrap .layout .nav .inner {border: 1px solid #dde2e5; border-radius: 10px;} .nav_title{padding: 35px 30px 26px 30px;} /* changed by lim border-bottom: 4px solid #dde2e5; */ .c_wrap .layout .nav h2 {color: #222; font-size: 24px;} diff --git a/egovframe-template-simple-react-contribution/src/pages/standardCode/list/StandardCodeList.jsx b/egovframe-template-simple-react-contribution/src/pages/standardCode/list/StandardCodeList.jsx index e738869..fd82c80 100644 --- a/egovframe-template-simple-react-contribution/src/pages/standardCode/list/StandardCodeList.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/standardCode/list/StandardCodeList.jsx @@ -12,6 +12,7 @@ function StandardCodeList({}) { const [listData, setListData] = useState([]) const [filterData, setFilterData] = useState(''); const [resultCnt, setResultCnt] = useState(0); + const [remarkCnt, setRemarkCnt] = useState(0); const [groupSeq, setGroupSeq] = useState(); const [show, setShow] = useState(false); @@ -75,7 +76,8 @@ function StandardCodeList({}) { }, (resp) => { setListData(resp.result.resultList); - setResultCnt(resp.result.resultCnt); + setResultCnt(resp.result.resultCnt.allCnt); + setRemarkCnt(resp.result.resultCnt.remarkCnt); }, function (resp) { console.log("err response : ", resp); @@ -87,22 +89,10 @@ function StandardCodeList({}) { return (
-
-
-
    -
  • Home
    • -
  • 건설기준코드
    • -
  • 건설기준코드 검색
    • -
-
+
-
-
-

건설기준코드 검색

-
- -
전체 {resultCnt} 건
- {/* */} +
+
대분류 @@ -125,9 +115,9 @@ function StandardCodeList({}) {
{item.mainCategory}
{item.middleCategory}
{item.kcscCd}
-
{item.groupNm}
+
{item.groupNm}
{item.rvsnRemark}
-
{item.contentcount > 0 ? 내용보기 : null}
+
) diff --git a/egovframe-template-simple-react-contribution/src/pages/standardCode/list/StandardCodeSearchForm.jsx b/egovframe-template-simple-react-contribution/src/pages/standardCode/list/StandardCodeSearchForm.jsx index 954142c..3e6a39f 100644 --- a/egovframe-template-simple-react-contribution/src/pages/standardCode/list/StandardCodeSearchForm.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/standardCode/list/StandardCodeSearchForm.jsx @@ -1,6 +1,11 @@ import React, {useEffect, useState} from "react"; +import {Nav} from "react-bootstrap"; +import Row from "react-bootstrap/Row"; +import Col from "react-bootstrap/Col"; +import {Link} from "react-router-dom"; +import Button from "react-bootstrap/Button"; -function StandardCodeSearchForm({param, reloadFunction}){ +function StandardCodeSearchForm({param, reloadFunction, resultCnt, remarkCnt}){ const [searchCondition, setSearchCondition] = useState({ pageIndex: 1, @@ -60,25 +65,36 @@ function StandardCodeSearchForm({param, reloadFunction}){ +
  • + {remarkCnt?( + 전체 {resultCnt} / {remarkCnt} 건 + ):( + 전체 {resultCnt} 건 + )} + +
  • 통합 다운로드
    • - {subTabsVisible && ( -
    -
    -
      -
      {setSearchCondition({...searchCondition, tab: 40})}}>서울특별시
      -
      {setSearchCondition({...searchCondition, tab: 50})}}>고속도로공사
      -
      {setSearchCondition({...searchCondition, tab: 60})}}>한국농어촌공사
      -
      {setSearchCondition({...searchCondition, tab: 70})}}>철도건설공사
      -
      {setSearchCondition({...searchCondition, tab: 80})}}>LH한국토지주택공사
      -
      {setSearchCondition({...searchCondition, tab: 90})}}>K-Water
      -
    -
    -
    - )} + + + {subTabsVisible && ( + + )} + + + + + ); } 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 fe89702..30119c6 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 @@ -164,11 +164,8 @@ public class StandardCodeController extends BaseController { resultMap.put("category3List", standardCodeService.selectStandardCodeCategoryList(categorySeq3)); tnDocumentInfo.setListCode(tab + category1 + category2 + category3); - List tnDocumentCodeList = standardCodeService.selectStandardCodeList(tnDocumentInfo); - resultMap.put("resultList", tnDocumentCodeList); - Integer totCnt = tnDocumentCodeList.get(0).getContentcount(); - - resultMap.put("resultCnt", totCnt); + resultMap.put("resultList", standardCodeService.selectStandardCodeList(tnDocumentInfo)); + resultMap.put("resultCnt", standardCodeService.selectStandardCodeListCnt(tnDocumentInfo)); resultMap.put("user", user); resultVO.setResultCode(ResponseCode.SUCCESS.getCode()); diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/entity/TnDocumentCodeList.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/entity/TnDocumentCodeList.java index e726c04..fb0ebad 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/entity/TnDocumentCodeList.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/entity/TnDocumentCodeList.java @@ -28,15 +28,20 @@ public class TnDocumentCodeList { private String middleCategory; @Column(name = "group_nm") private String groupNm; + @Column(name = "rvsn_remark") + private String rvsnRemark; @Column(name = "kcsc_cd") private String kcscCd; @Column(name = "doc_file_grp_id") private String docFileGrpId; - @Column(name = "contentcount") - private Integer contentcount; @Column(name = "parent_group_seq") private String parentGroupSeq; @Column(name = "group_full_cd") private String groupFullCd; + @Transient + private Integer allCnt; + @Transient + private Integer remarkCnt; + } diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/mapper/StandardCodeMapper.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/mapper/StandardCodeMapper.java index 78d3ac2..a3b51ec 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/mapper/StandardCodeMapper.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/mapper/StandardCodeMapper.java @@ -12,7 +12,9 @@ public interface StandardCodeMapper { List selectStandardCodeList(TnDocumentInfo tnDocumentInfo); - Integer selectStandardCodeListCnt(TnDocumentInfo tnDocumentInfo); + TnDocumentCodeList selectStandardCodeListCnt(TnDocumentInfo tnDocumentInfo); + + List selectStandardCodeHistoryList(TnDocumentInfo tnDocumentInfo); List selectStandardCodeRevisionhistoryList(Integer groupseq); diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/service/StandardCodeService.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/service/StandardCodeService.java index 5e916af..d486072 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/service/StandardCodeService.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/service/StandardCodeService.java @@ -44,10 +44,17 @@ public class StandardCodeService extends EgovAbstractServiceImpl { } public List selectStandardCodeList(TnDocumentInfo tnDocumentInfo){ - return standardCodeMapper.selectStandardCodeList(tnDocumentInfo); + List codeList = standardCodeMapper.selectStandardCodeList(tnDocumentInfo); + List historyList = standardCodeMapper.selectStandardCodeHistoryList(tnDocumentInfo); + for(TnDocumentCodeList code: codeList){ + for(TnDocumentInfo history: historyList){ + + } + } + return codeList; } - public Integer selectStandardCodeListCnt(TnDocumentInfo tnDocumentInfo) { + public TnDocumentCodeList selectStandardCodeListCnt(TnDocumentInfo tnDocumentInfo) { return standardCodeMapper.selectStandardCodeListCnt(tnDocumentInfo); } diff --git a/kcsc-back-end/src/main/resources/mybatisMapper/StandardCodeMapper.xml b/kcsc-back-end/src/main/resources/mybatisMapper/StandardCodeMapper.xml index db8c839..31772cd 100644 --- a/kcsc-back-end/src/main/resources/mybatisMapper/StandardCodeMapper.xml +++ b/kcsc-back-end/src/main/resources/mybatisMapper/StandardCodeMapper.xml @@ -5,52 +5,71 @@ - a.parent_group_seq = a2.seq - and a2.parent_seq = a3.seq - and a.group_full_cd like #{listCode} || '%' + and c.group_full_cd like #{listCode} || '%' - and (a.group_full_cd like 102041 || '%' - or a.group_full_cd like 102042 || '%' - or a.group_full_cd like 102043 || '%') + and (c.group_full_cd like 102041 || '%' + or c.group_full_cd like 102042 || '%' + or c.group_full_cd like 102043 || '%') - and a.group_nm like '%' || #{searchWrd} || '%' + and c.group_nm like '%' || #{searchWrd} || '%' - and a.group_type = 'D' + and c.group_type = 'D' and tdi.last_yn = 'Y' + + + +