|
|
@@ -11,8 +11,8 @@ class ExecStat extends \app\admin\BaseController{
|
|
|
public function __construct(App $app) {parent::__construct($app);}
|
|
|
|
|
|
public function list(){
|
|
|
- $param=$this->request->param(["name"=>"","type"=>"","status"=>"","companyNo"=>"",'relaComNo'=>'',"page"=>1,"size"=>15],"post","trim");
|
|
|
- $conditon =[["is_del","=",0],["type","=",3]];
|
|
|
+ $param=$this->request->param(["name"=>"","type"=>3,"status"=>"","companyNo"=>"",'relaComNo'=>'',"page"=>1,"size"=>15],"post","trim");
|
|
|
+ $conditon =[["is_del","=",0],["type","=",$param['type']]];
|
|
|
if($param['name']!='')$conditon[]=["name","like","%{$param['name']}%"];
|
|
|
if($param['status']!=='')$conditon[]=["status","=",$param['status']];
|
|
|
$count=Db::name("exec")->where($conditon)->count();
|
|
|
@@ -23,17 +23,15 @@ class ExecStat extends \app\admin\BaseController{
|
|
|
}
|
|
|
|
|
|
public function query(){
|
|
|
- $param=$this->request->param(["name"=>"","status"=>"","companyNo"=>"",'relaComNo'=>'',"type"=>""],"post","trim");
|
|
|
- $conditon =[["is_del","=",0],["type","=",3]];
|
|
|
+ $param=$this->request->param(["name"=>"","status"=>"","companyNo"=>"",'relaComNo'=>'',"type"=>3],"post","trim");
|
|
|
+ $conditon =[["is_del","=",0],["type","=",$param['type']]];
|
|
|
if($param['name']!='')$conditon[]=["name","like","%{$param['name']}%"];
|
|
|
if($param['status']!=='')$conditon[]=["status","=",$param['status']];
|
|
|
-// if($param['companyNo']!='')$conditon[]=["companyNo","=",$param['companyNo']];
|
|
|
-// if($param['relaComNo']!='')$conditon[]=["companyNo","=",$param['relaComNo']];
|
|
|
$list=Db::name("exec")->where($conditon)->select()->toArray();
|
|
|
return app_show(0,"获取成功",$list);
|
|
|
}
|
|
|
public function add(){
|
|
|
- $param=$this->request->param(["name"=>"","companyNo"=>"",'relaComNo'=>'',"action"=>''],"post","trim");
|
|
|
+ $param=$this->request->param(["name"=>"","companyNo"=>"",'relaComNo'=>'',"action"=>'',"type"=>3],"post","trim");
|
|
|
$valid=Validate::rule([
|
|
|
"name|脚本名称"=>'require|max:255',
|
|
|
]);
|
|
|
@@ -47,7 +45,7 @@ class ExecStat extends \app\admin\BaseController{
|
|
|
"companyNo"=>'',
|
|
|
"companyName"=>'',
|
|
|
"action"=>$param["action"]??"",
|
|
|
- "type"=>3,//行政业绩报表
|
|
|
+ "type"=>$param['type'],//3行政业绩报表 4 仓库每日订单数据
|
|
|
"status"=>0,
|
|
|
"addtime"=>date("Y-m-d H:i:s"),
|
|
|
"updatetime"=>date("Y-m-d H:i:s")
|
|
|
@@ -57,12 +55,12 @@ class ExecStat extends \app\admin\BaseController{
|
|
|
}
|
|
|
//新建脚本数据
|
|
|
public function addlog(){
|
|
|
- $param=$this->request->param(["id"=>"","start"=>"","end"=>"","companyNo"=>"",'relaComNo'=>'',"type"=>""],"post","trim");
|
|
|
+ $param=$this->request->param(["id"=>"","start"=>date("Y-m-d"),"end"=>date("Y-m-d"),"companyNo"=>"",'relaComNo'=>'',"type"=>""],"post","trim");
|
|
|
$valid=Validate::rule([
|
|
|
"id|脚本ID"=>'require|number|gt:0',
|
|
|
"start|起始时间"=>'require|dateFormat:Y-m-d',
|
|
|
- "end|结束时间"=>'require|dateFormat:Y-m-d|gt:start',
|
|
|
- "type|执行类型"=>'require|number|in:3,4',
|
|
|
+ "end|结束时间"=>'require|dateFormat:Y-m-d|glt:start',
|
|
|
+ "type|执行类型"=>'require|number|in:3,4,5',
|
|
|
]);
|
|
|
if($valid->check($param)==false) return error_show(1004,$valid->getError());
|
|
|
$exec =Db::name("exec")->where("id",$param['id'])->findOrEmpty();
|
|
|
@@ -81,7 +79,7 @@ class ExecStat extends \app\admin\BaseController{
|
|
|
"status"=>1,
|
|
|
"remark"=>'',
|
|
|
"type"=>$param["type"],
|
|
|
- "expiretime"=>$param["type"]==3? date("Y-m-d H:i:s"):date("Y-m-d 22:00:00"),
|
|
|
+ "expiretime"=>in_array($param["type"],[3,5])? date("Y-m-d H:i:s"):date("Y-m-d 22:00:00"),
|
|
|
"addtime"=> date("Y-m-d H:i:s"),
|
|
|
"updatetime"=> date("Y-m-d H:i:s")
|
|
|
];
|
|
|
@@ -91,8 +89,9 @@ class ExecStat extends \app\admin\BaseController{
|
|
|
}
|
|
|
|
|
|
public function loglist(){
|
|
|
- $param=$this->request->param(["name"=>"","apply_name"=>"","status"=>"","action"=>"","type"=>"","companyNo"=>"",'relaComNo'=>'',"page"=>1,"size"=>15],"post","trim");
|
|
|
- $where=[["is_del","=",0],["type","in",[3,4]],["addtime",">=",date("Y-m-d H:i:s",strtotime("-30 day"))]];
|
|
|
+ $param=$this->request->param(["name"=>"","apply_name"=>"","status"=>"","action"=>"","type"=>[3,4],
|
|
|
+ "companyNo"=>"",'relaComNo'=>'',"page"=>1,"size"=>15],"post","trim");
|
|
|
+ $where=[["is_del","=",0],['type','=',$param['type']],["addtime",">=",date("Y-m-d H:i:s",strtotime("-30 day"))]];
|
|
|
if($param['name']!='')$where[]=["name","like","%{$param['name']}%"];
|
|
|
if($param['apply_name']!='')$where[]=["apply_name","like","%{$param['apply_name']}%"];
|
|
|
if($param['type']!='')$where[]=["type","=",$param['type']];
|
|
|
@@ -117,8 +116,14 @@ class ExecStat extends \app\admin\BaseController{
|
|
|
["action"=>"U","name"=>'项目部旧政策回款明细'],
|
|
|
["action"=>"V","name"=>'退货订单明细'],
|
|
|
["action"=>"Q","name"=>'销售订单明细'],
|
|
|
- ["action"=>"X","name"=>'仓储物流日报'],
|
|
|
];
|
|
|
return app_show(0,"获取成功",$ation);
|
|
|
}
|
|
|
+
|
|
|
+ public function actioninfo(){
|
|
|
+ $ation=[
|
|
|
+ ['action'=>'X','name'=>'仓储物流日报'],
|
|
|
+ ];
|
|
|
+ return app_show(0,'获取成功',$ation);
|
|
|
+ }
|
|
|
}
|
