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

CallCenterApi/CallCenterApi.DB/obj/Debug/CallCenterApi.DB.csproj.CoreCompileInputs.cache

@@ -1 +0,0 @@
-2eb3a9605142bfeda971e2159d42d53f4e9496b5

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/weixin/WxLoginController.cs

@@ -364,7 +364,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     }
 
                     string gcsql = "select *,dbo.GetUserName(F_CreateUser) as UserName "
-                                        + "from T_Bus_Operation where F_IsDelete=0 and F_WorkOrderId ='" + strworkorderid + "'";
+                                        + "from T_Bus_Operation where F_IsDelete=0  and (F_Message LIKE '%登记%' OR  F_Message LIKE '%查收%' OR  F_Message LIKE '%主办了%' ) and F_WorkOrderId ='" + strworkorderid + "'";
                     var gcdt = DbHelperSQL.Query(gcsql).Tables[0];
                     gcdt.Columns.Add("File", typeof(object));
                     gcdt.Columns.Add("FilePath", typeof(string));

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

@@ -3432,6 +3432,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     + "from T_Bus_VisitResult where F_State=1 and F_IsDelete=0 and F_WorkOrderId ='" + strworkorderid + "' order by F_CreateTime";
                     string gcsql = "select *,dbo.GetUserName(F_CreateUser) as UserName "
                                     + "from T_Bus_Operation where F_IsDelete=0 and F_WorkOrderId ='" + strworkorderid + "' order by F_CreateTime";
+                    //string gcsql = "select *,dbo.GetUserName(F_CreateUser) as UserName "
+                    //              + "from T_Bus_Operation where F_IsDelete=0  and (F_Message LIKE '%登记%' OR  F_Message LIKE '%查收%' OR  F_Message LIKE '%主办了%' ) and F_WorkOrderId ='" + strworkorderid + "' order by F_CreateTime";
+
                     string cbsql = "select *,dbo.GetUserName(F_CreateUser) as UserName "
                                     + "from T_Bus_Additional where F_State=1 and F_IsDelete=0 and F_WorkOrderId ='" + strworkorderid + "' order by F_CreateTime";