问题修改

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerNewController.cs

@@ -781,69 +781,69 @@ namespace CallCenterApi.Interface.Controllers.customer
 
                             if (dr["客户编号"].ToString() != "" && valcode(dr["客户编号"].ToString()))
                             {
-                                    if (!getunique(0, dr["客户编号"].ToString()))
+                                if (!getunique(0, dr["客户编号"].ToString()))
+                                {
+                                    dModel.F_CustomerCode = dr["客户编号"].ToString();
+                                    dModel.F_CompanyName = dr["公司名称"].ToString();
+                                    Model.T_Sys_Department pdModel = departmentBLL.GetModel(dr["大区名称"].ToString());
+                                    if (pdModel != null)
                                     {
-                                        dModel.F_CustomerCode = dr["客户编号"].ToString();
-                                        dModel.F_CompanyName = dr["公司名称"].ToString();
-                                        Model.T_Sys_Department pdModel = departmentBLL.GetModel(dr["大区名称"].ToString());
-                                        if (pdModel != null)
-                                        {
-                                            dModel.F_AreaID = pdModel.F_DeptId.ToString();
-                                        }
-                                        Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(dr["分公司名称"].ToString());
-                                        if (pdModel1 != null)
-                                        {
-                                            dModel.F_BranchID = pdModel1.F_DeptId.ToString();
-                                        }
-                                        #region
-                                        dModel.F_Salesman = dr["业务员"].ToString();
-                                        dModel.F_SalesPhone = dr["业务员电话"].ToString();
-                                        dModel.F_Channel = dr["渠道类型"].ToString();
-                                        dModel.F_Credit = dr["信用等级"].ToString();
-                                        dModel.F_Legal = dr["客户"].ToString();
-                                        if (!string.IsNullOrEmpty(dr["性别"].ToString()))
-                                        {
-                                            if (dr["性别"].ToString() == "女")
-                                            {
-                                                dModel.F_Gender = "2";
-                                            }
-                                            else
-                                            {
-                                                dModel.F_Gender = "1";
-                                            }
-                                        }
-                                        dModel.F_LegalPhone = dr["客户电话"].ToString();
-                                        dModel.F_AddressProvince = dr["省"].ToString();
-                                        dModel.F_AddressCity = dr["市"].ToString();
-                                        dModel.F_AddressCountry = dr["县"].ToString();
-                                        dModel.F_AddressTownship = dr["乡"].ToString();
-                                        dModel.F_AddressFull = dr["详细地址"].ToString();
-                                        dModel.F_Brands = dr["经营品牌"].ToString();
-                                        dModel.F_Product = dr["产品"].ToString();
-                                        dModel.F_IsRunXLX = dr["是否经营心连心"].ToString();
-                                        dModel.F_AnnualSales = dr["年销量"].ToString();
-                                        dModel.F_Formula = dr["配方"].ToString();
-                                        dModel.F_RaiseCrops = dr["种植作物"].ToString();
-                                        dModel.F_PlantingArea = dr["种植面积"].ToString();
-                                        dModel.F_FertilizerBrand = dr["用肥品牌"].ToString();
-                                        dModel.F_Remark = dr["备注"].ToString();
-                                        #endregion
-                                        dModel.F_CreateOn = DateTime.Now;
-                                        var res = cusbll.Add(dModel);
-                                        if (res > 0)
+                                        dModel.F_AreaID = pdModel.F_DeptId.ToString();
+                                    }
+                                    Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(dr["分公司名称"].ToString());
+                                    if (pdModel1 != null)
+                                    {
+                                        dModel.F_BranchID = pdModel1.F_DeptId.ToString();
+                                    }
+                                    #region
+                                    dModel.F_Salesman = dr["业务员"].ToString();
+                                    dModel.F_SalesPhone = dr["业务员电话"].ToString();
+                                    dModel.F_Channel = dr["渠道类型"].ToString();
+                                    dModel.F_Credit = dr["信用等级"].ToString();
+                                    dModel.F_Legal = dr["客户"].ToString();
+                                    if (!string.IsNullOrEmpty(dr["性别"].ToString()))
+                                    {
+                                        if (dr["性别"].ToString() == "女")
                                         {
-                                            addoptlog(usercode, ip, EnumOpt.import.ToString(), res.ToString(), "导入成功,导入的文件为：" + newpath + ",当前为第" + headrow + "行");
+                                            dModel.F_Gender = "2";
                                         }
                                         else
                                         {
-                                            msg = msg + "第" + headrow + "行，导入失败<br>";
+                                            dModel.F_Gender = "1";
                                         }
                                     }
+                                    dModel.F_LegalPhone = dr["客户电话"].ToString();
+                                    dModel.F_AddressProvince = dr["省"].ToString();
+                                    dModel.F_AddressCity = dr["市"].ToString();
+                                    dModel.F_AddressCountry = dr["县"].ToString();
+                                    dModel.F_AddressTownship = dr["乡"].ToString();
+                                    dModel.F_AddressFull = dr["详细地址"].ToString();
+                                    dModel.F_Brands = dr["经营品牌"].ToString();
+                                    dModel.F_Product = dr["产品"].ToString();
+                                    dModel.F_IsRunXLX = dr["是否经营心连心"].ToString();
+                                    dModel.F_AnnualSales = dr["年销量"].ToString();
+                                    dModel.F_Formula = dr["配方"].ToString();
+                                    dModel.F_RaiseCrops = dr["种植作物"].ToString();
+                                    dModel.F_PlantingArea = dr["种植面积"].ToString();
+                                    dModel.F_FertilizerBrand = dr["用肥品牌"].ToString();
+                                    dModel.F_Remark = dr["备注"].ToString();
+                                    #endregion
+                                    dModel.F_CreateOn = DateTime.Now;
+                                    var res = cusbll.Add(dModel);
+                                    if (res > 0)
+                                    {
+                                        addoptlog(usercode, ip, EnumOpt.import.ToString(), res.ToString(), "导入成功,导入的文件为：" + newpath + ",当前为第" + headrow + "行");
+                                    }
                                     else
                                     {
-                                    var CustomerBase = new BLL.T_Cus_CustomerBaseNew().GetModelList("F_CustomerCode='" + dr["客户编号"].ToString() + "'").FirstOrDefault  ();
+                                        msg = msg + "第" + headrow + "行，导入失败<br>";
+                                    }
+                                }
+                                else
+                                {
+                                    var CustomerBase = new BLL.T_Cus_CustomerBaseNew().GetModelList("F_CustomerCode='" + dr["客户编号"].ToString() + "'").FirstOrDefault();
 
-                                    if (CustomerBase!=null )
+                                    if (CustomerBase != null)
                                     {
                                         CustomerBase.F_CompanyName = dr["公司名称"].ToString();
                                         Model.T_Sys_Department pdModel = departmentBLL.GetModel(dr["大区名称"].ToString());
@@ -888,7 +888,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                                         CustomerBase.F_PlantingArea = dr["种植面积"].ToString();
                                         CustomerBase.F_FertilizerBrand = dr["用肥品牌"].ToString();
                                         CustomerBase.F_Remark = dr["备注"].ToString();
-                                        var res = cusbll.Update (CustomerBase);
+                                        var res = cusbll.Update(CustomerBase);
                                         if (res)
                                         {
                                             addoptlog(usercode, ip, EnumOpt.import.ToString(), res.ToString(), "导入成功,导入的文件为：" + newpath + ",当前为第" + headrow + "行");
@@ -900,7 +900,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                                     }
 
 
-                                    }
+                                }
 
 
 
@@ -919,9 +919,88 @@ namespace CallCenterApi.Interface.Controllers.customer
             }
             return Error("用户登录失败，请重新登录");
         }
