qq

codegit/CallCenterApi/CallCenterApi.DAL/Rotation.cs

@@ -4,12 +4,13 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace CallCenterApi.DAL
 {
-   public   class Rotation
+    public class Rotation
     {
         /// <summary>
         /// 增加一条图片
@@ -49,12 +50,16 @@ namespace CallCenterApi.DAL
         /// 查询图片信息
         /// </summary>
         /// <returns></returns>
-        public DataSet GetList()
+        public DataSet GetList(string name)
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("select ");
             strSql.Append(" * ");
             strSql.Append(" FROM Rotation ");
+            if (name != "")
+            {
+                strSql.Append(" where roname like '%" + name + "%' ");
+            }
 
             var ds = DbHelperSQL.Query(strSql.ToString());
 
@@ -65,7 +70,7 @@ namespace CallCenterApi.DAL
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        public bool delrotation(string  id)
+        public bool delrotation(string id)
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("update Rotation set isEnable=1 ");
@@ -80,7 +85,7 @@ namespace CallCenterApi.DAL
                 return false;
             }
 
-          
+
         }
         /// <summary>
         /// 启用图片信息
@@ -104,5 +109,54 @@ namespace CallCenterApi.DAL
 
 
         }
+        /// <summary>
+        /// 删除图片
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public bool SCRotion(string id)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("delete  from  Rotation");
+            strSql.Append(" where id  in (" + id + ") ");
+            int rows = DbHelperSQL.ExecuteSql(strSql.ToString());
+            if (rows > 0)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+
+
+        }
+        /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
+        public CallCenterApi.Model.Rotation DataRowToModel(DataRow row)
+        {
+            #region 之前的 
+
+            #endregion
+            Model.Rotation model = new Model.Rotation();//主表字段
+            if (row != null)
+            {
+                #region 主表信息======================
+                //利用反射获得属性的所有公共属性
+                Type modelType = model.GetType();
+                for (int i = 0; i < row.Table.Columns.Count; i++)
+                {
+                    PropertyInfo proInfo = modelType.GetProperty(row.Table.Columns[i].ColumnName);
+                    if (proInfo != null && row[i] != DBNull.Value)
+                    {
+                        //用索引值设置属性值
+                        proInfo.SetValue(model, row[i], null);
+                    }
+                }
+                #endregion
+            }
+            return model;
+        }
     }
 }

codegit/CallCenterApi/CallCenterApi.DAL/T_Call_CallRecords.cs

@@ -875,7 +875,7 @@ namespace CallCenterApi.DAL
         public bool UpdateCallInHookTelRecord(string p_CallId)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("update T_Call_CallRecords SET DealType=(case CallState when 1 then 6 else DealType end)");
+            strSql.Append("update T_Call_CallRecords  SET DealType=(case CallState when 1 then 6 else DealType end)");
             strSql.Append(" where CallId=@CallId");
             SqlParameter[] parameters = {
                     new SqlParameter("@CallId", SqlDbType.VarChar,50)};

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

@@ -72,7 +72,6 @@ namespace CallCenterApi.Interface.Controllers.report
 
             }
         }
-
         public ActionResult AreaComplaint(string stime="", string endtime = "", int isdc=0)
         {
           List <Complaint>   complaintlist = new List<Complaint>();
@@ -246,6 +245,8 @@ namespace CallCenterApi.Interface.Controllers.report
             }
 
         }
