From be128c771315ef4ca24ac7faa991f96006de0af5 Mon Sep 17 00:00:00 2001
From: jity7777 <jity7777  @example.com>
Date: Mon, 16 May 2022 06:55:12 +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:=20{4561}=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)=20Base/Controller/FOCommon.cs?=
 =?UTF-8?q?=20=20-=20pcmno=20=ED=8C=8C=EB=9D=BC=EB=A9=94=ED=84=B0=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80=20(2)=20Dao/MyBatis/Maps/Lect.xml=20=20-=20?=
 =?UTF-8?q?=EC=A1=B0=EA=B1=B4=20=EC=A1=B0=ED=9A=8C=20=EC=BF=BC=EB=A6=AC=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=20(3)=20FO/Views/Course/SmartSearch.cshtml?=
 =?UTF-8?q?=20=20-=20pcmno=20=ED=8C=8C=EB=9D=BC=EB=A9=94=ED=84=B0=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Base/Controller/FOCommon.cs        |  8 ++++----
 Dao/MyBatis/Maps/Lect.xml          | 33 +++++++++++++++++++++++++++---
 FO/Views/Course/SmartSearch.cshtml |  6 +++---
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/Base/Controller/FOCommon.cs b/Base/Controller/FOCommon.cs
index 468e9d6..b2bbe44 100644
--- a/Base/Controller/FOCommon.cs
+++ b/Base/Controller/FOCommon.cs
@@ -538,7 +538,7 @@ namespace NP.Base.Controllers
         }
 
         [HttpPost]