+
+        //public ActionResult ImportExcel()
+        //{
+        //    string usercode = CurrentUser.UserData.F_UserCode;
+        //    string ip = DTRequest.GetIP();
+        //    if (!string.IsNullOrWhiteSpace(usercode))
+        //    {
+        //        HttpPostedFile _upFile = RequestString.GetFile("upFile");
+        //        if (_upFile != null)
+        //        {
+        //            int a = 80528;
+        //            int headrow = 0;
+        //            #region 上传文件
+        //            string filepath = "";
+        //            string datepath = DateTime.Now.ToString("yyyyMMddHHMMss");
+        //            string aLastName = Path.GetExtension(_upFile.FileName);
+        //            string oriname = Path.GetFileNameWithoutExtension(_upFile.FileName);
+        //            if (aLastName != ".xls" && aLastName != ".xlsx")
+        //            {
+        //                return Error("文件类型错误，请选择Excel文件");
+        //            }
+        //            string newpath = datepath + "_" + _upFile.FileName;
+        //            if (!Directory.Exists(Server.MapPath(this.Request.ApplicationPath + "\\ExcelData")))
+        //            {
+        //                Directory.CreateDirectory(Server.MapPath(this.Request.ApplicationPath + "\\ExcelData"));
+        //            }
+        //            filepath = this.Request.ApplicationPath + "/ExcelData/" + newpath;
+        //            string PhysicalPath = Server.MapPath(filepath);
+        //            _upFile.SaveAs(PhysicalPath);
+        //            #endregion
+        //            NPOIHelper np = new NPOIHelper();
+        //            DataTable dt = np.ExcelToTable(_upFile, headrow);
+        //            string msg = string.Empty;
+        //            if (dt == null || dt.Rows.Count == 0)
+        //                return Error("文件没有数据");
+        //            else
+        //            {
+        //                Model.T_Sys_UserAccount dModel = new Model.T_Sys_UserAccount();
+
+        //                foreach (DataRow dr in dt.Rows)
+        //                {
+        //                    headrow = headrow + 1;
+        //                    string ucode = dr["职员编码"].ToString();
+        //                    if (!string.IsNullOrEmpty(ucode))
+        //                    {
+        //                        dModel.F_UserCode = (a + headrow).ToString();
+        //                        dModel.F_WorkNumber = ucode;
+        //                    }
+        //                    dModel.F_UserName = dr["姓名"].ToString();
+        //                    dModel.F_Password = "123456";
+        //                    dModel.F_DeptId = int.Parse(dr["大区"].ToString());
+        //                    dModel.F_DeptCode = "|0|1|15|" + int.Parse(dr["大区"].ToString()) + "|";
+        //                    if (dr["岗位"].ToString() == "大区经理")
+        //                        dModel.F_RoleId = 62;
+        //                    else if (dr["岗位"].ToString() == "业务员")
+        //                        dModel.F_RoleId = 58;
+        //                    else
+        //                        return Error("失败");
+        //                    dModel.F_SeatFlag = false;
+        //                    dModel.F_SeatRight = "0";
+        //                    dModel.F_SexFlag = "男";
+        //                    dModel.F_Remark = dr["负责区域"].ToString();
+        //                    dModel.F_Mobile = dr["联系方式"].ToString();
+        //                    dModel.F_DeleteFlag = 0;
+        //                    dModel.F_CreateOn = DateTime.Now;
+        //                    BLL.T_Sys_UserAccount T_Sys_UserAccount = new BLL.T_Sys_UserAccount();
+        //                    var res = T_Sys_UserAccount.Add(dModel);
+
+        //                }
+        //                if (string.IsNullOrEmpty(msg))
+        //                    return Success("导入成功 ");
+        //                else
+        //                    return Error(msg);
+        //            }
+        //        }
+        //        return Error("数据源上传失败");
+        //    }
+        //    return Error("用户登录失败，请重新登录");
+        //}
         #endregion
