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

<기능개선> 

1. PMS NO : 7801
2. (주요)작업내용 
(1) 사용자 : 안전관리계속(16시간)교육 관련 표기관련 문구 수정
(2) 관리자 : 결제목록 최초 환불요청건 표기
(3) 성적처리(전체) : 집합교육 관련 필터 추가
This commit is contained in:
jity7777 2023-04-26 04:32:02 +00:00
parent f582536326
commit 69eff5aa75
11 changed files with 97 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
BO/Controllers/croomController.cs
View File

@ -627,13 +627,14 @@ namespace NP.BO.Controllers
if (searchCheck)
{
if (SUserInfo.UserNo != 27460 && SUserInfo.UserNo != 31049 && SUserInfo.UserNo != 110 && SUserInfo.UserNo != 163)
if (true) // SUserInfo.UserNo != 27460 && SUserInfo.UserNo != 31049 && SUserInfo.UserNo != 110 && SUserInfo.UserNo != 163
{
vm.Lects = Dao.Get<Lect>("grade.lectgradesToAll", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "ustatus", 1 }, { "isrebate", vm.addstringval }, { "iscomplete", vm.addstringval2 }, { "cmisno", vm.addstringval3 }, { "ispasss", vm.addstringval4 }, { "ispassa", vm.addstringval5 }, { "ispassex", vm.addstringval6 }, { "usernameid", vm.addstringval7 }, { "orderby", "ua.asname,ua.asno,u.username" } });
//vm.Lects = Dao.Get<Lect>("grade.lectgrades", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "ustatus", 1 }, { "isrebate", vm.addstringval }, { "iscomplete", vm.addstringval2 }, { "cmisno", vm.addstringval3 }, { "ispasss", vm.addstringval4 }, { "ispassa", vm.addstringval5 }, { "ispassex", vm.addstringval6 }, { "usernameid", vm.addstringval7 }, { "orderby", "ua.asname,ua.asno,u.username" } });
}
else
{
// 사용안함
vm.Lects = Dao.Get<Lect>("grade.lectgradesToAll2", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "ustatus", 1 }, { "isrebate", vm.addstringval }, { "iscomplete", vm.addstringval2 }, { "cmisno", vm.addstringval3 }, { "ispasss", vm.addstringval4 }, { "ispassa", vm.addstringval5 }, { "ispassex", vm.addstringval6 }, { "usernameid", vm.addstringval7 }, { "orderby", "ua.asname,ua.asno,u.username" } });
}
@ -747,6 +748,17 @@ namespace NP.BO.Controllers
ht.Add("edateall", vm.stringval9);
ht.Add("asname", vm.stringval10);
ht.Add("mobile", vm.stringval11);
ht.Add("attendance", vm.stringval13);
/*
* Dictionary<int, string> attendance = new Dictionary<int, string>() <= stringval13
{
{ 0, "전체"}
, { 1, "해당없음"}
, { 2, "대상자(미입력/출석)"}
, { 3, "미입력"}
, { 4, "출석"}
};
*/
if (!string.IsNullOrEmpty(vm.stringval11))
{
var mobile_temp = vm.stringval11.Replace("-", "");
@ -793,7 +805,7 @@ namespace NP.BO.Controllers
//ht.Add("ustatus", 1);
ht.Add("orderby", "ua.asname,ua.asno,u.username");
if (SUserInfo.UserNo != 27460 && SUserInfo.UserNo != 31049 && SUserInfo.UserNo != 110 && SUserInfo.UserNo != 163)
if (true) // SUserInfo.UserNo != 27460 && SUserInfo.UserNo != 31049 && SUserInfo.UserNo != 110 && SUserInfo.UserNo != 163
{
vm.Lects = Dao.Get<Lect>("grade.lectgradesToAll", ht);
@ -818,6 +830,7 @@ namespace NP.BO.Controllers
}
else
{
//사용안함
vm.Lects = Dao.Get<Lect>("grade.lectgradesToAll2", ht);
if (vm.isexceldown == 1)
@ -909,6 +922,7 @@ namespace NP.BO.Controllers
if (!IsPost())
{
vm.pagerowcount = 50;
vm.stringval4 = "1";
//vm.stringval = DateTime.Now.ToString("yyyy-MM-01");
//vm.stringval2 = Convert.ToDateTime(vm.stringval).AddMonths(1).AddSeconds(-1).ToString("yyyy-MM-dd");
}

22
BO/Views/croom/gradeall.cshtml
View File

@ -79,6 +79,28 @@
@Html.Partial("./Partial/Text", Model.stringval11, Helpers.DicText(new NP.Model.TextDic() { Name = "stringval11", Style = "width:70%; display:inline-block;", Value = Model.stringval11, CssClass = "esitem" }))
</div>
</td>
<th>집합교육</th>
<td>
@{
Dictionary<int, string> attendance = new Dictionary<int, string>()
{
{ 0, "전체"}
, { 1, "해당없음"}
, { 2, "대상자(미입력/출석/결석)"}
, { 3, "미입력"}
, { 4, "출석"}
, { 5, "결석"}
};
}
<div class="col-md-12">
<select id="stringval13" name="stringval13" class="form-control dev ">
@foreach (var item in attendance)
{
<option value="@item.Key" @(Model.stringval13 == item.Key.ToString() ? "selected" : "")>@item.Value</option>
}
</select>
</div>
</td>
</tr>
</table>
</div>

4
BO/Web.config
View File

@ -55,8 +55,8 @@
<!--<add key="talk" value="https://alimtalk-api.bizmsg.kr/v2/sender/send,?,?,?,?,?,023103312" />-->
<!--<add key="configpath" value="Product" />-->
<add key="configpath" value="ProductDev" />
<!--<add key="configpath" value="staging" />-->
<!--<add key="configpath" value="ProductDev" />-->
<add key="configpath" value="staging" />
<add key="lgdacomConfigPath" value="D:\3rdparti\lgdacomyicte" />

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

@ -1327,6 +1327,19 @@
<isNotNull property="asname" prepend="and">ua.asname like concat('%',#asname#,'%')</isNotNull>
<isNotNull property="edate" prepend="and">date_format((case when c.cshape = 2 and e.eend is not null then e.eend else b.edate end),'%Y-%m-%d') = #edate#</isNotNull>
<isNotNull property="mobile" prepend="and">cast(AES_DECRYPT(UNHEX(u.mobile), 'np123@!' ) as char) like concat('%',#mobile#,'%')</isNotNull>
<isNotNull property="attendance" >
<!--해당없음-->
<isEqual property="attendance" compareValue="1" prepend="and"> ifnull(d.isoffabs,0) = 0</isEqual>
<!--대상자(미입력/출석)-->
<isEqual property="attendance" compareValue="2" prepend="and"> ifnull(d.isoffabs,0) = 1</isEqual>
<!--미입력-->
<isEqual property="attendance" compareValue="3" prepend="and"> ifnull(d.isoffabs,0) = 1 and f.istatus is null </isEqual>
<!--출석-->
<isEqual property="attendance" compareValue="4" prepend="and"> ifnull(d.isoffabs,0) = 1 and ifnull(f.istatus,-1) = 2</isEqual>
<!--결석-->
<isEqual property="attendance" compareValue="5" prepend="and"> ifnull(d.isoffabs,0) = 1 and ifnull(f.istatus,-1) = 0</isEqual>
</isNotNull>
</dynamic>
) a
<include refid="sql.pagedynamic"></include>
@ -1620,6 +1633,19 @@
<isNotNull property="asname" prepend="and">a.asname like concat('%',#asname#,'%')</isNotNull>
<isNotNull property="edate" prepend="and">date_format((case when a.cshape = 2 and a.eend is not null then a.eend else b.edate end),'%Y-%m-%d') = #edate#</isNotNull>
<isNotNull property="mobile" prepend="and">a.mobile like concat('%',#mobile#,'%')</isNotNull>
<isNotNull property="attendance" >
<!--해당없음-->
<isEqual property="attendance" compareValue="1" prepend="and"> ifnull(a.isoffabs,0) = 0</isEqual>
<!--대상자(미입력/출석)-->
<isEqual property="attendance" compareValue="2" prepend="and"> ifnull(a.isoffabs,0) = 1</isEqual>
<!--미입력-->
<isEqual property="attendance" compareValue="3" prepend="and"> ifnull(a.isoffabs,0) = 1 and f.istatus is null </isEqual>
<!--출석-->
<isEqual property="attendance" compareValue="4" prepend="and"> ifnull(a.isoffabs,0) = 1 and ifnull(f.istatus,-1) = 2</isEqual>
<!--결석-->
<isEqual property="attendance" compareValue="5" prepend="and"> ifnull(a.isoffabs,0) = 1 and ifnull(f.istatus,-1) = 0</isEqual>
</isNotNull>
</dynamic>
)a
<include refid="sql.pagedynamic"></include>

2
FO/Views/CRoom/Index.cshtml
View File

@ -65,7 +65,7 @@
{
<div class="lctcScore">
<div class="lctCont" style="padding-bottom:0">
@if (Model.Lect.isoffabs != null)
@if (Model.Lect.isoffabs != null && Model.Lect.typeedu != 32)
{
<h5>집체교육 안내</h5>
<table>

11
FO/Views/Course/ApplyAgree.cshtml
View File

@ -52,7 +52,12 @@
strEduInfo += string.Format("<span> 교육종료일 {0} </span> | ", Model.SelectCMInningscd.eend2);
strEduInfo += string.Format("{0}시간과정 |", Model.CM.studytime);
strEduInfo += string.Format("<span class='red'> {0}과정 </span><br />", (Model.CM.isrefund == 1 ? "환급" : "비환급"));
strEduInfo += string.Format("<span style='margin-left:5px;' class='red'>집체교육 참석일 : {0}</span><br />", Model.SelectCMInningscd.estart.ToString("yyyy년 MM월 dd일"));
if (Model.CM.typeedu != "32")
{
strEduInfo += string.Format("<span style='margin-left:5px;' class='red'>집체교육 참석일 : {0}</span><br />", Model.SelectCMInningscd.estart.ToString("yyyy년 MM월 dd일"));
}
strEduInfo += string.Format("<span style='margin-left:5px;'>교육비 : {0}원</span>", Model.CM.infee.ToString("#,0"));
@ -220,11 +225,13 @@
온라인교육은 신청일로 부터 <span class="subTxt red">최대 1년 이내</span>에 수료하셔야 하며 <span class="subTxt red">1년 이내</span>에 교육수료가 되지 않으면 수료 및 환불이 불가능합니다.
</p>
if (Model.CM.typeedu != "32")
{
<h4 class="clsTitle">집체교육(7시간)일정 관련 안내</h4>
<p class="subTxt">
교육 신청 시 지정하신 집체교육일에 접수인원이 적은 경우 해당 일자의 집체교육은 폐강되어 다른 일정으로 변경 하셔야 될 수도 있습니다. 꼭! 참고 부탁 드립니다.
</p>
}
}
<h4 class="clsTitle">주의사항</h4>
<p class="subTxt" style="border: 3px solid red; padding: 5px; margin: 10px;">

7
FO/Views/Course/ApplyComplete.cshtml
View File

@ -53,7 +53,12 @@ else
strEduInfo += string.Format("<span> 교육종료일 {0} </span> | ", Model.SelectCMInningscd.eend2);
strEduInfo += string.Format("{0}시간과정 |", Model.CM.studytime);
strEduInfo += string.Format("<span class='red'> {0}과정 </span><br />", (Model.CM.isrefund == 1 ? "환급" : "비환급"));
strEduInfo += string.Format("<span style='margin-left:5px;' class='red'>집체교육 참석일 : {0}</span><br />", Model.SelectCMInningscd.estart.ToString("yyyy년 MM월 dd일"));
if (Model.CM.typeedu != "32")
{
strEduInfo += string.Format("<span style='margin-left:5px;' class='red'>집체교육 참석일 : {0}</span><br />", Model.SelectCMInningscd.estart.ToString("yyyy년 MM월 dd일"));
}
strEduInfo += string.Format("<span style='margin-left:5px;'>교육비 : {0}원</span>", Model.CM.infee.ToString("#,0"));

7
FO/Views/Course/ApplyEdu.cshtml
View File

@ -68,7 +68,12 @@
strEduInfo += string.Format("<span> 교육종료일 {0} </span> | ", Model.SelectCMInningscd.eend2);
strEduInfo += string.Format("{0}시간과정 |", Model.CM.studytime);
strEduInfo += string.Format("<span class='red'> {0}과정 </span><br />", (Model.CM.isrefund == 1 ? "환급" : "비환급"));
strEduInfo += string.Format("<span style='margin-left:5px;' class='red'>집체교육 참석일 : {0}</span><br />", Model.SelectCMInningscd.estart.ToString("yyyy년 MM월 dd일"));
if(Model.CM.typeedu != "32")
{
strEduInfo += string.Format("<span style='margin-left:5px;' class='red'>집체교육 참석일 : {0}</span><br />", Model.SelectCMInningscd.estart.ToString("yyyy년 MM월 dd일"));
}
strEduInfo += string.Format("<span style='margin-left:5px;'>교육비 : {0}원</span>", Model.CM.infee.ToString("#,0"));
}

7
FO/Views/Course/ApplyPay.cshtml
View File

@ -71,7 +71,12 @@
strEduInfo += string.Format("<span> 교육종료일 {0} </span> | ", Model.SelectCMInningscd.eend2);
strEduInfo += string.Format("{0}시간과정 |", Model.CM.studytime);
strEduInfo += string.Format("<span class='red'> {0}과정 </span><br />", (Model.CM.isrefund == 1 ? "환급" : "비환급"));
strEduInfo += string.Format("<span style='margin-left:5px;' class='red'>집체교육 참석일 : {0}</span><br />", Model.SelectCMInningscd.estart.ToString("yyyy년 MM월 dd일"));
if (Model.CM.typeedu != "32")
{
strEduInfo += string.Format("<span style='margin-left:5px;' class='red'>집체교육 참석일 : {0}</span><br />", Model.SelectCMInningscd.estart.ToString("yyyy년 MM월 dd일"));
}
strEduInfo += string.Format("<span style='margin-left:5px;'>교육비 : {0}원</span>", Model.CM.infee.ToString("#,0"));
//strEduInfo = string.Format("교육기간 {0} |<span class='red'> 교육종료일 {1} </span> | {2}시간과정 |<span class='red'> {3}과정 </span><br /><span style='margin-left:5px;'>교육비 : {4}원</span>",

2
FO/Views/Course/SmartSearch.cshtml
View File

@ -405,7 +405,7 @@
else if (cshape == 2 && typeedu == "32") //온라인 & 안전관리계속교육
{
strTmp = "※ <span style='font-weight: bold; font-size: 12pt;'>교육비 입금과 동시에 동영상강의 시청이 가능합니다.</span><br>" +
"</div><br><span class='clsTitle'>교육종료일(집체교육 참석일)을 선택하여 주세요.</span>";
"</div><br><span class='clsTitle'>교육종료일을 선택하여 주세요.</span>";
}
else if (cshape == 2) //온라인
{

4
FO/Web.config
View File

@ -41,8 +41,8 @@
<add key="daokey" value="ynictelms2020" />
<!--<add key="configpath" value="Product" />-->
<!--<add key="configpath" value="ProductDev" />-->
<add key="configpath" value="Staging" />
<add key="configpath" value="ProductDev" />
<!--<add key="configpath" value="Staging" />-->
<add key="thumbnailexe" value="D:\\dev_tool\\ffmpeg.exe" />