qqqq

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallrecordsController.cs

             string endtime = HttpUtility.UrlDecode(RequestString.GetQueryString("endtime"));
             string tasktype = HttpUtility.UrlDecode(RequestString.GetQueryString("tasktype"));
             string extnumber = HttpUtility.UrlDecode(RequestString.GetQueryString("extnumber"));
+            string PhoneType = HttpUtility.UrlDecode(RequestString.GetQueryString("phoneType"));
             int type = RequestString.GetInt("type", 0);
             int islike = RequestString.GetInt("islike", 1);
 
             {
                 sql += " and UserCode in(" + usercode + ")";
             }
+            if (PhoneType != null && PhoneType.Trim() != "")
+            {
+                sql += " and PhoneType='"+ PhoneType + "'";
+            }
+            
             if (islike > 0)
             {
                 if (phone != null && phone.Trim() != "")

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

                     }
                     else
                     {
-                        int[] sts = new int[] { (int)EnumWorkState.receive, (int)EnumWorkState.dealing };
-                        sql += " and F_WorkState in (" + string.Join(",", sts.Select(p => p.ToString())) + ")";
-                        //sql += " and F_WorkState in (2,4,8)";
+                        if (distribute!=0)
+                        {
+                            int[] sts = new int[] { (int)EnumWorkState.receive, (int)EnumWorkState.dealing };
+                            sql += " and F_WorkState in (" + string.Join(",", sts.Select(p => p.ToString())) + ")";
+                        }
+                      
+                    
                     }
                     sql += "and F_WorkOrderID  not in (select F_WorkOrderID from T_Bus_RemindRecord where F_Type=1 and F_IsDelete=0)";
                     if (User.F_RoleCode != "GLY" && User.F_RoleCode != "DDZG")
                         {
                             if (distribute == 0)
                             {
-                                sql += "and F_WorkOrderId in   (  select F_WorkOrderId from T_Bus_AssignedInfo as a  where F_State=1 and F_IsDelete=0 and ISNULL(F_FeedbackTime, '')='' and F_MainDeptId =" + User.F_DeptId + " and F_IsSure in (0,1) and (F_IsNext =" + distribute + " or  F_IsNext='' )and not exists(select 1 from T_Bus_AssignedInfo  where F_WorkOrderId = a.F_WorkOrderId and F_Id > a.F_Id  )and F_WorkState  in (2,4)  ";
+                                sql += "and F_WorkOrderId in   (  select F_WorkOrderId from T_Bus_AssignedInfo as a  where F_State=1 and F_IsDelete=0 and ISNULL(F_FeedbackTime, '')='' and F_MainDeptId =" + User.F_DeptId + " and F_IsSure in (0,1) and (F_IsNext =" + distribute + " or  F_IsNext='' )and not exists(select 1 from T_Bus_AssignedInfo  where F_WorkOrderId = a.F_WorkOrderId and F_Id > a.F_Id  )and (F_WorkState  in (2,4) or (F_WorkState=8 and F_Identification=0) ) ";
+                               
                                 if (isys > -1)
                                 {
                                     if (isys == 0)
                     //    sql += " and F_WorkOrderId in (select F_WorkOrderId from T_Bus_AssignedInfo WITH(NOLOCK) where F_State=1 and F_IsDelete=0 and "
                     //  + "  F_MainDeptId =" + User.F_DeptId + " and F_IsSure in (0,1))";
                     //}
-
+                    sql += "and (F_Identification!=0 or F_Identification is null) ";
                     if (User.F_RoleCode != "GLY" && User.F_RoleCode != "DDZG")
                     {
                         sql += " and F_WorkOrderId in (select F_WorkOrderId from T_Bus_AssignedInfo a  WITH(NOLOCK) where F_State=1 and F_IsDelete=0 and "
                             string creattime = ((DateTime)modelT_Bus_WorkOrder1.F_CreateTime).ToString("yyyy-MM-dd") + " 00:00:00";
                             string endtime = ((DateTime)modelT_Bus_WorkOrder1.F_CreateTime).ToString("yyyy-MM-dd") + " 23:59:59";
                             modelT_Bus_WorkOrder1.F_WorkOrderId = workorderBLL.GetNewWorkOrderID((int)modelT_Bus_WorkOrder.F_InfoSource, (int)modelT_Bus_WorkOrder.F_SourceArea, creattime, endtime);
-                            modelT_Bus_WorkOrder1.F_MainWorkorder1 = modelT_Bus_WorkOrder.F_WorkOrderId;
+                            modelT_Bus_WorkOrder1.F_MainWorkorder1 = workorderid;
                             modelT_Bus_WorkOrder1.F_Id = workorderBLL.Add(modelT_Bus_WorkOrder1);
                             if (modelT_Bus_WorkOrder1.F_Id <= 0)
                             {
                                 errdeptid += deptinfo.F_DeptName + ",";
                                 continue;
                             }
+                            modelT_Bus_WorkOrder.F_SubWorkorder1 = modelT_Bus_WorkOrder1.F_WorkOrderId;
+                            new BLL.T_Bus_WorkOrder().Update(modelT_Bus_WorkOrder);
                             #endregion
                             #region 交办
                             #region 插入交办记录
                 string visituser = RequestString.GetFormString("visituser");//回访人
                 int type = RequestString.GetInt("type", 0);//回访方式
                 int issatisfie = RequestString.GetInt("issatisfie", 0);//0不满意 1满意
-                int state = RequestString.GetInt("state", 0);//0保存 1保存并下一步
+                int state = RequestString.GetInt("state", 1);//0保存 1保存并下一步
                 int visitid = RequestString.GetInt("visitid", 0);
                 string result = RequestString.GetFormString("result");//回访情况
                 int nexttype = RequestString.GetInt("nexttype", 0);//1重办 2退回重办
             if (f >= 2)
             {
                 Model.T_Bus_RemindRecord modelT_Bus_RemindRecord = new Model.T_Bus_RemindRecord();
-                var modelRemindlist = new BLL.T_Bus_RemindRecord().GetModelList(" F_State=0 and F_IsDelete=0 and F_Type =1 and F_WorkOrderId= '" + modelT_Bus_WorkOrder.F_WorkOrderId + "  order by F_CreateTime desc");
+                var modelRemindlist = new BLL.T_Bus_RemindRecord().GetModelList(" F_State=0 and F_IsDelete=0 and F_Type =1 and F_WorkOrderId= '" + modelT_Bus_WorkOrder.F_WorkOrderId + "'  order by F_CreateTime desc");
                 if (modelRemindlist != null && modelRemindlist.Count > 0)
                 {
                     modelT_Bus_RemindRecord = modelRemindlist.FirstOrDefault();
         //[Authority]
         public ActionResult FinishWorkOrder()
         {
-
-
-
-
             //if (User.F_RoleCode == "ZXLD" || User.F_RoleCode == "ZXLDGLYGLY" || User.F_RoleCode == "GLY")
             if (User.F_RoleCode == "ZJZY" || User.F_RoleCode == "ZXLD" || User.F_RoleCode == "ZXHWY" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG" || User.F_RoleCode == "MTDD")
             {