-        #endregion
-        #region 私有方法
+        //   #endregion
+     //   #region 私有方法
         /// <summary>
         /// 验证物料编码为10位纯数字
         /// </summary>

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/knowledge/KnowledgeController.cs

@@ -461,7 +461,7 @@ namespace CallCenterApi.Interface.Controllers.knowledge
             }
             #endregion
             NPOIHelper npoi = new NPOIHelper();
-            if (npoi.ExportToExcel("工单列表", dt) == "")
+            if (npoi.ExportToExcel("知识库", dt) == "")
             {
                 return Success("导出成功");
             }
@@ -579,7 +579,7 @@ namespace CallCenterApi.Interface.Controllers.knowledge
         /// 上传附件
         /// </summary>
         /// <returns></returns>
-        [Authority]
+      //  [Authority]
         public ActionResult UpLoadProcess(string id, string name, string type, string lastModifiedDate, int size, HttpPostedFileBase file)
         {
             try
@@ -587,7 +587,7 @@ namespace CallCenterApi.Interface.Controllers.knowledge
                 if (file == null) return Error("参数传入失败");
                 if (Request.Files.Count == 0) return Error("保存失败");
 
-                string userCode = CurrentUser.UserData.F_UserCode;
+             //   string userCode = CurrentUser.UserData.F_UserCode;
                 string filePathName = string.Empty;
                 #region 保存文件到本地路径
                 string path = "/Upload/Files/" + DateTime.Now.ToString("yyyy/MM/dd") + "/";
@@ -633,7 +633,7 @@ namespace CallCenterApi.Interface.Controllers.knowledge
                         model_T_Sys_Accessories.F_FileType = type;//附件类型
                         model_T_Sys_Accessories.F_FileUrl = (filePathName).Replace('\\', '/');//附件地址
                         model_T_Sys_Accessories.F_Size = size;
-                        model_T_Sys_Accessories.F_UserCode = userCode;//上传人  
+                   //     model_T_Sys_Accessories.F_UserCode = userCode;//上传人  
                         model_T_Sys_Accessories.F_OriName = oriname;
                         int fid = new BLL.T_Sys_Accessories().Add(model_T_Sys_Accessories);
                         #endregion

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/WOReportController.cs

@@ -1648,7 +1648,10 @@ namespace CallCenterApi.Interface.Controllers.report
                 drNew["处理人"] = it.F_DealBy;//
                 drNew["处理时间"] = it.F_DealTime;//
                 drNew["处理内容"] = it.F_DealContent;//
-                drNew["处理结果"] = it.F_DealResult;//
+                if (it.F_State == 10 || it.F_State == 11)
+                    drNew["处理结果"] = "已处理";//处理结果
+                else
+                    drNew["处理结果"] =   "未处理";//处理结果
                 drNew["未处理原因"] = it.F_DealReasons;//
                 drNew["添加时间"] = it.F_CreateOn; ;//
                 dt.Rows.Add(drNew);
@@ -4244,7 +4247,10 @@ question, int page = 1, int limit = 10)
                     model.F_DealBy = model1[i].F_DealBy;//处理人
                     model.F_DealTime = model1[i].F_DealTime;//处理时间
                     model.F_DealContent = model1[i].F_DealContent;//处理内容
