Index: pom.xml =================================================================== diff -u -r0cf45c181be03a7254ba758f857d8c7db0fe1647 -r1936e60dae53301428372e99f188a288734f8d2f --- pom.xml (.../pom.xml) (revision 0cf45c181be03a7254ba758f857d8c7db0fe1647) +++ pom.xml (.../pom.xml) (revision 1936e60dae53301428372e99f188a288734f8d2f) @@ -10,7 +10,7 @@ 4.0.0 313devgrp java-service-tree-framework-backend-server - 22.12.18 + 22.12.20 pom java-service-tree-framework Index: web-module/pom.xml =================================================================== diff -u -r73b61d12fc72c79664dce3231b0de5c00ca6c4eb -r1936e60dae53301428372e99f188a288734f8d2f --- web-module/pom.xml (.../pom.xml) (revision 73b61d12fc72c79664dce3231b0de5c00ca6c4eb) +++ web-module/pom.xml (.../pom.xml) (revision 1936e60dae53301428372e99f188a288734f8d2f) @@ -7,7 +7,7 @@ 313devgrp java-service-tree-framework-backend-server - 22.12.18 + 22.12.20 ../pom.xml Index: web-module/src/main/java/egovframework/api/arms/module_reqadd/controller/UserReqAddController.java =================================================================== diff -u -r73b61d12fc72c79664dce3231b0de5c00ca6c4eb -r1936e60dae53301428372e99f188a288734f8d2f --- web-module/src/main/java/egovframework/api/arms/module_reqadd/controller/UserReqAddController.java (.../UserReqAddController.java) (revision 73b61d12fc72c79664dce3231b0de5c00ca6c4eb) +++ web-module/src/main/java/egovframework/api/arms/module_reqadd/controller/UserReqAddController.java (.../UserReqAddController.java) (revision 1936e60dae53301428372e99f188a288734f8d2f) @@ -481,15 +481,15 @@ StringUtility.equals(reqReviewDTO.getC_review_responder() , reviewer05) ){ logger.info("reqReviewDataClean hit = " + reqReviewDTO.getC_review_responder()); - if( StringUtility.contains(reqReviewDTO.getC_review_result_state(), "Disable" )){ + if( StringUtility.contains(reqReviewDTO.getC_review_result_state(), "AutoClose" )){ reqReviewDTO.setC_review_result_date(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); - reqReviewDTO.setC_review_result_state("Update-Enable"); + reqReviewDTO.setC_review_result_state("ReOpen"); reqReview.updateNode(reqReviewDTO); } }else{ reqReviewDTO.setC_review_result_date(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); - reqReviewDTO.setC_review_result_state("Update-Disable"); + reqReviewDTO.setC_review_result_state("AutoClose"); reqReview.updateNode(reqReviewDTO); } } @@ -530,7 +530,7 @@ reqReviewDTO.setC_review_sender(returnNode.getC_writer()); reqReviewDTO.setC_review_responder(reviewer); - reqReviewDTO.setC_review_result_state("Enable"); + reqReviewDTO.setC_review_result_state("Open"); reqReviewDTO.setC_review_creat_date(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); reqReview.addNode(reqReviewDTO); @@ -545,7 +545,7 @@ searchResult.setC_review_req_name(returnNode.getC_title()); - searchResult.setC_review_result_state("Update-Enable"); + searchResult.setC_review_result_state("Update"); searchResult.setC_review_creat_date(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); reqReview.updateNode(searchResult); Index: web-module/src/main/java/egovframework/api/arms/module_reqreviewlog/controller/UserReqReviewLogController.java =================================================================== diff -u -r73b61d12fc72c79664dce3231b0de5c00ca6c4eb -r1936e60dae53301428372e99f188a288734f8d2f --- web-module/src/main/java/egovframework/api/arms/module_reqreviewlog/controller/UserReqReviewLogController.java (.../UserReqReviewLogController.java) (revision 73b61d12fc72c79664dce3231b0de5c00ca6c4eb) +++ web-module/src/main/java/egovframework/api/arms/module_reqreviewlog/controller/UserReqReviewLogController.java (.../UserReqReviewLogController.java) (revision 1936e60dae53301428372e99f188a288734f8d2f) @@ -14,6 +14,7 @@ import egovframework.api.arms.module_reqaddlog.model.ReqAddLogDTO; import egovframework.api.arms.module_reqstatus.model.ReqStatusDTO; import egovframework.api.arms.module_reqstatuslog.model.ReqStatusLogDTO; +import egovframework.api.arms.util.StringUtility; import egovframework.com.ext.jstree.springHibernate.core.interceptor.SessionUtil; import egovframework.com.ext.jstree.support.util.ParameterParser; import lombok.extern.slf4j.Slf4j; @@ -67,14 +68,26 @@ public ModelAndView getHistory(ModelMap model, HttpServletRequest request) throws Exception { ParameterParser parser = new ParameterParser(request); - long reqID = parser.getLong("reqID"); + long c_review_pdservice_link = parser.getLong("c_review_pdservice_link"); + long c_review_req_link = parser.getLong("c_review_req_link"); ReqReviewLogDTO reviewLogDTO = new ReqReviewLogDTO(); - reviewLogDTO.setWhere("c_review_pdservice_link", 10L); - reviewLogDTO.setWhere("c_review_req_link", reqID); - reviewLogDTO.setOrder(Order.desc("c_date")); + reviewLogDTO.setWhere("c_review_pdservice_link", c_review_pdservice_link); + reviewLogDTO.setWhere("c_review_req_link", c_review_req_link); + reviewLogDTO.setOrder(Order.desc("c_review_creat_date")); List list = reqReviewLog.getChildNodeWithoutPaging(reviewLogDTO); + list.stream().forEach(data -> { + if(StringUtility.contains(data.getC_state(), "삽입된데이터")){ + data.setC_state("요구사항 리뷰 등록"); + }else if(StringUtility.contains(data.getC_state(), "변경이전데이터")){ + data.setC_state("요구사항 리뷰 수정"); + }else if(StringUtility.contains(data.getC_state(), "변경이후데이터")){ + data.setC_state("요구사항 리뷰 수정"); + }else if(StringUtility.contains(data.getC_state(), "삭제된데이터")){ + data.setC_state("요구사항 리뷰 삭제"); + } + }); ModelAndView modelAndView = new ModelAndView("jsonView"); modelAndView.addObject("result", list);