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

<기능개선> 

통합테스트목록 . 571
BO/Controllers/croomController.cs
Dao/MyBatis/Maps/Lect.xml
탈퇴회원 제외
This commit is contained in:
kdh0120 2021-11-24 00:23:48 +00:00
parent 6cc31d58f4
commit a67f560c9c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BO/Controllers/croomController.cs
View File

@ -583,7 +583,7 @@ namespace NP.BO.Controllers
vm.LectEXes = new List<LectEX>() { }; vm.LectEXes = new List<LectEX>() { };
if (vm.CMEXes.Count() > 0) if (vm.CMEXes.Count() > 0)
{ {
vm.LectEXes = Dao.Get<LectEX>("lect.lectexes", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "exno", !string.IsNullOrEmpty(vm.addstringval) ? GetInt(vm.addstringval) : vm.CMEXes.First().exno }, { "isrebate", vm.addstringval2 }, { "estate", vm.addstringval3 } }); vm.LectEXes = Dao.Get<LectEX>("lect.lectexes", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "exno", !string.IsNullOrEmpty(vm.addstringval) ? GetInt(vm.addstringval) : vm.CMEXes.First().exno }, { "isrebate", vm.addstringval2 }, { "estate", vm.addstringval3 },{"ustatus",1 } });
} }
vm.pagetotalcount = GetCount(vm.LectEXes); vm.pagetotalcount = GetCount(vm.LectEXes);
} }
@ -600,7 +600,7 @@ namespace NP.BO.Controllers
} }
if (vm.CMSDs.Count() > 0) if (vm.CMSDs.Count() > 0)
{ {
vm.LectSDs = Dao.Get<LectSD>("lect.lectsds", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "sdno", !string.IsNullOrEmpty(vm.addstringval) ? GetInt(vm.addstringval) : vm.CMSDs.First().sdno }, { "isrebate", vm.addstringval2 }, { "sdstate", vm.addstringval3 }, { "isproduct" + (GetConfig("isstaging") == "1" ? "x" : ""), 1 } }); vm.LectSDs = Dao.Get<LectSD>("lect.lectsds", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "sdno", !string.IsNullOrEmpty(vm.addstringval) ? GetInt(vm.addstringval) : vm.CMSDs.First().sdno }, { "isrebate", vm.addstringval2 }, { "sdstate", vm.addstringval3 }, { "isproduct" + (GetConfig("isstaging") == "1" ? "x" : ""), 1 } ,{"ustatus",1 } });
} }
vm.pagetotalcount = GetCount(vm.LectSDs); vm.pagetotalcount = GetCount(vm.LectSDs);
} }
@ -617,7 +617,7 @@ namespace NP.BO.Controllers
} }
if (vm.CMSDs.Count() > 0) if (vm.CMSDs.Count() > 0)
{ {
var _ht = new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "sdno", !string.IsNullOrEmpty(vm.addstringval) ? GetInt(vm.addstringval) : vm.CMSDs.First().sdno }, { "isrebate", vm.addstringval2 } }; var _ht = new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "sdno", !string.IsNullOrEmpty(vm.addstringval) ? GetInt(vm.addstringval) : vm.CMSDs.First().sdno }, { "isrebate", vm.addstringval2 },{"ustatus",1 } };
if (!string.IsNullOrEmpty(vm.addstringval3)) if (!string.IsNullOrEmpty(vm.addstringval3))
{ {
_ht.Add("dcount", "=" + vm.addstringval3); _ht.Add("dcount", "=" + vm.addstringval3);

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

@ -815,7 +815,7 @@
from lect a from lect a
inner join cmex b on b.isdel=0 <isNotNull property="exno">and b.exno=#exno#</isNotNull> inner join cmex b on b.isdel=0 <isNotNull property="exno">and b.exno=#exno#</isNotNull>
left outer join lectex c on c.lectno=a.lectno and c.exno=b.exno left outer join lectex c on c.lectno=a.lectno and c.exno=b.exno
inner join users d on d.userno=a.userno inner join users d on d.userno=a.userno<isNotNull property="ustatus"> and d.status = #ustatus#</isNotNull>
left outer join assign e on e.asno=d.asno left outer join assign e on e.asno=d.asno
where a.status=1 and a.ischanged=0 where a.status=1 and a.ischanged=0
<isNotNull property="extype">and b.extype = #extype#</isNotNull> <isNotNull property="extype">and b.extype = #extype#</isNotNull>
@ -1064,7 +1064,7 @@
inner join cmsd b on b.isdel=0 and b.cmno = a.cmno <isNotNull property="sdno">and b.sdno=#sdno#</isNotNull> inner join cmsd b on b.isdel=0 and b.cmno = a.cmno <isNotNull property="sdno">and b.sdno=#sdno#</isNotNull>
left outer join lectsd c on c.lectno=a.lectno and c.sdno=b.sdno left outer join lectsd c on c.lectno=a.lectno and c.sdno=b.sdno
left outer join fileinfo cf on cf.fgno=c.fgno and cf.isdel=0 left outer join fileinfo cf on cf.fgno=c.fgno and cf.isdel=0
inner join users d on d.userno=a.userno inner join users d on d.userno=a.userno<isNotNull property="ustatus"> and d.status = #ustatus#</isNotNull>
left outer join assign e on e.asno=d.asno left outer join assign e on e.asno=d.asno
<isNotNull property="isproduct">left outer join mch_source_v_lectsd_list f on f.DOC_ID = concat(b.sdno ,'_',a.lectno )</isNotNull> <isNotNull property="isproduct">left outer join mch_source_v_lectsd_list f on f.DOC_ID = concat(b.sdno ,'_',a.lectno )</isNotNull>
where a.status=1 and a.ischanged=0 where a.status=1 and a.ischanged=0
@ -1235,7 +1235,7 @@
inner join cmsd b on b.isdel=0 <isNotNull property="sdno">and b.sdno=#sdno#</isNotNull> inner join cmsd b on b.isdel=0 <isNotNull property="sdno">and b.sdno=#sdno#</isNotNull>
left outer join lectsd c on c.lectno=a.lectno and c.sdno=b.sdno left outer join lectsd c on c.lectno=a.lectno and c.sdno=b.sdno
left outer join lectsdboard c2 on c2.lectno=c.lectno and c2.sdno=c.sdno and c2.isdel=0 left outer join lectsdboard c2 on c2.lectno=c.lectno and c2.sdno=c.sdno and c2.isdel=0
inner join users d on d.userno=a.userno inner join users d on d.userno=a.userno<isNotNull property="ustatus"> and d.status = #ustatus#</isNotNull>
left outer join assign e on e.asno=d.asno left outer join assign e on e.asno=d.asno
where a.cmno=#cmno# and a.status=1 and a.ischanged=0 where a.cmno=#cmno# and a.status=1 and a.ischanged=0
<isNotNull property="isrebate">and a.isrebate=#isrebate#</isNotNull> <isNotNull property="isrebate">and a.isrebate=#isrebate#</isNotNull>