修改提交

codegit/CallCenterApi/CallCenterApi.BLL/T_Call_LeaveRecord.cs

             return dal.GetListByPage(strWhere, orderby, startIndex, endIndex);
         }
 
+        /// <summary>
+        /// 更新办理标志
+        /// </summary>
+        public bool UpdateFlag(int F_ID, string F_CallAppId)
+        {
+            return dal.UpdateFlag(F_ID,  F_CallAppId);
+        }
+
         #endregion  BasicMethod
         #region  ExtensionMethod
 

codegit/CallCenterApi/CallCenterApi.DAL/T_Call_LeaveRecord.cs

         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Call_LeaveRecord(");
-            strSql.Append("F_CallId,F_Phone,F_LeaveTime,F_Status,F_UserId,F_UserCode,F_UserName,F_DealTime,F_DealContent,F_Remark,F_CallAppId,F_RecFileUrl)");
+            strSql.Append("F_CallId,F_Phone,F_LeaveTime,F_Status,F_UserId,F_UserCode,F_UserName,F_DealTime,F_DealContent,F_Remark,F_CallAppId,F_RecFileUrl,F_LeaveType)");
             strSql.Append(" values (");
-            strSql.Append("@F_CallId,@F_Phone,@F_LeaveTime,@F_Status,@F_UserId,@F_UserCode,@F_UserName,@F_DealTime,@F_DealContent,@F_Remark,@F_CallAppId,@F_RecFileUrl)");
+            strSql.Append("@F_CallId,@F_Phone,@F_LeaveTime,@F_Status,@F_UserId,@F_UserCode,@F_UserName,@F_DealTime,@F_DealContent,@F_Remark,@F_CallAppId,@F_RecFileUrl,@F_LeaveType)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_CallId", SqlDbType.VarChar,50),
                     new SqlParameter("@F_DealContent", SqlDbType.NText),
                     new SqlParameter("@F_Remark", SqlDbType.NText),
                     new SqlParameter("@F_CallAppId", SqlDbType.NVarChar,50),
-                    new SqlParameter("@F_RecFileUrl", SqlDbType.NVarChar,50)};
+                    new SqlParameter("@F_RecFileUrl", SqlDbType.NVarChar,50),
+            new SqlParameter("@F_LeaveType", SqlDbType.NVarChar,50)};
             parameters[0].Value = model.F_CallId;
             parameters[1].Value = model.F_Phone;
             parameters[2].Value = model.F_LeaveTime;
             parameters[9].Value = model.F_Remark;
             parameters[10].Value = model.F_CallAppId;
             parameters[11].Value = model.F_RecFileUrl;
+            parameters[12].Value = model.F_LeaveType;
 
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
             strSql.Append("F_DealContent=@F_DealContent,");
             strSql.Append("F_Remark=@F_Remark,");
             strSql.Append("F_CallAppId=@F_CallAppId,");
