From 4985ca36141891b4f5616f21f4caacc91b37601f Mon Sep 17 00:00:00 2001 From: wzp <2040239371@qq.com> Date: 星期五, 06 十二月 2024 17:14:41 +0800 Subject: [PATCH] 修复小程序统计分析里显示干扰问题 --- Report_WXCXOrdAnalysis_Data.php | 2 +- API/v1/index.gds | 2 +- admin_save.gds | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/API/v1/index.gds b/API/v1/index.gds index 45dc27e..e715e67 100644 --- a/API/v1/index.gds +++ b/API/v1/index.gds @@ -1558,7 +1558,7 @@ errcode=40503 errmsg="鏈嶅姟鍗曞凡鍙栨秷" ElseIf Left(errcode,1)<>"4" Then - sql="update ServiceOrder set ServiceOrdState=4,ServiceOrdPoints=0,ServiceOrd_AP_ID=0,ServiceOrd_AP_Time=getdate(),ServiceOrdCancelReason=9,ServiceOrdCancelReasonTXT='"&DELRemarks&"' where ServiceOrdID="&ServiceOrdID + sql="update ServiceOrder set ServiceOrdState=4,ServiceOrdPoints=0,ServiceOrd_AP_ID=0,ServiceOrd_AP_Time=getdate(),ServiceOrdCancelReason=9,ServiceOrdOperationRemarks='',ServiceOrdCancelReasonTXT='"&DELRemarks&"' where ServiceOrdID="&ServiceOrdID objConn.Execute sql sql="delete from UserPoints where Points_Type=6 and ServiceOrdIDDt="&ServiceOrdID&" and ToUserID="&UserID objConn.Execute sql diff --git a/Report_WXCXOrdAnalysis_Data.php b/Report_WXCXOrdAnalysis_Data.php index fa3855b..6e84cba 100644 --- a/Report_WXCXOrdAnalysis_Data.php +++ b/Report_WXCXOrdAnalysis_Data.php @@ -56,7 +56,7 @@ ,ServiceOrdTraTxnPrice as OrdSumPrice ,OrdSumPriceDel=(select sum(ServiceOrdTraTxnPrice) from ServiceOrder as b where ServiceOrdState=4 and a.ServiceOrdID=b.ServiceOrdID) from ServiceOrder as a -where ((ServiceOrdCancelReason<>10 or ServiceOrdCancelReason is null) and (ServiceOrdCancelReasonTXT<>'鑷姩鍙栨秷' or ServiceOrdCancelReasonTXT is null)) and (ServiceOrdOperationRemarks<>'[瀹㈡埛鏈寮忔彁浜ら渶姹傦紝鍙笉鑱旂郴]' or ServiceOrdOperationRemarks is null) and ServiceOrdUserID not in (4,53) and ServiceOrd_CC_Time ".$SqlDateType." and ServiceOrdSource=5 +where ((ServiceOrdCancelReason<>10 or ServiceOrdCancelReason is null) and (ServiceOrdCancelReasonTXT<>'鑷姩鍙栨秷' or ServiceOrdCancelReasonTXT is null)) and (ServiceOrdOperationRemarks<>'[瀹㈡埛鏈寮忔彁浜ら渶姹傦紝鍙笉鑱旂郴]' or ServiceOrdOperationRemarks is null) and ServiceOrdUserID not in (4,53,11638,93481) and ServiceOrd_CC_Time ".$SqlDateType." and ServiceOrdSource=5 ) as aa GROUP BY SourceName,UserSource"; //echo $sql;//exit; $data = sqlsrv_query($conn,$sql); diff --git a/admin_save.gds b/admin_save.gds index df210d3..14f9e7c 100644 --- a/admin_save.gds +++ b/admin_save.gds @@ -1276,7 +1276,7 @@ If ServiceOrdPtOutHospID_New="" Then ServiceOrdPtOutHospID_New=0 If ServiceOrdPtInHospID_New="" Then ServiceOrdPtInHospID_New=0 If ServiceOrdVIP="" Then ServiceOrdVIP=0 -If ServiceOrdOperationRemarks<>"" Then ServiceOrdOperationRemarks=replace(ServiceOrdOperationRemarks,"[瀹㈡埛鏈寮忔彁浜ら渶姹傦紝鍙笉鑱旂郴]","") +If ServiceOrdOperationRemarks<>"" Then ServiceOrdOperationRemarks=replace(replace(ServiceOrdOperationRemarks,"[瀹㈡埛鏈寮忔彁浜ら渶姹傦紝鍙笉鑱旂郴]",""),"[瀹㈡埛鏈寮忔彁浜ら渶姹俔","") If ServiceOrdVisit<>"" And ServiceOrdVisit_old<>ServiceOrdVisit Then RV_Point=0 sql="select id from DispatchOrd_Entourage,DispatchOrd where EntourageState<>4 and DispatchOrdIDDt=DispatchOrdID and ServiceOrdIDDt="&ServiceOrdID -- Gitblit v1.9.1