From 59a296b9fbaa5fe2a9b51a772d113b0af857e3d7 Mon Sep 17 00:00:00 2001 From: jity7777 Date: Thu, 7 Mar 2024 04:00:19 +0000 Subject: [PATCH] =?UTF-8?q?<=EA=B8=B0=EB=8A=A5=EA=B0=9C=EC=84=A0>=201.=20P?= =?UTF-8?q?MS=20NO=20:=204451=202.=20(=EC=A3=BC=EC=9A=94)=EC=9E=91?= =?UTF-8?q?=EC=97=85=EB=82=B4=EC=9A=A9=20(1)=20=EB=B9=84=ED=99=9C=EC=84=B1?= =?UTF-8?q?=EA=B3=84=EC=A0=95=EC=9D=98=20=EC=A0=95=EB=B3=B4=EB=A5=BC=20?= =?UTF-8?q?=EB=85=B8=EC=B6=9C=ED=95=A0=20=EC=88=98=20=EC=9E=88=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20users=EC=9D=98=20status=20=3D=201=20=EC=9D=B4=20?= =?UTF-8?q?=EC=95=84=EB=8B=8C=20status=20<=2099=20=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BO/Controllers/croomController.cs | 6 +-- Dao/MyBatis/Maps/CM.xml | 2 +- Dao/MyBatis/Maps/Grade.xml | 6 +-- Dao/MyBatis/Maps/Lect.xml | 80 +++++++++++++++---------------- 4 files changed, 46 insertions(+), 48 deletions(-) diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index 5c50a46..19d1043 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -655,7 +655,7 @@ namespace NP.BO.Controllers break; case 1: { - vm.Lects = Dao.Get("lect.atts", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "status", 1 }, { "ustatus", 1 }, { "isrebate", vm.addstringval } }); + vm.Lects = Dao.Get("lect.atts", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "status", 1 }, { "ustatus", 9 }, { "isrebate", vm.addstringval } }); vm.pagetotalcount = GetCount(vm.Lects.FirstOrDefault()); vm.CMInnings = Dao.Get("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() { }; if (vm.CMEXes.Count() > 0) { - vm.LectEXes = Dao.Get("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("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); } @@ -782,7 +782,7 @@ namespace NP.BO.Controllers ht.Add("ustatus", 0); } else { - ht.Add("ustatus", 1); + ht.Add("ustatus", 99); } if (!string.IsNullOrEmpty(vm.stringval6)) diff --git a/Dao/MyBatis/Maps/CM.xml b/Dao/MyBatis/Maps/CM.xml index 8199faa..df9de7d 100644 --- a/Dao/MyBatis/Maps/CM.xml +++ b/Dao/MyBatis/Maps/CM.xml @@ -524,7 +524,7 @@ 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 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 < 99 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 g on g.fgno=a.fgnooff and g.isdel=0 diff --git a/Dao/MyBatis/Maps/Grade.xml b/Dao/MyBatis/Maps/Grade.xml index 5bc74c2..acf06e2 100644 --- a/Dao/MyBatis/Maps/Grade.xml +++ b/Dao/MyBatis/Maps/Grade.xml @@ -1052,7 +1052,7 @@ from cm a 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 users c on c.userno=b.userno and c.status=1 + inner join users c on c.userno=b.userno and c.status < 99 inner join pay p on p.payno=b.payno left outer join cminningscd e on e.cmisno = b.cmisno where a.ismaster=0 and a.isdel=0 @@ -1092,7 +1092,7 @@ from cm a 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 users c on c.userno=b.userno and c.status=1 + inner join users c on c.userno=b.userno and c.status < 99 inner join pay p on p.payno=b.payno left outer join cminningscd e on e.cmisno = b.cmisno 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 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 < 99 AND c.ismaster=0 AND c.isdel=0 AND l.status = 1 AND l.ischanged = 0 u.username like concat('%',#usernamestr#,'%') u.userid like concat('%',#useridstr#,'%') diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml index e598e94..c0c48df 100644 --- a/Dao/MyBatis/Maps/Lect.xml +++ b/Dao/MyBatis/Maps/Lect.xml @@ -923,7 +923,7 @@ ,row_number() over(order by $orderby$b.username) rno ,count(a.cdt) over() pagetotalcount from lect a - inner join users b on b.userno=a.userno and b.status=#ustatus# + inner join users b on b.userno=a.userno and b.status < 99 left outer join assign c on c.asno=b.asno inner join cminning d on d.cmno=a.cmno left outer join lectinning e on e.lectno=a.lectno and e.cmino=d.cmino @@ -1049,8 +1049,8 @@ ,count(a.cdt) over() pagetotalcount from lect a inner join cmex b on b.isdel=0 and b.exno=#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 and d.status = #ustatus# + left outer join lectex c on c.lectno=a.lectno and c.exno=b.exno + inner join users d on d.userno=a.userno and d.status < 99 left outer join assign e on e.asno=d.asno where a.status=1 and a.ischanged=0 and b.extype = #extype# @@ -1090,41 +1090,39 @@ left outer join assign e on e.asno = d.asno left outer join cminningscd f on f.cmisno = a.cmisno left outer join comcode g on g.ccode = f.studyplace and g.isuse =1 - + left outer join cmev ce on b2.cmno=ce.cmno left outer join lect l on a.lectno = l.lectno 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 - where a.status=1 and a.ischanged=0 + where a.status = 1 and a.ischanged=0 and d.status < 99 and b.extype = #extype# - and a.cmno = #cmno# - and a.isrebate=#isrebate# - 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#) - and ((case when b2.cshape = 2 and f.eend is not null then f.eend else a.edate end) >= #edate1#) - and ((case when b2.cshape = 2 and f.eend is not null then f.eend else a.edate end) <= #edate2#) - and b2.cshape = #cshape# - and b2.cname like concat('%',#cname#,'%') - and b2.cname like concat('%',#cname#,'%') - and ifnull(a.iscomplete,0) = #iscomplete# - and f.studyplace = #studyplace# - and d.username like concat('%',#usernamestr#,'%') - and d.userid like concat('%',#useridstr#,'%') - - and d.username like concat('%',#usernamestr#,'%') - and d.userid like concat('%',#useridstr#,'%') - - - and c.estart is null - and c.estart is not null and c.eend is null - and c.eend is not null - - and (case when b2.cshape = 0 and a.isrebate = 0 then p.payoktime else a.sdate end) >= date_format(#sdateall#,'%Y-%m-%d 00:00:00') - and (case when b2.cshape = 2 then f.eend else a.edate end) <= date_format(#edateall#,'%Y-%m-%d 23:59:59') - and e.asname like concat('%',#asname#,'%') - and (cast(AES_DECRYPT(UNHEX(d.mobile), 'np123@!' ) as char) like concat('%',#mobile#,'%')) - and d.status = #ustatus# - + and a.cmno = #cmno# + and a.isrebate=#isrebate# + 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#) + and ((case when b2.cshape = 2 and f.eend is not null then f.eend else a.edate end) >= #edate1#) + and ((case when b2.cshape = 2 and f.eend is not null then f.eend else a.edate end) <= #edate2#) + and b2.cshape = #cshape# + and b2.cname like concat('%',#cname#,'%') + and b2.cname like concat('%',#cname#,'%') + and ifnull(a.iscomplete,0) = #iscomplete# + and f.studyplace = #studyplace# + and d.username like concat('%',#usernamestr#,'%') + and d.userid like concat('%',#useridstr#,'%') + + and d.username like concat('%',#usernamestr#,'%') + and d.userid like concat('%',#useridstr#,'%') + + + and c.estart is null + and c.estart is not null and c.eend is null + and c.eend is not null + + and (case when b2.cshape = 0 and a.isrebate = 0 then p.payoktime else a.sdate end) >= date_format(#sdateall#,'%Y-%m-%d 00:00:00') + and (case when b2.cshape = 2 then f.eend else a.edate end) <= date_format(#edateall#,'%Y-%m-%d 23:59:59') + and e.asname like concat('%',#asname#,'%') + and (cast(AES_DECRYPT(UNHEX(d.mobile), 'np123@!' ) as char) like concat('%',#mobile#,'%')) ifnull(ce.isoffabs,0) = 0 @@ -1391,9 +1389,9 @@ inner join cmsd b on b.isdel=0 and b.cmno = a.cmno and b.sdno=#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 - inner join users d on d.userno=a.userno and d.status = #ustatus# - left outer join assign e on e.asno=d.asno - left outer join mch_source_v_lectsd_list f on f.DOC_ID = concat(b.sdno ,'_',a.lectno ) + inner join users d on d.userno=a.userno and d.status < 99 + left outer join assign e on e.asno=d.asno + left outer join mch_source_v_lectsd_list f on f.DOC_ID = concat(b.sdno ,'_',a.lectno ) where a.status=1 and a.ischanged=0 and b.sdtype=#sdtype# and a.cmno=#cmno# @@ -1501,12 +1499,12 @@ and cast(AES_DECRYPT(UNHEX(d.mobile), 'np123@!' ) as char) like concat('%',#mobile#,'%') - and d.status = #ustatus# + and d.status < #ustatus# and ifnull(c.cpoint,0) = 0 and ifnull(c.cpoint,0) > 0 - and d.status = #ustatus# + and d.status < #ustatus# @@ -1693,10 +1691,10 @@ inner join cmsd b on b.isdel=0 and b.sdno=#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 - inner join users d on d.userno=a.userno and d.status = #ustatus# - left outer join assign e on e.asno=d.asno - where a.cmno=#cmno# and a.status=1 and a.ischanged=0 - and a.isrebate=#isrebate# + inner join users d on d.userno=a.userno and d.status < 99 + left outer join assign e on e.asno=d.asno + where a.cmno=#cmno# and a.status=1 and a.ischanged=0 + and a.isrebate=#isrebate# group by a.lectno,a.userno,a.cmno,a.isrebate ,b.sdno ,c.cpoint,c.feedb,c.submittime,c.submitip,c.checktime,c.checkip