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

This commit is contained in:
kdh0120 2021-06-30 06:31:47 +00:00
parent 0e26a9c444
commit 8562c0630b
8 changed files with 10 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
BO/Views/croom/completions.cshtml
View File

@ -112,6 +112,7 @@
<thead> <thead>
<tr> <tr>
<th>수정</th> <th>수정</th>
<th>등록/수정일자</th>
<th>사용자ID</th> <th>사용자ID</th>
<th>이름</th> <th>이름</th>
<th>주민번호</th> <th>주민번호</th>
@ -126,29 +127,6 @@
<th>교육종료일</th> <th>교육종료일</th>
<th>과정명</th> <th>과정명</th>
<th>수료번호</th> <th>수료번호</th>
<th>교육상위분류</th>
<th>교육하위분류</th>
<th>업체명</th>
<th>업체주소</th>
<th>사업자등록번호</th>
<th>고용보험관리번호</th>
<th>업태</th>
<th>종목</th>
<th>대표자</th>
<th>교육이수시간</th>
<th>소속협회</th>
<th>학력</th>
<th>직위</th>
<th>업체담당자</th>
<th>업체담당자연락처</th>
<th>교육비</th>
<th>환급액</th>
<th>환급은행명</th>
<th>환급계좌</th>
<th>환급계좌예금주</th>
<th>계산서이메일</th>
<th>교육연도</th>
<th>교육장</th>
</tr> </tr>
</thead> </thead>
<tbody class="data" id="tbody1"> <tbody class="data" id="tbody1">
@ -156,6 +134,7 @@
{ {
<tr> <tr>
<td class="link"><a href="#" onclick="viewcompletion(@item.lectno)">[수정]</a></td> <td class="link"><a href="#" onclick="viewcompletion(@item.lectno)">[수정]</a></td>
<td>@(item.udt == null ? "-" : item.udt.ToString("yyyy-MM-dd"))</td>
<td>@item.userid</td> <td>@item.userid</td>
<td>@item.username</td> <td>@item.username</td>
<td>@item.userpnostr</td> <td>@item.userpnostr</td>
@ -170,29 +149,6 @@
<td>@Convert.ToDateTime(@item.edate).ToShortDateString()</td> <td>@Convert.ToDateTime(@item.edate).ToShortDateString()</td>
<td>@item.cname</td> <td>@item.cname</td>
<td>@item.completeno</td> <td>@item.completeno</td>
<td>@item.pcgname</td>
<td>@item.cgname</td>
<td>@item.asname</td>
<td>@item.companyaddr </td>
<td>@item.brno</td>
<td>@item.eino</td>
<td>@item.btype</td>
<td>@item.bkind</td>
<td>@item.ceoname</td>
<td>@item.studytime</td>
<td>@item.association</td>
<td>@item.slevelName</td>
<td>@item.uduty</td>
<td>@item.mname</td>
<td>@item.mphone</td>
<td>@item.payamt</td>
<td>@item.rbankamt</td>
<td>@item.rbank</td>
<td>@item.rbankaccnum</td>
<td>@item.rbankuser</td>
<td>@item.taxemail</td>
<td>@item.tyear</td>
<td>@item.studyplaceName</td>
</tr> </tr>
} }
</tbody> </tbody>

44
BO/Views/croom/documentspast.cshtml
View File

@ -125,28 +125,6 @@
<th>교육종료일</th> <th>교육종료일</th>
<th>과정명</th> <th>과정명</th>
<th>수료번호</th> <th>수료번호</th>
<th>구분</th>
<th>과정분류</th>
<th>업체명</th>
<th>업체주소</th>
<th>사업자등록번호</th>
<th>고용보험관리번호</th>
<th>업태</th>
<th>종목</th>
<th>대표자</th>
<th>교육이수시간</th>
<th>소속협회</th>
<th>학력</th>
<th>직위</th>
<th>업체담당자</th>
<th>업체담당자연락처</th>
<th>교육비</th>
<th>환급액</th>
<th>환급은행명</th>
<th>환급계좌</th>
<th>환급계좌예금주</th>
<th>계산서이메일</th>
<th>교육연도</th>
</tr> </tr>
</thead> </thead>
<tbody class="data" id="tbody1"> <tbody class="data" id="tbody1">
@ -168,28 +146,6 @@
<td>@Convert.ToDateTime(@item.sedate).ToShortDateString()</td> <td>@Convert.ToDateTime(@item.sedate).ToShortDateString()</td>
<td>@item.cgname</td> <td>@item.cgname</td>
<td>@item.completeno</td> <td>@item.completeno</td>
<td>@item.kind</td>
<td>@item.cg</td>
<td>@item.companyname</td>
<td>@item.companyaddr</td>
<td>@item.brno</td>
<td>@item.eino</td>
<td>@item.btype</td>
<td>@item.bkind</td>
<td>@item.ceoname</td>
<td>@item.sctime</td>
<td>@item.assign</td>
<td>@item.slevel</td>
<td>@item.uduty</td>
<td>@item.mname</td>
<td>@item.mphone</td>
<td>@item.sprice</td>
<td>@item.rprice</td>
<td>@item.rbank</td>
<td>@item.rbankno</td>
<td>@item.rbankuser</td>
<td>@item.taxemail</td>
<td>@item.syear</td>
</tr> </tr>
} }
</tbody> </tbody>

4
Dao/MyBatis/Maps/CRoom.xml
View File

