【郵送受付申請機能】文言修正

src/main/java/jp/agentec/sinaburocast/action/admin/enquete/MemberCardReceiptSearchAction.java

@@ -19,7 +19,7 @@ import jp.agentec.sinaburocast.form.admin.enquete.MemberCardReceiptSearchForm;
 import jp.agentec.sinaburocast.service.MemberCardReceiptService;
 import jp.agentec.sinaburocast.service.MemberCardReceiptService;
 
 
 /**
 /**
- * (磁気カードの)郵送申請検索
+ * (磁気カードの)郵送受付申請検索
  * @author nakamura-k
  * @author nakamura-k
  *
  *
  */
  */
@@ -41,7 +41,7 @@ public class MemberCardReceiptSearchAction extends AbstractAction {
 	}
 	}
 
 
 	/**
 	/**
-	 * カード郵送申請を検索する
+	 * 郵送受付申請を検索する
 	 */
 	 */
 	@Execute(validator = false,urlPattern="memberCardReceiptSearch/{pageNo}")
 	@Execute(validator = false,urlPattern="memberCardReceiptSearch/{pageNo}")
 	public String memberCardReceiptSearch(){
 	public String memberCardReceiptSearch(){
@@ -96,7 +96,7 @@ public class MemberCardReceiptSearchAction extends AbstractAction {
 	}
 	}
 
 
 	/**
 	/**
-	 * カード郵送申請結果CSV出力
+	 * 郵送受付申請結果CSV出力
 	 */
 	 */
 	@Execute(validator=false)
 	@Execute(validator=false)
 	public String reportDownload() throws UnsupportedEncodingException, Exception {
 	public String reportDownload() throws UnsupportedEncodingException, Exception {
@@ -104,7 +104,7 @@ public class MemberCardReceiptSearchAction extends AbstractAction {
 		String result = SinaburoUtil.toSJIS(memberCardReceiptService.getMemberCardReceiptForCsv(memberCardReceiptSearchForm));
 		String result = SinaburoUtil.toSJIS(memberCardReceiptService.getMemberCardReceiptForCsv(memberCardReceiptSearchForm));
 		
 		
 		String dateStr = new DateTool().format("yyyyMMdd_HHmmss",DateTool.getSystemDate());
 		String dateStr = new DateTool().format("yyyyMMdd_HHmmss",DateTool.getSystemDate());
-		ResponseUtil.download(URLEncoder.encode("カード郵送申請結果_"+dateStr+".csv", "UTF-8"),result.getBytes("Windows-31J") );
+		ResponseUtil.download(URLEncoder.encode("郵送受付申請結果_"+dateStr+".csv", "UTF-8"),result.getBytes("Windows-31J") );
 
 
 		return null;
 		return null;
 	}
 	}

src/main/java/jp/agentec/sinaburocast/action/user/PointUseAction.java

@@ -238,7 +238,7 @@ public class PointUseAction extends AbstractAction {
 		}
 		}
 		member = memberService.findById(member.memberId);
 		member = memberService.findById(member.memberId);
 		
 		
-		// カード郵送申請情報をDBに登録する
+		// 郵送受付申請情報をDBに登録する
 		memberCardReceiptService.insertMemberCardReceipt(member);
 		memberCardReceiptService.insertMemberCardReceipt(member);
 		
 		
 		//メール送信
 		//メール送信

src/main/java/jp/agentec/sinaburocast/form/admin/enquete/MemberCardReceiptSearchForm.java

@@ -11,7 +11,7 @@ import jp.agentec.sinaburocast.entity.MemberCardReceipt;
 import jp.agentec.sinaburocast.form.admin.setting.PagingForm;
 import jp.agentec.sinaburocast.form.admin.setting.PagingForm;
 
 
 /**
 /**
- * (磁気カード)郵送申請検索Form
+ * (磁気カード)郵送受付申請検索Form
  *
  *
  * @author nakamura-k
  * @author nakamura-k
  *
  *

src/main/java/jp/agentec/sinaburocast/service/MemberCardReceiptService.java

@@ -48,7 +48,7 @@ public class MemberCardReceiptService extends AbstractService<MemberCardReceipt>
 	}
 	}
 
 
 	/**
 	/**
-	 * カード郵送申請情報を登録する
+	 * 郵送受付申請情報を登録する
 	 * @param member
 	 * @param member
 	 */
 	 */
 	public void insertMemberCardReceipt(Member member) {
 	public void insertMemberCardReceipt(Member member) {
@@ -59,7 +59,7 @@ public class MemberCardReceiptService extends AbstractService<MemberCardReceipt>
 	}
 	}
 
 
 	/**
 	/**
-	 * カード郵送申請情報取得（画面用）
+	 * 郵送受付申請情報取得（画面用）
 	 * @param memberCardReceiptSearchForm
 	 * @param memberCardReceiptSearchForm
 	 * @return ArrayList<MemberCardReceipt>
 	 * @return ArrayList<MemberCardReceipt>
 	 */
 	 */
@@ -98,7 +98,7 @@ public class MemberCardReceiptService extends AbstractService<MemberCardReceipt>
 	}
 	}
 
 
 	/**
 	/**
-	 * カード郵送申請情報を検索するための、AutoSelectを返す。
+	 * 郵送受付申請情報を検索するための、AutoSelectを返す。
 	 * @param memberCardReceiptSearchForm
 	 * @param memberCardReceiptSearchForm
 	 * @return AutoSelect<MemberCardReceipt>
 	 * @return AutoSelect<MemberCardReceipt>
 	 */
 	 */

