|
|
@@ -418,12 +418,18 @@ class report {
|
|
|
if(!empty($realSelect)){
|
|
|
$data_type = 'select';
|
|
|
}
|
|
|
+ $supportMultiple = false;
|
|
|
+ if($filed['field_display_name_user'] == "Consignee" || $filed['field_display_name_user'] == "Consignee ID"
|
|
|
+ || $filed['field_display_name_user'] == "Shipper" || $filed['field_display_name_user'] == "Shipper ID"
|
|
|
+ || $filed['field_display_name_user'] == "Controlling Customer"){
|
|
|
+ $supportMultiple = true;
|
|
|
+ }
|
|
|
$filtersList[] = array(
|
|
|
"label"=>$filed['field_display_name_user'],
|
|
|
"field"=>$field_display_name,
|
|
|
"field_real"=>$filed['field_display_name'],
|
|
|
"data_type"=>$data_type,
|
|
|
- "value"=>'',"options"=>$realSelect);
|
|
|
+ "value"=>'',"options"=>$realSelect,"supportMultiple"=>$supportMultiple);
|
|
|
}
|
|
|
if($filed['is_sort_enabled'] == 't'){
|
|
|
$sortByOptions[] = $filed['field_db'];
|
|
|
@@ -695,9 +701,12 @@ class report {
|
|
|
$day = $schedule["yearly_day"];
|
|
|
$time = $schedule["yearly_time"];
|
|
|
}
|
|
|
+
|
|
|
+ $reportName = common::excuteOneSql("select name from public.kln_report_template where serial_no = '$serial_no' limit 1");
|
|
|
$data["deliveryFrequency"] = array("emailRecipients"=>$schedule["email_recipients"],"orderBy"=>$schedule["schedule_order_field"],
|
|
|
"timezone"=>$schedule["timezone"],"deliveryFrequency"=>$schedule["delivery_frequency"],
|
|
|
"scheduleDetails" =>array("time"=>$time,"week"=>$week,"month"=>$month,"monthlyDay" =>$monthlyDay,"quarterMonth"=>$quarterMonth,"day"=>$day));
|
|
|
+ $data["reportName"]= $reportName;
|
|
|
common::echo_json_encode(200,array("msg"=>"success","showData" => $data));
|
|
|
exit;
|
|
|
}
|
|
|
@@ -1132,7 +1141,14 @@ class report {
|
|
|
//找到给key
|
|
|
$temp_sql_where = "";
|
|
|
if ($fiter['data_type'] == "string" || $fiter['data_type'] == "select"){
|
|
|
- $temp_sql_where .= " and ".$key." ilike '%". common::check_input($_POST[$fiter['field']])."%'";
|
|
|
+ $textSearch_arr = $_POST[$fiter['field']];
|
|
|
+ if($fiter['supportMultiple'] == 'true'){
|
|
|
+ $textSearch_arr = str_replace(",", ";", $textSearch_arr);
|
|
|
+ $more_param = common::getInNotInSqlForSearch(strtolower($textSearch_arr));
|
|
|
+ $temp_sql_where .= " and lower(".$key.") in ($more_param)";
|
|
|
+ }else{
|
|
|
+ $temp_sql_where .= " and ".$key." = '". common::check_input($_POST[$fiter['field']])."'";
|
|
|
+ }
|
|
|
} elseif ($fiter['data_type'] == "number"){
|
|
|
$temp_arr = $_POST [$fiter['field']];
|
|
|
if(trim((string)$temp_arr[0]) !== ''){
|