+
+
         public ActionResult Afterprogress(string stime = "", string endtime = "", int isdc = 0)
         {
             List<Aftersale> aftersalelist = new List<Aftersale>();
@@ -275,14 +276,16 @@ namespace CallCenterApi.Interface.Controllers.report
             var Area = new BLL.T_Sys_Department().GetModelList("isnull(F_ParentId, 1) = 1 and F_State = 1 and F_Layer = 1");
             float max = 0; float min = 0;
             string maxarea = "", minarea = "";
+            int Tobeassignment = 0;
             Aftersale complaints = new Aftersale();
             complaints.serialnumbe = "合计";
             complaints.receiving = 0;
             complaints.assignmentnumber = 0;
-          //  float Distributionrate = 0; float Receiving = 0;
             complaints.area = "";
+         
             if (workoeder != null)
             {
+                Tobeassignment = workoeder.Where(x => x.F_State == 1 || x.F_State == 5).Count();
                 for (int i = 0; i < Area.Count; i++)
                 {
                     Aftersale aftersale = new Aftersale();
@@ -290,20 +293,9 @@ namespace CallCenterApi.Interface.Controllers.report
                     aftersale.area = Area[i].F_DeptName;//大区
                     var group = workoeder.Where(p => p.F_Area == Area[i].F_DeptId.ToString());//投诉总量
                     aftersale.total = group.Count();
-
-                 
-                  
                     float a = 0; float b = 0; int assignment=0, receivingorders=0;
                     for (DateTime dt = strattime; dt <= enddatetime; dt = dt.AddDays(1))
                     {
-                     //   c++;
-                     //   var daycount = group.Where(p => (p.F_TobeallocatedTime < dt.AddDays(1) && (p.F_TransferTime >= dt || p.F_TransferTime == null))
-                           //   ).Count();
-
-                      //  var jiedancount = group.Where(p => ((p.F_TransferTime < dt.AddDays(1) && p.F_Receiving >= dt) ||(p.F_TransferTime < dt.AddDays(1)&& p.F_Receiving == null))
-                         //    ).Count();
-
-
                          assignment+= group.Where(p => (p.F_TobeallocatedTime < dt.AddDays(1) && p.F_TobeallocatedTime >= dt
                          && p.F_TransferTime < dt.AddDays(1) && p.F_TransferTime >= dt
                                )
@@ -312,22 +304,6 @@ namespace CallCenterApi.Interface.Controllers.report
                  && p.F_Receiving < dt.AddDays(1) && p.F_Receiving >= dt
                        )
                     ).Count();
-
-                      //  var tojiedan = group.Where(p => p.F_Receiving >= dt && p.F_Receiving < dt.AddDays(1)
-                     //   ).Count();
-                      //  var today = group.Where(p => p.F_TransferTime >= dt && p.F_TransferTime < dt.AddDays(1)
-                          //  ).Count();
-
-                     //   if (jiedancount > 0)
-                         //   b +=(float ) tojiedan / jiedancount;//当日
-                     //   else
-                          //  b += 1;
-
-
-                    //    if (daycount > 0)
-                         //   a += (float)today / daycount;//当日
-                     //   else
-                          //  a += 1;
                     }
                     complaints.receiving += receivingorders;//接单条数
                     aftersale.receiving = receivingorders;//接单条数
@@ -337,20 +313,10 @@ namespace CallCenterApi.Interface.Controllers.report
                         aftersale.assignmentrate = string.Format("{0:f2}%", (float)assignment / aftersale.total * 100);
                     else
                         aftersale.assignmentrate = "100%";
-                    //分派率
-                    // Distributionrate += (float)assignment / c;
-                    //   Receiving += (float)receivingorders / c;
                     if (aftersale.total > 0)
                         aftersale.receivingrate = string.Format("{0:f2}%", (float)receivingorders / aftersale.total * 100);//接单率
                     else
                         aftersale.receivingrate = "100%";
-
-
-
-
-
-
-
                     aftersale.processingnumber = group.Where( p => p.F_State == 4).Count();//处理中投诉
                     aftersale.processednumber = group.Where( p => p.F_State == 10).Count();//已处理投诉
                     float d = 0;
@@ -360,7 +326,6 @@ namespace CallCenterApi.Interface.Controllers.report
                         aftersale.processed = d;
                         aftersale.processedrate = string.Format("{0:f2}%", (float)aftersale.processednumber / aftersale.total * 100);//完结率
                     }
-                       
                     else
                     {
                         d = 1;
@@ -396,7 +361,6 @@ namespace CallCenterApi.Interface.Controllers.report
                     aftersalelist.Add(aftersale);
                 }
                 complaints.total = workoeder.Count();
-              
                 if (complaints.total > 0)
                     complaints.assignmentrate = string.Format("{0:f2}%",(float ) complaints.assignmentnumber / complaints.total * 100); //当日分派率
                 else
@@ -406,10 +370,6 @@ namespace CallCenterApi.Interface.Controllers.report
                     complaints.receivingrate = string.Format("{0:f2}%", (float)complaints.receiving / complaints.total * 100); //当日分派率
                 else
                     complaints.receivingrate = "100%";
-
-
-               
-              
                 complaints.processingnumber = workoeder.Where(p => p.F_State == 4).Count();//处理中投诉
                 complaints.processednumber = workoeder.Where(p => p.F_State == 10).Count();//已处理投诉
                 if (complaints.total > 0)
@@ -432,7 +392,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 if (isdc > 0)
                 {
                     NPOIHelper npoi = new NPOIHelper();
-                    if (npoi.AftersaleToExcel(strattime, enddatetime, aftersalelist, maxarea, minarea, pendingnumber) == "")
+                    if (npoi.AftersaleToExcel(strattime, enddatetime, aftersalelist, maxarea, minarea, pendingnumber, Tobeassignment) == "")
                     {
                         return Success("导出成功");
                     }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallInScreenController.cs

@@ -527,17 +527,17 @@ namespace CallCenterApi.Interface.Controllers.tel
             
             if (Request.IsAuthenticated)
             {
-
-                string strid = RequestString.GetFormString("callid");
-                bool bl = new BLL.T_Call_CallRecords().UpdateCallInHookTelRecord(strid);
-                if (bl)
-                {
-                    return Success("更新挂机状态成功");
-                }
-                else
-                {
-                    return Success("更新挂机状态失败");
-                }
+                return Success("更新挂机状态成功");
+                //string strid = RequestString.GetFormString("callid");
+                //bool bl = new BLL.T_Call_CallRecords().UpdateCallInHookTelRecord(strid);
+                //if (bl)
+                //{
+                //    return Success("更新挂机状态成功");
+                //}
+                //else
+                //{
+                //    return Success("更新挂机状态失败");
+                //}
 
             }
             return NoToken("未知错误，请重新登录");

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

@@ -1348,11 +1348,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                                 bool n = true;
                                                 if (model.F_State==10)
                                                 {
-                                                    n = new WorkTypeController().SendReminderSMS("完善工单提醒:", user.F_Mobile, count);
+                                                   n = new WorkTypeController().SendReminderSMS("完善工单提醒:", user.F_Mobile, count);
                                                 }
                                                 else
                                                 {
-                                                    n = new WorkTypeController().SendReminderSMS("工单催单提醒:", user.F_Mobile, count);
+                                                   n = new WorkTypeController().SendReminderSMS("工单催单提醒:", user.F_Mobile, count);
                                                 }
                                               
                                                 //   string msg = new PushMessageController().Push(Title, count, user.F_UserCode);
@@ -1658,164 +1658,179 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
 
         }
+        private readonly static object _MyLock = new object();
         /// 添加工单信息
         /// </summary>
         /// <returns></returns>
+        [Authority]
         public ActionResult AddWorkOrder(WorkOrderInput input,int isover=0, int IsAssign = 0, int clid = 0, string cont = "")
         {
             if (Request.IsAuthenticated)
             {
-                int userId = CurrentUser.UserData.F_UserId;
-                Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
-                Model.T_Sys_RoleInfo ro = rolebll.GetModel(userModel.F_RoleId);
-                if (!(input.F_Type > 0 && input.F_Type < 5))
-                    return Error("工单类型错误！");
-              
-                if (IsAssign > 0)
+                lock (_MyLock)
                 {
-                    if (clid == 0)
-                        return Error("请选择提交人！");
-                }
-                if (input.F_Type == 4)
-                {
-                    if (ro .F_RoleCode != "CJZY"&& ro.F_RoleCode != "XTGLY")
+                    #region 
+                    int userId = CurrentUser.UserData.F_UserId;
+                    Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
+                    if (userModel == null)
+                        return Error("未知错误，请重新登录");
+                        Model.T_Sys_RoleInfo ro = rolebll.GetModel(userModel.F_RoleId);
+                    if (ro == null)
+                        return Error("获取权限失败，请重新登录");
+                    if (input .F_Type==null )
+                        return Error("工单类型错误！");
+                    if (!(input.F_Type > 0 && input.F_Type < 5))
+                        return Error("工单类型错误！");
+
+                    if (IsAssign > 0)
                     {
-                        return Error("非抽检人员不可添加抽检工单！");
+                        if (clid == 0)
+                            return Error("请选择提交人！");
                     }
-                    if (string.IsNullOrEmpty(input.F_Company))
-                        return Error("抽检单位不能为空！");
-                    if (string.IsNullOrEmpty(input.F_Samplingtype))
-                        return Error("抽检类型不能为空！");
-                    if (string.IsNullOrEmpty(input.F_Salesroom))
-                        return Error("抽样客户/门店不能为空！");
-                    if (string.IsNullOrEmpty(input.F_Samplingproducts))
-                        return Error("抽检产品不能为空！");
-                    if (string.IsNullOrEmpty(input.F_ProductDate))
-                        return Error("生产日期不能为空！");
-                    if (string.IsNullOrEmpty(input.F_Factories))
-                        return Error("涉及工厂不能为空！");
-                    if (string.IsNullOrEmpty(input.F_CusPhone))
-                        return Error("电话不能为空！");
-                    if (string.IsNullOrEmpty(input.F_Remark ))
-                        return Error("备注不能为空！");
-                    if (string.IsNullOrEmpty(input.F_Datecheck))
-                        return Error("抽检日期不能为空！");
-                    
-                }
-                else
-                {
-                    if (string.IsNullOrEmpty(input.F_CusName))
-                        return Error("请输入来电人姓名！");
-                    if (string.IsNullOrEmpty(input.F_CusPhone))
-                        return Error("请输入来电人电话！");
-                    if (input.F_Type == 2)
+                    if (input.F_Type == 4)
                     {
-
+                        if (ro.F_RoleCode != "CJZY" && ro.F_RoleCode != "XTGLY")
+                        {
+                            return Error("非抽检人员不可添加抽检工单！");
+                        }
+                        if (string.IsNullOrEmpty(input.F_Company))
+                            return Error("抽检单位不能为空！");
+                        if (string.IsNullOrEmpty(input.F_Samplingtype))
+                            return Error("抽检类型不能为空！");
+                        if (string.IsNullOrEmpty(input.F_Salesroom))
+                            return Error("抽样客户/门店不能为空！");
+                        if (string.IsNullOrEmpty(input.F_Samplingproducts))
+                            return Error("抽检产品不能为空！");
                         if (string.IsNullOrEmpty(input.F_ProductDate))
-                            return Error("请输入生产日期！");
-                        if (string.IsNullOrEmpty(input.F_ProductType))
-                            return Error("产品代码不能为空！");
-                        if (string.IsNullOrEmpty(input.F_ProductName))
-                            return Error("产品名称不能为空！");
-                        if (string.IsNullOrEmpty(input.F_Specifications))
-                            return Error("规格不能为空！");
-                        if (string.IsNullOrEmpty(input.F_Manufacturer))
-                            return Error("生产厂家不能为空！");
-                        if (string.IsNullOrEmpty(input.F_ProblemCode))
-                            return Error("问题代码不能为空！");
-                        if (string.IsNullOrEmpty(input.F_QualityProblem))
-                            return Error("质量问题不能为空！");
+                            return Error("生产日期不能为空！");
+                        if (string.IsNullOrEmpty(input.F_Factories))
+                            return Error("涉及工厂不能为空！");
+                        if (string.IsNullOrEmpty(input.F_CusPhone))
+                            return Error("电话不能为空！");
+                        if (string.IsNullOrEmpty(input.F_Remark))
+                            return Error("备注不能为空！");
+                        if (string.IsNullOrEmpty(input.F_Datecheck))
+                            return Error("抽检日期不能为空！");
+
                     }
-                
-                }
-              
-             if (!string.IsNullOrEmpty(input.F_ProductDate))
-                {
-                    if (input.F_ProductDate!="不清")
+                    else
                     {
-                        try
+                        if (string.IsNullOrEmpty(input.F_CusName))
+                            return Error("请输入来电人姓名！");
+                        if (string.IsNullOrEmpty(input.F_CusPhone))
+                            return Error("请输入来电人电话！");
+                        if (input.F_Type == 2)
                         {
-                            string result = input.F_ProductDate.Replace(".", "");
-                            var pronos = DateTime.ParseExact(result, "yyyyMMdd", null).ToString("yyyy-MM-dd");
-                            var protime = Convert.ToDateTime(pronos);
-                            if (DateTime.Parse(pronos) > DateTime.Now)
-                            {
-                                return Error("生产日期不能大于当前时间！");
-                            }
-                        }
-                        catch
-                        {
-                            return Error("生产日期格式错误！");
+
+                            if (string.IsNullOrEmpty(input.F_ProductDate))
+                                return Error("请输入生产日期！");
+                            if (string.IsNullOrEmpty(input.F_ProductType))
+                                return Error("产品代码不能为空！");
+                            if (string.IsNullOrEmpty(input.F_ProductName))
+                                return Error("产品名称不能为空！");
+                            if (string.IsNullOrEmpty(input.F_Specifications))
+                                return Error("规格不能为空！");
+                            if (string.IsNullOrEmpty(input.F_Manufacturer))
+                                return Error("生产厂家不能为空！");
+                            if (string.IsNullOrEmpty(input.F_ProblemCode))
+                                return Error("问题代码不能为空！");
+                            if (string.IsNullOrEmpty(input.F_QualityProblem))
+                                return Error("质量问题不能为空！");
                         }
+
                     }
-                 
-                }
-                if (!string.IsNullOrEmpty(input.F_Datecheck))
-                {
-                    if (input.F_Datecheck != "不清")
+
+                    if (!string.IsNullOrEmpty(input.F_ProductDate))
                     {
-                        try
+                        if (input.F_ProductDate != "不清")
                         {
-                            string result = input.F_Datecheck.Replace(".", "");
-                            var pronos = DateTime.ParseExact(result, "yyyyMMdd", null).ToString("yyyy-MM-dd");
+                            try
+                            {
+                                string result = input.F_ProductDate.Replace(".", "");
+                                var pronos = DateTime.ParseExact(result, "yyyyMMdd", null).ToString("yyyy-MM-dd");
+                                var protime = Convert.ToDateTime(pronos);
+                                if (DateTime.Parse(pronos) > DateTime.Now)
+                                {
+                                    return Error("生产日期不能大于当前时间！");
+                                }
+                            }
+                            catch
+                            {
+                                return Error("生产日期格式错误！");
+                            }
                         }
-                        catch
+
+                    }
+                    if (!string.IsNullOrEmpty(input.F_Datecheck))
+                    {
+                        if (input.F_Datecheck != "不清")
                         {
-                            return Error("抽检日期格式错误！");
+                            try
+                            {
+                                string result = input.F_Datecheck.Replace(".", "");
+                                var pronos = DateTime.ParseExact(result, "yyyyMMdd", null).ToString("yyyy-MM-dd");
+                            }
+                            catch
+                            {
+                                return Error("抽检日期格式错误！");
+                            }
                         }
+
                     }
+                    var model = new Model.T_Bus_WorkOrder();
+                    model = inputtoobj(model, input, 0);
 
-                }
-                var model = new Model.T_Bus_WorkOrder();
-                model = inputtoobj(model, input, 0);
-            
-                int n = workorderBLL.Add(model);
-                if (n > 0)
-                {
-                    Model.T_Bus_WorkOrder modlelist = new BLL.T_Bus_WorkOrder().GetModel(n);
-                    var deptmodel = departmentBLL.GetModel(userModel.F_DeptId);
-                    string deptname = "";
-                    if (deptmodel != null)
-                        deptname = deptmodel.F_DeptName;
-                    AddLog(modlelist.F_Id, 0, deptname + userModel.F_UserName + "创建工单", 0, 0, "", 0, userModel);
-                    if (isover >0)
+                    int n = workorderBLL.Add(model);
+                    if (n > 0)
                     {
+                        Model.T_Bus_WorkOrder modlelist = new BLL.T_Bus_WorkOrder().GetModel(n);
                        
-                        if (userModel != null)
+                     var deptmodel = departmentBLL.GetModel(userModel.F_DeptId);
+                        string deptname = "";
+                        if (deptmodel != null)
+                            deptname = deptmodel.F_DeptName;
+                        AddLog(modlelist.F_Id, 0, deptname + userModel.F_UserName + "创建工单", 0, 0, "", 0, userModel);
+                        if (isover > 0)
                         {
-                          
-                            if (model != null)
+
+                            if (userModel != null)
                             {
-                                var res = DealWO(userModel, modlelist, cont, "", isover);
-                                if (res)
-                                    return Success("处理成功");
+
+                                if (model != null)
+                                {
+                                    var res = DealWO(userModel, modlelist, cont, "", isover);
+                                    if (res)
+                                        return Success("处理成功");
+                                    else
+                                        return Error("处理失败！");
+                                }
                                 else
-                                    return Error("处理失败！");
+                                    return Error("工单不存在！");
                             }
-                            else
-                                return Error("工单不存在！");
                         }
-                    }
-                   else  if (IsAssign > 0)
-                    {
-                        if (clid == 0)
-                            return Error("请选择提交人！");
-                        bool t = AssignWO(userModel, modlelist, cont, 1, clid);
-                        if (t)
+                        else if (IsAssign > 0)
                         {
-                     
-                            return Success("提交成功！");
+                            if (clid == 0)
+                                return Error("请选择提交人！");
+                            bool t = AssignWO(userModel, modlelist, cont, 1, clid);
+                            if (t)
+                            {
+
+                                return Success("提交成功！");
+                            }
+
+                            else
+                                return Error("提交失败！");
                         }
-                           
-                        else
-                            return Error("提交失败！");
-                    }
-                    return Success("添加成功！");
+                        return Success("添加成功！");
 
+                    }
+                    else
+                        return Error("添加失败！");
                 }
-                else
-                    return Error("添加失败！");
+                #endregion
             }
+
             return NoToken("未知错误，请重新登录");
         }
       
