Merge branch 'tolag3'
Conflicts: src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp
This commit is contained in:
commit
ca6828f190
@ -23,5 +23,6 @@ public interface AdjReqMgrPastService {
|
||||
|
||||
AdjReqMgrPastVO findByIdPrtclMgr(AdjReqMgrPastVO adjReqMgrPastVO);
|
||||
|
||||
List<AdjReqMgrPastVO> selectAdrRpplPastList(AdjReqMgrPastVO adjReqMgrPastVO);
|
||||
|
||||
}
|
||||
|
||||
@ -70,4 +70,5 @@ public class AdjReqMgrPastDAO extends EgovAbstractDAO {
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -654,5 +654,6 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
|
||||
return adjReqMgrPastDAO.findByIdPrtclMgr(adjReqMgrPastVO);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -200,6 +200,13 @@ public class AdjReqMgrPastController {
|
||||
// PgrCmmVO info = cmmService.selectPgrCmm(cmmVO);
|
||||
// model.addAttribute("info", info);
|
||||
// model.addAttribute("adjReqMgrPastListVO", adjReqMgrPastService.selectAdrPrtclMgrPastList(adjReqMgrPastVO));
|
||||
|
||||
List<AdjReqMgrPastVO> rpplList = new ArrayList<AdjReqMgrPastVO>();
|
||||
|
||||
rpplList = adjReqMgrPastService.selectAdrRpplPastList(adjReqMgrPastVO);
|
||||
|
||||
|
||||
model.addAttribute("rpplList", rpplList);
|
||||
|
||||
return "kccadr/adjReqMgrPast/adjReqMgrPastFileRegist";
|
||||
}
|
||||
|
||||
@ -453,6 +453,7 @@
|
||||
|
||||
</select>
|
||||
|
||||
|
||||
|
||||
<!-- 오프라인 조정사건정보 수정 : 조정사건 정보 불러오기 -->
|
||||
<select id="adjReqMgrPastDAO.findByIdPrtclMgr" parameterClass="AdjReqPastVO" resultClass="AdjReqPastVO">
|
||||
|
||||
@ -136,3 +136,4 @@ $(document).ready(function(){
|
||||
|
||||
</body>
|
||||
</html>
|
||||
<!-- //cont -->
|
||||
|
||||
Loading…
Reference in New Issue
Block a user