Compare commits

..

No commits in common. "7a92c874d33129d3e5584907e48fc62e5ca8526f" and "acd01abd7771d625964111279a4e80bc3c0292bc" have entirely different histories.

5 changed files with 24 additions and 27 deletions

View File

@ -322,9 +322,14 @@
.viewerDiv{height: calc(100vh - 190px); overflow-y: auto;} .viewerDiv{height: calc(100vh - 190px); overflow-y: auto;}
.openDoc{background-color: bisque;} .openDoc{background-color: bisque;}
.docLink{color: black;background-color: palegreen} .docLink{
color: black;
background-color: palegreen
}
.docLink:hover{cursor: pointer} .docLink:hover{cursor: pointer}
.bookmark{color: forestgreen;} .bookmark{
color: forestgreen;
}
.bookmark:hover{cursor: pointer} .bookmark:hover{cursor: pointer}
.errorText{color:white; background-color: red; font-size: x-small; vertical-align: bottom; padding: 0 10px;} .errorText{color:white; background-color: red; font-size: x-small; vertical-align: bottom; padding: 0 10px;}
@ -332,8 +337,4 @@
.titleCheckBox ~ p {display: inline} .titleCheckBox ~ p {display: inline}
.errorCnt{display: inline; color:red;} .errorCnt{display: inline; color:red;}
.errorText{display: inline; cursor: pointer} .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;}

View File

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

View File

@ -17,9 +17,6 @@ public interface TnDocumentContentRepository extends JpaRepository<TnDocumentCon
@Query(value = "select * from get_year_full_context_by_content(:docInfoSeq, :docCode, :docPart, null, null)", nativeQuery = true) @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); 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> findByContTypeCd(String contTypeCd);
Optional<TnDocumentContent> findByDocInfoSeqAndContTypeCd(Integer docInfoSeq, String contTypeCd); Optional<TnDocumentContent> findByDocInfoSeqAndContTypeCd(Integer docInfoSeq, String contTypeCd);

View File

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

View File

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