feat: 관리자 - 사이트관리 > 컨텐츠관리 > 건설기준연구 관리에 게시글 번호추가 건
parent
617bc8d482
commit
26351bd549
|
|
@ -161,7 +161,7 @@ function PopUp(props) {
|
|||
}
|
||||
{listPopup.map((it)=>(
|
||||
<div className='list_item' key={it.seq}>
|
||||
<div>{it.seq}</div>
|
||||
<div>{it.number}</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.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>
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ function StandardResearch(props) {
|
|||
}
|
||||
{list.map((it)=>(
|
||||
<div className='list_item' key={it.id}>
|
||||
<div>{it.id}</div>
|
||||
<div>{it.number}</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.director}</div>
|
||||
|
|
|
|||
|
|
@ -55,7 +55,8 @@ public class PopUpApiServiceImpl extends EgovAbstractServiceImpl implements PopU
|
|||
.stream()
|
||||
.map(item -> {
|
||||
Map<String, Object> codeMap = new HashMap<>();
|
||||
codeMap.put("seq", totalRecordCount - pageable.getPageNumber() * pageable.getPageSize() - index.getAndIncrement());
|
||||
codeMap.put("number", totalRecordCount - (long) pageable.getPageNumber() * pageable.getPageSize() - index.getAndIncrement());
|
||||
codeMap.put("seq", item.getPopupSeq());
|
||||
codeMap.put("popupTitle", item.getPopupTitle());
|
||||
codeMap.put("startDate", item.getPopupStartDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
|
||||
codeMap.put("endDate", item.getPopupEndDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
|
||||
|
|
@ -67,7 +68,6 @@ public class PopUpApiServiceImpl extends EgovAbstractServiceImpl implements PopU
|
|||
codeMap.put("createDate", item.getFrstCrtDt());
|
||||
codeMap.put("updateDate", item.getLastChgDt());
|
||||
codeMap.put("base64String", null);
|
||||
//nCount ++;
|
||||
return codeMap;
|
||||
})
|
||||
.collect(Collectors.toList());
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ import java.time.format.DateTimeFormatter;
|
|||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Service("adminStandardResearchService")
|
||||
|
|
@ -55,10 +56,12 @@ public class AdminStandardResearchServiceImpl extends EgovAbstractServiceImpl im
|
|||
|
||||
|
||||
long totalRecordCount = tnResearchRepositoryLightweight.countByUseYn("Y");
|
||||
AtomicInteger index = new AtomicInteger();
|
||||
List<Map<String, Object>> list = tnResearchRepositoryLightweight.findByUseYn("Y", pageable)
|
||||
.stream()
|
||||
.map(item -> {
|
||||
Map<String, Object> codeMap = new HashMap<>();
|
||||
codeMap.put("number", totalRecordCount - (long) pageable.getPageNumber() * pageable.getPageSize() - index.getAndIncrement());
|
||||
codeMap.put("id", item.getRsSeq());
|
||||
codeMap.put("title", item.getRsTitle());
|
||||
codeMap.put("researchStartDate", item.getRsStartDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
|
||||
|
|
|
|||
Loading…
Reference in New Issue