Skip to content

D
data-collect-api
Commit 1ab962f8 by cwy
Options

0406

parent 1d2238a7
Showing with 16 additions and 10 deletions
app/api/controller/Norm.php
...@@ -115,6 +115,7 @@ class Norm ...@@ -115,6 +115,7 @@ class Norm
'refer'=>$data['refer'], 'refer'=>$data['refer'],
'price'=>$data['price'], 'price'=>$data['price'],
'guide'=>$data['guide'], 'guide'=>$data['guide'],
'type'=>1,
'num'=>$this->num, 'num'=>$this->num,
]; ];
$normBus = new CommonBus('NormBus'); // 通过公共业务初始化指标类 $normBus = new CommonBus('NormBus'); // 通过公共业务初始化指标类
...@@ -334,6 +335,7 @@ class Norm ...@@ -334,6 +335,7 @@ class Norm
public function editDele($queryArr) public function editDele($queryArr)
{ {
try{ try{
$data = array(); $data = array();
$normId = trim($queryArr['norm_id']); $normId = trim($queryArr['norm_id']);
$normBus = new CommonBus('NormBus'); // 通过公共业务初始化指标类 $normBus = new CommonBus('NormBus'); // 通过公共业务初始化指标类
...@@ -370,7 +372,7 @@ class Norm ...@@ -370,7 +372,7 @@ class Norm
return returnResult(config("config.code.error"),'填写信息错误，请检查！'); return returnResult(config("config.code.error"),'填写信息错误，请检查！');
} }
$index = 1; $control = 1;
// 指标数据 // 指标数据
$normData = [ $normData = [
'task_id'=>$data['task_id'], 'task_id'=>$data['task_id'],
...@@ -391,7 +393,7 @@ class Norm ...@@ -391,7 +393,7 @@ class Norm
// 添加到指标表中 // 添加到指标表中
$normId = $normBus->addData($normData); $normId = $normBus->addData($normData);
if(empty($normId)){ if(empty($normId)){
$index++; $control++;
} }
// 指标扩展数据 // 指标扩展数据
$normExtendList=[]; $normExtendList=[];
...@@ -409,7 +411,7 @@ class Norm ...@@ -409,7 +411,7 @@ class Norm
// 添加自定义数据到指标扩展表中 // 添加自定义数据到指标扩展表中
$normExtend = $normExtendBus->addData($normExtendList); $normExtend = $normExtendBus->addData($normExtendList);
if(empty($normExtend)){ if(empty($normExtend)){
$index++; $control++;
} }
// 格式化数据 // 格式化数据
...@@ -450,7 +452,7 @@ class Norm ...@@ -450,7 +452,7 @@ class Norm
$normListBus = new CommonBus('NormListBus'); // 通过公共业务初始化用户待领取指标类 $normListBus = new CommonBus('NormListBus'); // 通过公共业务初始化用户待领取指标类
$normListId =$normListBus->addData($normList); $normListId =$normListBus->addData($normList);
if(empty($normListId)){ if(empty($normListId)){
$index++; $control++;
} }
// 添加到用户待领取扩展数据表 // 添加到用户待领取扩展数据表
}else{ }else{
...@@ -462,13 +464,14 @@ class Norm ...@@ -462,13 +464,14 @@ class Norm
$normListExtendBus = new CommonBus('NormListExtendBus');// 通过公共业务初始化用户待领取指标扩展类 $normListExtendBus = new CommonBus('NormListExtendBus');// 通过公共业务初始化用户待领取指标扩展类
$res = $normListExtendBus->addData($normListExtend); $res = $normListExtendBus->addData($normListExtend);
if(empty($res)){ if(empty($res)){
$index++; $control++;
} }
} }
} }
} }
// 全部添加完成提交 // 全部添加完成提交
if($index ==1){ if($control ==1){
Db::commit(); Db::commit();
return returnResult(config("config.code.success"),config("config.describe.success"),$res); return returnResult(config("config.code.success"),config("config.describe.success"),$res);
}else{ }else{
......
app/api/controller/System.php
...@@ -16,7 +16,7 @@ class System extends BaseController ...@@ -16,7 +16,7 @@ class System extends BaseController
{ {
public function index() public function index()
{ {
$data = ['version'=>'v1.3.9','server'=>'DSIS']; $data = ['version'=>'v1.3.9','server'=>'DSIS','resource_address'=>config("config.resource_address")];
return returnResult(config("config.code.success"),'正式版本',$data); return returnResult(config("config.code.success"),'正式版本',$data);
} }
......
app/api/route/api.php
...@@ -39,8 +39,6 @@ Route::rule("menu/delete","Menu/delete"); // 删除路由 ...@@ -39,8 +39,6 @@ Route::rule("menu/delete","Menu/delete"); // 删除路由
/***************************系统配置 */ /***************************系统配置 */
Route::rule("system/version","System/index"); // 获取系统相关信息 Route::rule("system/version","System/index"); // 获取系统相关信息
//Route::rule("system/me","System/me"); // 获取系统相关信息
//Route::rule("system/menus","System/menus"); // 获取系统相关信息
Route::rule("system/departments","System/departments"); // 获取系统相关信息 Route::rule("system/departments","System/departments"); // 获取系统相关信息
//Route::rule("system/user","System/user"); // 获取系统相关信息 //Route::rule("system/user","System/user"); // 获取系统相关信息
Route::rule("system/hospital_area","System/hospital_area"); // 获取系统相关信息 Route::rule("system/hospital_area","System/hospital_area"); // 获取系统相关信息
...@@ -95,6 +93,8 @@ Route::rule("normOrders/detail","NormOrders/detail"); //结算指标列表 ...@@ -95,6 +93,8 @@ Route::rule("normOrders/detail","NormOrders/detail"); //结算指标列表
Route::rule("taskExportFile","ExcelFile/taskExportFile"); //按任务导出数据 Route::rule("taskExportFile","ExcelFile/taskExportFile"); //按任务导出数据
Route::rule("normExportFile","ExcelFile/normExportFile"); //按指标导出数据 Route::rule("normExportFile","ExcelFile/normExportFile"); //按指标导出数据
Route::rule("multipleExportFile","ExcelFile/multipleExportFile"); //导出多个数据
Route::rule("importFile","ExcelFile/importFile"); //按任务导入指标信息 Route::rule("importFile","ExcelFile/importFile"); //按任务导入指标信息
Route::rule("test","test/index"); //结算指标列表 Route::rule("test","test/index"); //结算指标列表
\ No newline at end of file
config/config.php
...@@ -70,5 +70,5 @@ return [ ...@@ -70,5 +70,5 @@ return [
], ],
// "resource_address"=>'https://data-collect.raisound.com/data-collect-api/', // "resource_address"=>'https://data-collect.raisound.com/data-collect-api/',
// "resource_address"=>'http://192.168.10.168/data-collect-api/' // "resource_address"=>'http://192.168.10.168/data-collect-api/'
"resource_address"=>'http://gcspider.raisound.com:81/data-collect-api/' "resource_address"=>'http://gcspider.raisound.com:81/data-collect-api-dev/'
]; ];
runtime/session/sess_1ac77d4b365f00277be291f17cd0504e 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
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