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

<기능개선> 

1. PMS NO : 4451
2. (주요)작업내용 
(1) 비활성계정의 정보를 노출할 수 있도록 users의 status = 1 이 아닌 status < 99 로 변경
This commit is contained in:
jity7777 2024-03-07 04:00:19 +00:00
parent 8c735b32cf
commit 59a296b9fb
4 changed files with 46 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BO/Controllers/croomController.cs
View File

@ -655,7 +655,7 @@ namespace NP.BO.Controllers
break; break;
case 1: case 1:
{ {
vm.Lects = Dao.Get<Lect>("lect.atts", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "status", 1 }, { "ustatus", 1 }, { "isrebate", vm.addstringval } }); vm.Lects = Dao.Get<Lect>("lect.atts", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "status", 1 }, { "ustatus", 9 }, { "isrebate", vm.addstringval } });
vm.pagetotalcount = GetCount(vm.Lects.FirstOrDefault()); vm.pagetotalcount = GetCount(vm.Lects.FirstOrDefault());
vm.CMInnings = Dao.Get<CMInning>("cm.cminnings", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "isonline", 0 }, { "isscd", 0 } }); vm.CMInnings = Dao.Get<CMInning>("cm.cminnings", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "isonline", 0 }, { "isscd", 0 } });
} }
@ -667,7 +667,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 }, { "ustatus", 1 } }); 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", 99 } });
} }
vm.pagetotalcount = GetCount(vm.LectEXes); vm.pagetotalcount = GetCount(vm.LectEXes);
} }
@ -782,7 +782,7 @@ namespace NP.BO.Controllers
ht.Add("ustatus", 0); ht.Add("ustatus", 0);
} else } else
{ {
ht.Add("ustatus", 1); ht.Add("ustatus", 99);
} }
if (!string.IsNullOrEmpty(vm.stringval6)) if (!string.IsNullOrEmpty(vm.stringval6))

2
Dao/MyBatis/Maps/CM.xml
View File

@ -524,7 +524,7 @@
inner join cm a2 on a2.cmno = a.cmno inner join cm a2 on a2.cmno = a.cmno
left outer join ct b on b.ctno=a.ctno and b.isdel=0 left outer join ct b on b.ctno=a.ctno and b.isdel=0
left outer join ctpage b2 on b2.ctno=b.ctno and b2.pseq=1 left outer join ctpage b2 on b2.ctno=b.ctno and b2.pseq=1
left outer join users c on c.userno=a.userno and c.status = 1 left outer join users c on c.userno=a.userno and c.status &lt; 99
left outer join fileinfo d on d.fgno=a.fgno and d.isdel=0 left outer join fileinfo d on d.fgno=a.fgno and d.isdel=0
left outer join fileinfo e on e.fgno=a.fgnotf and e.isdel=0 left outer join fileinfo e on e.fgno=a.fgnotf and e.isdel=0
left outer join fileinfo g on g.fgno=a.fgnooff and g.isdel=0 left outer join fileinfo g on g.fgno=a.fgnooff and g.isdel=0

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

