Merge branch 'master' of http://192.168.1.222:3000/duhongyu/Anyang_api

CallCenterApi/CallCenterApi.DAL/T_Bus_WorkOrder.cs

@@ -279,6 +279,8 @@ namespace CallCenterApi.DAL
             strSql.Append("F_Content=@F_Content, ");
             strSql.Append("F_MainWorkorder=@F_MainWorkorder, ");
             strSql.Append("F_SubWorkorder=@F_SubWorkorder, ");
+            strSql.Append("F_MainWorkorder1=@F_MainWorkorder1, ");
+            strSql.Append("F_SubWorkorder1=@F_SubWorkorder1, ");
             strSql.Append("F_Administrative=@F_Administrative, ");
             
             strSql.Append("F_IsSms=@F_IsSms ");
@@ -356,6 +358,8 @@ namespace CallCenterApi.DAL
                    new SqlParameter("@F_Content", SqlDbType.VarChar,-1),
                    new SqlParameter("@F_MainWorkorder", SqlDbType.VarChar,100),
                     new SqlParameter("@F_SubWorkorder", SqlDbType.VarChar,-1),
+                     new SqlParameter("@F_MainWorkorder1", SqlDbType.VarChar,500),
+                    new SqlParameter("@F_SubWorkorder1", SqlDbType.VarChar,500),
                        new SqlParameter("@F_Administrative", SqlDbType.VarChar,500),
                     
                        new SqlParameter("@F_IsSms", SqlDbType.Int,4),
@@ -432,9 +436,11 @@ namespace CallCenterApi.DAL
             parameters[69].Value = model.F_Content;
             parameters[70].Value = model.F_MainWorkorder;
             parameters[71].Value = model.F_SubWorkorder ;
-            parameters[72].Value = model.F_Administrative;
-            parameters[73].Value = model.F_IsSms;
-            parameters[74].Value = model.F_Id;
+            parameters[72].Value = model.F_MainWorkorder1;
+            parameters[73].Value = model.F_SubWorkorder1;
+            parameters[74].Value = model.F_Administrative;
+            parameters[75].Value = model.F_IsSms;
+            parameters[76].Value = model.F_Id;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -870,6 +876,16 @@ namespace CallCenterApi.DAL
                 {
                     model.F_SubWorkorder = row["F_SubWorkorder"].ToString();
                 }
+
+
+                if (row["F_MainWorkorder1"] != null)
+                {
+                    model.F_MainWorkorder1 = row["F_MainWorkorder1"].ToString();
+                }
+                if (row["F_SubWorkorder1"] != null)
+                {
+                    model.F_SubWorkorder1 = row["F_SubWorkorder1"].ToString();
+                }
                 if (row["F_PhoneType"] != null)
                 {
                     model.F_PhoneType = row["F_PhoneType"].ToString();

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

@@ -204,7 +204,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         if (jianhang==3)
                             sql += " and F_InfoSource = '2501' ";
                         else 
-                        sql += " and F_InfoSource != '1' ";
+                        sql += " and F_InfoSource != '1' and F_InfoSource != '2501'";
                         
                     }
                     else
@@ -771,7 +771,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (jianhang == 3)
                     sql += " and F_InfoSource = '2501' ";
                 else
