页面修改

Edu.WebApi/Controllers/User/StudentStatController.cs

@@ -238,8 +238,46 @@ namespace Edu.WebApi.Controllers.User
                 foreach (var item in list)
                 {
                     JObject dObj = JObject.Parse(JsonHelper.Serialize(item));
-                    var columns = new List<ExcelColumn>();
-                    columns.Add(new ExcelColumn(dObj.GetStringValue("StuName"));
+                    var columns = new List<ExcelColumn>
+                    {
+                        new ExcelColumn(dObj.GetStringValue("StuName"))
+                    };
+                    string EnrollState = dObj.GetInt("EnrollState") == 1 ? "已报名" : "未成交";
+                    columns.Add(new ExcelColumn(EnrollState));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("AssistName")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("StuBirthStr")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("StuRealMobile")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("StuAddress")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("StuChannelName")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("JapanBaseInfo")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("PlanPrice")));
+                    string baseCondition = dObj.GetStringValue("BaseCondition");
+                    string demandPoint = dObj.GetStringValue("DemandPoint");
+                    string resistPoint = dObj.GetStringValue("ResistPoint");
+                    string consultingResults = dObj.GetStringValue("ConsultingResults");
+
+                    baseCondition = !string.IsNullOrEmpty(baseCondition) ? baseCondition : "暂无";
+                    demandPoint = !string.IsNullOrEmpty(demandPoint) ? demandPoint : "暂无";
+                    resistPoint = !string.IsNullOrEmpty(resistPoint) ? resistPoint : "暂无";
+                    consultingResults = !string.IsNullOrEmpty(consultingResults) ? consultingResults : "暂无";
+                    string baseInfo = "基本情况：" + baseCondition + "\r\n" + "需求点：" + consultingResults + "\r\n" + "抗拒点：" + resistPoint + "\r\n" + "咨询结果：" + consultingResults;
+                    columns.Add(new ExcelColumn(baseInfo));
+
+                    string remark = "";
+                    string FUTime = dObj.GetStringValue("FUTime");
+                    if (!string.IsNullOrEmpty(FUTime))
+                    {
+                        remark += FUTime;
+                    }
+                    string FURemark = dObj.GetStringValue("FURemark");
+                    if (!string.IsNullOrEmpty(FURemark))
+                    {
+                        remark += "\r\n" +StringHelper.FilterHtml(FURemark);
+                    }
+                    columns.Add(new ExcelColumn()
+                    {
+                        Value = remark
+                    });
 
                     var dataRow = new ExcelDataSource()
                     {