|
|
@@ -56,12 +56,6 @@ class Judge extends Backend
|
|
|
if (empty($baseData)) {
|
|
|
$this->error(__('Parameter %s can not be empty', ''));
|
|
|
}
|
|
|
-// $params['list_name'] = '';
|
|
|
- foreach ($data as $key => $val){
|
|
|
-// $params['list_name'] .= $val['0'].',';
|
|
|
- $params['list_name'] = $val['0'];
|
|
|
- }
|
|
|
-// $params['list_name'] = rtrim($params['list_name'],",");
|
|
|
|
|
|
//基础数据
|
|
|
$params['userid'] = $baseData[0];
|
|
|
@@ -69,7 +63,19 @@ class Judge extends Backend
|
|
|
$params['name'] = $baseData[2];
|
|
|
$params['create'] = $baseData[3];
|
|
|
$params['update'] = $baseData[4];
|
|
|
-
|
|
|
+ //1.项目名称值不同有重复合并一个=>列:测试,测试,测试1 转换为 测试,测试1
|
|
|
+ $params['list_name'] = '';
|
|
|
+ foreach ($data as $k => $val){
|
|
|
+ $params['list_name'] .= $val[0].',';
|
|
|
+ }
|
|
|
+ $params['list_name'] = rtrim($params['list_name'],",");
|
|
|
+ $myArray = explode(',', $params['list_name']);
|
|
|
+ $array_unique = array_unique($myArray);
|
|
|
+ $params['list_name'] = implode(',', $array_unique);
|
|
|
+// //2.项目名称相同取一个=>列:测试,测试 转换为 测试
|
|
|
+// foreach ($data as $k => $val){
|
|
|
+// $params['list_name'] = $val[0];
|
|
|
+// }
|
|
|
$result = true;
|
|
|
Db::startTrans();
|
|
|
try {
|
|
|
@@ -149,13 +155,19 @@ class Judge extends Backend
|
|
|
$params['no'] = $baseData[1]; //判定标准编号
|
|
|
$params['name'] = $baseData[2]; //判定标准名称
|
|
|
$params['update'] = $baseData[3]; //修改时间
|
|
|
-// $params['list_name'] = ''; //检测项目集
|
|
|
- foreach ($data as $ke => $val){
|
|
|
-// $params['list_name'] .= $val['0'].',';
|
|
|
- $params['list_name'] = $val['0'];
|
|
|
+ //1.项目名称值不同有重复合并一个=>列:测试,测试,测试1 转换为 测试,测试1
|
|
|
+ $params['list_name'] = ''; //检测项目集
|
|
|
+ foreach ($data as $k => $val){
|
|
|
+ $params['list_name'] .= $val[0].',';
|
|
|
}
|
|
|
-// $params['list_name'] = rtrim($params['list_name'],",");
|
|
|
-
|
|
|
+ $params['list_name'] = rtrim($params['list_name'],",");
|
|
|
+ $myArray = explode(',', $params['list_name']);
|
|
|
+ $array_unique = array_unique($myArray);
|
|
|
+ $params['list_name'] = implode(',', $array_unique);
|
|
|
+// //2.项目名称相同取一个=>列:测试,测试 转换为 测试
|
|
|
+// foreach ($data as $k => $val){
|
|
|
+// $params['list_name'] = $val[0];
|
|
|
+// }
|
|
|
$validate = $this->validate($params,'admin/item/judge.edit');
|
|
|
if (true !== $validate){
|
|
|
$this->error($validate);
|