一卡通对接

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/Index.cshtml

@@ -0,0 +1,54 @@
+@{
+    ViewBag.Title = "宿舍调换申请";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="datesearch"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">一卡通账号</div>
+                                    <input id="YKTNO" type="text" class="form-control"/>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学号</div>
+                                    <input id="StuNo" type="text" class="form-control"/>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">姓名</div>
+                                    <input id="StuName" type="text" class="form-control"/>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">系部</div>
+                                    <div id="DeptNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">专业</div>
+                                    <div id="MajorNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">班级</div>
+                                    <div id="ClassNo"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/YKTStateMent/Index.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/Index.js

@@ -121,13 +121,13 @@ var bootstrap = function ($, learun) {
                     { label: "班级", name: "ClassName", width: 100, align: "left" },
                     { label: "身份证号", name: "IdentityCardNo", width: 150, align: "left" },
                     { label: "消费金额", name: "MONEY", width: 100, align: "left", statistics: true },
-                    //{ label: "余额", name: "BALANCE", width: 100, align: "left" },
+                    { label: "余额", name: "BALANCE", width: 100, align: "left" },
                     { label: "发生时间", name: "HAPPENTIME", width: 120, align: "left" },
                     { label: "科目", name: "SUBJECT", width: 100, align: "left" },
                     { label: "终端名称", name: "TERMNAME", width: 150, align: "left" },
                 ],
                 //mainId: 'AId',
-                sidx: 'A.OPDT',
+                sidx: 'A.jndatetime',
                 sord: 'desc',
                 isPage: true
             });

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -7757,12 +7757,9 @@
     <Content Include="Areas\EducationalAdministration\Views\RecruitStuPlan\IndexPlan.cshtml" />
     <Content Include="Areas\LR_OAModule\Views\Notice\IndexStatistics.cshtml" />
     <Content Include="Content\excel\AccommodationImport.xls" />
-    <Content Include="Areas\EducationalAdministration\Views\MealCardRunTab\Form.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\MealCardRunTab\Index.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuSubsidize\FormView.cshtml" />
     <Content Include="Areas\LR_NewWorkFlow\Views\NWFProcess\MonitorIndexStatistics.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuScore\InputScoreIndexInTeacherImport.cshtml" />
-    <Content Include="Areas\EducationalAdministration\Views\YKTStateMent\Index.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\CdMajor\IndexProvince.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\CdMajor\FormProvince.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\YKTStateMent\IndexForStudent.cshtml" />
@@ -7771,6 +7768,7 @@
     <Content Include="Areas\EducationalAdministration\Views\YKTStateMent\IndexForTeacher.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\YKTStateMent\ManageIndexTeacher.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\YKTStateMent\AnalysisByMonthForStudent.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\YKTStateMent\Index.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />

Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config

@@ -4,46 +4,13 @@
 	<!--<add name="BaseDb" connectionString="Server=.;Initial Catalog=adms7ultimate2;User ID=sa;Password=1" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=.;Initial Catalog=CollegeMIS;User ID=sa;Password=1" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
-	<!--126-->
-	<!--<add name="BaseDb" connectionString="Server=192.168.2.126;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
-  <add name="CollegeMIS" connectionString="Server=192.168.2.126;Initial Catalog=CollegeMIS;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
-  <add name="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />-->
-	<!--西昌-->
-	<!--<add name="BaseDb" connectionString="Server=112.45.152.8;Initial Catalog=adms7ultimate2;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />
-  <add name="CollegeMIS" connectionString="Server=112.45.152.8;Initial Catalog=NewCollegeMIS;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />
-  <add name="hangfireString" connectionString="Server=112.45.152.8;Initial Catalog=HangFire;User ID=sa;Password=qj@2018" providerName="System.Data.SqlClient" />-->
-	<!--demo.quanjiang.com-->
-	<!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-  <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-  <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
-	<!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-	<add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-	<add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-	--><!--获取网上缴费数据--><!--
-	<add name="IsPay" connectionString="Server=192.168.53.19;Initial Catalog=u8gx;User ID=jfcx;Password=xcyz1234567." providerName="System.Data.SqlClient" />-->
-
-	<!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_20200403test;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-  <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_20200403test;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-  <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
-	<!--金隅-->
-	<!--<add name="BaseDb" connectionString="Server=192.168.100.225;Initial Catalog=adms7ultimate2;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
-  <add name="CollegeMIS" connectionString="Server=192.168.100.225;Initial Catalog=CollegeMIS;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
-  <add name="hangfireString" connectionString="Server=192.168.100.225;Initial Catalog=Hangfire;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />-->
-	<!--126西昌测试-->
-	<!--<add name="BaseDb" connectionString="Server=192.168.2.126;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
-  <add name="CollegeMIS" connectionString="Server=192.168.2.126;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
-  <add name="hangfireString" connectionString="Server=192.168.2.126;Initial Catalog=Hangfire;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />-->
-	<!--测试公共提交-->
-	<!--塔里木测试-->
-	<!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_塔里木;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-  <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_塔里木;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-  <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
+	<!--娄底-->
   <add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_娄底;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_娄底;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-  <add name="paikeDbString" connectionString="Data Source=10.30.0.11;Database=paike;User ID=root;Password=12345678;" providerName="MySql.Data.MySqlClient" />
