|
@@ -113,6 +113,7 @@ class ProjectService extends Service
|
|
DB::beginTransaction();
|
|
DB::beginTransaction();
|
|
try{
|
|
try{
|
|
$model = Project::where('id',$data['id'])->first();
|
|
$model = Project::where('id',$data['id'])->first();
|
|
|
|
+ $model->order_number = $data['order_number'] ?? "";
|
|
$model->title = $data['title'] ?? "";
|
|
$model->title = $data['title'] ?? "";
|
|
$model->importance = $data['importance'] ?? 0;
|
|
$model->importance = $data['importance'] ?? 0;
|
|
$model->company = $data['company'] ?? "";
|
|
$model->company = $data['company'] ?? "";
|
|
@@ -148,6 +149,7 @@ class ProjectService extends Service
|
|
DB::beginTransaction();
|
|
DB::beginTransaction();
|
|
|
|
|
|
$model = new Project();
|
|
$model = new Project();
|
|
|
|
+ $model->order_number = $data['order_number'] ?? "";
|
|
$model->title = $data['title'] ?? "";
|
|
$model->title = $data['title'] ?? "";
|
|
$model->importance = $data['importance'] ?? 0;
|
|
$model->importance = $data['importance'] ?? 0;
|
|
$model->company = $data['company'] ?? "";
|
|
$model->company = $data['company'] ?? "";
|
|
@@ -336,10 +338,11 @@ class ProjectService extends Service
|
|
|
|
|
|
public function projectList($data,$user){
|
|
public function projectList($data,$user){
|
|
$model = Project::where('del_time',0)
|
|
$model = Project::where('del_time',0)
|
|
- ->select('id','title','importance','company','project_cycle','business_director','technical_director','online_director','after_sale_director','project_amount','plan_start_time','plan_end_time','finish_time','budget','stage','crt_time','crt_id')
|
|
|
|
|
|
+ ->select('id','title','importance','company','project_cycle','business_director','technical_director','online_director','after_sale_director','project_amount','plan_start_time','plan_end_time','finish_time','budget','stage','crt_time','crt_id','order_number')
|
|
->orderBy('id','desc');
|
|
->orderBy('id','desc');
|
|
|
|
|
|
if(! empty($data['title'])) $model->where('title',$data['title']);
|
|
if(! empty($data['title'])) $model->where('title',$data['title']);
|
|
|
|
+ if(! empty($data['order_number'])) $model->where('order_number',$data['order_number']);
|
|
if(! empty($data['company'])) $model->where('company',$data['company']);
|
|
if(! empty($data['company'])) $model->where('company',$data['company']);
|
|
if(isset($data['importance'])) $model->where('importance',$data['importance']);
|
|
if(isset($data['importance'])) $model->where('importance',$data['importance']);
|
|
if(! empty($data['crt_time'][0]) && ! empty($data['crt_time'][1])) {
|
|
if(! empty($data['crt_time'][0]) && ! empty($data['crt_time'][1])) {
|
|
@@ -380,6 +383,7 @@ class ProjectService extends Service
|
|
}
|
|
}
|
|
|
|
|
|
public function projectRule(&$data, $is_check = true){
|
|
public function projectRule(&$data, $is_check = true){
|
|
|
|
+ if(empty($data['order_number'])) return [false, '项目编号不能为空'];
|
|
if(empty($data['title'])) return [false,'项目名称不能为空'];
|
|
if(empty($data['title'])) return [false,'项目名称不能为空'];
|
|
if(isset($data['project_cycle'])){
|
|
if(isset($data['project_cycle'])){
|
|
if(! is_numeric($data['project_cycle']) || floatval($data['project_cycle']) < 0.0) return [false, '项目周期请输入合法的数字(天数)'];
|
|
if(! is_numeric($data['project_cycle']) || floatval($data['project_cycle']) < 0.0) return [false, '项目周期请输入合法的数字(天数)'];
|
|
@@ -408,12 +412,17 @@ class ProjectService extends Service
|
|
if(! empty($data['finish_time'])) $data['finish_time'] = $this->changeDateToDate($data['finish_time']);
|
|
if(! empty($data['finish_time'])) $data['finish_time'] = $this->changeDateToDate($data['finish_time']);
|
|
|
|
|
|
if($is_check){
|
|
if($is_check){
|
|
-
|
|
|
|
|
|
+ $bool = Project::where('order_number',$data['order_number'])->exists();
|
|
}else{
|
|
}else{
|
|
if(empty($data['id'])) return [false, '项目ID不能为空'];
|
|
if(empty($data['id'])) return [false, '项目ID不能为空'];
|
|
$boolean = Project::where('id',$data['id'])->where('del_time',0)->exists();
|
|
$boolean = Project::where('id',$data['id'])->where('del_time',0)->exists();
|
|
if(! $boolean) return [false, '项目不存在或已被删除'];
|
|
if(! $boolean) return [false, '项目不存在或已被删除'];
|
|
|
|
+
|
|
|
|
+ $bool = Project::where('order_number',$data['order_number'])
|
|
|
|
+ ->where('id','<>',$data['id'])
|
|
|
|
+ ->exists();
|
|
}
|
|
}
|
|
|
|
+ if($bool) return [false, '项目编号已存在'];
|
|
|
|
|
|
return [true, ''];
|
|
return [true, ''];
|
|
}
|
|
}
|