//有三种工单状态需要审批

            //1.待处理的时候撤回； 即  8待处理撤回审批中(转办)
            //2.客服处理的 已完结的工单 能撤回； 即  10 已完结撤回审批中（客服处理）
            //3.待定责的时候可以撤回。（客服处理和转办）  9 待定责撤回审批中（客服处理和转办）

web/BaseCallCenter.BLL/T_Wo_WorkOrderBase.cs

@@ -609,9 +609,9 @@ namespace YTSoft.BaseCallCenter.BLL
         #endregion  ExtensionMethod
     
         #region 工单撤回
-        public bool ResetWorkOrder(int workOrderId,int  byid,string byname,int bmid, string bmmc)
+        public bool ResetWorkOrder(int workOrderId,int  byid,string byname,int bmid, string bmmc,string reason)
         {
-            return dal.ResetWorkOrder(workOrderId, byid, byname, bmid, bmmc);
+            return dal.ResetWorkOrder(workOrderId, byid, byname, bmid, bmmc, reason);
         }
         #endregion
 
@@ -642,9 +642,9 @@ namespace YTSoft.BaseCallCenter.BLL
         }
 
         //撤回已回访是待定责工单
-        public bool CheHuiDDZWorkOrder(int workOrderId, int byid, string byname, int bmid, string bmmc)
+        public bool CheHuiDDZWorkOrder(int workOrderId, int byid, string byname, int bmid, string bmmc,string reason)
         {
-            return dal.CheHuiDDZWorkOrder(workOrderId, byid, byname, bmid, bmmc);
+            return dal.CheHuiDDZWorkOrder(workOrderId, byid, byname, bmid, bmmc, reason);
         }
 
         public DataSet GetFiveList()
@@ -685,7 +685,14 @@ namespace YTSoft.BaseCallCenter.BLL
             return dal.GetTodayTelType();
 
         }
-        
+
+
+
+        public bool SubmitShenPiYj(int workorderid, int shenpiresult, string shenpiopinion, int byid, string byname, int bmid)
+        {
+            return dal.SubmitShenPiYj(workorderid, shenpiresult, shenpiopinion, byid, byname, bmid);
+        }
+
 
     }
 }

web/BaseCallCenter.DAL/Order/T_Wo_WorkOrderBase.cs

@@ -2419,7 +2419,7 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
 
 
         #region 工单撤回
-        public bool ResetWorkOrder(int workOrderId, int byid, string byname, int bmid, string bmmc)
+        public bool ResetWorkOrderOldJiekou(int workOrderId, int byid, string byname, int bmid, string bmmc)
         {
             bool result = false;
 
@@ -2428,17 +2428,26 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
                 StringBuilder strSql = new StringBuilder();
                 strSql.Append(" update T_Wo_WorkOrderBase set ");
                 strSql.Append(" F_WORKORDERSTATEID=0,F_REPAIRREQUEST='待处理',F_HASTENCOUNTS=0 where F_WORKORDERID=" + workOrderId);
+
+                
+                //strSql.Append(" update T_Wo_WorkOrderHistory set ");
+                //strSql.Append(" F_StateName = '已撤回' where F_HISTORYID in ( SELECT TOP 1  F_HISTORYID FROM  dbo.T_Wo_WorkOrderHistory where F_INSTANCEID=" + workOrderId + " order by F_OPTDATE desc)");
+               
+                //先不发布
                 strSql.Append(" update T_Wo_WorkOrderHistory set ");
-                strSql.Append(" F_StateName = '已撤回' where F_HISTORYID in ( SELECT TOP 1  F_HISTORYID FROM  dbo.T_Wo_WorkOrderHistory where F_INSTANCEID=" + workOrderId + " order by F_OPTDATE desc)");
+                strSql.Append(" F_StateName = '已撤回'  WHERE  F_workorderstateid=0 AND F_StateName='未处理' and F_INSTANCEID= " + workOrderId);
+
+
+
                 result = DbHelperSQL.ExecuteSql(strSql.ToString()) > 0;
 
-                int hisid = EditOrderHistoryInfo(workOrderId, byid, byname, bmid, bmmc);
+                int hisid = EditOrderHistoryInfoOldJiekou(workOrderId, byid, byname, bmid, bmmc);
 
             }
             return result;
         }
         //插入撤消工单历史信息
-        public int EditOrderHistoryInfo(int workOrderId, int byid, string byname, int bmid, string bmmc)
+        public int EditOrderHistoryInfoOldJiekou(int workOrderId, int byid, string byname, int bmid, string bmmc)
         {
             //历史工单id
             int historyId = 0;
@@ -2483,14 +2492,16 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
 
         }
 
+        #endregion
+
 
 
-        #endregion
 
 
         /// 工单状态F_WORKORDERSTATEID  0处理中 1已处理，12 从编辑工单撤回到补录工单  13 从待处理中驳回到补录工单  14 从待回访中驳回到处理中  15 从已处理中撤回到处理中 16 从待定责驳回到待回访 17 从已回访中撤回到待回访
 
 