@@ -2410,6 +2425,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     if (ua != null)
                     {
                         Model.T_Bus_WorkOrder model = workorderBLL.GetModel(id);
+                        if (model.F_State == 0)
+                        {
+                            return Error("工单未提交");
+                        }
+                        else if (model.F_State == 6)
+                        {
+                            return Error("工单已退回，请勿重复提交");
+                        }
                         //验证信息 
                         if (model != null)
                         {
@@ -2433,37 +2456,61 @@ namespace CallCenterApi.Interface.Controllers.workorder
         {
             #region 工单处理
             int sms = 0;
-            var itemlasts = itembll.GetModelList("  F_ItemType=" + 1 + " and  F_WoID=" + model.F_Id + " ");
-            var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_ItemType=" + 1 + " and  F_WoID=" + model.F_Id + " ").FirstOrDefault(); ;
             string creatuser = "";
             int wostate = 5;
-            if (itemlasts.Count > 0)
+            if (model.F_State == 1)
             {
-                foreach (var it in itemlasts)
+                wostate = 6;
+                var itemlast = itembll.GetModelList(" F_ItemType=" + 1 + " and  F_WoID=" + model.F_Id + "and  F_WoState=1  order by F_ID desc ").FirstOrDefault(); ;
+                if (itemlast != null)
                 {
-                    if (itemlast.F_WoState > 1)
-                    {
-                        if (it.F_WoState == 3)
-                        {
-                            creatuser = it.F_CreateUser;
-                            wostate = 5;
-                        }
-                        else if (it.F_WoState == 5)
-                        {
-                            creatuser = it.F_CreateUser;
-                            wostate = 6;
-                        }
-                       
-
-                    }
-                    else
-                    {
-                        if (it.F_WoState == 1 )
-                        {
-                            creatuser = it.F_CreateUser;
-                            wostate = 6;
-                        }
-                    }
+                    creatuser = itemlast.F_CreateUser;
+                }
+            }
+            else if (model.F_State == 2)
+            {
+                wostate = 5;
+                var itemlast = itembll.GetModelList(" F_ItemType=" + 1 + " and  F_WoID=" + model.F_Id + "and  F_WoState=2  order by F_ID desc ").FirstOrDefault(); ;
+                if (itemlast != null)
+                {
+                    creatuser = itemlast.F_CreateUser;
+                }
+            }
+            else if (model.F_State == 3)
+            {
+                wostate = 5;
+                var itemlast = itembll.GetModelList("  F_ItemType=" + 1 + " and  F_WoID=" + model.F_Id + "and  F_WoState=3  order by F_ID desc ").FirstOrDefault(); ;
+                if (itemlast != null)
+                {
+                    creatuser = itemlast.F_CreateUser;
+                }
+            }
+            else if (model.F_State == 4)
+            {
+                wostate = 5;
+                var itemlast = itembll.GetModelList("  F_ItemType=" + 1 + " and  F_WoID=" + model.F_Id + "and  F_WoState=3  order by F_ID desc ").FirstOrDefault(); ;
+                if (itemlast != null)
+                {
+                    creatuser = itemlast.F_CreateUser;
+                }
+            }
+            else if (model.F_State == 5)
+            {
+                wostate = 6;
+                var itemlast = itembll.GetModelList("  F_ItemType=" + 1 + " and  F_WoID=" + model.F_Id + "and  F_WoState=3  order by F_ID desc ").FirstOrDefault(); ;
+                if (itemlast != null)
+                {
+                    creatuser = itemlast.F_CreateUser;
+                }
+                
+            }
+            else if (model.F_State == 10)
+            {
+                wostate = 5;
+                var itemlast = itembll.GetModelList(" F_ItemType=" + 1 + " and  F_WoID=" + model.F_Id + "and  F_WoState=3  order by F_ID desc ").FirstOrDefault(); ;
+                if (itemlast != null)
+                {
+                    creatuser = itemlast.F_CreateUser;
                 }
             }
             var opt = "退回";
@@ -2479,21 +2526,25 @@ namespace CallCenterApi.Interface.Controllers.workorder
             var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode  + ")" + opt + "工单，退回说明：" + cont;
             //获取上一级处理人员
             int deptid = 0;
-            var touser = new BLL.T_Sys_UserAccount().GetModel(creatuser);
-            if (touser != null)
+            if (creatuser!="")
             {
-                deptid = touser.F_DeptId;
-                var deptm = departmentBLL.GetModel(touser.F_DeptId);
-                if (deptm != null)
+                var touser = new BLL.T_Sys_UserAccount().GetModel(creatuser);
+                if (touser != null)
                 {
-                    if (deptm.F_Layer == 2)
+                    deptid = touser.F_DeptId;
+                    var deptm = departmentBLL.GetModel(touser.F_DeptId);
+                    if (deptm != null)
                     {
-                        F_Officeid = deptm.F_DeptId;
-                        F_Largeareaid = deptm.F_ParentId;
+                        if (deptm.F_Layer == 2)
+                        {
+                            F_Officeid = deptm.F_DeptId;
+                            F_Largeareaid = deptm.F_ParentId;
+                        }
                     }
-                }
 
+                }
             }
+          
             var itemid = AddLog(model.F_Id, wostate, content, 1, wostate, creatuser, deptid, nowUser);
             if (itemid > 0)
             {

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

@@ -1659,8 +1659,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (ua != null)
                 {
                     Model.T_Bus_WorkOrder model = workorderBLL.GetModel(id);
-                    //验证信息 
-                    if (model != null)
+                       if(model .F_State ==0)
+                        {
+                            return Error("工单未提交");
+                        }
+                       else if (model.F_State ==6)
+                        {
+                            return Error("工单已退回，请勿重复提交");
+                        }
+                        //验证信息 
+                        if (model != null)
                     {
                         var res = BackWO(ua, model, cont);
                         if (res)
@@ -1682,35 +1690,63 @@ namespace CallCenterApi.Interface.Controllers.workorder
         {
             #region 工单处理
             int sms = 0;
-            var itemlasts = itembll.GetModelList("  F_ItemType=" +1 + " and  F_WoID=" + model.F_Id  + " ");
-            var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_ItemType=" + 1 + " and  F_WoID=" + model.F_Id + " ").FirstOrDefault(); ;
+           // var itemlasts = itembll.GetModelList("  F_ItemType=" +1 + " and  F_WoID=" + model.F_Id  + " ");
+          //  var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_ItemType=" + 1 + " and  F_WoID=" + model.F_Id + "order by F_ID desc ").FirstOrDefault(); ;
             string creatuser = "";
             int wostate = 5;
-            if (itemlasts.Count > 0)
+
+            if (model .F_State ==1)
             {
-                foreach (var it in itemlasts)
+                var itemlast = itembll.GetModelList("  F_ItemType=" + 1 + " and  F_WoID=" + model.F_Id + "and  F_WoState=1  order by F_ID desc ").FirstOrDefault(); ;
+                if (itemlast!=null )
                 {
-                    if (itemlast.F_WoState >1)
-                    {
-                        if (it.F_WoState == 3 )
-                        {
-                            creatuser = it.F_CreateUser;
-                            wostate = 5;
-                        }
-                        else if (it.F_WoState == 5)
-                        {
-                            creatuser = it.F_CreateUser;
-                            wostate = 6;
-                        }
-                    }
-                    else
-                    {
-                        if (it.F_WoState == 1 )
-                        {
-                            creatuser = it.F_CreateUser;
-                            wostate = 6;
-                        }
-                    }
+                    creatuser = itemlast.F_CreateUser;
+                    wostate = 6;
+                }
+            }
+            else if (model.F_State == 2)
+            {
+                var itemlast = itembll.GetModelList("  F_ItemType=" + 1 + " and  F_WoID=" + model.F_Id + "and  F_WoState=2  order by F_ID desc ").FirstOrDefault(); ;
+                if (itemlast != null)
+                {
+                    creatuser = itemlast.F_CreateUser;
+                    wostate = 5;
+                }
+            }
+            else if (model.F_State == 3)
+            {
+                var itemlast = itembll.GetModelList(" F_ItemType=" + 1 + " and  F_WoID=" + model.F_Id + "and  F_WoState=3  order by F_ID desc ").FirstOrDefault(); ;
+                if (itemlast != null)
+                {
+                    creatuser = itemlast.F_CreateUser;
+                    wostate = 5;
+                }
+            }
+            else if (model.F_State == 4)
+            {
+                var itemlast = itembll.GetModelList("  F_ItemType=" + 1 + " and  F_WoID=" + model.F_Id + "and  F_WoState=3  order by F_ID desc ").FirstOrDefault(); ;
+                if (itemlast != null)
+                {
+                    creatuser = itemlast.F_CreateUser;
+                    wostate = 5;
+                }
+            }
+            else if (model.F_State ==5)
+            {
+                var itemlast = itembll.GetModelList("F_ItemType=" + 1 + " and  F_WoID=" + model.F_Id + "and  F_WoState=1  order by F_ID desc ").FirstOrDefault(); ;
+                if (itemlast != null)
+                {
+                    creatuser = itemlast.F_CreateUser;
+                    wostate = 6;
+                }
+            }
+            else if (model.F_State == 10)
+            {
+                var itemlast = itembll.GetModelList("   F_ItemType=" + 1 + " and  F_WoID=" + model.F_Id + "and  F_WoState=3  order by F_ID desc ").FirstOrDefault(); ;
+                if (itemlast != null)
+                {
+                    creatuser = itemlast.F_CreateUser;
+                    wostate = 5;
                 }
             }
             var opt = "退回";

codegit/CallCenterCommon/CallCenter.Utility/NPOI/NPOIHelper.cs

@@ -831,9 +831,6 @@ namespace CallCenter.Utility
                 style13.BorderDiagonal = BorderDiagonal.Backward;
                 style13.BorderDiagonalColor = IndexedColors.Black .Index;
                 string sb = "                  数量\n日期";
-              //  StringBuilder sb = new StringBuilder();
-              //  sb.AppendLine("数量".PadLeft(15));//该行不足长度10在左侧填空格
-              //  sb.AppendLine("日期".PadRight(15));//该行不足长度10在右侧填空格
                 cell2.SetCellValue(sb);
                 cell2.CellStyle = cellStylebt;
                 style13.WrapText = true;
@@ -1625,7 +1622,7 @@ namespace CallCenter.Utility
             }
         }
 
-        public string AftersaleToExcel(DateTime stime, DateTime etime, List<Aftersale> complaints, string maxarea, string minarea,int pendingnumber)
+        public string AftersaleToExcel(DateTime stime, DateTime etime, List<Aftersale> complaints, string maxarea, string minarea,int pendingnumber,int Tobeassignment)
         {
             try
             {
@@ -1670,7 +1667,7 @@ namespace CallCenter.Utility
                 ICell cell2 = irow2.CreateCell(0);
 
                 cell2.SetCellValue("   "+ stime.Year +"年" + stime.Month + "月" + stime.Day + "日-" + etime.Month + "月" + +etime.Day + "日共有售后APP工单" + complaints[complaints.Count - 1].total  + "条，" +
-                    "已完结工单" + complaints[complaints.Count - 1].processednumber + "条，完结率" + complaints[complaints.Count - 1].processedrate + "，待分派工单" + complaints[complaints.Count - 1].assignmentnumber + "条，待处理工单" + pendingnumber + "条。19个大区中，" + maxarea + "大区处理率最高，" + minarea + "大区处理率最低。");
+                    "已完结工单" + complaints[complaints.Count - 1].processednumber + "条，完结率" + complaints[complaints.Count - 1].processedrate + "，待分派工单" + complaints[complaints.Count - 1].assignmentnumber + "条，待处理工单" + pendingnumber + "条。19个大区中，" + maxarea + "大区处理率最高，" + minarea + "大区处理率最低。目前待分派"+ Tobeassignment+"条");
                 cell2.CellStyle = cellStylebt2;
                 sheet.AddMergedRegion(new CellRangeAddress(1, 5, 0, 11));
                 #endregion

codegit/PushMessage/Program.cs

@@ -26,8 +26,8 @@ namespace Push
         {
             Console.OutputEncoding = System.Text.Encoding.UTF8;
             Environment.SetEnvironmentVariable("needDetails", "true");
-            Console.OutputEncoding = System.Text.Encoding.UTF8;
-            Environment.SetEnvironmentVariable("needDetails", "true");
+          //  Console.OutputEncoding = System.Text.Encoding.UTF8;
+          //  Environment.SetEnvironmentVariable("needDetails", "true");
             
             
             System.Console.WriteLine("Hello Push!");
@@ -44,8 +44,6 @@ namespace Push
        
        public static void Push(PushTime time)
         {
-          
-         
             FileStream fs = null;
             try
             {
@@ -71,7 +69,6 @@ namespace Push
                     fs.Close();
                 }
             }
-
         }
         //http://oa.shuanghui.net:8046/
         private static void SetCensusURL()