#56951 性別の選択肢を追加

#56954 メールアドレスの種別変更
バグ修正

src/main/java/jp/agentec/sinaburocast/action/admin/member/MemberEditAction.java

@@ -143,7 +143,7 @@ public class MemberEditAction extends AbstractAction {
 			memberEditForm.withDrawFlg = "0";
 		}
 
-		// メールアドレス登録チェック
+		// E-mail(メイン)メールアドレス登録チェック
 		if(StringUtil.isBlank(memberEditForm.mainPcEmail)) {
 
 			ActionMessages messages = (ActionMessages)request.getAttribute(Globals.ERROR_KEY);
@@ -151,12 +151,12 @@ public class MemberEditAction extends AbstractAction {
 			if (messages == null) {
 				messages = new ActionMessages();
 			}
-			messages.add("Email", new ActionMessage(SinaburoViewUtil.getMessage("errors.E010")));
+			messages.add("mainPcEmail", new ActionMessage(SinaburoViewUtil.getMessage("errors.E010")));
 			request.setAttribute(Globals.ERROR_KEY, messages);
 
 			return "/admin/member/memberEdit.html";
 		}
-
+		//　E-mail(サブ)メールチェック
 		if (StringUtil.isNotBlank(memberEditForm.subPcEmail) && memberEditForm.mainPcEmail.equals(memberEditForm.subPcEmail)) {
 			ActionMessages messages = (ActionMessages)request.getAttribute(Globals.ERROR_KEY);
 
@@ -182,7 +182,7 @@ public class MemberEditAction extends AbstractAction {
 //			}
 //		}
 
-		//メールアドレス重複チェックPCメール
+		//メールアドレス重複チェックメインメール
 		if (!memberEditForm.mainPcEmail.trim().equals(memberEditForm.mainPcEmailBefore)) {
 			if (!StringUtil.isBlank(memberEditForm.mainPcEmail)) {
 				memberList = memberService.findByEmail(memberEditForm.mainPcEmail);
@@ -218,7 +218,7 @@ public class MemberEditAction extends AbstractAction {
 			}
 		}
 
-			//メールアドレス重複チェック携帯メール
+			//メールアドレス重複チェックサブメール
 		if (!memberEditForm.subPcEmail.trim().equals(memberEditForm.subPcEmailBefore)) {
 			if (!StringUtil.isBlank(memberEditForm.subPcEmail)) {
 

src/main/java/jp/agentec/sinaburocast/action/admin/member/MemberRegistAction.java

@@ -8,6 +8,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.Globals;
 import org.apache.struts.action.ActionMessage;
@@ -93,6 +94,7 @@ public class MemberRegistAction extends AbstractAction {
 	@Execute(validator = true, input="/admin/member/memberInput.html")
 	public String memberConfirm() {
 
+		List<Member> memberList = null;
 		Member memberInfo = null;
 
 		if (memberEditForm.withDrawFlg != null) {
@@ -101,68 +103,50 @@ public class MemberRegistAction extends AbstractAction {
 			memberEditForm.withDrawFlg = "0";
 		}
 
-		// メールアドレス登録チェック
-		if(StringUtil.isBlank(memberEditForm.mainPcEmail) && memberEditForm.subPcEmail == "") {
-
+		// E-mail(メイン)メールアドレス登録チェック
+		if(StringUtil.isBlank(memberEditForm.mainPcEmail)) {
 			ActionMessages messages = (ActionMessages)request.getAttribute(Globals.ERROR_KEY);
-
 			if (messages == null) {
 				messages = new ActionMessages();
 			}
-			messages.add("Email", new ActionMessage(SinaburoViewUtil.getMessage("errors.E010")));
+			messages.add("mainPcEmail", new ActionMessage(SinaburoViewUtil.getMessage("errors.E010")));
 			request.setAttribute(Globals.ERROR_KEY, messages);
 
 			return "/admin/member/memberInput.html";
 		}
 
-		//携帯メールチェック
-		if (!StringUtil.isBlank(memberEditForm.subPcEmail)) {
-			if (!SinaburoUtil.mobileAddressCheck(memberEditForm.subPcEmail)) {
-				ActionMessages messages = (ActionMessages)request.getAttribute(Globals.ERROR_KEY);
-				if (messages == null) {
-					messages = new ActionMessages();
-				}
-				messages.add("subPcEmail", new ActionMessage(SinaburoViewUtil.getMessage("errors.email",SinaburoViewUtil.getMessage("labels.mbMail"))));
-				request.setAttribute(Globals.ERROR_KEY, messages);
-				return "/admin/member/memberInput.html";
+		//　E-mail(サブ)メールチェック
+		if (StringUtil.isNotBlank(memberEditForm.subPcEmail) && memberEditForm.mainPcEmail.equals(memberEditForm.subPcEmail)) {
+			ActionMessages messages = (ActionMessages)request.getAttribute(Globals.ERROR_KEY);
+			if (messages == null) {
+				messages = new ActionMessages();
 			}
+			messages.add("Email", new ActionMessage(SinaburoViewUtil.getMessage("errors.E071")));
+			request.setAttribute(Globals.ERROR_KEY, messages);
+			return "/admin/member/memberInput.html";
 		}
 
-		//メールアドレス重複チェックPCメール
+		//メールアドレス重複チェックメインメール
 		if (!memberEditForm.mainPcEmail.trim().equals(memberEditForm.mainPcEmailBefore)) {
-			if (!StringUtil.isBlank(memberEditForm.mainPcEmail)) {
-
-				if (SinaburoUtil.mobileAddressCheck(memberEditForm.mainPcEmail)) {
-					ActionMessages messages = (ActionMessages)request.getAttribute(Globals.ERROR_KEY);
-					if (messages == null) {
-						messages = new ActionMessages();
-					}
-					messages.add("mainPcEmail", new ActionMessage(SinaburoViewUtil.getMessage("errors.email",SinaburoViewUtil.getMessage("labels.pcMail"))));
-					request.setAttribute(Globals.ERROR_KEY, messages);
-					return "/admin/member/memberInput.html";
+			memberList = memberService.findByEmail(memberEditForm.mainPcEmail);
+			if (CollectionUtils.isNotEmpty(memberList)) {
+				ActionMessages messages = (ActionMessages)request.getAttribute(Globals.ERROR_KEY);
+				if (messages == null) {
+					messages = new ActionMessages();
 				}
+				messages.add("mainPcEmail", new ActionMessage(SinaburoViewUtil.getMessage("errors.E014")));
+				request.setAttribute(Globals.ERROR_KEY, messages);
 
-				memberInfo = memberService.findByMainPcEmail(memberEditForm.mainPcEmail);
-				if (memberInfo != null) {
-					ActionMessages messages = (ActionMessages)request.getAttribute(Globals.ERROR_KEY);
-					if (messages == null) {
-						messages = new ActionMessages();
-					}
-					messages.add("mainPcEmail", new ActionMessage(SinaburoViewUtil.getMessage("errors.E014")));
-					request.setAttribute(Globals.ERROR_KEY, messages);
-
-					return "/admin/member/memberInput.html";
+				return "/admin/member/memberInput.html";
 
-				}
 			}
 		}
 
-		//メールアドレス重複チェック携帯メール
+		//メールアドレス重複チェックサブメール
 		if (!memberEditForm.subPcEmail.trim().equals(memberEditForm.subPcEmailBefore)) {
 			if (!StringUtil.isBlank(memberEditForm.subPcEmail)) {
-
-				memberInfo = memberService.findBySubPcEmail(memberEditForm.subPcEmail);
-				if (memberInfo != null) {
+				memberList = memberService.findByEmail(memberEditForm.subPcEmail);
+				if (CollectionUtils.isNotEmpty(memberList)) {
 					ActionMessages messages = (ActionMessages)request.getAttribute(Globals.ERROR_KEY);
 					if (messages == null) {
 						messages = new ActionMessages();

src/main/java/jp/agentec/sinaburocast/action/admin/member/MemberReportAction.java

@@ -8,6 +8,12 @@ import java.net.URLEncoder;
 import java.text.ParseException;
 import java.util.List;
 
+import org.apache.log4j.Logger;
+import org.seasar.framework.util.StringUtil;
+import org.seasar.struts.annotation.ActionForm;
+import org.seasar.struts.annotation.Execute;
+import org.seasar.struts.util.ResponseUtil;
+
 import jp.agentec.sinaburocast.action.AbstractAction;
 import jp.agentec.sinaburocast.common.SinaburoConstant;
 import jp.agentec.sinaburocast.common.annotation.OperationHistoryAno;
@@ -17,12 +23,6 @@ import jp.agentec.sinaburocast.dto.MemberReportDto;
 import jp.agentec.sinaburocast.form.admin.member.MemberReportForm;
 import jp.agentec.sinaburocast.service.MemberService;
 
-import org.apache.log4j.Logger;
-import org.seasar.framework.util.StringUtil;
-import org.seasar.struts.annotation.ActionForm;
-import org.seasar.struts.annotation.Execute;
-import org.seasar.struts.util.ResponseUtil;
-
 
 /**
  *
@@ -119,7 +119,7 @@ public class MemberReportAction extends AbstractAction {
 	public String reportDownload() throws UnsupportedEncodingException, Exception {
 
 		StringBuffer str = new StringBuffer();
-		str.append("\"\"\t\"全体\"\t\"\"\t\"\"\t\"PC\"\t\"\"\t\"\"\t\"携帯\"\t\"\"\t\"\"\r\n");
+		str.append("\"\"\t\"全体\"\t\"\"\t\"\"\t\"E-mail(メイン)\"\t\"\"\t\"\"\t\"E-mail(サブ)\"\t\"\"\t\"\"\r\n");
 		str.append("\"日付\"\t\"登録者\"\t\"退会者\"\t\"純増者\"\t\"登録者\"\t\"退会者\"\t\"純増者\"\t\"登録者\"\t\"退会者\"\t\"純増者\"\r\n");
 
         @SuppressWarnings("unchecked")

src/main/java/jp/agentec/sinaburocast/common/SinaburoConstant.java

@@ -207,6 +207,9 @@ public interface SinaburoConstant {
 
 		/** 携帯用のアドレスのみ */
 		String MOBILE = "1";
+		
+		/** 全て */
+		String ALL = "2";
 	}
 
 

src/main/java/jp/agentec/sinaburocast/form/admin/mail/MailRegistForm.java

@@ -3,9 +3,6 @@
  */
 package jp.agentec.sinaburocast.form.admin.mail;
 
-import jp.agentec.sinaburocast.common.SinaburoConstant.MailSendTypeStr;
-import jp.agentec.sinaburocast.common.util.SinaburoViewUtil;
-
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.upload.FormFile;
@@ -17,6 +14,9 @@ import org.seasar.struts.annotation.Maxlength;
 import org.seasar.struts.annotation.Msg;
 import org.seasar.struts.annotation.Required;
 
+import jp.agentec.sinaburocast.common.SinaburoConstant.MailSendTypeStr;
+import jp.agentec.sinaburocast.common.util.SinaburoViewUtil;
+
 /**
  * @author kim-hs
  *
@@ -83,9 +83,9 @@ public class MailRegistForm {
 			if (deliveryGroupId.equals("")) {
 				errors.add("deliveryGroupId", new ActionMessage(SinaburoViewUtil.getMessage("errors.E032"), false));
 			}
-			if (deliveryTargetType.equals("")) {
-				errors.add("deliveryTargetType", new ActionMessage(SinaburoViewUtil.getMessage("errors.E066"), false));
-			}
+//			if (deliveryTargetType.equals("")) {
+//				errors.add("deliveryTargetType", new ActionMessage(SinaburoViewUtil.getMessage("errors.E066"), false));
+//			}
 		}
 
 		if (deliveryTargetMethod.equals("0")) {

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

@@ -8,6 +8,14 @@ import java.util.Map;
 import javax.annotation.Resource;
 import javax.mail.MessagingException;
 
+import org.apache.commons.io.IOUtils;
+import org.apache.log4j.Logger;
+import org.apache.struts.upload.FormFile;
+import org.seasar.extension.jdbc.AutoSelect;
+import org.seasar.framework.container.annotation.tiger.Component;
+import org.seasar.framework.container.annotation.tiger.InstanceType;
+import org.seasar.framework.util.StringUtil;
+
 import jp.agentec.sinaburocast.common.SinaburoConstant;
 import jp.agentec.sinaburocast.common.util.MailUtil;
 import jp.agentec.sinaburocast.common.util.PropertyUtil;
@@ -24,14 +32,6 @@ import jp.agentec.sinaburocast.form.admin.mail.MailSearchForm;
 import jp.agentec.sinaburocast.helper.KeyHelper;
 import jp.agentec.sinaburocast.service.csv.CsvService;
 
-import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Logger;
-import org.apache.struts.upload.FormFile;
-import org.seasar.extension.jdbc.AutoSelect;
-import org.seasar.framework.container.annotation.tiger.Component;
-import org.seasar.framework.container.annotation.tiger.InstanceType;
-import org.seasar.framework.util.StringUtil;
-
 @Component(instance=InstanceType.SINGLETON)
 public class EnqueteMailService extends AbstractService<EnqueteMail> {
 	private final Logger logger = Logger.getLogger(getClass());
@@ -243,17 +243,13 @@ public class EnqueteMailService extends AbstractService<EnqueteMail> {
     	int deliveryFailNum = 0;
     	//メール送信
 		for (DeliveryGroupMember member : list) {
-			String email = null;
-			if (enqueteMail.deliveryTargetType.equals(SinaburoConstant.DeliveryTargetType.PC)) {
-				if (StringUtil.isBlank(member.member.mainPcEmail)) {
-					continue;
-				}
-				email = member.member.mainPcEmail;
-			} else {
-				if (StringUtil.isBlank(member.member.subPcEmail)) {
-					continue;
-				}
-				email = member.member.subPcEmail;
+			String mainPcEmail = null;
+			String subPcEmail = null;
+			if (StringUtil.isNotBlank(member.member.mainPcEmail)) {
+				mainPcEmail = member.member.mainPcEmail;
+			}
+			if (StringUtil.isBlank(member.member.subPcEmail)) {
+				subPcEmail = member.member.subPcEmail;
 			}
 
 			String contents = enqueteMail.mailBody;
@@ -293,31 +289,61 @@ public class EnqueteMailService extends AbstractService<EnqueteMail> {
 			body.append(contents);
 
 			// メール送信
-			EnqueteMailSendResult enqueteMailSendResult = new EnqueteMailSendResult();
-			enqueteMailSendResult.enqueteMailId = enqueteMailId;
-			enqueteMailSendResult.memberId = member.member.memberId;
-			enqueteMailSendResult.email = email;
-			enqueteMailSendResult.sendResultCd = 0;
-			try {
-				enqueteMailSendResult.messageId = MailUtil.send(email, title, body.toString());
-			} catch (MessagingException e) {
-				deliveryFailNum++;
-				logger.error("Mail send failed." + e.toString());
-				if (e.toString().contains("SMTPAddressFailedException:")) {
-					enqueteMailSendResult.sendResultCd = Integer.valueOf(SinaburoUtil.extractRegexString(e.toString(), "SMTPAddressFailedException: (\\d+) ", 1));
-					enqueteMailSendResult.statusCd = SinaburoUtil.extractRegexString(e.toString(), "SMTPAddressFailedException: \\d+ ([^\\s]+)", 1);
-					enqueteMailSendResult.sendResult = SinaburoUtil.extractRegexString(e.toString(), "SMTPAddressFailedException: [^:]+: (.+)$", 1);
-				} else if (e.toString().contains("java.net.ConnectException:")) {
-					enqueteMailSendResult.sendResultCd = 451;
-					enqueteMailSendResult.sendResult = SinaburoUtil.extractRegexString(e.toString(), "java.net.ConnectException: (.+)$", 1);
-				} else {
-					enqueteMailSendResult.sendResultCd = 999;
+			if (mainPcEmail != null) {
+				EnqueteMailSendResult enqueteMailSendResult = new EnqueteMailSendResult();
+				enqueteMailSendResult.enqueteMailId = enqueteMailId;
+				enqueteMailSendResult.memberId = member.member.memberId;
+				enqueteMailSendResult.email = mainPcEmail;
+				enqueteMailSendResult.sendResultCd = 0;
+				try {
+					enqueteMailSendResult.messageId = MailUtil.send(mainPcEmail, title, body.toString());
+				} catch (MessagingException e) {
+					deliveryFailNum++;
+					logger.error("Mail send failed." + e.toString());
+					if (e.toString().contains("SMTPAddressFailedException:")) {
+						enqueteMailSendResult.sendResultCd = Integer.valueOf(SinaburoUtil.extractRegexString(e.toString(), "SMTPAddressFailedException: (\\d+) ", 1));
+						enqueteMailSendResult.statusCd = SinaburoUtil.extractRegexString(e.toString(), "SMTPAddressFailedException: \\d+ ([^\\s]+)", 1);
+						enqueteMailSendResult.sendResult = SinaburoUtil.extractRegexString(e.toString(), "SMTPAddressFailedException: [^:]+: (.+)$", 1);
+					} else if (e.toString().contains("java.net.ConnectException:")) {
+						enqueteMailSendResult.sendResultCd = 451;
+						enqueteMailSendResult.sendResult = SinaburoUtil.extractRegexString(e.toString(), "java.net.ConnectException: (.+)$", 1);
+					} else {
+						enqueteMailSendResult.sendResultCd = 999;
+					}
+					enqueteMailSendResult.messageId = "FAILED";
 				}
-				enqueteMailSendResult.messageId = "FAILED";
+
+				enqueteMailSendResultService.insertEnqueteMail(enqueteMailSendResult, insId);
+				mailTotalNum++;
 			}
+			if (subPcEmail != null) {
+				EnqueteMailSendResult enqueteMailSendResult = new EnqueteMailSendResult();
+				enqueteMailSendResult.enqueteMailId = enqueteMailId;
+				enqueteMailSendResult.memberId = member.member.memberId;
+				enqueteMailSendResult.email = subPcEmail;
+				enqueteMailSendResult.sendResultCd = 0;
+				try {
+					enqueteMailSendResult.messageId = MailUtil.send(subPcEmail, title, body.toString());
+				} catch (MessagingException e) {
+					deliveryFailNum++;
+					logger.error("Mail send failed." + e.toString());
+					if (e.toString().contains("SMTPAddressFailedException:")) {
+						enqueteMailSendResult.sendResultCd = Integer.valueOf(SinaburoUtil.extractRegexString(e.toString(), "SMTPAddressFailedException: (\\d+) ", 1));
+						enqueteMailSendResult.statusCd = SinaburoUtil.extractRegexString(e.toString(), "SMTPAddressFailedException: \\d+ ([^\\s]+)", 1);
+						enqueteMailSendResult.sendResult = SinaburoUtil.extractRegexString(e.toString(), "SMTPAddressFailedException: [^:]+: (.+)$", 1);
+					} else if (e.toString().contains("java.net.ConnectException:")) {
+						enqueteMailSendResult.sendResultCd = 451;
+						enqueteMailSendResult.sendResult = SinaburoUtil.extractRegexString(e.toString(), "java.net.ConnectException: (.+)$", 1);
+					} else {
+						enqueteMailSendResult.sendResultCd = 999;
+					}
+					enqueteMailSendResult.messageId = "FAILED";
+				}
 
-			enqueteMailSendResultService.insertEnqueteMail(enqueteMailSendResult, insId);
-			mailTotalNum++;
+				enqueteMailSendResultService.insertEnqueteMail(enqueteMailSendResult, insId);
+				mailTotalNum++;
+			}
+			
 		}
     	
     	//送信件数更新
@@ -336,7 +362,7 @@ public class EnqueteMailService extends AbstractService<EnqueteMail> {
 
     	return retValue;
     }
-
+	
 	public List<DeliveryGroupMember> fileRead(FormFile file) throws Exception {
 		List<DeliveryGroupMember> deliveryGroupMemberList = new ArrayList<DeliveryGroupMember>();
 		StringBuffer isOk = new StringBuffer("OK");

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

@@ -707,16 +707,14 @@ public class MemberService extends AbstractService<Member> {
 			values.add("%"+memberSearchForm.lastNameKana.trim().replace("%", "\\%")+"%");
 			flg = true;
 		}
-		if (!StringUtil.isBlank(memberSearchForm.mainPcEmail)) {
-			if (flg) sql.append(" and ");
-			sql.append("main_pc_email like ? ");
-			values.add("%"+memberSearchForm.mainPcEmail.trim().replace("%", "\\%")+"%");
-			flg = true;
-		}
-		if (!StringUtil.isBlank(memberSearchForm.subPcEmail)) {
+		// E-mail(メイン)又はE-mail(サブ)検索
+		if (!StringUtil.isBlank(memberSearchForm.searchPcEmail)) {
 			if (flg) sql.append(" and ");
-			sql.append("sub_pc_email like ? ");
-			values.add("%"+memberSearchForm.subPcEmail.trim().replace("%", "\\%")+"%");
+			sql.append("(main_pc_email like ? ");
+			values.add("%"+memberSearchForm.searchPcEmail.trim().replace("%", "\\%")+"%");
+			sql.append(" or sub_pc_email like ? ");
+			values.add("%"+memberSearchForm.searchPcEmail.trim().replace("%", "\\%")+"%");
+			sql.append(")");
 			flg = true;
 		}
 		if (!StringUtil.isBlank(memberSearchForm.telNo)) {

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

@@ -98,7 +98,7 @@ $!tools.getMsg("dateError") $!tools.getMsg("dateError_1") $!tools.getMsg("dateEr
 			<th class="t_center">申請日</th>
 			<th class="t_center">会員ID</th>
 			<th class="t_center">氏名</th>
-			<th class="t_center">メールアドレス</th>
+			<th class="t_center">E-mail(メイン)</th>
 			<th class="t_center">申請(枚数/ポイント数)</th>
 			<th class="t_center">郵便番号</th>
 			<th class="t_center">都道府県</th>

src/main/webapp/WEB-INF/view/admin/mail/mailConfirm.html

@@ -130,8 +130,10 @@ function centerPopup(){
 		<td>
 		#if ($!mailRegistForm.deliveryTargetType == "0")
 			PC用のアドレスのみ
-		#else
+		#elseif ($!mailRegistForm.deliveryTargetType == "1")
 			携帯用のアドレスのみ
+		#elseif ($!mailRegistForm.deliveryTargetType == "2")
+			E-mail(メイン)、E-mail(サブ)
 		#end
 		</td>
 ##		<input type="hidden" name="deliveryTargetType" value="$!mailRegistForm.deliveryTargetType">

src/main/webapp/WEB-INF/view/admin/mail/mailConfirmPopup.html

@@ -86,8 +86,10 @@
 		<td>
 		#if ($!mailRegistForm.deliveryTargetType == "0")
 			PC用のアドレスのみ
-		#else
+		#elseif ($!mailRegistForm.deliveryTargetType == "1")
 			携帯用のアドレスのみ
+		#elseif ($!mailRegistForm.deliveryTargetType == "2")
+			E-mail(メイン)、E-mail(サブ)
 		#end
 		</td>
 		<input type="hidden" name="deliveryTargetType" value="$!mailRegistForm.deliveryTargetType">

src/main/webapp/WEB-INF/view/admin/mail/mailInput.html

@@ -50,13 +50,13 @@
         if (type == "0") {
             document.getElementById('send_file').style.display = 'none';
             document.getElementById('enquete_id').style.display = 'none';
-            document.getElementById('send_target').style.display = '';
+            //document.getElementById('send_target').style.display = '';
             document.getElementById('send_group').style.display = '';
         } else {
             document.getElementById('send_file').style.display = '';
             document.getElementById('enquete_id').style.display = '';
             document.getElementById('send_group').style.display = 'none';
-            document.getElementById('send_target').style.display = 'none';
+            //document.getElementById('send_target').style.display = 'none';
         }
     }
 
@@ -172,7 +172,7 @@
 		<button class="button" onclick="save_mail('2'); return false;">一時保存</button>&nbsp;&nbsp;&nbsp;
 	</td>
 	</tr>
--->
+
 	<tr id="send_target">
 		<td style="vertical-align:top">配信対象</td>
 		<td>
@@ -184,8 +184,8 @@
 		#if($!tools.getMsg("deliveryTargetType")) <BR>$tools.getMsg("deliveryTargetType") #end
 		</td>
 	</tr>
-
-	</tr>
+-->
+	<input type="hidden" name="deliveryTargetType" value="2">
 	<tr>
 		<td style="vertical-align:top">テスト配信</td>
 		<td>&nbsp;&nbsp;メールアドレス

src/main/webapp/WEB-INF/view/admin/member/memberEdit.html

@@ -85,7 +85,7 @@
 		</td>
 	</tr>
 	<tr>
-		<td>E-mail(サブ)<font class="listpoint">*</font></td>
+		<td>E-mail(サブ)</td>
 		<td><input name="subPcEmail" type="text" / class="w250" value="$!escape.html($!{memberEditForm.subPcEmail})">
 			<BR>$!tools.getMsg("subPcEmail")
 			$!tools.getMsg("Email")
@@ -172,10 +172,14 @@
 		<td>
 #if($!memberEditForm.genderCd)
 <input type="radio" name="genderCd" value="0" #if($!memberEditForm.genderCd == "0")checked#end>男性&nbsp;&nbsp;
-<input type="radio" name="genderCd" value="1" #if($!memberEditForm.genderCd == "1")checked#end>女性
+<input type="radio" name="genderCd" value="1" #if($!memberEditForm.genderCd == "1")checked#end>女性&nbsp;&nbsp;
+<input type="radio" name="genderCd" value="2" #if($!memberEditForm.genderCd == "2")checked#end>その他&nbsp;&nbsp;
+<input type="radio" name="genderCd" value="3" #if($!memberEditForm.genderCd == "3")checked#end>入力しない
 #else
 <input type="radio" name="genderCd" value="0">男性&nbsp;&nbsp;
-<input type="radio" name="genderCd" value="1">女性
+<input type="radio" name="genderCd" value="1">女性&nbsp;&nbsp;
+<input type="radio" name="genderCd" value="2">その他&nbsp;&nbsp;
+<input type="radio" name="genderCd" value="3">入力しない
 #end
 		</td>
 	</tr>

src/main/webapp/WEB-INF/view/admin/member/memberInput.html

@@ -59,14 +59,14 @@
 		</td>
 	</tr>
 	<tr>
-		<td>パソコンE-mail<font class="listpoint">*</font></td>
+		<td>E-mail(メイン)<font class="listpoint">*</font></td>
 		<td><input name="mainPcEmail" type="text" / class="w250" value="$!escape.html($!memberEditForm.mainPcEmail)">
 			<BR>$!tools.getMsg("mainPcEmail")
 			$!tools.getMsg("Email")
 		</td>
 	</tr>
 	<tr>
-		<td>携帯電話E-mail<font class="listpoint">*</font></td>
+		<td>E-mail(サブ)</td>
 		<td><input name="subPcEmail" type="text" / class="w250" value="$!escape.html($!{memberEditForm.subPcEmail})">
 			<BR>$!tools.getMsg("subPcEmail")
 			$!tools.getMsg("Email")

src/main/webapp/WEB-INF/view/admin/member/memberList.html

@@ -46,7 +46,7 @@
 <th class="w100">会員ID</th>
 <th class="w100 t_center">ログインID</th>
 <th class="w90 t_center">氏名</th>
-<th class="w150 t_center">メールアドレス</th>
+<th class="w150 t_center">E-mail(メイン)</th>
 <th class="w80 t_center">生年月日</th>
 <th class="w220 t_center">住所</th>
 ##<th class="w80 t_center">回答結果</th>

src/main/webapp/WEB-INF/view/admin/member/memberReport.html

@@ -97,8 +97,8 @@ $tools.getMsgs()
 <tr>
 <th class="w100"></th>
 <th colspan="3" class="w300 t_center">全体</th>
-<th colspan="3" class="w300 t_center">PC</th>
-<th colspan="3" class="w300 t_center">携帯</th>
+<th colspan="3" class="w300 t_center">E-mail(メイン)</th>
+<th colspan="3" class="w300 t_center">E-mail(サブ)</th>
 </tr>
 <tr>
 <th class="w100 t_center">年月日</th>