+        //转办多人 时 单人驳回 则把所有的操作记录都改成驳回
         #region 待处理的工单驳回到补录工单
         public bool OverruleWorkOrder(int workOrderId, int byid, string byname, int bmid, string bmmc, string opinion)
         {
@@ -2501,8 +2512,16 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
                 StringBuilder strSql = new StringBuilder();
                 strSql.Append(" update T_Wo_WorkOrderBase set ");
                 strSql.Append(" F_WORKORDERSTATEID=0,F_WORKORDERTYPEID=1,F_REPAIRREQUEST='待处理',F_HASTENCOUNTS=0 where F_WORKORDERID=" + workOrderId);
+
+                //转办多人 时 单人驳回 则把所有的操作记录都改成驳回
+                //strSql.Append(" update T_Wo_WorkOrderHistory set ");
+                //strSql.Append(" F_StateName = '已驳回'  WHERE  F_HISTORYID =(  SELECT TOP 1  F_HISTORYID FROM dbo.T_Wo_WorkOrderHistory  WHERE F_INSTANCEID= " + workOrderId + " ORDER BY f_optdate DESC)  ");
+                //先不发布
                 strSql.Append(" update T_Wo_WorkOrderHistory set ");
-                strSql.Append(" F_StateName = '已驳回'  WHERE  F_HISTORYID =(  SELECT TOP 1  F_HISTORYID FROM dbo.T_Wo_WorkOrderHistory  WHERE F_INSTANCEID= " + workOrderId + " ORDER BY f_optdate DESC)  ");
+                strSql.Append(" F_StateName = '已驳回'  WHERE  F_workorderstateid=0 AND F_StateName='未处理' and F_INSTANCEID= " + workOrderId   );
+
+
+
                 result = DbHelperSQL.ExecuteSql(strSql.ToString()) > 0;
                 int hisid = EditOverruleOrderHistoryInfo(workOrderId, byid, byname, bmid, bmmc,opinion);
 
@@ -2587,25 +2606,41 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
             if (workOrderId > 0)
             {
                 Model.T_Wo_WorkOrderBase model = GetModel(workOrderId);
-                if (model.F_RETURNVISITFLAG == 1) //等于1 是回访
+
+                //转单的待定责驳回
+                if (model.F_WORKORDERTYPEID == 1)
                 {
+                    if (model.F_RETURNVISITFLAG == 1) //等于1 是回访
+                    {
 
-                    StringBuilder strSql = new StringBuilder();
-                    strSql.Append(" update T_Wo_WorkOrderBase set ");
-                    strSql.Append(" F_WORKORDERSTATEID=3,F_REPAIRREQUEST='待回访',F_HASTENCOUNTS=0 where F_WORKORDERID=" + workOrderId);
+                        StringBuilder strSql = new StringBuilder();
+                        strSql.Append(" update T_Wo_WorkOrderBase set ");
+                        strSql.Append(" F_WORKORDERSTATEID=3,F_REPAIRREQUEST='待回访',F_HASTENCOUNTS=0 where F_WORKORDERID=" + workOrderId);
 
-                    result = DbHelperSQL.ExecuteSql(strSql.ToString()) > 0;
-                    int hisid = EditBoHuiDDZWorkOrder(workOrderId, byid, byname, bmid, bmmc, opinion);
-                }
+                        result = DbHelperSQL.ExecuteSql(strSql.ToString()) > 0;
+                        int hisid = EditBoHuiDDZWorkOrder(workOrderId, byid, byname, bmid, bmmc, opinion);
+                    }
+
+                    else //待定责工单如果不回访，驳回到处理人 的处理列表
+                    {
+                        StringBuilder strSql = new StringBuilder();
+                        strSql.Append(" update T_Wo_WorkOrderBase set ");
+                        strSql.Append(" F_WORKORDERSTATEID=1,F_REPAIRREQUEST='处理中',F_HASTENCOUNTS=0 where F_WORKORDERID=" + workOrderId);
 
-                else //待定责工单如果不回访，驳回到处理人 的处理列表
+                        result = DbHelperSQL.ExecuteSql(strSql.ToString()) > 0;
+                        int hisid = EditCheHuiDDZWorkOrder2(workOrderId, byid, byname, bmid, bmmc);
+                    }
+                }
+                //客服处理的待定责驳回
+                if (model.F_WORKORDERTYPEID == 3)
                 {
                     StringBuilder strSql = new StringBuilder();
                     strSql.Append(" update T_Wo_WorkOrderBase set ");
-                    strSql.Append(" F_WORKORDERSTATEID=1,F_REPAIRREQUEST='处理中',F_HASTENCOUNTS=0 where F_WORKORDERID=" + workOrderId);
+                    strSql.Append(" F_WORKORDERSTATEID=0,F_REPAIRREQUEST='待处理',F_HASTENCOUNTS=0 where F_WORKORDERID=" + workOrderId);
 
                     result = DbHelperSQL.ExecuteSql(strSql.ToString()) > 0;
-                    int hisid = EditCheHuiDDZWorkOrder2(workOrderId, byid, byname, bmid, bmmc);
+                    int hisid = EditBoHuiDDZWorkOrderKF(workOrderId, byid, byname, bmid, bmmc, opinion);
+
                 }
             }
             return result;
@@ -2687,7 +2722,7 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
 
 
         //撤回已回访即待定责的工单
-        public bool CheHuiDDZWorkOrder(int workOrderId, int byid, string byname, int bmid, string bmmc)
+        public bool CheHuiDDZWorkOrderOldJiekou(int workOrderId, int byid, string byname, int bmid, string bmmc)
         {
             bool result = false;
 
@@ -2787,7 +2822,506 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
         }
 
 
