diff --git a/src/main/java/com/wb/domainserver/domain/admin/ntcn/email/vo/BOMaEmailSrchVO.java b/src/main/java/com/wb/domainserver/domain/admin/ntcn/email/vo/BOMaEmailSrchVO.java index 0bbe8a52..99c4514c 100644 --- a/src/main/java/com/wb/domainserver/domain/admin/ntcn/email/vo/BOMaEmailSrchVO.java +++ b/src/main/java/com/wb/domainserver/domain/admin/ntcn/email/vo/BOMaEmailSrchVO.java @@ -28,4 +28,12 @@ public class BOMaEmailSrchVO extends AbstractVO { /*secretkey*/ private String secretKey; + + /** 셋팅용 파라미터 tab구분 + * send : 이메일 수동발송 + * search : 이메일 발송내역*/ + private String reqTab; + + /** 셋팅용 파라미터 받는사람 이메일주소*/ + private String email; } diff --git a/src/main/java/com/wb/domainserver/domain/gcone/ntcn/mssage/vo/BOMssageVO.java b/src/main/java/com/wb/domainserver/domain/gcone/ntcn/mssage/vo/BOMssageVO.java index 92a36581..6c0d6306 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/ntcn/mssage/vo/BOMssageVO.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/ntcn/mssage/vo/BOMssageVO.java @@ -156,4 +156,11 @@ public class BOMssageVO extends AbstractVO { /** 메세지 취소 구분코드 */ private String cancelDvCd; + /** 셋팅용 파라미터 tab구분 + * send : 메시지수동바송 + * search : 메시지 발송내역*/ + private String reqTab; + + /** 셋팅용 파라미터 받는사람 휴대전화번호*/ + private String mbtlnb; } diff --git a/src/main/java/com/wb/domainserver/domain/mngr/ntcn/email/controller/EmailController.java b/src/main/java/com/wb/domainserver/domain/mngr/ntcn/email/controller/EmailController.java index e68fb0cc..56b907a7 100644 --- a/src/main/java/com/wb/domainserver/domain/mngr/ntcn/email/controller/EmailController.java +++ b/src/main/java/com/wb/domainserver/domain/mngr/ntcn/email/controller/EmailController.java @@ -116,8 +116,8 @@ public class EmailController { */ @Policy(AuthPolicy.RESTRICTED) @RequestMapping(value="/selectEmailPassivSndngManage") - public String selectEmailPassivSndngManage(){ - + public String selectEmailPassivSndngManage(ModelMap model, BOMaEmailSrchVO bOMaEmailSrchVO){ + model.addAttribute("emailSrchVO", bOMaEmailSrchVO); return "mngr/ntcn/email/EmailPassivSndngManage"; } diff --git a/src/main/java/com/wb/domainserver/domain/mngr/ntcn/mssage/controller/MssageController.java b/src/main/java/com/wb/domainserver/domain/mngr/ntcn/mssage/controller/MssageController.java index 6a98d770..7eb336e5 100644 --- a/src/main/java/com/wb/domainserver/domain/mngr/ntcn/mssage/controller/MssageController.java +++ b/src/main/java/com/wb/domainserver/domain/mngr/ntcn/mssage/controller/MssageController.java @@ -122,10 +122,11 @@ public class MssageController { */ @Policy(AuthPolicy.RESTRICTED) @RequestMapping(value="/selectMssagePassivSndngManage") - public String selectMessagePassivSndngManage(MssageVO vo, ModelMap model, + public String selectMessagePassivSndngManage(BOMssageVO vo, ModelMap model, @CookieValue(value = "authSopmalCd") String authSopmalCd){ vo.setSopmalCd(authSopmalCd); + model.addAttribute("mssageVO", vo); return "mngr/ntcn/mssage/MssagePassivSndngManage"; } @@ -149,6 +150,7 @@ public class MssageController { } DataMap content = new DataMap(); + content.put("mssageVO", vo); content.put("shopInfoMap", service.selectBOShopInfoInqire(vo)); content.put("sopmalCd", user.getSopmalCd()); @@ -178,6 +180,7 @@ public class MssageController { vo.setSopmalCd(user.getSopmalCd()); } DataMap content = new DataMap(); + content.put("mssageVO", vo); content.put("shopInfoMap", service.selectBOShopInfoInqire(vo)); content.put("sopmalCd", user.getSopmalCd()); @@ -188,7 +191,7 @@ public class MssageController { // "resultMap" // ); - return "mngr/ntcn/mssage/MssageSndngPopupC"; + return "mngr/ntcn/mssage/MssageSndngPopupC"; } diff --git a/src/main/webapp/WEB-INF/views/mngr/ntcn/email/EmailPassivSndngManage.jsp b/src/main/webapp/WEB-INF/views/mngr/ntcn/email/EmailPassivSndngManage.jsp index dc045af3..d7c4ace9 100644 --- a/src/main/webapp/WEB-INF/views/mngr/ntcn/email/EmailPassivSndngManage.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/ntcn/email/EmailPassivSndngManage.jsp @@ -25,7 +25,16 @@