diff --git a/BO/Controllers/userController.cs b/BO/Controllers/userController.cs index a81ae11..b9e2b04 100644 --- a/BO/Controllers/userController.cs +++ b/BO/Controllers/userController.cs @@ -131,6 +131,7 @@ namespace NP.BO.Controllers ht.Add("mname", vm.stringval5); ht.Add("issite", vm.stringval20); ht.Add("statusfee", vm.stringval21); + ht.Add("mphone", vm.stringval22); if (!string.IsNullOrEmpty(vm.stringval6) || !string.IsNullOrEmpty(vm.stringval7)) { ht.Add("salesamountf", GetInt64(vm.stringval6 ?? "0")); @@ -143,8 +144,8 @@ namespace NP.BO.Controllers } if (!string.IsNullOrEmpty(vm.stringval10) || !string.IsNullOrEmpty(vm.stringval11)) { - ht.Add("joindatef", vm.stringval10??"1980-11-28"); - ht.Add("joindatet", string.IsNullOrEmpty(vm.stringval11)?DateTime.Now.ToString("yyyy-MM-dd 23:59:59") : (vm.stringval11 + " 23:59:59")); + ht.Add("cdtf", vm.stringval10??"1980-11-28"); + ht.Add("cdtt", string.IsNullOrEmpty(vm.stringval11)?DateTime.Now.ToString("yyyy-MM-dd 23:59:59") : (vm.stringval11 + " 23:59:59")); } ht.Add("fyear", vm.stringval12); ht.Add("astype", vm.stringval13); diff --git a/BO/Views/user/asr.cshtml b/BO/Views/user/asr.cshtml index a5b5d53..fe869fe 100644 --- a/BO/Views/user/asr.cshtml +++ b/BO/Views/user/asr.cshtml @@ -13,37 +13,11 @@ - - + + - - - - - - @@ -53,36 +27,15 @@ - - + + - + - - - - - - - - - - - - - - - - - - - - + + - - + + + + + + + @@ -169,16 +113,12 @@ else $(document).ready(function () { if ('@(Model.IsAdmin ? 1 : 0)' == '0') { $("#Assign_astype,#Assign_asctg,#Assign_askey").attr("disabled", "disabled"); - $("#Assign_joindate,#Assign_exitdate").attr("readonly", "readonly"); } }); function save() { setv("Assign_brno", val("Assign_brno").replace(/-/gi, '')); setv("Assign_grno", val("Assign_grno").replace(/-/gi, '')); - if (check("Assign_ascode", null, "회원번호를 입력해주세요.")) { } - else if (check("Assign_asname", null, "법인명을 입력해주세요.")) { } - else if (($("#Assign_status1").prop("checked") && val("Assign_exitdate") != "") ||($("#Assign_status9").prop("checked") && val("Assign_exitdate") != "")) { msg("가입과 정지상태는 탈퇴일을 등록할 수 없습니다."); } - else if ((!$("#Assign_status2").prop("checked") && val("Assign_exitdate") != "") || ($("#Assign_status2").prop("checked") && val("Assign_exitdate") == "")) { msg("탈퇴일자와 상태를 확인해주세요."); } + if (check("Assign_asname", null, "법인명을 입력해주세요.")) { } else if (confirm("저장하시겠습니까?")) { capfileform("/acommon/assignsave", "mform", "cbsave"); } diff --git a/BO/Views/user/assigns.cshtml b/BO/Views/user/assigns.cshtml index f8b7bb0..1df4c4e 100644 --- a/BO/Views/user/assigns.cshtml +++ b/BO/Views/user/assigns.cshtml @@ -14,7 +14,6 @@ @@ -27,98 +26,64 @@ - + - + - - - - - - - + - - - - - - - - - - - + + + + +
회원번호 - @if (!Model.IsAdmin) - { - @Html.HiddenFor(m=>m.Assign.ascode)@Model.Assign.ascode - } - else - { - @Html.TextBoxFor(m => m.Assign.ascode, new { @class = "form-control int nocomma text-center" }) - } - 구분/회비 - @if (!Model.IsAdmin && Model.Assign.asno > 0) - { - @:@Model.Assign.isjoinname / @(Model.Assign.joinyear ?? "-")년 / @Model.Assign.joinprice.ToString("#,0") - } - else - { - @Html.Partial("./Partial/Select", "", new ViewDataDictionary { { "valuetext", "1:회원;0:비회원" }, { "name", "Assign.isjoin" }, { "selected", Model.Assign.isjoin }, { "style", "width: auto" }, { "class", "disp-init" } }) - @Html.Partial("./Partial/Select", Model.Assign.joinyear, new ViewDataDictionary { { "special", "fromtodesc" }, { "textadd", "년" }, { "start", DateTime.Now.Year - 5 }, { "end", DateTime.Now.Year + 5 }, { "name", "Assign.joinyear" }, { "selected", DateTime.Now.Year }, { "style", "width: 120px" } }) - @Html.TextBoxFor(m => m.Assign.joinprice, new { @class = "form-control disp-init int text-right", @placeholder = "회비", @style = "width: 150px" }) - } -
법인명 @Html.TextBoxFor(m => m.Assign.asname, new { @class = "form-control", @maxlength = "100" })
사업자등록번호 @Html.TextBoxFor(m => m.Assign.brno, new { @class = "form-control int nocomma", @maxlength = "10" })법인등록번호@Html.TextBoxFor(m => m.Assign.grno, new { @class = "form-control int nocomma", @maxlength = "14" })고용보험관리번호@Html.TextBoxFor(m => m.Assign.eino, new { @class = "form-control int nocomma", @maxlength = "13" })
업태 @Html.TextBoxFor(m => m.Assign.btype, new { @class = "form-control", @maxlength = "50" })업종종목 @Html.TextBoxFor(m => m.Assign.bkind, new { @class = "form-control", @maxlength = "50" })
매출액@Html.TextBoxFor(m => m.Assign.salesamount, new { @class = "form-control int" })홈페이지@Html.TextBoxFor(m => m.Assign.homeurl, new { @class = "form-control", @maxlength = "100" })
상시종업원수@Html.TextBoxFor(m => m.Assign.mcount, new { @class = "form-control int" })창립일@Html.Partial("./Partial/Date", Model.Assign.aday, new ViewDataDictionary { { "name", "Assign.aday" } })
회원사구분/계열 - @Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "astype"), new ViewDataDictionary { {"special","reg" }, { "df", ":-선택" }, { "name", "Assign.astype" }, { "selected", Model.Assign.asno < 1 ? "" : Model.Assign.astype.ToString() }, { "style", "width: auto" }, { "class", "disp-init" } }) - @Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "asctg"), new ViewDataDictionary { { "special", "reg" }, { "df", ":-선택" }, { "name", "Assign.asctg" }, { "selected", Model.Assign.asno < 1 ? "" : Model.Assign.asctg.ToString() }, { "style", "width: auto" }, { "class", "disp-init" } }) - 주요키워드@Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "askey"), new ViewDataDictionary { { "special", "reg" }, { "df", ":-선택" }, { "name", "Assign.askey" }, { "selected", Model.Assign.asno < 1 ? "" : Model.Assign.askey.ToString() }, { "style", "width: auto" }, { "class", "disp-init" } })
주소 @@ -103,31 +56,22 @@
통장사본 - @Html.Partial("./Partial/File", Model.FileList.Where(w=>w.fgno==Model.Assign.fgnobank).ToList(), new ViewDataDictionary { - { "name", "Assign.fgnobank" },{"value", Model.Assign.fgnobank },{ "fname", "fgnobank"}, - {"width", null },{"table", "assign" },{ "column", "fgnobank"},{"filecount", 1 }, - {"readmode", 0 },{"hidemode", 0 }, - { "isimage", 0 },{ "imageid", "" },{ "dftsrc", "/img/common/profile_sample.jpg" }, - { "fileext", "png,jpg,gif,pdf" }, { "loginfo",Model.Assign.asno+"|9"}}) - 담당자명@Html.TextBoxFor(m => m.Assign.mname, new { @class = "form-control", @maxlength = "50" })
가입/탈퇴일@Html.Partial("./Partial/Date", Model.Assign.joindate, new ViewDataDictionary { { "name", "Assign.joindate" } })~@Html.Partial("./Partial/Date", Model.Assign.exitdate, new ViewDataDictionary { { "name", "Assign.exitdate" } })담당자연락처@Html.TextBoxFor(m => m.Assign.mphone, new { @class = "form-control mobilefmt nocomma", @data_zero = "1", @maxlength = "13" })
계산서이메일@Html.TextBoxFor(m => m.Assign.taxemail, new { @class = "form-control", @maxlength = "50" })
상태 -@if (Model.IsAdmin) -{ - @Html.Partial("./Partial/Radio", null, new ViewDataDictionary() { { "valuetext", "1:가입;2:탈퇴;9:정지" }, { "checked", Model.Assign.status }, { "name", "Assign.status" } }) -} -else -{ - @Model.Assign.statusname -} + @Html.Partial("./Partial/Radio", null, new ViewDataDictionary() { { "valuetext", "1:가입;2:탈퇴;9:정지" }, { "checked", Model.Assign.status }, { "name", "Assign.status" } })
법인명 - @Html.Partial("./Partial/Select", "", new ViewDataDictionary { { "valuetext", ":-회원선택;1:회원;0:비회원" }, { "name", "stringval" }, { "selected", Model.stringval }, { "style", "width: auto" }, { "class", "disp-init" } }) @Html.TextBoxFor(m => m.stringval2, new { @class = "form-control disp-init", @style = "width: 208px" }) 상태
대표자@Html.TextBoxFor(m => m.stringval4, new { @class = "form-control", @style="width: " })@Html.TextBoxFor(m => m.stringval4, new { @class = "form-control", @style = "width: 208px" }) 담당자@Html.TextBoxFor(m => m.stringval5, new { @class = "form-control disp-init", @style="width: 308px" })@Html.TextBoxFor(m => m.stringval5, new { @class = "form-control disp-init", @style = "width: 208px" })
매출액@Html.TextBoxFor(m => m.stringval6, new { @class = "form-control int disp-init text-right", @style = "width: 150px;", @data_zero="" })  ~  @Html.TextBoxFor(m => m.stringval7, new { @class = "form-control int disp-init text-right", @style = "width: 150px;", @data_zero="" })종업원수@Html.TextBoxFor(m => m.stringval8, new { @class = "form-control int disp-init text-right", @style = "width: 150px;" , @data_zero=""})  ~  @Html.TextBoxFor(m => m.stringval9, new { @class = "form-control int disp-init text-right", @style = "width: 150px;" , @data_zero=""})
가입일등록일 @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval10) ? (DateTime?)null : Convert.ToDateTime(Model.stringval10), new ViewDataDictionary { { "name", "stringval10" } })   ~   @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval11) ? (DateTime?)null : Convert.ToDateTime(Model.stringval11), new ViewDataDictionary { { "name", "stringval11" } }) 회비납부 - @Html.HiddenFor(m => m.stringval21) - @Html.Partial("./Partial/Select", Model.stringval12, new ViewDataDictionary { { "special", "fromtodesc" }, { "textadd", "년" }, { "start", DateTime.Now.Year - 5 }, { "end", DateTime.Now.Year + 5 }, { "name", "stringval12" }, { "selected", Model.stringval12 }, { "style", "width: 200px" } })   -    -    -
회원구분/계열 - @Html.Partial("./Partial/Select", Model.ComCodes.Where(w=>w.cgroup=="astype"), new ViewDataDictionary { { "special", "reg"}, { "df", ":-선택" }, { "name", "stringval13" }, { "selected", Model.stringval13 }, { "style", "width: 49%" }, { "class", "form-control disp-init" } }) - @Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "asctg"), new ViewDataDictionary { { "special", "reg" }, { "df", ":-선택" }, { "name", "stringval14" }, { "selected", Model.stringval14 }, { "style", "width: 49%" }, { "class", "form-control disp-init" } }) - 주요키워드@Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "askey"), new ViewDataDictionary { { "special", "reg" }, { "df", ":-선택" }, { "name", "stringval15" }, { "selected", Model.stringval15 }, { "style", "width: 308px" } })
사업자등록번호@Html.TextBoxFor(m => m.stringval16, new { @class = "form-control int nocomma text-center", @data_zero=""})@Html.TextBoxFor(m => m.stringval16, new { @class = "form-control int nocomma text-center", @data_zero = "", @style = "width: 208px", @maxlength = "10" })
사이트생성 @Html.Partial("./Partial/Select", "", new ViewDataDictionary { { "valuetext", ":-선택;1:생성함;0:생성안함" }, { "name", "stringval20" }, { "selected", Model.stringval20 }, { "style", "width: 308px" }, { "class", "disp-init" } })연락처@Html.TextBoxFor(m => m.stringval22, new { @class = "form-control mobilefmt nocomma", @data_zero = "1", @style = "width: 208px", @maxlength = "13" })
- @if (Model.IsAdmin) - { -
- @Html.Partial("./Partial/Select", "", new ViewDataDictionary { { "valuetext", "a.joindate desc:가입일 내림차순;a.joindate asc:가입일 오름차순;a.asname desc:법인명 내림차순;a.asname asc:법인명 오름차순" }, { "name", "stringval18" }, { "selected", Model.stringval18 }, { "style", "width: auto" }, { "class", "disp-init" } }) - @Html.Partial("./Partial/Select", "", new ViewDataDictionary { { "valuetext", "a.joindate desc:가입일 내림차순;a.joindate asc:가입일 오름차순;a.asname desc:법인명 내림차순;a.asname asc:법인명 오름차순" }, { "name", "stringval19" }, { "selected", Model.stringval19 }, { "style", "width: auto" }, { "class", "disp-init" } }) -    -

-
- 신규등록 - 엑셀다운로드(법인목록) - 엑셀다운로드(담당자목록) -
- } + @if (Model.IsAdmin) + { +
+ +

+
+ 신규등록 +
+ }
- - - - - - - - - - + + + + + + -@foreach (var item in Model.Assigns) -{ - - - - - - - - - @**@ - - - @**@ - - -} + @foreach (var item in Model.Assigns) + { + + + + + + + + + }
No회원여부회원사코드법인명회원구분계열가입일납부일회비납부상태No법인명대표자담당자등록일상태
@item.rnorvt@item.isjoinname@item.ascode@item.asno @item.asname@item.astypename@item.asctgname@(item.joindate == null ? "-" : item.joindate.Value.ToString("yy-MM-dd"))@((Model.AssignFees.Where(w => w.asno == item.asno)).Count() < 1 ? "-" : Model.AssignFees.Where(w => w.asno == item.asno).First().fdate == null ? "-" : Model.AssignFees.Where(w => w.asno == item.asno).First().fdate.Value.ToString("yy-MM-dd"))@(item.fdate==null ? "" : item.fdate.Value.ToString("yy-MM-dd"))@(item.joindate != null && item.joindate.Value.Year > Convert.ToInt32(Model.stringval12) ? "--" : item.fstatus == 1 ? "납부" : "미납")@(item.joindate != null && DateTime.Now.Year < item.joindate.Value.Year ? "-" : (Model.AssignFees.Where(w => w.asno == item.asno)).Count() < 1 ? "미납" : Model.AssignFees.Where(w => w.asno == item.asno).First().status == 1 ? "납무" : "미납")@item.statusname
@item.rnorvt@item.asno @item.asname@item.ceoname@item.mname@(item.cdt == null ? "-" : item.cdt.ToString("yy-MM-dd"))@item.statusname
@@ -154,12 +119,7 @@ s3 += "," + $(c).val(); }); setv("stringval3", s3 == "" ? "" : s3.substr(1)); - //회비납부상태 - var s21 = ""; - $.each($("input[name='statusfee']:checked"), function (i, c) { - s21 += "," + $(c).val(); - }); - setv("stringval21", s21 == "" ? "" : s21.substr(1)); + submit(); } diff --git a/Base/Controller/ACommonUser.cs b/Base/Controller/ACommonUser.cs index 904f86a..8d495b2 100644 --- a/Base/Controller/ACommonUser.cs +++ b/Base/Controller/ACommonUser.cs @@ -116,10 +116,10 @@ namespace NP.Base.Controllers { return JsonBack(new JsonRtn() { code = 1 }); } - //else if (!string.IsNullOrEmpty(vm.Assign.brno) && Dao.Get("users.assign.check.brno", new Hashtable() { { "asnonot" + (vm.Assign.asno < 1 ? "xxx" : ""), vm.Assign.asno }, { "brno", vm.Assign.brno } }).Count() > 0) - //{ - // return JsonBack(new JsonRtn() { code = 2 }); - //} + else if (!string.IsNullOrEmpty(vm.Assign.brno) && Dao.Get("users.assign.check.brno", new Hashtable() { { "asnonot" + (vm.Assign.asno < 1 ? "xxx" : ""), vm.Assign.asno }, { "brno", vm.Assign.brno } }).Count() > 0) + { + return JsonBack(new JsonRtn() { code = 2 }); + } vm.Assign.uno = SUserInfo.UserNo; vm.Assign.uip = GetUserIP(); if (Request.Files.GetMultiple("fgnobno").Where(w => !string.IsNullOrEmpty(w.FileName)).Count() > 0) { diff --git a/Dao/MyBatis/Maps/User.xml b/Dao/MyBatis/Maps/User.xml index 8d001ce..6492728 100644 --- a/Dao/MyBatis/Maps/User.xml +++ b/Dao/MyBatis/Maps/User.xml @@ -78,28 +78,32 @@ order by a.rno - insert into assign (ascode,isjoin,joinyear,joinprice,asname,ceoname,brno,grno,btype,bkind,salesamount,homeurl,mcount,aday,astype,asctg,askey,post,address1,address2,fgnobno,fgnobank,joindate,exitdate,status,issite,subdomain,sitename,sitelogo,sitefooter,ismain,isdel,) - values (#ascode#,#isjoin#,#joinyear#,#joinprice#,#asname#,#ceoname#,#brno#,#grno#,#btype#,#bkind#,#salesamount#,#homeurl#,#mcount#,#aday#,#astype#,#asctg#,#askey#,#post#,#address1#,#address2#,#fgnobno#,#fgnobank#,#joindate#,#exitdate#,#status#,0,null,null,null,null,0,0,); + insert into assign (ascode,isjoin,joinyear,joinprice,asname,ceoname,brno,grno,btype,bkind,salesamount,homeurl,mcount,aday,astype,asctg,askey,post,address1,address2,fgnobno,fgnobank,joindate,exitdate,status,issite,subdomain,sitename,sitelogo,sitefooter,ismain,isdel, + eino,mname,mphone,taxemail,) + values (#ascode#,#isjoin#,#joinyear#,#joinprice#,#asname#,#ceoname#,#brno#,#grno#,#btype#,#bkind#,#salesamount#,#homeurl#,#mcount#,#aday#,#astype#,#asctg#,#askey#,#post#,#address1#,#address2#,#fgnobno#,#fgnobank#,#joindate#,#exitdate#,#status#,0,null,null,null,null,0,0, + #eino#,#mname# + ,HEX(AES_ENCRYPT(#mphone#, )) + ,HEX(AES_ENCRYPT(#taxemail#, )) + ,); SELECT LAST_INSERT_ID() @@ -448,9 +460,12 @@ ,ascode=#ascode#,isjoin=#isjoin#,joinyear=#joinyear#,joinprice=#joinprice#,astype=#astype#,asctg=#asctg#,askey=#askey#,joindate=#joindate#,exitdate=#exitdate#,status=#status# - ,asname=#asname#,ceoname=#ceoname#,brno =#brno#,grno =#grno#,btype =#btype#,bkind =#bkind#,salesamount=#salesamount#,homeurl=#homeurl# - ,mcount=#mcount#,aday =#aday# ,post =#post#,address1=#address1#,address2=#address2#,fgnobno=#fgnobno#,fgnobank=#fgnobank# - where asno=#asno# + ,asname=#asname#,ceoname=#ceoname#,brno =#brno#,grno =#grno#,btype =#btype#,bkind =#bkind#,salesamount=#salesamount#,homeurl=#homeurl# + ,mcount=#mcount#,aday =#aday# ,post =#post#,address1=#address1#,address2=#address2#,fgnobno=#fgnobno#,fgnobank=#fgnobank# + ,eino=#eino#,mname=#mname# + ,mphone =case when #mphone# is not null then HEX(AES_ENCRYPT(#mphone#, )) else mphone end + ,taxemail =case when #taxemail# is not null then HEX(AES_ENCRYPT(#taxemail#, )) else taxemail end + where asno=#asno# update assign set diff --git a/Model/Users.cs b/Model/Users.cs index 7f44417..2784410 100644 --- a/Model/Users.cs +++ b/Model/Users.cs @@ -493,6 +493,23 @@ namespace NP.Model /// 200 담당자주소 /// public String adr2 { get; set; } + /// + /// 고용보험관리번호 + /// + public String eino { get; set; } + /// + /// 담당자명 + /// + public String mname { get; set; } + /// + /// 담당자연락처 + /// + public String mphone { get; set; } + /// + /// 계산서 수신 이메일 + /// + public String taxemail { get; set; } + } [Serializable] diff --git a/Model/VMBase.cs b/Model/VMBase.cs index f12611d..553ba97 100644 --- a/Model/VMBase.cs +++ b/Model/VMBase.cs @@ -96,6 +96,7 @@ namespace NP.Model public String stringval19 { get; set; } public String stringval20 { get; set; } public String stringval21 { get; set; } + public string stringval22 { get; set; } public String addstringval { get; set; } public String addstringval2 { get; set; }