修复接口及后台bug

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) });
         }
     };

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) });
         }
     };

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) });
         }
     };

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) });
         }
     };

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) });
         }
     };

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) });
         }
     };

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) });
         }
     };

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" },
                     {

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) });
         }
     };

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) });
         }
     };

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;
         }
         /// <summary>
         /// 编辑调用

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<Purchase_EduEntity>(strSql.ToString(),dp, pagination);

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())
                 {

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;
         }
         /// <summary>
         /// 编辑调用

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<Purchase_InfoEntity>(strSql.ToString(),dp, pagination);

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())
                 {

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;
         }
         /// <summary>
         /// 编辑调用

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<Purchase_LogisticEntity>(strSql.ToString(),dp, pagination);

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())
                 {

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;
         }
         /// <summary>
         /// 编辑调用

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<Purchase_OtherEntity>(strSql.ToString(),dp, pagination);

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())
                 {

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;
         }
         /// <summary>
         /// 编辑调用

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<Purchase_PrintEntity>(strSql.ToString(),dp, pagination);

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())
                 {

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;
         }
         /// <summary>
         /// 编辑调用

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<Purchase_ServiceEntity>(strSql.ToString(),dp, pagination);

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())
                 {

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;
         }
         /// <summary>
         /// 编辑调用

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<Purchase_StudentEntity>(strSql.ToString(),dp, pagination);

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())
                 {

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
         /// 报账状态
         /// </summary>
         [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;
         }
         /// <summary>
         /// 编辑调用

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<Purchase_TravelEntity>(strSql.ToString(),dp, pagination);

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())
                 {

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
         /// 报账状态
         /// </summary>
         [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;
         }
         /// <summary>
         /// 编辑调用

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<Purchase_WorkEntity>(strSql.ToString(),dp, pagination);

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())
                 {