#56952 設問設定機能追加

#56951 性別の選択肢を追加
#56954 メールアドレスの種別変更

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

@@ -14,6 +14,17 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Properties;
 
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.log4j.Logger;
+import org.apache.struts.Globals;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
+import org.apache.struts.util.TokenProcessor;
+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;
@@ -31,17 +42,6 @@ import jp.agentec.sinaburocast.service.DeliveryGroupService;
 import jp.agentec.sinaburocast.service.MemberService;
 import jp.agentec.sinaburocast.service.PrefectureService;
 
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.log4j.Logger;
-import org.apache.struts.Globals;
-import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
-import org.apache.struts.util.TokenProcessor;
-import org.seasar.framework.util.StringUtil;
-import org.seasar.struts.annotation.ActionForm;
-import org.seasar.struts.annotation.Execute;
-import org.seasar.struts.util.ResponseUtil;
-
 /**
  *
  * 配信グループ検索
@@ -362,7 +362,7 @@ public class DeliveryGroupSearchAction  extends AbstractAction {
 	public String memberGroupDownload() throws UnsupportedEncodingException, Exception {
 
 		StringBuffer str = new StringBuffer();
-		str.append("\"会員ID\"\t\"ログインID\"\t\"パスワード\"\t\"氏\"\t\"名\"\t\"氏(カナ)\"\t\"名(カナ)\"\t\"PCﾒｰﾙｱﾄﾞﾚｽ\"\t\"携帯ﾒｰﾙｱﾄﾞﾚｽ\"\t\"電話\"\t\"性別\"\t\""+
+		str.append("\"会員ID\"\t\"ログインID\"\t\"パスワード\"\t\"氏\"\t\"名\"\t\"氏(カナ)\"\t\"名(カナ)\"\t\"E-mail(メイン)\"\t\"E-mail(サブ)\"\t\"電話\"\t\"性別\"\t\""+
 				"生年月日\"\t\"年代\"\t\"郵便番号\"\t\"都道府県\"\t\"市区町村\"\t\"町名・番地\"\t\"建物名\"\t\"ポイント\"\t\"メモ\"\t\"削除フラグ\"\t\"退会有無\"\t\"退会日時\"\t\"退会理由区分\"\t\"退会理由コメント\""
 				+"\r\n");
 		int offSet=0;
@@ -379,12 +379,16 @@ public class DeliveryGroupSearchAction  extends AbstractAction {
     	do{
 	    	for (DeliveryGroupMember report : list) {
 	    		str.append("\""+report.memberId+"\"\t\""+report.member.loginId+"\"\t\""+report.member.password+"\"\t\""+report.member.firstName+"\"\t\""+report.member.lastName+"\"\t\""+report.member.firstNameKana+"\"\t\""+report.member.lastNameKana);
-	    		str.append("\"\t\""+report.member.pcEmail+"\"\t\""+report.member.mbEmail+"\"\t\""+report.member.telno+"\"\t\"");
+	    		str.append("\"\t\""+report.member.mainPcEmail+"\"\t\""+report.member.subPcEmail+"\"\t\""+report.member.telno+"\"\t\"");
 	    		if (report.member.genderCd != null) {
 	    			if (report.member.genderCd == SinaburoConstant.GenderType.MAN) {
 		    			str.append("男");
 		    		} else if (report.member.genderCd == SinaburoConstant.GenderType.WOMAN) {
 						str.append("女");
+		    		} else if (report.member.genderCd == SinaburoConstant.GenderType.OTHERS) {
+						str.append("その他");
+		    		} else if (report.member.genderCd == SinaburoConstant.GenderType.DO_NOT_ENTER) {
+						str.append("入力しない");
 					} else {
 						str.append("");
 					}

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

@@ -8,6 +8,15 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.log4j.Logger;
+import org.apache.struts.Globals;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
+import org.apache.struts.util.TokenProcessor;
+import org.seasar.framework.util.StringUtil;
+import org.seasar.struts.annotation.ActionForm;
+import org.seasar.struts.annotation.Execute;
+
 import jp.agentec.sinaburocast.action.AbstractAction;
 import jp.agentec.sinaburocast.common.SinaburoConstant;
 import jp.agentec.sinaburocast.common.annotation.OperationHistoryAno;
@@ -22,15 +31,6 @@ import jp.agentec.sinaburocast.service.MemberService;
 import jp.agentec.sinaburocast.service.PostalcodeService;
 import jp.agentec.sinaburocast.service.PrefectureService;
 
-import org.apache.log4j.Logger;
-import org.apache.struts.Globals;
-import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
-import org.apache.struts.util.TokenProcessor;
-import org.seasar.framework.util.StringUtil;
-import org.seasar.struts.annotation.ActionForm;
-import org.seasar.struts.annotation.Execute;
-
 /**
  *
  * 会員登録
@@ -102,7 +102,7 @@ public class MemberRegistAction extends AbstractAction {
 		}
 
 		// メールアドレス登録チェック
-		if(StringUtil.isBlank(memberEditForm.pcEmail) && memberEditForm.mbEmail == "") {
+		if(StringUtil.isBlank(memberEditForm.mainPcEmail) && memberEditForm.subPcEmail == "") {
 
 			ActionMessages messages = (ActionMessages)request.getAttribute(Globals.ERROR_KEY);
 
@@ -116,39 +116,39 @@ public class MemberRegistAction extends AbstractAction {
 		}
 
 		//携帯メールチェック
-		if (!StringUtil.isBlank(memberEditForm.mbEmail)) {
-			if (!SinaburoUtil.mobileAddressCheck(memberEditForm.mbEmail)) {
+		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("mbEmail", new ActionMessage(SinaburoViewUtil.getMessage("errors.email",SinaburoViewUtil.getMessage("labels.mbMail"))));
+				messages.add("subPcEmail", new ActionMessage(SinaburoViewUtil.getMessage("errors.email",SinaburoViewUtil.getMessage("labels.mbMail"))));
 				request.setAttribute(Globals.ERROR_KEY, messages);
 				return "/admin/member/memberInput.html";
 			}
 		}
 
 		//メールアドレス重複チェックPCメール
-		if (!memberEditForm.pcEmail.trim().equals(memberEditForm.pcEmailBefore)) {
-			if (!StringUtil.isBlank(memberEditForm.pcEmail)) {
+		if (!memberEditForm.mainPcEmail.trim().equals(memberEditForm.mainPcEmailBefore)) {
+			if (!StringUtil.isBlank(memberEditForm.mainPcEmail)) {
 
-				if (SinaburoUtil.mobileAddressCheck(memberEditForm.pcEmail)) {
+				if (SinaburoUtil.mobileAddressCheck(memberEditForm.mainPcEmail)) {
 					ActionMessages messages = (ActionMessages)request.getAttribute(Globals.ERROR_KEY);
 					if (messages == null) {
 						messages = new ActionMessages();
 					}
-					messages.add("pcEmail", new ActionMessage(SinaburoViewUtil.getMessage("errors.email",SinaburoViewUtil.getMessage("labels.pcMail"))));
+					messages.add("mainPcEmail", new ActionMessage(SinaburoViewUtil.getMessage("errors.email",SinaburoViewUtil.getMessage("labels.pcMail"))));
 					request.setAttribute(Globals.ERROR_KEY, messages);
 					return "/admin/member/memberInput.html";
 				}
 
-				memberInfo = memberService.findByPcEmail(memberEditForm.pcEmail);
+				memberInfo = memberService.findByMainPcEmail(memberEditForm.mainPcEmail);
 				if (memberInfo != null) {
 					ActionMessages messages = (ActionMessages)request.getAttribute(Globals.ERROR_KEY);
 					if (messages == null) {
 						messages = new ActionMessages();
 					}
-					messages.add("pcEmail", new ActionMessage(SinaburoViewUtil.getMessage("errors.E014")));
+					messages.add("mainPcEmail", new ActionMessage(SinaburoViewUtil.getMessage("errors.E014")));
 					request.setAttribute(Globals.ERROR_KEY, messages);
 
 					return "/admin/member/memberInput.html";
@@ -158,17 +158,17 @@ public class MemberRegistAction extends AbstractAction {
 		}
 
 		//メールアドレス重複チェック携帯メール
-		if (!memberEditForm.mbEmail.trim().equals(memberEditForm.mbEmailBefore)) {
-			if (!StringUtil.isBlank(memberEditForm.mbEmail)) {
+		if (!memberEditForm.subPcEmail.trim().equals(memberEditForm.subPcEmailBefore)) {
+			if (!StringUtil.isBlank(memberEditForm.subPcEmail)) {
 
-				memberInfo = memberService.findByMoEmail(memberEditForm.mbEmail);
+				memberInfo = memberService.findBySubPcEmail(memberEditForm.subPcEmail);
 				if (memberInfo != null) {
 					ActionMessages messages = (ActionMessages)request.getAttribute(Globals.ERROR_KEY);
 					if (messages == null) {
 						messages = new ActionMessages();
 					}
 
-					messages.add("mbEmail", new ActionMessage(SinaburoViewUtil.getMessage("errors.E015")));
+					messages.add("subPcEmail", new ActionMessage(SinaburoViewUtil.getMessage("errors.E015")));
 					request.setAttribute(Globals.ERROR_KEY, messages);
 					return "/admin/member/memberInput.html";
 				}
@@ -262,8 +262,8 @@ public class MemberRegistAction extends AbstractAction {
 		member.lastName = memberEditForm.lastName;
 		member.firstNameKana = memberEditForm.firstNameKana;
 		member.lastNameKana = memberEditForm.lastNameKana;
-		member.pcEmail = memberEditForm.pcEmail;
-		member.mbEmail = memberEditForm.mbEmail;
+		member.mainPcEmail = memberEditForm.mainPcEmail;
+		member.subPcEmail = memberEditForm.subPcEmail;
 		member.password = memberEditForm.password;
 		member.password = memberEditForm.password2;
 		member.zipCode = memberEditForm.zipCode;

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

@@ -8,6 +8,16 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.List;
 
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.log4j.Logger;
+import org.apache.struts.util.TokenProcessor;
+import org.seasar.framework.util.FileUtil;
+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;
@@ -21,16 +31,6 @@ import jp.agentec.sinaburocast.service.MemberService;
 import jp.agentec.sinaburocast.service.UploadErrorService;
 import jp.agentec.sinaburocast.service.csv.CsvService;
 
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Logger;
-import org.apache.struts.util.TokenProcessor;
-import org.seasar.framework.util.FileUtil;
-import org.seasar.framework.util.StringUtil;
-import org.seasar.struts.annotation.ActionForm;
-import org.seasar.struts.annotation.Execute;
-import org.seasar.struts.util.ResponseUtil;
-
 /**
  * @author kim-hs
  *
@@ -41,7 +41,7 @@ public class MemberRegistAllAction extends AbstractAction {
 
 	private final Logger logger = Logger.getLogger(getClass());
 
-	private final String header = "\"会員ID\"\t\"ログインID\"\t\"パスワード\"\t\"氏\"\t\"名\"\t\"氏(カナ)\"\t\"名(カナ)\"\t\"PCﾒｰﾙｱﾄﾞﾚｽ\"\t\"携帯ﾒｰﾙｱﾄﾞﾚｽ\"\t\"電話\"\t\"性別\"\t\""+
+	private final String header = "\"会員ID\"\t\"ログインID\"\t\"パスワード\"\t\"氏\"\t\"名\"\t\"氏(カナ)\"\t\"名(カナ)\"\t\"E-mail(メイン)\"\t\"E-mail(サブ)\"\t\"電話\"\t\"性別\"\t\""+
 			"生年月日\"\t\"年代\"\t\"郵便番号\"\t\"都道府県\"\t\"市区町村\"\t\"町名・番地\"\t\"建物名\"\t\"ポイント\"\t\"メモ\"\t\"削除フラグ\"\t\"退会有無\""+"\r\n";
 
 	@ActionForm

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

@@ -76,7 +76,7 @@ public class PointUseAction extends AbstractAction {
 		
 		if (StringUtil.isBlank(member.zipCode) || member.prefectureId == null || StringUtil.isBlank(member.cityName) || StringUtil.isBlank(member.areaName) || StringUtil.isBlank(member.telno)
 				|| StringUtil.isBlank(member.firstName) || StringUtil.isBlank(member.lastName) || StringUtil.isBlank(member.firstNameKana) || StringUtil.isBlank(member.lastNameKana)
-				|| member.genderCd == null || StringUtil.isBlank(member.birthday)) {
+				|| StringUtil.isBlank(member.birthday)) {
 
 			ActionMessages messages = (ActionMessages)request.getAttribute(Globals.ERROR_KEY);
 
@@ -277,11 +277,11 @@ public class PointUseAction extends AbstractAction {
 		//メール送信
 		try {
 			Message message = messageService.findById(SinaburoConstant.MessageCode.MEMBER_CARD_RECEIPT);
-			if (!StringUtil.isBlank(member.pcEmail)) {
-				MailUtil.send(member.pcEmail, PropertyUtil.getProperty("MEMBER_CARD_RECEIPT_MAIL_TITLE"), message.message);
+			if (!StringUtil.isBlank(member.mainPcEmail)) {
+				MailUtil.send(member.mainPcEmail, PropertyUtil.getProperty("MEMBER_CARD_RECEIPT_MAIL_TITLE"), message.message);
 			}
-			if (!StringUtil.isBlank(member.mbEmail)) {
-				MailUtil.send(member.mbEmail, PropertyUtil.getProperty("MEMBER_CARD_RECEIPT_MAIL_TITLE"), message.message);
+			if (!StringUtil.isBlank(member.subPcEmail)) {
+				MailUtil.send(member.subPcEmail, PropertyUtil.getProperty("MEMBER_CARD_RECEIPT_MAIL_TITLE"), message.message);
 			}
 		} catch (MessagingException e) {
 			logger.warn("Mail send failed." + e.toString());
@@ -333,11 +333,11 @@ public class PointUseAction extends AbstractAction {
 			} else {
 				giftExchangeInfo = giftExchangeInfoService.findGiftExchangeInfoById(SinaburoConstant.giftType.ICHICO);
 			}
-			if (!StringUtil.isBlank(member.pcEmail)) {
-				MailUtil.send(member.pcEmail, PropertyUtil.getProperty("POINT_USE_MAIL_TITLE"), giftExchangeInfo.mailBody);
+			if (!StringUtil.isBlank(member.mainPcEmail)) {
+				MailUtil.send(member.mainPcEmail, PropertyUtil.getProperty("POINT_USE_MAIL_TITLE"), giftExchangeInfo.mailBody);
 			}
-			if (!StringUtil.isBlank(member.mbEmail)) {
-				MailUtil.send(member.mbEmail, PropertyUtil.getProperty("POINT_USE_MAIL_TITLE"), giftExchangeInfo.mailBody);
+			if (!StringUtil.isBlank(member.subPcEmail)) {
+				MailUtil.send(member.subPcEmail, PropertyUtil.getProperty("POINT_USE_MAIL_TITLE"), giftExchangeInfo.mailBody);
 			}
 		} catch (MessagingException e) {
 			logger.warn("Mail send failed." + e.toString());

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

@@ -106,9 +106,9 @@ public class RegistAction extends AbstractAction {
 		List<Member> memberList = new ArrayList<Member>();
 
 		if (SinaburoUtil.mobileAddressCheck(registForm.email)) {
-			member.mbEmail = registForm.email;
+			member.subPcEmail = registForm.email;
 		} else {
-			member.pcEmail = registForm.email;
+			member.mainPcEmail = registForm.email;
 		}
 
 		String id = RandomStringUtils.randomAlphanumeric(6);
@@ -228,9 +228,9 @@ public class RegistAction extends AbstractAction {
 		// 登録済みのメールアドレスチェック
 		Member memberInfo = null;
 		if (SinaburoUtil.mobileAddressCheck(registForm.email)) {
-			memberInfo = memberService.findByMoEmail(registForm.email);
+			memberInfo = memberService.findBySubPcEmail(registForm.email);
 		} else {
-			memberInfo = memberService.findByPcEmail(registForm.email);
+			memberInfo = memberService.findByMainPcEmail(registForm.email);
 		}
 
 		if (memberInfo != null) {

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

 package jp.agentec.sinaburocast.action.user;
 
+import org.apache.log4j.Logger;
+import org.seasar.struts.annotation.ActionForm;
+import org.seasar.struts.annotation.Execute;
+
 import jp.agentec.sinaburocast.action.AbstractAction;
 import jp.agentec.sinaburocast.common.annotation.NoLogin;
 import jp.agentec.sinaburocast.form.user.TopForm;
 import jp.agentec.sinaburocast.service.TestService;
 
-import org.apache.log4j.Logger;
-import org.seasar.struts.annotation.ActionForm;
-import org.seasar.struts.annotation.Execute;
-
 @NoLogin
 public class TopAction extends AbstractAction {
 	private final Logger logger = Logger.getLogger(getClass());
@@ -87,4 +87,10 @@ public class TopAction extends AbstractAction {
 		return "/user/top/faq.html";
 	}
 	
+	@Execute(validator = false)
+	public String newUserRegist() {
+
+		return "/user/top/newUserRegist.html";
+	}
+
 }

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

@@ -68,8 +68,8 @@ public class UserEditAction extends AbstractAction {
 		userEditForm.lastName = memberInfo.lastName;
 		userEditForm.firstNameKana = memberInfo.firstNameKana;
 		userEditForm.lastNameKana = memberInfo.lastNameKana;
-		userEditForm.pcEmail = memberInfo.pcEmail;
-		userEditForm.mbEmail = memberInfo.mbEmail;
+		userEditForm.mainPcEmail = memberInfo.mainPcEmail;
+		userEditForm.subPcEmail = memberInfo.subPcEmail;
 		userEditForm.password = memberInfo.password;
 		userEditForm.password2 = memberInfo.password;
 
@@ -169,7 +169,7 @@ public class UserEditAction extends AbstractAction {
 		Member memberInfo = null;
 
 		// メールアドレス登録チェック
-		if(StringUtil.isBlank(userEditForm.pcEmail) && StringUtil.isBlank(userEditForm.mbEmail)) {
+		if(StringUtil.isBlank(userEditForm.mainPcEmail)) {
 
 			ActionMessages messages = (ActionMessages)request.getAttribute(Globals.ERROR_KEY);
 
@@ -183,59 +183,44 @@ public class UserEditAction extends AbstractAction {
 		}
 
 		//携帯メールチェック
-		if (!StringUtil.isBlank(userEditForm.mbEmail)) {
-			if (!SinaburoUtil.mobileAddressCheck(userEditForm.mbEmail)) {
-				ActionMessages messages = (ActionMessages)request.getAttribute(Globals.ERROR_KEY);
-				if (messages == null) {
-					messages = new ActionMessages();
-				}
-				messages.add("mbEmail", new ActionMessage(SinaburoViewUtil.getMessage("errors.email",SinaburoViewUtil.getMessage("labels.mbMail"))));
-				request.setAttribute(Globals.ERROR_KEY, messages);
-				return "/user/userEdit/uEdit.html";
-			}
-		}
+//		if (!StringUtil.isBlank(userEditForm.subPcEmail)) {
+//			if (!SinaburoUtil.mobileAddressCheck(userEditForm.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 "/user/userEdit/uEdit.html";
+//			}
+//		}
 
 		//メールアドレス重複チェックPCメール
-		if (!userEditForm.pcEmail.trim().equals(memberInfoSession.pcEmail)) {
-			if (!StringUtil.isBlank(userEditForm.pcEmail)) {
-
-				if (SinaburoUtil.mobileAddressCheck(userEditForm.pcEmail)) {
-					ActionMessages messages = (ActionMessages)request.getAttribute(Globals.ERROR_KEY);
-					if (messages == null) {
-						messages = new ActionMessages();
-					}
-					messages.add("pcEmail", new ActionMessage(SinaburoViewUtil.getMessage("errors.email",SinaburoViewUtil.getMessage("labels.pcMail"))));
-					request.setAttribute(Globals.ERROR_KEY, messages);
-					return "/user/userEdit/uEdit.html";
-				}
-
-				memberInfo = memberService.findByPcEmail(userEditForm.pcEmail);
+		if (!userEditForm.mainPcEmail.trim().equals(memberInfoSession.mainPcEmail)) {
+			memberInfo = memberService.findByMainPcEmail(userEditForm.mainPcEmail);
 			if (memberInfo != null) {
 				ActionMessages messages = (ActionMessages)request.getAttribute(Globals.ERROR_KEY);
 				if (messages == null) {
 					messages = new ActionMessages();
 				}
-					messages.add("pcEmail", new ActionMessage(SinaburoViewUtil.getMessage("errors.E014")));
+				messages.add("mainPcEmail", new ActionMessage(SinaburoViewUtil.getMessage("errors.E014")));
 				request.setAttribute(Globals.ERROR_KEY, messages);
 
 				return "/user/userEdit/uEdit.html";
-
-				}
 			}
 		}
 
 		//メールアドレス重複チェック携帯メール
-		if (!userEditForm.mbEmail.trim().equals(memberInfoSession.mbEmail)) {
-			if (!StringUtil.isBlank(userEditForm.mbEmail)) {
-
-				memberInfo = memberService.findByMoEmail(userEditForm.mbEmail);
+		if (!userEditForm.subPcEmail.trim().equals(memberInfoSession.subPcEmail)) {
+			if (!StringUtil.isBlank(userEditForm.subPcEmail)) {
+				memberInfo = memberService.findBySubPcEmail(userEditForm.subPcEmail);
 				if (memberInfo != null) {
 					ActionMessages messages = (ActionMessages)request.getAttribute(Globals.ERROR_KEY);
 					if (messages == null) {
 						messages = new ActionMessages();
 					}
 
-					messages.add("mbEmail", new ActionMessage(SinaburoViewUtil.getMessage("errors.E015")));
+					messages.add("subPcEmail", new ActionMessage(SinaburoViewUtil.getMessage("errors.E015")));
 					request.setAttribute(Globals.ERROR_KEY, messages);
 					return "/user/userEdit/uEdit.html";
 				}
@@ -444,8 +429,8 @@ public class UserEditAction extends AbstractAction {
 		member.lastName = userEditForm.lastName;
 		member.firstNameKana = userEditForm.firstNameKana;
 		member.lastNameKana = userEditForm.lastNameKana;
-		member.pcEmail = userEditForm.pcEmail;
-		member.mbEmail = userEditForm.mbEmail;
+		member.mainPcEmail = userEditForm.mainPcEmail;
+		member.subPcEmail = userEditForm.subPcEmail;
 		member.password = userEditForm.password;
 		member.password = userEditForm.password2;
 		member.zipCode = userEditForm.zipCode;

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

@@ -122,6 +122,13 @@ public interface SinaburoConstant {
 
 		/** 女性 */
 		int WOMAN = 1;