@ -1052,7 +1052,7 @@
from cm a from cm a
inner join cm a2 on a.pcmno = a2.cmno inner join cm a2 on a.pcmno = a2.cmno
inner join lect b on b.cmno=a.cmno and b.status=1 and b.ischanged=0 inner join lect b on b.cmno=a.cmno and b.status=1 and b.ischanged=0
inner join users c on c.userno=b.userno and c.status=1 inner join users c on c.userno=b.userno and c.status &lt; 99
inner join pay p on p.payno=b.payno inner join pay p on p.payno=b.payno
left outer join cminningscd e on e.cmisno = b.cmisno left outer join cminningscd e on e.cmisno = b.cmisno
where a.ismaster=0 and a.isdel=0 where a.ismaster=0 and a.isdel=0
@ -1092,7 +1092,7 @@
from cm a from cm a
inner join cm a2 on a.pcmno = a2.cmno inner join cm a2 on a.pcmno = a2.cmno
inner join lect b on b.cmno=a.cmno and b.status=1 and b.ischanged=0 inner join lect b on b.cmno=a.cmno and b.status=1 and b.ischanged=0
inner join users c on c.userno=b.userno and c.status=1 inner join users c on c.userno=b.userno and c.status &lt; 99
inner join pay p on p.payno=b.payno inner join pay p on p.payno=b.payno
left outer join cminningscd e on e.cmisno = b.cmisno left outer join cminningscd e on e.cmisno = b.cmisno
where a.ismaster=0 and a.isdel=0 where a.ismaster=0 and a.isdel=0
@ -1577,7 +1577,7 @@
LEFT OUTER JOIN cminning ci ON l.cmno=ci.cmno AND ci.isonline =0 AND ci.isscd = 1 LEFT OUTER JOIN cminning ci ON l.cmno=ci.cmno AND ci.isonline =0 AND ci.isscd = 1
LEFT OUTER JOIN lectinning li ON ci.cmino = li.cmino AND l.lectno = li.lectno AND li.istatus = 2 LEFT OUTER JOIN lectinning li ON ci.cmino = li.cmino AND l.lectno = li.lectno AND li.istatus = 2
WHERE u.status = 1 AND c.ismaster=0 AND c.isdel=0 AND l.status = 1 AND l.ischanged = 0 WHERE u.status &lt; 99 AND c.ismaster=0 AND c.isdel=0 AND l.status = 1 AND l.ischanged = 0
<isNotNull property="usernamestr" prepend="and">u.username like concat('%',#usernamestr#,'%')</isNotNull> <isNotNull property="usernamestr" prepend="and">u.username like concat('%',#usernamestr#,'%')</isNotNull>
<isNotNull property="useridstr" prepend="and">u.userid like concat('%',#useridstr#,'%')</isNotNull> <isNotNull property="useridstr" prepend="and">u.userid like concat('%',#useridstr#,'%')</isNotNull>

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

@ -923,7 +923,7 @@
,row_number() over(order by <isNotNull property="orderby">$orderby$</isNotNull><isNull property="orderby">b.username</isNull>) rno ,row_number() over(order by <isNotNull property="orderby">$orderby$</isNotNull><isNull property="orderby">b.username</isNull>) rno
,count(a.cdt) over() pagetotalcount ,count(a.cdt) over() pagetotalcount
from lect a from lect a
inner join users b on b.userno=a.userno <isNotNull property="ustatus">and b.status=#ustatus#</isNotNull> inner join users b on b.userno=a.userno and b.status &lt; 99
left outer join assign c on c.asno=b.asno left outer join assign c on c.asno=b.asno
inner join cminning d on d.cmno=a.cmno inner join cminning d on d.cmno=a.cmno
left outer join lectinning e on e.lectno=a.lectno and e.cmino=d.cmino left outer join lectinning e on e.lectno=a.lectno and e.cmino=d.cmino
@ -1049,8 +1049,8 @@
,count(a.cdt) over() pagetotalcount ,count(a.cdt) over() pagetotalcount
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<isNotNull property="ustatus"> and d.status = #ustatus#</isNotNull> inner join users d on d.userno=a.userno and d.status &lt; 99
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>
@ -1096,35 +1096,33 @@
left outer join cminningscd cis on l.cmisno = cis.cmisno left outer join cminningscd cis on l.cmisno = cis.cmisno
left outer join lectinning li on a.lectno = li.lectno and cis.cmino = li.cmino left outer join lectinning li on a.lectno = li.lectno and cis.cmino = li.cmino
where a.status=1 and a.ischanged=0 where a.status = 1 and a.ischanged=0 and d.status &lt; 99
<isNotNull property="extype">and b.extype = #extype#</isNotNull> <isNotNull property="extype">and b.extype = #extype#</isNotNull>
<isNotNull property="cmno">and a.cmno = #cmno#</isNotNull> <isNotNull property="cmno">and a.cmno = #cmno#</isNotNull>
<isNotNull property="isrebate">and a.isrebate=#isrebate#</isNotNull> <isNotNull property="isrebate">and a.isrebate=#isrebate#</isNotNull>
<isNotNull property="edate">and (date_format((case when b2.cshape = 2 and f.eend is not null then f.eend else a.edate end),'%Y-%m-%d') = #edate#)</isNotNull> <isNotNull property="edate">and (date_format((case when b2.cshape = 2 and f.eend is not null then f.eend else a.edate end),'%Y-%m-%d') = #edate#)</isNotNull>
<isNotNull property="edate1">and ((case when b2.cshape = 2 and f.eend is not null then f.eend else a.edate end) >= #edate1#)</isNotNull> <isNotNull property="edate1">and ((case when b2.cshape = 2 and f.eend is not null then f.eend else a.edate end) >= #edate1#)</isNotNull>
<isNotNull property="edate2">and ((case when b2.cshape = 2 and f.eend is not null then f.eend else a.edate end) &lt;= #edate2#)</isNotNull> <isNotNull property="edate2">and ((case when b2.cshape = 2 and f.eend is not null then f.eend else a.edate end) &lt;= #edate2#)</isNotNull>
<isNotNull property="cshape">and b2.cshape = #cshape#</isNotNull> <isNotNull property="cshape">and b2.cshape = #cshape#</isNotNull>
<isNotEmpty property="cname">and b2.cname like concat('%',#cname#,'%')</isNotEmpty> <isNotEmpty property="cname">and b2.cname like concat('%',#cname#,'%')</isNotEmpty>
<isNotEmpty property="cnamestr">and b2.cname like concat('%',#cname#,'%')</isNotEmpty> <isNotEmpty property="cnamestr">and b2.cname like concat('%',#cname#,'%')</isNotEmpty>
<isNotNull property="iscomplete">and ifnull(a.iscomplete,0) = #iscomplete#</isNotNull> <isNotNull property="iscomplete">and ifnull(a.iscomplete,0) = #iscomplete#</isNotNull>
<isNotNull property="studyplace">and f.studyplace = #studyplace#</isNotNull> <isNotNull property="studyplace">and f.studyplace = #studyplace#</isNotNull>
<isNotEmpty property="usernamestr">and d.username like concat('%',#usernamestr#,'%')</isNotEmpty> <isNotEmpty property="usernamestr">and d.username like concat('%',#usernamestr#,'%')</isNotEmpty>
<isNotEmpty property="useridstr">and d.userid like concat('%',#useridstr#,'%')</isNotEmpty> <isNotEmpty property="useridstr">and d.userid like concat('%',#useridstr#,'%')</isNotEmpty>
<isNotEmpty property="searchtext"> <isNotEmpty property="searchtext">
<isEqual property="searchtype" compareValue="usernamestr">and d.username like concat('%',#usernamestr#,'%')</isEqual> <isEqual property="searchtype" compareValue="usernamestr">and d.username like concat('%',#usernamestr#,'%')</isEqual>
<isEqual property="searchtype" compareValue="useridstr">and d.userid like concat('%',#useridstr#,'%')</isEqual> <isEqual property="searchtype" compareValue="useridstr">and d.userid like concat('%',#useridstr#,'%')</isEqual>
</isNotEmpty> </isNotEmpty>
<isNotNull property="estate"> <isNotNull property="estate">
<isEqual property="estate" compareValue="0">and c.estart is null</isEqual> <isEqual property="estate" compareValue="0">and c.estart is null</isEqual>
<isEqual property="estate" compareValue="1">and c.estart is not null and c.eend is null</isEqual> <isEqual property="estate" compareValue="1">and c.estart is not null and c.eend is null</isEqual>
<isEqual property="estate" compareValue="2">and c.eend is not null</isEqual> <isEqual property="estate" compareValue="2">and c.eend is not null</isEqual>
</isNotNull> </isNotNull>
<isNotEmpty property="sdateall">and (case when b2.cshape = 0 and a.isrebate = 0 then p.payoktime else a.sdate end) &gt;= date_format(#sdateall#,'%Y-%m-%d 00:00:00')</isNotEmpty> <isNotEmpty property="sdateall">and (case when b2.cshape = 0 and a.isrebate = 0 then p.payoktime else a.sdate end) &gt;= date_format(#sdateall#,'%Y-%m-%d 00:00:00')</isNotEmpty>
<isNotEmpty property="edateall">and (case when b2.cshape = 2 then f.eend else a.edate end) &lt;= date_format(#edateall#,'%Y-%m-%d 23:59:59')</isNotEmpty> <isNotEmpty property="edateall">and (case when b2.cshape = 2 then f.eend else a.edate end) &lt;= date_format(#edateall#,'%Y-%m-%d 23:59:59')</isNotEmpty>
<isNotEmpty property="asname">and e.asname like concat('%',#asname#,'%')</isNotEmpty> <isNotEmpty property="asname">and e.asname like concat('%',#asname#,'%')</isNotEmpty>
<isNotNull property="mobile">and (cast(AES_DECRYPT(UNHEX(d.mobile), 'np123@!' ) as char) like concat('%',#mobile#,'%'))</isNotNull> <isNotNull property="mobile">and (cast(AES_DECRYPT(UNHEX(d.mobile), 'np123@!' ) as char) like concat('%',#mobile#,'%'))</isNotNull>
<isNotNull property="ustatus">and d.status = #ustatus#</isNotNull>
<isNotNull property="attendance" > <isNotNull property="attendance" >
<!--해당없음--> <!--해당없음-->
<isEqual property="attendance" compareValue="1" prepend="and"> ifnull(ce.isoffabs,0) = 0</isEqual> <isEqual property="attendance" compareValue="1" prepend="and"> ifnull(ce.isoffabs,0) = 0</isEqual>
@ -1391,9 +1389,9 @@
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<isNotNull property="ustatus"> and d.status = #ustatus#</isNotNull> inner join users d on d.userno=a.userno and d.status &lt; 99
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
<isNotNull property="sdtype">and b.sdtype=#sdtype#</isNotNull> <isNotNull property="sdtype">and b.sdtype=#sdtype#</isNotNull>
<isNotNull property="cmno">and a.cmno=#cmno# </isNotNull> <isNotNull property="cmno">and a.cmno=#cmno# </isNotNull>
@ -1501,12 +1499,12 @@
<isNotEmpty property="mobile">and cast(AES_DECRYPT(UNHEX(d.mobile), 'np123@!' ) as char) like concat('%',#mobile#,'%')</isNotEmpty> <isNotEmpty property="mobile">and cast(AES_DECRYPT(UNHEX(d.mobile), 'np123@!' ) as char) like concat('%',#mobile#,'%')</isNotEmpty>
</isNotNull> </isNotNull>
<isNotNull property="ustatus"> <isNotNull property="ustatus">
<isNotEmpty property="ustatus">and d.status = #ustatus#</isNotEmpty> <isNotEmpty property="ustatus">and d.status &lt; #ustatus#</isNotEmpty>
</isNotNull> </isNotNull>
<isNotNull property="cpointchk"> <isNotNull property="cpointchk">
<isEqual property="cpointchk" compareValue="0">and ifnull(c.cpoint,0) = 0</isEqual> <isEqual property="cpointchk" compareValue="0">and ifnull(c.cpoint,0) = 0</isEqual>
<isEqual property="cpointchk" compareValue="1">and ifnull(c.cpoint,0) > 0</isEqual> <isEqual property="cpointchk" compareValue="1">and ifnull(c.cpoint,0) > 0</isEqual>
<isNotEmpty property="ustatus">and d.status = #ustatus#</isNotEmpty> <isNotEmpty property="ustatus">and d.status &lt; #ustatus#</isNotEmpty>
</isNotNull> </isNotNull>
<isNotNull property="mosarate"> <isNotNull property="mosarate">
@ -1693,10 +1691,10 @@
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<isNotNull property="ustatus"> and d.status = #ustatus#</isNotNull> inner join users d on d.userno=a.userno and d.status &lt; 99
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>
group by a.lectno,a.userno,a.cmno,a.isrebate group by a.lectno,a.userno,a.cmno,a.isrebate
,b.sdno ,b.sdno
,c.cpoint,c.feedb,c.submittime,c.submitip,c.checktime,c.checkip ,c.cpoint,c.feedb,c.submittime,c.submitip,c.checktime,c.checkip