Quellcode durchsuchen

Merge branch 'master' of http://192.168.1.222:3000/duhongyu/Anyang_api

duhongyu vor 4 Jahren
Ursprung
Commit
56c54aa6c8

+ 34 - 25
CallCenterApi/CallCenterApi.DAL/T_Wiki_Professor.cs

@@ -32,15 +32,15 @@ namespace CallCenterApi.DAL
32 32
 
33 33
 
34 34
         /// <summary>
35
-        /// 增加一条数据
36
-        /// </summary>
37
-        public int Add(CallCenterApi.Model.T_Wiki_Professor model)
35
+		/// 增加一条数据
36
+		/// </summary>
37
+		public int Add(CallCenterApi.Model.T_Wiki_Professor model)
38 38
         {
39 39
             StringBuilder strSql = new StringBuilder();
40 40
             strSql.Append("insert into T_Wiki_Professor(");
41
-            strSql.Append("F_XingMing,F_DanWei,F_KeShi,F_ZhiWu,F_ShouJi,F_DianHua,F_DiQu,F_HangYe,F_ShengXiaoShiJian,F_ShiXiaoShiJian,F_FaBuShiJian,F_FaBuRen,F_FaBuDanWei,F_TouXiang,F_ZhuanYeLingYuJianJie,F_DianJiLiang,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime)");
41
+            strSql.Append("F_XingMing,F_DanWei,F_KeShi,F_ZhiWu,F_ShouJi,F_DianHua,F_DiQu,F_HangYe,F_ShengXiaoShiJian,F_ShiXiaoShiJian,F_FaBuShiJian,F_FaBuRen,F_FaBuDanWei,F_BiaoShiBianMa,F_TouXiang,F_ZhuanYeLingYuJianJie,F_DianJiLiang,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime)");
42 42
             strSql.Append(" values (");
43
-            strSql.Append("@F_XingMing,@F_DanWei,@F_KeShi,@F_ZhiWu,@F_ShouJi,@F_DianHua,@F_DiQu,@F_HangYe,@F_ShengXiaoShiJian,@F_ShiXiaoShiJian,@F_FaBuShiJian,@F_FaBuRen,@F_FaBuDanWei,@F_TouXiang,@F_ZhuanYeLingYuJianJie,@F_DianJiLiang,@F_CreateUser,@F_CreateTime,@F_IsDelete,@F_DeleteUser,@F_DeleteTime)");
43
+            strSql.Append("@F_XingMing,@F_DanWei,@F_KeShi,@F_ZhiWu,@F_ShouJi,@F_DianHua,@F_DiQu,@F_HangYe,@F_ShengXiaoShiJian,@F_ShiXiaoShiJian,@F_FaBuShiJian,@F_FaBuRen,@F_FaBuDanWei,@F_BiaoShiBianMa,@F_TouXiang,@F_ZhuanYeLingYuJianJie,@F_DianJiLiang,@F_CreateUser,@F_CreateTime,@F_IsDelete,@F_DeleteUser,@F_DeleteTime)");
44 44
             strSql.Append(";select @@IDENTITY");
45 45
             SqlParameter[] parameters = {
46 46
                     new SqlParameter("@F_XingMing", SqlDbType.NVarChar,50),
@@ -56,6 +56,7 @@ namespace CallCenterApi.DAL
56 56
                     new SqlParameter("@F_FaBuShiJian", SqlDbType.DateTime),
57 57
                     new SqlParameter("@F_FaBuRen", SqlDbType.NVarChar,50),
58 58
                     new SqlParameter("@F_FaBuDanWei", SqlDbType.NVarChar,255),
59
+                    new SqlParameter("@F_BiaoShiBianMa", SqlDbType.VarChar,50),
59 60
                     new SqlParameter("@F_TouXiang", SqlDbType.NVarChar,255),
60 61
                     new SqlParameter("@F_ZhuanYeLingYuJianJie", SqlDbType.NVarChar,-1),
61 62
                     new SqlParameter("@F_DianJiLiang", SqlDbType.BigInt,8),
@@ -77,14 +78,15 @@ namespace CallCenterApi.DAL
77 78
             parameters[10].Value = model.F_FaBuShiJian;
78 79
             parameters[11].Value = model.F_FaBuRen;
79 80
             parameters[12].Value = model.F_FaBuDanWei;
80
-            parameters[13].Value = model.F_TouXiang;
81
-            parameters[14].Value = model.F_ZhuanYeLingYuJianJie;
82
-            parameters[15].Value = model.F_DianJiLiang;
83
-            parameters[16].Value = model.F_CreateUser;
84
-            parameters[17].Value = model.F_CreateTime;
85
-            parameters[18].Value = model.F_IsDelete;
86
-            parameters[19].Value = model.F_DeleteUser;
87
-            parameters[20].Value = model.F_DeleteTime;
81
+            parameters[13].Value = model.F_BiaoShiBianMa;
82
+            parameters[14].Value = model.F_TouXiang;
83
+            parameters[15].Value = model.F_ZhuanYeLingYuJianJie;
84
+            parameters[16].Value = model.F_DianJiLiang;
85
+            parameters[17].Value = model.F_CreateUser;
86
+            parameters[18].Value = model.F_CreateTime;
87
+            parameters[19].Value = model.F_IsDelete;
88
+            parameters[20].Value = model.F_DeleteUser;
89
+            parameters[21].Value = model.F_DeleteTime;
88 90
 
89 91
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
90 92
             if (obj == null)
@@ -116,6 +118,7 @@ namespace CallCenterApi.DAL
116 118
             strSql.Append("F_FaBuShiJian=@F_FaBuShiJian,");
117 119
             strSql.Append("F_FaBuRen=@F_FaBuRen,");
118 120
             strSql.Append("F_FaBuDanWei=@F_FaBuDanWei,");
121
+            strSql.Append("F_BiaoShiBianMa=@F_BiaoShiBianMa,");
119 122
             strSql.Append("F_TouXiang=@F_TouXiang,");
120 123
             strSql.Append("F_ZhuanYeLingYuJianJie=@F_ZhuanYeLingYuJianJie,");
121 124
             strSql.Append("F_DianJiLiang=@F_DianJiLiang,");
@@ -139,6 +142,7 @@ namespace CallCenterApi.DAL
139 142
                     new SqlParameter("@F_FaBuShiJian", SqlDbType.DateTime),
140 143
                     new SqlParameter("@F_FaBuRen", SqlDbType.NVarChar,50),
141 144
                     new SqlParameter("@F_FaBuDanWei", SqlDbType.NVarChar,255),
145
+                    new SqlParameter("@F_BiaoShiBianMa", SqlDbType.VarChar,50),
142 146
                     new SqlParameter("@F_TouXiang", SqlDbType.NVarChar,255),
143 147
                     new SqlParameter("@F_ZhuanYeLingYuJianJie", SqlDbType.NVarChar,-1),
144 148
                     new SqlParameter("@F_DianJiLiang", SqlDbType.BigInt,8),
@@ -161,15 +165,16 @@ namespace CallCenterApi.DAL
161 165
             parameters[10].Value = model.F_FaBuShiJian;
162 166
             parameters[11].Value = model.F_FaBuRen;
163 167
             parameters[12].Value = model.F_FaBuDanWei;
164
-            parameters[13].Value = model.F_TouXiang;
165
-            parameters[14].Value = model.F_ZhuanYeLingYuJianJie;
166
-            parameters[15].Value = model.F_DianJiLiang;
167
-            parameters[16].Value = model.F_CreateUser;
168
-            parameters[17].Value = model.F_CreateTime;
169
-            parameters[18].Value = model.F_IsDelete;
170
-            parameters[19].Value = model.F_DeleteUser;
171
-            parameters[20].Value = model.F_DeleteTime;
172
-            parameters[21].Value = model.F_Id;
168
+            parameters[13].Value = model.F_BiaoShiBianMa;
169
+            parameters[14].Value = model.F_TouXiang;
170
+            parameters[15].Value = model.F_ZhuanYeLingYuJianJie;
171
+            parameters[16].Value = model.F_DianJiLiang;
172
+            parameters[17].Value = model.F_CreateUser;
173
+            parameters[18].Value = model.F_CreateTime;
174
+            parameters[19].Value = model.F_IsDelete;
175
+            parameters[20].Value = model.F_DeleteUser;
176
+            parameters[21].Value = model.F_DeleteTime;
177
+            parameters[22].Value = model.F_Id;
173 178
 
174 179
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
175 180
             if (rows > 0)
@@ -233,7 +238,7 @@ namespace CallCenterApi.DAL
233 238
         {
234 239
 
235 240
             StringBuilder strSql = new StringBuilder();
236
-            strSql.Append("select  top 1 F_Id,F_XingMing,F_DanWei,F_KeShi,F_ZhiWu,F_ShouJi,F_DianHua,F_DiQu,F_HangYe,F_ShengXiaoShiJian,F_ShiXiaoShiJian,F_FaBuShiJian,F_FaBuRen,F_FaBuDanWei,F_TouXiang,F_ZhuanYeLingYuJianJie,F_DianJiLiang,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime from T_Wiki_Professor with(nolock)");
241
+            strSql.Append("select  top 1 F_Id,F_XingMing,F_DanWei,F_KeShi,F_ZhiWu,F_ShouJi,F_DianHua,F_DiQu,F_HangYe,F_ShengXiaoShiJian,F_ShiXiaoShiJian,F_FaBuShiJian,F_FaBuRen,F_FaBuDanWei,F_BiaoShiBianMa,F_TouXiang,F_ZhuanYeLingYuJianJie,F_DianJiLiang,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime from T_Wiki_Professor with(nolock)");
237 242
             strSql.Append(" where F_Id=@F_Id");
238 243
             SqlParameter[] parameters = {
239 244
                     new SqlParameter("@F_Id", SqlDbType.Int,4)
@@ -317,6 +322,10 @@ namespace CallCenterApi.DAL
317 322
                 {
318 323
                     model.F_FaBuDanWei = row["F_FaBuDanWei"].ToString();
319 324
                 }
325
+                if (row["F_BiaoShiBianMa"] != null)
326
+                {
327
+                    model.F_BiaoShiBianMa = row["F_BiaoShiBianMa"].ToString();
328
+                }
320 329
                 if (row["F_TouXiang"] != null)
321 330
                 {
322 331
                     model.F_TouXiang = row["F_TouXiang"].ToString();
@@ -359,7 +368,7 @@ namespace CallCenterApi.DAL
359 368
         public DataSet GetList(string strWhere)
360 369
         {
361 370
             StringBuilder strSql = new StringBuilder();
362
-            strSql.Append("select F_Id,F_XingMing,F_DanWei,F_KeShi,F_ZhiWu,F_ShouJi,F_DianHua,F_DiQu,F_HangYe,F_ShengXiaoShiJian,F_ShiXiaoShiJian,F_FaBuShiJian,F_FaBuRen,F_FaBuDanWei,F_TouXiang,F_ZhuanYeLingYuJianJie,F_DianJiLiang,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime ");
371
+            strSql.Append("select F_Id,F_XingMing,F_DanWei,F_KeShi,F_ZhiWu,F_ShouJi,F_DianHua,F_DiQu,F_HangYe,F_ShengXiaoShiJian,F_ShiXiaoShiJian,F_FaBuShiJian,F_FaBuRen,F_FaBuDanWei,F_BiaoShiBianMa,F_TouXiang,F_ZhuanYeLingYuJianJie,F_DianJiLiang,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime ");
363 372
             strSql.Append(" FROM T_Wiki_Professor with(nolock)");
364 373
             if (strWhere.Trim() != "")
365 374
             {
@@ -379,7 +388,7 @@ namespace CallCenterApi.DAL
379 388
             {
380 389
                 strSql.Append(" top " + Top.ToString());
381 390
             }
382
-            strSql.Append(" F_Id,F_XingMing,F_DanWei,F_KeShi,F_ZhiWu,F_ShouJi,F_DianHua,F_DiQu,F_HangYe,F_ShengXiaoShiJian,F_ShiXiaoShiJian,F_FaBuShiJian,F_FaBuRen,F_FaBuDanWei,F_TouXiang,F_ZhuanYeLingYuJianJie,F_DianJiLiang,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime ");
391
+            strSql.Append(" F_Id,F_XingMing,F_DanWei,F_KeShi,F_ZhiWu,F_ShouJi,F_DianHua,F_DiQu,F_HangYe,F_ShengXiaoShiJian,F_ShiXiaoShiJian,F_FaBuShiJian,F_FaBuRen,F_FaBuDanWei,F_BiaoShiBianMa,F_TouXiang,F_ZhuanYeLingYuJianJie,F_DianJiLiang,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime ");
383 392
             strSql.Append(" FROM T_Wiki_Professor with(nolock)");
384 393
             if (strWhere.Trim() != "")
385 394
             {

+ 7 - 4
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/App_Start/ErrorAttribute.cs

@@ -29,13 +29,16 @@ namespace CallCenterApi.Interface
29 29
             Dictionary<string, string> Params = new Dictionary<string, string>();
30 30
             Params.Add("request_url", rt.Url.ToString());
31 31
 
32
-            foreach (var key in rt.Params.AllKeys)
32
+            if (rt.HttpMethod.ToUpper() != "GET")
33 33
             {
34
-                if (key == "ALL_HTTP")
34
+                foreach (var key in rt.Params.AllKeys)
35 35
                 {
36
-                    break;
36
+                    if (key == "ALL_HTTP")
37
+                    {
38
+                        break;
39
+                    }
40
+                    Params.Add(key, rt.Params[key]);
37 41
                 }
38
-                Params.Add(key, rt.Params[key]);
39 42
             }
40 43
 
41 44
             Model.T_Sys_UserAccount usermodel = null;

+ 1 - 0
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/CallCenterApi.Interface.csproj

@@ -160,6 +160,7 @@
160 160
     </None>
161 161
     <Content Include="Upload\Word\word.png" />
162 162
     <Content Include="Upload\Word\热线工单模版.doc" />
163
+    <Content Include="Upload\Word\政策专家库模板.doc" />
163 164
     <None Include="Web References\WebReference\CapturePhoto.disco" />
164 165
     <Content Include="Web.config">
165 166
       <SubType>Designer</SubType>

+ 17 - 0
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/HomeController.cs

@@ -438,6 +438,23 @@ namespace CallCenterApi.Interface.Controllers
438 438
             var aw = new AsposeWord();
439 439
             aw.OpenWithTemplate(Server.MapPath("/Upload/Word/热线工单模版.doc"));
440 440
             var bt = aw.ExportAs();
441
+            Response.AppendHeader("Access-Control-Expose-Headers", "Content-Disposition");
442
+            return File(bt, "application/msword", DateTime.Now.Ticks.ToString() + ".doc");
443
+        }
444
+
445
+        /// <summary>
446
+        /// 导出
447
+        /// </summary>
448
+        /// <returns></returns>
449
+        public ActionResult ExportWord(int id)
450
+        {
451
+            var aw = new AsposeWord();
452
+            aw.OpenWithTemplate(Server.MapPath("/Upload/Word/政策专家库模板.doc"));
453
+            var dt = DB.DbHelperSQL.Query("select * from T_Wiki_Professor where F_Id=" + id).Tables[0];
454
+            aw.Builder();
455
+            aw.CreateProfessorWord(dt);
456
+            var bt = aw.ExportAs();
457
+            Response.AppendHeader("Access-Control-Expose-Headers", "Content-Disposition");
441 458
             return File(bt, "application/msword", DateTime.Now.Ticks.ToString() + ".doc");
442 459
         }
443 460
 

+ 3 - 0
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/ProfessorController.cs

@@ -148,6 +148,7 @@ namespace CallCenterApi.Interface.Controllers.Wiki
148 148
             string fabushijian = RequestString.GetFormString("fabushijian");
149 149
             string faburen = RequestString.GetFormString("faburen");
150 150
             string fabudanwei = RequestString.GetFormString("fabudanwei");
151
+            string biaoshibianma = RequestString.GetFormString("biaoshibianma");
151 152
             string touxiang = RequestString.GetFormString("touxiang");
152 153
             string zhuanyelingyujianjie = RequestString.GetFormString("zhuanyelingyujianjie");
153 154
 
@@ -183,6 +184,7 @@ namespace CallCenterApi.Interface.Controllers.Wiki
183 184
 
184 185
                     dModel.F_FaBuRen = User .F_UserName ;
185 186
                     dModel.F_FaBuDanWei = fabudanwei;
187
+                    dModel.F_BiaoShiBianMa = biaoshibianma;
186 188
                     dModel.F_TouXiang = touxiang;
187 189
                     dModel.F_ZhuanYeLingYuJianJie = zhuanyelingyujianjie;
188 190
                     dModel.F_DianJiLiang = 0;
@@ -234,6 +236,7 @@ namespace CallCenterApi.Interface.Controllers.Wiki
234 236
 
235 237
                         dModel.F_FaBuRen = faburen;
236 238
                         dModel.F_FaBuDanWei = fabudanwei;
239
+                        dModel.F_BiaoShiBianMa = biaoshibianma;
237 240
                         dModel.F_TouXiang = touxiang;
238 241
                         dModel.F_ZhuanYeLingYuJianJie = zhuanyelingyujianjie;
239 242
                         if (new BLL.T_Wiki_Professor().Update(dModel))

+ 1 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/WorkOrderReportController.cs

@@ -17,7 +17,7 @@ using System.Web.Mvc;
17 17
 
18 18
 namespace CallCenterApi.Interface.Controllers.report
19 19
 {
20
-   // [Authority]
20
+    [Authority]
21 21
     public class WorkOrderReportController : BaseController
22 22
     {
23 23
         private readonly BLL.T_Sys_Department departmentBLL = new BLL.T_Sys_Department();

+ 1 - 0
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -8160,6 +8160,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
8160 8160
                     aw.Builder();
8161 8161
                     aw.CreateAssignWord(dt, jbdt, User.F_UserCode);
8162 8162
                     var bt = aw.ExportAs();
8163
+                    Response.AppendHeader("Access-Control-Expose-Headers", "Content-Disposition");
8163 8164
                     return File(bt, "application/msword", "工单" + strworkorderid + ".doc");
8164 8165
                 }
8165 8166
                 else

BIN
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Upload/Word/政策专家库模板.doc


+ 9 - 0
CallCenterApi/CallCenterApi.Model/T_Wiki_Professor.cs

@@ -24,6 +24,7 @@ namespace CallCenterApi.Model
24 24
         private DateTime? _f_fabushijian;
25 25
         private string _f_faburen;
26 26
         private string _f_fabudanwei;
27
+        private string _f_biaoshibianma;
27 28
         private string _f_touxiang;
28 29
         private string _f_zhuanyelingyujianjie;
29 30
         private long? _f_dianjiliang;
@@ -147,6 +148,14 @@ namespace CallCenterApi.Model
147 148
         /// <summary>
148 149
         /// 
149 150
         /// </summary>
151
+        public string F_BiaoShiBianMa
152
+        {
153
+            set { _f_biaoshibianma = value; }
154
+            get { return _f_biaoshibianma; }
155
+        }
156
+        /// <summary>
157
+        /// 
158
+        /// </summary>
150 159
         public string F_TouXiang
151 160
         {
152 161
             set { _f_touxiang = value; }

+ 10 - 1
CallCenterCommon/CallCenter.Utility/NPOI/NPOIHelper.cs

@@ -229,6 +229,7 @@ namespace CallCenter.Utility
229 229
                     curContext.Response.ContentType = "application/vnd.ms-excel";
230 230
                     curContext.Response.ContentEncoding = Encoding.UTF8;
231 231
                     curContext.Response.Charset = "";
232
+                    curContext.Response.AppendHeader("Access-Control-Expose-Headers", "Content-Disposition");
232 233
                     curContext.Response.AppendHeader("Content-Disposition",
233 234
                         "attachment;filename=" + HttpUtility.UrlEncode(Name + ".xls", Encoding.UTF8));
234 235
 
@@ -373,6 +374,7 @@ namespace CallCenter.Utility
373 374
                     curContext.Response.ContentType = "application/vnd.ms-excel";
374 375
                     curContext.Response.ContentEncoding = Encoding.UTF8;
375 376
                     curContext.Response.Charset = "";
377
+                    curContext.Response.AppendHeader("Access-Control-Expose-Headers", "Content-Disposition");
376 378
                     curContext.Response.AppendHeader("Content-Disposition",
377 379
                         "attachment;filename=" + HttpUtility.UrlEncode(Name + "_导出文件_" + DateTime.Now.Ticks + ".xls", Encoding.UTF8));
378 380
 
@@ -774,6 +776,7 @@ namespace CallCenter.Utility
774 776
                     curContext.Response.ContentType = "application/vnd.ms-excel";
775 777
                     curContext.Response.ContentEncoding = Encoding.UTF8;
776 778
                     curContext.Response.Charset = "";
779
+                    curContext.Response.AppendHeader("Access-Control-Expose-Headers", "Content-Disposition");
777 780
                     curContext.Response.AppendHeader("Content-Disposition",
778 781
                         "attachment;filename=" + HttpUtility.UrlEncode(Name + ".xls", Encoding.UTF8));
779 782
 
@@ -877,6 +880,7 @@ namespace CallCenter.Utility
877 880
                     curContext.Response.ContentType = "application/vnd.ms-excel";
878 881
                     curContext.Response.ContentEncoding = Encoding.UTF8;
879 882
                     curContext.Response.Charset = "";
883
+                    curContext.Response.AppendHeader("Access-Control-Expose-Headers", "Content-Disposition");
880 884
                     curContext.Response.AppendHeader("Content-Disposition",
881 885
                         "attachment;filename=" + HttpUtility.UrlEncode(Name + ".xls", Encoding.UTF8));
882 886
 
@@ -2017,6 +2021,7 @@ namespace CallCenter.Utility
2017 2021
                     curContext.Response.ContentType = "application/vnd.ms-excel";
2018 2022
                     curContext.Response.ContentEncoding = Encoding.UTF8;
2019 2023
                     curContext.Response.Charset = "";
2024
+                    curContext.Response.AppendHeader("Access-Control-Expose-Headers", "Content-Disposition");
2020 2025
                     curContext.Response.AppendHeader("Content-Disposition",
2021 2026
                         "attachment;filename=" + HttpUtility.UrlEncode("归并数据统计" + ".xls", Encoding.UTF8));
2022 2027
 
@@ -2137,7 +2142,8 @@ namespace CallCenter.Utility
2137 2142
                         curContext.Response.ContentType = "application/vnd.ms-excel";
2138 2143
                         curContext.Response.ContentEncoding = Encoding.UTF8;
2139 2144
                         curContext.Response.Charset = "";
2140
-                        curContext.Response.AppendHeader("Content-Disposition",
2145
+                    curContext.Response.AppendHeader("Access-Control-Expose-Headers", "Content-Disposition");
2146
+                    curContext.Response.AppendHeader("Content-Disposition",
2141 2147
                             "attachment;filename=" + HttpUtility.UrlEncode("投诉统计_导出文件_" + DateTime.Now.Ticks + ".xls", Encoding.UTF8));
2142 2148
 
2143 2149
                         curContext.Response.BinaryWrite(ms.GetBuffer());
@@ -2291,6 +2297,7 @@ namespace CallCenter.Utility
2291 2297
                 curContext.Response.ContentType = "application/vnd.ms-excel";
2292 2298
                 curContext.Response.ContentEncoding = Encoding.UTF8;
2293 2299
                 curContext.Response.Charset = "";
2300
+                curContext.Response.AppendHeader("Access-Control-Expose-Headers", "Content-Disposition");
2294 2301
                 curContext.Response.AppendHeader("Content-Disposition",
2295 2302
                     "attachment;filename=" + HttpUtility.UrlEncode(name + "_导出文件_" + DateTime.Now.Ticks + ".xls", Encoding.UTF8));
2296 2303
 
@@ -2610,6 +2617,7 @@ namespace CallCenter.Utility
2610 2617
                     curContext.Response.ContentType = "application/vnd.ms-excel";
2611 2618
                     curContext.Response.ContentEncoding = Encoding.UTF8;
2612 2619
                     curContext.Response.Charset = "";
2620
+                    curContext.Response.AppendHeader("Access-Control-Expose-Headers", "Content-Disposition");
2613 2621
                     curContext.Response.AppendHeader("Content-Disposition",
2614 2622
                         "attachment;filename=" + HttpUtility.UrlEncode("业务简报_导出文件_" + DateTime.Now.Ticks + ".xls", Encoding.UTF8));
2615 2623
 
@@ -2748,6 +2756,7 @@ namespace CallCenter.Utility
2748 2756
                     curContext.Response.ContentType = "application/vnd.ms-excel";
2749 2757
                     curContext.Response.ContentEncoding = Encoding.UTF8;
2750 2758
                     curContext.Response.Charset = "";
2759
+                    curContext.Response.AppendHeader("Access-Control-Expose-Headers", "Content-Disposition");
2751 2760
                     curContext.Response.AppendHeader("Content-Disposition",
2752 2761
                         "attachment;filename=" + HttpUtility.UrlEncode(Name + ".xls", Encoding.UTF8));
2753 2762
 

+ 60 - 0
CallCenterCommon/CallCenter.Utility/word/AsposeWord.cs

@@ -1,4 +1,5 @@
1 1
 using Aspose.Words;
2
+using Aspose.Words.Drawing;
2 3
 using Aspose.Words.Saving;
3 4
 using Aspose.Words.Tables;
4 5
 using System;
@@ -226,5 +227,64 @@ namespace CallCenter.Utility
226 227
             else
227 228
                 oWordApplic.Write("");
228 229
         }
230
+
231
+        /// <summary>
232
+        /// 导出政策专家库
233
+        /// </summary>
234
+        public void CreateProfessorWord(DataTable dt)
235
+        {
236
+            oWordApplic.MoveToBookmark("xh");//跳转到书签名是xh的位置
237
+            oWordApplic.Write(dt.Rows[0]["F_Id"].ToString());
238
+            oWordApplic.MoveToBookmark("zjxm");
239
+            oWordApplic.Write(dt.Rows[0]["F_XingMing"].ToString());
240
+            oWordApplic.MoveToBookmark("zjdw");
241
+            oWordApplic.Write(dt.Rows[0]["F_DanWei"].ToString());
242
+            oWordApplic.MoveToBookmark("ks");
243
+            oWordApplic.Write(dt.Rows[0]["F_KeShi"].ToString());
244
+            oWordApplic.MoveToBookmark("zw");
245
+            oWordApplic.Write(dt.Rows[0]["F_ZhiWu"].ToString());
246
+            oWordApplic.MoveToBookmark("sjhm");
247
+            oWordApplic.Write(dt.Rows[0]["F_ShouJi"].ToString());
248
+            oWordApplic.MoveToBookmark("bgdh");
249
+            oWordApplic.Write(dt.Rows[0]["F_DianHua"].ToString());
250
+            oWordApplic.MoveToBookmark("dq");
251
+            oWordApplic.Write(dt.Rows[0]["F_DiQu"].ToString());
252
+            oWordApplic.MoveToBookmark("sshy");
253
+            oWordApplic.Write(dt.Rows[0]["F_HangYe"].ToString());
254
+            oWordApplic.MoveToBookmark("sxsj");
255
+            if (dt.Rows[0]["F_ShengXiaoShiJian"] != null && dt.Rows[0]["F_ShengXiaoShiJian"].ToString() != "")
256
+                oWordApplic.Write(DateTime.Parse(dt.Rows[0]["F_ShengXiaoShiJian"].ToString()).ToString("yyyy-MM-dd HH:mm:ss"));
257
+            else
258
+                oWordApplic.Write("");
259
+            oWordApplic.MoveToBookmark("sxsj1");
260
+            if (dt.Rows[0]["F_ShiXiaoShiJian"] != null && dt.Rows[0]["F_ShiXiaoShiJian"].ToString() != "")
261
+                oWordApplic.Write(DateTime.Parse(dt.Rows[0]["F_ShiXiaoShiJian"].ToString()).ToString("yyyy-MM-dd HH:mm:ss"));
262
+            else
263
+                oWordApplic.Write("");
264
+            oWordApplic.MoveToBookmark("fbsj");
265
+            if (dt.Rows[0]["F_FaBuShiJian"] != null && dt.Rows[0]["F_FaBuShiJian"].ToString() != "")
266
+                oWordApplic.Write(DateTime.Parse(dt.Rows[0]["F_FaBuShiJian"].ToString()).ToString("yyyy-MM-dd HH:mm:ss"));
267
+            else
268
+                oWordApplic.Write("");
269
+            oWordApplic.MoveToBookmark("fbr");
270
+            oWordApplic.Write(dt.Rows[0]["F_FaBuRen"].ToString());
271
+            oWordApplic.MoveToBookmark("fbdw");
272
+            oWordApplic.Write(dt.Rows[0]["F_FaBuDanWei"].ToString());
273
+            oWordApplic.MoveToBookmark("bsbm");
274
+            oWordApplic.Write(dt.Rows[0]["F_BiaoShiBianMa"].ToString());
275
+            oWordApplic.MoveToBookmark("zylyjj");
276
+            oWordApplic.Write(dt.Rows[0]["F_ZhuanYeLingYuJianJie"].ToString());
277
+            oWordApplic.MoveToBookmark("tp");
278
+
279
+            if (dt.Rows[0]["F_TouXiang"] != null && dt.Rows[0]["F_TouXiang"].ToString() != "")
280
+            {
281
+                string imgPath = HttpContext.Current.Server.MapPath(dt.Rows[0]["F_TouXiang"].ToString());
282
+                if (File.Exists(imgPath))
283
+                {
284
+                    oWordApplic.MoveToBookmark("tp");
285
+                    oWordApplic.InsertImage(imgPath, RelativeHorizontalPosition.Margin, 1, RelativeVerticalPosition.Margin, 1, 100, 125, WrapType.Inline);
286
+                }
287
+            }
288
+        }
229 289
     }
230 290
 }