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:
LJH 2022-09-23 10:15:18 +09:00
commit ca6828f190
6 changed files with 12 additions and 0 deletions

View File

@ -23,5 +23,6 @@ public interface AdjReqMgrPastService {
AdjReqMgrPastVO findByIdPrtclMgr(AdjReqMgrPastVO adjReqMgrPastVO); AdjReqMgrPastVO findByIdPrtclMgr(AdjReqMgrPastVO adjReqMgrPastVO);
List<AdjReqMgrPastVO> selectAdrRpplPastList(AdjReqMgrPastVO adjReqMgrPastVO);
} }

View File

@ -70,4 +70,5 @@ public class AdjReqMgrPastDAO extends EgovAbstractDAO {
} }
} }

View File

@ -654,5 +654,6 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
return adjReqMgrPastDAO.findByIdPrtclMgr(adjReqMgrPastVO); return adjReqMgrPastDAO.findByIdPrtclMgr(adjReqMgrPastVO);
} }
} }

View File

@ -201,6 +201,13 @@ public class AdjReqMgrPastController {
// model.addAttribute("info", info); // model.addAttribute("info", info);
// model.addAttribute("adjReqMgrPastListVO", adjReqMgrPastService.selectAdrPrtclMgrPastList(adjReqMgrPastVO)); // model.addAttribute("adjReqMgrPastListVO", adjReqMgrPastService.selectAdrPrtclMgrPastList(adjReqMgrPastVO));
List<AdjReqMgrPastVO> rpplList = new ArrayList<AdjReqMgrPastVO>();
rpplList = adjReqMgrPastService.selectAdrRpplPastList(adjReqMgrPastVO);
model.addAttribute("rpplList", rpplList);
return "kccadr/adjReqMgrPast/adjReqMgrPastFileRegist"; return "kccadr/adjReqMgrPast/adjReqMgrPastFileRegist";
} }

View File

@ -454,6 +454,7 @@
</select> </select>
<!-- 오프라인 조정사건정보 수정 : 조정사건 정보 불러오기 --> <!-- 오프라인 조정사건정보 수정 : 조정사건 정보 불러오기 -->
<select id="adjReqMgrPastDAO.findByIdPrtclMgr" parameterClass="AdjReqPastVO" resultClass="AdjReqPastVO"> <select id="adjReqMgrPastDAO.findByIdPrtclMgr" parameterClass="AdjReqPastVO" resultClass="AdjReqPastVO">

View File

@ -136,3 +136,4 @@ $(document).ready(function(){
</body> </body>
</html> </html>
<!-- //cont -->