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

<기능개선> 

통합테스트목록 . 575
This commit is contained in:
kdh0120 2021-11-29 02:02:11 +00:00
parent 347df94481
commit e324e07ba0
7 changed files with 36 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BO/Controllers/croomController.cs
View File

@ -919,6 +919,9 @@ namespace NP.BO.Controllers
ht.Add("pstatus", vm.stringval10);
ht.Add("taxnos", vm.stringval11);
ht.Add("ischeck", vm.stringval12);
ht.Add("csdate", vm.stringval13);
ht.Add("cedate", string.IsNullOrEmpty(vm.stringval14) ? null : (vm.stringval14 + " 23:59:59"));
ht.Add("isreceipt", vm.stringval15);
if (!string.IsNullOrEmpty(vm.stringval3))
{
if(vm.stringval3 == "2")

27
BO/Views/croom/tax.cshtml
View File

@ -17,33 +17,38 @@
<div class="form-groupx">
<table class="table table-striped b-t b-light no-odd">
<colgroup>
<col width="150" />
<col />
<col width="15%" />
<col width="35%" />
<col width="15%" />
<col width="*" />
</colgroup>
<tr>
<th>계산서 요청날짜</th>
<td class="text-left">
@Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval6) ? (DateTime?)null : Convert.ToDateTime(Model.stringval6), new ViewDataDictionary { { "name", "stringval6" } }) ~ @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval7) ? (DateTime?)null : Convert.ToDateTime(Model.stringval7), new ViewDataDictionary { { "name", "stringval7" } })
</td>
</tr>
<tr>
<th>신청일</th>
<td class="text-left">
@Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval) ? (DateTime?)null : Convert.ToDateTime(Model.stringval), new ViewDataDictionary { { "name", "stringval" } }) ~ @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval2) ? (DateTime?)null : Convert.ToDateTime(Model.stringval2), new ViewDataDictionary { { "name", "stringval2" } })
</td>
<th>계산서 요청날짜</th>
<td class="text-left">
@Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval6) ? (DateTime?)null : Convert.ToDateTime(Model.stringval6), new ViewDataDictionary { { "name", "stringval6" } }) ~ @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval7) ? (DateTime?)null : Convert.ToDateTime(Model.stringval7), new ViewDataDictionary { { "name", "stringval7" } })
</td>
</tr>
<tr>
<th>계산서 실제 날짜</th>
<td class="text-left">
@Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval8) ? (DateTime?)null : Convert.ToDateTime(Model.stringval8), new ViewDataDictionary { { "name", "stringval8" } }) ~ @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval9) ? (DateTime?)null : Convert.ToDateTime(Model.stringval9), new ViewDataDictionary { { "name", "stringval9" } })
</td>
<th>계산서 확인 날짜</th>
<td class="text-left">
@Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval13) ? (DateTime?)null : Convert.ToDateTime(Model.stringval13), new ViewDataDictionary { { "name", "stringval13" } }) ~ @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval14) ? (DateTime?)null : Convert.ToDateTime(Model.stringval14), new ViewDataDictionary { { "name", "stringval14" } })
</td>
</tr>
<tr>
<th>검색어</th>
<td class="text-left">
<td class="text-left" colspan="3">
@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":발행상태;0:미발행;3:미발행(임시저장);1:발행;2:발행취소" }, { "name", "stringval3" }, { "selected", Model.stringval3 } })
@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":결제상태;p21:결제대기;p22:입금대기;p1:결제완료;rf1:환불요청;r1:부분환불;r2:전액환불;p41,42,43:결제취소" }, { "name", "stringval10" }, { "selected", Model.stringval10 } })
@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":확인상태;1:확인;0:미확인" }, { "name", "stringval12" }, { "selected", Model.stringval12 } })
@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":영수구분;1:영수;0:청구" }, { "name", "stringval15" }, { "selected", Model.stringval15 } })
@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":전체검색;username:신청자이름;userid:신청자ID;manname:담당자이름;itemname:상품명;cname:교육과정명;paynos:결제번호;asname:회사명" }, { "name", "stringval4" }, { "selected", Model.stringval4 } })
@Html.Partial("./Partial/Text", Model.stringval5, Helpers.DicText(new NP.Model.TextDic() { Name = "stringval5", Value = Model.stringval5, PH = "", CssClass = "ff" }))
@Html.Partial("./Partial/Button", new NP.Model.Button() { Special = "search" })
@ -82,7 +87,8 @@
<th>발행한날</th>
<th>영수구분</th>
<th width="100">상태</th>
<th>확인상태</th>
<th width="100">확인상태</th>
<th>확인날짜</th>
</tr>
</thead>
<tbody class="data" id="tbody1">
@ -105,6 +111,7 @@
<td>@(d.isreceipt == 0 ? "청구" : "영수")</td>
<td class="taxdate@(d.status == "미발행" || d.status == "임시저장" ? "x" :"")" @(!string.IsNullOrEmpty(d.mgtkey) && d.statecode == 0 ? "style=color:blue;" : "" )>@(d.status)</td>
<td class="taxdate@(d.ischeck == 1 ? "" : "x")">@(d.ischeckname)</td>
<td>@d.checktimeymd</td>
</tr>
}

