Skip to content

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

0403需求变动1

parent 9c4537d5
Showing with 35 additions and 15 deletions
.env
APP_DEBUG = false [APP] DEFAULT_TIMEZONE = Asia/Shanghai ###项目初始化配置 [init] // 项目名称 entry_name = data-collect // 是否开启调试日志 log = true ###数据库配置 [database] type = mysql hostname = huisheng_mysql database = data-collect username = root password = Huisheng@12345 hostport = 3306 charset = utf8 debug = true ###redis配置 [redis] hostname = huisheng_redis port = 6379 debug = false [LANG] default_lang = zh-cn APP_DEBUG = true [APP] DEFAULT_TIMEZONE = Asia/Shanghai ###项目初始化配置 [init] // 项目名称 entry_name = data-collect-dev // 是否开启调试日志 log = true ###数据库配置 [database] type = mysql hostname = huisheng_mysql database = data-collect-dev username = root password = Huisheng@12345 hostport = 3306 charset = utf8 debug = true ###redis配置 [redis] hostname = huisheng_redis port = 6379 debug = true [LANG] default_lang = zh-cn
\ No newline at end of file
......
app/api/business/NormReceivesBus.php
...@@ -34,9 +34,6 @@ class NormReceivesBus extends BaseBus ...@@ -34,9 +34,6 @@ class NormReceivesBus extends BaseBus
if(!empty($data['task_id'])) { if(!empty($data['task_id'])) {
$where[]=['task_id', '=', $data['task_id']]; $where[]=['task_id', '=', $data['task_id']];
} }
if(!empty($data['name'])) {
$where[]=['name', 'like', "%{$data['name']}%"];
}
if(!empty($data['user_id'])) { if(!empty($data['user_id'])) {
$where[]=['user_id', '=', $data['user_id']]; $where[]=['user_id', '=', $data['user_id']];
} }
...@@ -97,9 +94,6 @@ class NormReceivesBus extends BaseBus ...@@ -97,9 +94,6 @@ class NormReceivesBus extends BaseBus
if(!empty($data['task_id'])) { if(!empty($data['task_id'])) {
$where[]=['task_id', '=', $data['task_id']]; $where[]=['task_id', '=', $data['task_id']];
} }
if(!empty($data['name'])) {
$where[]=['name', 'like', "%{$data['name']}%"];
}
if(!empty($data['status']) || $data['status'] ==0) { if(!empty($data['status']) || $data['status'] ==0) {
$where[]=['status', 'in', "{$data['status']}"]; $where[]=['status', 'in', "{$data['status']}"];
} }
......
app/api/controller/NormList.php
...@@ -41,6 +41,8 @@ class NormList extends AuthBase ...@@ -41,6 +41,8 @@ class NormList extends AuthBase
foreach ($result as $index => $value){ foreach ($result as $index => $value){
$res = $NormExtendBus->getConditionalQueryAll(['norm_id'=>$value['norm_id'],'user_filled'=>1]); $res = $NormExtendBus->getConditionalQueryAll(['norm_id'=>$value['norm_id'],'user_filled'=>1]);
$result[$index]['user_filled'] = $res; $result[$index]['user_filled'] = $res;
$NormBus = new \app\api\business\CommonBus('NormBus'); // 通过公共业务初始化用户待领取指标类
$result['data'][$index]['normInfo'] = $NormBus->getConditionalQuery(['id'=>$value['norm_id']]);
} }
}else{ }else{
//查询全部数据 //查询全部数据
...@@ -49,6 +51,8 @@ class NormList extends AuthBase ...@@ -49,6 +51,8 @@ class NormList extends AuthBase
foreach ($result['data'] as $index => $value){ foreach ($result['data'] as $index => $value){
$res = $NormExtendBus->getConditionalQueryAll(['norm_id'=>$value['norm_id'],'user_filled'=>1]); $res = $NormExtendBus->getConditionalQueryAll(['norm_id'=>$value['norm_id'],'user_filled'=>1]);
$result['data'][$index]['user_filled'] = $res; $result['data'][$index]['user_filled'] = $res;
$NormBus = new \app\api\business\CommonBus('NormBus'); // 通过公共业务初始化用户待领取指标类
$result['data'][$index]['normInfo'] = $NormBus->getConditionalQuery(['id'=>$value['norm_id']]);
} }
} }
if($result){ if($result){
......
app/api/controller/NormReceives.php
...@@ -22,7 +22,6 @@ class NormReceives extends AuthBase ...@@ -22,7 +22,6 @@ class NormReceives extends AuthBase
// 数据接收 // 数据接收
$data['page'] = input("param.page",0,"intval"); $data['page'] = input("param.page",0,"intval");
$data['limit'] = input("param.limit",0,"intval"); $data['limit'] = input("param.limit",0,"intval");
$data['name'] = input("param.name");
$data['task_id'] = input("param.task_id"); $data['task_id'] = input("param.task_id");
$data['status'] = input("param.status"); $data['status'] = input("param.status");
$data['statusSelect'] = input("param.statusSelect"); $data['statusSelect'] = input("param.statusSelect");
...@@ -57,6 +56,9 @@ class NormReceives extends AuthBase ...@@ -57,6 +56,9 @@ class NormReceives extends AuthBase
$TaskPackageBus= new \app\api\business\CommonBus('TaskPackageBus'); // 通过公共业务初始化用户待领取指标类 $TaskPackageBus= new \app\api\business\CommonBus('TaskPackageBus'); // 通过公共业务初始化用户待领取指标类
$taskInfo = $TaskPackageBus->getConditionalQuery(['id'=>$value['task_id']]); $taskInfo = $TaskPackageBus->getConditionalQuery(['id'=>$value['task_id']]);
$result['data'][$index]['taskInfo'] = $taskInfo; $result['data'][$index]['taskInfo'] = $taskInfo;
$NormBus = new \app\api\business\CommonBus('NormBus'); // 通过公共业务初始化用户待领取指标类
$normInfo = $NormBus->getConditionalQuery(['id'=>$value['norm_id']]);
$result['data'][$index]['normInfo'] = $normInfo;
} }
}else{ }else{
//查询全部数据 //查询全部数据
...@@ -76,6 +78,9 @@ class NormReceives extends AuthBase ...@@ -76,6 +78,9 @@ class NormReceives extends AuthBase
$TaskPackageBus= new \app\api\business\CommonBus('TaskPackageBus'); // 通过公共业务初始化用户待领取指标类 $TaskPackageBus= new \app\api\business\CommonBus('TaskPackageBus'); // 通过公共业务初始化用户待领取指标类
$taskInfo = $TaskPackageBus->getConditionalQuery(['id'=>$value['task_id']]); $taskInfo = $TaskPackageBus->getConditionalQuery(['id'=>$value['task_id']]);
$result['data'][$index]['taskInfo'] = $taskInfo; $result['data'][$index]['taskInfo'] = $taskInfo;
$NormBus = new \app\api\business\CommonBus('NormBus'); // 通过公共业务初始化用户待领取指标类
$normInfo = $NormBus->getConditionalQuery(['id'=>$value['norm_id']]);
$result['data'][$index]['normInfo'] = $normInfo;
} }
} }
if($result){ if($result){
......
app/api/controller/System.php
...@@ -17,14 +17,14 @@ class System extends BaseController ...@@ -17,14 +17,14 @@ class System extends BaseController
public function index() public function index()
{ {
$data = ['version'=>'v1.3.9','server'=>'DSIS']; $data = ['version'=>'v1.3.9','server'=>'DSIS'];
return returnResult(config("config.code.success"),'测试',$data); return returnResult(config("config.code.success"),'正式版本',$data);
} }
public function menus() public function menus()
{ {
$q = Db::table('menu')->select(); $q = Db::table('menu')->select();
$ss = $this->getTreeData($q->toArray()); $ss = $this->getTreeData($q->toArray());
return returnResult(config("config.code.success"),'测试',$ss); return returnResult(config("config.code.success"),'正式版本',$ss);
} }
/** /**
......
app/api/route/api.php
...@@ -93,10 +93,8 @@ Route::rule("normOrders/list","NormOrders/list"); //结算指标列表 ...@@ -93,10 +93,8 @@ Route::rule("normOrders/list","NormOrders/list"); //结算指标列表
Route::rule("normOrders/detail","NormOrders/detail"); //结算指标列表 Route::rule("normOrders/detail","NormOrders/detail"); //结算指标列表
//Route::rule("importFile","ExcelFile/importFile"); //结算指标列表
//Route::rule("exportFile","ExcelFile/exportFile"); //结算指标列表
Route::rule("taskExportFile","ExcelFile/taskExportFile"); //按任务导出数据 Route::rule("taskExportFile","ExcelFile/taskExportFile"); //按任务导出数据
Route::rule("normExportFile","ExcelFile/normExportFile"); //按指标导出数据 Route::rule("normExportFile","ExcelFile/normExportFile"); //按指标导出数据
Route::rule("importFile","ExcelFile/importFile"); //按任务导入指标信息
Route::rule("test","test/index"); //结算指标列表 Route::rule("test","test/index"); //结算指标列表
//Route::rule("import","ImportFile/import"); \ No newline at end of file
\ No newline at end of file
runtime/session/sess_133ef1b0a4f3dee9ec3958afb8ba7bd7 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_15cd2b0f2447787bd314d111a82665f9 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_2dce71faf3ca117d4e4000ecaecf7b84 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_3b09c5acc0a82e923c2154daa73e6bf9 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_6d2b4bfa1832992e0ffa010815ce5385 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_91a9c85d356c5d75c23288267b266cf8 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_d5d796a065e06447080eeb398ef71b65 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_dd6ad8a323a674f7743023c8efa780b4 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_f8f81b89abcbeba11000207f1bf36086 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