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

This commit is contained in:
kdh0120 2020-11-26 04:35:01 +00:00
parent 5a10a57d9b
commit 7b8a5050e1
8 changed files with 50 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
BO/Controllers/croomController.cs
View File

@ -791,6 +791,28 @@ namespace NP.BO.Controllers
public ActionResult Documents(VMCRoom vm)
{
ViewBag.reporturl = GetConfig("reporturl");
var ht = SetHash(vm, false);
if (!IsPost())
{
vm.pagerowcount = 50;
vm.stringval = DateTime.Now.ToString("yyyy-MM-01");
vm.stringval2 = Convert.ToDateTime(vm.stringval).AddMonths(1).AddSeconds(-1).ToString("yyyy-MM-dd");
}
ht.Add("cdts", vm.stringval);
ht.Add("cdte", string.IsNullOrEmpty(vm.stringval2) ? null : (vm.stringval2 + " 23:59:59"));
ht.Add("asname", string.IsNullOrEmpty(vm.stringval3) ? null : vm.stringval3);
ht.Add("isrebate", string.IsNullOrEmpty(vm.stringval4) ? null : "1");
if (!string.IsNullOrEmpty(vm.stringval16))
{
ht.Add(vm.stringval15 ?? "usernameiditemname", vm.stringval16);
}
vm.stringval20 = DateTime.Now.AddDays(-6).ToString("yyyy-MM-dd") + ";" +
DateTime.Now.AddDays(-14).ToString("yyyy-MM-dd") + ";" +
DateTime.Now.AddMonths(-1).ToString("yyyy-MM-dd") + ";" +
DateTime.Now.AddMonths(-2).ToString("yyyy-MM-dd");
vm.Lects = Dao.Get<Lect>("lect.lecture.document", ht);
vm.pagetotalcount = GetCount(vm.Lects.FirstOrDefault());
return View(vm);
}
}

14
BO/Web.config
View File

@ -226,7 +226,7 @@
</iBATIS>
<log4net>
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
<file value="D:\log\kfcf\log.txt" />
<file value="D:\log\ynicte\log.txt" />
<param name="MaxSizeRollBackups" value="2" />
<param name="MaximumFileSize" value="1024KB" />
<param name="RollingStyle" value="Size" />
@ -242,7 +242,7 @@
</layout>
</appender>
<appender name="DebugAppender" type="log4net.Appender.RollingFileAppender,log4net">
<param name="File" value="D:\log\kfcf\debug.txt" />
<param name="File" value="D:\log\ynicte\debug.txt" />
<param name="AppendToFile" value="true" />
<param name="MaxSizeRollBackups" value="10" />
<param name="MaximumFileSize" value="5MB" />
@ -253,7 +253,7 @@
</layout>
</appender>
<appender name="DeleteAppender" type="log4net.Appender.RollingFileAppender,log4net">
<param name="File" value="D:\log\kfcf\delete.txt" />
<param name="File" value="D:\log\ynicte\delete.txt" />
<param name="AppendToFile" value="true" />
<param name="MaxSizeRollBackups" value="10" />
<param name="MaximumFileSize" value="5MB" />
@ -264,7 +264,7 @@
</layout>
</appender>
<appender name="WarnAppender" type="log4net.Appender.RollingFileAppender,log4net">
<param name="File" value="D:\log\kfcf\warn.txt" />
<param name="File" value="D:\log\ynicte\warn.txt" />
<param name="AppendToFile" value="true" />
<param name="MaxSizeRollBackups" value="10" />
<param name="MaximumFileSize" value="5MB" />
@ -275,7 +275,7 @@
</layout>
</appender>
<appender name="QueryAppender" type="log4net.Appender.RollingFileAppender,log4net">
<param name="File" value="D:\log\kfcf\query.txt" />
<param name="File" value="D:\log\ynicte\query.txt" />
<param name="AppendToFile" value="true" />
<param name="MaxSizeRollBackups" value="10" />
<param name="MaximumFileSize" value="5MB" />
@ -286,7 +286,7 @@
</layout>
</appender>
<appender name="ErrorAppender" type="log4net.Appender.RollingFileAppender,log4net">
<param name="File" value="D:\log\kfcf\/error.txt" />
<param name="File" value="D:\log\ynicte\error.txt" />
<param name="AppendToFile" value="true" />
<param name="MaxSizeRollBackups" value="10" />
<param name="MaximumFileSize" value="5MB" />
@ -297,7 +297,7 @@
</layout>
</appender>
<appender name="TryErrorAppender" type="log4net.Appender.RollingFileAppender,log4net">
<param name="File" value="D:\log\kfcf\tryerror.txt" />
<param name="File" value="D:\log\ynicte\tryerror.txt" />
<param name="AppendToFile" value="true" />
<param name="MaxSizeRollBackups" value="10" />
<param name="MaximumFileSize" value="5MB" />