-            strSql.Append("F_RecFileUrl=@F_RecFileUrl");
+            strSql.Append("F_RecFileUrl=@F_RecFileUrl,"); 
+                strSql.Append("F_LeaveType=@F_LeaveType");
             strSql.Append(" where F_Id=@F_Id");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_CallId", SqlDbType.VarChar,50),
                     new SqlParameter("@F_Remark", SqlDbType.NText),
                     new SqlParameter("@F_CallAppId", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_RecFileUrl", SqlDbType.NVarChar,50),
+                     new SqlParameter("@F_LeaveType", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_Id", SqlDbType.Int,4)};
             parameters[0].Value = model.F_CallId;
             parameters[1].Value = model.F_Phone;
             parameters[9].Value = model.F_Remark;
             parameters[10].Value = model.F_CallAppId;
             parameters[11].Value = model.F_RecFileUrl;
-            parameters[12].Value = model.F_Id;
+            parameters[12].Value = model.F_LeaveType;
+            parameters[13].Value = model.F_Id;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_Id,F_CallId,F_Phone,F_LeaveTime,F_Status,F_UserId,F_UserCode,F_UserName,F_DealTime,F_DealContent,F_Remark,F_CallAppId,F_RecFileUrl from T_Call_LeaveRecord ");
+            strSql.Append("select  top 1 F_Id,F_CallId,F_Phone,F_LeaveTime,F_Status,F_UserId,F_UserCode,F_UserName,F_DealTime,F_DealContent,F_Remark,F_CallAppId,F_RecFileUrl,F_LeaveType from T_Call_LeaveRecord ");
             strSql.Append(" where F_Id=@F_Id");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_Id", SqlDbType.Int,4)
                 {
                     model.F_RecFileUrl = row["F_RecFileUrl"].ToString();
                 }
+                if (row["F_LeaveType"] != null)
+                {
+                    model.F_LeaveType = row["F_LeaveType"].ToString();
+                }
             }
             return model;
         }
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select F_Id,F_CallId,F_Phone,F_LeaveTime,F_Status,F_UserId,F_UserCode,F_UserName,F_DealTime,F_DealContent,F_Remark,F_CallAppId,F_RecFileUrl ");
+            strSql.Append("select F_Id,F_CallId,F_Phone,F_LeaveTime,F_Status,F_UserId,F_UserCode,F_UserName,F_DealTime,F_DealContent,F_Remark,F_CallAppId,F_RecFileUrl,F_LeaveType ");
             strSql.Append(" FROM T_Call_LeaveRecord ");
             if (strWhere.Trim() != "")
             {
             {
                 strSql.Append(" top " + Top.ToString());
             }
-            strSql.Append(" F_Id,F_CallId,F_Phone,F_LeaveTime,F_Status,F_UserId,F_UserCode,F_UserName,F_DealTime,F_DealContent,F_Remark,F_CallAppId,F_RecFileUrl ");
+            strSql.Append(" F_Id,F_CallId,F_Phone,F_LeaveTime,F_Status,F_UserId,F_UserCode,F_UserName,F_DealTime,F_DealContent,F_Remark,F_CallAppId,F_RecFileUrl,F_LeaveType ");
             strSql.Append(" FROM T_Call_LeaveRecord ");
             if (strWhere.Trim() != "")
             {
             return DbHelperSQL.Query(strSql.ToString());
         }
 
+
+        /// <summary>
+        /// 更新办理标志
+        /// </summary>
+        public bool UpdateFlag(int F_ID,string F_CallAppId)
+        {
+
+            StringBuilder strSql = new StringBuilder();
+            //strSql.Append("delete from T_Call_OutTask ");
+            strSql.Append("update T_Call_LeaveRecord set F_Status=1,F_CallAppId=@F_CallAppId ");
+            strSql.Append(" where F_Id=@F_Id");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_Id", SqlDbType.Int,4),
+                    new SqlParameter("@F_CallAppId", SqlDbType.NVarChar ,50)
+            };
+            parameters[0].Value = F_ID;
+            parameters[1].Value = F_CallAppId;
+
+            int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
+            if (rows > 0)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
         #endregion  BasicMethod
         #region  ExtensionMethod
 

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/IndexController.cs

                             //uwhere += " and State =0 ";
                         }
                         //2、待接单的
-                        string djdwhere = $" 1=1 and State =" + (int)EnumWorkOrderState.assign + " and T_Wo_WorkOrder.ID in ( " + woController.GetDJDWorkOrderID(ua.F_UserCode) + ") ";//" 1=1 and State =1 and WorkOrderID in ( " + woController.GetDJDWorkOrderID(ua.F_UserCode) + ") ";
+                        string djdwhere = $" 1=1 and State =" + (int)EnumWorkOrderState.assign + " and T_Wo_WorkOrder.ID in ( " + woController.GetDJDWorkOrderID(ua.F_DeptId.ToString()) + ") ";//" 1=1 and State =1 and WorkOrderID in ( " + woController.GetDJDWorkOrderID(ua.F_UserCode) + ") ";
                         //3、待完成（处理）的
                         string dclwhere = $" 1=1 and State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ") and T_Wo_WorkOrder.ID in ( " + woController.GetDWCWorkOrderID(ua.F_UserCode) + ") ";//" 1=1 and State =1 and WorkOrderID in ( " + woController.GetDWCWorkOrderID(ua.F_UserCode) + ") ";
                         //4、已处理的
                         string cqwhere = $" 1=1 and DATEADD(DAY,{days},CreateTime) < GETDATE() AND State < " + (int)EnumWorkOrderState.finish + " ";//$" 1=1 and DATEADD(DAY,{days},CreateTime) < GETDATE() AND State < 2  ";
                         //5、未审核微信工单
                         string wxwhere = $" 1=1 ";  // ANd Type = (SELECT F_DictionaryValueId FROM dbo.T_Sys_DictionaryValue (NOLOCK) WHERE F_DictionaryFlag = 'GDLY' AND F_Name = '微信')