+		
+		/** その他 */
+		int OTHERS = 2;
+		
+		/** 入力しない */
+		int DO_NOT_ENTER = 3;
+
 	}
 
 	/**

src/main/java/jp/agentec/sinaburocast/csv/MemberInfoCsv.java

@@ -10,13 +10,6 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
-import jp.agentec.sinaburocast.common.util.SinaburoUtil;
-import jp.agentec.sinaburocast.common.util.SinaburoViewUtil;
-import jp.agentec.sinaburocast.entity.Member;
-import jp.agentec.sinaburocast.entity.Prefecture;
-import jp.agentec.sinaburocast.service.MemberService;
-import jp.agentec.sinaburocast.service.PrefectureService;
-
 import org.seasar.framework.util.StringUtil;
 import org.seasar.s2csv.csv.annotation.CSVValidator;
 import org.seasar.s2csv.csv.annotation.column.CSVColumn;
@@ -28,6 +21,13 @@ import org.seasar.s2csv.csv.annotation.entity.CSVRecordValidator;
 import org.seasar.s2csv.csv.exception.runtime.CSVValidationException;
 import org.seasar.struts.util.RequestUtil;
 
+import jp.agentec.sinaburocast.common.util.SinaburoUtil;
+import jp.agentec.sinaburocast.common.util.SinaburoViewUtil;
+import jp.agentec.sinaburocast.entity.Member;
+import jp.agentec.sinaburocast.entity.Prefecture;
+import jp.agentec.sinaburocast.service.MemberService;
+import jp.agentec.sinaburocast.service.PrefectureService;
+
 /**
  * @author kim-hs
  *
@@ -41,8 +41,8 @@ public class MemberInfoCsv extends AbstractCsv {
 
 	private int checkMemberId;
 	private String checkLoginId;
-	private String checkPcEmail;
-	private String checkMbEmail;
+	private String checkMainPcEmail;
+	private String checkSubPcEmail;
 	private int checkDelFlg;
 	
 
@@ -83,15 +83,15 @@ public class MemberInfoCsv extends AbstractCsv {
 
 	@CSVMaxLength(maxlength = 64)
 	@CSVMask(mask = "^[!-~]+@[!-~]+$")
-	@CSVValidator(msgKey = "errors.pcEmail", method = "validatepcEmail")
-	@CSVColumn(columnIndex = 7, columnName = "PCﾒｰﾙｱﾄﾞﾚｽ")
-	public String pcEmail;
+	@CSVValidator(msgKey = "errors.mainPcEmail", method = "validateMainPcEmail")
+	@CSVColumn(columnIndex = 7, columnName = "E-mail(メイン)")
+	public String mainPcEmail;
 
 	@CSVMaxLength(maxlength = 64)
 	@CSVMask(mask = "^[!-~]+@[!-~]+$")
-	@CSVValidator(msgKey = "errors.mbEmail", method = "validatembEmail")
-	@CSVColumn(columnIndex = 8, columnName = "携帯ﾒｰﾙｱﾄﾞﾚｽ")
-	public String mbEmail;
+	@CSVValidator(msgKey = "errors.subPcEmail", method = "validateSubPcEmail")
+	@CSVColumn(columnIndex = 8, columnName = "E-mail(サブ)")
+	public String subPcEmail;
 
 	@CSVMask(mask = "^[0-9]{8,20}$")
 	@CSVColumn(columnIndex = 9, columnName = "電話番号")
@@ -268,15 +268,15 @@ public class MemberInfoCsv extends AbstractCsv {
 		return true;
 	}
 
-	public boolean validatepcEmail(String args) {
-		// PCメールアドレスの検証は削除フラグの検証で行う
-		checkPcEmail = args;
+	public boolean validateMainPcEmail(String args) {
+		// メインPCメールアドレスの検証は削除フラグの検証で行う
+		checkMainPcEmail = args;
 		return true;
 	}
 
-	public boolean validatembEmail(String args) {
-		// 携帯メールアドレスの検証は削除フラグの検証で行う
-		checkMbEmail = args;
+	public boolean validateSubPcEmail(String args) {
+		// サブPCメールアドレスの検証は削除フラグの検証で行う
+		checkSubPcEmail = args;
 		return true;
 	}
 
@@ -319,31 +319,31 @@ public class MemberInfoCsv extends AbstractCsv {
 		}
 		
 		
-		// PCメールチェック
-		if (!StringUtil.isBlank(checkPcEmail)) {
-			memberInfo = memberService.findByPcEmail(checkPcEmail);
+		// メインPCメールチェック
+		if (!StringUtil.isBlank(checkMainPcEmail)) {
+			memberInfo = memberService.findByMainPcEmail(checkMainPcEmail);
 			if(memberInfo != null){
 				if(!memberInfo.memberId.equals(checkMemberId)) {
 					errorMessage.append(SinaburoViewUtil.getMessage("errors.E014"));
 				}
 			}
 			
-			if (SinaburoUtil.mobileAddressCheck(checkPcEmail)) {
+			if (SinaburoUtil.mobileAddressCheck(checkMainPcEmail)) {
 				errorMessage.append(SinaburoViewUtil.getMessage("errors.email", SinaburoViewUtil.getMessage("labels.pcMail")));
 			}
 
 		}
 		
-		// 携帯メールチェック
-		if (!StringUtil.isBlank(checkMbEmail)) {
-			memberInfo = memberService.findByMoEmail(checkMbEmail);
+		// サブPCメールチェック
+		if (!StringUtil.isBlank(checkSubPcEmail)) {
+			memberInfo = memberService.findBySubPcEmail(checkSubPcEmail);
 			if(memberInfo != null){
 				if(!memberInfo.memberId.equals(checkMemberId)) {
 					errorMessage.append(SinaburoViewUtil.getMessage("errors.E015"));
 				}
 			}
 			
-			if (!SinaburoUtil.mobileAddressCheck(checkMbEmail)) {
+			if (!SinaburoUtil.mobileAddressCheck(checkSubPcEmail)) {
 				errorMessage.append(SinaburoViewUtil.getMessage("errors.email", SinaburoViewUtil.getMessage("labels.mbMail")));
 			}
 		}

src/main/java/jp/agentec/sinaburocast/csv/MemberMigrationInfoCsv.java

@@ -11,12 +11,6 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
-import jp.agentec.sinaburocast.common.SinaburoConstant;
-import jp.agentec.sinaburocast.entity.Member;
-import jp.agentec.sinaburocast.entity.Prefecture;
-import jp.agentec.sinaburocast.service.MemberService;
-import jp.agentec.sinaburocast.service.PrefectureService;
-
 import org.seasar.framework.util.StringUtil;
 import org.seasar.s2csv.csv.annotation.CSVValidator;
 import org.seasar.s2csv.csv.annotation.column.CSVColumn;
@@ -28,6 +22,12 @@ import org.seasar.s2csv.csv.annotation.entity.CSVRecordValidator;
 import org.seasar.s2csv.csv.exception.runtime.CSVValidationException;
 import org.seasar.struts.util.RequestUtil;
 
+import jp.agentec.sinaburocast.common.SinaburoConstant;
+import jp.agentec.sinaburocast.entity.Member;
+import jp.agentec.sinaburocast.entity.Prefecture;
+import jp.agentec.sinaburocast.service.MemberService;
+import jp.agentec.sinaburocast.service.PrefectureService;
+
 /**
  * @author choi-c
  *
@@ -78,16 +78,16 @@ public class MemberMigrationInfoCsv extends AbstractCsv {
 	
 	
 	@CSVMaxLength(maxlength = 64)
-	@CSVValidator(msgKey = "errors.pcEmail", method = "validatepcEmail")
+	@CSVValidator(msgKey = "errors.mainPcEmail", method = "validateMainPcEmail")
 	@CSVMask(mask = "^[!-~]+@[!-~]+$")
 	@CSVColumn(columnIndex = 9, columnName = "メールアドレス(PC)")
-	public String pcEmail;
+	public String mainPcEmail;
 	
 	@CSVMaxLength(maxlength = 64)
-	@CSVValidator(msgKey = "errors.mbEmail", method = "validatembEmail")
+	@CSVValidator(msgKey = "errors.subPcEmail", method = "validateSubPcEmail")
 	@CSVMask(mask = "^[!-~]+@[!-~]+$")
-	@CSVColumn(columnIndex = 10, columnName = "メールアドレス(携帯)")
-	public String mbEmail;
+	@CSVColumn(columnIndex = 10, columnName = "メールアドレス(サブPC)")
+	public String subPcEmail;
 	
 	@CSVValidator(msgKey = "errors.prefecture", method = "validatezipCode")
 	//@CSVMask(mask = "^[0-9]{7}$")
@@ -203,6 +203,10 @@ public class MemberMigrationInfoCsv extends AbstractCsv {
 			genderCd = SinaburoConstant.GenderType.MAN;
 		} else if (args.equals("女性")) {
 			genderCd = SinaburoConstant.GenderType.WOMAN;
+		} else if (args.equals("その他")) {
+			genderCd = SinaburoConstant.GenderType.OTHERS;
+		} else if (args.equals("入力しない")) {
+			genderCd = SinaburoConstant.GenderType.DO_NOT_ENTER;
 		} else {
 			genderCd = null;
 		}
@@ -269,7 +273,7 @@ public class MemberMigrationInfoCsv extends AbstractCsv {
 //		
 //	}
 	
-	public boolean validatepcEmail(String args) {
+	public boolean validateMainPcEmail(String args) {
 
 		boolean result = false;
 
@@ -277,13 +281,13 @@ public class MemberMigrationInfoCsv extends AbstractCsv {
 
 		if(StringUtil.isBlank(args)) return true;
 
-		memberInfo = memberService.findByPcEmail(args);
+		memberInfo = memberService.findByMainPcEmail(args);
 
 		if (memberInfo != null) {
 			if (StringUtil.isBlank(args)) {
 				result = false;
 				throw new CSVValidationException(
-						"errors.pcEmail",
+						"errors.mainPcEmail",
 						new Object[]{"costom validation error"}
 						);
 			}
@@ -293,7 +297,7 @@ public class MemberMigrationInfoCsv extends AbstractCsv {
 			}
 			result = false;
 			throw new CSVValidationException(
-					"errors.pcEmail",
+					"errors.mainPcEmail",
 					new Object[]{"costom validation error"}
 					);
 		}
@@ -311,7 +315,7 @@ public class MemberMigrationInfoCsv extends AbstractCsv {
 		return result;
 	}
 
-	public boolean validatembEmail(String args) {
+	public boolean validateSubPcEmail(String args) {
 
 		boolean result = false;
 
@@ -319,13 +323,13 @@ public class MemberMigrationInfoCsv extends AbstractCsv {
 
 		if(StringUtil.isBlank(args)) return true;
 
-		memberInfo = memberService.findByMoEmail(args);
+		memberInfo = memberService.findBySubPcEmail(args);
 
 		if (memberInfo != null) {
 			if (StringUtil.isBlank(args)) {
 				result = false;
 				throw new CSVValidationException(
-						"errors.mbEmail",
+						"errors.subPcEmail",
 						new Object[]{"costom validation error"}
 						);
 			}
@@ -334,7 +338,7 @@ public class MemberMigrationInfoCsv extends AbstractCsv {
 			}
 			result = false;
 			throw new CSVValidationException(
-					"errors.mbEmail",
+					"errors.subPcEmail",
 					new Object[]{"costom validation error"}
 					);
 		}

src/main/java/jp/agentec/sinaburocast/entity/Member.java

@@ -45,11 +45,11 @@ public class Member extends AbstractEntity {
 	@Column(name = "last_name_kana")
 	public String lastNameKana;
 
-	@Column(name = "pc_email")
-	public String pcEmail;
+	@Column(name = "main_pc_email")
+	public String mainPcEmail;
 
-	@Column(name = "mb_email")
-	public String mbEmail;
+	@Column(name = "sub_pc_email")
+	public String subPcEmail;
 
 	@Column(name = "zip_code")
 	public String zipCode;

src/main/java/jp/agentec/sinaburocast/form/admin/member/MemberEditForm.java

@@ -53,12 +53,12 @@ public class MemberEditForm {
     //@Required(msg=@Msg(key="errors.required"), arg0=@Arg(key="labels.pcMail"))
     @Maxlength(maxlength=64, msg=@Msg(key="errors.maxlength"), arg0=@Arg(key="labels.pcMail"))
     @Mask(mask = "^[!-~]+@[!-~]+$", msg = @Msg(key = "errors.email"),arg0=@Arg(key="labels.pcMail"))
-	public String pcEmail;
+	public String mainPcEmail;
 
     //@Required(msg=@Msg(key="errors.required"), arg0=@Arg(key="labels.mbMail"))
     @Maxlength(maxlength=64, msg=@Msg(key="errors.maxlength"), arg0=@Arg(key="labels.mbMail"))
     @Mask(mask = "^[!-~]+@[!-~]+$",msg = @Msg(key = "errors.email"),arg0=@Arg(key="labels.mbMail"))
-	public String mbEmail;
+	public String subPcEmail;
 
     @Mask(mask = "^[0-9]{7}$",msg=@Msg(key="errors.invalid"), arg0=@Arg(key="labels.zipCode"))
 	public String zipCode;
@@ -96,8 +96,8 @@ public class MemberEditForm {
 	public String withDrawFlg;
 
 	public String loginIdBefore;
-	public String pcEmailBefore;
-	public String mbEmailBefore;
+	public String mainPcEmailBefore;
+	public String subPcEmailBefore;
 	public String withDrawFlgBefore;
 
 	@Override

src/main/java/jp/agentec/sinaburocast/form/admin/member/MemberSearchForm.java

@@ -4,8 +4,6 @@
 package jp.agentec.sinaburocast.form.admin.member;
 
 
-import jp.agentec.sinaburocast.form.admin.setting.PagingForm;
-
 import org.apache.commons.lang.builder.StandardToStringStyle;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.seasar.framework.container.annotation.tiger.Component;
@@ -15,6 +13,8 @@ import org.seasar.struts.annotation.Mask;
 import org.seasar.struts.annotation.Maxlength;
 import org.seasar.struts.annotation.Msg;
 
+import jp.agentec.sinaburocast.form.admin.setting.PagingForm;
+
 /**
  * @author kim-hs
  *
@@ -36,9 +36,12 @@ public class MemberSearchForm extends PagingForm{
 
 	public String lastNameKana;
 
-	public String pcEmail;
+	public String mainPcEmail;
+
+	public String subPcEmail;
 	
-	public String mbEmail;
+	// メイン、サブいずれか含む検索
+	public String searchPcEmail;
 
 	@Mask(mask = "^[0-9]{7}$",msg=@Msg(key="errors.zipcode"), arg0=@Arg(key="labels.zipCode.from"), target="memberSearchResult")
 	public String zipCode;
@@ -93,8 +96,9 @@ public class MemberSearchForm extends PagingForm{
 		lastName = null;
 		firstNameKana = null;
 		lastNameKana = null;
-		pcEmail = null;
-		mbEmail = null;
+		mainPcEmail = null;
+		subPcEmail = null;
+		searchPcEmail = null;
 		zipCode = null;
 		zipCode1 = null;
 		pageNo = 1;

src/main/java/jp/agentec/sinaburocast/form/user/UserEditForm.java

@@ -41,14 +41,18 @@ public class UserEditForm {
 	public String lastNameKana;
 
     //@Required(msg=@Msg(key="errors.required"), arg0=@Arg(key="labels.pcMail"))
-    @Maxlength(maxlength=64, msg=@Msg(key="errors.maxlength"), arg0=@Arg(key="labels.pcMail"))
-    @Mask(mask = "^[!-~]+@[!-~]+$",msg = @Msg(key = "errors.email"), arg0=@Arg(key="labels.pcMail"))
-	public String pcEmail;
+    @Maxlength(maxlength=64, msg=@Msg(key="errors.maxlength"), arg0=@Arg(key="labels.mainPcMail"))
+    @Mask(mask = "^[!-~]+@[!-~]+$",msg = @Msg(key = "errors.email"), arg0=@Arg(key="labels.mainPcMail"))
+	public String mainPcEmail;
 
     //@Required(msg=@Msg(key="errors.required"), arg0=@Arg(key="labels.mbMail"))
-    @Maxlength(maxlength=64, msg=@Msg(key="errors.maxlength"), arg0=@Arg(key="labels.mbMail"))
-    @Mask(mask = "^[!-~]+@[!-~]+$",msg = @Msg(key = "errors.email"), arg0=@Arg(key="labels.mbMail"))
-	public String mbEmail;
+    @Maxlength(maxlength=64, msg=@Msg(key="errors.maxlength"), arg0=@Arg(key="labels.subPcMail"))
+    @Mask(mask = "^[!-~]+@[!-~]+$",msg = @Msg(key = "errors.email"), arg0=@Arg(key="labels.subPcMail"))
+	public String subPcEmail;
+    
+    @Maxlength(maxlength=64, msg=@Msg(key="errors.maxlength"), arg0=@Arg(key="labels.email"))
+    @Mask(mask = "^[!-~]+@[!-~]+$",msg = @Msg(key = "errors.email"), arg0=@Arg(key="labels.email"))
+	public String searchPcEmail;
 
     @Required(msg=@Msg(key="errors.required"), arg0=@Arg(key="labels.zipCode"), target="addrSearchUseMb")
     @Mask(mask = "^[0-9]{7}$",msg=@Msg(key="errors.invalid"), arg0=@Arg(key="labels.zipCode"))

src/main/java/jp/agentec/sinaburocast/logic/MemberRegisterBatchLogic.java

@@ -112,9 +112,9 @@ public class MemberRegisterBatchLogic {
 	private void sendRegisterMail(String email) throws Exception {
 		Member member;
 		if (SinaburoUtil.mobileAddressCheck(email)) {
-			member = memberService.findByMoEmail(email);
+			member = memberService.findBySubPcEmail(email);
 		} else {
-			member = memberService.findByPcEmail(email);
+			member = memberService.findByMainPcEmail(email);
 		}
 		
 		if (member != null) { // すでに登録されている場合のメール送信
@@ -144,11 +144,11 @@ public class MemberRegisterBatchLogic {
 		List<Member> memberList = new ArrayList<Member>();
 
 		if (SinaburoUtil.mobileAddressCheck(email)) {
-			member.mbEmail = email;
-			memberInfo = memberService.findByMoEmail(email);
+			member.subPcEmail = email;
+			memberInfo = memberService.findBySubPcEmail(email);
 		} else {
-			member.pcEmail = email;
-			memberInfo = memberService.findByPcEmail(email);
+			member.mainPcEmail = email;
+			memberInfo = memberService.findByMainPcEmail(email);
 		}
 
 		if (memberInfo == null) {

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

@@ -31,8 +31,8 @@ public class EnqueteMailAddressTmpService extends AbstractService<EnqueteMailAdd
 		for (EnqueteMailAddressTmp address : select().where(new SimpleWhere().eq("enqueteMailId", enqueteMailId)).getResultList()) {
 			DeliveryGroupMember deliveryGroupMember = new DeliveryGroupMember();
 			Member member = new Member();
-			member.pcEmail = address.email;
-			member.mbEmail = address.email;
+			member.mainPcEmail = address.email;
+			member.subPcEmail = address.email;
 			member.firstName = "";
 			member.lastName = "";
 			member.loginId = "";
@@ -58,7 +58,7 @@ public class EnqueteMailAddressTmpService extends AbstractService<EnqueteMailAdd
 		for (DeliveryGroupMember address : addressList) {
 			EnqueteMailAddressTmp entity = new EnqueteMailAddressTmp();
 			entity.enqueteMailId = enqueteMailId;
-			entity.email = address.member.pcEmail;
+			entity.email = address.member.mainPcEmail;
 			insert(entity, insIdStr);
 		}
 	}

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

@@ -245,15 +245,15 @@ public class EnqueteMailService extends AbstractService<EnqueteMail> {
 		for (DeliveryGroupMember member : list) {
 			String email = null;
 			if (enqueteMail.deliveryTargetType.equals(SinaburoConstant.DeliveryTargetType.PC)) {
-				if (StringUtil.isBlank(member.member.pcEmail)) {
+				if (StringUtil.isBlank(member.member.mainPcEmail)) {
 					continue;
 				}
-				email = member.member.pcEmail;
+				email = member.member.mainPcEmail;
 			} else {
-				if (StringUtil.isBlank(member.member.mbEmail)) {
+				if (StringUtil.isBlank(member.member.subPcEmail)) {
 					continue;
 				}
-				email = member.member.mbEmail;
+				email = member.member.subPcEmail;
 			}
 
 			String contents = enqueteMail.mailBody;
@@ -350,8 +350,8 @@ public class EnqueteMailService extends AbstractService<EnqueteMail> {
 			for (MailCsv csv : list) {
 				DeliveryGroupMember deliveryGroupMember = new DeliveryGroupMember();
 				Member member = new Member();
-				member.pcEmail = csv.mailAddress;
-				member.mbEmail = csv.mailAddress;
+				member.mainPcEmail = csv.mailAddress;
+				member.subPcEmail = csv.mailAddress;
 				member.firstName = "";
 				member.lastName = "";
 				member.loginId = "";

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

@@ -1185,7 +1185,7 @@ public class EnqueteService extends AbstractService<Enquete> {
 		StringBuffer str = new StringBuffer();
 		
 		if(hasHeader){
-			str.append("\"会員ID\"\t\"ログインID\"\t\"パスワード\"\t\"氏\"\t\"名\"\t\"氏(カナ)\"\t\"名(カナ)\"\t\"PCﾒｰﾙｱﾄﾞﾚｽ\"\t\"携帯ﾒｰﾙｱﾄﾞﾚｽ\"\t\"電話\"\t\"性別\"\t\""+
+			str.append("\"会員ID\"\t\"ログインID\"\t\"パスワード\"\t\"氏\"\t\"名\"\t\"氏(カナ)\"\t\"名(カナ)\"\t\"E-mail(メイン)\"\t\"E-mail(サブ)\"\t\"電話\"\t\"性別\"\t\""+
 					"生年月日\"\t\"年代\"\t\"郵便番号\"\t\"都道府県\"\t\"市区町村\"\t\"町名・番地\"\t\"建物名\"\t\"ポイント\"\t\"メモ\"\t\"削除フラグ\"");
 	
 			if(isMemberWithdraw){
@@ -1205,12 +1205,16 @@ public class EnqueteService extends AbstractService<Enquete> {
 
     	for (Member report : list) {
     		str.append("\""+report.memberId+"\"\t\""+report.loginId+"\"\t\""+report.password+"\"\t\""+report.firstName+"\"\t\""+report.lastName+"\"\t\""+report.firstNameKana+"\"\t\""+report.lastNameKana);
-    		str.append("\"\t\""+report.pcEmail+"\"\t\""+report.mbEmail+"\"\t\""+report.telno+"\"\t\"");
+    		str.append("\"\t\""+report.mainPcEmail+"\"\t\""+report.subPcEmail+"\"\t\""+report.telno+"\"\t\"");
     		if (report.genderCd != null) {
 	    		if (report.genderCd == SinaburoConstant.GenderType.MAN) {
 	    			str.append("男");
 	    		} else if (report.genderCd == SinaburoConstant.GenderType.WOMAN) {
 					str.append("女");
+	    		} else if (report.genderCd == SinaburoConstant.GenderType.OTHERS) {
+					str.append("その他");
+	    		} else if (report.genderCd == SinaburoConstant.GenderType.DO_NOT_ENTER) {
+					str.append("入力しない");
 				} else {
 					str.append("");
 				}

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

@@ -135,7 +135,7 @@ public class GiftExchangeService extends AbstractService<GiftExchange> {
     		str.append("\"" + giftExchange.member.firstName + " " + giftExchange.member.lastName + "\",");
 
     		//メールアドレス
-    		str.append("\"" + replaceNullWithBlank(giftExchange.member.pcEmail) +"\",");
+    		str.append("\"" + replaceNullWithBlank(giftExchange.member.mainPcEmail) +"\",");
 
     		//申請枚数
     		String unit = null;

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

@@ -90,11 +90,11 @@ public class MemberWithdrawService extends AbstractService<MemberWithdraw> {
 
     	Properties prop = PropertyUtil.getProperties("application_ja",false);
     	try {
-        	if(StringUtil.isNotBlank(member.pcEmail)){
-        		MailUtil.send(member.pcEmail, prop.getProperty("withDrow.mail.title"),prop.getProperty("withDrow.mail.body"));
+        	if(StringUtil.isNotBlank(member.mainPcEmail)){
+        		MailUtil.send(member.mainPcEmail, prop.getProperty("withDrow.mail.title"),prop.getProperty("withDrow.mail.body"));
         	}
-        	if(StringUtil.isNotBlank(member.mbEmail)){
-        		MailUtil.send(member.mbEmail, prop.getProperty("withDrow.mail.title"),prop.getProperty("withDrow.mail.body"));
+        	if(StringUtil.isNotBlank(member.subPcEmail)){
+        		MailUtil.send(member.subPcEmail, prop.getProperty("withDrow.mail.title"),prop.getProperty("withDrow.mail.body"));
         	}
 		} catch (MessagingException e) {
 			logger.error("Mail send failed." + e.toString()); // 退会時なので例外はスローしない

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

@@ -99,12 +99,12 @@ public class PointDonationService extends AbstractService<PointDonation> {
 
     		
     		//ユーザーに送信
-    		if(StringUtil.isNotBlank(member.pcEmail)){
-    			MailUtil.send(member.pcEmail, memberNotifyMail.subject, memberNotifyMail.mailBody);
+    		if(StringUtil.isNotBlank(member.mainPcEmail)){
+    			MailUtil.send(member.mainPcEmail, memberNotifyMail.subject, memberNotifyMail.mailBody);
     		}
 
-    		if(StringUtil.isNotBlank(member.mbEmail)){
-    			MailUtil.send(member.mbEmail, memberNotifyMail.subject,memberNotifyMail.mailBody);
+    		if(StringUtil.isNotBlank(member.subPcEmail)){
+    			MailUtil.send(member.subPcEmail, memberNotifyMail.subject,memberNotifyMail.mailBody);
     		}
 
     		//BCCに送信

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

@@ -389,9 +389,9 @@ public class ReplyService extends AbstractService<Reply> {
 				    			memberNotifyMail.mailBody+"\r\n"+
 				    			PropertyUtil.getString("ENQUETE_CONFIRM_URL"), enqueteEncodeId);
 		    		//ユーザーに送信
-		    		if(StringUtil.isNotBlank(member.pcEmail)){
+		    		if(StringUtil.isNotBlank(member.mainPcEmail)){
 		    			try {
-							MailUtil.send(member.pcEmail, memberNotifyMail.subject, mailbody);
+							MailUtil.send(member.mainPcEmail, memberNotifyMail.subject, mailbody);
 						} catch (UnsupportedEncodingException e) {
 							logger.error("Mail encode failed." + e.toString());
 						} catch (MessagingException e) {
@@ -399,9 +399,9 @@ public class ReplyService extends AbstractService<Reply> {
 						}
 		    		}
 		
-		    		if(StringUtil.isNotBlank(member.mbEmail)){
+		    		if(StringUtil.isNotBlank(member.subPcEmail)){
 		    			try{
-		    				MailUtil.send(member.mbEmail, memberNotifyMail.subject,mailbody);
+		    				MailUtil.send(member.subPcEmail, memberNotifyMail.subject,mailbody);
 		    			} catch (UnsupportedEncodingException e) {
 							logger.error("Mail encode failed." + e.toString());
 						} catch (MessagingException e) {

src/main/resources/application_ja.properties

@@ -49,7 +49,7 @@ errors.E006=\u4e0d\u6b63\u306a\u30d5\u30a1\u30a4\u30eb\u304c\u3042\u308a\u307e\u
 errors.E007=\u8a72\u5f53\u3059\u308b\u30c7\u30fc\u30bf\u304c\u3042\u308a\u307e\u305b\u3093\u3002
 errors.E008=\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u304c\u4e00\u81f4\u3057\u307e\u305b\u3093\u3002
 errors.E009=\u65e2\u306b\u767b\u9332\u6e08\u307f\u306e\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3067\u3059\u3002
-errors.E010=\u30d1\u30bd\u30b3\u30f3\u307e\u305f\u306f\u643a\u5e2f\u96fb\u8a71\u3069\u3061\u3089\u304b\u306f\u5fc5\u9808\u3067\u3059\u3002
+errors.E010=E-mail(\u30e1\u30a4\u30f3)\u306f\u5fc5\u9808\u3067\u3059\u3002
 errors.E011=\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u4e00\u81f4\u3057\u307e\u305b\u3093\u3002
 errors.E012=\u30ed\u30b0\u30a4\u30f3ID\u3082\u3057\u304f\u306f\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u4e0d\u6b63\u3067\u3059\u3002
 errors.E013=\u73fe\u5728\u306e\u30dd\u30a4\u30f3\u30c8\u6570\u3088\u308a\u30dd\u30a4\u30f3\u30c8\u6d88\u8cbb\u6570\u304c\u5927\u304d\u3044\u3067\u3059\u3002
@@ -168,8 +168,9 @@ labels.firstName=\u6c0f\u540d(\u59d3)
 labels.lastName=\u6c0f\u540d(\u540d)
 labels.firstKana=\u30d5\u30ea\u30ac\u30ca(\u30bb\u30a4)
 labels.lastKana=\u30d5\u30ea\u30ac\u30ca(\u30e1\u30a4)
-labels.pcMail=\u30d1\u30bd\u30b3\u30f3E-mail
-labels.mbMail=\u643a\u5e2f\u96fb\u8a71E-mail
+labels.mainPcEmail=E-mail(\u30e1\u30a4\u30f3)
+labels.subPcEmail=E-mail(\u30b5\u30d6)
+labels.email=E-mail
 labels.zipCode=\u90f5\u4fbf\u756a\u53f7
 labels.zipCode.from=\u90f5\u4fbf\u756a\u53f7(From)
 labels.zipCode.to=\u90f5\u4fbf\u756a\u53f7(To)

src/main/resources/csv_application.properties

@@ -27,10 +27,10 @@ errors.mailCheck=\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\uff08PC\u30e1\u30fc\
 errors.prefecture=\u8a72\u5f53\u3059\u308b\u90fd\u9053\u5e9c\u770c\u304c\u5b58\u5728\u3057\u307e\u305b\u3093\u3002
 errors.birthday=\u751f\u5e74\u6708\u65e5\u306f\u65e5\u4ed8\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093\u3002
 errors.birthday=\u751f\u5e74\u6708\u65e5\u306f\u65e5\u4ed8\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093\u3002
-errors.pcEmail=\u65e2\u306b\u767b\u9332\u6e08\u307f\u306e\u30d1\u30bd\u30b3\u30f3E-mail\u3067\u3059\u3002
-errors.pcEmail1=\u30d1\u30bd\u30b3\u30f3E-mail\u306f\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3068\u3057\u3066\u4e0d\u6b63\u3067\u3059\u3002
-errors.mbEmail=\u65e2\u306b\u767b\u9332\u6e08\u307f\u306e\u643a\u5e2f\u96fb\u8a71E-mail\u3067\u3059\u3002
-errors.mbEmail1=\u643a\u5e2f\u96fb\u8a71E-mail\u306f\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3068\u3057\u3066\u4e0d\u6b63\u3067\u3059\u3002
+errors.mainPcEmail=\u65e2\u306b\u767b\u9332\u6e08\u307f\u306eE-mail\u3067\u3059\u3002
+errors.mainPcEmail1=\u30d1\u30bd\u30b3\u30f3E-mail\u306f\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3068\u3057\u3066\u4e0d\u6b63\u3067\u3059\u3002
+errors.subPcEmail=\u65e2\u306b\u767b\u9332\u6e08\u307f\u306eE-mail\u3067\u3059\u3002
+errors.subPcEmail1=\u643a\u5e2f\u96fb\u8a71E-mail\u306f\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3068\u3057\u3066\u4e0d\u6b63\u3067\u3059\u3002
 errors.loginId=\u65e2\u306b\u767b\u9332\u6e08\u307f\u306e\u30ed\u30b0\u30a4\u30f3ID\u3067\u3059\u3002
 errors.memberId=\u5b58\u5728\u3057\u306a\u3044\u4f1a\u54e1ID\u3067\u3059\u3002
 errors.memberId2=\u4f1a\u54e1ID\u304c\u4e0d\u6b63\u3067\u3059\u3002

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

@@ -115,7 +115,7 @@ $!tools.getMsg("dateError") $!tools.getMsg("dateError_1") $!tools.getMsg("dateEr
 				<td class="tdDiv t_center">$date.format("yyyy/MM/dd",$!giftExchange.applyDate)</td>
 				<td class="tdDiv">$!giftExchange.memberId</td>
 				<td class="tdDiv">$!escape.html($!giftExchange.member.firstName) $!escape.html($!giftExchange.member.lastName)&nbsp;</td>
-				<td class="tdDiv">$!giftExchange.member.pcEmail&nbsp;</td>
+				<td class="tdDiv">$!giftExchange.member.mainPcEmail&nbsp;</td>
 				<td class="tdDiv">$!giftExchange.cnt #if($!giftExchange.gift.giftType == 1)枚#elseポイント#end</td>
 				<td class="tdDiv">$!giftExchange.member.zipCode</td>
 				<td class="tdDiv">$!giftExchange.member.prefecture.prefecture</td>

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

@@ -48,11 +48,11 @@
 	</tr>
 	<tr>
 		<td style="vertical-align:top">パソコンE-mail</td>
-		<td>$!escape.html($!memberEditForm.pcEmail)</td>
+		<td>$!escape.html($!memberEditForm.mainPcEmail)</td>
 	</tr>
 	<tr>
 		<td style="vertical-align:top">携帯電話E-mail</td>
-		<td>$!escape.html($!memberEditForm.mbEmail)</td>
+		<td>$!escape.html($!memberEditForm.subPcEmail)</td>
 	</tr>
 	<tr>
 		<td style="vertical-align:top">氏名</td>
@@ -139,8 +139,8 @@
 ##</div>
 #makeToken()
 <input type="hidden" name="loginIdBefore" value="$!memberEditForm.loginIdBefore">
-<input type="hidden" name="pcEmailBefore" value="$!memberEditForm.pcEmailBefore">
-<input type="hidden" name="mbEmailBefore" value="$!memberEditForm.mbEmailBefore">
+<input type="hidden" name="mainPcEmailBefore" value="$!memberEditForm.mainPcEmailBefore">
+<input type="hidden" name="subPcEmailBefore" value="$!memberEditForm.subPcEmailBefore">
 </form>
 </div>
 </div>

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

@@ -78,16 +78,16 @@
 		</td>
 	</tr>
 	<tr class="gray">
-		<td>パソコンE-mail<font class="listpoint">*</font></td>
-		<td><input name="pcEmail" type="text" / class="w250" value="$!escape.html($!memberEditForm.pcEmail)">
-			<BR>$!tools.getMsg("pcEmail")
+		<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><input name="mbEmail" type="text" / class="w250" value="$!escape.html($!{memberEditForm.mbEmail})">
-			<BR>$!tools.getMsg("mbEmail")
+		<td>E-mail(サブ)<font class="listpoint">*</font></td>
+		<td><input name="subPcEmail" type="text" / class="w250" value="$!escape.html($!{memberEditForm.subPcEmail})">
+			<BR>$!tools.getMsg("subPcEmail")
 			$!tools.getMsg("Email")
 		</td>
 	</tr>
@@ -261,8 +261,8 @@
 ##</div>
 #makeToken()
 <input type="hidden" name="loginIdBefore" value="$!memberEditForm.loginIdBefore">
-<input type="hidden" name="pcEmailBefore" value="$!memberEditForm.pcEmailBefore">
-<input type="hidden" name="mbEmailBefore" value="$!memberEditForm.mbEmailBefore">
+<input type="hidden" name="mainPcEmailBefore" value="$!memberEditForm.mainPcEmailBefore">
+<input type="hidden" name="subPcEmailBefore" value="$!memberEditForm.subPcEmailBefore">
 <input type="hidden" name="memberId" value="$!memberEditForm.memberId">
 <input type="hidden" name="withDrawFlgBefore" value="$!memberEditForm.withDrawFlgBefore">
 </form>

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

@@ -60,15 +60,15 @@
 	</tr>
 	<tr>
 		<td>パソコンE-mail<font class="listpoint">*</font></td>
-		<td><input name="pcEmail" type="text" / class="w250" value="$!escape.html($!memberEditForm.pcEmail)">
-			<BR>$!tools.getMsg("pcEmail")
+		<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><input name="mbEmail" type="text" / class="w250" value="$!escape.html($!{memberEditForm.mbEmail})">
-			<BR>$!tools.getMsg("mbEmail")
+		<td><input name="subPcEmail" type="text" / class="w250" value="$!escape.html($!{memberEditForm.subPcEmail})">
+			<BR>$!tools.getMsg("subPcEmail")
 			$!tools.getMsg("Email")
 		</td>
 	</tr>
@@ -153,11 +153,15 @@
 		<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>
@@ -239,8 +243,8 @@
 </div>
 ##</div>
 <input type="hidden" name="loginIdBefore" value="$!memberEditForm.loginIdBefore">
-<input type="hidden" name="pcEmailBefore" value="$!memberEditForm.pcEmailBefore">
-<input type="hidden" name="mbEmailBefore" value="$!memberEditForm.mbEmailBefore">
+<input type="hidden" name="mainPcEmailBefore" value="$!memberEditForm.mainPcEmailBefore">
+<input type="hidden" name="subPcEmailBefore" value="$!memberEditForm.subPcEmailBefore">
 <input type="hidden" name="memberId" value="$!memberEditForm.memberId">
 </form>
 

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

@@ -46,13 +46,13 @@
 		</td>
 	</tr>
 	<tr>
-		<td style="vertical-align:top">パソコンE-mail</td>
-		<td>$!escape.html($!memberEditForm.pcEmail)
+		<td style="vertical-align:top">E-mail(メイン)</td>
+		<td>$!escape.html($!memberEditForm.mainPcEmail)
 		</td>
 	</tr>
 	<tr>
-		<td style="vertical-align:top">携帯電話E-mail</td>
-		<td>$!escape.html($!memberEditForm.mbEmail)
+		<td style="vertical-align:top">E-mail(サブ)</td>
+		<td>$!escape.html($!memberEditForm.subPcEmail)
 		</td>
 	</tr>
 	<tr>
@@ -135,8 +135,8 @@
 ##</div>
 #makeToken()
 <input type="hidden" name="loginIdBefore" value="$!memberEditForm.loginIdBefore">
-<input type="hidden" name="pcEmailBefore" value="$!memberEditForm.pcEmailBefore">
-<input type="hidden" name="mbEmailBefore" value="$!memberEditForm.mbEmailBefore">
+<input type="hidden" name="mainPcEmailBefore" value="$!memberEditForm.mainPcEmailBefore">
+<input type="hidden" name="subPcEmailBefore" value="$!memberEditForm.subPcEmailBefore">
 </form>
 </div>
 </div>

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

@@ -82,10 +82,8 @@ function formClear(form_obj){
 		<td><input name="lastNameKana" type="text" class="w180 mgl10" value="$!escape.html($!memberSearchForm.lastNameKana)">&nbsp;を含む</td>
 	</tr>
 	<tr>
-		<td>PCﾒｰﾙｱﾄﾞﾚｽ</td>
-		<td><input name="pcEmail" type="text" class="w180 mgl10" value="$!escape.html($!memberSearchForm.pcEmail)">&nbsp;を含む</td>
-		<td>携帯ﾒｰﾙｱﾄﾞﾚｽ</td>
-		<td><input name="mbEmail" type="text" class="w180 mgl10" value="$!escape.html($!memberSearchForm.mbEmail)">&nbsp;を含む</td>
+		<td>E-mail</td>
+		<td><input name="searchPcEmail" type="text" class="w180 mgl10" value="$!escape.html($!memberSearchForm.searchPcEmail)">&nbsp;を含む</td>
 	</tr>
 	<tr>
 		<td class="w100">電話</td>
@@ -96,6 +94,8 @@ function formClear(form_obj){
 				<option value=""></option>
 				<option value="0" #if ( "$!{memberSearchForm.genderCd}" == "0" ) selected #end>男</option>
 				<option value="1" #if ( "$!{memberSearchForm.genderCd}" == "1" ) selected #end>女</option>
+				<option value="2" #if ( "$!{memberSearchForm.genderCd}" == "2" ) selected #end>その他</option>
+				<option value="3" #if ( "$!{memberSearchForm.genderCd}" == "3" ) selected #end>入力しない</option>
 			</select>&nbsp;と一致
 		</td>
 	</tr>

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

@@ -39,15 +39,17 @@
 									</td>
 								</tr>
 							</table>
+						</FORM>
+	        		</div>
 	        		<table width="150" border="0" cellspacing="0" cellpadding="0">
 						<tr style="padding: 15px 0 0 0;">
 							<td nowrap align="center">
-										<input type="image" src="/em/images/logon_btn.png" onmouseover="this.src='/em/images/logon_on_btn.png'" onmouseout="this.src='/em/images/logon_btn.png'" alt="ログイン">
+								<a href="/em/user/top/newUserRegist/">
+      								<img src="/em/images/logon_btn_new.png"/>
+  								</a>
 							</td>
 						</tr>
 					</table>
-						</FORM>
-	        		</div>
 	        	#end
         	</td>
         </tr>
@@ -80,7 +82,7 @@
             <div class="ctg01"><a href="#q('/user/top/howtoHtml/')">ご利用方法</a></div>
             <div class="ctg01"><a href="#q('/user/top/ruleHtml/')">会員規約</a></div>
             <div class="ctg01"><a href="#q('/user/top/faqHtml/')">FAQ</a></div>
-			<div class="ctg01"><a href="#q('/user/top/faqHtml/')" style="font-size:11pt;">アンケート結果</a></div>
+			<div class="ctg01"><a href="#q('/user/enqResultList/')" style="font-size:11pt;">アンケート結果</a></div>
             #if($userInfo.loginId)
 				<div class="ctg01"><a href="/em/user/myPage/">マイページ</a></div>
 			#end

src/main/webapp/WEB-INF/view/index.html

@@ -93,14 +93,29 @@
 																					#if($registForm.genderCd == 0)
 																						<input type="radio" name="genderCd" value="0" checked>男性　　　　　
 																						<input type="radio" name="genderCd" value="1">女性
+																						<input type="radio" name="genderCd" value="2">その他
+																						<input type="radio" name="genderCd" value="3">入力しない
 																					#elseif($registForm.genderCd == 1)
 																						<input type="radio" name="genderCd" value="0">男性　　　　　
 																						<input type="radio" name="genderCd" value="1" checked>女性
-																					#else
+																						<input type="radio" name="genderCd" value="2">その他
+																						<input type="radio" name="genderCd" value="3">入力しない
+																					#elseif($registForm.genderCd == 2)
+																						<input type="radio" name="genderCd" value="0">男性　　　　　
+																						<input type="radio" name="genderCd" value="1">女性
+																						<input type="radio" name="genderCd" value="2" checked>その他
+																						<input type="radio" name="genderCd" value="3">入力しない
+																					#elseif($registForm.genderCd == 3)
 																						<input type="radio" name="genderCd" value="0">男性　　　　　
 																						<input type="radio" name="genderCd" value="1">女性
+																						<input type="radio" name="genderCd" value="2">その他
+																						<input type="radio" name="genderCd" value="3" checked>入力しない
+																					#else
+																						<input type="radio" name="genderCd" value="0"><span>男性</span>　　
+																						<input type="radio" name="genderCd" value="1"><span>女性</span>
+																						<input type="radio" name="genderCd" value="2"><span>その他</span>
+																						<input type="radio" name="genderCd" value="3"><span>入力しない</span>
 																					#end
-																					
 																				</td>
 																			</tr>
 																			<tr>

src/main/webapp/WEB-INF/view/mb/user/userEdit/uEdit.html

@@ -36,14 +36,14 @@ $!tools.getMsg("lastNameKana")
 $!tools.getMsg("Email")<br>
 <font class="txt10or">※パソコンと携帯どちらかを必ず入力してください。</font><br>
 
-<br>パソコン E-mail
-<br><input type="text" size="37" name="pcEmail" maxlength="128" value="$!escape.html($!userEditForm.pcEmail)" style="width:100%">
-$!tools.getMsg("pcEmail")
+<br>E-mail(メイン)
+<br><input type="text" size="37" name="mainPcEmail" maxlength="128" value="$!escape.html($!userEditForm.mainPcEmail)" style="width:100%">
+$!tools.getMsg("mainPcEmail")
 $!tools.getMsg("Email")
 
-<br>携帯電話 E-mail
-<br><input type="text" size="37" name="mbEmail" maxlength="128" value="$!escape.html($!{userEditForm.mbEmail})" style="width:100%">
-$!tools.getMsg("mbEmail")
+<br>E-mail(サブ)
+<br><input type="text" size="37" name="subPcEmail" maxlength="128" value="$!escape.html($!{userEditForm.subPcEmail})" style="width:100%">
+$!tools.getMsg("subPcEmail")
 $!tools.getMsg("Email")
 <br>
 

src/main/webapp/WEB-INF/view/mb/user/userEdit/uEditConfirm.html

@@ -26,12 +26,12 @@
 <br>$!escape.html($!userEditForm.lastNameKana)
 ##<input type="hidden" name="lastNameKana" value="$!userEditForm.lastNameKana">
 
-<br>パソコン E-mail
-<br>$!userEditForm.pcEmail
-##<input type="hidden" name="pcEmail" value="$!userEditForm.pcEmail">
-<br>携帯電話 E-mail
-<br>$!userEditForm.mbEmail
-##<input type="hidden" name="mbEmail" value="$!userEditForm.mbEmail">
+<br>E-mail(メイン)
+<br>$!userEditForm.mainPcEmail
+##<input type="hidden" name="mainPcEmail" value="$!userEditForm.mainPcEmail">
+<br>E-mail(サブ)
+<br>$!userEditForm.subPcEmail
+##<input type="hidden" name="subPcEmail" value="$!userEditForm.subPcEmail">
 
 <br>ログイン名
 <br>$!escape.html($!userEditForm.loginId)
@@ -77,6 +77,8 @@
 <br>
  #if($!userEditForm.genderCd == "0")男性
  #elseif($!userEditForm.genderCd == "1")女性
+ #elseif($!userEditForm.genderCd == "2")その他
+ #elseif($!userEditForm.genderCd == "3")入力しない
  #else
  #end
 ##<input type="hidden" name="genderCd" value="$!userEditForm.genderCd">

src/main/webapp/WEB-INF/view/sp/user/userEdit/uEdit.html

@@ -21,20 +21,20 @@ $!tools.getMsg("pointUse")
 	<div class="dot_line02"></div>
 
 	<div data-role="fieldcontain">
-	$!tools.getMsg("pcEmail")
+	$!tools.getMsg("mainPcEmail")
 	$!tools.getMsg("Email")
-	<label for="pcEmail" class="area_title">パソコンE-mail（半角英数字）<sup>※</sup></label>
-	<input type="text" id="pcEmail" name="pcEmail" size="40" maxlength="128" value="$!escape.html($!userEditForm.pcEmail)">
+	<label for="mainPcEmail" class="area_title">E-mail(メイン)<sup>※</sup></label>
+	<input type="text" id="mainPcEmail" name="mainPcEmail" size="40" maxlength="128" value="$!escape.html($!userEditForm.mainPcEmail)">
 	</div>
 
 	<div class="dot_line02"></div>
 
 	<div data-role="fieldcontain">
-	$!tools.getMsg("mbEmail")
+	$!tools.getMsg("subPcEmail")
 	$!tools.getMsg("Email")
-	<label for="mbEmail" class="area_title">携帯電話E-mail<sup>※</sup></label>
-	<input type="text" id="mbEmail" name="mbEmail" size="40" maxlength="128" value="$!escape.html($!{userEditForm.mbEmail})">
-	<p class="indent01">※パソコンE-mailまたは携帯電話E-mailどちらかは必須です。</p>
+	<label for="subPcEmail" class="area_title">E-mail(サブ)<sup>※</sup></label>
+	<input type="text" id="subPcEmail" name="subPcEmail" size="40" maxlength="128" value="$!escape.html($!{userEditForm.subPcEmail})">
+	<p class="indent01">※E-mail(メイン)は必須です。</p>
 	<p class="indent01">※ドメイン指定受信をされている方は[city.ichikawa.lg.jp]をドメインに追加していただく必要があります。 </p>
 	</div>
 
@@ -169,9 +169,15 @@ $!tools.getMsg("pointUse")
 	<label for="genderCd1">男性</label>
 	<input type="radio" name="genderCd" id="genderCd2" value="1" />
 	<label for="genderCd2">女性</label>
+	<input type="radio" name="genderCd" id="genderCd3" value="2" />
+	<label for="genderCd3">その他</label>
+	<input type="radio" name="genderCd" id="genderCd4" value="3" />
+	<label for="genderCd4">入力しない</label>
 #else
 	<input type="radio" name="genderCd" id="genderCd1" value="0" #if($!userEditForm.genderCd == "0")checked#end><label for="genderCd1">男性</label>&nbsp;&nbsp;
-	<input type="radio" name="genderCd" id="genderCd2" value="1" #if($!userEditForm.genderCd != "0")checked#end><label for="genderCd2">女性</label>
+	<input type="radio" name="genderCd" id="genderCd2" value="1" #if($!userEditForm.genderCd == "1")checked#end><label for="genderCd2">女性</label>&nbsp;&nbsp;
+	<input type="radio" name="genderCd" id="genderCd3" value="2" #if($!userEditForm.genderCd == "2")checked#end><label for="genderCd3">その他</label>&nbsp;&nbsp;
+	<input type="radio" name="genderCd" id="genderCd4" value="3" #if($!userEditForm.genderCd == "3")checked#end><label for="genderCd4">入力しない</label>
 #end
 
 	</fieldset>

src/main/webapp/WEB-INF/view/sp/user/userEdit/uEditConfirm.html

@@ -41,12 +41,12 @@
 	</p>
 	<div class="dot_line01"></div>
 
-	<h4>パソコン E-mail</h4>
-	<p>$!userEditForm.pcEmail<input type="hidden" name="pcEmail" value="$!userEditForm.pcEmail"></p>
+	<h4>E-mail(メイン)</h4>
+	<p>$!userEditForm.mainPcEmail<input type="hidden" name="mainPcEmail" value="$!userEditForm.mainPcEmail"></p>
 	<div class="dot_line01"></div>
 
-	<h4>携帯電話 E-mail</h4>
-	<p>$!userEditForm.mbEmail<input type="hidden" name="mbEmail" value="$!userEditForm.mbEmail"></p>
+	<h4>E-mail(サブ)</h4>
+	<p>$!userEditForm.subPcEmail<input type="hidden" name="subPcEmail" value="$!userEditForm.subPcEmail"></p>
 	<div class="dot_line01"></div>
 
 	<h4>ログイン名</h4>
@@ -107,6 +107,8 @@
 	<p>
 	 #if($!userEditForm.genderCd == "0")男性
 	 #elseif($!userEditForm.genderCd == "1")女性
+	 #elseif($!userEditForm.genderCd == "2")その他
+	 #elseif($!userEditForm.genderCd == "3")入力しない
 	 #else
 	 #end
 

src/main/webapp/WEB-INF/view/user/enquete/enquete.html

@@ -9,7 +9,11 @@
 
 #set($dateIndex=0)
 #foreach($question  in  $!enqueteForm.questionList)
-
+<script language="javascript" type="text/javascript" charset="utf-8">
+console.log("${question.questionId}");
+console.log("${question.condRequiredQuestionNo}");
+console.log("${question.condRequiredAnswer}");
+</script>
 	#if($question.controlId == 5)
 		#set($dateIndex = $dateIndex+1)
 <script language="javascript" type="text/javascript" charset="utf-8">
@@ -183,7 +187,7 @@ $tools.getMsg("errorheader")
 						#if($!question.controlId == "2")
 						<td width="$tdWidthPercent%" valign = "top" >
 							#set($answerIdValueName = "questionList[$questionIndex].answerList[0].answerIdValue")
-							 <select name="$answerIdValueName">
+							<select name="$answerIdValueName" #if($!question.condRequiredQuestionNo != "0") disabled="disabled" #end>
 									#foreach($selectAnswer in $question.answerList)
 									<option value="$!selectAnswer.answerId" #if($enqueteForm.initCount =="2" && $!selectAnswer.answerId == $!selectAnswer.answerIdValue) selected #elseif($!selectAnswer.defaultFlg == "1" && $enqueteForm.initCount!="2") selected    #end >$!escape.html($!selectAnswer.answer)</option>
 										  <!-- <option value="$!selectAnswer.answerId" #if($enqueteForm.initCount =="2" && $!selectAnswer.answerId == $!selectAnswer.answerIdValue) selected $!selectAnswer.answerId , $!selectAnswer.answerIdValue #elseif($!selectAnswer.defaultFlg == "1" ) selected  $!selectAnswer.answerId , $!selectAnswer.answerIdValue  #end >$!escape.html($!selectAnswer.answer)</option> -->
@@ -215,7 +219,7 @@ $tools.getMsg("errorheader")
 															##if($!answer.freeTextFlg != "1" && $!answer.freeTextFlg != "2")
 													 <input type="radio" name="$!answerIdValueRadioName"  value="$velocityCount"  #if($!answer.answerIdValue ==  $velocityCount.toString() && $enqueteForm.initCount =="2") checked #{end}
 													     #if($!answer.defaultFlg == 1 && $enqueteForm.initCount =="1") checked #end
-													 > $!escape.html($!answer.answer)
+													 #if($!question.condRequiredQuestionNo != "0") disabled="disabled" #end> $!escape.html($!answer.answer)
 															##end
 
 												##<!-- 自由入力欄。freeTextFlg=1(あり)、2(必須) -->
@@ -227,7 +231,7 @@ $tools.getMsg("errorheader")
 															##if($!answer.freeTextFlg != "1" && $!answer.freeTextFlg != "2")
 													<input type="checkbox" name="$answerIdValueName"  value="$!escape.html($!answer.answerNo)"  #if($answer.answerIdValue != "" && $enqueteForm.initCount =="2") checked #end
 																									#if($!answer.defaultFlg == 1 && $enqueteForm.initCount =="1") checked #end
-													> $!escape.html($!answer.answer)
+													#if($!question.condRequiredQuestionNo != "0") disabled="disabled" #end> $!escape.html($!answer.answer)
 															##end
 
 												##<!-- 自由入力欄。freeTextFlg=1(あり)、2(必須) -->

src/main/webapp/WEB-INF/view/user/top/newUserRegist.html

+#set($title = "eモニとは")
+<!-- preHeader -->
+#parse( "/WEB-INF/view/common/preHeader.vm" )
+##<!-- JAVASCRIPTはここに記載 -->
+
+<style type="text/css">
+	<!--
+	.style1 {
+		color: #FF0000;
+		font-weight: bold;
+	}
+	.style2 {color: #FF0000}
+	-->
+</style>
+
+<body bgcolor="#B3C9E1" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
+<center>
+<!-- header -->
+<table width="1024"  cellspacing="0" cellpadding="0">
+	<tr>
+		<TD>#parse( "/WEB-INF/view/common/header.vm" )</TD>
+	</tr>
+	<tr>
+		<TD>
+			<table width="1024" border="0" cellspacing="0" cellpadding="0">
+				<tr>
+			   <td width="25" background="/em/images/shadowlft2.jpg"><img src="/em/images/spacer.gif" width="25" height="1" border="0"></td>
+				    <td width="1024" bgcolor="#FFFFFF">
+				    <table width="100%" border="0" cellspacing="5" cellpadding="0">
+					    <tr>
+					        <td align="right" width="155" valign="top">#parse( "/WEB-INF/view/common/menu.vm" )</td>
+					        <td align="left" width="10" background="/em/images/cts_bar.gif"><img src="/em/images/spacer.gif" border="0"></td>
+					        <td align="center" valign="top">
+##CONTENT START 各ページコンテンツ
+
+<!-- Contents Title Table Start -->
+<div id="registration_title">
+	<div style="font-size: 9pt;">
+	$!tools.getMsg("email")
+	$!tools.getMsg("email1")
+	$!tools.getMsg("genderCd")
+	$!tools.getMsg("birthdayY")
+	</div>
+	<img src="/em/images/registration_ttl.png" width="206" height="21" border="0" alt="e-モニター新規登録">
+</div>
+#set($regist-url = $tools.getSecureUrl('/user/regist/regist'))
+<div class="input_form">
+	<form name="mainForm"
+		action="$regist-url"
+		method="post" style="padding: 0; margin: 10px 0;">
+		<table width="780" border="0" cellspacing="0" cellpadding="0">
+			<tr>
+				<td	style="text-align: right; width: 150px; padding-bottom: 7px;">E-mail:</td>
+				<td	style="text-align: left; width: 230px; padding-bottom: 7px;">
+					<input type="text" name="email" class="inputBox" maxlength="128" value="$!escape.html($!registForm.email)">
+				</td>
+			</tr>
+			<tr>
+				<td	style="text-align: right; width: 70px; padding-bottom: 10px;" nowrap>E-mail確認:</td>
+				<td style="text-align: left; padding-bottom: 10px;">
+					<input type="text" name="email1" class="inputBox" maxlength="128" value="$!escape.html($!registForm.email1)">
+				</td>
+			</tr>
+			<tr>
+				<td	style="text-align: right; width: 70px; padding-bottom: 15px;">性別:</td>
+				<td	style="padding-bottom: 15px;">
+						<input type="radio" name="genderCd" value="0" #if($registForm.genderCd == 0) checked #end style="margin-left: 10px;">男性
+						<input type="radio" name="genderCd" value="1" #if($registForm.genderCd == 1) checked #end>女性
+						<input type="radio" name="genderCd" value="2" #if($registForm.genderCd == 2) checked #end>その他
+						<input type="radio" name="genderCd" value="3" #if($registForm.genderCd == 3) checked #end>入力しない
+				</td>
+			</tr>
+			<tr>
+				<td
+					style="text-align: right; width: 70px; padding-bottom: 15px;"
+					nowrap>生年月日:</td>
+				<td style="text-align: left; padding: 0px 0px 15px 10px; margin: 0;">
+					<select name="birthdayY" id="birthdayY">
+						<option value=""></option>
+						#foreach($yyyy in [1900..$birthYYYY])
+							#if($registForm.birthdayY)
+								#if($yyyy == $!{registForm.birthdayY})
+									<option value="$!yyyy" selected>#he($!yyyy)</option>
+								#else
+									<option value="$!yyyy">#he($!yyyy)</option>
+								#end
+							#else
+								<option value="$!yyyy">#he($!yyyy)</option>
+							#end
+						#end
+					</select>年
+					<select name="birthdayM" id="birthdayM">
+						<option value=""></option>
+						#foreach($mm in [1..12])
+							#if($mm == $!{registForm.birthdayM})
+								<option value="$!mm" selected>#he($!mm)</option>
+							#else
+								<option value="$!mm">#he($!mm)</option>
+							#end
+						#end
+					</select>月
+					<select name="birthdayD" id="birthdayD">
+						<option value=""></option>
+						#foreach($dd in [1..31])
+							#if($dd == $!{registForm.birthdayD})
+								<option value="$!dd" selected>#he($!dd)</option>
+							#else
+								<option value="$!dd">#he($!dd)</option>
+							#end
+						#end
+					</select>日
+				</td>
+			</tr>
+			<tr>
+				<td colspan="2" style="padding-left: 220px;"><a href="#q('/user/top/ruleHtml/')">会員規約</a>と<a href="#q('/user/top/howtoHtml/')">ご利用方法</a>をご確認いただき、同意いただけましたら、<br>[新規登録]ボタンをクリックしてください。</td>
+			</tr>
+		</table>
+		<table width="300" border="0" cellspacing="0" cellpadding="0" style="margin-top: 5px;">
+			<tr>
+				<td align="center">
+					<a href="#" onclick="send_check();">
+						<img src="/em/images/registration_btn.png" onmouseover="this.src='/em/images/registration_on_btn.png'" onmouseout="this.src='/em/images/registration_btn.png'" alt="新規登録" width="302" height="42" border="0">
+					</a>
+				</td>
+			</tr>
+		</table>
+	</form>
+</div>
+</td>
+</tr>
+<tr>
+<td colspan="3" align="right" valign="top">
+<img src="/em/images/spacer.gif" width="1" height="6" border="0"></td>
+</tr>
+</table>
+
+</td>
+<td width="25" background="/em/images/shadowrgt2.jpg">
+<img src="/em/images/spacer.gif" width="25" height="1" border="0"></td>
+</tr>
+</table>
+<!--  Contents Table End -->
+
+##CONTENT END 各ページコンテンツ
+</td>
+</tr>
+<tr>
+	<TD>#parse( "/WEB-INF/view/common/footer.vm" )</TD>
+</tr>
+</table>
+</center>
+</body>
+</html>
\ No newline at end of file

src/main/webapp/WEB-INF/view/user/userEdit/uEdit.html

@@ -108,23 +108,18 @@
 <table width="740" border="0" cellpadding="2" cellspacing="1" bgcolor="#004080">
 
 <tr>
-	<td class="listmenu">パソコンE-mail<span class="listpoint">*</span></td>
+	<td class="listmenu">E-mail(メイン)<span class="listpoint">*</span></td>
 	<td class="listcts">
-		<input type="text" size="40" name="pcEmail" maxlength="128" value="$!escape.html($!userEditForm.pcEmail)">
+		<input type="text" size="40" name="mainPcEmail" maxlength="128" value="$!escape.html($!userEditForm.mainPcEmail)">
 
-	<TABLE border="0" cellspacing="0" cellpadding="0"><TR><Td>$!tools.getMsg("pcEmail")</Td></TR></TABLE>
-	<TABLE border="0" cellspacing="0" cellpadding="0"><TR><Td>$!tools.getMsg("Email")</Td></TR></TABLE>
-	<font class="txt10or">※パソコンまたは携帯電話どちらかは必須です。</font>
+	<TABLE border="0" cellspacing="0" cellpadding="0"><TR><Td>$!tools.getMsg("mainPcEmail")</Td></TR></TABLE>
+	<font class="txt10or">※E-mail(メイン)は必須です。</font>
 	</td>
 </tr>
 <tr>
-<td class="listmenu"> 携帯電話E-mail<span class="listpoint">*</span></td>
+<td class="listmenu"> E-mail(サブ)</td>
 <td class="listcts">
-	<input type="text" size="40" name="mbEmail" maxlength="128" value="$!escape.html($!{userEditForm.mbEmail})">
-
-	<TABLE border="0" cellspacing="0" cellpadding="0"><TR><Td>$!tools.getMsg("mbEmail")</Td></TR></TABLE>
-		<TABLE border="0" cellspacing="0" cellpadding="0"><TR><Td>$!tools.getMsg("Email")</Td></TR></TABLE>
-	<font class="txt10or">※パソコンまたは携帯電話どちらかは必須です。</font>
+	<input type="text" size="40" name="subPcEmail" maxlength="128" value="$!escape.html($!{userEditForm.subPcEmail})">
 		</td>
 </tr>
 
@@ -283,10 +278,14 @@
 <td width="350" class="listcts">
 #if($!userEditForm.genderCd == "null" || $!userEditForm.genderCd == "")
 <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">入力しない
 #else
 <input type="radio" name="genderCd" value="0" #if($!userEditForm.genderCd == "0")checked#end>男性&nbsp;&nbsp;
-<input type="radio" name="genderCd" value="1" #if($!userEditForm.genderCd != "0")checked#end>女性
+<input type="radio" name="genderCd" value="1" #if($!userEditForm.genderCd == "1")checked#end>女性&nbsp;&nbsp;
+<input type="radio" name="genderCd" value="2" #if($!userEditForm.genderCd == "2")checked#end>その他&nbsp;&nbsp;
+<input type="radio" name="genderCd" value="3" #if($!userEditForm.genderCd == "3")checked#end>入力しない
 #end
 <font class="error"></font>
 <br>

src/main/webapp/WEB-INF/view/user/userEdit/uEditConfirm.html

@@ -84,15 +84,15 @@
 <table width="480" border="0" cellpadding="2" cellspacing="1" bgcolor="#004080">
 
 <tr>
-<td class="listcts">パソコンE-mail
-<td class="listmenu">$!userEditForm.pcEmail</td>
-##<input type="hidden" name="pcEmail" value="$!userEditForm.pcEmail">
+<td class="listcts">E-mail(メイン)
+<td class="listmenu">$!userEditForm.mainPcEmail</td>
+##<input type="hidden" name="mainPcEmail" value="$!userEditForm.mainPcEmail">
 </tr>
 <tr>
-<td class="listcts"> 携帯電話E-mail
+<td class="listcts"> E-mail(サブ)
 </td>
-<td class="listmenu">$!userEditForm.mbEmail</td>
-##<input type="hidden" name="mbEmail" value="$!userEditForm.mbEmail">
+<td class="listmenu">$!userEditForm.subPcEmail</td>
+##<input type="hidden" name="subPcEmail" value="$!userEditForm.subPcEmail">
 </tr>
 
 <tr>
@@ -165,6 +165,8 @@ $!userEditForm.lastNameKana &nbsp;
 <td width="280" class="listmenu">
  #if($!userEditForm.genderCd == "0")男性
  #elseif($!userEditForm.genderCd == "1")女性
+ #elseif($!userEditForm.genderCd == "2")その他
+ #elseif($!userEditForm.genderCd == "3")入力しない
  #else
  #end
 ## <input type="hidden" name="genderCd" value="$!userEditForm.genderCd">

src/test/java/jp/agentec/sinaburocast/service/EnqueteMailAddressTmpServiceTest.java

@@ -92,7 +92,7 @@ public class EnqueteMailAddressTmpServiceTest extends S2DaoTestCase {
 		List<DeliveryGroupMember> addressList = new ArrayList<DeliveryGroupMember>();
 		DeliveryGroupMember deliveryGroupMember = new DeliveryGroupMember();
 		deliveryGroupMember.member = new Member();
-		deliveryGroupMember.member.pcEmail = "tauchi@agentec.jp";
+		deliveryGroupMember.member.mainPcEmail = "tauchi@agentec.jp";
 		addressList.add(deliveryGroupMember);
 		enqueteMailAddressTmpService.deleteInsert(2, addressList, "test");
 	}

src/test/java/jp/agentec/sinaburocast/service/MemberServiceTest.java

@@ -145,12 +145,12 @@ public class MemberServiceTest extends S2DaoTestCase {
 		}
 	}
 	public void findByPcEmail(){
-		System.out.println(memberService.findByPcEmail("kim-hs@agentec.jp"));
+		System.out.println(memberService.findByMainPcEmail("kim-hs@agentec.jp"));
 
 	}
 	public void findByMoEmail(){
 
-	    System.out.println(memberService.findByMoEmail("kim-hs@agentec.jp"));
+	    System.out.println(memberService.findBySubPcEmail("kim-hs@agentec.jp"));
 	}
 	public void findByLoginId(){