来电弹屏暂不更新摘机状态

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/CallCenterApi.Interface.csproj

@@ -81,8 +81,8 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NPOI, Version=2.3.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -158,6 +158,8 @@
     <Content Include="Lib\Senparc.Weixin.dll" />
     <Content Include="Lib\Senparc.Weixin.MP.dll" />
     <Content Include="Txt\dirtywords.txt" />
+    <Content Include="Upload\ZXTX\20170728170157397.jpg" />
+    <Content Include="Upload\ZXTX\20170728170157397_s.jpg" />
     <Content Include="Web.config">
       <SubType>Designer</SubType>
     </Content>
@@ -192,11 +194,16 @@
     <Compile Include="Controllers\report\BusinessController.cs" />
     <Compile Include="Controllers\report\CallInController.cs" />
     <Compile Include="Controllers\report\DaysTalkTimeController.cs" />
+    <Compile Include="Controllers\report\GDLXSJController.cs" />
+    <Compile Include="Controllers\report\GDLXYQController.cs" />
+    <Compile Include="Controllers\report\GDLYController.cs" />
+    <Compile Include="Controllers\report\GDPosController.cs" />
     <Compile Include="Controllers\report\QCResultController.cs" />
     <Compile Include="Controllers\report\SwitchedlossCallController.cs" />
     <Compile Include="Controllers\report\TalkTimeController.cs" />
     <Compile Include="Controllers\report\TotalCallController.cs" />
     <Compile Include="Controllers\report\YearContrastController.cs" />
+    <Compile Include="Controllers\report\ZuoXiManYiDuController.cs" />
     <Compile Include="Controllers\report\ZuoXiTongHuaController.cs" />
     <Compile Include="Controllers\report\ZuoXiWorkTotalController.cs" />
     <Compile Include="Controllers\RoleFController.cs" />
@@ -231,6 +238,7 @@
     <Compile Include="Controllers\weixin\WxLoginController.cs" />
     <Compile Include="Controllers\weixin\WxReceiveController.cs" />
     <Compile Include="Controllers\workorder\WorkOrderController.cs" />
+    <Compile Include="Controllers\workorder\WorkTypeController.cs" />
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
@@ -278,6 +286,7 @@
     </Content>
     <Content Include="Configs\log4net.config" />
     <Content Include="Configs\system.config" />
+    <Content Include="ExcelMod\CustomerList_Mod.xls" />
     <None Include="Properties\PublishProfiles\1q.pubxml" />
     <None Include="Properties\PublishProfiles\ddr.pubxml" />
     <None Include="Properties\PublishProfiles\my.pubxml" />

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

@@ -387,7 +387,8 @@ namespace CallCenterApi.Interface.Controllers.tel
                         }
                         else
                         {
-                            res = Error("更新振铃状态失败");
+                            // res = Error("更新振铃状态失败");
+                            res = Success("更新振铃状态失败");
                         }
                     }
                 }
@@ -424,7 +425,8 @@ namespace CallCenterApi.Interface.Controllers.tel
                 }
                 else
                 {
-                    res = Error("更新摘机状态失败");
+                    //res = Error("更新摘机状态失败");
+                    res = Success("更新摘机状态失败");
                 }
 
             }