Skip to content

D
data-collect-api
Commit 20a05623 by wenyi.chen
Options

线上

parent 173e63d1
Showing with 114 additions and 21 deletions
app/api/controller/ExcelTest.php → app/api/controller/ExcelFile.php
...@@ -16,12 +16,13 @@ use think\facade\Filesystem; ...@@ -16,12 +16,13 @@ use think\facade\Filesystem;
use PhpOffice\PhpSpreadsheet\Spreadsheet; use PhpOffice\PhpSpreadsheet\Spreadsheet;
use PhpOffice\PhpSpreadsheet\Writer\Xlsx; use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
use think\facade\Env; use think\facade\Env;
class ExcelTest extends BaseController use think\facade\Db;
class ExcelFile extends BaseController
{ {
public function importFile() public function importFile()
{ {
try{ try{
$spreadsheet = IOFactory::load('excel_with_image.xlsx'); $spreadsheet = IOFactory::load('import.xlsx');
// $allSheets = $spreadsheet->getAllSheets(); // $allSheets = $spreadsheet->getAllSheets();
$objWorksheet = $spreadsheet->getSheet(0); $objWorksheet = $spreadsheet->getSheet(0);
$drawings = $objWorksheet->getDrawingCollection(); $drawings = $objWorksheet->getDrawingCollection();
...@@ -81,8 +82,8 @@ class ExcelTest extends BaseController ...@@ -81,8 +82,8 @@ class ExcelTest extends BaseController
// 创建一个新的 Spreadsheet 对象 // 创建一个新的 Spreadsheet 对象
$spreadsheet = new Spreadsheet(); $spreadsheet = new Spreadsheet();
$list = []; $list = [];
for ($i=0;$i<10;$i++){ for ($i=0;$i<100;$i++){
if($i % 200 == 0){ if($i % 2 == 0){
array_push($list,$data[1]); array_push($list,$data[1]);
}else{ }else{
array_push($list,$data[0]); array_push($list,$data[0]);
...@@ -124,9 +125,82 @@ class ExcelTest extends BaseController ...@@ -124,9 +125,82 @@ class ExcelTest extends BaseController
$drawing->setWidth(80); // 图片宽度，单位为磅 $drawing->setWidth(80); // 图片宽度，单位为磅
} }
} }
// 保存 ExcelTest 文件 // 保存 ExcelFile 文件
$writer = new Xlsx($spreadsheet); $writer = new Xlsx($spreadsheet);
$writer->save('excel_with_image.xlsx'); $writer->save('import.xlsx');
}catch (\Exception $e){
var_dump($e->getMessage());
}
}
public function taskExportFile()
{
try{
$task = Db::table('task_package')->where('id', 22)->find();
$norm = Db::table('norm')->where('task_id', 22)->select();
$list = [];
foreach ($norm as $value){
$sheet = ['total'=>0,'data'=>[]];
$normList = Db::table('norm_list')->where('norm_id', $value['id'])->select();
foreach ($normList as $index=> $val){
$total = 0;
$normCollects = Db::table('norm_collects')->where('norm_list_id', $val['id'])->find();
$referType = '无'; // 信源类型
$imgPath = '无'; // 图片
$remark = '无';
$normCollectsId = '';
if ($normCollects){
if($normCollects['refer_type']==1){
$referType = '官网/政府';
}else if ($normCollects['refer_type']==2){
$referType = '权威媒体';
}else{
$referType = '其他可信信源';
}
if ($normCollects['imgPath']){
$imgPath = $normCollects['imgPath'];
}
if ($normCollects['remark']){
$remark = $normCollects['remark'];
}
$normCollectsId = $normCollects['id'];
}
$data = [
$index,
$val['name'],
$val['level'],
$val['refer'],
$val['price'],
$value['guide'],
$value['sort'],
$remark,
$referType,
];
$normListExtend = Db::table('norm_list_extend')->where('norm_list_id', $val['id'])->select();
// 添加展示端
foreach ($normListExtend as $extendValue){
$total +=1;
array_push($data,$extendValue['extend_name']);
array_push($data,$extendValue['extend_value']);
}
// 添加用户端
if($normCollectsId){
$collectsInfo = Db::table('norm_collects_extend')->where('norm_collects_id', $normCollectsId)->select();
foreach ($collectsInfo as $collectsValue){
$total +=1;
array_push($data,$collectsValue['extend_name']);
array_push($data,$collectsValue['extend_value']);
}
}
// 添加图片信息
array_push($data,$imgPath);
// 添加第一条指标信息
$sheet['total'] = $total;
array_push($sheet['data'],$data);
}
array_push($list,$sheet);
}
dump($list);
}catch (\Exception $e){ }catch (\Exception $e){
var_dump($e->getMessage()); var_dump($e->getMessage());
} }
......
app/api/controller/Norm.php
...@@ -13,7 +13,7 @@ use app\api\business\CommonBus as CommonBus; // 指标待领取扩展业务 ...@@ -13,7 +13,7 @@ use app\api\business\CommonBus as CommonBus; // 指标待领取扩展业务
use think\facade\Db; use think\facade\Db;
class Norm class Norm
{ {
public $num = 1; public $num = 2;
/** /**
* 任务列表 * 任务列表
* @return \josn|void * @return \josn|void
...@@ -420,14 +420,10 @@ class Norm ...@@ -420,14 +420,10 @@ class Norm
array_push($extend,['name'=>$value['name'],'value'=>$value['value']]); array_push($extend,['name'=>$value['name'],'value'=>$value['value']]);
} }
} }
$keyName = []; //每个值对应的名称
$ordering= []; // 需要排列组合的数据 $ordering= []; // 需要排列组合的数据
foreach ($extend as $value){ foreach ($extend as $value){
$exp = explode(',',$value['value']); $exp = explode(',',$value['value']);
array_push($ordering,$exp); array_push($ordering,$exp);
foreach ($exp as $value1){
array_push($keyName,[$value['name']=>$value1]);
}
} }
// 格式化数据 // 格式化数据
...@@ -436,12 +432,11 @@ class Norm ...@@ -436,12 +432,11 @@ class Norm
// 格式化每个数据表需要的数据格式 // 格式化每个数据表需要的数据格式
foreach ($processedData as $value){ foreach ($processedData as $value){
$exp = explode(',',$value); $exp = explode(',',$value);
foreach ($exp as $value1){ foreach ($exp as $index=> $value1){
$normList = []; // 指标待领取数据 $normList = []; // 指标待领取数据
$normListExtend = []; // 指标待领取数据扩展 $normListExtend = []; // 指标待领取数据扩展
$key = \app\common\lib\Arr::deepGetKey($value1,$keyName);
// 添加到用户待领取数据表 // 添加到用户待领取数据表
if($key=='名称'){ if($index==0){
$normList['task_id'] = $data['task_id']; $normList['task_id'] = $data['task_id'];
$normList['norm_id']=$normId; $normList['norm_id']=$normId;
$normList['name']=$value1; $normList['name']=$value1;
...@@ -461,7 +456,7 @@ class Norm ...@@ -461,7 +456,7 @@ class Norm
}else{ }else{
$normListExtend['norm_id'] = $normId; $normListExtend['norm_id'] = $normId;
$normListExtend['norm_list_id'] = $normListId; $normListExtend['norm_list_id'] = $normListId;
$normListExtend['extend_name'] = $key; $normListExtend['extend_name'] = $extend[$index]['name'];
$normListExtend['extend_value'] = $value1; $normListExtend['extend_value'] = $value1;
$normListExtend['extend_type'] = 1; $normListExtend['extend_type'] = 1;
$normListExtendBus = new CommonBus('NormListExtendBus');// 通过公共业务初始化用户待领取指标扩展类 $normListExtendBus = new CommonBus('NormListExtendBus');// 通过公共业务初始化用户待领取指标扩展类
......
app/api/controller/NormReceives.php
...@@ -11,6 +11,7 @@ use think\facade\Db; ...@@ -11,6 +11,7 @@ use think\facade\Db;
class NormReceives extends AuthBase class NormReceives extends AuthBase
{ {
public $num = 2;
/** /**
* 当前可领取的指标列表 * 当前可领取的指标列表
* @return \josn|void * @return \josn|void
...@@ -176,9 +177,11 @@ class NormReceives extends AuthBase ...@@ -176,9 +177,11 @@ class NormReceives extends AuthBase
$NormListBus= new \app\api\business\CommonBus('NormListBus'); $NormListBus= new \app\api\business\CommonBus('NormListBus');
$info = $NormListBus->getConditionalQuery(['id'=>$data['norm_list_id']]); $info = $NormListBus->getConditionalQuery(['id'=>$data['norm_list_id']]);
if($info){ if($info){
if ($info['num']>0){
$NormListBus->decrementing($data['norm_list_id'],1); $NormListBus->decrementing($data['norm_list_id'],1);
//添加数据 //添加数据
$result = $NormReceivesBus->addData($data); $result = $NormReceivesBus->addData($data);
}
}else{ }else{
return returnResult(config("config.code.error"),'待领取指标ID错误!',''); return returnResult(config("config.code.error"),'待领取指标ID错误!','');
} }
......
app/api/controller/Test.php
...@@ -26,7 +26,7 @@ class Test extends BaseController ...@@ -26,7 +26,7 @@ class Test extends BaseController
$sheet = $spreadsheet->getActiveSheet(); $sheet = $spreadsheet->getActiveSheet();
// 设置一些数据到单元格中 // 设置一些数据到单元格中
$sheet->setCellValue('A1', '带有图片的 ExcelTest 表格'); $sheet->setCellValue('A1', '带有图片的 ExcelFile 表格');
// 创建一个 Drawing 对象，并设置图片的路径 // 创建一个 Drawing 对象，并设置图片的路径
$drawing = new Drawing(); $drawing = new Drawing();
...@@ -40,7 +40,7 @@ class Test extends BaseController ...@@ -40,7 +40,7 @@ class Test extends BaseController
$drawing->setHeight(36); // 图片高度，单位为磅 $drawing->setHeight(36); // 图片高度，单位为磅
$drawing->setWidth(32); // 图片宽度，单位为磅 $drawing->setWidth(32); // 图片宽度，单位为磅
// 保存 ExcelTest 文件 // 保存 ExcelFile 文件
$writer = new Xlsx($spreadsheet); $writer = new Xlsx($spreadsheet);
$writer->save('excel_with_image.xlsx'); $writer->save('excel_with_image.xlsx');
}catch (\Exception $e){ }catch (\Exception $e){
......
app/api/route/api.php
...@@ -93,6 +93,9 @@ Route::rule("normOrders/list","NormOrders/list"); //结算指标列表 ...@@ -93,6 +93,9 @@ Route::rule("normOrders/list","NormOrders/list"); //结算指标列表
Route::rule("normOrders/detail","NormOrders/detail"); //结算指标列表 Route::rule("normOrders/detail","NormOrders/detail"); //结算指标列表
Route::rule("test","ExcelTest/importFile"); //结算指标列表 Route::rule("importFile","ExcelFile/importFile"); //结算指标列表
Route::rule("test1","ExcelTest/exportFile"); //结算指标列表 Route::rule("exportFile","ExcelFile/exportFile"); //结算指标列表
Route::rule("taskExportFile","ExcelFile/taskExportFile"); //结算指标列表
//Route::rule("import","ImportFile/import");
\ No newline at end of file
app/common/model/mysql/NormReceives.php
...@@ -115,8 +115,7 @@ class NormReceives extends Model ...@@ -115,8 +115,7 @@ class NormReceives extends Model
try{ try{
return $this->with([ return $this->with([
'userInfo' => function($query){ 'userInfo' => function($query){
$query->field("id,name"); $query->field("id,name");},
},
])->where($where)->find(); ])->where($where)->find();
}catch (\Exception $e){ }catch (\Exception $e){
exception($e,'mysql.NormReceives.getFindModel'); exception($e,'mysql.NormReceives.getFindModel');
......
runtime/session/sess_1ce1969e23af14a3c33b94a5a4ac36bc 0 → 100644
a:1:{s:5:"users";a:10:{s:2:"id";i:4;s:4:"name";s:13:"测试人员2";s:5:"phone";s:4:"2131";s:7:"account";s:7:"test002";s:8:"password";s:32:"e10adc3949ba59abbe56e057f20f883e";s:6:"status";i:1;s:4:"type";i:1;s:11:"create_time";s:10:"1708836112";s:5:"email";s:3:"123";s:13:"department_id";i:2;}}
\ No newline at end of file
runtime/session/sess_2af0a735c3ba6aa7da2b3a08b0e9d393 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_2be01c0c815c8f0fa18313e2dcbe5321 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:1;}}
\ No newline at end of file
runtime/session/sess_4d5d280b0ad6c6c8a4da1272f74d52af 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_5b81eff6e77c6e0831d5157a735daa55 0 → 100644
a:1:{s:5:"users";a:10:{s:2:"id";i:2;s:4:"name";s:13:"测试人员1";s:5:"phone";s:4:"2131";s:7:"account";s:7:"test001";s:8:"password";s:32:"e10adc3949ba59abbe56e057f20f883e";s:6:"status";i:1;s:4:"type";i:1;s:11:"create_time";s:10:"1708836112";s:5:"email";s:3:"123";s:13:"department_id";i:2;}}
\ No newline at end of file
runtime/session/sess_5fb10d26d97d29774ebf901ce4f163f2 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:1;}}
\ No newline at end of file
runtime/session/sess_7d6bf69b3c1a63dbd59f179797db18e6 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:1;}}
\ No newline at end of file
runtime/session/sess_aa33c33c11ef7e01a0d67a51ca8422a8 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:1;}}
\ No newline at end of file
runtime/session/sess_dc60b8fc7f95811a898a1084e4d11609 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:1;}}
\ 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