Merge branch 'master' of http://118.219.150.34:50501/DBNT/kcscDev
commit
7a92c874d3
|
|
@ -87,6 +87,7 @@ function StandardCodeList(props) {
|
|||
const [listdata, setlistdata] = useState([]);
|
||||
const [filterData, setfilterData] = useState('');
|
||||
const [categoryList, setCategoryList] = useState([]);
|
||||
const [resultCnt, setResultCnt] = useState(0);
|
||||
|
||||
/* 탭 */
|
||||
const [activeTab, setActiveTab] = useState('10');
|
||||
|
|
@ -122,6 +123,7 @@ function StandardCodeList(props) {
|
|||
/*검색을 위한 리스트 state에 저장*/
|
||||
setlistdata(resp.result.resultList);
|
||||
setCategoryList(resp.result.categoryList);
|
||||
setResultCnt(resp.result.resultCnt);
|
||||
// 리스트 항목 구성
|
||||
},
|
||||
function (resp) {
|
||||
|
|
@ -186,7 +188,7 @@ function StandardCodeList(props) {
|
|||
<select id="sel1" title="조건" defaultValue={listCode.substring(2, 4)} ref={category1Ref}
|
||||
onChange={e => {
|
||||
category1Ref.current.value = e.target.value;
|
||||
retrieveList({...searchCondition, pageIndex: 1, category1: category1Ref.current.value, searchWrd: wrdRef.current.value, tab: activeTab});
|
||||
retrieveList({...searchCondition, pageIndex: 1, category1: category1Ref.current.value, category2: '', searchWrd: wrdRef.current.value, tab: activeTab});
|
||||
}}
|
||||
>
|
||||
<option value="">전체</option>
|
||||
|
|
@ -244,6 +246,7 @@ function StandardCodeList(props) {
|
|||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div><span>resultCnt : {resultCnt}</span></div>
|
||||
{/* <!-- 게시판목록 --> */}
|
||||
<div className="board_list BRD002 code_list">
|
||||
<div className="head">
|
||||
|
|
|
|||
|
|
@ -157,14 +157,12 @@ public class StandardCodeController extends BaseController {
|
|||
paginationInfo.setPageSize(propertyService.getInt("Globals.pageSize"));
|
||||
resultMap.put("paginationInfo", paginationInfo);
|
||||
|
||||
System.out.println("@@@ tab : " + tnDocumentInfo.getTab());
|
||||
System.out.println("@@@ category1 : " + tnDocumentInfo.getCategory1());
|
||||
System.out.println("@@@ category2 : " + tnDocumentInfo.getCategory2());
|
||||
System.out.println("@@@ searchWrd : " + tnDocumentInfo.getSearchWrd());
|
||||
System.out.println("@@@ tab : " + tnDocumentInfo.getTab());
|
||||
|
||||
if (!tnDocumentInfo.getCategory1().isEmpty()) {
|
||||
tnDocumentInfo.setListCode(tnDocumentInfo.getTab() + tnDocumentInfo.getCategory1() + tnDocumentInfo.getCategory2());
|
||||
}
|
||||
tnDocumentInfo.setListCode(tnDocumentInfo.getTab() + tnDocumentInfo.getCategory1() + tnDocumentInfo.getCategory2());
|
||||
|
||||
Integer groupFullCd = standardCodeService.selectStandardCodeGroupSeq(tnDocumentInfo.getTab() + tnDocumentInfo.getCategory1());
|
||||
System.out.println("@@@ groupFullCd : " + groupFullCd);
|
||||
|
|
@ -173,6 +171,7 @@ public class StandardCodeController extends BaseController {
|
|||
resultMap.put("resultList", tnDocumentCodeList);
|
||||
resultMap.put("categoryList", standardCodeService.selectStandardCodeCategoryList(groupFullCd));
|
||||
Integer totCnt = tnDocumentCodeList.get(0).getContentcount();
|
||||
System.out.println("@@@ resultCnt : " + totCnt);
|
||||
resultMap.put("resultCnt", totCnt);
|
||||
resultMap.put("user", user);
|
||||
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
|
||||
<select id="selectStandardCodeList" parameterType="TnDocumentInfo" resultType="TnDocumentCodeList">
|
||||
select
|
||||
count(*) over() as contentcount,
|
||||
case
|
||||
when a3.doc_level > 1 then a3.doc_code_name
|
||||
else a2.doc_code_name
|
||||
|
|
@ -31,8 +32,7 @@
|
|||
a.group_nm,
|
||||
a.kcsc_cd,
|
||||
tdi.doc_file_grp_id,
|
||||
a.group_seq,
|
||||
count(tdc.full_content) as contentcount
|
||||
a.group_seq
|
||||
from
|
||||
tn_document_group a
|
||||
left join tn_document_info tdi on
|
||||
|
|
|
|||
Loading…
Reference in New Issue