+  <add name="paikeDbString" connectionString="Data Source=8.141.155.183;Port=23306;Database=paikeloudi;User ID=root;Password=QJKJ@bjqj@123;" providerName="MySql.Data.MySqlClient" />
+
   <!--塔里木中间库一卡通-->
   <!--<add name="TLMYKTDBString" connectionString="Data Source=orcl;Persist Security Info=True;User ID=bjqj;Password=bjqj;" providerName="System.Data.OracleClient" />-->
   <add name="TLMZYMIDDLEString" connectionString="Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=39.98.73.155)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=TLMZYMIDDLE)));Persist Security Info=True;User ID=digitalschool;Password=digitalschool;" providerName="Oracle.ManagedDataAccess.Client" />
-  <add name="paikeDbString" connectionString="Data Source=8.141.155.183;Port=23306;Database=paikeloudi;User ID=root;Password=QJKJ@bjqj@123;" providerName="MySql.Data.MySqlClient" />
 </connectionStrings>

Learun.Framework.Ultimate V7/Learun.Application.Web/document.pdf

@@ -1,6 +0,0 @@
-2
-2
-1
-1
-1
-

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/YKTStateMent/YKTStateMentService.cs

@@ -32,13 +32,14 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             {
                 var queryParam = queryJson.ToJObject();
                 var strSql = new StringBuilder();
-                strSql.Append(@"SELECT  A.OUTID AS STUPHONE,A.CUSTOMERID AS YKTNO,round(A.OPFARE/100,2) AS MONEY,round(A.ODDFARE/100,2) AS BALANCE,A.OPDT AS HAPPENTIME,A.DSCRP AS SUBJECT,B.TERMNAME,C.StuNo,C.StuName,d.DeptName,e.ClassName,c.identityno as IdentityCardNo, f.MajorName
-                FROM M_REC_CONSUME@ykt A LEFT JOIN M_BASE_TERM@ykt B ON A.TERMID = B.TERMID
-                left join ds_stuinfo C on A.OUTID = C.mobile
+                strSql.Append(@"SELECT  A.fromcardno AS YKTNO,round(A.tranamt/100,2) AS MONEY,round(A.ebagamt/100,2) AS BALANCE,A.jndatetime AS HAPPENTIME,b.tranname AS SUBJECT,g.mercname as TERMNAME,C.StuNo,C.StuName,d.DeptName,e.ClassName,c.identityno as IdentityCardNo, f.MajorName
+                FROM card.trjn A LEFT JOIN card.trcd B ON A.trancode = B.trancode
+                left join ds_stuinfo C on A.sno = C.stuno
                 left join ds_dept d on c.deptno = d.deptno
                 left join ds_classinfo e on c.classno = e.classno
                 left join ds_major f on c.majorno=f.majorno
-                where 1=1 and stuno is not null ");
+                left join card.mercacc g on a.toaccount=g.account
+                where 1=1 and stuno is not null and a.pid='02' and a.journalstatus='0' ");
                 if (!queryParam["StuNo"].IsEmpty())
                 {
                     strSql.Append($" AND C.StuNo like '%{queryParam["StuNo"].ToString()}%' ");
@@ -57,11 +58,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
                 if (!queryParam["YKTNO"].IsEmpty())
                 {
-                    strSql.Append($" AND a.CUSTOMERID like '%{queryParam["CUSTOMERID"].ToString()}%' ");
+                    strSql.Append($" AND a.fromcardno like '%{queryParam["YKTNO"].ToString()}%' ");
                 }
                 if (!queryParam["StartDate"].IsEmpty() && !queryParam["EndDate"].IsEmpty())
                 {
-                    strSql.Append(" and (A.OPDT>=to_date('" + queryParam["StartDate"] + "','yyyy-mm-dd') and A.OPDT<=to_date('" + queryParam["EndDate"] + "','yyyy-mm-dd hh24:mi:ss'))");
+                    strSql.Append(" and (A.jndatetime>=to_date('" + queryParam["StartDate"] + "','yyyy-mm-dd hh24:mi:ss') and A.jndatetime<=to_date('" + queryParam["EndDate"] + "','yyyy-mm-dd hh24:mi:ss'))");
                 }
 
                 return BaseRepository("TLMZYMIDDLEString").FindList<YKTStateMentEntity>(strSql.ToString(), pagination);
@@ -92,7 +93,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var strSql = new StringBuilder();
                 strSql.Append(
                     @"SELECT  C.StuNo,C.StuName,d.DeptName,f.MajorName,e.ClassName,c.identityno as IdentityCardNo, sum(round(A.OPFARE/100,2)) AS MONEY,count(stuno) as PayTimes,round(sum(round(A.OPFARE/100,2))/count(stuno),2) as PerMoney
-                FROM M_REC_CONSUME@ykt A LEFT JOIN M_BASE_TERM@ykt B ON A.TERMID = B.TERMID
+                FROM card.trjn A LEFT JOIN card.trcd B ON A.trancode = B.trancode
                 left join ds_stuinfo C on A.OUTID = C.mobile
                 left join ds_dept d on c.deptno = d.deptno
                 left join ds_classinfo e on c.classno = e.classno
@@ -140,12 +141,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             {
                 var queryParam = queryJson.ToJObject();
                 var strSql = new StringBuilder();
-                strSql.Append(@"SELECT  A.OUTID AS STUPHONE,A.CUSTOMERID AS YKTNO,round(A.OPFARE/100,2) AS MONEY,round(A.ODDFARE/100,2) AS BALANCE,A.OPDT AS HAPPENTIME,A.DSCRP AS SUBJECT,
-B.TERMNAME,c.EmpNo,c.EmpName,d.Name as DepartmentName,c.identityno as IdentityCardNo
-                FROM M_REC_CONSUME@ykt A LEFT JOIN M_BASE_TERM@ykt B ON A.TERMID = B.TERMID
-                left join ds_empinfo C on A.OUTID = C.mobile
+                strSql.Append(@"SELECT  A.fromcardno AS YKTNO,round(A.tranamt/100,2) AS MONEY,round(A.ebagamt/100,2) AS BALANCE,A.jndatetime AS HAPPENTIME,b.tranname AS SUBJECT,g.mercname as TERMNAME,c.EmpNo,c.EmpName,d.Name as DepartmentName,c.identityno as IdentityCardNo
+                FROM card.trjn A LEFT JOIN card.trcd B ON A.trancode = B.trancode
+                left join ds_empinfo C on A.sno = C.empno
                 left join ds_department d on c.departmentid=d.id
-                where 1=1 and EmpNo is not null");
+                left join card.mercacc g on a.toaccount=g.account
+                where 1=1 and EmpNo is not null and a.pid='01' and a.journalstatus='0' ");
                 if (!queryParam["EmpNo"].IsEmpty())
                 {
                     strSql.Append($" AND C.EmpNo like '%{queryParam["EmpNo"].ToString()}%' ");
@@ -160,7 +161,7 @@ B.TERMNAME,c.EmpNo,c.EmpName,d.Name as DepartmentName,c.identityno as IdentityCa
                 }
                 if (!queryParam["YKTNO"].IsEmpty())
                 {
-                    strSql.Append($" AND a.CUSTOMERID like '%{queryParam["CUSTOMERID"].ToString()}%' ");
+                    strSql.Append($" AND a.fromcardno like '%{queryParam["YKTNO"].ToString()}%' ");
                 }
                 if (!queryParam["StartDate"].IsEmpty() && !queryParam["EndDate"].IsEmpty())
                 {