+
+                        
+                            string yzpwhere= " 1=1 and State =" + (int)EnumWorkOrderState.assign;
+                        
+                        string dhfwhere= " 1=1 and State =" + (int)EnumWorkOrderState.finish;
+                        string yhfwhere= " 1=1 and State =" + (int)EnumWorkOrderState.returnbak;
+                        
                         #endregion
 
                         #region 未处理开票数量
                             cq = bll.GetList(cqwhere + sql + " AND State < " + (int)EnumWorkOrderState.finish + " and IsAudit = 1 ").Tables[0].Rows.Count,    //超期工单的统计
                             wx = bll.GetList(wxwhere + sql + " and IsAudit = 0 ").Tables[0].Rows.Count,    //微信工单的统计
                             billcount = billcount,//开票管理未处理数量
+                            yzp = bll.GetList(yzpwhere + sql + " and State=" + (int)EnumWorkOrderState.assign + " and IsAudit = 1 ").Tables[0].Rows.Count,
+                            dhf = bll.GetList(dhfwhere + sql + " and State=" + (int)EnumWorkOrderState.finish + " and IsAudit = 1 ").Tables[0].Rows.Count,
+                            yhf = bll.GetList(yhfwhere + sql + " and State=" + (int)EnumWorkOrderState.returnbak + " and IsAudit = 1 ").Tables[0].Rows.Count,
                             //dpd = bll.GetList(uwhere + sql+ " and State=0 and IsAudit = 1 ").Tables[0].Rows.Count,                    //待指派的统计
                             //djd = bll.GetList(djdwhere + sql + " and State =1 and IsAudit = 1 ").Tables[0].Rows.Count,    //待接单的统计
                             //dcl = bll.GetList(dclwhere + sql + " and State =1 and IsAudit = 1 ").Tables[0].Rows.Count,    //待处理的统计

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

                 sql += " and LastDealTime>='" + stime + " 00:00:00' ";
             
                 sql += " and LastDealTime<='" + endtime + " 23:59:59' ";
-            
+
             #endregion
-            
-            
-            DataSet ds = DbHelperSQL.Query("SELECT dbo.GetGDLXName(CType) as typename,count(*) as count  FROM T_Wo_WorkOrder where state >= 10 " + sql +" group by CType");
+
+
+            //DataSet ds = DbHelperSQL.Query("SELECT dbo.GetDictionaryName(CType) as typename,count(*) as count  FROM T_Wo_WorkOrder where state >= 10 " + sql +" group by CType");
+            //select F_Name,count(WorkOrderID) as count from  (select   a.*,b.*   from  T_Sys_DictionaryValue   b   left      join   T_Wo_WorkOrder a  on   b.F_DictionaryValueId=a.CType where F_DictionaryFlag='GSZL') t group by F_Name
+            DataSet ds = DbHelperSQL.Query("select F_Name,SUM(case when state >= 10 "+sql+"  then 1  else 0   end) as count from  (select   a.*,b.*   from  T_Sys_DictionaryValue   b   left      join   T_Wo_WorkOrder a  on   b.F_DictionaryValueId=a.CType where b.F_DictionaryFlag='GSZL' ) t  group by F_Name");
             if (ds != null && ds.Tables.Count > 0)
             {
                 DataTable dt = ds.Tables[0];
-                DataRow dr = dt.NewRow();
-                string Sum = dt.Compute("sum(count)", "true").ToString();
-                dr["typename"] = "总计";
-                dr["count"] = Sum;
-                dt.Rows.InsertAt(dr, 0);
+                if (dt.Rows.Count > 0)
+                {
+                    DataRow dr = dt.NewRow();
+                    string Sum = dt.Compute("sum(count)", "true").ToString();
+                    dr["typename"] = "总计";
+                    dr["count"] = Sum;
+                    dt.Rows.InsertAt(dr, 0);
+                }
                 res = Success("获取工单子类统计数据成功", dt);
             }
             else if (ds != null)
             #endregion
 
 
