From b3f8789cf8bf0d934f8431b1d7b564a756576b4b Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期四, 14 八月 2025 22:18:35 +0800
Subject: [PATCH] feat: new upload file php
---
Report_DispatchDetailed_Data.php | 91 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 85 insertions(+), 6 deletions(-)
diff --git a/Report_DispatchDetailed_Data.php b/Report_DispatchDetailed_Data.php
index d0e35f7..3d2c514 100644
--- a/Report_DispatchDetailed_Data.php
+++ b/Report_DispatchDetailed_Data.php
@@ -324,6 +324,42 @@
";
//$sql=",isRespirator=(select count(id) from ServiceOrd_Condition where ConditionID=4 and ServiceOrdCoID=ServiceOrdID)"
}
+/**
+ * 鏍规嵁 DispatchOrdID 鏌ユ壘寮�鍗曚汉鍙婅窡鍗曚汉鍒楄〃
+ *
+ * @param int $ServiceOrdID 璋冨害鍗� ID
+ * @param object $conn 鏁版嵁搴撹繛鎺ュ璞�
+ * @return array 鍖呭惈寮�鍗曚汉鍙婅窡鍗曚汉淇℃伅鐨勬暟缁�
+ */
+function getDispatchOrderStaff($ServiceOrdID, $conn) {
+ $staffList = [];
+
+ // 鏌ヨ寮�鍗曚汉淇℃伅
+ $sqlDispatcher = "select PersonName,CommissionRatio from ServiceOrderCommissionDetails where ServiceOrderID='$ServiceOrdID' and PersonType='Opener'";
+
+ $dataDispatcher = sqlsrv_query($conn, $sqlDispatcher);
+ if ($dataDispatcher && sqlsrv_has_rows($dataDispatcher)) {
+ $rsDispatcher = sqlsrv_fetch_array($dataDispatcher);
+ $staffList['Opener'] = $rsDispatcher['PersonName'];
+ $staffList['OpenerCommissionRatio'] = $rsDispatcher['CommissionRatio'];
+ }
+
+ // 鏌ヨ璺熷崟浜哄垪琛�
+ $sqlEntourage = "select PersonName,CommissionRatio from ServiceOrderCommissionDetails where ServiceOrderID='$ServiceOrdID' and PersonType='Follower'";
+ $dataEntourage = sqlsrv_query($conn, $sqlEntourage);
+ if ($dataEntourage) {
+ $entourageList = [];
+ $i=1;
+ while ($rsEntourage = sqlsrv_fetch_array($dataEntourage)) {
+ $entourageList[$i]["Follower"] = $rsEntourage['PersonName'];
+ $entourageList[$i]["FollowerRatio"] = $rsEntourage['CommissionRatio'];
+ $i++;
+ }
+ $staffList['entourage'] = $entourageList;
+ }
+
+ return $staffList;
+}
//echo $total_sql;exit;
if ($is_CSV!=1){
//璁＄畻鎬婚〉鏁�
@@ -341,12 +377,16 @@
$sqlPage="" ;
}
$sql = "select * $Additional_sql from ($Result_sql) sqlData ".$sqlPage." order by sqlData.n" ;
-//echo $sql;exit;
+// echo $sql;exit;
+
+// 鍒濆鍖栧彉閲忥紝纭繚鍦ㄦ墍鏈夋儏鍐典笅閮借瀹氫箟
+$FormArrayX = 0;
+$FormArray = array();
+
$data = sqlsrv_query($conn,$sql);
if($data == true){
- $FormArray=array();
//琛ㄥご
- $FormArray[0]=array("搴忓彿","鏈嶅姟鍗曞彿","璋冨害鍗曞彿","绾у埆","鍒嗗尯","棰勭害绫诲瀷","璋冨害鍗曠姸鎬�","鏃ユ湡","鏃堕棿","鐝","鑱旂郴浜�","鑱旂郴鐢佃瘽","鎮ｈ�呭鍚�","閿�鍞�","浠嬬粛浜�","瀹㈡湇","璋冨害","鏉ユ簮","鏄惁浼佸井鎴愪氦","涓昏浼佸井瀹㈡湇","鍏朵粬浼佸井瀹㈡湇","鎯呮櫙缂栧彿","浼佸井缁╂晥","鎬婚儴涓嬪彂","鏀彺鎬婚儴","鎵垮寘缁�","鍖哄煙","绫诲瀷","鍑哄彂鐪佷唤","鍑哄彂甯�","鍑哄彂鍖�","杞嚭鍖婚櫌","杞嚭绉戝","杞嚭搴婁綅","杞叆鐪佷唤","杞叆甯�","杞叆鍖�","杞叆鍖婚櫌","杞叆绉戝","鎬绘垚浜や环","绯荤粺鎶ヤ环鍙傝��","绛夊緟璐�","鎷呮灦璐�","灞呭ICU璐�","璺濈(鍏噷)","鏀粯鏂瑰紡","浣跨敤鍛煎惛鏈�","杞︾墝","鍑鸿溅鎴愬憳","鍑鸿溅宀椾綅","鍖绘姢鍑鸿溅鏃堕棿(鍒嗛挓)");
+ $FormArray[0]=array("搴忓彿","鏈嶅姟鍗曞彿","璋冨害鍗曞彿","绾у埆","鍒嗗尯","棰勭害绫诲瀷","璋冨害鍗曠姸鎬�","鏃ユ湡","鏃堕棿","鐝","鑱旂郴浜�","鑱旂郴鐢佃瘽","鎮ｈ�呭鍚�","閿�鍞�","浠嬬粛浜�","瀹㈡湇","璋冨害","鏉ユ簮","鏄惁浼佸井鎴愪氦","涓昏浼佸井瀹㈡湇","鍏朵粬浼佸井瀹㈡湇","鎯呮櫙缂栧彿","浼佸井缁╂晥","鎬婚儴涓嬪彂","鏀彺鎬婚儴","鎵垮寘缁�","鍖哄煙","绫诲瀷","鍑哄彂鐪佷唤","鍑哄彂甯�","鍑哄彂鍖�","杞嚭鍖婚櫌","杞嚭绉戝","杞嚭搴婁綅","杞叆鐪佷唤","杞叆甯�","杞叆鍖�","杞叆鍖婚櫌","杞叆绉戝","鎬绘垚浜や环","绯荤粺鎶ヤ环鍙傝��","绛夊緟璐�","鎷呮灦璐�","灞呭ICU璐�","璺濈(鍏噷)","鏀粯鏂瑰紡","浣跨敤鍛煎惛鏈�","杞︾墝","鍑鸿溅鎴愬憳","鍑鸿溅宀椾綅","鍖绘姢鍑鸿溅鏃堕棿(鍒嗛挓)","寮�鍗曚汉","寮�鍗曚汉鎻愭垚姣斾緥","璺熷崟浜�","璺熷崟浜烘彁鎴愭瘮渚�","璺熷崟浜�","璺熷崟浜烘彁鎴愭瘮渚�","璺熷崟浜�","璺熷崟浜烘彁鎴愭瘮渚�","璺熷崟浜�","璺熷崟浜烘彁鎴愭瘮渚�");
if ($is_CSV==1){array_push($FormArray[0],"浠诲姟澶囨敞");}
$FormArrayX=count($FormArray[0]);
if (sqlsrv_rows_affected($data)==0) {
@@ -366,11 +406,11 @@
$isRespirator="鏄�";
}
//璇诲彇鏁版嵁--End
-
+ $ServiceOrdID=$rs['ServiceOrdID'];
//鍐欏叆鏁扮粍
$FormArray[$i][0]=$i+(($page-1)*$page_size);
If ($OrdType=="2") {
- $FormArray[$i][1]="<a href='ServiceOrder.gds?ServiceOrdID=".$rs['ServiceOrdID']."&OrdDateType=4&OrdClassList=&h_menu1_1=1' target='_blank'>".$rs['ServiceOrdNo']."</a>";
+ $FormArray[$i][1]="<a href='ServiceOrder.gds?ServiceOrdID=".$ServiceOrdID."&OrdDateType=4&OrdClassList=&h_menu1_1=1' target='_blank'>".$rs['ServiceOrdNo']."</a>";
if (!empty($rs['DispatchOrdNo'])) {
$FormArray[$i][2]="<a href='DispatchOrder.gds?DispatchOrdID=".$rs['DispatchOrdID']."&OrdDateType=4&OrdClassList=&h_menu1_1=1' target='_blank'>".$rs['DispatchOrdNo']."</a>";
}else{
@@ -487,7 +527,46 @@
$FormArray[$i][48]=$rs['EntourageName'];
$FormArray[$i][49]=$rs['EntouragePost'];
$FormArray[$i][50]=$rs['Stime2'];
- if ($is_CSV==1){$FormArray[$i][51]=$rs['ServiceOrdTaskRemarks'];}
+ $rs2=getDispatchOrderStaff($ServiceOrdID, $conn);
+ //濡傛灉 $rs2 涓虹┖锛岃缃粯璁ゅ��
+ if (empty($rs2)) {
+ $FormArray[$i][51]='--';
+ $FormArray[$i][52]='';
+ }else{
+ $FormArray[$i][51]=isset($rs2['Opener'])?$rs2['Opener']:'--';
+ $FormArray[$i][52]=isset($rs2['OpenerCommissionRatio'])?$rs2['OpenerCommissionRatio']:'';
+ }
+ if (!empty($rs2['entourage'])) {
+ //$rs2['entourage']鐨勯暱搴�
+
+ $FormArray[$i][53]='--';
+ $FormArray[$i][54]='';
+ $FormArray[$i][55]='--';
+ $FormArray[$i][56]='';
+ $FormArray[$i][57]='--';
+ $FormArray[$i][58]='';
+ $FormArray[$i][59]='--';
+ $FormArray[$i][60]='';
+ $j=0;
+
+ foreach ($rs2['entourage'] as $key => $value) {
+ $FormArray[$i][53+$j*2]=$value['Follower'];
+ $FormArray[$i][54+$j*2]=$value['FollowerRatio'];
+ $j++;
+ }
+
+
+ }else{
+ $FormArray[$i][53]='--';
+ $FormArray[$i][54]='';
+ $FormArray[$i][55]='--';
+ $FormArray[$i][56]='';
+ $FormArray[$i][57]='--';
+ $FormArray[$i][58]='';
+ $FormArray[$i][59]='--';
+ $FormArray[$i][60]='';
+ }
+ if ($is_CSV==1){$FormArray[$i][61]=$rs['ServiceOrdTaskRemarks'];}
$i++;
//鍐欏叆鏁扮粍--End
--
Gitblit v1.9.1