2
BO/Views/croom/taxdetail.cshtml
View File

@ -31,6 +31,7 @@
<th>영수구분</th>
<th>상태</th>
<th>확인상태</th>
<th>확인날짜</th>
</tr>
</thead>
<tbody class="data" id="tbody1">
@ -51,6 +52,7 @@
<td>@(d.isreceipt == 0 ? "청구" : "영수")</td>
<td class="taxdate@(d.status =="미발행" || d.status == "임시저장" ? "x" : "")">@(d.status)</td>
<td class="taxdate@(d.ischeck == 1 ? "" : "x")">@(d.ischeckname)</td>
<td>@d.checktimeymd</td>
</tr>
}

1
BO/Views/user/assigns.cshtml
View File

@ -8,7 +8,6 @@
<col width="35%" />
<col width="15%" />
<col width="*" />
<col />
</colgroup>
<tbody id="searchtbody">
<tr>

1
Dao/DB/DB1.Scheme.txt
View File

@ -1015,6 +1015,7 @@ create table paytax (
,statecode INT(11) NULL DEFAULT NULL
,realtaxdate datetime default null
,ischeck tinyint(4) NOT NULL DEFAULT 0
,checktime datetime
,primary key(taxno));
create table paytaxitem (

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

@ -909,51 +909,6 @@
) a
<include refid="sql.pagedynamic"></include>
order by a.rno
<!--select a.*
from (
select p.payno,p.ptype pptype,p.payoktime
,case pi.ptype when 3 then exu.cdt when 4 then le.oktime else p.cdt end cdt
,pi.pino,pi.isrebate,pi.ptype,pi.payamt,pi.refundamt,pi.rstatus,pi.pstatus
,case when pri.rfdno is not null then 1 else 0 end isrefundcall
,u.userno,u.userid,u.username
,ua.asname,ua.isjoin
,cm.cshape
,case pi.ptype when 2 then bk.bkname when 3 then ex.exname else cm.cname end itemname
,row_number() over(order by case when pr.rfdno is not null then 0 else 1 end, p.cdt desc) rno
,count(p.payno) over() pagetotalcount
from pay p
inner join payitem pi on pi.payno=p.payno
<isNotNull property="piptype">and pi.ptype=#piptype#</isNotNull>
<isNotNull property="isrebates">and pi.ptype in (0, 4) and pi.isrebate in ($isrebates$)</isNotNull>
<isNotNull property="rstatusin">and pi.rstatus in ($rstatusin$)</isNotNull>
inner join users u on u.userno=p.userno
left outer join assign ua on ua.asno=u.asno
left outer join payrfditem pri on pri.pino=pi.pino
left outer join payrfd pr on pr.rfdno=pri.rfdno and pr.rstatus=0
left outer join cm cm on pi.ptype in (0,1,4) and cm.cmno=pi.itemno
left outer join lect le on le.pino=pi.pino and le.ischanged=0
left outer join cg cg on cg.cgno=cm.cgno
left outer join book bk on pi.ptype=2 and bk.bkno=pi.itemno
left outer join exam ex on pi.ptype=3 and ex.exno=pi.itemno
left outer join examuser exu on exu.exno=ex.exno and exu.userno=p.userno
where p.pstatus in (1,21,22,41,42,43) and (pri.rfdno is null or pr.rfdno is not null)
<isNotNull property="cdts">and p.cdt &gt;= #cdts#</isNotNull>
<isNotNull property="cdte">and p.cdt &lt;= #cdte#</isNotNull>
<isNotNull property="pstatusin">and p.pstatus in ($pstatusin$)</isNotNull>
<isNotNull property="isrefundcall">and pr.rfdno is not null</isNotNull>
<isNotNull property="ptypein">and p.ptype in ($ptypein$)</isNotNull>
<isNotNull property="isjoin">and ua.isjoin=#isjoin#</isNotNull>
<isNotNull property="asname">and ua.asname like concat('%',#asname#,'%')</isNotNull>
<isNotNull property="brno">and ua.brno=#brno#</isNotNull>
<isNotNull property="cshape">and cm.cshape=#cshape#</isNotNull>
<isNotNull property="pcgno">and cg.pcgno=#pcgno#</isNotNull>
<isNotNull property="username">and u.username=#username#</isNotNull>
<isNotNull property="userid">and u.userid=#userid#</isNotNull>
<isNotNull property="itemname">and (cm.cname like concat('%',#itemname#,'%') or bk.bkname like concat('%',#itemname#,'%') or ex.exname like concat('%',#itemname#,'%'))</isNotNull>
<isNotNull property="usernameiditemname">and (u.username=#usernameiditemname# or u.userid=#usernameiditemname# or cm.cname like concat('%',#usernameiditemname#,'%') or bk.bkname like concat('%',#usernameiditemname#,'%') or ex.exname like concat('%',#usernameiditemname#,'%'))</isNotNull>
) a
<include refid="sql.pagedynamic"></include>
order by a.rno-->
</select>
<select id="cr.pay1" parameterClass="long" resultClass="pay">
select p.payno,p.cdt,p.payamt,p.ptype,p.refundamt,p.ispg,p.isgroup,p.isexam,p.pstatus,p.rstatus,p.payoktime,p.pgkey,p.isdvr,p.deliamt,p.isunpay,p.paylimit
@ -1293,7 +1248,7 @@
select a.*
from (
select a.taxno,ifnull(a.cname, ifnull(a.exname, a.bkname)) itemname,a.asaddr,a.pcnt,a.ccount,b.iscancel
,b.payno,b.asname,b.taxamt,b.cdt,b.taxdate,b.ceoname,b.brno,b.grno,b.btype,b.bkind,b.manname,b.fgno,b.taxinfo,b.isreceipt,b.mgtkey,b.taxdatereq,b.realtaxdate,b.statecode,b.ischeck
,b.payno,b.asname,b.taxamt,b.cdt,b.taxdate,b.ceoname,b.brno,b.grno,b.btype,b.bkind,b.manname,b.fgno,b.taxinfo,b.isreceipt,b.mgtkey,b.taxdatereq,b.realtaxdate,b.statecode,b.ischeck,b.checktime
,CAST(AES_DECRYPT(UNHEX(b.telno), <include refid="sql.digest"></include>) AS char) telno
,CAST(AES_DECRYPT(UNHEX(b.email), <include refid="sql.digest"></include>) AS char) email
,u.userno cno,u.username,u.userid,CAST(AES_DECRYPT(UNHEX(u.mobile), <include refid="sql.digest"></include>) AS char) mobile
@ -1335,10 +1290,13 @@
</isNotNull>
<isNotNull property="staxdatereq" prepend="and">a.taxdatereq &gt;= #staxdatereq#</isNotNull>
<isNotNull property="etaxdatereq" prepend="and">a.taxdatereq &lt;= #etaxdatereq#</isNotNull>
<isNotNull property="csdate" prepend="and">a.checktime &gt;= #csdate#</isNotNull>
<isNotNull property="cedate" prepend="and">a.checktime &lt;= #cedate#</isNotNull>
<isNotNull property="staxdate" prepend="and">a.taxdate &gt;= #staxdate#</isNotNull>
<isNotNull property="etaxdate" prepend="and">a.taxdate &lt;= #etaxdate#</isNotNull>
<isNotNull property="asname" prepend="and">a.asname like concat('%',#asname#,'%')</isNotNull>
<isNotNull property="ischeck" prepend="and">a.ischeck = #ischeck#</isNotNull>
<isNotNull property="isreceipt" prepend="and">a.isreceipt = #isreceipt#</isNotNull>
<isNotEmpty property="taxnos" prepend="and">a.taxno in ($taxnos$)</isNotEmpty>
</dynamic>
group by a.taxno
@ -1382,6 +1340,7 @@
,a.udt = now()
,a.uno = #uno#
,a.uip = #uip#
,a.checktime = case when #ischeck# = 1 then now() else null end
<dynamic prepend="where">
<isNotEmpty property="taxnos" prepend="and">a.taxno in ($taxnos$)</isNotEmpty>
<isNotNull property="taxno" prepend="and">a.taxno = #taxno#</isNotNull>

8
Model/Pay.cs
View File

@ -1179,6 +1179,14 @@ namespace NP.Model
return ischeck == 0 ? "미확인" : "확인";
}
}
public DateTime? checktime { get; set; }
public String checktimeymd
{
get
{
return checktime == null ? "-" : checktime.Value.ToString("yyyy-MM-dd");
}
}
}
[Serializable]
public class PayRfd : BaseModel