-        public JsonResult GetCheckLectIs(string man, string cgcode, string edu, string grade, int cmno)
+        public JsonResult GetCheckLectIs(string man, string cgcode, string edu, string grade, int cmno, int pcmno)
         {
             // 29:기본교육  ,30:최초교육    ,31:계속교육    ,32:안전관리계속교육(16시간)  ,33:PQ가점교육  ,34:기타교육    ,35:승급교육
             // 36:초급 ,37:중급 ,38:고급 ,39:특급
@@ -592,17 +592,17 @@ where t1.status = 1 and t4.pstatus= 1
 
                         if ((edu == "31" || edu == "35") && (grade == "38" || grade == "39")) // 계속교육, 승급교육 && 고급, 특급
                         {
-                            var lectCount = Dao.Get<int>("lect.count.user2", new Hashtable() { { "userno", userno }, { "cgcode", cgcode }, { "edu", edu }, { "grade", grade }, { "cmno", cmno } });
+                            var lectCount = Dao.Get<int>("lect.count.user2", new Hashtable() { { "userno", userno }, { "cgcode", cgcode }, { "edu", edu }, { "grade", grade }, { "cmno", cmno }, { "pcmno", pcmno } });
                             rst = lectCount.First();
                         }
                         else if((cgcode == "103" || cgcode == "104") && edu == "30") //  최초
                         {
-                            var lectCount = Dao.Get<int>("lect.count.user3", new Hashtable() { { "userno", userno }, { "cmno", cmno } });
+                            var lectCount = Dao.Get<int>("lect.count.user3", new Hashtable() { { "userno", userno }, { "cmno", cmno }, { "pcmno", pcmno } });
                             rst = lectCount.First();
                         }
                         else
                         {
-                            var lectCount = Dao.Get<int>("lect.count.user", new Hashtable() { { "userno", userno }, { "cgcode", cgcode }, { "edu", edu }, { "cmno", cmno } });
+                            var lectCount = Dao.Get<int>("lect.count.user", new Hashtable() { { "userno", userno }, { "cgcode", cgcode }, { "edu", edu }, { "cmno", cmno }, { "pcmno", pcmno } });
                             rst = lectCount.First();
                         }
                         
diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml
index b16b2fd..7a3ecb1 100644
--- a/Dao/MyBatis/Maps/Lect.xml
+++ b/Dao/MyBatis/Maps/Lect.xml
@@ -1968,7 +1968,9 @@
 			order by e.qno,e.qino
 		</select>
 		<select id="lect.count.user" parameterClass="hashtable" resultClass="int">
-			select count(t1.lectno) * (case when t2.pcmno = (select pcmno from cm where cmno=#cmno#) then -1 else 1 end) <!--t5.typegrade, t5.typeman, t5.typeedu, t3.cgcode, t1.lectno, t1.userno-->
+			select max(lectCnt) * min(checkNum)
+			from (
+			select count(t1.lectno) as lectCnt, 1 as checkNum
 			from lect t1
 			inner join cm t2 on t1.cmno = t2.cmno
 			inner join cg t3 on t2.cgno= t3.cgno
@@ -1983,10 +1985,19 @@
 				<isNotEqual property="cgcode" compareValue="105">and t3.cgcode in (103,104)</isNotEqual>
 				<Equal property="cgcode" compareValue="105">and t3.cgcode = 105</Equal>
 			</isNotEmpty>
+			union
+			select 0 as lectCnt, (case when count(t1.lectno) > 0 then -1 else 1 end) as checkNum
+			from lect t1
+			inner join cm t2 on t1.cmno = t2.cmno
+			inner join cg t3 on t2.cgno= t3.cgno
+			where t2.isdel= 0 and t2.isuse= 1 and t2.ismaster = 0 and t1.userno = #userno#  and t2.pcmno = #pcmno#
+			)t
 		</select>
 
 		<select id="lect.count.user2" parameterClass="hashtable" resultClass="int">
-			select count(t1.lectno) *  (case when t2.pcmno = (select pcmno from cm where cmno=#cmno#) then -1 else 1 end)<!--t5.typegrade, t5.typeman, t5.typeedu, t3.cgcode, t1.lectno, t1.userno-->
+			select max(lectCnt) * min(checkNum)
+			from (
+			select count(t1.lectno) as lectCnt, 1 as checkNum
 			from lect t1
 			inner join cm t2 on t1.cmno = t2.cmno
 			inner join cg t3 on t2.cgno= t3.cgno
@@ -1994,10 +2005,19 @@
 			inner join pplog t5 on t1.cmno= t5.cmno and t1.userno = t5.userno and t4.pplno = t5.pplno
 			where (t1.status = 1 or t1.status = 2) and (t4.pstatus= 1 or t4.pstatus=22) and t3.cgcode in (103,104,105) and t5.typegrade = #grade# and t5.typeedu = #edu#
 			and t1.userno = #userno# and t5.typeman = 28
+			union
+			select 0 as lectCnt, (case when count(t1.lectno) > 0 then -1 else 1 end) as checkNum
+			from lect t1
+			inner join cm t2 on t1.cmno = t2.cmno
+			inner join cg t3 on t2.cgno= t3.cgno
+			where t2.isdel= 0 and t2.isuse= 1 and t2.ismaster = 0 and t1.userno = #userno#  and t2.pcmno = #pcmno#
+			)t
 		</select>
 
 		<select id="lect.count.user3" parameterClass="hashtable" resultClass="int">
-			select count(t1.lectno) *  (case when t2.pcmno = (select pcmno from cm where cmno=#cmno#) then -1 else 1 end)<!--t5.typegrade, t5.typeman, t5.typeedu, t3.cgcode, t1.lectno, t1.userno-->
+			select max(lectCnt) * min(checkNum)
+			from (
+			select count(t1.lectno) as lectCnt, 1 as checkNum
 			from lect t1
 			inner join cm t2 on t1.cmno = t2.cmno
 			inner join cg t3 on t2.cgno= t3.cgno
@@ -2005,6 +2025,13 @@
 			inner join pplog t5 on t1.cmno= t5.cmno and t1.userno = t5.userno and t4.pplno = t5.pplno
 			where  (t1.status = 1 or t1.status = 2) and (t4.pstatus= 1 or t4.pstatus=22) and t3.cgcode in (103,104) and t5.typeedu = 30
 			and t1.userno = #userno# and t5.typeman = 28
+			union
+			select 0 as lectCnt, (case when count(t1.lectno) > 0 then -1 else 1 end) as checkNum
+			from lect t1
+			inner join cm t2 on t1.cmno = t2.cmno
+			inner join cg t3 on t2.cgno= t3.cgno
+			where t2.isdel= 0 and t2.isuse= 1 and t2.ismaster = 0 and t1.userno = #userno#  and t2.pcmno = #pcmno#
+			)t
 		</select>
 	</statements>
 </sqlMap>
diff --git a/FO/Views/Course/SmartSearch.cshtml b/FO/Views/Course/SmartSearch.cshtml
index 289c094..6251f51 100644
--- a/FO/Views/Course/SmartSearch.cshtml
+++ b/FO/Views/Course/SmartSearch.cshtml
@@ -368,7 +368,7 @@
 
     function applyClass(cmno, pcmno) {
         if (@ViewBag.SSUserNo > 0) {
-            checkLectComplete(cmno, "@Model.stringval3", "@Model.stringval4", "@Model.stringval5", $("#pcmno_" + pcmno + "_cgcode").val(), "chkLect");
+            checkLectComplete(cmno, "@Model.stringval3", "@Model.stringval4", "@Model.stringval5", $("#pcmno_" + pcmno + "_cgcode").val(), pcmno, "chkLect");
         }
         else {
             msg("로그인 후 신청 할 수 있습니다.");
@@ -376,9 +376,9 @@
         }
     }
 
-    function checkLectComplete(cmno, man, edu, grade, cgcode) {
+    function checkLectComplete(cmno, man, edu, grade, cgcode, pcmno) {
         _cmno = cmno;
-        capp("/focommon/GetCheckLectIs", { cmno: cmno, man: man, edu: edu, grade: grade, cgcode: cgcode }, "chkLect"); // 1
+        capp("/focommon/GetCheckLectIs", { cmno: cmno, man: man, edu: edu, grade: grade, cgcode: cgcode, pcmno: pcmno }, "chkLect"); // 1
         @*capResult.code == code;*@
     }