@ -187,7 +187,7 @@
left outer join cminningscd scd on a.cmisno = scd.cmisno left outer join cminningscd scd on a.cmisno = scd.cmisno
left outer join comcode com on scd.studyplace = com.ccode left outer join comcode com on scd.studyplace = com.ccode
where a.lectno=#lectno# and a.userno=#userno# where a.lectno=#lectno# and a.userno=#userno#
<isNotNull property="notstudy">and ifnull(c.istatus,0) &lt; 2 and a2.sstime &lt; now() and a2.setime &gt; now()</isNotNull> <isNotNull property="notstudy">and ifnull(c.istatus,0) &lt; 2 and a.sdate &lt; now() and a.edate &gt; now()</isNotNull>
order by b.iseq order by b.iseq
<isNotNull property="limit">limit $limit$</isNotNull> <isNotNull property="limit">limit $limit$</isNotNull>
</select> </select>
@ -1519,7 +1519,7 @@
select a.* select a.*
from ( from (
select select
l.lectno,l.iscomplete,l.completetime,l.completeno,l.sdate,l.edate,l.cdt,l.cno,l.udt,l.uno,l.uip l.lectno,l.iscomplete,l.completetime,l.completeno,l.sdate,l.edate,l.cdt,l.cno,pp.udt,l.uno,l.uip
,cm.cgno,cm.studytime,cm.cshape,cm.cname,cm.studyplace ,cm.cgno,cm.studytime,cm.cshape,cm.cname,cm.studyplace
,t.tyear ,t.tyear
,cg.cgname,cg.pcgno ,cg.cgname,cg.pcgno

2
FO/Controllers/AccountController.cs
View File

@ -1146,8 +1146,10 @@ namespace NP.FO.Controllers
cshrcode =x.LGD_CASHRECEIPTKIND cshrcode =x.LGD_CASHRECEIPTKIND
}; };
int update = 0;
if (Dao.Save("pay.paylect.vbankin", payvbankin) < 3) if (Dao.Save("pay.paylect.vbankin", payvbankin) < 3)
{ {
SetError(payvbankin.payno + " : " + update + "건 업데이트");
//상품구매완료 처리 (최소 3건 업데이트 (payvbankin, pay) //상품구매완료 처리 (최소 3건 업데이트 (payvbankin, pay)
return "FAIL"; return "FAIL";
} }

2
FO/Controllers/FOBaseController.cs
View File

@ -23,7 +23,7 @@ namespace NP.FO.Controllers
protected override void OnActionExecuting(ActionExecutingContext filterContext) protected override void OnActionExecuting(ActionExecutingContext filterContext)
{ {
if (Request.AcceptTypes == null && !Request.Url.AbsolutePath.ToUpper().StartsWith("/OPEN/") && !Request.Url.AbsolutePath.ToUpper().StartsWith("/ACCOUNT/PAYVBANKMONEY")) if (Request.AcceptTypes == null && !Request.Url.AbsolutePath.ToUpper().StartsWith("/OPEN/") && !Request.Url.AbsolutePath.ToUpper().StartsWith("/ACCOUNT/XPAYVBANKMONEY") && !Request.Url.AbsolutePath.ToUpper().StartsWith("/ACCOUNT/PAYVBANKMONEY"))
{ {
if ("Y".Equals(GetConfig("isdebug"))) if ("Y".Equals(GetConfig("isdebug")))
{ {

2
FO/Views/Account/IndexBase.cshtml
View File

@ -23,7 +23,7 @@
<ul class="lgnFind"> <ul class="lgnFind">
<li><a href="/Account/FindMe">아이디/비밀번호찾기</a></li> <li><a href="/Account/FindMe">아이디/비밀번호찾기</a></li>
@*<li><a href="/Account/JoinIdVeri">회원가입</a></li>*@ <li><a href="/Account/JoinIdVeri">회원가입</a></li>
</ul> </ul>
<br /> <br />

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

@ -123,7 +123,7 @@
3. 총점 70점 이상 득점 : 시험평가(60점) + 과제(20점) + 진도율(20점) =100점<br /><br /> 3. 총점 70점 이상 득점 : 시험평가(60점) + 과제(20점) + 진도율(20점) =100점<br /><br />
<span class="subTxt red">※ 위 3가지 조건 모두 만족하셔야 수료가 가능합니다.</span><br /> <span class="subTxt red">※ 위 3가지 조건 모두 만족하셔야 수료가 가능합니다.</span><br />
※ 국토부 장관이 인정하는 사유로 집체교육을 실시 하지 못할 시 에는 동영상강의로 대체되며 7시간을 100% 이수하셔야 수료가 가능합니다.<br /> @*※ 국토부 장관이 인정하는 사유로 집체교육을 실시 하지 못할 시 에는 동영상강의로 대체되며 7시간을 100% 이수하셔야 수료가 가능합니다.<br />*@
</p> </p>
<h4 class="clsTitle">교육수강기한</h4> <h4 class="clsTitle">교육수강기한</h4>

2
FO/Views/Shared/Partial/GNB.cshtml
View File

@ -11,7 +11,7 @@
else else
{ {
<li><a href="/Account/Index">로그인</a></li> <li><a href="/Account/Index">로그인</a></li>
@*<li><a href="/Account/JoinIdVeri">회원가입</a></li>*@ <li><a href="/Account/JoinIdVeri">회원가입</a></li>
} }
<li><a href="http://939.co.kr/yicte" target="_blank" >원격지원</a></li> <li><a href="http://939.co.kr/yicte" target="_blank" >원격지원</a></li>
</ul> </ul>