From 17c77daae37ad71357a414cfa4c31058de16d436 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=9D=A4=20=E6=A2=81?= Date: Mon, 28 Aug 2023 11:41:12 +0800 Subject: [PATCH 01/10] =?UTF-8?q?fzp=20=E8=B0=83=E8=AF=95=E5=BB=BA?= =?UTF-8?q?=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DigitalSchoolApi/Controllers/PayFeeResultTwoController.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DigitalSchoolApi/Controllers/PayFeeResultTwoController.cs b/DigitalSchoolApi/Controllers/PayFeeResultTwoController.cs index 0b5249d..80d72cd 100644 --- a/DigitalSchoolApi/Controllers/PayFeeResultTwoController.cs +++ b/DigitalSchoolApi/Controllers/PayFeeResultTwoController.cs @@ -140,7 +140,7 @@ namespace DigitalSchoolApi.Controllers using (IDbConnection conncore = new SqlConnection(_coresqlConnection)) { conncore.Execute( - "insert into LR_Base_Log(F_LogId,F_CategoryId,F_SourceObjectId,F_SourceContentJson,F_OperateTime) values(newid(),121,'ccb','" + Learun.Util.Str.ReplaceHtml(reStr) + "',getdate())"); + "insert into LR_Base_Log(F_LogId,F_CategoryId,F_SourceObjectId,F_SourceContentJson,F_OperateTime) values(newid(),121,'ccb','s = 000000: "+ Learun.Util.Str.ReplaceHtml(reStr) + "',getdate())"); } string Orderid = ((XmlElement)xml.SelectSingleNode("TX/TX_INFO/LIST/ORDER")).InnerText; string PAYMENT_MONEY = ((XmlElement)xml.SelectSingleNode("TX/TX_INFO/LIST/PAYMENT_MONEY")).InnerText; @@ -245,7 +245,7 @@ group by a.FSYear,b.StuNo ) aa left join using (IDbConnection conncore = new SqlConnection(_coresqlConnection)) { conncore.Execute( - "insert into LR_Base_Log(F_LogId,F_CategoryId,F_SourceObjectId,F_SourceContentJson,F_OperateTime) values(newid(),121,'ccb','" + e.Message + "',getdate())"); + "insert into LR_Base_Log(F_LogId,F_CategoryId,F_SourceObjectId,F_SourceContentJson,F_OperateTime) values(newid(),121,'ccb','catch error:" + e.Message + ":"+e.StackTrace+"',getdate())"); } } } From fa7d6a90587c407a631226a044a1414200d4b39c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=9D=A4=20=E6=A2=81?= Date: Mon, 28 Aug 2023 18:24:58 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=AD=A6=E7=94=9F?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=B8=93?= =?UTF-8?q?=E4=B8=9A=E4=B8=8D=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DigitalSchoolApi/Controllers/YKTTrabs.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DigitalSchoolApi/Controllers/YKTTrabs.cs b/DigitalSchoolApi/Controllers/YKTTrabs.cs index 73451f2..92c788c 100644 --- a/DigitalSchoolApi/Controllers/YKTTrabs.cs +++ b/DigitalSchoolApi/Controllers/YKTTrabs.cs @@ -1441,7 +1441,7 @@ namespace DigitalSchoolApi.Controllers //教室组织机构 List zzjg = conn_oracle.Query("select * from V_JS_ZZJG where ID!='0'").ToList(); //学生信息 - List xsxx = conn_oracle.Query("select * from V_XSXX").ToList(); + List xsxx = conn_oracle.Query("select * from V_XSXX where MAJOR_CODE is not null ").ToList(); //记录获取数据条数 using (IDbConnection conncore = new SqlConnection(_coresqlConnection)) { From 5df558ffa83ea7f35f272d027b70c3e251c0142d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=9D=A4=20=E6=A2=81?= Date: Wed, 30 Aug 2023 17:19:07 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=90=8C=E6=AD=A5bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DigitalSchoolApi/Controllers/YKTTrabs.cs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/DigitalSchoolApi/Controllers/YKTTrabs.cs b/DigitalSchoolApi/Controllers/YKTTrabs.cs index 92c788c..abf6fce 100644 --- a/DigitalSchoolApi/Controllers/YKTTrabs.cs +++ b/DigitalSchoolApi/Controllers/YKTTrabs.cs @@ -1911,7 +1911,7 @@ namespace DigitalSchoolApi.Controllers } if (!string.IsNullOrEmpty(item.SEX_CODE)) { - sb.Append($" GenderNo='{item.SEX_CODE}',"); + sb.Append(" GenderNo='"+(item.SEX_CODE=="1"?"1":"0")+"',"); } //民族 if (!string.IsNullOrEmpty(item.NATION_CODE)) @@ -2056,8 +2056,8 @@ namespace DigitalSchoolApi.Controllers } if (!string.IsNullOrEmpty(xsxx.SEX_CODE)) { - fieleSb.Append("IdentityCardNo,"); - sb.Append($" '{xsxx.SEX_CODE}',"); + fieleSb.Append("GenderNo,"); + sb.Append(" '" + (xsxx.SEX_CODE == "1" ? "1" : "0") + "',"); } //民族 if (!string.IsNullOrEmpty(xsxx.NATION_CODE)) @@ -2101,7 +2101,12 @@ namespace DigitalSchoolApi.Controllers fieleSb.Append("Grade,"); sb.Append($" '{xsxx.ENROLL_GRADE.ToString().Substring(2)}',"); } - sb.Append(@" InSchoolStatus='" + (xsxx.IS_NORMAL) + "',"); + + if (xsxx.IS_NORMAL!=null) + { + fieleSb.Append("InSchoolStatus,"); + sb.Append(" '" + (xsxx.IS_NORMAL) + "',"); + } //去掉最后一个逗号 if (fieleSb.ToString().Contains(",") && sb.ToString().Contains(",")) { From 164dd298a3af7e87588e97ef87d15e206e4385b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=9D=A4=20=E6=A2=81?= Date: Thu, 31 Aug 2023 13:14:52 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=96=B0=E7=94=9F=E8=A1=A8=E7=BC=B4=E8=B4=B9=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/PayFeeResultTwoController.cs | 60 ++++++++++--- DigitalSchoolApi/DigitalSchoolApi.csproj | 1 + .../Models/FinaChargeStuYearEntity.cs | 90 +++++++++++++++++++ 3 files changed, 139 insertions(+), 12 deletions(-) create mode 100644 DigitalSchoolApi/Models/FinaChargeStuYearEntity.cs diff --git a/DigitalSchoolApi/Controllers/PayFeeResultTwoController.cs b/DigitalSchoolApi/Controllers/PayFeeResultTwoController.cs index 80d72cd..b072dd7 100644 --- a/DigitalSchoolApi/Controllers/PayFeeResultTwoController.cs +++ b/DigitalSchoolApi/Controllers/PayFeeResultTwoController.cs @@ -27,6 +27,42 @@ namespace DigitalSchoolApi.Controllers private static string payresulturl = ConfigurationManager.AppSettings["payresulturl"]; + + /// + /// 定时更新线上收费状态到新生表 + /// + /// + public IHttpActionResult SyncPayStatusToFresh() + { + RecurringJob.AddOrUpdate("SyncPayStatusToFresh", + () => SyncStuInfoFreshPayStatus(), + Cron.Minutely, TimeZoneInfo.Local); + return Ok(); + } + + /// + /// 更新线上收费状态到新生表 + /// + public void SyncStuInfoFreshPayStatus() + { + try + { + using (IDbConnection conn = new SqlConnection(_sqlConnection)) + { + conn.Execute(@"update StuInfoFresh set payfeestatus=1 + from FinaChargeStuYear a left join StuInfoFresh b on a.stuno = b.stuno where a.PayFeeStatus <> 0"); + } + } + catch (Exception e) + { + using (IDbConnection conncore = new SqlConnection(_coresqlConnection)) + { + conncore.Execute( + "insert into LR_Base_Log(F_LogId,F_CategoryId,F_SourceObjectId,F_SourceContentJson,F_OperateTime) values(newid(),122,'syncpaystatustofresh','" + e.Message + "',getdate())"); + } + } + } + /// /// 每分钟执行缴费后处理 /// @@ -91,7 +127,7 @@ namespace DigitalSchoolApi.Controllers foreach (var stuorderEntity in stuorderlist) { //开票 - YKTTrabs.InvoiceEBillMethodTwo(stuorderEntity); + YKTTrabs.InvoiceEBillMethodTwo(stuorderEntity); } } } @@ -140,7 +176,7 @@ namespace DigitalSchoolApi.Controllers using (IDbConnection conncore = new SqlConnection(_coresqlConnection)) { conncore.Execute( - "insert into LR_Base_Log(F_LogId,F_CategoryId,F_SourceObjectId,F_SourceContentJson,F_OperateTime) values(newid(),121,'ccb','s = 000000: "+ Learun.Util.Str.ReplaceHtml(reStr) + "',getdate())"); + "insert into LR_Base_Log(F_LogId,F_CategoryId,F_SourceObjectId,F_SourceContentJson,F_OperateTime) values(newid(),121,'ccb','s = 000000: " + Learun.Util.Str.ReplaceHtml(reStr) + "',getdate())"); } string Orderid = ((XmlElement)xml.SelectSingleNode("TX/TX_INFO/LIST/ORDER")).InnerText; string PAYMENT_MONEY = ((XmlElement)xml.SelectSingleNode("TX/TX_INFO/LIST/PAYMENT_MONEY")).InnerText; @@ -162,7 +198,7 @@ namespace DigitalSchoolApi.Controllers //string Orderid = item.orderid; //string REM1 = item.StuNo; //string REM2 = item.YearNo.ToString(); - if (ORDER_STATUS=="1") + if (ORDER_STATUS == "1") { conn.Execute("update FinaChargeStuOrder set SJAmount='" + PAYMENT_MONEY + "',Status='" + ORDER_STATUS + "',PayTime='" + TRAN_DATE + "',PayMode='" + PAY_MODE + "',BankOrder='" + OriOvrlsttnEV_Trck_No + "' where orderid='" + Orderid + "'"); ////判断实缴金额是否缴清费用 @@ -180,30 +216,30 @@ namespace DigitalSchoolApi.Controllers //} //记录缴费前余额、待缴金额 var oldFinaChargeStuYearItem = conn.Query(@"select b.* from [dbo].[FinaChargeStuOrderDetail] a left join [dbo].[FinaChargeStuYearItem] b on a.ChargeItemCode=b.ChargeItemCode - where a.[FCSOId] = '"+item.Id+"' and b.FSYId = '"+ item.FSYId + "'"); + where a.[FCSOId] = '" + item.Id + "' and b.FSYId = '" + item.FSYId + "'"); //实缴、缴费余额更新 //FinaChargeStuYearItem表 conn.Execute(@"update [dbo].[FinaChargeStuYearItem] set SJAmount=b.SJAmount+a.SJAmount,NeedToPay=NeedToPay-a.SJAmount,PayFeeStatus=(case when(NeedToPay-a.SJAmount<=0) then 1 when(NeedToPay-a.SJAmount=Standard) then 0 else 4 end) from [dbo].[FinaChargeStuOrderDetail] a left join [dbo].[FinaChargeStuYearItem] b on a.ChargeItemCode=b.ChargeItemCode -where a.[FCSOId]='" + item.Id + "' and b.FSYId='"+item.FSYId+"'"); +where a.[FCSOId]='" + item.Id + "' and b.FSYId='" + item.FSYId + "'"); //FinaChargeStuYear表 conn.Execute(@" update FinaChargeStuYear set SJAmount=aa.SJAmount,NeedToPay=aa.NeedToPay,PayFeeStatus=(case when(aa.NeedToPay<=0) then 1 else 4 end) from (select isnull(sum(a.[NeedToPay]),0) as [NeedToPay],isnull(sum(a.SJAmount),0) as SJAmount,a.FSYear,b.StuNo from FinaChargeStuYearItem a left join FinaChargeStuYear b on a.FSYId=b.FSYId group by a.FSYear,b.StuNo ) aa left join FinaChargeStuYear b on aa.stuno=b.stuno and aa.FSYear=b.FSYear - where aa.StuNo='" + item.StuNo+"' and aa.FSYear='"+item.YearNo+"'"); + where aa.StuNo='" + item.StuNo + "' and aa.FSYear='" + item.YearNo + "'"); //FinaChargeStudent表 conn.Execute(@"update FinaChargeStudent set NeedToPay=a.NeedToPay from (select isnull(sum([NeedToPay]),0) as [NeedToPay],StuNo from [FinaChargeStuYear] group by StuNo) a left join - FinaChargeStudent b on a.stuno=b.stuno where a.stuno='" + item.StuNo+"'"); + FinaChargeStudent b on a.stuno=b.stuno where a.stuno='" + item.StuNo + "'"); //FinaChargeStuBalance流水表 //记录缴费后余额、待缴金额 var newFinaChargeStuYearItem = conn.Query(@"select b.* from [dbo].[FinaChargeStuOrderDetail] a left join [dbo].[FinaChargeStuYearItem] b on a.ChargeItemCode=b.ChargeItemCode where a.[FCSOId] = '" + item.Id + "' and b.FSYId = '" + item.FSYId + "'"); - IEnumerable detaillist =conn.Query("select * from FinaChargeStuOrderDetail where FCSOId='"+item.Id+"'"); + IEnumerable detaillist = conn.Query("select * from FinaChargeStuOrderDetail where FCSOId='" + item.Id + "'"); foreach (var finaChargeStuOrderDetailEntity in detaillist) { - if (finaChargeStuOrderDetailEntity.SJAmount>0) + if (finaChargeStuOrderDetailEntity.SJAmount > 0) { //计算学生缴费项目当前欠缴金额 var olditem = oldFinaChargeStuYearItem.FirstOrDefault(m => m.ChargeItemCode == finaChargeStuOrderDetailEntity.ChargeItemCode); @@ -214,8 +250,8 @@ group by a.FSYear,b.StuNo ) aa left join "'0','" + newitem.FSBlance + "',getdate(),'1')"); } } - int PayFeeStatus = Convert.ToInt32(conn.ExecuteScalar("select PayFeeStatus from FinaChargeStuYear where StuNo='"+item.StuNo+"' and FSYear='"+item.YearNo+"'")); - if (PayFeeStatus==1) + int PayFeeStatus = Convert.ToInt32(conn.ExecuteScalar("select PayFeeStatus from FinaChargeStuYear where StuNo='" + item.StuNo + "' and FSYear='" + item.YearNo + "'")); + if (PayFeeStatus == 1) { //开票 Task.Run(() => YKTTrabs.InvoiceEBillMethodTwo(item)); @@ -245,7 +281,7 @@ group by a.FSYear,b.StuNo ) aa left join using (IDbConnection conncore = new SqlConnection(_coresqlConnection)) { conncore.Execute( - "insert into LR_Base_Log(F_LogId,F_CategoryId,F_SourceObjectId,F_SourceContentJson,F_OperateTime) values(newid(),121,'ccb','catch error:" + e.Message + ":"+e.StackTrace+"',getdate())"); + "insert into LR_Base_Log(F_LogId,F_CategoryId,F_SourceObjectId,F_SourceContentJson,F_OperateTime) values(newid(),121,'ccb','catch error:" + e.Message + ":" + e.StackTrace + "',getdate())"); } } } diff --git a/DigitalSchoolApi/DigitalSchoolApi.csproj b/DigitalSchoolApi/DigitalSchoolApi.csproj index 335f2f6..b8b867e 100644 --- a/DigitalSchoolApi/DigitalSchoolApi.csproj +++ b/DigitalSchoolApi/DigitalSchoolApi.csproj @@ -419,6 +419,7 @@ + diff --git a/DigitalSchoolApi/Models/FinaChargeStuYearEntity.cs b/DigitalSchoolApi/Models/FinaChargeStuYearEntity.cs new file mode 100644 index 0000000..6d8b259 --- /dev/null +++ b/DigitalSchoolApi/Models/FinaChargeStuYearEntity.cs @@ -0,0 +1,90 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2023-08-07 15:52 + /// 描 述：学生年度缴费管理 + /// + public class FinaChargeStuYearEntity + { + #region 实体成员 + /// + /// FSYId + /// + public string FSYId { get; set; } + /// + /// StuNo + /// + public string StuNo { get; set; } + /// + /// FSYear + /// + public int? FSYear { get; set; } + /// + /// 应缴金额（收费标准） + /// + public decimal? YJAmount { get; set; } + /// + /// 实缴金额（已缴金额） + /// + public decimal? SJAmount { get; set; } + /// + /// 应缴余额 + /// + public decimal? NeedToPay { get; set; } + /// + /// 超出应收额 + /// + public decimal? FSBlance { get; set; } + /// + /// 缴费标志（0未缴费，1已缴清，4部分缴纳） + /// + public int? PayFeeStatus { get; set; } + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.FSYId = Guid.NewGuid().ToString(); + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue) + { + this.FSYId = keyValue; + } + #endregion + #region 扩展字段 + [NotMapped] + public string DeptNo { get; set; } + [NotMapped] + public string MajorNo { get; set; } + [NotMapped] + public string ClassNo { get; set; } + [NotMapped] + public string Grade { get; set; } + [NotMapped] + public string IdentityCardNo { get; set; } + [NotMapped] + public string StuName { get; set; } + [NotMapped] + public bool? GenderNo { get; set; } + [NotMapped] + public decimal? PayMoney { get; set; } + [NotMapped] + public string orderid { get; set; } + #endregion + } +} + From c9d7c44fa1ab35e1a49e4395c8d5a9f26e7df24d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=9D=A4=20=E6=A2=81?= Date: Fri, 8 Dec 2023 21:54:30 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E8=A5=BF=E6=98=8C=E7=BC=B4=E8=B4=B9?= =?UTF-8?q?=E4=BA=8C=E6=9C=9F=E8=A1=A5=E5=BC=80=E5=8F=91=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/PayFeeResultTwoController.cs | 39 ++++++++++++++++++- DigitalSchoolApi/Controllers/YKTTrabs.cs | 2 +- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/DigitalSchoolApi/Controllers/PayFeeResultTwoController.cs b/DigitalSchoolApi/Controllers/PayFeeResultTwoController.cs index b072dd7..b2383f0 100644 --- a/DigitalSchoolApi/Controllers/PayFeeResultTwoController.cs +++ b/DigitalSchoolApi/Controllers/PayFeeResultTwoController.cs @@ -94,6 +94,18 @@ namespace DigitalSchoolApi.Controllers BackgroundJob.Enqueue(() => UnInvoiceHandle(true)); return Ok(); } + /// + /// 根据年度学生缴费id触发开票任务 + /// + /// + /// + [HttpPost] + public IHttpActionResult SetUnInvoiceHandleByFSYID(string FSYID) + { + + BackgroundJob.Enqueue(() => DoUnInvoiceHandleByFSYID(FSYID)); + return Ok(); + } /// /// 补开发票 @@ -106,7 +118,6 @@ namespace DigitalSchoolApi.Controllers return Ok(); } - public void UnInvoiceHandle(bool isexcel) { try @@ -140,6 +151,32 @@ namespace DigitalSchoolApi.Controllers } } } + public void DoUnInvoiceHandleByFSYID(string FSYID) + { + try + { + using (IDbConnection conn = new SqlConnection(_sqlConnection)) + { + List stuorderlist = null; + stuorderlist = conn.Query(@"select StuNo,YearNo,FSYId,'ExcelOffLine' as PayMode from FinaChargeStuOrder where Status=1 and fsyid='"+ FSYID + @"' + group by StuNo, YearNo, FSYId, PayMode").ToList(); + foreach (var stuorderEntity in stuorderlist) + { + //开票 + YKTTrabs.InvoiceEBillMethodTwo(stuorderEntity); + break; + } + } + } + catch (Exception e) + { + using (IDbConnection conncore = new SqlConnection(_coresqlConnection)) + { + conncore.Execute( + "insert into LR_Base_Log(F_LogId,F_CategoryId,F_SourceObjectId,F_SourceContentJson,F_OperateTime) values(newid(),121,'piaoju','" + e.Message + "',getdate())"); + } + } + } public void GetResult(bool iflasttenminutes) { diff --git a/DigitalSchoolApi/Controllers/YKTTrabs.cs b/DigitalSchoolApi/Controllers/YKTTrabs.cs index abf6fce..70081a9 100644 --- a/DigitalSchoolApi/Controllers/YKTTrabs.cs +++ b/DigitalSchoolApi/Controllers/YKTTrabs.cs @@ -1059,7 +1059,7 @@ namespace DigitalSchoolApi.Controllers } if (orderEntity.PayMode == "ExcelOffLine")//BHK:建行;THK:他行;ZFB:支付宝;CFT:微信 { - biParam.channel = "26"; + biParam.channel = "11"; } biParam.payerType = "1"; biParam.recer = "林智慧"; From bc1a9968aaf1f76e848ffca497ac20f50fdc5398 Mon Sep 17 00:00:00 2001 From: zzj <31836194@qq.com> Date: Wed, 20 Mar 2024 11:56:31 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DigitalSchoolApi/Controllers/YKTTrabs.cs | 38 +++++++++++++++++++++- DigitalSchoolApi/Models/XCStudentEntity.cs | 24 ++++++++++++++ 2 files changed, 61 insertions(+), 1 deletion(-) diff --git a/DigitalSchoolApi/Controllers/YKTTrabs.cs b/DigitalSchoolApi/Controllers/YKTTrabs.cs index 70081a9..7512b3d 100644 --- a/DigitalSchoolApi/Controllers/YKTTrabs.cs +++ b/DigitalSchoolApi/Controllers/YKTTrabs.cs @@ -1434,6 +1434,8 @@ namespace DigitalSchoolApi.Controllers List zyxx = conn_oracle.Query("select * from V_ZYXX").ToList(); //课程信息 List kcxx = conn_oracle.Query("select * from V_KCXX").ToList(); + //部门 + var depts = conn_oracle.Query("select * from V_DEPT").ToList(); //教师 List jsxx = conn_oracle.Query("select * from V_JSXX").ToList(); //行政班级表 @@ -1449,6 +1451,8 @@ namespace DigitalSchoolApi.Controllers $"insert into LR_Base_Log(F_LogId,F_CategoryId,F_SourceObjectId,F_SourceContentJson,F_OperateTime) values(newid(),55555,'中间库专业数据','获取oracle专业数据共{zyxx.Count()}条',getdate())"); conncore.Execute( $"insert into LR_Base_Log(F_LogId,F_CategoryId,F_SourceObjectId,F_SourceContentJson,F_OperateTime) values(newid(),55555,'中间库课程数据','获取oracle课程数据共{kcxx.Count()}条',getdate())"); + conncore.Execute( + $"insert into LR_Base_Log(F_LogId,F_CategoryId,F_SourceObjectId,F_SourceContentJson,F_OperateTime) values(newid(),55555,'中间库部门数据','获取oracle部门数据共{depts.Count()}条',getdate())"); conncore.Execute( $"insert into LR_Base_Log(F_LogId,F_CategoryId,F_SourceObjectId,F_SourceContentJson,F_OperateTime) values(newid(),55555,'中间库教师数据','获取oracle教师数据共{jsxx.Count()}条',getdate())"); conncore.Execute( @@ -1461,6 +1465,38 @@ namespace DigitalSchoolApi.Controllers #endregion + using (var db=new SqlConnection(_coresqlConnection)) + { + + #region 部门 + var departments = db.Query("select * from LR_Base_Department").ToList(); + var anumDept = 0; + var unumDept = 0; + foreach (var item in depts) + { + try + { + if(departments.Any(x=>x.F_DepartmentId==item.ID)) + { + var sql = $"update LR_Base_Department set F_FullName='{item.NAME_}',F_ParentId='{item.PID}',F_EnCode='{item.ID}',F_ShortName='{item.NAME_SHORT}',F_CreateDate='{DateTime.Now}' where F_DepartmentId='{item.ID}'"; + anumDept += db.Execute(sql); + } + else + { + var sql = $"insert into LR_Base_Department (F_DepartmentId,F_CompanyId,F_ParentId,F_EnCode,F_FullName,F_ShortName,F_SortCode,F_DeleteMark,F_EnabledMark,F_CreateDate,F_Order) values ('{item.ID}','207fa1a9-160c-4943-a89b-8fa4db0547ce','{item.PID}','{item.ID}','{item.NAME_}','{item.NAME_SHORT}',0,0,1,'{DateTime.Now}',0)"; + anumDept += db.Execute(sql); + } + } + catch (Exception ex) + { + db.Execute( + $"insert into LR_Base_Log(F_LogId,F_CategoryId,F_SourceObjectId,F_SourceContentJson,F_OperateTime) values(newid(),55555,'更新部门数据','编号（{item.ID}），姓名（{item.NAME_}）更新时出现异常：{ex.Message}',getdate())"); + } + } + + #endregion + } + using (IDbConnection conncores = new SqlConnection(_sqlConnection)) { #region 专业 @@ -1583,7 +1619,7 @@ namespace DigitalSchoolApi.Controllers } #endregion - + #region 教师信息 List teachinfo = conncores.Query("select * from empinfo").ToList(); int anumTeach = 0; diff --git a/DigitalSchoolApi/Models/XCStudentEntity.cs b/DigitalSchoolApi/Models/XCStudentEntity.cs index 5affff0..2cfc08f 100644 --- a/DigitalSchoolApi/Models/XCStudentEntity.cs +++ b/DigitalSchoolApi/Models/XCStudentEntity.cs @@ -933,4 +933,28 @@ namespace DigitalSchoolApi.Models public string STU_ROLL_CODE { get; set; } public string IS_NORMAL { get; set; } } + + public class V_Dept + { + public string ID { get; set; } + + public string CODE_ { get; set; } + + public string NAME_ { get; set; } + + public string PID { get; set; } + + public string PATH_ { get; set; } + + public string LEVEL_ { get; set; } + + public string LEVEL_TYPE { get; set; } + + public int ISTRUE { get; set; } + + public string NAME_SHORT { get; set; } + + public string ADMIN_MANAGE_TEA_NO { get; set; } + } + } \ No newline at end of file From 1d8b214fbf0cd2871a93a468c6afc97d9aaf16fc Mon Sep 17 00:00:00 2001 From: zzj <31836194@qq.com> Date: Thu, 21 Mar 2024 17:12:33 +0800 Subject: [PATCH 07/10] --- DigitalSchoolApi/Controllers/YKTTrabs.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/DigitalSchoolApi/Controllers/YKTTrabs.cs b/DigitalSchoolApi/Controllers/YKTTrabs.cs index 7512b3d..8492281 100644 --- a/DigitalSchoolApi/Controllers/YKTTrabs.cs +++ b/DigitalSchoolApi/Controllers/YKTTrabs.cs @@ -1435,7 +1435,7 @@ namespace DigitalSchoolApi.Controllers //课程信息 List kcxx = conn_oracle.Query("select * from V_KCXX").ToList(); //部门 - var depts = conn_oracle.Query("select * from V_DEPT").ToList(); + List depts = conn_oracle.Query("select * from V_DEPT").ToList(); //教师 List jsxx = conn_oracle.Query("select * from V_JSXX").ToList(); //行政班级表 @@ -1465,13 +1465,13 @@ namespace DigitalSchoolApi.Controllers #endregion - using (var db=new SqlConnection(_coresqlConnection)) + using (IDbConnection db =new SqlConnection(_coresqlConnection)) { #region 部门 - var departments = db.Query("select * from LR_Base_Department").ToList(); - var anumDept = 0; - var unumDept = 0; + List departments = db.Query("select * from LR_Base_Department").ToList(); + int anumDept = 0; + int unumDept = 0; foreach (var item in depts) { try From 09e1a2229d148cedeea1c32effca1d75829640a1 Mon Sep 17 00:00:00 2001 From: dao Date: Thu, 28 Mar 2024 09:20:34 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E8=A5=BF=E6=98=8C=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E9=83=A8=E9=97=A8=EF=BC=88=E9=83=A8=E9=97=A8=E8=B4=9F=E8=B4=A3?= =?UTF-8?q?=E4=BA=BA=E3=80=81=E5=A4=87=E6=B3=A8=E7=AD=89=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DigitalSchoolApi/Controllers/YKTTrabs.cs | 95 +++++++++++++----------- 1 file changed, 53 insertions(+), 42 deletions(-) diff --git a/DigitalSchoolApi/Controllers/YKTTrabs.cs b/DigitalSchoolApi/Controllers/YKTTrabs.cs index 8492281..f23d156 100644 --- a/DigitalSchoolApi/Controllers/YKTTrabs.cs +++ b/DigitalSchoolApi/Controllers/YKTTrabs.cs @@ -813,7 +813,7 @@ namespace DigitalSchoolApi.Controllers conncore.Execute( "insert into LR_Base_Log(F_LogId,F_CategoryId,F_SourceObjectId,F_SourceContentJson,F_OperateTime) values(newid(),121,'typecode','开票typecode:" + item.Key + "',getdate())"); } - InvoiceEBillByTypeTwo(conn,orderEntity, item.Key, item); + InvoiceEBillByTypeTwo(conn, orderEntity, item.Key, item); } catch (Exception ex) { @@ -1030,7 +1030,7 @@ namespace DigitalSchoolApi.Controllers } } - private static void InvoiceEBillByTypeTwo(IDbConnection conn,FinaChargeStuOrderEntity orderEntity, string billCode, IGrouping stuEnrollFeeOrderDetailList) + private static void InvoiceEBillByTypeTwo(IDbConnection conn, FinaChargeStuOrderEntity orderEntity, string billCode, IGrouping stuEnrollFeeOrderDetailList) { Encoding encoding = Encoding.UTF8; string StuName = conn.QuerySingle("select StuName from FinaChargeStudent where stuno='" + orderEntity.StuNo + "'").StuName; @@ -1465,37 +1465,7 @@ namespace DigitalSchoolApi.Controllers #endregion - using (IDbConnection db =new SqlConnection(_coresqlConnection)) - { - - #region 部门 - List departments = db.Query("select * from LR_Base_Department").ToList(); - int anumDept = 0; - int unumDept = 0; - foreach (var item in depts) - { - try - { - if(departments.Any(x=>x.F_DepartmentId==item.ID)) - { - var sql = $"update LR_Base_Department set F_FullName='{item.NAME_}',F_ParentId='{item.PID}',F_EnCode='{item.ID}',F_ShortName='{item.NAME_SHORT}',F_CreateDate='{DateTime.Now}' where F_DepartmentId='{item.ID}'"; - anumDept += db.Execute(sql); - } - else - { - var sql = $"insert into LR_Base_Department (F_DepartmentId,F_CompanyId,F_ParentId,F_EnCode,F_FullName,F_ShortName,F_SortCode,F_DeleteMark,F_EnabledMark,F_CreateDate,F_Order) values ('{item.ID}','207fa1a9-160c-4943-a89b-8fa4db0547ce','{item.PID}','{item.ID}','{item.NAME_}','{item.NAME_SHORT}',0,0,1,'{DateTime.Now}',0)"; - anumDept += db.Execute(sql); - } - } - catch (Exception ex) - { - db.Execute( - $"insert into LR_Base_Log(F_LogId,F_CategoryId,F_SourceObjectId,F_SourceContentJson,F_OperateTime) values(newid(),55555,'更新部门数据','编号（{item.ID}），姓名（{item.NAME_}）更新时出现异常：{ex.Message}',getdate())"); - } - } - - #endregion - } + var teachinfo = new List(); using (IDbConnection conncores = new SqlConnection(_sqlConnection)) { @@ -1532,7 +1502,7 @@ namespace DigitalSchoolApi.Controllers sb.Remove(sb.ToString().LastIndexOf(","), 1); } //修改条件 - sb.Append($" where MajorNo='{item.CODE_ }' and MajorName='{item.NAME_}'"); + sb.Append($" where MajorNo='{item.CODE_}' and MajorName='{item.NAME_}'"); unumMajor += conncores.Execute(sb.ToString()); } else @@ -1592,7 +1562,7 @@ namespace DigitalSchoolApi.Controllers sb.Remove(sb.ToString().LastIndexOf(","), 1); } //修改条件 - sb.Append($" where lessonno='{item.CODE_ }' and lessonName='{item.NAME_}'"); + sb.Append($" where lessonno='{item.CODE_}' and lessonName='{item.NAME_}'"); unumlesson += conncores.Execute(sb.ToString()); } else @@ -1619,9 +1589,9 @@ namespace DigitalSchoolApi.Controllers } #endregion - + #region 教师信息 - List teachinfo = conncores.Query("select * from empinfo").ToList(); + teachinfo = conncores.Query("select * from empinfo").ToList(); int anumTeach = 0; int unumTeach = 0; foreach (var item in jsxx) @@ -1678,7 +1648,7 @@ namespace DigitalSchoolApi.Controllers sb.Remove(sb.ToString().LastIndexOf(","), 1); } //修改条件 - sb.Append($" where empno='{item.TEA_NO }' and empName='{item.NAME_}'"); + sb.Append($" where empno='{item.TEA_NO}' and empName='{item.NAME_}'"); unumTeach += conncores.Execute(sb.ToString()); } else @@ -1764,7 +1734,7 @@ namespace DigitalSchoolApi.Controllers sb.Remove(sb.ToString().LastIndexOf(","), 1); } //修改条件 - sb.Append($" where classno='{item.NO_ }' and className='{item.NAME_}'"); + sb.Append($" where classno='{item.NO_}' and className='{item.NAME_}'"); unumClass += conncores.Execute(sb.ToString()); } else @@ -1849,7 +1819,7 @@ namespace DigitalSchoolApi.Controllers sb.Remove(sb.ToString().LastIndexOf(","), 1); } //修改条件 - sb.Append($" where classroomno='{item.CODE_ }' and classroomName='{item.NAME_}'"); + sb.Append($" where classroomno='{item.CODE_}' and classroomName='{item.NAME_}'"); unumCroom += conncores.Execute(sb.ToString()); } else @@ -1881,6 +1851,47 @@ namespace DigitalSchoolApi.Controllers #endregion } + using (IDbConnection db = new SqlConnection(_coresqlConnection)) + { + + #region 部门 + List departments = db.Query("select * from LR_Base_Department").ToList(); + int anumDept = 0; + int unumDept = 0; + + foreach (var item in depts) + { + try + { + if (item.LEVEL_TYPE.ToLower() != "xx" && item.LEVEL_TYPE.ToLower() != "zy") + { + var manager = string.Empty; + if (!string.IsNullOrWhiteSpace(item.ADMIN_MANAGE_TEA_NO)) + { + manager = teachinfo.FirstOrDefault(x => x.EmpNo == item.ADMIN_MANAGE_TEA_NO)?.EmpId ?? ""; + } + if (departments.Any(x => x.F_DepartmentId == item.ID)) + { + var sql = $"update LR_Base_Department set F_FullName='{item.NAME_}',F_ParentId='{item.PID}',F_EnCode='{item.CODE_}',F_ShortName='{item.NAME_SHORT}',F_Manager='{manager}',F_Description='{item.LEVEL_TYPE}',F_CreateDate='{DateTime.Now}' where F_DepartmentId='{item.ID}'"; + anumDept += db.Execute(sql); + } + else + { + var sql = $"insert into LR_Base_Department (F_DepartmentId,F_CompanyId,F_ParentId,F_EnCode,F_FullName,F_ShortName,F_Manager,F_Description,F_SortCode,F_DeleteMark,F_EnabledMark,F_CreateDate,F_Order) values ('{item.ID}','207fa1a9-160c-4943-a89b-8fa4db0547ce','{item.PID}','{item.CODE_}','{item.NAME_}','{item.NAME_SHORT}','{manager}','{item.LEVEL_TYPE}',0,0,1,'{DateTime.Now}',0)"; + anumDept += db.Execute(sql); + } + } + + } + catch (Exception ex) + { + db.Execute( + $"insert into LR_Base_Log(F_LogId,F_CategoryId,F_SourceObjectId,F_SourceContentJson,F_OperateTime) values(newid(),55555,'更新部门数据','编号（{item.ID}），姓名（{item.NAME_}）更新时出现异常：{ex.Message}',getdate())"); + } + } + + #endregion + } //获取oracle学生数据 //List xcStudentList = conn_oracle.Query(@"select ID,stu_no,name_, //(case when dept_id in ('01','02','03') then dept_id when dept_id='00' then '06' when dept_id='23' then '04' when dept_id='06' then '07' else '' end )as dept_id, @@ -1947,7 +1958,7 @@ namespace DigitalSchoolApi.Controllers } if (!string.IsNullOrEmpty(item.SEX_CODE)) { - sb.Append(" GenderNo='"+(item.SEX_CODE=="1"?"1":"0")+"',"); + sb.Append(" GenderNo='" + (item.SEX_CODE == "1" ? "1" : "0") + "',"); } //民族 if (!string.IsNullOrEmpty(item.NATION_CODE)) @@ -2138,7 +2149,7 @@ namespace DigitalSchoolApi.Controllers sb.Append($" '{xsxx.ENROLL_GRADE.ToString().Substring(2)}',"); } - if (xsxx.IS_NORMAL!=null) + if (xsxx.IS_NORMAL != null) { fieleSb.Append("InSchoolStatus,"); sb.Append(" '" + (xsxx.IS_NORMAL) + "',"); From b072a66a51944f7083e966b5e9553b3637eeb18b Mon Sep 17 00:00:00 2001 From: dao Date: Fri, 29 Mar 2024 13:27:48 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E8=A5=BF=E6=98=8C=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=95=99=E5=B8=88=E3=80=81=E5=AD=A6=E7=94=9F=E3=80=81=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DigitalSchoolApi/Controllers/YKTTrabs.cs | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/DigitalSchoolApi/Controllers/YKTTrabs.cs b/DigitalSchoolApi/Controllers/YKTTrabs.cs index f23d156..3f028ca 100644 --- a/DigitalSchoolApi/Controllers/YKTTrabs.cs +++ b/DigitalSchoolApi/Controllers/YKTTrabs.cs @@ -1598,9 +1598,11 @@ namespace DigitalSchoolApi.Controllers { try { - if (teachinfo.Exists(x => x.EmpNo == item.TEA_NO && x.EmpName == item.NAME_)) + if (teachinfo.Exists(x => x.EmpNo == item.TEA_NO)) { StringBuilder sb = new StringBuilder("update empinfo set "); + sb.Append($" EmpName='{item.NAME_}',"); + sb.Append($" UpdateTime='{DateTime.Now}', "); if (!string.IsNullOrEmpty(item.ZZJG_ID)) { sb.Append($" ZZJG_ID='{item.ZZJG_ID}',"); @@ -1653,7 +1655,7 @@ namespace DigitalSchoolApi.Controllers } else { - int mysql = conncores.Execute($"insert into empinfo (empid,ZZJG_ID,F_DepartmentId,empNo,empName,Birthday,IdentityCardNo,mobile,DegreeNo,HighestRecord,CheckMark,F_CompanyId,BZLB_CODE,BZLX_CODE,IsInActiveStatus) values (newid(), '{item.ZZJG_ID}', '{item.DEPT_ID}', '{item.TEA_NO}', '{item.NAME_}', '{item.BIRTH_DATE}', '{item.IDNO}', '{item.PHONE}', '{item.EDU_ID}', '{item.DEGREE_ID}', '{item.IS_NORMAL}', '207fa1a9-160c-4943-a89b-8fa4db0547ce', '{item.BZLB_CODE}', '{item.BZLX_CODE}', '{item.TEA_STATUS_CODE}')"); + int mysql = conncores.Execute($"insert into empinfo (empid,ZZJG_ID,F_DepartmentId,empNo,empName,Birthday,IdentityCardNo,mobile,DegreeNo,HighestRecord,CheckMark,F_CompanyId,BZLB_CODE,BZLX_CODE,IsInActiveStatus,UpdateTime) values (newid(), '{item.ZZJG_ID}', '{item.DEPT_ID}', '{item.TEA_NO}', '{item.NAME_}', '{item.BIRTH_DATE}', '{item.IDNO}', '{item.PHONE}', '{item.EDU_ID}', '{item.DEGREE_ID}', '{item.IS_NORMAL}', '207fa1a9-160c-4943-a89b-8fa4db0547ce', '{item.BZLB_CODE}', '{item.BZLX_CODE}', '{item.TEA_STATUS_CODE}','{DateTime.Now}')"); anumTeach += mysql; } } @@ -1872,7 +1874,7 @@ namespace DigitalSchoolApi.Controllers } if (departments.Any(x => x.F_DepartmentId == item.ID)) { - var sql = $"update LR_Base_Department set F_FullName='{item.NAME_}',F_ParentId='{item.PID}',F_EnCode='{item.CODE_}',F_ShortName='{item.NAME_SHORT}',F_Manager='{manager}',F_Description='{item.LEVEL_TYPE}',F_CreateDate='{DateTime.Now}' where F_DepartmentId='{item.ID}'"; + var sql = $"update LR_Base_Department set F_FullName='{item.NAME_}',F_ParentId='{item.PID}',F_EnCode='{item.CODE_}',F_ShortName='{item.NAME_SHORT}',F_Manager='{manager}',F_Description='{item.LEVEL_TYPE}',F_ModifyDate='{DateTime.Now}' where F_DepartmentId='{item.ID}'"; anumDept += db.Execute(sql); } else @@ -1919,11 +1921,13 @@ namespace DigitalSchoolApi.Controllers { try { - if (stuInfoBasicList.Exists(x => x.StuNo == item.STU_NO && x.StuName == item.NAME_)) + if (stuInfoBasicList.Exists(x => x.StuNo == item.STU_NO)) { //学生存在，修改 #region 拼接SQL StringBuilder sb = new StringBuilder("update StuInfoBasic set "); + sb.Append($" StuName='{item.NAME_}',"); + sb.Append($" UpdateTime='{DateTime.Now}', "); if (!string.IsNullOrEmpty(item.DEPT_ID)) { sb.Append($" DeptNo='{item.DEPT_ID}',"); @@ -2009,7 +2013,7 @@ namespace DigitalSchoolApi.Controllers { sb.Remove(sb.ToString().LastIndexOf(","), 1); } - sb.Append($" where StuNo='{item.STU_NO}' and StuName='{item.NAME_}'"); + sb.Append($" where StuNo='{item.STU_NO}'"); //System.IO.File.AppendAllText(@"c:\test.txt", sb.ToString() + "\r\n"); #endregion unum += conn.Execute(sb.ToString()); @@ -2067,8 +2071,8 @@ namespace DigitalSchoolApi.Controllers string mysql = "insert into StuInfoBasic("; StringBuilder fieleSb = new StringBuilder(); StringBuilder sb = new StringBuilder(); - fieleSb.Append("StuId,stuno,stuname,CheckMark,F_SchoolId,"); - sb.Append($" NEWID(),'{xsxx.STU_NO}','{xsxx.NAME_}','1','207fa1a9-160c-4943-a89b-8fa4db0547ce',"); + fieleSb.Append("StuId,stuno,stuname,CheckMark,F_SchoolId,UpdateTime,"); + sb.Append($" NEWID(),'{xsxx.STU_NO}','{xsxx.NAME_}','1','207fa1a9-160c-4943-a89b-8fa4db0547ce','{DateTime.Now}',"); if (!string.IsNullOrEmpty(xsxx.DEPT_ID)) { fieleSb.Append("DeptNo,"); From c76da9dde982e6ade5d9428591e2a66e12900c22 Mon Sep 17 00:00:00 2001 From: dao Date: Fri, 29 Mar 2024 15:12:27 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E5=90=8C=E6=AD=A5BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DigitalSchoolApi/Controllers/YKTTrabs.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DigitalSchoolApi/Controllers/YKTTrabs.cs b/DigitalSchoolApi/Controllers/YKTTrabs.cs index 3f028ca..34c737e 100644 --- a/DigitalSchoolApi/Controllers/YKTTrabs.cs +++ b/DigitalSchoolApi/Controllers/YKTTrabs.cs @@ -1650,7 +1650,7 @@ namespace DigitalSchoolApi.Controllers sb.Remove(sb.ToString().LastIndexOf(","), 1); } //修改条件 - sb.Append($" where empno='{item.TEA_NO}' and empName='{item.NAME_}'"); + sb.Append($" where empno='{item.TEA_NO}'"); unumTeach += conncores.Execute(sb.ToString()); } else