-        //大屏
+
+        public int EditBoHuiDDZWorkOrderKF(int workOrderId, int byid, string byname, int bmid, string bmmc, string opinion)
+        {
+            //历史工单id
+            int historyId = 0;
+            //插入撤回信息
+            Model.T_Wo_WorkOrderHistory historyModel = new Model.T_Wo_WorkOrderHistory();
+            historyModel.F_INSTANCEID = workOrderId;
+            historyModel.F_OPTUSERID = byid;
+            historyModel.F_UserName = byname;
+            historyModel.F_OPTBTNID = bmid;
+            historyModel.F_NEXTOWNERARRID = bmmc;
+            historyModel.F_OPTDATE = DateTime.Now;
+            historyModel.F_WORKORDERSTATEID = 6;
+            historyModel.F_StateName = "已驳回";
+            historyModel.F_TASKFLAG = 7; // 
+            historyModel.F_REMARK = byname + "驳回，转补录工单;" + "驳回意见：" + opinion;
+            historyId = InsertWorkOrderHistoryModel(historyModel);
+            return historyId;
+
+        }
+
+
+
+
+        #region 待处理的工单撤回 需要审批工单撤回;客服处理的工单撤回也是这个
+        public bool ResetWorkOrder(int workOrderId, int byid, string byname, int bmid, string bmmc, string reason)
+        {
+            bool result = false;
+
+          Model.T_Wo_WorkOrderBase model=  GetModel(workOrderId);
+
+            if (workOrderId > 0)
+            {
+
+                if (model.F_WORKORDERTYPEID == 3) //客服处理                   
+                {
+                    if (model.F_HOUSING == "投诉" && model.F_FILEFLAG == 3)
+                    {
+                        StringBuilder strSql = new StringBuilder();
+                        strSql.Append(" update T_Wo_WorkOrderBase set ");
+                        strSql.Append(" F_WORKORDERSTATEID=9,F_REPAIRREQUEST='待定责撤回审批中',F_HASTENCOUNTS=0 where F_WORKORDERID=" + workOrderId);
+                        result = DbHelperSQL.ExecuteSql(strSql.ToString()) > 0;
+
+                        #region 工单历史记录
+                        Model.T_Wo_WorkOrderHistory historyModel = new Model.T_Wo_WorkOrderHistory();
+                        historyModel.F_INSTANCEID = workOrderId;
+                        historyModel.F_OPTUSERID = byid;
+                        historyModel.F_UserName = byname;
+                        historyModel.F_OPTBTNID = bmid;
+                        historyModel.F_NEXTOWNERARRID = bmmc;
+                        historyModel.F_OPTDATE = DateTime.Now;
+                        historyModel.F_WORKORDERSTATEID = 8;
+                        historyModel.F_StateName = "提交撤回";
+                        historyModel.F_TASKFLAG = 0;
+                        if (string.IsNullOrEmpty(reason))
+                        {
+                            historyModel.F_REMARK = byname + "撤回待定责的工单;";
+                        }
+                        else
+                        {
+                            historyModel.F_REMARK = byname + "撤回待定责的工单; 撤回原因：" + reason;
+                        }
+                         InsertWorkOrderHistoryModel(historyModel);
+                        #endregion
+
+                    }
+
+                    else //客服处理非投诉 撤回到补录工单
+                    {
+                        StringBuilder strSql = new StringBuilder();
+                        strSql.Append(" update T_Wo_WorkOrderBase set ");
+                        strSql.Append(" F_WORKORDERSTATEID=10,F_REPAIRREQUEST='已处理撤回审批中',F_HASTENCOUNTS=0 where F_WORKORDERID=" + workOrderId);
+                        result = DbHelperSQL.ExecuteSql(strSql.ToString()) > 0;
+                        #region 工单历史记录
+                        Model.T_Wo_WorkOrderHistory historyModel = new Model.T_Wo_WorkOrderHistory();
+                        historyModel.F_INSTANCEID = workOrderId;
+                        historyModel.F_OPTUSERID = byid;
+                        historyModel.F_UserName = byname;
+                        historyModel.F_OPTBTNID = bmid;
+                        historyModel.F_NEXTOWNERARRID = bmmc;
+                        historyModel.F_OPTDATE = DateTime.Now;
+                        historyModel.F_WORKORDERSTATEID = 8;
+                        historyModel.F_StateName = "提交撤回";
+                        historyModel.F_TASKFLAG = 0;
+                        if (string.IsNullOrEmpty(reason))
+                        {
+                            historyModel.F_REMARK = byname + "撤回已处理的工单;";
+                        }
+                        else
+                        {
+                            historyModel.F_REMARK = byname + "撤回已处理的工单; 撤回原因：" + reason;
+                        }
+                        InsertWorkOrderHistoryModel(historyModel);
+                        #endregion
+
+                    }
+
+                }
+                else
+                { 
+
+                StringBuilder strSql = new StringBuilder();
+                strSql.Append(" update T_Wo_WorkOrderBase set ");
+                strSql.Append(" F_WORKORDERSTATEID=8,F_REPAIRREQUEST='待处理撤回审批中',F_HASTENCOUNTS=0 where F_WORKORDERID=" + workOrderId);
+                //strSql.Append(" update T_Wo_WorkOrderHistory set ");
+                //strSql.Append(" F_StateName = '已撤回' where F_HISTORYID in ( SELECT TOP 1  F_HISTORYID FROM  dbo.T_Wo_WorkOrderHistory where F_INSTANCEID=" + workOrderId + " order by F_OPTDATE desc)");
+
+                //先不发布
+                //strSql.Append(" update T_Wo_WorkOrderHistory set ");
+                //strSql.Append(" F_StateName = '已撤回'  WHERE  F_workorderstateid=0 AND F_StateName='未处理' and F_INSTANCEID= " + workOrderId);
+
+
+
+                result = DbHelperSQL.ExecuteSql(strSql.ToString()) > 0;
+
+                int hisid = EditOrderHistoryInfo(workOrderId, byid, byname, bmid, bmmc, reason);
+                }
+
+            }
+            return result;
+        }
+
+        //插入撤工单历史信息
+        public int EditOrderHistoryInfo(int workOrderId, int byid, string byname, int bmid, string bmmc, string reason)
+        {
+            //历史工单id
+            int historyId = 0;
+            //插入操作信息
+            Model.T_Wo_WorkOrderHistory historyModel = new Model.T_Wo_WorkOrderHistory();
+            historyModel.F_INSTANCEID = workOrderId;
+            historyModel.F_OPTUSERID = byid;
+            historyModel.F_UserName = byname;
+            historyModel.F_OPTBTNID = bmid;
+            historyModel.F_NEXTOWNERARRID = bmmc;
+            historyModel.F_OPTDATE = DateTime.Now;
+            historyModel.F_WORKORDERSTATEID = 8;
+            historyModel.F_StateName = "提交撤回";
+            historyModel.F_TASKFLAG = 0;
+            if (string.IsNullOrEmpty(reason))
+            {
+                historyModel.F_REMARK = byname + "撤回处理中的工单;";
+            }
+            else
+            {
+                historyModel.F_REMARK = byname + "撤回处理中的工单; 撤回原因：" + reason;
+            }
+            historyId = InsertWorkOrderHistoryModel(historyModel);
+
+
+            return historyId;
+
+        }
+
+
+
+
+        #endregion
+
+
+        #region 撤回已回访即待定责的工单
+        public bool CheHuiDDZWorkOrder(int workOrderId, int byid, string byname, int bmid, string bmmc,string reason)
+        {
+            bool result = false;
+
+            if (workOrderId > 0)
+            {
+                Model.T_Wo_WorkOrderBase model = GetModel(workOrderId);
+              
+
+                    StringBuilder strSql = new StringBuilder();
+                    strSql.Append(" update T_Wo_WorkOrderBase set ");
+                    strSql.Append(" F_WORKORDERSTATEID=9,F_REPAIRREQUEST='待定责撤回审批中',F_HASTENCOUNTS=0 where F_WORKORDERID=" + workOrderId);
+                  
+                    result = DbHelperSQL.ExecuteSql(strSql.ToString()) > 0;                
+
+                   
+                    #region 工单历史记录
+                    Model.T_Wo_WorkOrderHistory historyModel = new Model.T_Wo_WorkOrderHistory();
+                    historyModel.F_INSTANCEID = workOrderId;
+                    historyModel.F_OPTUSERID = byid;
+                    historyModel.F_UserName = byname;
+                    historyModel.F_OPTBTNID = bmid;
+                    historyModel.F_NEXTOWNERARRID = bmmc;
+                    historyModel.F_OPTDATE = DateTime.Now;
+                    historyModel.F_WORKORDERSTATEID = 8;
+                    historyModel.F_StateName = "";
+                    historyModel.F_TASKFLAG = 0;
+                    if (string.IsNullOrEmpty(reason))
+                    {
+                        historyModel.F_REMARK = byname + "撤回待定责的工单;";
+                    }
+                    else
+                    {
+                        historyModel.F_REMARK = byname + "撤回待定责的工单; 撤回原因：" + reason;
+                    }
+                    InsertWorkOrderHistoryModel(historyModel);
+                    #endregion
+               
+                
+
+            }
+            return result;
+
+
+        }
+
+        #endregion
+
+
+        /// <summary>
+        /// 审批列表审批
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool SubmitShenPiYj(int  workorderid, int shenpiresult,string shenpiopinion,int byid,string byname,int bmid)
+        {
+            bool EditStatus = false;
+           
+            DAL.T_Wo_WorkOrderHistory bllOrderHistory = new DAL.T_Wo_WorkOrderHistory();
+            //有三种工单状态需要审批
+
+            //1.待处理的时候撤回； 即  8待处理撤回审批中(转办)    
+            //2.客服处理的 已完结的工单 能撤回； 即  10 已完结撤回审批中（客服处理）
+            //3.待定责的时候可以撤回。（客服处理和转办）  9 待定责撤回审批中（客服处理和转办）
+             
+           
+            Model.T_Wo_WorkOrderBase basemodel = GetModel(workorderid);
+
+            if (basemodel.F_WORKORDERSTATEID == 8) // 8待处理撤回审批中(转办)  
+            {
+                if (shenpiresult == 0) 
+                { 
+                    //不同意撤回，改工单状态为处理中，加一条history历史记录 
+                    StringBuilder strSql = new StringBuilder();
+                    strSql.Append(" update T_Wo_WorkOrderBase set ");
+                    strSql.Append(" F_WORKORDERSTATEID=1,F_REPAIRREQUEST='处理中',F_HASTENCOUNTS=0 where F_WORKORDERID=" + workorderid);
+
+                    EditStatus = DbHelperSQL.ExecuteSql(strSql.ToString()) > 0;
+
+                    Model.T_Wo_WorkOrderHistory historyModelNew = new Model.T_Wo_WorkOrderHistory();
+                    historyModelNew.F_INSTANCEID = workorderid;
+                    historyModelNew.F_OPTUSERID = byid;
+                    historyModelNew.F_UserName = byname;
+                    historyModelNew.F_OPTBTNID = bmid;
+                    historyModelNew.F_NEXTOWNERARRID = "";
+                    historyModelNew.F_OPTDATE = DateTime.Now;
+                    historyModelNew.F_WORKORDERSTATEID = 1;
+                    historyModelNew.F_StateName = "审批不通过";
+                    historyModelNew.F_TASKFLAG = 0;
+                    if (string.IsNullOrEmpty(shenpiopinion))
+                    {
+                        historyModelNew.F_REMARK = byname + "审批不通过";
+                    }
+                    else
+                    {
+                        historyModelNew.F_REMARK = byname + "审批不通过; 原因：" + shenpiopinion;
+                    }
+                      InsertWorkOrderHistoryModel(historyModelNew);
+                }
+                if (shenpiresult == 1)
+                {
+                    //同意撤回，改工单状态为待处理，加一条history历史记录 ，修改以前的转办记录 状态为已撤回
+                    StringBuilder strSql = new StringBuilder();
+                    strSql.Append(" update T_Wo_WorkOrderBase set ");
+                    strSql.Append(" F_WORKORDERSTATEID=0,F_REPAIRREQUEST='待处理',F_HASTENCOUNTS=0 where F_WORKORDERID=" + workorderid);
+                  
+                    // 转办记录改成已撤回
+                    strSql.Append(" update T_Wo_WorkOrderHistory set ");
+                    strSql.Append(" F_StateName = '已撤回'  WHERE  F_workorderstateid=0 AND F_StateName='未处理' and F_INSTANCEID= " + workorderid);
+
+                    EditStatus = DbHelperSQL.ExecuteSql(strSql.ToString()) > 0;
+
+                    Model.T_Wo_WorkOrderHistory historyModelNew = new Model.T_Wo_WorkOrderHistory();
+                    historyModelNew.F_INSTANCEID = workorderid;
+                    historyModelNew.F_OPTUSERID = byid;
+                    historyModelNew.F_UserName = byname;
+                    historyModelNew.F_OPTBTNID = bmid;
+                    historyModelNew.F_NEXTOWNERARRID = "";
+                    historyModelNew.F_OPTDATE = DateTime.Now;
+                    historyModelNew.F_WORKORDERSTATEID = 1;
+                    historyModelNew.F_StateName = "审批通过";
+                    historyModelNew.F_TASKFLAG = 0;
+                    if (string.IsNullOrEmpty(shenpiopinion))
+                    {
+                        historyModelNew.F_REMARK = byname + "审批通过";
+                    }
+                    else
+                    {
+                        historyModelNew.F_REMARK = byname + "审批通过; 原因：" + shenpiopinion;
+                    }
+                    InsertWorkOrderHistoryModel(historyModelNew);
+                }
+
+
+            }
+            else if (basemodel.F_WORKORDERSTATEID == 9) // 9 待定责撤回审批中（客服处理和转办）
+            {
+                if (shenpiresult == 0)
+                {
+                    //不同意撤回，改工单状态为待定责，加一条history历史记录 
+                    StringBuilder strSql = new StringBuilder();
+                    strSql.Append(" update T_Wo_WorkOrderBase set ");
+                    strSql.Append(" F_WORKORDERSTATEID=4,F_REPAIRREQUEST='待定责',F_HASTENCOUNTS=0 where F_WORKORDERID=" + workorderid);
+
+                    EditStatus = DbHelperSQL.ExecuteSql(strSql.ToString()) > 0;
+
+                    Model.T_Wo_WorkOrderHistory historyModelNew = new Model.T_Wo_WorkOrderHistory();
+                    historyModelNew.F_INSTANCEID = workorderid;
+                    historyModelNew.F_OPTUSERID = byid;
+                    historyModelNew.F_UserName = byname;
+                    historyModelNew.F_OPTBTNID = bmid;
+                    historyModelNew.F_NEXTOWNERARRID = "";
+                    historyModelNew.F_OPTDATE = DateTime.Now;
+                    historyModelNew.F_WORKORDERSTATEID = 1;
+                    historyModelNew.F_StateName = "审批不通过";
+                    historyModelNew.F_TASKFLAG = 0;
+                    if (string.IsNullOrEmpty(shenpiopinion))
+                    {
+                        historyModelNew.F_REMARK = byname + "审批不通过";
+                    }
+                    else
+                    {
+                        historyModelNew.F_REMARK = byname + "审批不通过; 原因：" + shenpiopinion;
+                    }
+                    InsertWorkOrderHistoryModel(historyModelNew);
+                }
+                if (shenpiresult == 1)
+                {
+                    //同意撤回，改工单状态 加一条history历史记录 ，修改以前的转办记录 状态为已撤回
+                    if (basemodel.F_WORKORDERTYPEID == 3)//客服处理的工单 是投诉类型的 ，从待定责撤回就是 转到补录工单
+                    {
+                        StringBuilder strSql1 = new StringBuilder();
+                        strSql1.Append(" update T_Wo_WorkOrderBase set ");
+                        strSql1.Append(" F_WORKORDERSTATEID=0,F_REPAIRREQUEST='待处理',F_HASTENCOUNTS=0 ,F_RETURNVISITCONTENT='' where F_WORKORDERID=" + workorderid);
+
+                        EditStatus = DbHelperSQL.ExecuteSql(strSql1.ToString()) > 0;
+
+                        Model.T_Wo_WorkOrderHistory historyModelNew = new Model.T_Wo_WorkOrderHistory();
+                        historyModelNew.F_INSTANCEID = workorderid;
+                        historyModelNew.F_OPTUSERID = byid;
+                        historyModelNew.F_UserName = byname;
+                        historyModelNew.F_OPTBTNID = bmid;
+                        historyModelNew.F_NEXTOWNERARRID = "";
+                        historyModelNew.F_OPTDATE = DateTime.Now;
+                        historyModelNew.F_WORKORDERSTATEID = 1;
+                        historyModelNew.F_StateName = "审批通过";
+                        historyModelNew.F_TASKFLAG = 0;
+                        if (string.IsNullOrEmpty(shenpiopinion))
+                        {
+                            historyModelNew.F_REMARK = byname + "审批通过";
+                        }
+                        else
+                        {
+                            historyModelNew.F_REMARK = byname + "审批通过; 原因：" + shenpiopinion;
+                        }
+                        InsertWorkOrderHistoryModel(historyModelNew);
+
+
+                    }
+
+                    else
+                    {  //转办的工单，待定责撤回的前状态是待回访或者处理中
+
+                        if (basemodel.F_RETURNVISITFLAG == 0) //不回访                        
+                        {
+                            StringBuilder strSql = new StringBuilder();
+                            strSql.Append(" update T_Wo_WorkOrderBase set ");
+                            strSql.Append(" F_WORKORDERSTATEID=1,F_REPAIRREQUEST='处理中',F_HASTENCOUNTS=0 where F_WORKORDERID=" + workorderid);
+                            EditStatus = DbHelperSQL.ExecuteSql(strSql.ToString()) > 0;
+
+                        }
+                        else
+                        {
+                            StringBuilder strSql = new StringBuilder();
+                            strSql.Append(" update T_Wo_WorkOrderBase set ");
+                            strSql.Append(" F_WORKORDERSTATEID=3,F_REPAIRREQUEST='待回访',F_HASTENCOUNTS=0 where F_WORKORDERID=" + workorderid);
+
+                            EditStatus = DbHelperSQL.ExecuteSql(strSql.ToString()) > 0;
+
+                            Model.T_Wo_WorkOrderHistory historyModelNew = new Model.T_Wo_WorkOrderHistory();
+                            historyModelNew.F_INSTANCEID = workorderid;
+                            historyModelNew.F_OPTUSERID = byid;
+                            historyModelNew.F_UserName = byname;
+                            historyModelNew.F_OPTBTNID = bmid;
+                            historyModelNew.F_NEXTOWNERARRID = "";
+                            historyModelNew.F_OPTDATE = DateTime.Now;
+                            historyModelNew.F_WORKORDERSTATEID = 1;
+                            historyModelNew.F_StateName = "审批通过";
+                            historyModelNew.F_TASKFLAG = 0;
+                            if (string.IsNullOrEmpty(shenpiopinion))
+                            {
+                                historyModelNew.F_REMARK = byname + "审批通过";
+                            }
+                            else
+                            {
+                                historyModelNew.F_REMARK = byname + "审批通过; 原因：" + shenpiopinion;
+                            }
+                            InsertWorkOrderHistoryModel(historyModelNew);
+                        }
+                        return EditStatus;
+                    }
+                }
+
+
+
+
+            }
+            else if (basemodel.F_WORKORDERSTATEID == 10) // 客服处理的 已完结的工单 能撤回； 10 已处理撤回审批中（客服处理）
+            {
+                if (shenpiresult == 0)
+                {
+                    //不同意撤回，改工单状态为已完结，加一条history历史记录 
+                    StringBuilder strSql = new StringBuilder();
+                    strSql.Append(" update T_Wo_WorkOrderBase set ");
+                    strSql.Append(" F_WORKORDERSTATEID=5,F_REPAIRREQUEST='已处理'  where F_WORKORDERID=" + workorderid);
+
+                    EditStatus = DbHelperSQL.ExecuteSql(strSql.ToString()) > 0;
+
+                    Model.T_Wo_WorkOrderHistory historyModelNew = new Model.T_Wo_WorkOrderHistory();
+                    historyModelNew.F_INSTANCEID = workorderid;
+                    historyModelNew.F_OPTUSERID = byid;
+                    historyModelNew.F_UserName = byname;
+                    historyModelNew.F_OPTBTNID = bmid;
+                    historyModelNew.F_NEXTOWNERARRID = "";
+                    historyModelNew.F_OPTDATE = DateTime.Now;
+                    historyModelNew.F_WORKORDERSTATEID = 5;
+                    historyModelNew.F_StateName = "审批不通过";
+                    historyModelNew.F_TASKFLAG = 0;
+                    if (string.IsNullOrEmpty(shenpiopinion))
+                    {
+                        historyModelNew.F_REMARK = byname + "审批不通过";
+                    }
+                    else
+                    {
+                        historyModelNew.F_REMARK = byname + "审批不通过; 原因：" + shenpiopinion;
+                    }
+                    InsertWorkOrderHistoryModel(historyModelNew);
+                }
+                if (shenpiresult == 1)
+                {
+                    //同意撤回，转到补录工单；改工单状态为待处理，F_RETURNVISITCONTENT =‘’ 加一条history历史记录 ， 
+                    StringBuilder strSql = new StringBuilder();
+                    strSql.Append(" update T_Wo_WorkOrderBase set ");
+                    strSql.Append(" F_WORKORDERSTATEID=0,F_REPAIRREQUEST='待处理',F_HASTENCOUNTS=0,F_RETURNVISITCONTENT=''  where F_WORKORDERID=" + workorderid);
+
+                    if (basemodel.F_HOUSING == "表扬")
+                    {
+                        //把表扬记录删掉
+                        DataTable dt = NoticeBll.GetList("NoticeType=0 and OrderId='" + basemodel.F_WORKORDERID + "'").Tables[0];
+                        if (dt.Rows.Count > 0)
+                        {
+                            foreach (DataRow dr in dt.Rows)
+                            {
+                                int deleteid = Convert.ToInt32(dr["NoticeId"].ToString());
+                                NoticeBll.Delete(deleteid);
+                            }
+                        }
+
+
+                    }
+
+
+                    EditStatus = DbHelperSQL.ExecuteSql(strSql.ToString()) > 0;
+
+                    Model.T_Wo_WorkOrderHistory historyModelNew = new Model.T_Wo_WorkOrderHistory();
+                    historyModelNew.F_INSTANCEID = workorderid;
+                    historyModelNew.F_OPTUSERID = byid;
+                    historyModelNew.F_UserName = byname;
+                    historyModelNew.F_OPTBTNID = bmid;
+                    historyModelNew.F_NEXTOWNERARRID = "";
+                    historyModelNew.F_OPTDATE = DateTime.Now;
+                    historyModelNew.F_WORKORDERSTATEID = 0;
+                    historyModelNew.F_StateName = "审批通过";
+                    historyModelNew.F_TASKFLAG = 0;
+                    if (string.IsNullOrEmpty(shenpiopinion))
+                    {
+                        historyModelNew.F_REMARK = byname + "审批通过";
+                    }
+                    else
+                    {
+                        historyModelNew.F_REMARK = byname + "审批通过; 原因：" + shenpiopinion;
+                    }
+                    InsertWorkOrderHistoryModel(historyModelNew);
+                }
+
+            }
+            else
+            {
+                return EditStatus;
+            }
+
+             
+            return EditStatus;
+
+        }
+
+
+
+        #region 大屏相关的接口
         public DataSet GetFiveList()
         {
             string sql = "SELECT TOP 5 F_CREATEDATE,F_HOUSING, F_ADSLACCOUNT  ,F_content FROM dbo.T_Wo_WorkOrderBase ORDER BY F_CREATEDATE DESC";
@@ -2967,6 +3501,8 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
 
 
         }