-            DataSet ds = DbHelperSQL.Query("SELECT dbo.GetDeptName(ToDept) as deptname,count(*) as count  FROM T_Wo_WorkOrder where state >= 10 " + sql + " group by ToDept");
+            //DataSet ds = DbHelperSQL.Query("SELECT dbo.GetDeptName(ToDept) as deptname,count(*) as count  FROM T_Wo_WorkOrder where state >= 10 " + sql + " group by ToDept");
+            //select F_DeptName,SUM(case when state >= 10   then 1  else 0   end) as count from  (select   a.*,b.*   from  T_Sys_Department   b   left      join   T_Wo_WorkOrder a  on   b.F_DeptId=a.ToDept where b.F_ParentId=339 and b.F_State =1 ) t  group by F_DeptName
+            DataSet ds = DbHelperSQL.Query("select F_DeptName,SUM(case when state >= 10 "+sql+"  then 1  else 0   end) as count from  (select   a.*,b.*   from  T_Sys_Department   b   left      join   T_Wo_WorkOrder a  on   b.F_DeptId=a.ToDept where b.F_ParentId=339 and b.F_State =1 ) t  group by F_DeptName");
             if (ds != null && ds.Tables.Count > 0)
             {
                 DataTable dt = ds.Tables[0];

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

                         else
                         {
                             //无接收人时，状态修改成 0待指派
-                            if (clid == 0)
+                            if (clbm == 0)
                             {
+                                
                                 model.State = (int)EnumWorkOrderState.neworder;    //工单状态 待指派
                             }
                             else
                             {
+                                model.ToDept = clbm.ToString ();
                                 model.AuditUser = touser;
                                 model.State = (int)EnumWorkOrderState.assign;    //待处理
+                                
                             }
                         }
                         //接待描述 - 反馈内容
                                 #endregion
                                 opt = "创建并指派工单给"+ tousername;
                                 optbut = (int)EnumItemOpt.assign;
+                                bool x = new WorkOrderController().AssignWO(ua, model, "", clbm, clid);
                             }
                             if (isover == 1)
                                 opt = "创建并处理完结工单"; optbut = (int)EnumItemOpt.end;

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

             string str = string.Empty;
             str = "select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType=" + (int)EnumItemType.deal 
                 + " and F_WoState="+ (int)EnumWorkOrderState.assign
-                + " and isnull(F_IsUsed,'0')='0' and F_NextUser='" + user + "' ";
-           
+                + " and isnull(F_IsUsed,'0')='0' and F_NextDept='" + user + "' ";//F_NextUser
+
             return str;
         }
 
             return Error("无操作权限！");
         }
 
+
+        /// <summary>
+        /// 回访工单
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult RBakWorkOrder(long orderid, string cont)
+        {
+            int userId = CurrentUser.UserData.F_UserId;
+            if (userId != 0)
+            {
+                Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
+                if (ua != null)
+                {
+                    Model.T_Wo_WorkOrder model = bll.GetModel(orderid);
+                    if (model != null)
+                    {
+                        var res = RBakWO(ua, model, cont);
+                        if (res)
+                            return Success("回访成功！");
+                        else
+                            return Error("操作失败！");
+                    }
+                    return Error("工单不存在！");
+                }
+            }
+            return Error("无操作权限！");
+        }
         #endregion
         #region 暂时不用
         ///// <summary>
                 #endregion
                 #region 向上一级操作人员推送消息
                 var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
-                if (itemlast.F_CreateUser != model.CreateUser)
+                if (itemlast!=null&&itemlast.F_CreateUser != model.CreateUser)
                 {
                     sendsysmsg(model, nowUser, itemlast.F_CreateUser, (int)itemid, opt);
                     var lastUser = sysUserAccountBll.GetModel(itemlast.F_CreateUser);
                 #endregion
                 #region 向上一级操作人员推送消息
                 var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
-                if (itemlast.F_CreateUser != model.CreateUser)
+                if (itemlast!=null&&itemlast.F_CreateUser != model.CreateUser)
                 {
                     sendsysmsg(model, nowUser, itemlast.F_CreateUser, (int)itemid, opt);
                     var lastUser = sysUserAccountBll.GetModel(itemlast.F_CreateUser);

codegit/CallCenterApi/CallCenterApi.Model/T_Call_LeaveRecord.cs

         private string _f_remark;
         private string _f_callappid;
         private string _f_recfileurl;
+        private string  _f_leavetype;
+        private string _f_connum;
         /// <summary>
         /// 标识列，自动增长
         /// </summary>
             set { _f_recfileurl = value; }
             get { return _f_recfileurl; }
         }
+
+        /// <summary>
+        /// 留言类型
+        /// </summary>
+        public string F_LeaveType
+        {
+            set { _f_leavetype = value; }
+            get { return _f_leavetype; }
+        }
+
+        /// <summary>
+        /// 缴费户号Contributory number
+        /// </summary>
+        public string F_ConNum
+        {
+            set { _f_connum = value; }
+            get { return _f_connum; }
+        }
         #endregion Model
     }
 }