src/main/webapp/WEB-INF/view/admin/enquete/memberCardReceiptSearch.html

-#set($title = "カード郵送申請検索")
+#set($title = "郵送受付申請検索")
 #set($menukubun = "3")
 #set($menukubun = "3")
 #parse( "/WEB-INF/view/common/header_admin.vm" )
 #parse( "/WEB-INF/view/common/header_admin.vm" )
 
 
@@ -35,7 +35,7 @@
 
 
 </div><!--[ /breadcrumbsWrap ]-->
 </div><!--[ /breadcrumbsWrap ]-->
 <div id="main" class="clearfix">
 <div id="main" class="clearfix">
-<h2 class="contents_title">カード郵送申請検索</h2>
+<h2 class="contents_title">郵送受付申請検索</h2>
 <form method="POST" action="#q('/admin/enquete/memberCardReceiptSearch/memberCardReceiptSearch/1')" name="frm">
 <form method="POST" action="#q('/admin/enquete/memberCardReceiptSearch/memberCardReceiptSearch/1')" name="frm">
 <div id="right_contents">
 <div id="right_contents">
 	<div id="search">
 	<div id="search">

src/main/webapp/WEB-INF/view/common/header_admin.vm

@@ -94,7 +94,7 @@ function numberOnly() {
   <li><a href="#q('/admin/enquete/enqueteRegist/')">アンケート登録</a></li>
   <li><a href="#q('/admin/enquete/enqueteRegist/')">アンケート登録</a></li>
 <!--  <li><a href="#q('/admin/enquete/pointExchangeResultOutput/')">アンケート結果出力</a></li>-->
 <!--  <li><a href="#q('/admin/enquete/pointExchangeResultOutput/')">アンケート結果出力</a></li>-->
   <li><a href="#q('/admin/enquete/giftExchangeSearch/')">ポイント交換申請結果出力</a></li>
   <li><a href="#q('/admin/enquete/giftExchangeSearch/')">ポイント交換申請結果出力</a></li>
-  <li class="end"><a href="#q('/admin/enquete/memberCardReceiptSearch/')">カード郵送申請結果出力</a></li>
+  <li class="end"><a href="#q('/admin/enquete/memberCardReceiptSearch/')">郵送受付申請結果出力</a></li>
 </ul>
 </ul>
 </li>
 </li>
 <li><a href="#q('/admin/support/')"><img id="btn04" src="/em/images/g_navi04_off.jpg" alt="1％支援制度管理" width="205" height="51" /></a>
 <li><a href="#q('/admin/support/')"><img id="btn04" src="/em/images/g_navi04_off.jpg" alt="1％支援制度管理" width="205" height="51" /></a>