DBNT
/
kcscDev
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: DBNT:d9f223960a79bb21d76b3bcda61d6139eb1899f7
Branches Tags
DBNT:master
DBNT:thkim
DBNT:cks
...
compare: DBNT:5d87831386a314466bd8802f22d62e53d4f4b186
Branches Tags
DBNT:master
DBNT:thkim
DBNT:cks

2 Commits
d9f223960a ... 5d87831386

Author SHA1 Message Date
thkim 5d87831386 feat: 관리자 - 컨텐츠관리 - 건설기준연구 관리에서 삭제 기능 구현 front-end 2024-01-26 13:18:37 +09:00
thkim bcaf14dfc3 feat: 관리자 - 컨텐츠관리 - 건설기준연구 관리에서 삭제 기능 구현 back-end 2024-01-26 13:18:12 +09:00
4 changed files with 22 additions and 19 deletions
Show Stats Expand all files Collapse all files

4
egovframe-template-simple-react-contribution/src/pages/admin/contents/StandardResearch/StandardResearchEditor.jsx
View File

@ -234,7 +234,7 @@ function StandardResearchEditor(props) {
(resp) => {
if (Number(resp.resultCode) === Number(CODE.RCV_SUCCESS)) {
alert("삭제 되었습니다.");
navigate(URL.ADMIN__CONTENTS__POP_UP ,{ replace: true });
navigate(URL.ADMIN__CONTENTS__STANDARDS_RESEARCH ,{ replace: true });
} else {
navigate({pathname: URL.ERROR}, {state: {msg : resp.resultMessage}});
}
@ -248,7 +248,7 @@ function StandardResearchEditor(props) {
const onClickList = (e) => {
const requestTask = () => {
navigate(URL.ADMIN__CONTENTS__POP_UP ,{ replace: true });
navigate(URL.ADMIN__CONTENTS__STANDARDS_RESEARCH ,{ replace: true });
};
if( purpose !== purposeOriginal ) {

4
kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/standardResearch/AdminStandardResearchController.java
View File

@ -172,11 +172,11 @@ public class AdminStandardResearchController {
(
@AuthenticationPrincipal LoginVO user,
HttpServletRequest request,
@PathVariable("rsId") String strPopupId
@PathVariable("rsId") String strRsId
) throws Exception {
ResultVO resultVO = new ResultVO();
Long rsId = Long.valueOf(strPopupId);
Long rsId = Long.valueOf(strRsId);
try {
resultVO = adminStandardResearchService.contentsStandardResearchDelete(resultVO, request, user, rsId);
} catch (Exception e) {

10
kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/standardResearch/repository/TnResearchRepositoryLightweight.java
View File

@ -1,8 +1,18 @@
package com.dbnt.kcscbackend.admin.standardResearch.repository;
import com.dbnt.kcscbackend.admin.standardResearch.model.TnResearchLightweight;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import java.util.List;
public interface TnResearchRepositoryLightweight extends JpaRepository<TnResearchLightweight, Long> {
@Query(value = "SELECT COUNT(1) FROM tn_research tr WHERE tr.use_yn = :use_yn", nativeQuery = true)
Long countByUseYn(@Param("use_yn") String useYn);
List<TnResearchLightweight> findByUseYn( String useYn, Pageable pageable);
}

23
kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/standardResearch/service/impl/AdminStandardResearchServiceImpl.java
View File

@ -54,8 +54,8 @@ public class AdminStandardResearchServiceImpl extends EgovAbstractServiceImpl im
);
long totalRecordCount = tnResearchRepositoryLightweight.count();
List<Map<String, Object>> list = tnResearchRepositoryLightweight.findAll(pageable)
long totalRecordCount = tnResearchRepositoryLightweight.countByUseYn("Y");
List<Map<String, Object>> list = tnResearchRepositoryLightweight.findByUseYn("Y", pageable)
.stream()
.map(item -> {
Map<String, Object> codeMap = new HashMap<>();
@ -64,11 +64,11 @@ public class AdminStandardResearchServiceImpl extends EgovAbstractServiceImpl im
codeMap.put("researchStartDate", item.getRsStartDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
codeMap.put("researchEndDate", item.getRsEndDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
codeMap.put("director", item.getRsDirector());
codeMap.put("createDate", item.getFrstCrtDt());
codeMap.put("createUserId", item.getFrstCrtId());
codeMap.put("updateDate", item.getLastChgDt());
codeMap.put("updateUserId", item.getLastChgId());
codeMap.put("useYn", item.getUseYn());
//codeMap.put("createDate", item.getFrstCrtDt());
//codeMap.put("createUserId", item.getFrstCrtId());
//codeMap.put("updateDate", item.getLastChgDt());
//codeMap.put("updateUserId", item.getLastChgId());
//codeMap.put("useYn", item.getUseYn());
return codeMap;
})
.collect(Collectors.toList());
@ -165,10 +165,6 @@ public class AdminStandardResearchServiceImpl extends EgovAbstractServiceImpl im
dto.put("updateUserId", tnResearch.getLastChgId());
dto.put("useYn", tnResearch.getUseYn());
resultVO.setResult(dto);
resultVO.setResultCode(ResponseCode.SUCCESS.getCode());
resultVO.setResultMessage(ResponseCode.SUCCESS.getMessage());
@ -222,6 +218,7 @@ public class AdminStandardResearchServiceImpl extends EgovAbstractServiceImpl im
@Override
public ResultVO contentsStandardResearchDelete(ResultVO resultVO, HttpServletRequest request, LoginVO user, Long rsId) throws Exception {
System.out.println(
"\n--------------------------------------------------------------\n" +
request.getRequestURI() + " IN:" +
@ -231,10 +228,6 @@ public class AdminStandardResearchServiceImpl extends EgovAbstractServiceImpl im
"\n--------------------------------------------------------------\n"
);
Map<String, Object> dto = new HashMap<String, Object>();
Map<String, Object> response = tnResearchRepository.spDeleteTnResearch(