From 7a7f1af6500b734b9dde3ce8c73ae5c4cf92b085 Mon Sep 17 00:00:00 2001 From: kdh0120 Date: Fri, 13 Nov 2020 00:09:52 +0000 Subject: [PATCH] --- BO/Views/croom/grade0.cshtml | 4 ++++ Dao/MyBatis/Maps/Grade.xml | 40 ++++++++++++++++++++++++++++++++++++ Model/CM.cs | 1 + 3 files changed, 45 insertions(+) diff --git a/BO/Views/croom/grade0.cshtml b/BO/Views/croom/grade0.cshtml index f45d42a..0b90aaf 100644 --- a/BO/Views/croom/grade0.cshtml +++ b/BO/Views/croom/grade0.cshtml @@ -117,6 +117,10 @@ @((d.isrebate == 1 && Model.CMEV.finalrfd < 1) || (d.isrebate == 0 && Model.CMEV.final < 1) ? "-" : d.ex1cnt < 1 ? "-" : d.ex1lectcnt < 1 && d.ex1cnt > 0 ? "미제출" : d.ex1lectpoint.ToString()) @((d.isrebate == 1 && Model.CMEV.subjectrfd < 1) || (d.isrebate == 0 && Model.CMEV.subject < 1) ? "-" : d.sd0cnt < 1 ? "-" : d.sd0lectcnt < 1 && d.sd0cnt > 0 ? "미제출" : d.sd0lectpoint.ToString()) @((d.isrebate == 1 && Model.CMEV.discussrfd < 1) || (d.isrebate == 0 && Model.CMEV.discuss < 1) ? "-" : d.sd1cnt < 1 ? "-" : d.sd1lectcnt < 1 && d.sd1cnt > 0 ? "미제출" : d.sd1lectpoint.ToString())*@ + @if(Model.CMEV.isoffabs == 1) + { + @(d.ispassat == 1 ? "O" : "X") + } @(((d.apoint + d.mpoint + d.fpoint + d.spoint + d.dpoint)).ToString()) @Html.Raw(d.iscomplete == 1 ? string.Format("{1}", d.lectno, "수료") : d.iscompletename) diff --git a/Dao/MyBatis/Maps/Grade.xml b/Dao/MyBatis/Maps/Grade.xml index 963505f..cc9b507 100644 --- a/Dao/MyBatis/Maps/Grade.xml +++ b/Dao/MyBatis/Maps/Grade.xml @@ -25,8 +25,10 @@ ,case when case when b.isrebate=1 then d.finalcutrfd else d.finalcut end <= a.ex1lectpoint then 1 else 0 end ispassf ,case when case when b.isrebate=1 then d.subjectcutrfd else d.subjectcut end <= a.sd0lectpoint then 1 else 0 end ispasss ,case when case when b.isrebate=1 then d.discusscutrfd else d.discusscut end <= a.sd1lectpoint then 1 else 0 end ispassd + ,case when case when d.isoffabs=1 then ifnull(a.at0cnt,0) else 0 end <= ifnull(a.at0lectcnt,0) then 1 else 0 end ispassat ,case when + case when case when d.isoffabs=1 then ifnull(a.at0cnt,0) else 0 end <= ifnull(a.at0lectcnt,0) then 1 else 0 end = 1 and case when case when b.isrebate=1 then d.attendcutrfd else d.attendcut end <= b.attrate then 1 else 0 end =1 and case when case when b.isrebate=1 then d.midcutrfd else d.midcut end <= a.ex0lectpoint then 1 else 0 end =1 and case when case when b.isrebate=1 then d.finalcutrfd else d.finalcut end <= a.ex1lectpoint then 1 else 0 end =1 and @@ -46,6 +48,7 @@ ,sum(sd0cnt) sd0cnt,sum(sd0lectcnt) sd0lectcnt,sum(sd0lectpoint) sd0lectpoint ,sum(sd1cnt) sd1cnt,sum(sd1lectcnt) sd1lectcnt,sum(sd1lectpoint) sd1lectpoint ,sum(rs0cnt) rs0cnt,sum(rs0lectcnt) rs0lectcnt,sum(rs0lectpoint) rs0lectpoint + ,sum(at0cnt) at0cnt,sum(at0lectcnt) at0lectcnt from ( select a.lectno ,count(b.exno) ex0cnt,count(c.lectno) ex0lectcnt,avg(ifnull(c.tpoint,0) / b.tpoint * 100) ex0lectpoint @@ -53,6 +56,7 @@ ,0 sd0cnt,0 sd0lectcnt,0 sd0lectpoint ,0 sd1cnt,0 sd1lectcnt,0 sd1lectpoint ,0 rs0cnt,0 rs0lectcnt,0 rs0lectpoint + ,0 at0cnt,0 at0lectcnt from ( select b.lectno,a.cmno from cm a @@ -83,6 +87,7 @@ ,0,0,0 ,0,0,0 ,0,0,0 + ,0,0 from ( select b.lectno,a.cmno from cm a @@ -113,6 +118,7 @@ ,count(b.sdno),count(c.lectno),avg(ifnull(c.cpoint,0) / b.tpoint * 100) ,0,0,0 ,0,0,0 + ,0,0 from ( select b.lectno,a.cmno from cm a @@ -143,6 +149,7 @@ ,0,0,0 ,count(b.sdno),count(c.lectno),avg(ifnull(c.cpoint,0) / b.tpoint * 100) ,0,0,0 + ,0,0 from ( select b.lectno,a.cmno from cm a @@ -173,6 +180,7 @@ ,0,0,0 ,0,0,0 ,count(b.rsno),count(c.lectno),0 + ,0,0 from ( select b.lectno,a.cmno from cm a @@ -196,6 +204,37 @@ left outer join cmrs b on b.cmno=a.cmno and b.rstype=0 and b.isdel=0 left outer join lectrs c on c.lectno=a.lectno and c.rsno=b.rsno group by a.lectno + union all + select a.lectno + ,0,0,0 + ,0,0,0 + ,0,0,0 + ,0,0,0 + ,0,0,0 + ,count(b.cmino),count(c.lectno) + from ( + select b.lectno,a.cmno + from cm a + inner join lect b on b.cmno=a.cmno and b.status=1 and b.ischanged=0 + and b.lectno=#lectno# + and b.userno=#userno# + and b.attrate <= #attrateunder# + and b.isrebate=#isrebate# + and b.lectno in ($lectnos$) + inner join users c on c.userno=b.userno and c.status=1 + and c.userid=#userid# + and c.username=#username# + where a.ismaster=0 + and a.cgno=#cgno# + and a.tmno=#tmno# + and a.cmno=#cmno# + and a.cmno in ($cmnos$) + and a.cshape in ($cshapes$) + and a.isdel=0 + ) a + left outer join cminning b on b.cmno=a.cmno and b.isonline =0 + left outer join lectinning c on c.cmino=b.cmino and c.lectno = a.lectno and c.istatus = 2 + group by a.lectno ) a group by a.lectno ) a @@ -216,6 +255,7 @@ ,a.sd0cnt,a.sd0lectcnt,a.sd0lectpoint,a.spoint ,a.sd1cnt,a.sd1lectcnt,a.sd1lectpoint,a.dpoint ,a.rs0cnt,a.rs0lectcnt,a.rs0lectpoint + ,a.ispassat from ( ) a diff --git a/Model/CM.cs b/Model/CM.cs index 96849cd..10842c6 100644 --- a/Model/CM.cs +++ b/Model/CM.cs @@ -1051,6 +1051,7 @@ namespace NP.Model public String uduty { get; set; } public String lectnos { get; set; } public String cmnos { get; set; } + public int ispassat { get; set; } } /// /// 자격검정시험