省平台

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/AffairsController.cs

@@ -1452,9 +1452,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     string path = "/Upload/ZhenWu/" + DateTime.Now.ToString("yyyy") + "/" + DateTime.Now.ToString("MM") + "/" + DateTime.Now.ToString("dd") + "/";
                     foreach (var it in jo.body)
                     {
-                        byte[] data = Encoding.UTF8.GetBytes(it.ATTATH_CONTENT);
+                      //  byte[] data = Encoding.UTF8.GetBytes(it.ATTATH_CONTENT);
                         FileUp fu = new FileUp();
-                        fu.SaveFile(data, path, it.ATTATH_NAME);
+                        fu.ByteSaveFile(it.ATTATH_CONTENT, path, it.ATTATH_NAME);
                         Model.T_Sys_Accessories model_T_Sys_Accessories = new Model.T_Sys_Accessories();
                         model_T_Sys_Accessories.F_AddTime = DateTime.Now;//上传时间
                         model_T_Sys_Accessories.F_FileName = it.ATTATH_NAME;//附件名称
@@ -1718,7 +1718,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     var responseString = HttpMethods.HttpPost("http://172.20.0.203:8888/Affairs/receive_Push", jsonParam);
                                     bendiack jo = JsonConvert.DeserializeObject<bendiack>(responseString);
                                     if (jo.state != "success")
-                                        return Error("签收失败");
+                                    {
+                                        if (!jo.message.Contains("该任务单已签收"))
+                                            return Error("签收失败");
+                                    }
 
                                 }
                                 catch

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

@@ -424,7 +424,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     if (newusercode.Trim() != "" && newusercode != "undefined")
                     {
                         sql += " and F_WorkOrderId in (select F_WorkOrderId   from T_Bus_RemindRecord " +
-                            "where F_State != 2  and F_IsDelete = 0 and F_Type = 1 and Supervisor  in ("+ newusercode + ")) ";
+                            "where  F_IsDelete = 0 and F_Type = 1 and Supervisor  in ("+ newusercode + ")) ";
                     }
                 }
                 else
@@ -432,7 +432,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     if (newusercode.Trim() != "" && newusercode != "undefined")
                     {
                         sql += " and F_WorkOrderId in (select F_WorkOrderId   from T_Bus_RemindRecord " +
-                             "where F_State != 2  and F_IsDelete = 0 and F_Type = 1 and Supervisor  = " + newusercode + ") ";
+                             "where F_IsDelete = 0 and F_Type = 1 and Supervisor  = " + newusercode + ") ";
                     }
                 }
             }
@@ -3000,10 +3000,19 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     int isyq = RequestString.GetInt("isyq", -1);
                     if (strstate.Trim() != "" && strstate != "undefined")
                     {
-                        if (strstate.Trim() == ((int)EnumWorkState.neworder).ToString())
-                            sql += " and F_WorkState in (" + (int)EnumWorkState.neworder + "," + (int)EnumWorkState.audit + ") ";
+                        
+                        if (strstate=="4")
+                        {
+                            sql += " and (F_WorkState =4 or (F_Identification=0 and F_WorkState=8 ) )";
+                        }
                         else
-                            sql += " and F_WorkState = '" + strstate.Trim() + "' ";
+                        {
+                            if (strstate.Trim() == ((int)EnumWorkState.neworder).ToString())
+                                sql += " and F_WorkState in (" + (int)EnumWorkState.neworder + "," + (int)EnumWorkState.audit + ") ";
+                            else
+                                sql += " and F_WorkState = '" + strstate.Trim() + "' ";
+
+                        }
                         //sql += " and F_WorkState = '" + strstate.Trim() + "' ";
                     }
                     else

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/hb_affairsController.cs

@@ -962,9 +962,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     string path = "/Upload/ZhenWu/" + DateTime.Now.ToString("yyyy") + "/" + DateTime.Now.ToString("MM") + "/" + DateTime.Now.ToString("dd") + "/";
                     foreach (var it in jo.body)
                     {
-                        byte[] data = Encoding.UTF8.GetBytes(it.ATTATH_CONTENT);
+                       // byte[] data = Encoding.UTF8.GetBytes(it.ATTATH_CONTENT);
                         FileUp fu = new FileUp();
-                        fu.SaveFile(data, path, it.ATTATH_NAME);
+                        fu.ByteSaveFile(it.ATTATH_CONTENT, path, it.ATTATH_NAME);
                         Model.T_Sys_Accessories model_T_Sys_Accessories = new Model.T_Sys_Accessories();
                         model_T_Sys_Accessories.F_AddTime = DateTime.Now;//上传时间
                         model_T_Sys_Accessories.F_FileName = it.ATTATH_NAME;//附件名称

CallCenterCommon/CallCenter.Utility/FileUp.cs

@@ -137,7 +137,30 @@ namespace CallCenter.Utility
                 fileStream.Close();
             }
         }
-
+        public void ByteSaveFile(string base64String, string SavePath, string fileName)
+        {
+            string savePath = HttpContext.Current.Server.MapPath(SavePath);
+            if (!Directory.Exists(savePath))
+            {
+                Directory.CreateDirectory(savePath);
+            }
+            savePath += fileName;
+            try
+            {
+                using (MemoryStream stream = new MemoryStream(Convert.FromBase64String(base64String)))
+                {
+                    using (FileStream fs = new FileStream(savePath, FileMode.OpenOrCreate, FileAccess.Write))
+                    {
+                        byte[] b = stream.ToArray();
+                        fs.Write(b, 0, b.Length);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
         /// <summary>
         /// 上传文件
         /// </summary>