|
|
@@ -46,8 +46,7 @@ class Exec extends \app\admin\BaseController{
|
|
|
]);
|
|
|
if($valid->check($param)==false) return error_show(1004,$valid->getError());
|
|
|
$companyNo = $param['companyNo']??($param['relaComNo']??"");
|
|
|
- $ist =Db::name("exec")->where(["name"=>$param['name'],"companyNo"=>$companyNo,"type"=>$param['type'],
|
|
|
- "is_del"=>0])->findOrEmpty();
|
|
|
+ $ist =Db::name("exec")->where(["name"=>$param['name'],"companyNo"=>$companyNo,"is_del"=>0])->findOrEmpty();
|
|
|
if(!empty($ist))return error_show(1004,"同类型脚本名称已存在");
|
|
|
$data=[
|
|
|
"name"=>$param['name'],
|
|
|
@@ -68,7 +67,7 @@ class Exec extends \app\admin\BaseController{
|
|
|
public function status(){
|
|
|
$param=$this->request->param(["id"=>"","status"=>""],"post","trim");
|
|
|
if($param['id']=='')return error_show(1004,"参数id 不能为空");
|
|
|
- $log=Db::name("exec")->where(["id",$param['id']])->findOrEmpty();
|
|
|
+ $log=Db::name("exec")->where(["id"=>$param['id']])->findOrEmpty();
|
|
|
if(empty($log))return error_show(1004,"脚本不存在");
|
|
|
if($log['is_del']==1) return error_show(1004,"脚本已删除");
|
|
|
if($log['status']==$param['status']) return error_show(1004,"脚本状态已更新");
|
|
|
@@ -81,8 +80,8 @@ class Exec extends \app\admin\BaseController{
|
|
|
$param=$this->request->param(["id"=>"","start"=>"","end"=>"","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',
|
|
|
+ "start|起始时间"=>'require|dateFormat:Y-m-d',
|
|
|
+ "end|结束时间"=>'require|dateFormat:Y-m-d|gt:start',
|
|
|
"companyNo|业务公司"=>'requireWithout:relaComNo|max:255',
|
|
|
"relaComNo|业务公司"=>'requireWithout:companyNo|max:255',
|
|
|
"type|执行类型"=>'require|number|in:1,2',
|
|
|
@@ -134,11 +133,11 @@ class Exec extends \app\admin\BaseController{
|
|
|
public function logdel(){
|
|
|
$param=$this->request->param(["logid"=>""],"post","trim");
|
|
|
if($param['logid']=='')return error_show(1004,"参数logid 不能为空");
|
|
|
- $log=Db::name("exec_log")->where(["id",$param['logid']])->findOrEmpty();
|
|
|
+ $log=Db::name("exec_log")->where(["id"=>$param['logid']])->findOrEmpty();
|
|
|
if(empty($log))return error_show(1004,"脚本记录不存在");
|
|
|
if($log['is_del']==1) return error_show(1004,"脚本记录已删除");
|
|
|
if(in_array($log['status'],[2,4])) return error_show(1004,"脚本执行中或已完成");
|
|
|
- $del=Db::name("exec_log")->where(["id",$param['logid']])->update(["is_del"=>1,"updatetime"=>date("Y-m-d H:i:s")]);
|
|
|
+ $del=Db::name("exec_log")->where(["id"=>$param['logid']])->update(["is_del"=>1,"updatetime"=>date("Y-m-d H:i:s")]);
|
|
|
return $del? app_show("0","删除成功"):app_show("1004","删除失败");
|
|
|
}
|
|
|
public function actionList(){
|
