Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
em
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ichikawa
em
Commits
d12e68fb
Commit
d12e68fb
authored
Mar 06, 2023
by
Kazuki Nakamura
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【郵送受付申請機能】文言修正
parent
c841112b
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
12 deletions
+12
-12
src/main/java/jp/agentec/sinaburocast/action/admin/enquete/MemberCardReceiptSearchAction.java
+4
-4
src/main/java/jp/agentec/sinaburocast/action/user/PointUseAction.java
+1
-1
src/main/java/jp/agentec/sinaburocast/form/admin/enquete/MemberCardReceiptSearchForm.java
+1
-1
src/main/java/jp/agentec/sinaburocast/service/MemberCardReceiptService.java
+3
-3
src/main/webapp/WEB-INF/view/admin/enquete/memberCardReceiptSearch.html
+2
-2
src/main/webapp/WEB-INF/view/common/header_admin.vm
+1
-1
No files found.
src/main/java/jp/agentec/sinaburocast/action/admin/enquete/MemberCardReceiptSearchAction.java
View file @
d12e68fb
...
...
@@ -19,7 +19,7 @@ import jp.agentec.sinaburocast.form.admin.enquete.MemberCardReceiptSearchForm;
import
jp.agentec.sinaburocast.service.MemberCardReceiptService
;
/**
* (磁気カードの)郵送申請検索
* (磁気カードの)郵送
受付
申請検索
* @author nakamura-k
*
*/
...
...
@@ -41,7 +41,7 @@ public class MemberCardReceiptSearchAction extends AbstractAction {
}
/**
*
カード郵送
申請を検索する
*
郵送受付
申請を検索する
*/
@Execute
(
validator
=
false
,
urlPattern
=
"memberCardReceiptSearch/{pageNo}"
)
public
String
memberCardReceiptSearch
(){
...
...
@@ -96,7 +96,7 @@ public class MemberCardReceiptSearchAction extends AbstractAction {
}
/**
*
カード郵送
申請結果CSV出力
*
郵送受付
申請結果CSV出力
*/
@Execute
(
validator
=
false
)
public
String
reportDownload
()
throws
UnsupportedEncodingException
,
Exception
{
...
...
@@ -104,7 +104,7 @@ public class MemberCardReceiptSearchAction extends AbstractAction {
String
result
=
SinaburoUtil
.
toSJIS
(
memberCardReceiptService
.
getMemberCardReceiptForCsv
(
memberCardReceiptSearchForm
));
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
;
}
...
...
src/main/java/jp/agentec/sinaburocast/action/user/PointUseAction.java
View file @
d12e68fb
...
...
@@ -238,7 +238,7 @@ public class PointUseAction extends AbstractAction {
}
member
=
memberService
.
findById
(
member
.
memberId
);
//
カード郵送
申請情報をDBに登録する
//
郵送受付
申請情報をDBに登録する
memberCardReceiptService
.
insertMemberCardReceipt
(
member
);
//メール送信
...
...
src/main/java/jp/agentec/sinaburocast/form/admin/enquete/MemberCardReceiptSearchForm.java
View file @
d12e68fb
...
...
@@ -11,7 +11,7 @@ import jp.agentec.sinaburocast.entity.MemberCardReceipt;
import
jp.agentec.sinaburocast.form.admin.setting.PagingForm
;
/**
* (磁気カード)郵送申請検索Form
* (磁気カード)郵送
受付
申請検索Form
*
* @author nakamura-k
*
...
...
src/main/java/jp/agentec/sinaburocast/service/MemberCardReceiptService.java
View file @
d12e68fb
...
...
@@ -48,7 +48,7 @@ public class MemberCardReceiptService extends AbstractService<MemberCardReceipt>
}
/**
*
カード郵送
申請情報を登録する
*
郵送受付
申請情報を登録する
* @param member
*/
public
void
insertMemberCardReceipt
(
Member
member
)
{
...
...
@@ -59,7 +59,7 @@ public class MemberCardReceiptService extends AbstractService<MemberCardReceipt>
}
/**
*
カード郵送
申請情報取得(画面用)
*
郵送受付
申請情報取得(画面用)
* @param memberCardReceiptSearchForm
* @return ArrayList<MemberCardReceipt>
*/
...
...
@@ -98,7 +98,7 @@ public class MemberCardReceiptService extends AbstractService<MemberCardReceipt>
}
/**
*
カード郵送
申請情報を検索するための、AutoSelectを返す。
*
郵送受付
申請情報を検索するための、AutoSelectを返す。
* @param memberCardReceiptSearchForm
* @return AutoSelect<MemberCardReceipt>
*/
...
...
src/main/webapp/WEB-INF/view/admin/enquete/memberCardReceiptSearch.html
View file @
d12e68fb
#set($title = "
カード郵送
申請検索")
#set($title = "
郵送受付
申請検索")
#set($menukubun = "3")
#parse( "/WEB-INF/view/common/header_admin.vm" )
...
...
@@ -35,7 +35,7 @@
</div>
<!--[ /breadcrumbsWrap ]-->
<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"
>
<div
id=
"right_contents"
>
<div
id=
"search"
>
...
...
src/main/webapp/WEB-INF/view/common/header_admin.vm
View file @
d12e68fb
...
...
@@ -94,7 +94,7 @@ function numberOnly() {
<li><a
href=
"#q('/admin/enquete/enqueteRegist/')"
>
アンケート登録
</a></li>
<!-- <li><a href="#q('/admin/enquete/pointExchangeResultOutput/')">アンケート結果出力</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>
</li>
<li><a
href=
"#q('/admin/support/')"
><img
id=
"btn04"
src=
"/em/images/g_navi04_off.jpg"
alt=
"1%支援制度管理"
width=
"205"
height=
"51"
/></a>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment