diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/FindBack.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/FindBack.js index 6bad98fed..5c899d11e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/FindBack.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/FindBack.js @@ -123,6 +123,7 @@ var bootstrap = function ($, learun) { param.StartTime = startTime; param.EndTime = endTime; param.ApplyStatus = 0; + param.CheckStatus = 2; $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/FindBack.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/FindBack.js index daccfed99..89ef0ff87 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/FindBack.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/FindBack.js @@ -123,6 +123,7 @@ var bootstrap = function ($, learun) { param.StartTime = startTime; param.EndTime = endTime; param.ApplyStatus = 0; + param.CheckStatus = 2; $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/FindBack.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/FindBack.js index e8f4f70f2..8248fd650 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/FindBack.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/FindBack.js @@ -123,6 +123,7 @@ var bootstrap = function ($, learun) { param.StartTime = startTime; param.EndTime = endTime; param.ApplyStatus = 0; + param.CheckStatus = 2; $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/FindBack.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/FindBack.js index 6c1637180..5b5568cca 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/FindBack.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/FindBack.js @@ -123,6 +123,7 @@ var bootstrap = function ($, learun) { param.StartTime = startTime; param.EndTime = endTime; param.ApplyStatus = 0; + param.CheckStatus = 2; $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/FindBack.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/FindBack.js index 54e05df54..d3a3727b4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/FindBack.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/FindBack.js @@ -123,6 +123,7 @@ var bootstrap = function ($, learun) { param.StartTime = startTime; param.EndTime = endTime; param.ApplyStatus = 0; + param.CheckStatus = 2; $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/FindBack.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/FindBack.js index f1878c259..06f21c7f2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/FindBack.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/FindBack.js @@ -123,6 +123,7 @@ var bootstrap = function ($, learun) { param.StartTime = startTime; param.EndTime = endTime; param.ApplyStatus = 0; + param.CheckStatus = 2; $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/FindBack.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/FindBack.js index 2cf2957a5..04d84237f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/FindBack.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/FindBack.js @@ -123,6 +123,7 @@ var bootstrap = function ($, learun) { param.StartTime = startTime; param.EndTime = endTime; param.ApplyStatus = 0; + param.CheckStatus = 2; $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/Index.js index b373a93c1..7aadc3197 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/Index.js @@ -176,19 +176,16 @@ var bootstrap = function ($, learun) { $('#gridtable').jfGrid({ url: top.$.rootUrl + '/LogisticsManagement/Purchase_Travel/GetPageList', headData: [ - { label: "部门", name: "DepartmentId", width: 150, align: "left", - formatter: function (cellvalue, row) { - return row.DepartmentName; - } - }, { label: "申请人", name: "CreatorId", width: 100, align: "left", formatter: function (cellvalue, row) { return row.CreatorName; } }, - { label: "总价格", name: "TotalAmount", width: 100, align: "left"}, - { label: "备注", name: "Remark", width: 100, align: "left"}, + { label: "随行人员", name: "Follows", width: 100, align: "left"}, + { label: "出差原因", name: "Reason", width: 100, align: "left" }, + { label: "开始时间", name: "Starttime", width: 100, align: "left" }, + { label: "结束时间", name: "Endtime", width: 100, align: "left" }, { label: "提交时间", name: "SubmitTime", width: 130, align: "left" }, { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/FindBack.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/FindBack.js index a4b7e4137..4c97f78ca 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/FindBack.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/FindBack.js @@ -123,6 +123,7 @@ var bootstrap = function ($, learun) { param.StartTime = startTime; param.EndTime = endTime; param.ApplyStatus = 0; + param.CheckStatus = 2; $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/FindBack.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/FindBack.js index 513ee84cf..eeb962dbd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/FindBack.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/FindBack.js @@ -123,6 +123,7 @@ var bootstrap = function ($, learun) { param.StartTime = startTime; param.EndTime = endTime; param.ApplyStatus = 0; + param.CheckStatus = 2; $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu/Purchase_EduEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu/Purchase_EduEntity.cs index 7d8a50ee5..dd2e2a8ca 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu/Purchase_EduEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu/Purchase_EduEntity.cs @@ -110,6 +110,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement this.Id = Guid.NewGuid().ToString(); this.CreateTime = DateTime.Now; this.Status = 0; + this.CheckStatus = 0; + this.ApplyStatus = 0; } /// /// 编辑调用 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu/Purchase_EduService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu/Purchase_EduService.cs index 72ea50e27..6471e5300 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu/Purchase_EduService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu/Purchase_EduService.cs @@ -64,11 +64,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("@ApplyStatus", queryParam["ApplyStatus"].ToString(), DbType.String); strSql.Append(" AND (t.ApplyStatus=@ApplyStatus)"); } - if (!queryParam["checkstatus"].IsEmpty()) + if (!queryParam["CheckStatus"].IsEmpty()) { //审核状态 //采购审批通过且报账状态为0的数据 - dp.Add("@CheckStatus", queryParam["checkstatus"].ToString(), DbType.String); + dp.Add("@CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String); strSql.Append(" AND (t.CheckStatus=@CheckStatus)"); } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu_Apply/Purchase_Edu_ApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu_Apply/Purchase_Edu_ApplyService.cs index cb9259340..3f534f20b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu_Apply/Purchase_Edu_ApplyService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu_Apply/Purchase_Edu_ApplyService.cs @@ -67,10 +67,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("DepartmentId",queryParam["DepartmentId"].ToString(), DbType.String); strSql.Append(" AND t.DepartmentId = @DepartmentId "); } - if (!queryParam["checkstatus"].IsEmpty()) + if (!queryParam["CheckStatus"].IsEmpty()) { - dp.Add("checkstatus", queryParam["checkstatus"].ToString(), DbType.String); - strSql.Append(" AND t.checkstatus = @checkstatus "); + dp.Add("CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String); + strSql.Append(" AND t.CheckStatus = @CheckStatus "); } if (!queryParam["Payee"].IsEmpty()) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info/Purchase_InfoEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info/Purchase_InfoEntity.cs index 82911b53a..5e2b1e086 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info/Purchase_InfoEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info/Purchase_InfoEntity.cs @@ -110,6 +110,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement this.Id = Guid.NewGuid().ToString(); this.CreateTime = DateTime.Now; this.Status = 0; + this.CheckStatus = 0; + this.ApplyStatus = 0; } /// /// 编辑调用 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info/Purchase_InfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info/Purchase_InfoService.cs index d04ee2f8a..67e253617 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info/Purchase_InfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info/Purchase_InfoService.cs @@ -64,11 +64,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("@ApplyStatus", queryParam["ApplyStatus"].ToString(), DbType.String); strSql.Append(" AND (t.ApplyStatus=@ApplyStatus)"); } - if (!queryParam["checkstatus"].IsEmpty()) + if (!queryParam["CheckStatus"].IsEmpty()) { //审核状态 //采购审批通过且报账状态为0的数据 - dp.Add("@CheckStatus", queryParam["checkstatus"].ToString(), DbType.String); + dp.Add("@CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String); strSql.Append(" AND (t.CheckStatus=@CheckStatus)"); } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info_Apply/Purchase_Info_ApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info_Apply/Purchase_Info_ApplyService.cs index 654b12141..a44ed7a3f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info_Apply/Purchase_Info_ApplyService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info_Apply/Purchase_Info_ApplyService.cs @@ -67,10 +67,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("DepartmentId",queryParam["DepartmentId"].ToString(), DbType.String); strSql.Append(" AND t.DepartmentId = @DepartmentId "); } - if (!queryParam["checkstatus"].IsEmpty()) + if (!queryParam["CheckStatus"].IsEmpty()) { - dp.Add("checkstatus", queryParam["checkstatus"].ToString(), DbType.String); - strSql.Append(" AND t.checkstatus = @checkstatus "); + dp.Add("CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String); + strSql.Append(" AND t.CheckStatus = @CheckStatus "); } if (!queryParam["Payee"].IsEmpty()) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic/Purchase_LogisticEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic/Purchase_LogisticEntity.cs index c768f4fcf..6566ec959 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic/Purchase_LogisticEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic/Purchase_LogisticEntity.cs @@ -110,6 +110,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement this.Id = Guid.NewGuid().ToString(); this.CreateTime = DateTime.Now; this.Status = 0; + this.CheckStatus = 0; + this.ApplyStatus = 0; } /// /// 编辑调用 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic/Purchase_LogisticService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic/Purchase_LogisticService.cs index 378d24663..75ea27310 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic/Purchase_LogisticService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic/Purchase_LogisticService.cs @@ -64,11 +64,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("@ApplyStatus", queryParam["ApplyStatus"].ToString(), DbType.String); strSql.Append(" AND (t.ApplyStatus=@ApplyStatus)"); } - if (!queryParam["checkstatus"].IsEmpty()) + if (!queryParam["CheckStatus"].IsEmpty()) { //审核状态 //采购审批通过且报账状态为0的数据 - dp.Add("@CheckStatus", queryParam["checkstatus"].ToString(), DbType.String); + dp.Add("@CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String); strSql.Append(" AND (t.CheckStatus=@CheckStatus)"); } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic_Apply/Purchase_Logistic_ApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic_Apply/Purchase_Logistic_ApplyService.cs index 9770d45c0..163b5dbf1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic_Apply/Purchase_Logistic_ApplyService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic_Apply/Purchase_Logistic_ApplyService.cs @@ -67,10 +67,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("DepartmentId",queryParam["DepartmentId"].ToString(), DbType.String); strSql.Append(" AND t.DepartmentId = @DepartmentId "); } - if (!queryParam["checkstatus"].IsEmpty()) + if (!queryParam["CheckStatus"].IsEmpty()) { - dp.Add("checkstatus", queryParam["checkstatus"].ToString(), DbType.String); - strSql.Append(" AND t.checkstatus = @checkstatus "); + dp.Add("CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String); + strSql.Append(" AND t.CheckStatus = @CheckStatus "); } if (!queryParam["Payee"].IsEmpty()) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other/Purchase_OtherEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other/Purchase_OtherEntity.cs index dd3108577..67850fe3f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other/Purchase_OtherEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other/Purchase_OtherEntity.cs @@ -110,6 +110,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement this.Id = Guid.NewGuid().ToString(); this.CreateTime = DateTime.Now; this.Status = 0; + this.CheckStatus = 0; + this.ApplyStatus = 0; } /// /// 编辑调用 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other/Purchase_OtherService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other/Purchase_OtherService.cs index 0addacb25..ad6bb464b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other/Purchase_OtherService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other/Purchase_OtherService.cs @@ -64,11 +64,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("@ApplyStatus", queryParam["ApplyStatus"].ToString(), DbType.String); strSql.Append(" AND (t.ApplyStatus=@ApplyStatus)"); } - if (!queryParam["checkstatus"].IsEmpty()) + if (!queryParam["CheckStatus"].IsEmpty()) { //审核状态 //采购审批通过且报账状态为0的数据 - dp.Add("@CheckStatus", queryParam["checkstatus"].ToString(), DbType.String); + dp.Add("@CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String); strSql.Append(" AND (t.CheckStatus=@CheckStatus)"); } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other_Apply/Purchase_Other_ApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other_Apply/Purchase_Other_ApplyService.cs index 958b65c51..48cde20a5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other_Apply/Purchase_Other_ApplyService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other_Apply/Purchase_Other_ApplyService.cs @@ -67,10 +67,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("DepartmentId",queryParam["DepartmentId"].ToString(), DbType.String); strSql.Append(" AND t.DepartmentId = @DepartmentId "); } - if (!queryParam["checkstatus"].IsEmpty()) + if (!queryParam["CheckStatus"].IsEmpty()) { - dp.Add("checkstatus", queryParam["checkstatus"].ToString(), DbType.String); - strSql.Append(" AND t.checkstatus = @checkstatus "); + dp.Add("CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String); + strSql.Append(" AND t.CheckStatus = @CheckStatus "); } if (!queryParam["Payee"].IsEmpty()) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print/Purchase_PrintEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print/Purchase_PrintEntity.cs index 362342e33..f7acdfa80 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print/Purchase_PrintEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print/Purchase_PrintEntity.cs @@ -110,6 +110,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement this.Id = Guid.NewGuid().ToString(); this.CreateTime = DateTime.Now; this.Status = 0; + this.CheckStatus = 0; + this.ApplyStatus = 0; } /// /// 编辑调用 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print/Purchase_PrintService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print/Purchase_PrintService.cs index ca0786aff..29ea028d4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print/Purchase_PrintService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print/Purchase_PrintService.cs @@ -64,11 +64,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("@ApplyStatus", queryParam["ApplyStatus"].ToString(), DbType.String); strSql.Append(" AND (t.ApplyStatus=@ApplyStatus)"); } - if (!queryParam["checkstatus"].IsEmpty()) + if (!queryParam["CheckStatus"].IsEmpty()) { //审核状态 //采购审批通过且报账状态为0的数据 - dp.Add("@CheckStatus", queryParam["checkstatus"].ToString(), DbType.String); + dp.Add("@CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String); strSql.Append(" AND (t.CheckStatus=@CheckStatus)"); } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print_Apply/Purchase_Print_ApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print_Apply/Purchase_Print_ApplyService.cs index 53f32d62f..849d016ac 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print_Apply/Purchase_Print_ApplyService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print_Apply/Purchase_Print_ApplyService.cs @@ -67,10 +67,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("DepartmentId",queryParam["DepartmentId"].ToString(), DbType.String); strSql.Append(" AND t.DepartmentId = @DepartmentId "); } - if (!queryParam["checkstatus"].IsEmpty()) + if (!queryParam["CheckStatus"].IsEmpty()) { - dp.Add("checkstatus", queryParam["checkstatus"].ToString(), DbType.String); - strSql.Append(" AND t.checkstatus = @checkstatus "); + dp.Add("CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String); + strSql.Append(" AND t.CheckStatus = @CheckStatus "); } if (!queryParam["Payee"].IsEmpty()) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service/Purchase_ServiceEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service/Purchase_ServiceEntity.cs index e9ae10a30..088c4fc62 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service/Purchase_ServiceEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service/Purchase_ServiceEntity.cs @@ -110,6 +110,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement this.Id = Guid.NewGuid().ToString(); this.CreateTime = DateTime.Now; this.Status = 0; + this.CheckStatus = 0; + this.ApplyStatus = 0; } /// /// 编辑调用 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service/Purchase_ServiceService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service/Purchase_ServiceService.cs index 606e3d7e3..108c104bc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service/Purchase_ServiceService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service/Purchase_ServiceService.cs @@ -64,11 +64,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("@ApplyStatus", queryParam["ApplyStatus"].ToString(), DbType.String); strSql.Append(" AND (t.ApplyStatus=@ApplyStatus)"); } - if (!queryParam["checkstatus"].IsEmpty()) + if (!queryParam["CheckStatus"].IsEmpty()) { //审核状态 //采购审批通过且报账状态为0的数据 - dp.Add("@CheckStatus", queryParam["checkstatus"].ToString(), DbType.String); + dp.Add("@CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String); strSql.Append(" AND (t.CheckStatus=@CheckStatus)"); } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service_Apply/Purchase_Service_ApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service_Apply/Purchase_Service_ApplyService.cs index d458b8022..821155d4f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service_Apply/Purchase_Service_ApplyService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service_Apply/Purchase_Service_ApplyService.cs @@ -67,10 +67,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("DepartmentId",queryParam["DepartmentId"].ToString(), DbType.String); strSql.Append(" AND t.DepartmentId = @DepartmentId "); } - if (!queryParam["checkstatus"].IsEmpty()) + if (!queryParam["CheckStatus"].IsEmpty()) { - dp.Add("checkstatus", queryParam["checkstatus"].ToString(), DbType.String); - strSql.Append(" AND t.checkstatus = @checkstatus "); + dp.Add("CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String); + strSql.Append(" AND t.CheckStatus = @CheckStatus "); } if (!queryParam["Payee"].IsEmpty()) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student/Purchase_StudentEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student/Purchase_StudentEntity.cs index 7165d5f70..971332a96 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student/Purchase_StudentEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student/Purchase_StudentEntity.cs @@ -110,6 +110,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement this.Id = Guid.NewGuid().ToString(); this.CreateTime = DateTime.Now; this.Status = 0; + this.CheckStatus = 0; + this.ApplyStatus = 0; } /// /// 编辑调用 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student/Purchase_StudentService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student/Purchase_StudentService.cs index 7bd5a929d..924f8da60 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student/Purchase_StudentService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student/Purchase_StudentService.cs @@ -64,11 +64,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("@ApplyStatus", queryParam["ApplyStatus"].ToString(), DbType.String); strSql.Append(" AND (t.ApplyStatus=@ApplyStatus)"); } - if (!queryParam["checkstatus"].IsEmpty()) + if (!queryParam["CheckStatus"].IsEmpty()) { //审核状态 //采购审批通过且报账状态为0的数据 - dp.Add("@CheckStatus", queryParam["checkstatus"].ToString(), DbType.String); + dp.Add("@CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String); strSql.Append(" AND (t.CheckStatus=@CheckStatus)"); } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student_Apply/Purchase_Student_ApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student_Apply/Purchase_Student_ApplyService.cs index b10e3c2be..0ca707efe 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student_Apply/Purchase_Student_ApplyService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student_Apply/Purchase_Student_ApplyService.cs @@ -67,10 +67,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("DepartmentId",queryParam["DepartmentId"].ToString(), DbType.String); strSql.Append(" AND t.DepartmentId = @DepartmentId "); } - if (!queryParam["checkstatus"].IsEmpty()) + if (!queryParam["CheckStatus"].IsEmpty()) { - dp.Add("checkstatus", queryParam["checkstatus"].ToString(), DbType.String); - strSql.Append(" AND t.checkstatus = @checkstatus "); + dp.Add("CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String); + strSql.Append(" AND t.CheckStatus = @CheckStatus "); } if (!queryParam["Payee"].IsEmpty()) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel/Purchase_TravelEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel/Purchase_TravelEntity.cs index 9a4c35437..057b68233 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel/Purchase_TravelEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel/Purchase_TravelEntity.cs @@ -102,7 +102,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// 报账状态 /// [Column("APPLYSTATUS")] - public int ApplyStatus { get; set; } + public int? ApplyStatus { get; set; } #endregion #region 扩展操作 @@ -114,6 +114,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement this.Id = Guid.NewGuid().ToString(); this.CreateTime = DateTime.Now; this.Status = 0; + this.CheckStatus = 0; + this.ApplyStatus = 0; } /// /// 编辑调用 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel/Purchase_TravelService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel/Purchase_TravelService.cs index df3633d37..23809a7fe 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel/Purchase_TravelService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel/Purchase_TravelService.cs @@ -64,11 +64,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("@ApplyStatus", queryParam["ApplyStatus"].ToString(), DbType.String); strSql.Append(" AND (t.ApplyStatus=@ApplyStatus)"); } - if (!queryParam["checkstatus"].IsEmpty()) + if (!queryParam["CheckStatus"].IsEmpty()) { //审核状态 //采购审批通过且报账状态为0的数据 - dp.Add("@CheckStatus", queryParam["checkstatus"].ToString(), DbType.String); + dp.Add("@CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String); strSql.Append(" AND (t.CheckStatus=@CheckStatus)"); } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel_Apply/Purchase_Travel_ApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel_Apply/Purchase_Travel_ApplyService.cs index f5d8448c4..b7a8ab0eb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel_Apply/Purchase_Travel_ApplyService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel_Apply/Purchase_Travel_ApplyService.cs @@ -67,10 +67,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("DepartmentId",queryParam["DepartmentId"].ToString(), DbType.String); strSql.Append(" AND t.DepartmentId = @DepartmentId "); } - if (!queryParam["checkstatus"].IsEmpty()) + if (!queryParam["CheckStatus"].IsEmpty()) { - dp.Add("checkstatus", queryParam["checkstatus"].ToString(), DbType.String); - strSql.Append(" AND t.checkstatus = @checkstatus "); + dp.Add("CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String); + strSql.Append(" AND t.CheckStatus = @CheckStatus "); } if (!queryParam["Payee"].IsEmpty()) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work/Purchase_WorkEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work/Purchase_WorkEntity.cs index 0cb8a2f33..4d65fa676 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work/Purchase_WorkEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work/Purchase_WorkEntity.cs @@ -98,7 +98,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// 报账状态 /// [Column("APPLYSTATUS")] - public int ApplyStatus { get; set; } + public int? ApplyStatus { get; set; } #endregion #region 扩展操作 @@ -110,6 +110,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement this.Id = Guid.NewGuid().ToString(); this.CreateTime = DateTime.Now; this.Status = 0; + this.CheckStatus = 0; + this.ApplyStatus = 0; } /// /// 编辑调用 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work/Purchase_WorkService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work/Purchase_WorkService.cs index 1d3bafeee..dce0ed7bb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work/Purchase_WorkService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work/Purchase_WorkService.cs @@ -64,11 +64,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("@ApplyStatus", queryParam["ApplyStatus"].ToString(), DbType.String); strSql.Append(" AND (t.ApplyStatus=@ApplyStatus)"); } - if (!queryParam["checkstatus"].IsEmpty()) + if (!queryParam["CheckStatus"].IsEmpty()) { //审核状态 //采购审批通过且报账状态为0的数据 - dp.Add("@CheckStatus", queryParam["checkstatus"].ToString(), DbType.String); + dp.Add("@CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String); strSql.Append(" AND (t.CheckStatus=@CheckStatus)"); } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work_Apply/Purchase_Work_ApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work_Apply/Purchase_Work_ApplyService.cs index e6e2fe3cf..e51896f7f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work_Apply/Purchase_Work_ApplyService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work_Apply/Purchase_Work_ApplyService.cs @@ -67,10 +67,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("DepartmentId",queryParam["DepartmentId"].ToString(), DbType.String); strSql.Append(" AND t.DepartmentId = @DepartmentId "); } - if (!queryParam["checkstatus"].IsEmpty()) + if (!queryParam["CheckStatus"].IsEmpty()) { - dp.Add("checkstatus", queryParam["checkstatus"].ToString(), DbType.String); - strSql.Append(" AND t.checkstatus = @checkstatus "); + dp.Add("CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String); + strSql.Append(" AND t.CheckStatus = @CheckStatus "); } if (!queryParam["Payee"].IsEmpty()) {