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

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Question/QuestionnaireController.cs

@@ -14,6 +14,7 @@ using System.Web.Mvc;
 
 namespace CallCenterApi.Interface.Controllers.Question
 {
+    [Authority]
     public class QuestionnaireController : BaseController
     {
         private readonly BLL.T_Ask_QuestionCategory qCategoryBLL = new BLL.T_Ask_QuestionCategory();

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/UserAccountController.cs

@@ -13,7 +13,7 @@ using System.Web.Mvc;
 
 namespace CallCenterApi.Interface.Controllers
 {
-
+    [Authority]
     public class UserAccountController : BaseController
     {
         private BLL.T_Sys_UserAccount sysUserAccountBll = new BLL.T_Sys_UserAccount();
@@ -21,7 +21,7 @@ namespace CallCenterApi.Interface.Controllers
         private BLL.T_Sys_DictionaryValue dicValueBLL = new BLL.T_Sys_DictionaryValue();
 
         //用户列表
-        [Authority]
+        //[Authority]
         public ActionResult GetList(int isdc=0)
         {
             int userId = Utils.StrToInt(User.UserData["F_UserID"], 0);
@@ -177,7 +177,7 @@ namespace CallCenterApi.Interface.Controllers
 
 
         //获取用户信息
-        [Authority]
+        //[Authority]
         public ActionResult GetUser(int userId = 0, string userCode = "")
         {
             string sql = "";
@@ -234,7 +234,7 @@ namespace CallCenterApi.Interface.Controllers
             });
 
         }
-        [Authority]
+        //[Authority]
         //添加用户信息
         public ActionResult AddUsers(UserAccountInput input)
         {
@@ -298,7 +298,7 @@ namespace CallCenterApi.Interface.Controllers
             else
                 return Error("新增失败！");
         }
-        [Authority]
+        //[Authority]
         //修改用户信息
         public ActionResult EditUsers(UserAccountInput input)
         {
@@ -358,7 +358,7 @@ namespace CallCenterApi.Interface.Controllers
             else
                 return Error("编辑失败！");
         }
-        [Authority]
+        //[Authority]
         //删除/禁用/启用 用户
         public ActionResult DelUsers(string[] ids, int state = 0)
         {
@@ -389,7 +389,7 @@ namespace CallCenterApi.Interface.Controllers
                 return Error("设置失败");
         }
 
-        [Authority]
+        //[Authority]
         //删除用户
         public ActionResult WLDelUsers(string[] ids)
         {
@@ -439,7 +439,7 @@ namespace CallCenterApi.Interface.Controllers
 
         }
 
-        [Authority]
+        //[Authority]
         //获取当前用户信息
         public ActionResult GetNowUser()
         {
@@ -455,7 +455,7 @@ namespace CallCenterApi.Interface.Controllers
             return Success("获取成功", obj);
 
         }
-        [Authority]
+        //[Authority]
         /// <summary>
         /// 重置密码
         /// </summary>
@@ -575,7 +575,7 @@ namespace CallCenterApi.Interface.Controllers
         /// App手机端 用户列表
         /// </summary>
         /// <returns></returns>
-        [Authority]
+        //[Authority]
         public ActionResult GetAppUserList()
         {
             DataTable dt = new DataTable();

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/callout/CallOutPlanController.cs

@@ -1205,7 +1205,7 @@ namespace CallCenterApi.Interface.Controllers.callout
             Model.T_Cus_CustomerBase cusmodel = new Model.T_Cus_CustomerBase();
             if (!string.IsNullOrWhiteSpace(telphone))
             {
-                var fkconfig = new BLL.T_Sys_DictionaryValue().GetModel(countryid);
+                var fkconfig = new BLL.T_Sys_Area().GetModel(countryid);
                 
                 cusmodel = cusBLL.GetModelByPhone(telphone);
 
@@ -1213,7 +1213,7 @@ namespace CallCenterApi.Interface.Controllers.callout
                 {
                     cusmodel.F_Address = address;
                     if (fkconfig != null)
-                        cusmodel.F_City = fkconfig.F_Value;
+                        cusmodel.F_City = fkconfig.F_AreaName;
                     cusmodel.F_CityID = countryid;
                     cusmodel.F_CustomerName = name;
                     cusmodel.F_Telephone = phone;
@@ -1225,7 +1225,7 @@ namespace CallCenterApi.Interface.Controllers.callout
                     cusmodel = new Model.T_Cus_CustomerBase();
                     cusmodel.F_Address = address;
                     if (fkconfig != null)
-                        cusmodel.F_City = fkconfig.F_Value;
+                        cusmodel.F_City = fkconfig.F_AreaName;
                     cusmodel.F_CityID = countryid;
                     cusmodel.F_CustomerName = name;
                     cusmodel.F_Telephone = phone;

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/callout/CallPlanController.cs

@@ -15,6 +15,7 @@ using System.Web.Mvc;
 
 namespace CallCenterApi.Interface.Controllers.callout
 {
+    [Authority]
     public class CallPlanController : BaseController
     {
         private readonly BLL.T_CTI_Task taskBLL = new BLL.T_CTI_Task();
@@ -32,7 +33,7 @@ namespace CallCenterApi.Interface.Controllers.callout
         /// </summary>
         /// <param name="filter"></param>
         /// <returns></returns>
-        [Authority]
+        //[Authority]
         public ActionResult GetList(FilterCallPlan filter)
         {
             var sql = " and State>=0  ";
@@ -82,7 +83,7 @@ namespace CallCenterApi.Interface.Controllers.callout
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        [Authority]
+        //[Authority]
         public ActionResult GetModel(int id)
         {
             //if (!Request.IsAuthenticated)
@@ -121,7 +122,7 @@ namespace CallCenterApi.Interface.Controllers.callout
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        [Authority]
+        //[Authority]
         public ActionResult CreateOrUpdate(CallPlanInput input)
         {
           //  if (!Request.IsAuthenticated)
@@ -316,7 +317,7 @@ namespace CallCenterApi.Interface.Controllers.callout
         /// <param name="id"></param>
         /// <param name="state"></param>
         /// <returns></returns>
-        [Authority]
+        //[Authority]
         public ActionResult Delete(int id)
         {
             //if (!Request.IsAuthenticated)
@@ -334,7 +335,7 @@ namespace CallCenterApi.Interface.Controllers.callout
         /// <param name="pageSize"></param>
         /// <param name="pageIndex"></param>
         /// <returns></returns>
-        [Authority]
+        //[Authority]
         public ActionResult GetPhoneList(FilterCallPhone filter)
         {
             //if (!Request.IsAuthenticated)
@@ -428,7 +429,7 @@ namespace CallCenterApi.Interface.Controllers.callout
         /// </summary>
         /// <param name="filter"></param>
         /// <returns></returns>
-        [Authority]
+        //[Authority]
         public ActionResult GetCategoryList(FilterVoiceCategory filter)
         {
             var sql = " ";
@@ -470,7 +471,7 @@ namespace CallCenterApi.Interface.Controllers.callout
         /// 获取所有类别（包含顶级分类）
         /// </summary>
         /// <returns></returns>
-        [Authority]
+        //[Authority]
         public ActionResult GetCategoryAllList()
         {
             List<Model.T_CTI_TaskCategory> modelList = taskCategoryBLL.DataTableToList(taskCategoryBLL.GetList("").Tables[0]);
@@ -489,7 +490,7 @@ namespace CallCenterApi.Interface.Controllers.callout
         /// 获取所有类别（不包含顶级分类）
         /// </summary>
         /// <returns></returns>
-        [Authority]
+        //[Authority]
         public ActionResult GetCategoryALLList2()
         {
             List<Model.T_CTI_TaskCategory> modelList = taskCategoryBLL.DataTableToList(taskCategoryBLL.GetList("").Tables[0]);
@@ -504,7 +505,7 @@ namespace CallCenterApi.Interface.Controllers.callout
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        [Authority]
+        //[Authority]
         public ActionResult GetCategory(int id)
         {
             //if (!Request.IsAuthenticated)
@@ -525,7 +526,7 @@ namespace CallCenterApi.Interface.Controllers.callout
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        [Authority]
+        //[Authority]
         public ActionResult CreateOrUpdateCategory(VoiceCategoryInput input)
         {
             //if (!Request.IsAuthenticated)
@@ -564,7 +565,7 @@ namespace CallCenterApi.Interface.Controllers.callout
         /// <param name="id"></param>
         /// <param name="state"></param>
         /// <returns></returns>
-        [Authority]
+        //[Authority]
         public ActionResult DeleteCategory(int id)
         {
             //if (!Request.IsAuthenticated)
@@ -581,7 +582,7 @@ namespace CallCenterApi.Interface.Controllers.callout
         /// </summary>
         /// <param name="filter"></param>
         /// <returns></returns>
-        [Authority]
+        //[Authority]
         public ActionResult GetVoiceTempList(FilterVoiceTemp filter)
         {
             var sql = " ";
@@ -621,7 +622,7 @@ namespace CallCenterApi.Interface.Controllers.callout
             };
             return Content(obj.ToJson());
         }
-        [Authority]
+        //[Authority]
         public ActionResult GetVoiceTempTitleList(FilterVoiceTemp filter)
         {
             var list = taskVoiceTempBLL.DataTableToList2(taskVoiceTempBLL.GetList("").Tables[0]);
@@ -636,7 +637,7 @@ namespace CallCenterApi.Interface.Controllers.callout
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        [Authority]
+        //[Authority]
         public ActionResult GetVoiceTemp(int id)
         {
             //if (!Request.IsAuthenticated)
@@ -659,7 +660,7 @@ namespace CallCenterApi.Interface.Controllers.callout
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        [Authority]
+        //[Authority]
         public ActionResult CreateOrUpdateVoiceTemp(VoiceTempleteInput input)
         {
             //if (!Request.IsAuthenticated)
@@ -698,7 +699,7 @@ namespace CallCenterApi.Interface.Controllers.callout
         /// <param name="id"></param>
         /// <param name="state"></param>
         /// <returns></returns>
-        [Authority]
+        //[Authority]
         public ActionResult DeleteVoiceTemp(int[] ids)
         {
             //if (!Request.IsAuthenticated)

CallCenterCommon/CallCenter.Utility/NPOI/NPOIHelper.cs

@@ -1564,7 +1564,9 @@ namespace CallCenter.Utility
                 var cp0 = table.GetRow(0).GetCell(0).GetCTTc().AddNewTcPr();
                 cp0.AddNewVMerge().val = ST_Merge.restart;
                 cp0.AddNewVAlign().val = ST_VerticalJc.center;
+                cp0.tcW = new CT_TblWidth();cp0.tcW.w = "650";cp0.tcW.type = ST_TblWidth.dxa;
                 table.GetRow(0).GetCell(0).SetParagraph(GetParagraph(table, true, "事项编号"));
+
                 var cp1 = table.GetRow(0).GetCell(1).GetCTTc().AddNewTcPr();
                 cp1.AddNewVMerge().val = ST_Merge.restart;
                 cp1.AddNewVAlign().val = ST_VerticalJc.center;
@@ -1609,7 +1611,7 @@ namespace CallCenter.Utility
                 table.GetRow(5).GetCTRow().AddNewTrPr().AddNewTrHeight().val = (ulong)2000;
                 table.GetRow(5).MergeCells(1, 7);//合并列
                 table.GetRow(5).GetCell(0).SetParagraph(GetParagraph(table, true, "调度意见"));
-                table.GetRow(5).GetCell(1).SetParagraph(GetParagraphImg(table, false, "请于1小时内与来电人取得联系（匿名除外），并于7个工作日内将办理情况反馈来电人，并将办理结果报市长便民公开电话受理中心，同时做好来电人信息保密工作。（若超期将进行通报；若无故不回复，将转交市委市政府督查局。）", false));
+                table.GetRow(5).GetCell(1).SetParagraph(GetParagraph(table, false, "请于1小时内与来电人取得联系（匿名除外），并于7个工作日内将办理情况反馈来电人，并将办理结果报市长便民公开电话受理中心，同时做好来电人信息保密工作。（若超期将进行通报；若无故不回复，将转交市委市政府督查局。）", false));
                 //第七行
                 table.GetRow(6).GetCTRow().AddNewTrPr().AddNewTrHeight().val = (ulong)1500;
                 table.GetRow(6).MergeCells(1, 7);//合并列
@@ -1637,14 +1639,14 @@ namespace CallCenter.Utility
                 xwpfRun1.FontSize = 9;//设置文字大小
                 xwpfRun1.SetFontFamily("宋体", NPOI.XWPF.UserModel.FontCharRange.None); //设置标题样式如：（微软雅黑，隶书，楷体）根据自己的需求而定
 
-                //NPOI.XWPF.UserModel.XWPFParagraph paragraph2 = document.CreateParagraph();//创建段落对象
-                //paragraph2.Alignment = NPOI.XWPF.UserModel.ParagraphAlignment.RIGHT;//文字显示位置,段落排列（左对齐，居中，右对齐）
-                //NPOI.XWPF.UserModel.XWPFRun xwpfRun2 = paragraph2.CreateRun();//创建段落文本对象
-                //using (FileStream picData = new FileStream(HttpContext.Current.Server.MapPath("/Upload/Word/word.png"), FileMode.Open, FileAccess.Read))
-                //{
-                //    //图片的文件流   图片类型   图片名称   设置的宽度以及高度
-                //    xwpfRun2.AddPicture(picData, (int)PictureType.PNG, "word.png", NPOI.Util.Units.ToEMU(200), NPOI.Util.Units.ToEMU(200));
-                //}
+                NPOI.XWPF.UserModel.XWPFParagraph paragraph2 = document.CreateParagraph();//创建段落对象
+                paragraph2.Alignment = NPOI.XWPF.UserModel.ParagraphAlignment.RIGHT;//文字显示位置,段落排列（左对齐，居中，右对齐）
+                NPOI.XWPF.UserModel.XWPFRun xwpfRun2 = paragraph2.CreateRun();//创建段落文本对象
+                using (FileStream picData = new FileStream(HttpContext.Current.Server.MapPath("/Upload/Word/word.png"), FileMode.Open, FileAccess.Read))
+                {
+                    //图片的文件流   图片类型   图片名称   设置的宽度以及高度
+                    xwpfRun2.AddPicture(picData, (int)PictureType.PNG, "word.png", NPOI.Util.Units.ToEMU(100), NPOI.Util.Units.ToEMU(100));
+                }
 
 
                 using (MemoryStream ms = new MemoryStream())