Skip to content

D
data-collect-api
Commit 1f4336a0 by wenyi.chen
Options

主页修改

parent a9b06589
Showing with 34 additions and 6 deletions
app/api/controller/ExcelFile.php
...@@ -1062,7 +1062,6 @@ class ExcelFile extends BaseController ...@@ -1062,7 +1062,6 @@ class ExcelFile extends BaseController
$sheet->setCellValue($column[$num+$position].$row, $hh['value']); $sheet->setCellValue($column[$num+$position].$row, $hh['value']);
$position++; $position++;
} }
$position--;
$sheet->getRowDimension($row)->setRowHeight(80); // 设置第n行的高度为30 $sheet->getRowDimension($row)->setRowHeight(80); // 设置第n行的高度为30
$sheet->getColumnDimension($column[$num+$position])->setWidth(30); // 设置A列的宽度为20 $sheet->getColumnDimension($column[$num+$position])->setWidth(30); // 设置A列的宽度为20
if($title[$position]=='图片'){ if($title[$position]=='图片'){
......
app/api/controller/Norm.php
...@@ -149,7 +149,9 @@ class Norm ...@@ -149,7 +149,9 @@ class Norm
// 格式化数据 // 格式化数据
$extend = []; // 自定义内容 $extend = []; // 自定义内容
array_push($extend,['name'=>'名称','value'=>$data['name']]); // 子任务也可以拆分成多个指标
array_push($extend,['name'=>'名称','value'=>str_replace(",", "，", $data['name'])]);
// 子任务不可拆分成多个指标
if ($queryArr['dynamicItem']){ if ($queryArr['dynamicItem']){
foreach ($queryArr['dynamicItem'] as $value){ foreach ($queryArr['dynamicItem'] as $value){
array_push($extend,['name'=>$value['name'],'value'=>$value['value']]); array_push($extend,['name'=>$value['name'],'value'=>$value['value']]);
...@@ -160,7 +162,6 @@ class Norm ...@@ -160,7 +162,6 @@ class Norm
$exp = explode(',',$value['value']); $exp = explode(',',$value['value']);
array_push($ordering,$exp); array_push($ordering,$exp);
} }
// 格式化数据 // 格式化数据
$processedData = \app\common\lib\Arr::format($ordering); $processedData = \app\common\lib\Arr::format($ordering);
// 格式化每个数据表需要的数据格式 // 格式化每个数据表需要的数据格式
...@@ -291,6 +292,7 @@ class Norm ...@@ -291,6 +292,7 @@ class Norm
$id = input("param.id"); $id = input("param.id");
$page = input("param.page")?input("param.page"):-1; $page = input("param.page")?input("param.page"):-1;
$limit = input("param.limit")?input("param.limit"):10; $limit = input("param.limit")?input("param.limit"):10;
$show = input("param.show")?input("param.show"):1;
if(empty($id)){ if(empty($id)){
return returnResult(config("config.code.error"),'填写信息错误，请检查！'); return returnResult(config("config.code.error"),'填写信息错误，请检查！');
} }
...@@ -306,9 +308,9 @@ class Norm ...@@ -306,9 +308,9 @@ class Norm
// 领取信息 // 领取信息
$NormReceivesBus = new CommonBus('NormReceivesBus'); // 通过公共业务初始化指标类 $NormReceivesBus = new CommonBus('NormReceivesBus'); // 通过公共业务初始化指标类
if($page == -1){ if($page == -1){
$data['receivesList'] = $NormReceivesBus->getConditionalQueryAll(['norm_id'=>$id]); $data['receivesList'] = $NormReceivesBus->getConditionalQueryAll(['norm_id'=>$id,'show'=>$show]);
}else{ }else{
$list= $NormReceivesBus->getConditionalQueryAllPaging(['norm_id'=>$id],$page,$limit); $list= $NormReceivesBus->getConditionalQueryAllPaging(['norm_id'=>$id,'show'=>$show],$page,$limit);
$data['receivesList'] = $list['data']; $data['receivesList'] = $list['data'];
$data['total'] = $list['total']; $data['total'] = $list['total'];
} }
......
app/api/controller/NormReceives.php
...@@ -283,7 +283,12 @@ class NormReceives extends AuthBase ...@@ -283,7 +283,12 @@ class NormReceives extends AuthBase
errorRecord('NormReceives.revoke','错误id=>'.$id,true); errorRecord('NormReceives.revoke','错误id=>'.$id,true);
return returnResult(config("config.code.error"),'无法找到该任务ID相关数据!',''); return returnResult(config("config.code.error"),'无法找到该任务ID相关数据!','');
} }
$result = $NormReceivesBus->updateData(['id'=>$id,'status'=>$status,'review_time'=>date('Y-m-d H:i:s'),'review_remarks'=>$review_remarks]); $res = $NormReceivesBus->getConditionalQuery(['norm_list_id'=>$result['norm_list_id'],'show'=>1]);
if($res){
$result = $NormReceivesBus->updateData(['id'=>$id,'status'=>$status,'show'=>0,'review_time'=>date('Y-m-d H:i:s'),'review_remarks'=>$review_remarks]);
}else{
$result = $NormReceivesBus->updateData(['id'=>$id,'status'=>$status,'show'=>1,'review_time'=>date('Y-m-d H:i:s'),'review_remarks'=>$review_remarks]);
}
if($result){ if($result){
return returnResult(config("config.code.success"),config("config.describe.success"),$result); return returnResult(config("config.code.success"),config("config.describe.success"),$result);
}else{ }else{
......
runtime/session/sess_3fab07f64c367b1b25b8fd49101de56e 0 → 100644
a:1:{s:5:"users";a:10:{s:2:"id";i:3;s:4:"name";s:10:"管理员1";s:5:"phone";s:11:"18417180202";s:7:"account";s:8:"admin001";s:8:"password";s:32:"e10adc3949ba59abbe56e057f20f883e";s:6:"status";i:1;s:4:"type";i:1;s:11:"create_time";s:10:"1709196711";s:5:"email";s:0:"";s:13:"department_id";i:1;}}
\ No newline at end of file
runtime/session/sess_5c7f3515d8dc2f302f3a267bb6ebf9e5 0 → 100644
a:1:{s:5:"users";a:10:{s:2:"id";i:7;s:4:"name";s:7:"用户1";s:5:"phone";s:7:"1748512";s:7:"account";s:7:"user001";s:8:"password";s:32:"e10adc3949ba59abbe56e057f20f883e";s:6:"status";i:1;s:4:"type";i:1;s:11:"create_time";s:10:"1711093128";s:5:"email";s:3:"qwe";s:13:"department_id";i:4;}}
\ No newline at end of file
runtime/session/sess_5cebc3ff7606f0478f8076c22edf9fdf 0 → 100644
a:1:{s:5:"users";a:10:{s:2:"id";i:7;s:4:"name";s:7:"用户1";s:5:"phone";s:7:"1748512";s:7:"account";s:7:"user001";s:8:"password";s:32:"e10adc3949ba59abbe56e057f20f883e";s:6:"status";i:1;s:4:"type";i:1;s:11:"create_time";s:10:"1711093128";s:5:"email";s:3:"qwe";s:13:"department_id";i:4;}}
\ No newline at end of file
runtime/session/sess_79919f0385742c34431d0e7f4dd7fcfa 0 → 100644
a:1:{s:5:"users";a:10:{s:2:"id";i:7;s:4:"name";s:7:"用户1";s:5:"phone";s:7:"1748512";s:7:"account";s:7:"user001";s:8:"password";s:32:"e10adc3949ba59abbe56e057f20f883e";s:6:"status";i:1;s:4:"type";i:1;s:11:"create_time";s:10:"1711093128";s:5:"email";s:3:"qwe";s:13:"department_id";i:4;}}
\ No newline at end of file
runtime/session/sess_7abbbd645102d73ee52a6dd6a2b95dca 0 → 100644
a:1:{s:5:"users";a:10:{s:2:"id";i:7;s:4:"name";s:7:"用户1";s:5:"phone";s:7:"1748512";s:7:"account";s:7:"user001";s:8:"password";s:32:"e10adc3949ba59abbe56e057f20f883e";s:6:"status";i:1;s:4:"type";i:1;s:11:"create_time";s:10:"1711093128";s:5:"email";s:3:"qwe";s:13:"department_id";i:4;}}
\ No newline at end of file
runtime/session/sess_87132ab4e4d1b35f12a33b7d8d518527 0 → 100644
a:1:{s:5:"users";a:10:{s:2:"id";i:7;s:4:"name";s:7:"用户1";s:5:"phone";s:7:"1748512";s:7:"account";s:7:"user001";s:8:"password";s:32:"e10adc3949ba59abbe56e057f20f883e";s:6:"status";i:1;s:4:"type";i:1;s:11:"create_time";s:10:"1711093128";s:5:"email";s:3:"qwe";s:13:"department_id";i:4;}}
\ No newline at end of file
runtime/session/sess_a03e3920408f55fe88dc9eb09e7ccecb 0 → 100644
a:1:{s:5:"users";a:10:{s:2:"id";i:1;s:4:"name";s:12:"开发人员";s:5:"phone";s:11:"18417180202";s:7:"account";s:5:"admin";s:8:"password";s:32:"e10adc3949ba59abbe56e057f20f883e";s:6:"status";i:1;s:4:"type";i:1;s:11:"create_time";s:1:"1";s:5:"email";s:18:"wesley_prc@163.com";s:13:"department_id";i:3;}}
\ No newline at end of file
runtime/session/sess_bca6bd5c83ab31c202ce70570493d3f8 0 → 100644
a:1:{s:5:"users";a:10:{s:2:"id";i:1;s:4:"name";s:12:"开发人员";s:5:"phone";s:11:"18417180202";s:7:"account";s:5:"admin";s:8:"password";s:32:"e10adc3949ba59abbe56e057f20f883e";s:6:"status";i:1;s:4:"type";i:1;s:11:"create_time";s:1:"1";s:5:"email";s:18:"wesley_prc@163.com";s:13:"department_id";i:3;}}
\ No newline at end of file
runtime/session/sess_c7ddb840fadc6e0dc1ada871a165db9b 0 → 100644
a:1:{s:5:"users";a:10:{s:2:"id";i:7;s:4:"name";s:7:"用户1";s:5:"phone";s:7:"1748512";s:7:"account";s:7:"user001";s:8:"password";s:32:"e10adc3949ba59abbe56e057f20f883e";s:6:"status";i:1;s:4:"type";i:1;s:11:"create_time";s:10:"1711093128";s:5:"email";s:3:"qwe";s:13:"department_id";i:4;}}
\ No newline at end of file
runtime/session/sess_f971f22fcb1e7ec12185d58dab0c35a8 0 → 100644
a:1:{s:5:"users";a:10:{s:2:"id";i:7;s:4:"name";s:7:"用户1";s:5:"phone";s:7:"1748512";s:7:"account";s:7:"user001";s:8:"password";s:32:"e10adc3949ba59abbe56e057f20f883e";s:6:"status";i:1;s:4:"type";i:1;s:11:"create_time";s:10:"1711093128";s:5:"email";s:3:"qwe";s:13:"department_id";i:4;}}
\ No newline at end of file
runtime/session/sess_fe2deecc2eff47cdfefff96438f0e429 0 → 100644
a:1:{s:5:"users";a:10:{s:2:"id";i:7;s:4:"name";s:7:"用户1";s:5:"phone";s:7:"1748512";s:7:"account";s:7:"user001";s:8:"password";s:32:"e10adc3949ba59abbe56e057f20f883e";s:6:"status";i:1;s:4:"type";i:1;s:11:"create_time";s:10:"1711093128";s:5:"email";s:3:"qwe";s:13:"department_id";i:4;}}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment