diff --git a/BO/BO.csproj b/BO/BO.csproj index 7a1f6bc..f8d9518 100644 --- a/BO/BO.csproj +++ b/BO/BO.csproj @@ -60,7 +60,7 @@ ..\packages\Common.Logging.Core.3.0.0\lib\net40\Common.Logging.Core.dll - ..\..\LMS_TSTI\Source\Core\NPTech.LMS.Core\bin\Release\IBatisNet.Common.Logging.Log4Net.dll + ..\References\IBatisNet.Common.Logging.Log4Net.dll ..\References\Popbill\Linkhub.dll @@ -497,6 +497,7 @@ + diff --git a/BO/Content/file/documentspast.xlsx b/BO/Content/file/documentspast.xlsx new file mode 100644 index 0000000..c0b322c Binary files /dev/null and b/BO/Content/file/documentspast.xlsx differ diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index ce76529..8750d85 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -945,14 +945,15 @@ namespace NP.BO.Controllers { var ht = SetHash(vm); - vm.syears = Dao.Get("cr.documnets.syear", ht).ToList(); - vm.cgs = Dao.Get("cr.documnets.cg", ht).ToList(); - vm.cshapes = Dao.Get("cr.documnets.cshape", ht).ToList(); - vm.typemans = Dao.Get("cr.documnets.typeman", ht).ToList(); - vm.edukinds = Dao.Get("cr.documnets.edukind", ht).ToList(); - vm.typeedus = Dao.Get("cr.documnets.typeedu", ht).ToList(); - vm.typegrades = Dao.Get("cr.documnets.typegrade", ht).ToList(); - vm.typejobs = Dao.Get("cr.documnets.typejob", ht).ToList(); + vm.syears = Dao.Get("cr.documnetspasts.syear", ht).ToList(); + vm.cgs = Dao.Get("cr.documnetspasts.cg", ht).ToList(); + vm.cshapes = Dao.Get("cr.documnetspasts.cshape", ht).ToList(); + vm.typemans = Dao.Get("cr.documnetspasts.typeman", ht).ToList(); + vm.edukinds = Dao.Get("cr.documnetspasts.edukind", ht).ToList(); + vm.typeedus = Dao.Get("cr.documnetspasts.typeedu", ht).ToList(); + vm.typegrades = Dao.Get("cr.documnetspasts.typegrade", ht).ToList(); + vm.typejobs = Dao.Get("cr.documnetspasts.typejob", ht).ToList(); + vm.kinds = Dao.Get("cr.documnetspasts.kind", ht).ToList(); List words = new List(); words.Add(new textvalue { text = "이름", value = "이름"}); words.Add(new textvalue { text = "주민등록번호", value = "주민등록번호" }); @@ -983,17 +984,17 @@ namespace NP.BO.Controllers case "사업자등록번호": ht.Add("word", "brno"); break; } ht.Add("text", vm.stringval12); - vm.DocumentList = Dao.Get("cr.documnetspast", ht); + vm.DocumentList = Dao.Get("cr.documnetspasts", ht); vm.pagetotalcount = GetCount(vm.DocumentList.FirstOrDefault()); if (vm.isexceldown == 1) { - vm.DocumentList = Dao.Get("cr.documnetspast", ht); + vm.DocumentList = Dao.Get("cr.documnetspasts", ht); return ExportExcel( - new String[] { "구분","과정분류","교육유형","아이디","이름","주민번호","기술인분류","교육구분","교육목적","등급","직무분야","과정명","수료번호","업체명","업체주소","사업자등록번호", + new String[] { "구분","과정분류","교육유형","이름","주민번호","기술인분류","교육구분","교육목적","등급","직무분야","과정명","수료번호","업체명","업체주소","사업자등록번호", "고용보험관리번호","업태","종목","대표자","교육시작일","교육종료일","교육이수시간","소속협회","학력","직위","교육생연락처","업체담당자","업체담당당자 연락처","교육비", "환급액","환급은행명","환급계좌" ,"환급계좌예금주","계산서이메일","교육연도"}, - new String[] { "kind", "cg", "cshape","id", "username", "userpno", "typeman", "edukind", "typeedu", "typegrade", "typejob", "cgname", "completeno", "companyname", + new String[] { "kind", "cg", "cshape", "username", "userpno", "typeman", "edukind", "typeedu", "typegrade", "typejob", "cgname", "completeno", "companyname", "companyaddr", "brno", "eino", "btype", "bkind", "ceoname", "ssdateymd","sedateymd","sctime","assign","slevel","uduty","phone","mname","mphone", "sprice","rprice","rbank","rbankno","rbankuser","taxemail","syear"}, vm.DocumentList, diff --git a/BO/Views/croom/documentspast.cshtml b/BO/Views/croom/documentspast.cshtml index 4494e59..a5dd52d 100644 --- a/BO/Views/croom/documentspast.cshtml +++ b/BO/Views/croom/documentspast.cshtml @@ -99,6 +99,7 @@
@@ -109,6 +110,9 @@ + + + @@ -149,7 +153,10 @@ @foreach (var item in Model.DocumentList) { + + + @@ -191,13 +198,329 @@ @Html.Pager((int)Model.pagenum, 10, Model.pagerowcount, Model.pagetotalcount) +
+

과거 증빙서류 수정닫기

+ +
수정등록/수정 일자구분 과정분류 교육유형 이름
[수정]@(item.cdt != DateTime.MinValue ? item.cdtymd : item.udt != DateTime.MinValue ? item.udtymd : "-") @item.kind@item.cg @item.cshape @item.username @(item.userpno.Length > 7 ? item.userpno.Insert(6,"-") : item.userpno)
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
과정분류 + @Html.Partial("./Partial/Select", Model.cgs, new ViewDataDictionary { { "name", "document.cg" }, { "style", "width: 100%" }, { "df", ":-선택" } }) + 교육유형 + @Html.Partial("./Partial/Select", Model.cshapes, new ViewDataDictionary { { "name", "document.cshape" }, { "style", "width: 100%" }, { "df", ":-선택" } }) +
이름 + @Html.Partial("./Partial/Text", null, Helpers.DicText(new NP.Model.TextDic() { Name = "document.username", Style = "width:100%;" })) + 주민번호 + @Html.Partial("./Partial/Text", null, Helpers.DicText(new NP.Model.TextDic() { Name = "document.userpno", Style = "width:100%;" })) +
기술인분류 + @Html.Partial("./Partial/Select", Model.typemans, new ViewDataDictionary { { "name", "document.typeman" }, { "style", "width: 100%" }, { "df", ":-선택" } }) + 교육구분 + @Html.Partial("./Partial/Select", Model.edukinds, new ViewDataDictionary { { "name", "document.edukind" }, { "style", "width: 100%" }, { "df", ":-선택" } }) +
교육목적 + @Html.Partial("./Partial/Select", Model.typeedus, new ViewDataDictionary { { "name", "document.typeedu" }, { "style", "width: 100%" }, { "df", ":-선택" } }) + 등급 + @Html.Partial("./Partial/Select", Model.typegrades, new ViewDataDictionary { { "name", "document.typegrade" }, { "style", "width: 100%" }, { "df", ":-선택" } }) +
직무분야 + @Html.Partial("./Partial/Select", Model.typejobs, new ViewDataDictionary { { "name", "document.typejob" }, { "style", "width: 100%" }, { "df", ":-선택" } }) + 과정명 + @Html.Partial("./Partial/Text", null, Helpers.DicText(new NP.Model.TextDic() { Name = "document.cgname", Style = "width:100%;" })) +
수료번호 + @Html.Partial("./Partial/Text", null, Helpers.DicText(new NP.Model.TextDic() { Name = "document.completeno", Style = "width:100%;" })) + 업체명 + @Html.Partial("./Partial/Text", null, Helpers.DicText(new NP.Model.TextDic() { Name = "document.companyname", Style = "width:100%;" })) +
업체주소 + @Html.Partial("./Partial/Text", null, Helpers.DicText(new NP.Model.TextDic() { Name = "document.companyaddr", Style = "width:100%;" })) +
사업자등록번호 + @Html.Partial("./Partial/Text", null, Helpers.DicText(new NP.Model.TextDic() { Name = "document.brno", Style = "width:100%;" })) + 고용보험관리번호 + @Html.Partial("./Partial/Text", null, Helpers.DicText(new NP.Model.TextDic() { Name = "document.eino", Style = "width:100%;" })) +
업태 + @Html.Partial("./Partial/Text", null, Helpers.DicText(new NP.Model.TextDic() { Name = "document.btype", Style = "width:100%;" })) + 종목 + @Html.Partial("./Partial/Text", null, Helpers.DicText(new NP.Model.TextDic() { Name = "document.bkind", Style = "width:100%;" })) +
대표자 + @Html.Partial("./Partial/Text", null, Helpers.DicText(new NP.Model.TextDic() { Name = "document.ceoname", Style = "width:100%;" })) + 교육일시작일 + @Html.Partial("./Partial/Date", null, new ViewDataDictionary { { "name", "document.ssdate" } }) +
교육일종료일 + @Html.Partial("./Partial/Date", null, new ViewDataDictionary { { "name", "document.sedate" } }) + 교육이수시간 + @Html.Partial("./Partial/Text", null, Helpers.DicText(new NP.Model.TextDic() { Name = "document.sctime", Style = "width:100%;" })) +
소속협회 + @Html.Partial("./Partial/Text", null, Helpers.DicText(new NP.Model.TextDic() { Name = "document.assign", Style = "width:100%;" })) + 학력 + @Html.Partial("./Partial/Text", null, Helpers.DicText(new NP.Model.TextDic() { Name = "document.slevel", Style = "width:100%;" })) +
직위 + @Html.Partial("./Partial/Text", null, Helpers.DicText(new NP.Model.TextDic() { Name = "document.uduty", Style = "width:100%;" })) + 교육생연락처 + @Html.Partial("./Partial/Text", null, Helpers.DicText(new NP.Model.TextDic() { Name = "document.phone", Style = "width:100%;" })) +
업체담당자 + @Html.Partial("./Partial/Text", null, Helpers.DicText(new NP.Model.TextDic() { Name = "document.mname", Style = "width:100%;" })) + 업체담당자연락처 + @Html.Partial("./Partial/Text", null, Helpers.DicText(new NP.Model.TextDic() { Name = "document.mphone", Style = "width:100%;" })) +
교육비 + @Html.Partial("./Partial/Text", null, Helpers.DicText(new NP.Model.TextDic() { Name = "document.sprice", Style = "width:100%;" })) + 환급액 + @Html.Partial("./Partial/Text", null, Helpers.DicText(new NP.Model.TextDic() { Name = "document.rprice", Style = "width:100%;" })) +
환급은행명 + @Html.Partial("./Partial/Text", null, Helpers.DicText(new NP.Model.TextDic() { Name = "document.rbank", Style = "width:100%;" })) + 환급계좌 + @Html.Partial("./Partial/Text", null, Helpers.DicText(new NP.Model.TextDic() { Name = "document.rbankno", Style = "width:100%;" })) +
환급계좌예금주 + @Html.Partial("./Partial/Text", null, Helpers.DicText(new NP.Model.TextDic() { Name = "document.rbankuser", Style = "width:100%;" })) + 계산서이메일 + @Html.Partial("./Partial/Text", null, Helpers.DicText(new NP.Model.TextDic() { Name = "document.taxemail", Style = "width:100%;" })) +
교육연도 + @Html.Partial("./Partial/Select", Model.syears, new ViewDataDictionary { { "name", "document.syear" }, { "style", "width: 100%" }, { "df", ":-선택" } }) + 구분 + @Html.Partial("./Partial/Select", Model.kinds, new ViewDataDictionary { { "name", "document.kind" }, { "style", "width: 100%" }, { "df", ":-선택" } }) +
+
+ 수정 +
+
+
+

닫기

+
+
일괄등록
+
+
+ +
+
+
+
+ 양식다운로드 + 일괄등록 +
+
+
+
+
@section scriptsHeader{ - @Html.Partial("./Partial/ScriptDate") } @section scripts{ } \ No newline at end of file diff --git a/Base/Controller/ACommon.cs b/Base/Controller/ACommon.cs index 9fbbf94..aa8e2c2 100644 --- a/Base/Controller/ACommon.cs +++ b/Base/Controller/ACommon.cs @@ -1431,6 +1431,83 @@ namespace NP.Base.Controllers return JsonOK(Dao.SaveContentsBatch(cts), false); } } + case "documentbatch": + { + var data = new Lib.ExcelToEntity(uploadfile).Read(2, 1).ToList(); + //입력된 정보 검증 + if (data.Count() < 1) + { + return JsonBack(new JsonRtn() { code = 1, msg = "데이터가 없습니다." }); + } + int i = 1; + foreach (var d in data) + { + long tryParseResult = 0; + d.userpno = d.userpno.Replace("-", ""); + if (!String.IsNullOrEmpty(d.ssdatestring)) + { + int index = d.ssdatestring.IndexOf(" "); + if (index > -1) + { + d.ssdate = Convert.ToDateTime(d.ssdatestring.Substring(0, index + 1)); + } + else { + d.ssdate = Convert.ToDateTime(d.ssdatestring.Substring(0, 10)); + } + } + if (!String.IsNullOrEmpty(d.sedatestring)) + { + int index = d.sedatestring.IndexOf(" "); + if (index > -1) + { + d.sedate = Convert.ToDateTime(d.sedatestring.Substring(0, index + 1)); + } + else + { + d.sedate = Convert.ToDateTime(d.sedatestring.Substring(0, 10)); + } + } + if (string.IsNullOrEmpty(d.username.Trim())) + { + return JsonBack(new JsonRtn() { code = 1, msg = i + "번째 데이터의 이름이 공란입니다." }); + } + else if(string.IsNullOrEmpty(d.userpno.Trim())) + { + return JsonBack(new JsonRtn() { code = 1, msg = i + "번째 데이터의 주민번호가 공란입니다." }); + } + else if (!long.TryParse(d.brno.Trim(), out tryParseResult)) + { + return JsonBack(new JsonRtn() { code = 1, msg = i + "번째 데이터의 사업자등록번호는 숫자만 입력가능합니다." }); + } + else if (!long.TryParse(d.eino.Trim(), out tryParseResult)) + { + return JsonBack(new JsonRtn() { code = 1, msg = i + "번째 데이터의 고용보험관리번호는 숫자만 입력가능합니다." }); + } + else if (!long.TryParse(d.sctime.Trim(), out tryParseResult)) + { + return JsonBack(new JsonRtn() { code = 1, msg = i + "번째 데이터의 교육이수시간은 숫자만 입력가능합니다." }); + } + else if (!long.TryParse(d.sprice.Trim(), out tryParseResult)) + { + return JsonBack(new JsonRtn() { code = 1, msg = i + "번째 데이터의 교육비는 숫자만 입력가능합니다." }); + } + else if (!long.TryParse(d.rprice.Trim(), out tryParseResult)) + { + return JsonBack(new JsonRtn() { code = 1, msg = i + "번째 데이터의 환급액은 숫자만 입력가능합니다." }); + } + else if (!long.TryParse(d.rbankno.Trim(), out tryParseResult)) + { + return JsonBack(new JsonRtn() { code = 1, msg = i + "번째 데이터의 환급계좌는 숫자만 입력가능합니다." }); + } + else if (!long.TryParse(d.syear.Trim(), out tryParseResult)) + { + return JsonBack(new JsonRtn() { code = 1, msg = i + "번째 데이터의 교육년도는 숫자만 입력가능합니다." }); + } + d.uno = SUserInfo.UserNo; + d.uip = GetUserIP(); + } + return JsonOK(Dao.Save("cr.documnetspast.batch", new Hashtable() { { "Ds", data } })); + } } } } diff --git a/Base/Controller/ACommonCRoom.cs b/Base/Controller/ACommonCRoom.cs index 1f2e931..c49a348 100644 --- a/Base/Controller/ACommonCRoom.cs +++ b/Base/Controller/ACommonCRoom.cs @@ -1223,6 +1223,19 @@ namespace NP.Base.Controllers { return JsonOK(Dao.Save("pay.pplogtype.up", new Hashtable() { { "pplno", pplno }, { "typeman", typeman }, { "typejob", typejob }, { "typeedu", typeedu }, { "typegrade", typegrade } })); } + [HttpPost] + public JsonResult DocumnetsPast(Int64 no) + { + return JsonBack(Dao.Get("cr.documnetspast", new Hashtable() { { "no", no } }).First()); + } + [HttpPost] + public JsonResult DocumnetsPastUpdate(Document document) + { + document.userpno = document.userpno.Replace("-", ""); + document.uno = SUserInfo.UserNo; + document.uip = GetUserIP(); + return JsonOK(Dao.Save("cr.documnetspast.up", document)); + } } } \ No newline at end of file diff --git a/Dao/DB/DB1.Scheme.txt b/Dao/DB/DB1.Scheme.txt index b8d9d02..8979428 100644 --- a/Dao/DB/DB1.Scheme.txt +++ b/Dao/DB/DB1.Scheme.txt @@ -1492,4 +1492,64 @@ create table councel ( atext mediumtext DEFAULT NULL, isdel tinyint not null default 0, cdt datetime not null,cno bigint not NULL,udt datetime not null,uno bigint not NULL,uip varchar(50) not NULL -,primary key(bno)); \ No newline at end of file +,primary key(bno)); + +CREATE TABLE docprintpast ( + no BIGINT(20) NOT NULL AUTO_INCREMENT, + kind VARCHAR(50) NULL DEFAULT NULL COLLATE utf8_general_ci, + cg VARCHAR(30) NULL DEFAULT NULL COLLATE utf8_general_ci, + cshape VARCHAR(30) NULL DEFAULT NULL COLLATE utf8_general_ci, + username VARCHAR(30) NULL DEFAULT NULL COLLATE utf8_general_ci, + userpno VARBINARY(200) NULL DEFAULT NULL, + typeman VARCHAR(30) NULL DEFAULT NULL COLLATE utf8_general_ci, + edukind VARCHAR(30) NULL DEFAULT NULL COLLATE utf8_general_ci, + typeedu VARCHAR(30) NULL DEFAULT NULL COLLATE utf8_general_ci, + typegrade VARCHAR(30) NULL DEFAULT NULL COLLATE utf8_general_ci, + typejob VARCHAR(30) NULL DEFAULT NULL COLLATE utf8_general_ci, + cgname VARCHAR(30) NULL DEFAULT NULL COLLATE utf8_general_ci, + completeno VARCHAR(30) NULL DEFAULT NULL COLLATE utf8_general_ci, + companyname VARCHAR(30) NULL DEFAULT NULL COLLATE utf8_general_ci, + companyaddr VARCHAR(100) NULL DEFAULT NULL COLLATE utf8_general_ci, + brno VARCHAR(30) NULL DEFAULT NULL COLLATE utf8_general_ci, + eino VARCHAR(30) NULL DEFAULT NULL COLLATE utf8_general_ci, + btype VARCHAR(50) NULL DEFAULT NULL COLLATE utf8_general_ci, + bkind VARCHAR(100) NULL DEFAULT NULL COLLATE utf8_general_ci, + ceoname VARCHAR(30) NULL DEFAULT NULL COLLATE utf8_general_ci, + ssdate DATETIME NULL DEFAULT NULL, + sedate DATETIME NULL DEFAULT NULL, + sctime VARCHAR(30) NULL DEFAULT NULL COLLATE utf8_general_ci, + assign VARCHAR(30) NULL DEFAULT NULL COLLATE utf8_general_ci, + slevel VARCHAR(30) NULL DEFAULT NULL COLLATE utf8_general_ci, + uduty VARCHAR(30) NULL DEFAULT NULL COLLATE utf8_general_ci, + phone VARBINARY(200) NULL DEFAULT NULL, + mname VARCHAR(30) NULL DEFAULT NULL COLLATE utf8_general_ci, + mphone VARBINARY(200) NULL DEFAULT NULL, + sprice VARCHAR(30) NULL DEFAULT NULL COLLATE utf8_general_ci, + rprice VARCHAR(30) NULL DEFAULT NULL COLLATE utf8_general_ci, + rbank VARCHAR(30) NULL DEFAULT NULL COLLATE utf8_general_ci, + rbankno VARBINARY(200) NULL DEFAULT NULL, + rbankuser VARCHAR(30) NULL DEFAULT NULL COLLATE utf8_general_ci, + taxemail VARBINARY(200) NULL DEFAULT NULL, + syear VARCHAR(30) NULL DEFAULT NULL COLLATE utf8_general_ci, + cdt DATETIME NULL DEFAULT NULL, + cno BIGINT(20) NULL DEFAULT NULL, + udt DATETIME NULL DEFAULT NULL, + uno BIGINT(20) NULL DEFAULT NULL, + uip VARCHAR(50) NULL DEFAULT NULL COLLATE utf8_general_ci, + PRIMARY KEY (no) USING BTREE, + INDEX idocprintpastsedate (sedate) USING BTREE, + INDEX idocprintpastsyear (syear) USING BTREE, + INDEX idocprintpasttypeman (typeman) USING BTREE, + INDEX idocprintpastedukind (edukind) USING BTREE, + INDEX idocprintpasttypeedu (typeedu) USING BTREE, + INDEX idocprintpasttypegrade (typegrade) USING BTREE, + INDEX idocprintpasttypejob (typejob) USING BTREE, + INDEX idocprintpastssdate (ssdate) USING BTREE, + INDEX idocprintpastcshape (cshape) USING BTREE, + INDEX idocprintpastcg (cg) USING BTREE, + INDEX idocprintpastkind (kind) USING BTREE +) +COLLATE=utf8_general_ci +ENGINE=InnoDB +AUTO_INCREMENT=181866 +; \ No newline at end of file diff --git a/Dao/DB/DB1.SchemeFK.txt b/Dao/DB/DB1.SchemeFK.txt index 5e7f908..fca172c 100644 --- a/Dao/DB/DB1.SchemeFK.txt +++ b/Dao/DB/DB1.SchemeFK.txt @@ -221,3 +221,15 @@ alter table boardmaster add unique index uiboardmaster (bmcode); alter table users add unique index uiusersuserid(userid); alter table users add unique index uiusersemail(email); alter table ct add unique index uictccode(ccode); + +alter table docprintpast add index idocprintpastsedate (sedate) +alter table docprintpast add index idocprintpastsyear (syear) +alter table docprintpast add index idocprintpasttypeman (typeman) +alter table docprintpast add index idocprintpastedukind (edukind) +alter table docprintpast add index idocprintpasttypeedu (typeedu) +alter table docprintpast add index idocprintpasttypegrade (typegrade) +alter table docprintpast add index idocprintpasttypejob (typejob) +alter table docprintpast add index idocprintpastssdate (ssdate) +alter table docprintpast add index idocprintpastcshape (cshape) +alter table docprintpast add index idocprintpastcg (cg) +alter table docprintpast add index idocprintpastkind (kind) diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml index a7eee4c..f22fa8c 100644 --- a/Dao/MyBatis/Maps/CRoom.xml +++ b/Dao/MyBatis/Maps/CRoom.xml @@ -1347,20 +1347,25 @@ ,mgtkey=#mgtkey# where taxno=#taxno# - select a.* from ( select - a.no,a.kind,a.cg,a.cshape,a.username,CAST(AES_DECRYPT(UNHEX(a.userpno), ) AS char) userpno + a.no,a.kind,a.cg,a.cshape,a.username + ,CAST(AES_DECRYPT(UNHEX(a.userpno), ) AS char) userpno ,a.typeman,a.edukind,a.typeedu,a.typegrade,a.typejob,a.cgname,a.completeno,a.companyname,a.companyaddr,a.brno,a.eino,a.btype ,a.bkind,a.ceoname,date_format(a.ssdate, '%Y-%m-%d') ssdate,date_format(a.sedate, '%Y-%m-%d') sedate,a.sctime,a.assign,a.slevel,a.uduty - ,CAST(AES_DECRYPT(UNHEX(a.phone), ) AS char) phone,a.mname - ,CAST(AES_DECRYPT(UNHEX(a.mphone), ) AS char) mphone,a.sprice,a.rprice,a.rbank - ,CAST(AES_DECRYPT(UNHEX(a.rbankno), ) AS char) rbankno,a.rbankuser - ,CAST(AES_DECRYPT(UNHEX(a.taxemail), ) AS char) taxemail,a.syear + ,CAST(AES_DECRYPT(UNHEX(a.phone), ) AS char) phone + ,a.mname + ,CAST(AES_DECRYPT(UNHEX(a.mphone), ) AS char) mphone + ,a.sprice,a.rprice,a.rbank + ,CAST(AES_DECRYPT(UNHEX(a.rbankno), ) AS char) rbankno + ,a.rbankuser + ,CAST(AES_DECRYPT(UNHEX(a.taxemail), ) AS char) taxemail + ,a.syear,a.cdt,a.cno,a.udt,a.uno,a.uip ,row_number() over(order by a.ssdate desc) rno - ,count(a.ssdate) over() pagetotalcount + ,count(a.ssdate) over() pagetotalcount from docprintpast a where a.ssdate >= #ssdate# and a.sedate <= #sedate# and a.syear=#syear# @@ -1384,42 +1389,121 @@ order by a.rno - + select + a.no,a.kind,a.cg,a.cshape,a.username + ,CAST(AES_DECRYPT(UNHEX(a.userpno), ) AS char) userpno + ,a.typeman,a.edukind,a.typeedu,a.typegrade,a.typejob,a.cgname,a.completeno,a.companyname,a.companyaddr,a.brno,a.eino,a.btype + ,a.bkind,a.ceoname,date_format(a.ssdate, '%Y-%m-%d') ssdate,date_format(a.sedate, '%Y-%m-%d') sedate,a.sctime,a.assign,a.slevel,a.uduty + ,CAST(AES_DECRYPT(UNHEX(a.phone), ) AS char) phone + ,a.mname + ,CAST(AES_DECRYPT(UNHEX(a.mphone), ) AS char) mphone + ,a.sprice,a.rprice,a.rbank + ,CAST(AES_DECRYPT(UNHEX(a.rbankno), ) AS char) rbankno + ,a.rbankuser + ,CAST(AES_DECRYPT(UNHEX(a.taxemail), ) AS char) taxemail + ,a.syear,a.cdt,a.cno,a.udt,a.uno,a.uip + from docprintpast a + where a.no = #no# + + + update docprintpast + set + ,kind=#kind# + ,cg=#cg# + ,cshape=#cshape# + ,username=#username# + ,userpno=HEX(AES_ENCRYPT(#userpno#, )) + ,typeman=#typeman# + ,edukind=#edukind# + ,typeedu=#typeedu# + ,typegrade=#typegrade# + ,typejob=#typejob# + ,cgname=#cgname# + ,completeno=#completeno# + ,companyname=#companyname# + ,companyaddr=#companyaddr# + ,brno=#brno# + ,eino=#eino# + ,btype=#btype# + ,bkind=#bkind# + ,ceoname=#ceoname# + ,ssdate=#ssdate# + ,sedate=#sedate# + ,sctime=#sctime# + ,assign=#assign# + ,slevel=#slevel# + ,uduty=#uduty# + ,phone=HEX(AES_ENCRYPT(#phone#, )) + ,mname=#mname# + ,mphone=HEX(AES_ENCRYPT(#mphone#, )) + ,sprice=#sprice# + ,rprice=#rprice# + ,rbank=#rbank# + ,rbankno=HEX(AES_ENCRYPT(#rbankno#, )) + ,rbankuser=#rbankuser# + ,taxemail=HEX(AES_ENCRYPT(#taxemail#, )) + ,syear=#syear# + where no=#no# + + + insert into docprintpast (kind, cg, cshape, username, userpno, typeman, edukind, typeedu, typegrade, typejob, cgname, completeno, companyname, companyaddr, brno, eino, btype, bkind, ceoname, ssdate, sedate, sctime, assign, slevel, uduty, phone, mname, mphone, sprice, rprice, rbank, rbankno, rbankuser, taxemail, syear, ) + + select #Ds[].kind#, #Ds[].cg#, #Ds[].cshape#, #Ds[].username# + , HEX(AES_ENCRYPT(#Ds[].userpno#, )) + , #Ds[].typeman#, #Ds[].edukind#, #Ds[].typeedu#, #Ds[].typegrade#, #Ds[].typejob#, #Ds[].cgname#, #Ds[].completeno#, #Ds[].companyname#, #Ds[].companyaddr#, #Ds[].brno#, #Ds[].eino#, #Ds[].btype#, #Ds[].bkind#, #Ds[].ceoname#, #Ds[].ssdate#, #Ds[].sedate#, #Ds[].sctime#, #Ds[].assign#, #Ds[].slevel#, #Ds[].uduty# + , HEX(AES_ENCRYPT(#Ds[].phone#, )) + , #Ds[].mname# + , HEX(AES_ENCRYPT(#Ds[].mphone#, )) + , #Ds[].sprice#, #Ds[].rprice#, #Ds[].rbank# + , HEX(AES_ENCRYPT(#Ds[].rbankno#, )) + , #Ds[].rbankuser# + , HEX(AES_ENCRYPT(#Ds[].taxemail#, )) + , #Ds[].syear# + , now(), #Ds[].uno#, now(), #Ds[].uno#, #Ds[].uip# + ; + + + - select a.cg value,a.cg text from docprintpast a where a.cg is not null and a.cg <> "" group by a.cg - select a.cshape value,a.cshape text from docprintpast a where a.cshape is not null and a.cshape <> "" group by a.cshape - select a.typeman value,a.typeman text from docprintpast a where a.typeman is not null and a.typeman <> "" group by a.typeman - select a.edukind value,a.edukind text from docprintpast a where a.edukind is not null and a.edukind <> "" group by a.edukind - select a.typeedu value,a.typeedu text from docprintpast a where a.typeedu is not null and a.typeedu <> "" group by a.typeedu - select a.typegrade value,a.typegrade text from docprintpast a where a.typegrade is not null and a.typegrade <> "" group by a.typegrade - select a.typejob value,a.typejob text from docprintpast a where a.typejob is not null and a.typejob <> "" group by a.typejob diff --git a/Model/Documents.cs b/Model/Documents.cs index ffca30a..25c92f4 100644 --- a/Model/Documents.cs +++ b/Model/Documents.cs @@ -19,8 +19,9 @@ namespace NP.Model public List typegrades { get; set; } public List typejobs { get; set; } public List words { get; set; } + public List kinds { get; set; } } - public class Document + public class Document : BaseModel { /// /// 순서 @@ -37,11 +38,7 @@ namespace NP.Model /// /// 교육유형 /// - public String cshape { get; set; } - /// - /// 아이디 (공백) - /// - public String id { get; set; } + public String cshape { get; set; } /// /// 이름 /// @@ -117,7 +114,10 @@ namespace NP.Model return ssdate != null ? ssdate.Value.ToString("yyyy-MM-dd") : null; } } - + /// + /// 교육시작일(엑셀매칭용) + /// + public string ssdatestring { get; set; } /// /// 교육종료일 /// @@ -130,6 +130,10 @@ namespace NP.Model } } /// + /// 교육종료일(엑셀매칭용) + /// + public string sedatestring { get; set; } + /// /// 교육이수시간 /// public String sctime { get; set; } @@ -187,9 +191,7 @@ namespace NP.Model public String syear { get; set; } public int? pagenum { get; set; } public int pageviewcount { get; set; } - public int pagerowcount { get; set; } - public int pagetotalcount { get; set; } - + public int pagerowcount { get; set; } } public class textvalue {