订单完成一览 增加合同状态

Edu.Repository/Course/RB_Education_ContractRepository.cs

@@ -171,7 +171,7 @@ namespace Edu.Repository.Course
         {
             DynamicParameters parameters = new DynamicParameters();
             string where = $@" 1=1";
-            where += $@" AND c.{nameof(RB_Education_Contract_ViewModel.Status)} =2 ";//只查询已审核通过的
+            where += $@" AND c.{nameof(RB_Education_Contract_ViewModel.Status)} <>4 ";//只查询已审核通过的
             if (demodel.Group_Id > 0)
             {
                 where += $@" AND c.{nameof(RB_Education_Contract_ViewModel.Group_Id)} ={demodel.Group_Id}";

Edu.WebApi/Controllers/Finance/FinanceController.cs

@@ -1029,6 +1029,7 @@ namespace Edu.WebApi.Controllers.Finance
                 x.TotalSub,
                 x.TotalDiscountMoney,
                 x.TotalMoney,
+                x.Status,
                 IncomeList = x.FinanceList.Where(x => x.Type == WFTempLateClassEnum.IN).Select(z => new
                 {
                     z.FrID,
@@ -1107,7 +1108,7 @@ namespace Edu.WebApi.Controllers.Finance
             ExcelDataSource headerTop = new ExcelDataSource()
             {
                 ExcelRows = new List<ExcelColumn>(30) {
-                            new ExcelColumn(value:"合同信息"){CellWidth=20,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER,Colspan=14 },
+                            new ExcelColumn(value:"合同信息"){CellWidth=20,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER,Colspan=15 },
                             new ExcelColumn(value:"收款信息"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER,Colspan = 6 },
                             new ExcelColumn(value:"合同有效金额"){CellWidth=20,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER, Colspan = 2 },
                             new ExcelColumn(value:"消费情况"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER , Colspan = 7},
@@ -1121,6 +1122,7 @@ namespace Edu.WebApi.Controllers.Finance
                             new ExcelColumn(value:"订单号"){CellWidth=20,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                             new ExcelColumn(value:"签订时间"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                             new ExcelColumn(value:"合同号"){CellWidth=20,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
+                            new ExcelColumn(value:"合同状态"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                             new ExcelColumn(value:"产品名称"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                             new ExcelColumn(value:"班级"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                             new ExcelColumn(value:"学员名字"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
@@ -1165,6 +1167,23 @@ namespace Edu.WebApi.Controllers.Finance
             {
                 foreach (var item in list)
                 {
+                    string StatusName = "";//0-草稿，1-提交审核，2-审核通过，3-驳回，4-取消
+                    if (item.Status == 0)
+                    {
+                        StatusName = "草稿";
+                    }
+                    else if (item.Status == 1)
+                    {
+                        StatusName = "审核中";
+                    }
+                    else if (item.Status == 2)
+                    {
+                        StatusName = "审核通过";
+                    }
+                    else if (item.Status == 3)
+                    {
+                        StatusName = "驳回";
+                    }
                     var FinanceList = item.FinanceList.Where(x => x.Type == WFTempLateClassEnum.IN).ToList();
                     if (FinanceList.Any())
                     {
@@ -1183,6 +1202,7 @@ namespace Edu.WebApi.Controllers.Finance
                                         new ExcelColumn(value: item.OrderId.ToString()){ Rowspan = Count },
                                         new ExcelColumn(value: item.CreateTime.ToString("yyyy-MM-dd")){ Rowspan = Count },
                                         new ExcelColumn(value: item.ContractNo){ Rowspan = Count },
+                                        new ExcelColumn(value: StatusName){ Rowspan = Count },
                                         new ExcelColumn(value: item.CourseName){ Rowspan = Count },
                                         new ExcelColumn(value: item.ClassName){ Rowspan = Count },
                                         new ExcelColumn(value: item.StudentName){ Rowspan = Count },
@@ -1221,6 +1241,7 @@ namespace Edu.WebApi.Controllers.Finance
                                 {
                                     ExcelRows = new List<ExcelColumn>()
                                     {
+                                        new ExcelColumn(value: ""){ },
                                         new ExcelColumn(value: ""){ },
                                         new ExcelColumn(value: ""){ },
                                         new ExcelColumn(value: ""){ },
@@ -1268,6 +1289,7 @@ namespace Edu.WebApi.Controllers.Finance
                                     new ExcelColumn(value: item.OrderId.ToString()){ },
                                     new ExcelColumn(value: item.CreateTime.ToString("yyyy-MM-dd")){ },
                                     new ExcelColumn(value: item.ContractNo){ },
+                                    new ExcelColumn(value: StatusName){ },
                                     new ExcelColumn(value: item.CourseName){ },
                                     new ExcelColumn(value: item.ClassName){ },
                                     new ExcelColumn(value: item.StudentName){ },