diff --git a/DigitalSchoolApi/Controllers/PayFeeResultTwoController.cs b/DigitalSchoolApi/Controllers/PayFeeResultTwoController.cs
index 0b5249d..b2383f0 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())");
+ }
+ }
+ }
+
///
/// 每分钟执行缴费后处理
///
@@ -58,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();
+ }
///
/// 补开发票
@@ -70,7 +118,6 @@ namespace DigitalSchoolApi.Controllers
return Ok();
}
-
public void UnInvoiceHandle(bool isexcel)
{
try
@@ -91,7 +138,33 @@ namespace DigitalSchoolApi.Controllers
foreach (var stuorderEntity in stuorderlist)
{
//开票
- YKTTrabs.InvoiceEBillMethodTwo(stuorderEntity);
+ YKTTrabs.InvoiceEBillMethodTwo(stuorderEntity);
+ }
+ }
+ }
+ 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 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;
}
}
}
@@ -140,7 +213,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;
@@ -162,7 +235,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 +253,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 +287,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 +318,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())");
}
}
}
diff --git a/DigitalSchoolApi/Controllers/YKTTrabs.cs b/DigitalSchoolApi/Controllers/YKTTrabs.cs
index 928270e..521ba26 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 = "林智慧";
@@ -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();
+ //部门
+ List depts = conn_oracle.Query("select * from V_DEPT").ToList();
//教师
List jsxx = conn_oracle.Query("select * from V_JSXX").ToList();
//行政班级表
@@ -1441,7 +1443,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))
{
@@ -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,8 @@ namespace DigitalSchoolApi.Controllers
#endregion
+ var teachinfo = new List();
+
using (IDbConnection conncores = new SqlConnection(_sqlConnection))
{
#region 专业
@@ -1496,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
@@ -1556,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
@@ -1585,16 +1591,18 @@ 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)
{
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}',");
@@ -1642,12 +1650,12 @@ 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
{
- 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;
}
}
@@ -1728,7 +1736,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
@@ -1813,7 +1821,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
@@ -1845,6 +1853,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_ModifyDate='{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,
@@ -1872,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}',");
@@ -1911,7 +1962,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))
@@ -1962,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());
@@ -2020,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,");
@@ -2056,8 +2107,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 +2152,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(","))
{
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
+ }
+}
+
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