From 5bafa8f96efcfc23c9eaf000ff8b50c89bd4ba84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9C=A0=EB=AF=BC=ED=98=95?= <mhyu@dbnt.co.kr>
Date: Fri, 1 Dec 2023 17:58:36 +0900
Subject: [PATCH] =?UTF-8?q?=EC=BD=94=EB=93=9C=EB=A6=AC=EC=8A=A4=ED=8A=B8?=
 =?UTF-8?q?=20=EC=A4=91=EB=B6=84=EB=A5=98=20=EC=9E=91=EC=97=85=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/standardCode/StandardCodeList.jsx   | 42 +++++++++--------
 .../standardCode/StandardCodeController.java  |  6 +++
 .../entity/TnDocumentCodeList.java            |  8 ++--
 .../mapper/StandardCodeMapper.java            |  4 ++
 .../service/StandardCodeService.java          |  5 ++
 .../mybatisMapper/StandardCodeMapper.xml      | 47 +++++++++++++------
 6 files changed, 75 insertions(+), 37 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 1844583..50109aa 100644
--- a/egovframe-template-simple-react-contribution/src/pages/standardCode/StandardCodeList.jsx
+++ b/egovframe-template-simple-react-contribution/src/pages/standardCode/StandardCodeList.jsx
@@ -73,13 +73,14 @@ function StandardCodeList(props) {
     const location = useLocation();
     console.log("StandardCodeList [location] : ", location);
 
-    const cndRef = useRef();
+    const category1Ref = useRef();
+    const category2Ref = useRef();
     const wrdRef = useRef();
 
     const bbsId = location.state?.bbsId || NOTICE_BBS_ID;
 
     // eslint-disable-next-line no-unused-vars
-    const [searchCondition, setSearchCondition] = useState(location.state?.searchCondition || {listCode: listCode, pageIndex: 1, category1: '', searchWrd: ''});// 기존 조회에서 접근 했을 시 || 신규로 접근 했을 시
+    const [searchCondition, setSearchCondition] = useState(location.state?.searchCondition || {listCode: listCode, pageIndex: 1, category1: '', category2: '', searchWrd: ''});// 기존 조회에서 접근 했을 시 || 신규로 접근 했을 시
     const [masterBoard, setMasterBoard] = useState({});
     const [paginationInfo, setPaginationInfo] = useState({});
 
@@ -88,6 +89,7 @@ function StandardCodeList(props) {
     /* 검색기능 추가 변수*/
     const [listdata, setlistdata] = useState([]);
     const [filterData, setfilterData] = useState('');
+    const [categoryList, setCategoryList] = useState([]);
 
     /* 탭 */
     const [activeTab, setActiveTab] = useState('10');
@@ -97,9 +99,10 @@ function StandardCodeList(props) {
 
         retrieveList({
             ...searchCondition,
-            category1: cndRef.current.value,
-            searchWrd: wrdRef.current.value,
-            tab: tabName
+            tab: tabName,
+            category1: category1Ref.current.value,
+            category2: category2Ref.current.value,
+            searchWrd: wrdRef.current.value
         });
     };
 
@@ -122,6 +125,7 @@ function StandardCodeList(props) {
                 setPaginationInfo(resp.result.paginationInfo);
                 /*검색을 위한 리스트 state에 저장*/
                 setlistdata(resp.result.resultList);
+                setCategoryList(resp.result.categoryList);
                 // 리스트 항목 구성
             },
             function (resp) {
@@ -178,16 +182,16 @@ function StandardCodeList(props) {
                                         />
                                         <button type="button"
                                                 onClick={() => {
-                                                    retrieveList({...searchCondition, pageIndex: 1, category1: cndRef.current.value, searchWrd: wrdRef.current.value, tab: activeTab});
+                                                    retrieveList({...searchCondition, pageIndex: 1, category1: category1Ref.current.value, searchWrd: wrdRef.current.value, tab: activeTab});
                                                 }}>조회</button>
                                     </span>
                                 </li>
                                 <li className="third_1 L">
                                     <label className="f_select" htmlFor="sel1">
-                                        <select id="sel1" title="조건" defaultValue={listCode.substring(2, 4)} ref={cndRef}
+                                        <select id="sel1" title="조건" defaultValue={listCode.substring(2, 4)} ref={category1Ref}
                                                 onChange={e => {
-                                                    cndRef.current.value = e.target.value;
-                                                    retrieveList({...searchCondition, pageIndex: 1, category1: cndRef.current.value, searchWrd: wrdRef.current.value, tab: activeTab});
+                                                    category1Ref.current.value = e.target.value;
+                                                    retrieveList({...searchCondition, pageIndex: 1, category1: category1Ref.current.value, searchWrd: wrdRef.current.value, tab: activeTab});
                                                 }}
                                         >
                                             <option value="">전체</option>
@@ -196,26 +200,24 @@ function StandardCodeList(props) {
                                         </select>
                                     </label>
                                 </li>
-                                {/*<li className="third_1 L">
+                                <li className="third_1 L">
                                     <label className="f_select" htmlFor="sel1">
-                                        <select id="sel2" title="조건" defaultValue={searchCondition.category1} ref={cndRef}
+                                        <select id="sel2" title="조건" defaultValue={searchCondition.category2} ref={category2Ref}
                                                 onChange={e => {
-                                                    cndRef.current.value = e.target.value;
-                                                    retrieveList({...searchCondition, pageIndex: 1, category1: cndRef.current.value, searchWrd: wrdRef.current.value});
+                                                    category2Ref.current.value = e.target.value;
+                                                    retrieveList({...searchCondition, pageIndex: 1, category1: category1Ref.current.value, category2: category2Ref, searchWrd: wrdRef.current.value});
                                                 }}
                                         >
-                                            <option value="10">전체</option>
-                                            <option value="1010">공통편</option>
-                                            <option value="1020">시설물편</option>
+                                            <option value="">전체</option>
                                         </select>
                                     </label>
                                 </li>
-                                <li className="third_1 L">
+                                {/*<li className="third_1 L">
                                     <label className="f_select" htmlFor="sel1">
-                                        <select id="sel3" title="조건" defaultValue={searchCondition.category1} ref={cndRef}
+                                        <select id="sel3" title="조건" defaultValue={searchCondition.category1} ref={category1Ref}
                                                 onChange={e => {
-                                                    cndRef.current.value = e.target.value;
-                                                    retrieveList({...searchCondition, pageIndex: 1, category1: cndRef.current.value, searchWrd: wrdRef.current.value});
+                                                    category1Ref.current.value = e.target.value;
+                                                    retrieveList({...searchCondition, pageIndex: 1, category1: category1Ref.current.value, searchWrd: wrdRef.current.value});
                                                 }}
                                         >
                                             <option value="10">전체</option>
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 20e9f16..de8039b 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
@@ -160,11 +160,17 @@ public class StandardCodeController extends BaseController {
 		System.out.println("@@@ category1 : " + tnDocumentInfo.getCategory1());
 		System.out.println("@@@ searchWrd : " + tnDocumentInfo.getSearchWrd());
 		System.out.println("@@@ tab : " + tnDocumentInfo.getTab());
+
 		if (!tnDocumentInfo.getCategory1().isEmpty()) {
 			tnDocumentInfo.setListCode(tnDocumentInfo.getTab() + tnDocumentInfo.getCategory1());
 		}
+
+		Integer groupFullCd = standardCodeService.selectStandardCodeGroupSeq(tnDocumentInfo.getTab() + tnDocumentInfo.getCategory1());
+		System.out.println("@@@ groupFullCd : " + groupFullCd);
+
 		List<TnDocumentCodeList> tnDocumentCodeList = standardCodeService.selectStandardCodeList(tnDocumentInfo);
 		resultMap.put("resultList", tnDocumentCodeList);
+		resultMap.put("categoryList", standardCodeService.selectStandardCodeCategoryList(groupFullCd));
 		Integer totCnt = tnDocumentCodeList.get(0).getContentcount();
 		resultMap.put("resultCnt", totCnt);
 		resultMap.put("user", user);
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 9d1ff3d..9a12188 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
@@ -18,6 +18,9 @@ import javax.persistence.Id;
 @DynamicUpdate
 public class TnDocumentCodeList {
 
+    @Id
+    @Column(name ="group_seq")
+    private Integer groupSeq;
     @Column(name = "main_category")
     private String mainCategory;
     @Column(name = "middle_category")
@@ -28,9 +31,8 @@ public class TnDocumentCodeList {
     private String kcscCd;
     @Column(name = "doc_file_grp_id")
     private String docFileGrpId;
-    @Id
-    @Column(name ="group_seq")
-    private Integer groupSeq;
     @Column(name = "contentcount")
     private Integer contentcount;
+    @Column(name = "parent_group_seq")
+    private String parentGroupSeq;
 }
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 f49f0b2..78d3ac2 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
@@ -16,4 +16,8 @@ public interface StandardCodeMapper {
 
 	List<TnDocumentInfo> selectStandardCodeRevisionhistoryList(Integer groupseq);
 
+	Integer selectStandardCodeGroupSeq(String groupFullCd);
+
+	List<TnDocumentCodeList> selectStandardCodeCategoryList(Integer parentGroupSeq);
+
 }
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 8c978ae..361f809 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
@@ -53,4 +53,9 @@ public class StandardCodeService extends EgovAbstractServiceImpl {
   public List<TnDocumentInfo> selectStandardCodeRevisionhistoryList(Integer groupseq) {
     return standardCodeMapper.selectStandardCodeRevisionhistoryList(groupseq);
   }
+
+  public Integer selectStandardCodeGroupSeq(String groupFullCd) { return standardCodeMapper.selectStandardCodeGroupSeq(groupFullCd); }
+
+  public List<TnDocumentCodeList> selectStandardCodeCategoryList(Integer parentGroupSeq){ return standardCodeMapper.selectStandardCodeCategoryList(parentGroupSeq); }
+
 }
diff --git a/kcsc-back-end/src/main/resources/mybatisMapper/StandardCodeMapper.xml b/kcsc-back-end/src/main/resources/mybatisMapper/StandardCodeMapper.xml
index c15543e..238388a 100644
--- a/kcsc-back-end/src/main/resources/mybatisMapper/StandardCodeMapper.xml
+++ b/kcsc-back-end/src/main/resources/mybatisMapper/StandardCodeMapper.xml
@@ -3,6 +3,21 @@
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.dbnt.kcscbackend.standardCode.mapper.StandardCodeMapper">
 
+	<sql id="selectStandardCodeListWhere">
+		<where>
+			a.parent_group_seq = a2.seq
+			and a2.parent_seq = a3.seq
+			<if test="listCode != null and listCode != ''">
+				and a.group_full_cd like #{listCode} || '%'
+			</if>
+			<if test="searchWrd != null and searchWrd != ''">
+				and a.group_nm like '%' || #{searchWrd} || '%'
+			</if>
+			and a.group_type = 'D'
+			and tdi.last_yn = 'Y'
+		</where>
+	</sql>
+
  	<select id="selectStandardCodeList" parameterType="TnDocumentInfo" resultType="TnDocumentCodeList">
 		select
 			case
@@ -31,20 +46,24 @@
 		order by a.kcsc_cd
  	</select>
 
-	<sql id="selectStandardCodeListWhere">
-		<where>
-			a.parent_group_seq = a2.seq
-			and a2.parent_seq = a3.seq
-			<if test="listCode != null and listCode != ''">
-			and a.group_full_cd like #{listCode} || '%'
-			</if>
-			<if test="searchWrd != null and searchWrd != ''">
-			and a.group_nm like '%' || #{searchWrd} || '%'
-			</if>
-			and a.group_type = 'D'
-			and tdi.last_yn = 'Y'
-		</where>
-	</sql>
+	<select id="selectStandardCodeGroupSeq" parameterType="String" resultType="Integer">
+		select
+			group_seq
+		from tn_document_group
+		where group_full_cd = #{groupFullCd}
+	</select>
+
+	<select id="selectStandardCodeCategoryList" parameterType="Integer" resultType="TnDocumentCodeList">
+		select
+			group_seq,
+		    group_full_cd,
+		    kcsc_cd,
+		    group_cur_cd,
+		    group_nm,
+		    parent_group_seq
+		from tn_document_group
+		where parent_group_seq = #{parentGroupSeq}
+	</select>
 
 	<select id="selectStandardCodeRevisionhistoryList" resultType="TnDocumentInfo">
 		select tdi.aplcn_bgng_ymd,tdi.doc_file_grp_id,tdi.rvsn_file_grp_id from tn_document_info tdi, tn_document_group tdg