|
@@ -22,7 +22,7 @@ class Judge extends Backend
|
|
|
* @var \app\admin\model\item\Judge
|
|
* @var \app\admin\model\item\Judge
|
|
|
*/
|
|
*/
|
|
|
protected $model = null;
|
|
protected $model = null;
|
|
|
- protected $searchFields = 'id,no,name,list_name';
|
|
|
|
|
|
|
+ protected $searchFields = 'id,no,name,list_name,create,update';
|
|
|
|
|
|
|
|
public function _initialize()
|
|
public function _initialize()
|
|
|
{
|
|
{
|
|
@@ -66,7 +66,7 @@ class Judge extends Backend
|
|
|
//1.项目名称值不同有重复合并一个=>列:测试,测试,测试1 转换为 测试,测试1
|
|
//1.项目名称值不同有重复合并一个=>列:测试,测试,测试1 转换为 测试,测试1
|
|
|
$params['list_name'] = '';
|
|
$params['list_name'] = '';
|
|
|
foreach ($data as $k => $val){
|
|
foreach ($data as $k => $val){
|
|
|
- $params['list_name'] .= $val[0].',';
|
|
|
|
|
|
|
+ $params['list_name'] .= $val[1].',';
|
|
|
}
|
|
}
|
|
|
$params['list_name'] = rtrim($params['list_name'],",");
|
|
$params['list_name'] = rtrim($params['list_name'],",");
|
|
|
$myArray = explode(',', $params['list_name']);
|
|
$myArray = explode(',', $params['list_name']);
|
|
@@ -99,7 +99,6 @@ class Judge extends Backend
|
|
|
$insertData[$key]['min'] = $value[6];
|
|
$insertData[$key]['min'] = $value[6];
|
|
|
$insertData[$key]['create'] = date('Y-m-d H:i:s');
|
|
$insertData[$key]['create'] = date('Y-m-d H:i:s');
|
|
|
$insertData[$key]['update'] = date('Y-m-d H:i:s');
|
|
$insertData[$key]['update'] = date('Y-m-d H:i:s');
|
|
|
-// $insertData[$key]['deletetime'] = date('Y-m-d H:i:s');
|
|
|
|
|
}
|
|
}
|
|
|
$res = Db::name('item_judge_detail')->insertAll($insertData);
|
|
$res = Db::name('item_judge_detail')->insertAll($insertData);
|
|
|
if (!$res){
|
|
if (!$res){
|
|
@@ -158,7 +157,7 @@ class Judge extends Backend
|
|
|
//1.项目名称值不同有重复合并一个=>列:测试,测试,测试1 转换为 测试,测试1
|
|
//1.项目名称值不同有重复合并一个=>列:测试,测试,测试1 转换为 测试,测试1
|
|
|
$params['list_name'] = ''; //检测项目集
|
|
$params['list_name'] = ''; //检测项目集
|
|
|
foreach ($data as $k => $val){
|
|
foreach ($data as $k => $val){
|
|
|
- $params['list_name'] .= $val[0].',';
|
|
|
|
|
|
|
+ $params['list_name'] .= $val[1].',';
|
|
|
}
|
|
}
|
|
|
$params['list_name'] = rtrim($params['list_name'],",");
|
|
$params['list_name'] = rtrim($params['list_name'],",");
|
|
|
$myArray = explode(',', $params['list_name']);
|
|
$myArray = explode(',', $params['list_name']);
|
|
@@ -248,4 +247,17 @@ class Judge extends Backend
|
|
|
$this->success();
|
|
$this->success();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 删除 判断标准数据和子项目
|
|
|
|
|
+ */
|
|
|
|
|
+// public function del($ids = null){
|
|
|
|
|
+// $id = $this->request->post('ids');
|
|
|
|
|
+// $item_judge = Db::name('item_judge')->where('id',$id)->delete();
|
|
|
|
|
+// $item_judge_detail = Db::name('item_judge_detail')->where('pid',$item_judge['id'])->select();
|
|
|
|
|
+// foreach ($item_judge_detail as $k => $v){
|
|
|
|
|
+// Db::name('item_judge_detail')->where('pid',$item_judge['id'])->delete($v['id']);
|
|
|
|
|
+// }
|
|
|
|
|
+// }
|
|
|
|
|
+
|
|
|
}
|
|
}
|