优化提交检测

application/admin/controller/Entrust.php

@@ -324,6 +324,8 @@ class Entrust extends Backend
         $ben = 0; //苯含量
         $all_dis_data = []; //所有杂质含量数组
         $ethanol = 0; //乙醇含量
+        $methanol = 0; //甲醇含量
+        $ethylacetate = 0; //乙酸乙酯含量
         $dis_impurity_arr = ['甲醇','丙酮','正丁醇','苯','2-乙氧基乙醇','4-甲基-2-戊酮','甲苯','乙酸正丁酯','乙苯','间对二甲苯','邻-二甲苯','苯乙烯','2-乙氧基乙基乙酸酯','环己酮'];
         $ben_arr = ['甲苯','乙苯','间对二甲苯','邻-二甲苯'];
         foreach ($detail_data as $key=>$value){
@@ -340,12 +342,26 @@ class Entrust extends Backend
             if (in_array($value['chemical_compound'],$ben_arr)){//苯系物总量
                 $ben_total_data[$value['chemical_compound']] = $value['potency'];
             }
+            if ($value['chemical_compound'] == '甲醇'){//甲醇含量
+                $methanol = $value['potency'];
+            }
+            if ($value['chemical_compound'] == '乙酸乙酯'){//乙酸乙酯含量
+                $ethylacetate = $value['potency'];
+            }
         }
-
         $judge = Db::name('item_judge_detail')->where('pid',$temp_id)->select();
+        $class = Db::name('item_judge')->where('id',$temp_id)->value('class');//获取判定标准类别
         $sum_all_dis_data = array_sum($all_dis_data);
-        $dis = $sum_all_dis_data - $ethanol;    //残留总量
-        $dis_impurity = array_sum($dis_impurity_data);  //杂质总量
+        if ($class == 1){//常规类  26项减去乙醇 杂质总量14项
+            $dis = $sum_all_dis_data - $ethanol;    //残留总量
+            $dis_impurity = array_sum($dis_impurity_data);  //杂质总量
+        }elseif ($class == 2){//特殊类1 26项减去乙醇、甲醇、乙酸乙酯，杂质总量减去甲醇
+            $dis = $sum_all_dis_data - $ethanol - $methanol - $ethylacetate;    //残留总量
+            $dis_impurity = array_sum($dis_impurity_data) - $methanol;  //杂质总量
+        }else{//特殊类2 26项减去乙醇 杂质总量14项减去甲醇
+            $dis = $sum_all_dis_data - $ethanol;    //残留总量
+            $dis_impurity = array_sum($dis_impurity_data) - $methanol;  //杂质总量
+        }
         $ben_total = array_sum($ben_total_data);    //苯系物重量
         foreach ($judge as $k=>$v){
             if ($v['params'] == '溶剂残留总量'){