-                    model.F_DealResult = model1[i].F_DealResult;//处理结果
+                    if (model1[i].F_State ==10|| model1[i].F_State == 11)
+                    model.F_DealResult ="已处理";//处理结果
+                    else
+                        model.F_DealResult = "未处理";//处理结果
                     model.F_DealReasons = model1[i].F_DealReasons;//未处理原因
                     model.F_CreateOn = model1[i].F_CreateOn; ;//添加时间
                     Input.Add(model);

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/weixin/WxLoginController.cs

@@ -3038,7 +3038,42 @@ namespace CallCenterApi.Interface.Controllers.weixin
 
             return count > 0;
         }
-
+        /// <summary>
+        /// 添加工单
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult CustomAdd(WorkOrderNewInput input, int overtime = 0, int sms = 0)
+        {
+                if ( input.F_Source != 4)
+                {
+                    return Error("无操作权限！");
+                }
+                if (string.IsNullOrEmpty(input.F_CusName))
+                    return Error("请输入客户姓名！");
+                if (string.IsNullOrEmpty(input.F_CusPhone))
+                    return Error("请输入客户电话！");
+                var model = new Model.T_Wo_WorkOrder();
+                #region 保存客户基本信息
+                model = inputtoobj(null , model, input, 2);
+                model.F_State = (int)EnumWorkOrderState.customers;
+                model.F_limit = overtime;
+                #endregion
+                long n = woBLL.Add(model);
+                if (n > 0)
+                {
+                    #region 流转上一级领导审批
+                    Model.T_Wo_WorkOrder modlelist = new BLL.T_Wo_WorkOrder().GetModel(n);
+                    if (modlelist != null)
+                    {
+                    AddLog(modlelist.F_ID, 0, "客户" + "创建工单", (int)EnumItemType.deal, (int)EnumItemOpt.create, "", 0, null, overtime, sms);
+                    return Success("添加成功");
+                }
+                    #endregion
+                    return Success("添加成功！");
+                }
+                else
+                    return Error("添加失败！");
+        }
         /// <summary>
         /// 添加工单
         /// </summary>

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderNewController.cs

@@ -3908,8 +3908,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             
                     if (!string.IsNullOrEmpty(idd.Trim()))
                     {
-                        if (itembll .DeleteList (idd.TrimEnd(',')))
-                          {
+                       
                             if (workOrder.DeleteList(idd.TrimEnd(',')))
                             {
 
@@ -3920,11 +3919,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             {
                                 return Error("设置失败");
                             }
-                        }
-                        else
-                        {
-                            return Error("设置失败");
-                        }
                        
                     }
                     else