-                    sql += " and F_InfoSource != '1' ";
+                    sql += " and F_InfoSource != '1'and F_InfoSource != '2501' ";
             }
             else
             {
@@ -1513,7 +1513,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (jianhang == 3)
                     sql += " and F_InfoSource = '2501' ";
                 else
-                    sql += " and F_InfoSource != '1' ";
+                    sql += " and F_InfoSource != '1' and F_InfoSource != '2501'";
             }
             else
             {
@@ -2372,10 +2372,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
             else if (jianhang == 1)
             {
 
-                sql += " and F_InfoSource != '1' ";
+                sql += " and F_InfoSource != '1' and F_InfoSource != '2501'";
             }
             else if (jianhang == 3)
-                sql += " and F_InfoSource = '2501' ";
+                sql += " and F_InfoSource = '2501'  ";
             
                 string incomingcall = RequestString.GetString("incomingcall");//来电电话
             if (incomingcall.Trim() != "" && incomingcall != "undefined")
@@ -2844,7 +2844,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (jianhang == 3)
                     sql += " and F_InfoSource = '2501' ";
                 else
-                    sql += " and F_InfoSource != '1' ";
+                    sql += " and F_InfoSource != '1' and F_InfoSource != '2501'";
             }
             else
             {
@@ -3282,7 +3282,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (jianhang == 3)
                     sql += " and F_InfoSource = '2501' ";
                 else
-                    sql += " and F_InfoSource != '1' ";
+                    sql += " and F_InfoSource != '1' and F_InfoSource != '2501'";
             }
             else
             {
@@ -4124,7 +4124,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (jianhang == 3)
                     sql += " and F_InfoSource = '2501' ";
                 else
-                    sql += " and F_InfoSource != '1' ";
+                    sql += " and F_InfoSource != '1' and F_InfoSource != '2501'";
             }
             else
             {
@@ -4498,7 +4498,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (jianhang == 3)
                     sql += " and F_InfoSource = '2501' ";
                 else
-                    sql += " and F_InfoSource != '1' ";
+                    sql += " and F_InfoSource != '1' and F_InfoSource != '2501'";
             }
             else
             {
@@ -4879,7 +4879,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
             else if (jianhang ==1)
             {
-                sql += " and F_InfoSource != '1' ";
+                sql += " and F_InfoSource != '1' and F_InfoSource != '2501'";
             }
            else  if (jianhang == 3)
                 sql += " and F_InfoSource = '2501' ";
@@ -5777,7 +5777,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (jianhang == 3)
                     sql += " and F_InfoSource = '2501' ";
                 else
-                    sql += " and F_InfoSource != '1' ";
+                    sql += " and F_InfoSource != '1'and F_InfoSource != '2501' ";
             }
             else
             {
@@ -6176,7 +6176,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (jianhang == 3)
                     sql += " and F_InfoSource = '2501' ";
                 else
-                    sql += " and F_InfoSource != '1' ";
+                    sql += " and F_InfoSource != '1' and F_InfoSource != '2501'";
             }
             else
             {
@@ -6565,7 +6565,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (jianhang == 3)
                     sql += " and F_InfoSource = '2501' ";
                 else
-                    sql += " and F_InfoSource != '1' ";
+                    sql += " and F_InfoSource != '1' and F_InfoSource != '2501'";
             }
             else
             {
@@ -9869,11 +9869,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
         //[Authority]
         public ActionResult AssignWorkOrderNew()
         {
-            
-
-            
-
-
             if (User.F_RoleCode == "ZXLD" || User.F_RoleCode == "ZXLDGLYGLY" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG"|| User .F_RoleCode == "DBZY"|| User.F_RoleCode == "MTDD")
             {
                 string workorderid = RequestString.GetFormString("workorderid");
@@ -10433,22 +10428,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 string files = RequestString.GetFormString("files");
                 int state = RequestString.GetInt("state", 0);
                 int nextid = RequestString.GetInt("nextid", 0);
-
-              
-                //string resdatetime = "";
-                //if (limittime > 0)
-                //{
-                //    string resdate = DateTime.Now.Date.ToString("yyyy-MM-dd");
-                //    DataTable dt = DbHelperSQL.Query("select top " + limittime + " F_OffDate from  T_Sys_WorkOFFDays  where F_OffState = 1   and F_OffDate>'" + resdate + "' order by F_OffDate").Tables[0];
-                //    resdatetime = dt.Rows[dt.Rows.Count - 1]["F_OffDate"].ToString();
-                //}
-                //else
-                //{
-                //    return Error("请选择办理时限");
-                //}
-                //  resdatetime = Convert.ToDateTime(resdatetime).ToString("yyyy-MM-dd") + " 23:59:59 ";
-
-
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
                 Model.T_Bus_AssignedInfo modelT_Bus_AssignedInfo = assignBLL.GetNewModelByWorkOrderID(workorderid);
                 Model.T_Bus_AssignedInfo_Next modelT_Bus_AssignedInfo_Next = new Model.T_Bus_AssignedInfo_Next();
@@ -10460,7 +10439,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         return Error("办理时限不能大于当前办理时限");
                     }
                     int type = AssignDeptType(modelT_Bus_AssignedInfo, User.F_DeptId);
-                    //if ((type == 1 && modelT_Bus_WorkOrder.F_WorkState == 4) || User.F_RoleCode == "GLY")
                     if ((type == 1 && (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.dealing|| modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.reload )) || (User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG"))
                     {
                         if (modelT_Bus_AssignedInfo.F_IsNext == null || modelT_Bus_AssignedInfo.F_IsNext.Value == 0 || modelT_Bus_AssignedInfo.F_IsNext.Value == 4)

CallCenterApi/CallCenterApi.Model/T_Bus_WorkOrder.cs

@@ -672,15 +672,22 @@ namespace CallCenterApi.Model
         public string F_AdditionalReply { set; get; }
 
         public string F_Content { set; get; }
-       /// <summary>
+         /// <summary>
         /// 主工单编号
-       /// </summary>
-      public string F_MainWorkorder { set; get; }
+        /// </summary>
+        public string F_MainWorkorder { set; get; }
         /// <summary>
         /// 子工单编号
         /// </summary>
         public string F_SubWorkorder { set; get; }
-
+        /// <summary>
+        /// 主工单编号
+        /// </summary>
+        public string F_MainWorkorder1 { set; get; }
+        /// <summary>
+        /// 子工单编号
+        /// </summary>
+        public string F_SubWorkorder1 { set; get; }
         public string F_PhoneType { set; get; }
         #endregion Model