+
+       #endregion
     }
 
 }

web/BaseCallCenter.Model/T_Wo_WorkOrderBase.cs

@@ -324,6 +324,7 @@ namespace YTSoft.BaseCallCenter.Model
 
         /// <summary>
         /// 0未处理 1处理中  2已办结（结束） 3待回访 4待定责 5已定责，已处理
+        /// 新加的：8待处理撤回审批中(转办)  9 待定责撤回审批中（客服处理和转办）   10 已处理撤回审批中（客服处理） 
         /// </summary>
         public int? F_WORKORDERSTATEID
         {
@@ -396,7 +397,7 @@ namespace YTSoft.BaseCallCenter.Model
             get { return _f_returnvisitcontent; }
         }
         /// <summary>
-        /// 是否回访
+        /// 是否回访 0 不回访 1 回访
         /// </summary>
         public int? F_RETURNVISITFLAG
         {

web/YTSoft.BaseCallCenter.MVCWeb/Content/js/WorkOrder/WorkOrderMyListHF.js

@@ -293,7 +293,7 @@ layui.use(['table', 'jquery'], function () {
         '<textarea placeholder="请输入撤回内容" id="txtReason" style="width:280px;height:70px;resize:none;border-radius:6px;border-color:#ccc;" >' +
         '</textarea></div>',
         btn:['确定','取消'],
-        yes:function(){
+          yes: function (index, layero){
           var textReason = top.$('#txtReason').val();
           layer.close(index)
           $.ajax({
@@ -305,12 +305,12 @@ layui.use(['table', 'jquery'], function () {
             cache: false,
             data: {
               workOrderId: data.F_WORKORDERID,
-              reason: txtReason
+                reason: textReason
             },
             success: function (thisResult, result) {
             if (thisResult == "True") {
               layer.open({
-                content: '撤回成功'
+                content: '提交撤回成功'
                 , icon: 1
                 , btn: ['确定']
                 , yes: function (index, layero) {
@@ -336,7 +336,7 @@ layui.use(['table', 'jquery'], function () {
                 }
               });
             } else {
-                layui.layer.alert("撤回失败!", {
+                layui.layer.alert("提交撤回失败!", {
                   icon: 2
                 });
   

web/YTSoft.BaseCallCenter.MVCWeb/Content/js/WorkOrder/WorkOrderMyListSP.js

@@ -104,7 +104,7 @@ layui.use(['table', 'jquery'], function () {
         content: openUrl,
         area: ['30%', '40%'],
         id: 'EditCallWorkFolw',
-        title: '撤回审核',
+        title: '审批',
         end: function () {
 
           //置闲

web/YTSoft.BaseCallCenter.MVCWeb/Content/js/WorkOrder/workorderalllist.js

@@ -332,12 +332,12 @@ layui.use(['table', 'jquery'], function () {
                   
                   if (repairRequest == "待回访"||repairRequest == "已处理"||repairRequest == "待定责") {
 
-                    htmlContext +='<a class="layui-btn layui-btn-primary layui-btn-xs btnBj" lay-event="reset">编辑</a>'
+                      htmlContext +='<a class="layui-btn layui-btn-primary layui-btn-xs btnBj" lay-event="edit">编辑</a>'
 
                   }
                 }else if (linkman == userCode && workOrderTypeId==3 && repairRequest != "已定责") {
 
-                    htmlContext +='<a class="layui-btn layui-btn-primary layui-btn-xs btnBj" lay-event="reset">编辑</a>'
+                    htmlContext +='<a class="layui-btn layui-btn-primary layui-btn-xs btnBj" lay-event="edit">编辑</a>'
                     
                 }
                 htmlContext +='<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="view">查看详情</a>'

web/YTSoft.BaseCallCenter.MVCWeb/Controllers/HW/CallRecordController.cs

@@ -321,13 +321,13 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
         }
 
         /// <summary>
-        /// 撤回历史工单
+        /// 编辑工单列表 的撤回按钮 ；撤回历史工单
         /// </summary>
         /// <param name="workOrderBaseModel"></param>
         /// <returns></returns>
         [AcceptVerbs(HttpVerbs.Get)]
-        public bool ResetWorkOrder(int workOrderId)
-        {
+        public bool ResetWorkOrder(int workOrderId,string reason)
+        {             
                 string F_UserCode = "";
                 if (Request.Cookies["BaseCallCenter_T_User"] != null)
                 {
@@ -350,7 +350,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                         if (list.Count > 0)
                         {
                             bmmc = list[0].F_DeptName.ToString();
-                            result = orderBLL.ResetWorkOrder(workOrderId, F_UserID, F_UserName, F_DeptId, bmmc);
+                            result = orderBLL.ResetWorkOrder(workOrderId, F_UserID, F_UserName, F_DeptId, bmmc, reason);
                         }
                     }
                     return result;

web/YTSoft.BaseCallCenter.MVCWeb/Views/Order/ViewMyOrder.cshtml

@@ -299,7 +299,13 @@
                       else if (Model.HistoryOrderList[i].F_REMARK.Contains("驳回"))
                       {
                          <span>处理方式：驳回</span>
-                      } else{
+                      } 
+                          else if (Model.HistoryOrderList[i].F_REMARK.Contains("审批"))
+                      {
+                         <span>处理方式：审批</span>
+                      } 
+                         
+                         else{
                           <span>处理方式：转办</span>
                       }
 

web/YTSoft.BaseCallCenter.MVCWeb/Views/Order/WorkOrderShenPiList.cshtml

@@ -223,7 +223,7 @@
 </body>
 <script type="text/html" id="barDemo">
     <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="view">查看详情</a>
-    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="examineRecall">撤回审批</a>
+    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="examineRecall">审批</a>
 </script>
 <script src="/Content/js/WorkOrder/WorkOrderMyListSP.js" charset="utf-8"></script>
 <script type="text/html" id="btnCallOut">

web/YTSoft.BaseCallCenter.MVCWeb/YTSoft.BaseCallCenter.MVCWeb.csproj

@@ -640,6 +640,7 @@
     <Content Include="Content\js\sysmanage\userlist.js" />
     <Content Include="Content\js\welcome.min.js" />
     <Content Include="Content\js\WorkOrder\editmyorder.js" />
+    <Content Include="Content\js\WorkOrder\OverOrderView.js" />
     <Content Include="Content\js\WorkOrder\Tag.js" />
     <Content Include="Content\js\WorkOrder\workorderalllist.js" />
     <Content Include="Content\js\WorkOrder\WorkOrderAllListReport.js" />
@@ -647,6 +648,8 @@
     <Content Include="Content\js\WorkOrder\WorkOrderAllList_Wb.js" />
     <Content Include="Content\js\WorkOrder\workordermylist.js" />
     <Content Include="Content\js\WorkOrder\WorkOrderMyListHF.js" />
+    <Content Include="Content\js\WorkOrder\WorkOrderMyListJY.js" />
+    <Content Include="Content\js\WorkOrder\WorkOrderMyListSP.js" />
     <Content Include="Content\js\WorkOrder\workordernolist.js" />
     <Content Include="Content\js\WorkOrder\workorderWaitlist.js" />
     <Content Include="Content\js\worldExport.js" />