18
Dao/MyBatis/Maps/Lect.xml
View File

@ -1344,20 +1344,34 @@
,b.rstime,b.retime
,b.sstime,b.setime
,c.tyear,c.tseq
,e.pstatus,e.payamt,e.ptype,e.ispg
,u.username,u.userid
,ass.asname
,e.payno,e.pstatus,e.payamt,e.ptype,e.ispg
,f.estart,f.eend
,cc.cname studyplacename
,pt.taxno,pt.taxdate
,a.cdt
,row_number() over(order by a.cdt desc) rno
,count(a.lectno) over() pagetotalcount
from lect a
inner join cm b on b.cmno = a.cmno
inner join term c on c.tmno = b.tmno
inner join pay e on e.payno = a.payno
left outer join users u on u.userno = a.userno
left outer join assign ass on ass.asno = u.asno
left outer join cminningscd f on f.cmisno = a.cmisno
left outer join comcode cc on cc.ccode = b.studyplace
left outer join paytax pt on pt.payno = e.payno and ifnull(pt.iscancel,0) =0
where a.userno = #userno# and a.status=1 and a.ischanged=0
where a.status=1 and a.ischanged=0
<isNotNull property="cdts">and a.cdt &gt;= #cdts#</isNotNull>
<isNotNull property="cdte">and a.cdt &lt;= #cdte#</isNotNull>
<isNotNull property="asname">and ass.asname like concat('%',#asname#,'%')</isNotNull>
<isNotNull property="userno">and a.userno = #userno#</isNotNull>
<isNotNull property="isrebate"> a.isrebate = #isrebate#</isNotNull>
<isNotNull property="username"> u.username like concat('%',#username#,'%')</isNotNull>
<isNotNull property="userid"> u.userid like concat('%',#userid#,'%')</isNotNull>
<isNotNull property="cname"> b.cname like concat('%',#cname#,'%')</isNotNull>
<isNotNull property="usernameiditemname">and(u.username like concat('%',#usernameiditemname#,'%') or u.userid like concat('%',#usernameiditemname#,'%') or b.cname like concat('%',#usernameiditemname#,'%'))</isNotNull>
) a
<include refid="sql.pagedynamic"></include>
</select>

2
FO/Spring/ControllersStaging.xml
View File

@ -7,7 +7,7 @@
<!--<property name="Sms" ref="objSms" />-->
<property name="TopMenuNo" value="2" />
<property name="PageRowCount" value="10" />
<property name="MainSubDomain" value="kfcf" />
<property name="MainSubDomain" value="ynicte" />
<property name="IsDupCheck" value="1" />
</object>

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

@ -114,7 +114,7 @@
if (status1CNT < 3)
{
<li>
<a href="@(d.intval5 != 1 && d.intval4 == 1 && d.intval8 == 1 ? "/CRoom/Index?croomlectno=" + d.longval : d.intval5 != 1 && d.intval4 == 1 && d.intval8 == 0 ? "/My/Ready" : d.intval5 != 1 && d.intval4 == 51 ? "/My/Ready" : d.intval5 != 1 && d.intval4 == 21 ? "/My/Readypay?payno=" + d.longval2 : "/My/PayInfo?payno=" + d.longval2)">
<a href="@(d.intval5 != 1 && d.intval4 == 1 && d.intval8 == 1 ? "/CRoom/Index?croomlectno=" + d.longval : d.intval5 != 1 && d.intval4 == 1 && d.intval8 == 0 ? "/My/Ready" : d.intval5 != 1 && d.intval4 == 51 ? "/Course/ApplyPay" : d.intval5 != 1 && d.intval4 == 21 ? "/Course/ApplyPay?payno=" + d.longval2 : "/My/PayInfo?payno=" + d.longval2)">
<h5>
<em>@d.intval-@(d.intval2)기</em>
<span class="nav">@(d.intval3 == 0 ? "ON" : d.intval3 == 1 ? "OFF" : "혼합")</span>

2
FO/Views/My/Ready.cshtml
View File

@ -132,7 +132,7 @@
}
}
function gopay(payno) {
location.href = "/My/ReadyPay?payno=" + payno;
location.href = "/Course/ApplyPay?payno=" + payno;
}
</script>
}

2
FO/Web.config
View File

@ -291,7 +291,7 @@
</iBATIS>
<log4net>
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
<file value="D:\log\kfcf\log.txt" />
<file value="D:\log\ynicte\log.txt" />
<param name="MaxSizeRollBackups" value="2" />
<param name="MaximumFileSize" value="1024KB" />
<param name="RollingStyle" value="Size" />

1
Model/VMCRoom.cs
View File

@ -57,5 +57,6 @@ namespace NP.Model
public IList<PayTax> PayTaxes { get; set; }
public IList<PayTax> PayTaxes2 { get; set; }
public IList<PayItem> PayTaxItem { get; set; }
public IList<Lect> Lects { get; set; }
}
}