KimHanJin
/
YNICTE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"1. 교육장 검색이 되고 있지 않음 

- 2021년/교육장교육 에서 교육장을 어느곳으로 선택해도 동일한 값이 검색되고 있음
2. 학습기간 검색 시 수료일 기준으로 검색 요청
 - 수료일이 검색 기간 내에 포함되어 있을 경우 출력
 - 기본값: null
3. 검색단어 ID 누락"
This commit is contained in:
lch 2021-06-29 08:27:56 +00:00
parent 04643afb8e
commit 612b6f0310
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BO/Controllers/croomController.cs
View File

@ -1008,9 +1008,7 @@ namespace NP.BO.Controllers
{
vm.Completions = InitM<Completion>();
vm.CGs = Dao.Get<CG>("cm.cgs", new System.Collections.Hashtable() { { "isuse", 1 }, { "isdel", 0 } });
vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace");
vm.stringval8 = vm.stringval8 ?? DateTime.Now.AddMonths(-1).ToString("yyyy-MM-01");
vm.stringval9 = vm.stringval9 ?? DateTime.Now.AddMonths(1).ToString("yyyy-MM-01");
vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace");
var ht = SetHash(vm);
ht.Add("tyear", vm.stringval);
@ -1020,8 +1018,8 @@ namespace NP.BO.Controllers
ht.Add("typeman", vm.stringval5);
ht.Add("studyplace", vm.stringval6);
ht.Add("typejob", vm.stringval7);
ht.Add("sdate", vm.stringval8);
ht.Add("edate", vm.stringval9);
ht.Add("scompletetime", vm.stringval8);
ht.Add("ecompletetime", vm.stringval9);
ht.Add("typegrade", vm.stringval10);
ht.Add("typeedu", vm.stringval11);

2
BO/Views/croom/completions.cshtml
View File

@ -81,7 +81,7 @@
<th>검색단어</th>
<td>
<div class="col-md-4">
@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", "username:이름;userpno:주민등록번호;completeno:수료번호;asname:업체명;brno:사업자등록번호" }, { "name", "searchtype" }, { "selected", Model.searchtype }, { "style", "width: 100%" }, { "df", ":-유형선택" } })
@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", "userid:ID;username:이름;userpno:주민등록번호;completeno:수료번호;asname:업체명;brno:사업자등록번호" }, { "name", "searchtype" }, { "selected", Model.searchtype }, { "style", "width: 100%" }, { "df", ":-유형선택" } })
</div>
<div class="col-md-8">

6
Dao/MyBatis/Maps/CRoom.xml
View File

@ -1547,12 +1547,13 @@
left outer join pplog pp on pp.pplno = p.pplno
where l.iscomplete = 1
<isNotNull property="lectno" prepend="and">l.lectno = #lectno#</isNotNull>
<isNotNull property="sdate" prepend="and">l.sdate &gt;= #sdate#</isNotNull>
<isNotNull property="edate" prepend="and">l.edate &lt;= #edate#</isNotNull>
<isNotNull property="scompletetime" prepend="and">l.completetime &gt;= #scompletetime#</isNotNull>
<isNotNull property="ecompletetime" prepend="and">l.completetime &lt;= #ecompletetime#</isNotNull>
<isNotNull property="tyear" prepend="and">t.tyear=#tyear#</isNotNull>
<isNotNull property="cgno" prepend="and">cg.cgno=#cgno#</isNotNull>
<isNotNull property="pcgno" prepend="and">cg.pcgno=#pcgno#</isNotNull>
<isNotNull property="cshape" prepend="and">cm.cshape=#cshape#</isNotNull>
<isNotNull property="studyplace" prepend="and">cm.studyplace=#studyplace#</isNotNull>
<isNotNull property="typeman" prepend="and">pp.typeman=#typeman#</isNotNull>
<isNotNull property="edukind" prepend="and">pp.edukind=#edukind#</isNotNull>
<isNotNull property="typeedu" prepend="and">pp.typeedu=#typeedu#</isNotNull>
@ -1560,6 +1561,7 @@
<isNotNull property="typejob" prepend="and">pp.typejob=#typejob#</isNotNull>
<isNotNull property="searchtype">
<isNotNull property="searchtext">
<isEqual property="searchtype" compareValue="userid" prepend="and"> u.userid like concat('%',#searchtext#,'%')</isEqual>
<isEqual property="searchtype" compareValue="username" prepend="and"> u.username like concat('%',#searchtext#,'%')</isEqual>
<isEqual property="searchtype" compareValue="userpno" prepend="and">
u.userpno = HEX(AES_ENCRYPT(replace(#searchtext#,'-',''), <include refid="sql.digest"></include>))