Merge branch 'master' of http://118.219.150.34:50501/DBNT/kcscDev

egovframe-template-simple-react-contribution/src/css/page.css

@@ -322,14 +322,9 @@
 
     .viewerDiv{height: calc(100vh - 190px); overflow-y: auto;}
     .openDoc{background-color: bisque;}
-    .docLink{
+    .docLink{color: black;background-color: palegreen}
-        color: black;
-        background-color: palegreen
-    }
     .docLink:hover{cursor: pointer}
-    .bookmark{
+    .bookmark{color: forestgreen;}
-        color: forestgreen;
-    }
     .bookmark:hover{cursor: pointer}
     .errorText{color:white; background-color: red; font-size: x-small; vertical-align: bottom; padding: 0 10px;}
 
@@ -337,4 +332,8 @@
 .titleCheckBox ~ p {display: inline}
 .errorCnt{display: inline; color:red;}
 .errorText{display: inline; cursor: pointer}
-.detailInfoDiv > div > input {margin-right: 5px;}
+.detailInfoDiv > div > input {margin-right: 5px;}
+.docInfoTitle{white-space: nowrap;}
+.yearInfo{font-size: 9px}
+.yearInfoActive{color: #0d6efd}
+.docInfoBtn{--bs-btn-padding-y: 0.1rem;--bs-btn-padding-x: 0.25rem;--bs-btn-font-size: 0.7rem;}

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

@@ -49,7 +49,7 @@ function CodeViewer(props) {
         setDocName(docName);
         getCodeInfo(docCode);
         setErrorSelector([])
-        getCodeDetailInfo(null, docCode);
+        getCodeDetailInfo(docCode);
     }
 
     const getCodeTree = ()=>{
@@ -112,13 +112,16 @@ function CodeViewer(props) {
                     let optionTag = [];
                     docInfo.forEach(function (item, index){
                         optionTag.push(
-                            <option value={item.doc_info_seq}
+                            <Col>
-                                    selected={docInfoSeq===item.doc_info_seq || (docInfoSeq===undefined && item.last_yn === 'Y')}>
+                                <input type="button"
-                                {item.doc_er==='E'?'재정':'개정'} {item.kcsc_cd} {item.doc_nm} :{item.doc_yr}
+                                       className="btn btn-sm docInfoBtn btn-outline-secondary"
-                            </option>
+                                       value={item.doc_er==='E'?'재':'개'} />
-                        )
+                                <br/>
+                                <p className="yearInfo">{item.doc_yr}</p>
+                            </Col>)
+
                     })
-                    headTag.push(<Form.Select size="sm" id="docInfoSelector" onChange={docInfoSelectorChange} disabled={selectFlag}>{optionTag}</Form.Select>)
+                    headTag.push(<Row><Col className="docInfoTitle">{docCode} {docName}</Col>{optionTag}</Row>)
                 }else{
                     headTag.push(<div>검색된 결과가 없습니다.</div>); // 코드 목록 초기값
                 }
@@ -127,7 +130,7 @@ function CodeViewer(props) {
         )
     })
 
-    const getCodeDetailInfo = useCallback((docInfoSeq, docCode) => {
+    const getCodeDetailInfo = useCallback((docCode, ymd) => {
         console.groupCollapsed("EgovMain.getCodeDetailInfo()");
         EgovNet.requestFetch(
             '/standardCode/getCodeDetailInfo.do',
@@ -137,8 +140,8 @@ function CodeViewer(props) {
                     'Content-type': 'application/json'
                 },
                 body: JSON.stringify({
-                    docInfoSeq: docInfoSeq,
+                    docCode: docCode,
-                    docCode: docCode
+                    ymd: ymd
                 })
             },
             (resp) => {
@@ -271,7 +274,7 @@ function CodeViewer(props) {
         setSelectFlag(true);
         const docInfoSeq = el.target.value
         setDocInfoSeq(docInfoSeq);
-        getCodeDetailInfo(docInfoSeq, null);
+        getCodeDetailInfo(docCode);
     })
     const actionAppend = (el) => {
         if(!el) return;
@@ -377,7 +380,7 @@ function CodeViewer(props) {
     useEffect(() => {
         getCodeTree();
         getCodeInfo(docCode);
-        getCodeDetailInfo(null, docCode);
+        getCodeDetailInfo(docCode);
     }, []);
 
     console.log("------------------------------viewer [End]");

kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/repository/TnDocumentContentRepository.java

@@ -17,6 +17,9 @@ public interface TnDocumentContentRepository extends JpaRepository<TnDocumentCon
   @Query(value = "select * from get_year_full_context_by_content(:docInfoSeq, :docCode, :docPart, null, null)", nativeQuery = true)
   List<StandardCodeContentInterface> getYearFullContextByContent(Integer docInfoSeq, String docCode, String docPart);
 
+  @Query(value = "select * from sp_get_recent_full_context_by_content(:docCode, :docPart, :ymd)", nativeQuery = true)
+  List<StandardCodeContentInterface> spGetRecentFullContextByContent(String docCode, String docPart, String ymd);
+
   Optional<TnDocumentContent> findByContTypeCd(String contTypeCd);
 
   Optional<TnDocumentContent> findByDocInfoSeqAndContTypeCd(Integer docInfoSeq, String contTypeCd);

kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/service/StandardCodeService.java

@@ -37,7 +37,7 @@ public class StandardCodeService extends EgovAbstractServiceImpl {
   }
 
   public List<StandardCodeContentInterface> selectStandardCodeDocument(StandardCodeVO param) {
-    return tnDocumentContentRepository.getYearFullContextByContent(param.getDocInfoSeq(), param.getDocCode(), param.getDocPart());
+    return tnDocumentContentRepository.spGetRecentFullContextByContent(param.getDocCode(), param.getDocPart(), param.getYmd());
   }
 
   public List<TnDocumentInfoInterface> selectStandardCodeDocInfo(StandardCodeVO param) {

kcsc-back-end/src/main/java/com/dbnt/kcscbackend/standardCode/service/StandardCodeVO.java

@@ -6,9 +6,7 @@ import lombok.Setter;
 @Getter
 @Setter
 public class StandardCodeVO {
-  private Integer docInfoSeq;
   private String docCode;
   private String docPart;
-  private Integer year;
+  private String ymd;
-  private Integer month;
 }