Merge remote-tracking branch 'origin/master'

egovframe-template-simple-react-contribution/src/pages/standardCode/StandardCodeList.jsx

@@ -9,7 +9,7 @@ import { NOTICE_BBS_ID } from 'config';
 import EgovPaging from 'components/EgovPaging';
 import { itemIdxByPage } from 'utils/calc';
 
-import  {StandardCodeListModal,TestTable} from './StandardCodeListModal'
+import {StandardCodeListModal, StandardCodeListModalTable} from './StandardCodeListModal'
 
 function StandardCodeList(props) {
     const {listCode} = useParams();
@@ -32,21 +32,29 @@ function StandardCodeList(props) {
         },(resp) =>{
                 console.log(resp+"------------------------resp")
                 const body =[];
-
+                const head =[];
                 if(resp.length>0){
 
                     resp.forEach(function (item,index){
                         const formattedDate = item.aplcnBgngYmd.match(/\d{4}-\d{2}-\d{2}/)[0];
+                        const url = "https://www.kcsc.re.kr/file/DownloadGrp/"+item.docFileGrpId;
                         body.push(
                             <tr>
                             <td>{formattedDate}</td>
-                            <td>{item.docFileGrpId}</td>
+                            <td><a href={url}>{item.docFileGrpId}</a></td>
                             <td></td>
                         </tr>)
                     })
+                    head.push(
+                        <tr>
+                            <td>년도</td>
+                            <td>기준코드</td>
+                            <td>신구건설기준비교</td>
+                        </tr>
+                    )
                 }
 
-                 setgroupseq(<TestTable content={body}/>);
+                 setgroupseq(<StandardCodeListModalTable head={head} content={body}/>);
             }
         )
         setshow(true);
@@ -109,20 +117,20 @@ function StandardCodeList(props) {
                         <Link
                             key={listIdx}
                             className="list_item List_Codes" >
-                            <div></div>
+                            <div>{item.mainCategory}</div>
-                            <div></div>
+                            <div>{item.middleCategory}</div>
                             <div>{item.kcscCd}</div>
                             {(item.replyLc * 1 ? true : false) &&
                             <div className="al reply">
-                                {item.docNm}
+                                {item.groupNm}
                             </div>}
                             {(item.replyLc * 1 ? false : true) &&
                             <div className="al">
-                                {item.docNm}
+                                {item.groupNm}
                             </div>}
                             <div><button onClick={showhandling}  data-groupseq = {item.groupSeq}>개정이력</button></div>
-                            <div></div>
+                            <div>{item.contentcount>0?<a href = {"/standardCode/viewer/"+item.kcscCd}>{item.kcscCd}</a>:null}</div>
-                            <div></div>
+                            <div>{item.docFileGrpId}</div>
                             <div></div>
 
                         </Link>

egovframe-template-simple-react-contribution/src/pages/standardCode/StandardCodeListModal.js

@@ -14,22 +14,17 @@ function StandardCodeListModal({show,content,onClose,title,size}){
         </Modal>)
 }
 
-function TestTable({content}){
+function StandardCodeListModalTable({head,content}){
-
-
     return(
         <table>
             <thead>
-            <tr>
+                {head}
-                <td>년도</td>
-                <td>기준코드</td>
-                <td>신구건설기준비교</td>
-            </tr>
             </thead>
             <tbody>
-             {content}
+                {content}
             </tbody>
         </table>
     )
 }
-export  {StandardCodeListModal,TestTable};
+
+export  {StandardCodeListModal,StandardCodeListModalTable};