Compare commits
No commits in common. "bc9f30c502216b0c56cfb6088b1e2043401a21f5" and "3a8f9f700ee52dcd09fbc3ca5b670f19974524b1" have entirely different histories.
bc9f30c502
...
3a8f9f700e
|
|
@ -13,37 +13,8 @@ import EgovPagingPaginationInfo from 'components/EgovPagingPaginationInfo';
|
||||||
import styled from "styled-components";
|
import styled from "styled-components";
|
||||||
|
|
||||||
const StyledDiv = styled.div`
|
const StyledDiv = styled.div`
|
||||||
|
.board_btn_area {
|
||||||
.BRD008 {
|
margin: 12px 0px;
|
||||||
.head > span:nth-child(3) {
|
|
||||||
width: 180px;
|
|
||||||
}
|
|
||||||
.result .list_item > div:nth-child(3) {
|
|
||||||
width: 180px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.board-bot {
|
|
||||||
margin-top: 20px;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: row;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
justify-content: flex-start;
|
|
||||||
align-items: stretch;
|
|
||||||
justify-content: center;
|
|
||||||
|
|
||||||
& > *:nth-child(1) {
|
|
||||||
width: 16%;
|
|
||||||
justify-content: left;
|
|
||||||
}
|
|
||||||
& > *:nth-child(2) {
|
|
||||||
width: 68%;
|
|
||||||
justify-content: center;
|
|
||||||
}
|
|
||||||
& > *:nth-child(3) {
|
|
||||||
width: 16%;
|
|
||||||
justify-content: right;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
|
@ -142,6 +113,14 @@ function PopUp(props) {
|
||||||
<h1 className="tit_1">팝업 관리</h1>
|
<h1 className="tit_1">팝업 관리</h1>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* <!-- 버튼영역 --> */}
|
||||||
|
<div className="board_btn_area">
|
||||||
|
<div className="right_col btn1">
|
||||||
|
<Link to={URL.ADMIN__CONTENTS__POP_UP__CREATE} className="btn btn_blue_h46 w_100">팝업 추가</Link>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{/* <!--// 버튼영역 --> */}
|
||||||
|
|
||||||
{/* <!-- 게시판목록 --> */}
|
{/* <!-- 게시판목록 --> */}
|
||||||
<div className="board_list BRD008">
|
<div className="board_list BRD008">
|
||||||
<div className="head">
|
<div className="head">
|
||||||
|
|
@ -157,7 +136,7 @@ function PopUp(props) {
|
||||||
}
|
}
|
||||||
{listPopup.map((it)=>(
|
{listPopup.map((it)=>(
|
||||||
<div className='list_item' key={it.seq}>
|
<div className='list_item' key={it.seq}>
|
||||||
<div>{it.number}</div>
|
<div>{it.seq}</div>
|
||||||
<div className="al"><Link to={URL.ADMIN__CONTENTS__POP_UP__MODIFY} state={{popupId: it.seq} } key={it.seq}>{it.popupTitle}</Link></div>
|
<div className="al"><Link to={URL.ADMIN__CONTENTS__POP_UP__MODIFY} state={{popupId: it.seq} } key={it.seq}>{it.popupTitle}</Link></div>
|
||||||
<div>{it.startDate} ~ {it.endDate}</div>
|
<div>{it.startDate} ~ {it.endDate}</div>
|
||||||
<div>{it.useYn === 'Y' ? <Switch {...label} key={it.seq} onChange={(e) => onChangeActivationSwitch(e, it.seq)} defaultChecked /> : <Switch key={it.seq} onChange={(e) => onChangeActivationSwitch(e, it.seq)} {...label} />}</div>
|
<div>{it.useYn === 'Y' ? <Switch {...label} key={it.seq} onChange={(e) => onChangeActivationSwitch(e, it.seq)} defaultChecked /> : <Switch key={it.seq} onChange={(e) => onChangeActivationSwitch(e, it.seq)} {...label} />}</div>
|
||||||
|
|
@ -167,24 +146,13 @@ function PopUp(props) {
|
||||||
</div>
|
</div>
|
||||||
{/* <!--// 게시판목록 --> */}
|
{/* <!--// 게시판목록 --> */}
|
||||||
|
|
||||||
|
<div className="board_bot">
|
||||||
|
{/* <!-- Paging --> */}
|
||||||
|
|
||||||
|
|
||||||
{/* <!-- Paging --> */}
|
|
||||||
<div className="board-bot">
|
|
||||||
<div></div>
|
|
||||||
<EgovPagingPaginationInfo pagination={paginationInfo} setPaginationInfo={setPaginationInfo} moveToPage={passedPage => {
|
<EgovPagingPaginationInfo pagination={paginationInfo} setPaginationInfo={setPaginationInfo} moveToPage={passedPage => {
|
||||||
getList({ ...searchCondition, pageIndex: passedPage })
|
getList({ ...searchCondition, pageIndex: passedPage })
|
||||||
}} />
|
}} />
|
||||||
<div className="right_col btn1">
|
{/* <!--/ Paging --> */}
|
||||||
<Link to={URL.ADMIN__CONTENTS__POP_UP__CREATE} className="btn btn_blue_h46 w_100">등록</Link>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
{/* <!--/ Paging --> */}
|
|
||||||
|
|
||||||
|
|
||||||
</StyledDiv>
|
</StyledDiv>
|
||||||
{/* <!--// 본문 --> */}
|
{/* <!--// 본문 --> */}
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -13,36 +13,8 @@ import EgovPagingPaginationInfo from 'components/EgovPagingPaginationInfo';
|
||||||
import styled from "styled-components";
|
import styled from "styled-components";
|
||||||
|
|
||||||
const StyledDiv = styled.div`
|
const StyledDiv = styled.div`
|
||||||
.BRD008 {
|
.board_btn_area {
|
||||||
.head > span:nth-child(3) {
|
margin: 12px 0px;
|
||||||
width: 200px;
|
|
||||||
}
|
|
||||||
.result .list_item > div:nth-child(3) {
|
|
||||||
width: 200px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.board-bot {
|
|
||||||
margin-top: 20px;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: row;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
justify-content: flex-start;
|
|
||||||
align-items: stretch;
|
|
||||||
justify-content: center;
|
|
||||||
|
|
||||||
& > *:nth-child(1) {
|
|
||||||
width: 16%;
|
|
||||||
justify-content: left;
|
|
||||||
}
|
|
||||||
& > *:nth-child(2) {
|
|
||||||
width: 68%;
|
|
||||||
justify-content: center;
|
|
||||||
}
|
|
||||||
& > *:nth-child(3) {
|
|
||||||
width: 16%;
|
|
||||||
justify-content: right;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
|
@ -139,9 +111,13 @@ function StandardResearch(props) {
|
||||||
<div className="top_tit">
|
<div className="top_tit">
|
||||||
<h1 className="tit_1">건설기준연구 관리</h1>
|
<h1 className="tit_1">건설기준연구 관리</h1>
|
||||||
</div>
|
</div>
|
||||||
|
{/* <!-- 버튼영역 --> */}
|
||||||
|
<div className="board_btn_area">
|
||||||
|
<div className="right_col btn1">
|
||||||
|
<Link to={URL.ADMIN__CONTENTS__STANDARDS_RESEARCH__CREATE} className="btn btn_blue_h46 w_100">글 작성</Link>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{/* <!--// 버튼영역 --> */}
|
||||||
|
|
||||||
{/* <!-- 게시판목록 --> */}
|
{/* <!-- 게시판목록 --> */}
|
||||||
<div className="board_list BRD008">
|
<div className="board_list BRD008">
|
||||||
|
|
@ -158,7 +134,7 @@ function StandardResearch(props) {
|
||||||
}
|
}
|
||||||
{list.map((it)=>(
|
{list.map((it)=>(
|
||||||
<div className='list_item' key={it.id}>
|
<div className='list_item' key={it.id}>
|
||||||
<div>{it.number}</div>
|
<div>{it.id}</div>
|
||||||
<div className="al"><Link to={URL.ADMIN__CONTENTS__STANDARDS_RESEARCH__MODIFY} state={{rsId: it.id} } key={it.id}>{it.title}</Link></div>
|
<div className="al"><Link to={URL.ADMIN__CONTENTS__STANDARDS_RESEARCH__MODIFY} state={{rsId: it.id} } key={it.id}>{it.title}</Link></div>
|
||||||
<div>{it.researchStartDate} ~ {it.researchEndDate}</div>
|
<div>{it.researchStartDate} ~ {it.researchEndDate}</div>
|
||||||
<div>{it.director}</div>
|
<div>{it.director}</div>
|
||||||
|
|
@ -168,27 +144,13 @@ function StandardResearch(props) {
|
||||||
</div>
|
</div>
|
||||||
{/* <!--// 게시판목록 --> */}
|
{/* <!--// 게시판목록 --> */}
|
||||||
|
|
||||||
|
<div className="board_bot">
|
||||||
|
{/* <!-- Paging --> */}
|
||||||
|
|
||||||
|
|
||||||
{/* <!-- Paging --> */}
|
|
||||||
<div className="board-bot">
|
|
||||||
<div></div>
|
|
||||||
<EgovPagingPaginationInfo pagination={paginationInfo} setPaginationInfo={setPaginationInfo} moveToPage={passedPage => {
|
<EgovPagingPaginationInfo pagination={paginationInfo} setPaginationInfo={setPaginationInfo} moveToPage={passedPage => {
|
||||||
getList({ ...searchCondition, pageIndex: passedPage })
|
getList({ ...searchCondition, pageIndex: passedPage })
|
||||||
}} />
|
}} />
|
||||||
<div className="right_col btn1">
|
{/* <!--/ Paging --> */}
|
||||||
<Link to={URL.ADMIN__CONTENTS__STANDARDS_RESEARCH__CREATE} className="btn btn_blue_h46 w_100">등록</Link>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
{/* <!--/ Paging --> */}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</StyledDiv>
|
</StyledDiv>
|
||||||
{/* <!--// 본문 --> */}
|
{/* <!--// 본문 --> */}
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,6 @@ import java.time.format.DateTimeFormatter;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@Service("popUpApiService")
|
@Service("popUpApiService")
|
||||||
|
|
@ -48,14 +47,12 @@ public class PopUpApiServiceImpl extends EgovAbstractServiceImpl implements PopU
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
Long totalRecordCount = tnPopupMngRepositoryWithoutPopupContents.count();
|
Long totalRecordCount = tnPopupMngRepositoryWithoutPopupContents.count();
|
||||||
AtomicInteger index = new AtomicInteger();
|
|
||||||
//List<Map<String, Object>> listPopup = tnPopupMngRepositoryWithoutPopupContents.findAll(Sort.by(Sort.Direction.DESC, "popupSeq"))
|
//List<Map<String, Object>> listPopup = tnPopupMngRepositoryWithoutPopupContents.findAll(Sort.by(Sort.Direction.DESC, "popupSeq"))
|
||||||
List<Map<String, Object>> listPopup = tnPopupMngRepositoryWithoutPopupContents.findAll(pageable)
|
List<Map<String, Object>> listPopup = tnPopupMngRepositoryWithoutPopupContents.findAll(pageable)
|
||||||
.stream()
|
.stream()
|
||||||
.map(item -> {
|
.map(item -> {
|
||||||
Map<String, Object> codeMap = new HashMap<>();
|
Map<String, Object> codeMap = new HashMap<>();
|
||||||
codeMap.put("number", totalRecordCount - (long) pageable.getPageNumber() * pageable.getPageSize() - index.getAndIncrement());
|
|
||||||
codeMap.put("seq", item.getPopupSeq());
|
codeMap.put("seq", item.getPopupSeq());
|
||||||
codeMap.put("popupTitle", item.getPopupTitle());
|
codeMap.put("popupTitle", item.getPopupTitle());
|
||||||
codeMap.put("startDate", item.getPopupStartDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
|
codeMap.put("startDate", item.getPopupStartDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,6 @@ import java.time.format.DateTimeFormatter;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@Service("adminStandardResearchService")
|
@Service("adminStandardResearchService")
|
||||||
|
|
@ -56,12 +55,10 @@ public class AdminStandardResearchServiceImpl extends EgovAbstractServiceImpl im
|
||||||
|
|
||||||
|
|
||||||
long totalRecordCount = tnResearchRepositoryLightweight.countByUseYn("Y");
|
long totalRecordCount = tnResearchRepositoryLightweight.countByUseYn("Y");
|
||||||
AtomicInteger index = new AtomicInteger();
|
|
||||||
List<Map<String, Object>> list = tnResearchRepositoryLightweight.findByUseYn("Y", pageable)
|
List<Map<String, Object>> list = tnResearchRepositoryLightweight.findByUseYn("Y", pageable)
|
||||||
.stream()
|
.stream()
|
||||||
.map(item -> {
|
.map(item -> {
|
||||||
Map<String, Object> codeMap = new HashMap<>();
|
Map<String, Object> codeMap = new HashMap<>();
|
||||||
codeMap.put("number", totalRecordCount - (long) pageable.getPageNumber() * pageable.getPageSize() - index.getAndIncrement());
|
|
||||||
codeMap.put("id", item.getRsSeq());
|
codeMap.put("id", item.getRsSeq());
|
||||||
codeMap.put("title", item.getRsTitle());
|
codeMap.put("title", item.getRsTitle());
|
||||||
codeMap.put("researchStartDate", item.getRsStartDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
|
codeMap.put("researchStartDate", item.getRsStartDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue