From 2c662bd80b57273fd06894cdccb83068914dbeaf Mon Sep 17 00:00:00 2001 From: weiz <736250432@qq.com> Date: Wed, 28 Feb 2024 16:01:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9D=90=E6=96=99=E8=BF=9B?= =?UTF-8?q?=E5=9C=BA=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SupervisionMaterialEntryController.php | 108 +++++++++++ ...pervisionMaterialEntryDetailController.php | 108 +++++++++++ .../SupervisionMaterialEntryDetailLists.php | 79 ++++++++ .../SupervisionMaterialEntryLists.php | 120 ++++++++++++ .../SupervisionMaterialEntryDetailLogic.php | 119 ++++++++++++ .../SupervisionMaterialEntryLogic.php | 172 ++++++++++++++++++ ...SupervisionMaterialEntryDetailValidate.php | 128 +++++++++++++ .../SupervisionMaterialEntryValidate.php | 169 +++++++++++++++++ .../SupervisionMaterialEntry.php | 49 +++++ .../SupervisionMaterialEntryDetail.php | 38 ++++ 10 files changed, 1090 insertions(+) create mode 100644 app/adminapi/controller/supervision_work/SupervisionMaterialEntryController.php create mode 100644 app/adminapi/controller/supervision_work/SupervisionMaterialEntryDetailController.php create mode 100644 app/adminapi/lists/supervision_work/SupervisionMaterialEntryDetailLists.php create mode 100644 app/adminapi/lists/supervision_work/SupervisionMaterialEntryLists.php create mode 100644 app/adminapi/logic/supervision_work/SupervisionMaterialEntryDetailLogic.php create mode 100644 app/adminapi/logic/supervision_work/SupervisionMaterialEntryLogic.php create mode 100644 app/adminapi/validate/supervision_work/SupervisionMaterialEntryDetailValidate.php create mode 100644 app/adminapi/validate/supervision_work/SupervisionMaterialEntryValidate.php create mode 100644 app/common/model/supervision_work/SupervisionMaterialEntry.php create mode 100644 app/common/model/supervision_work/SupervisionMaterialEntryDetail.php diff --git a/app/adminapi/controller/supervision_work/SupervisionMaterialEntryController.php b/app/adminapi/controller/supervision_work/SupervisionMaterialEntryController.php new file mode 100644 index 000000000..78dbd754f --- /dev/null +++ b/app/adminapi/controller/supervision_work/SupervisionMaterialEntryController.php @@ -0,0 +1,108 @@ +dataLists(new SupervisionMaterialEntryLists()); + } + + + /** + * @notes 添加材料进场 + * @return \think\response\Json + * @author likeadmin + * @date 2024/02/28 13:41 + */ + public function add() + { + $params = (new SupervisionMaterialEntryValidate())->post()->goCheck('add'); + $result = SupervisionMaterialEntryLogic::add($params,$this->adminId); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(SupervisionMaterialEntryLogic::getError()); + } + + + /** + * @notes 编辑材料进场 + * @return \think\response\Json + * @author likeadmin + * @date 2024/02/28 13:41 + */ + public function edit() + { + $params = (new SupervisionMaterialEntryValidate())->post()->goCheck('edit'); + $result = SupervisionMaterialEntryLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(SupervisionMaterialEntryLogic::getError()); + } + + + /** + * @notes 删除材料进场 + * @return \think\response\Json + * @author likeadmin + * @date 2024/02/28 13:41 + */ + public function delete() + { + $params = (new SupervisionMaterialEntryValidate())->post()->goCheck('delete'); + SupervisionMaterialEntryLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取材料进场详情 + * @return \think\response\Json + * @author likeadmin + * @date 2024/02/28 13:41 + */ + public function detail() + { + $params = (new SupervisionMaterialEntryValidate())->goCheck('detail'); + $result = SupervisionMaterialEntryLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/adminapi/controller/supervision_work/SupervisionMaterialEntryDetailController.php b/app/adminapi/controller/supervision_work/SupervisionMaterialEntryDetailController.php new file mode 100644 index 000000000..599cb1687 --- /dev/null +++ b/app/adminapi/controller/supervision_work/SupervisionMaterialEntryDetailController.php @@ -0,0 +1,108 @@ +dataLists(new SupervisionMaterialEntryDetailLists()); + } + + + /** + * @notes 添加工程监理--材料进场明细 + * @return \think\response\Json + * @author likeadmin + * @date 2024/02/28 13:41 + */ + public function add() + { + $params = (new SupervisionMaterialEntryDetailValidate())->post()->goCheck('add'); + $result = SupervisionMaterialEntryDetailLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(SupervisionMaterialEntryDetailLogic::getError()); + } + + + /** + * @notes 编辑工程监理--材料进场明细 + * @return \think\response\Json + * @author likeadmin + * @date 2024/02/28 13:41 + */ + public function edit() + { + $params = (new SupervisionMaterialEntryDetailValidate())->post()->goCheck('edit'); + $result = SupervisionMaterialEntryDetailLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(SupervisionMaterialEntryDetailLogic::getError()); + } + + + /** + * @notes 删除工程监理--材料进场明细 + * @return \think\response\Json + * @author likeadmin + * @date 2024/02/28 13:41 + */ + public function delete() + { + $params = (new SupervisionMaterialEntryDetailValidate())->post()->goCheck('delete'); + SupervisionMaterialEntryDetailLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取工程监理--材料进场明细详情 + * @return \think\response\Json + * @author likeadmin + * @date 2024/02/28 13:41 + */ + public function detail() + { + $params = (new SupervisionMaterialEntryDetailValidate())->goCheck('detail'); + $result = SupervisionMaterialEntryDetailLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/adminapi/lists/supervision_work/SupervisionMaterialEntryDetailLists.php b/app/adminapi/lists/supervision_work/SupervisionMaterialEntryDetailLists.php new file mode 100644 index 000000000..3c7e99536 --- /dev/null +++ b/app/adminapi/lists/supervision_work/SupervisionMaterialEntryDetailLists.php @@ -0,0 +1,79 @@ + ['material_entry_id'], + '%like%' => ['name', 'model'], + ]; + } + + + /** + * @notes 获取工程监理--材料进场明细列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/02/28 13:41 + */ + public function lists(): array + { + return SupervisionMaterialEntryDetail::withoutField('create_time,update_time,delete_time')->where($this->searchWhere) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function($data){ + $data['contract_brand_text'] = $data->contract_brand_text; + }) + ->toArray(); + } + + + /** + * @notes 获取工程监理--材料进场明细数量 + * @return int + * @author likeadmin + * @date 2024/02/28 13:41 + */ + public function count(): int + { + return SupervisionMaterialEntryDetail::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/adminapi/lists/supervision_work/SupervisionMaterialEntryLists.php b/app/adminapi/lists/supervision_work/SupervisionMaterialEntryLists.php new file mode 100644 index 000000000..89e12e2ed --- /dev/null +++ b/app/adminapi/lists/supervision_work/SupervisionMaterialEntryLists.php @@ -0,0 +1,120 @@ + ['name', 'model'], + ]; + } + + + /** + * @notes 获取材料进场列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/02/28 13:41 + */ + public function lists(): array + { + $params = $this->request->get(); + $where = []; + if(isset($params['project_id']) && $params['project_id'] != ''){ + $material_entry_ids = SupervisionMaterialEntry::where('project_id','=',$params['project_id'])->column('id'); + $where[] = ['material_entry_id','in',$material_entry_ids]; + } + if(isset($params['theme']) && $params['theme'] != ''){ + $material_entry_ids = SupervisionMaterialEntry::where('theme','like','%'.$params['theme'].'%')->column('id'); + $where[] = ['material_entry_id','in',$material_entry_ids]; + } + if(isset($params['code']) && $params['code'] != ''){ + $material_entry_ids = SupervisionMaterialEntry::where('code','like','%'.$params['code'].'%')->column('id'); + $where[] = ['material_entry_id','in',$material_entry_ids]; + } + return SupervisionMaterialEntryDetail::withoutField('create_time,update_time,delete_time')->where($this->searchWhere)->where($where) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function($data){ + $material_entry = SupervisionMaterialEntry::field('project_id,company_id,code,theme,enter_time,enter_result,parallel_test')->where('id',$data['material_entry_id'])->findOrEmpty(); + $project = SupervisionProject::field('project_name')->where('id',$material_entry['project_id'])->findOrEmpty(); + $company = SupervisionParticipatingUnits::field('unit_name')->where('id',$material_entry['company_id'])->findOrEmpty(); + $data['contract_brand_text'] = $data->contract_brand_text; + $data['code'] = $material_entry['code']; + $data['theme'] = $material_entry['theme']; + $data['enter_result'] = $material_entry->enter_result_text; + $data['parallel_test'] = $material_entry['parallel_test']; + $data['parallel_test_text'] = $material_entry->parallel_test_text; + $data['enter_time'] = $material_entry['enter_time']; + $data['project_name'] = $project['project_name']; + $data['company_name'] = $company['unit_name']; + }) + ->toArray(); + } + + + /** + * @notes 获取材料进场数量 + * @return int + * @author likeadmin + * @date 2024/02/28 13:41 + */ + public function count(): int + { + $params = $this->request->get(); + $where = []; + if(isset($params['project_id']) && $params['project_id'] != ''){ + $material_entry_ids = SupervisionMaterialEntry::where('project_id','=',$params['project_id'])->column('id'); + $where[] = ['material_entry_id','in',$material_entry_ids]; + } + if(isset($params['theme']) && $params['theme'] != ''){ + $material_entry_ids = SupervisionMaterialEntry::where('theme','like','%'.$params['theme'].'%')->column('id'); + $where[] = ['material_entry_id','in',$material_entry_ids]; + } + if(isset($params['code']) && $params['code'] != ''){ + $material_entry_ids = SupervisionMaterialEntry::where('code','like','%'.$params['code'].'%')->column('id'); + $where[] = ['material_entry_id','in',$material_entry_ids]; + } + return SupervisionMaterialEntryDetail::where($this->searchWhere)->where($where)->count(); + } + +} \ No newline at end of file diff --git a/app/adminapi/logic/supervision_work/SupervisionMaterialEntryDetailLogic.php b/app/adminapi/logic/supervision_work/SupervisionMaterialEntryDetailLogic.php new file mode 100644 index 000000000..1ddca40cb --- /dev/null +++ b/app/adminapi/logic/supervision_work/SupervisionMaterialEntryDetailLogic.php @@ -0,0 +1,119 @@ + $params['material_entry_id'], + 'name' => $params['name'], + 'brand' => $params['brand'], + 'model' => $params['model'], + 'unit' => $params['unit'], + 'contract_brand' => $params['contract_brand'], + 'entry_number' => $params['entry_number'] + ]); + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 编辑工程监理--材料进场明细 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/02/28 13:41 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + SupervisionMaterialEntryDetail::where('id', $params['id'])->update([ + 'material_entry_id' => $params['material_entry_id'], + 'name' => $params['name'], + 'brand' => $params['brand'], + 'model' => $params['model'], + 'unit' => $params['unit'], + 'contract_brand' => $params['contract_brand'], + 'entry_number' => $params['entry_number'], + 'update_time' => time(), + ]); + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 删除工程监理--材料进场明细 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/02/28 13:41 + */ + public static function delete(array $params): bool + { + return SupervisionMaterialEntryDetail::destroy($params['id']); + } + + + /** + * @notes 获取工程监理--材料进场明细详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/02/28 13:41 + */ + public static function detail($params): array + { + $data = SupervisionMaterialEntryDetail::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']); + $data['contract_brand_text'] = $data->contract_brand_text; + return $data->toArray(); + } +} \ No newline at end of file diff --git a/app/adminapi/logic/supervision_work/SupervisionMaterialEntryLogic.php b/app/adminapi/logic/supervision_work/SupervisionMaterialEntryLogic.php new file mode 100644 index 000000000..6d59c2286 --- /dev/null +++ b/app/adminapi/logic/supervision_work/SupervisionMaterialEntryLogic.php @@ -0,0 +1,172 @@ + $params['project_id'], + 'company_id' => $params['company_id'], + 'theme' => $params['theme'], + 'code' => data_unique_code('CLJC'), + 'enter_time' => !empty($params['enter_time']) ? strtotime($params['enter_time']) : 0, + 'co_participant' => $params['co_participant'], + 'enter_result' => $params['enter_result'], + 'parallel_test' => $params['parallel_test'], + 'remark' => $params['remark'], + 'create_user' => $admin_id, + ]); + if(!empty($params['entry_detail'])){ + foreach($params['entry_detail'] as $v) { + SupervisionMaterialEntryDetail::create([ + 'material_entry_id' => $res->id, + 'name' => $v['name'], + 'brand' => $v['brand'], + 'model' => $v['model'], + 'unit' => $v['unit'], + 'contract_brand' => $v['contract_brand'], + 'entry_number' => $v['entry_number'] + ]); + } + } + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 编辑材料进场 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/02/28 13:41 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + SupervisionMaterialEntry::where('id', $params['id'])->update([ + 'project_id' => $params['project_id'], + 'company_id' => $params['company_id'], + 'theme' => $params['theme'], + 'enter_time' => !empty($params['enter_time']) ? strtotime($params['enter_time']) : 0, + 'co_participant' => $params['co_participant'], + 'enter_result' => $params['enter_result'], + 'parallel_test' => $params['parallel_test'], + 'remark' => $params['remark'], + 'update_time' => time(), + ]); + if(!empty($params['entry_detail'])){ + foreach($params['entry_detail'] as $v) { + if(!empty($v['id'])){ + SupervisionMaterialEntryDetail::where('id',$v['id'])->update([ + 'material_entry_id' => $params['id'], + 'name' => $v['name'], + 'brand' => $v['brand'], + 'model' => $v['model'], + 'unit' => $v['unit'], + 'contract_brand' => $v['contract_brand'], + 'entry_number' => $v['entry_number'], + 'update_time' => time() + ]); + }else{ + SupervisionMaterialEntryDetail::create([ + 'material_entry_id' => $params['id'], + 'name' => $v['name'], + 'brand' => $v['brand'], + 'model' => $v['model'], + 'unit' => $v['unit'], + 'contract_brand' => $v['contract_brand'], + 'entry_number' => $v['entry_number'] + ]); + } + } + } + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 删除材料进场 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/02/28 13:41 + */ + public static function delete(array $params): bool + { + $entry_detail = SupervisionMaterialEntryDetail::where('material_entry_id',$params['id'])->findOrEmpty(); + if(!$entry_detail->isEmpty()){ + self::setError('当前数据下存在材料信息记录,请先删除材料信息记录'); + return false; + } + return SupervisionMaterialEntry::destroy($params['id']); + } + + + /** + * @notes 获取材料进场详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/02/28 13:41 + */ + public static function detail($params): array + { + $data = SupervisionMaterialEntry::withoutField('update_time,delete_time')->findOrEmpty($params['id']); + $create_user = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty(); + $data['create_user_name'] = $create_user['name']; + $data['enter_result_text'] = $data->enter_result_text; + $data['parallel_test_text'] = $data->parallel_test_text; + return $data->toArray(); + } +} \ No newline at end of file diff --git a/app/adminapi/validate/supervision_work/SupervisionMaterialEntryDetailValidate.php b/app/adminapi/validate/supervision_work/SupervisionMaterialEntryDetailValidate.php new file mode 100644 index 000000000..bd52c754b --- /dev/null +++ b/app/adminapi/validate/supervision_work/SupervisionMaterialEntryDetailValidate.php @@ -0,0 +1,128 @@ + 'require|checkData', + 'material_entry_id' => 'require|checkMaterialEntry', + 'name' => 'require', + 'brand' => 'require', + 'model' => 'require', + 'unit' => 'require', + 'contract_brand' => 'require|in:0,1', + 'entry_number' => 'require|float', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + 'material_entry_id' => '材料进场id', + 'name' => '材料名称', + 'brand' => '材料品牌', + 'model' => '材料型号', + 'unit' => '计数单位', + 'contract_brand' => '合同约定品牌', + 'entry_number' => '进场数量', + ]; + + + /** + * @notes 添加场景 + * @return SupervisionMaterialEntryDetailValidate + * @author likeadmin + * @date 2024/02/28 13:41 + */ + public function sceneAdd() + { + return $this->only(['material_entry_id','name','brand','model','unit','contract_brand','entry_number']); + } + + + /** + * @notes 编辑场景 + * @return SupervisionMaterialEntryDetailValidate + * @author likeadmin + * @date 2024/02/28 13:41 + */ + public function sceneEdit() + { + return $this->only(['id','material_entry_id','name','brand','model','unit','contract_brand','entry_number']); + } + + + /** + * @notes 删除场景 + * @return SupervisionMaterialEntryDetailValidate + * @author likeadmin + * @date 2024/02/28 13:41 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return SupervisionMaterialEntryDetailValidate + * @author likeadmin + * @date 2024/02/28 13:41 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + + public function checkData($value): bool|string + { + $data = SupervisionMaterialEntryDetail::where('id',$value)->findOrEmpty(); + if($data->isEmpty()){ + return '数据不存在'; + } + return true; + } + + public function checkMaterialEntry($value): bool|string + { + $data = SupervisionMaterialEntry::where('id',$value)->findOrEmpty(); + if($data->isEmpty()){ + return '材料进场信息不存在'; + } + return true; + } + +} \ No newline at end of file diff --git a/app/adminapi/validate/supervision_work/SupervisionMaterialEntryValidate.php b/app/adminapi/validate/supervision_work/SupervisionMaterialEntryValidate.php new file mode 100644 index 000000000..bdf0368f1 --- /dev/null +++ b/app/adminapi/validate/supervision_work/SupervisionMaterialEntryValidate.php @@ -0,0 +1,169 @@ + 'require|checkData', + 'project_id' => 'require|checkProject', + 'company_id' => 'checkCompany', + 'theme' => 'require', + 'enter_time' => 'require|dateFormat:Y-m-d H:i:s', + 'enter_result' => 'require|in:0,1,2', + 'parallel_test' => 'require|in:0,1', + 'entry_detail' => 'checkEntryDetail', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + 'project_id' => '项目id', + 'company_id' => '采购单位id', + 'theme' => '进场主题', + 'code' => '编号', + 'enter_time' => '进场时间', + 'co_participant' => '共同参与人', + 'enter_result' => '进场结果', + 'parallel_test' => '是否平行检验', + 'remark' => '备注', + 'create_user' => '创建人', + ]; + + + /** + * @notes 添加场景 + * @return SupervisionMaterialEntryValidate + * @author likeadmin + * @date 2024/02/28 13:41 + */ + public function sceneAdd() + { + return $this->remove('id',true); + } + + + /** + * @notes 编辑场景 + * @return SupervisionMaterialEntryValidate + * @author likeadmin + * @date 2024/02/28 13:41 + */ + public function sceneEdit() + {} + + + /** + * @notes 删除场景 + * @return SupervisionMaterialEntryValidate + * @author likeadmin + * @date 2024/02/28 13:41 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return SupervisionMaterialEntryValidate + * @author likeadmin + * @date 2024/02/28 13:41 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + + public function checkData($value): bool|string + { + $data = SupervisionMaterialEntry::where('id',$value)->findOrEmpty(); + if($data->isEmpty()){ + return '数据不存在'; + } + return true; + } + + public function checkProject($value): bool|string + { + $data = SupervisionProject::where('id',$value)->findOrEmpty(); + if($data->isEmpty()){ + return '项目信息不存在'; + } + return true; + } + + public function checkCompany($value,$rule,$params): bool|string + { + $data = SupervisionParticipatingUnits::where('id',$value)->where('project_id',$params['project_id'])->findOrEmpty(); + if($data->isEmpty()){ + return '采购单位信息不存在'; + } + return true; + } + + public function checkEntryDetail($value): bool|string + { + if(!isset($value) || $value == '') return true; + if(!is_array($value)) return '材料信息数据格式错误'; + foreach($value as $k=>$v){ + if(!empty($v['id'])){ + $data = SupervisionMaterialEntryDetail::where('id',$v['id'])->findOrEmpty(); + if($data->isEmpty()){ + return '材料信息列表第'.($k+1).'行数据不存在'; + } + } + if(empty($v['name'])) return '材料信息列表第'.($k+1).'行材料名称为空'; + if(empty($v['brand'])) return '材料信息列表第'.($k+1).'行材料品牌为空'; + if(empty($v['model'])) return '材料信息列表第'.($k+1).'行材料型号为空'; + if(empty($v['unit'])) return '材料信息列表第'.($k+1).'行计数单位为空'; + if(!isset($v['contract_brand']) || $v['contract_brand'] == ''){ + return '材料信息列表第'.($k+1).'行是否合同约定品牌为空'; + }else{ + if(!in_array($v['contract_brand'],[0,1])) return '材料信息列表第'.($k+1).'行是否合同约定品牌选项数据值无效'; + } + if(empty($v['entry_number'])){ + return '材料信息列表第'.($k+1).'行进场数量为空'; + }else{ + if(!is_numeric($v['entry_number'])) return '材料信息列表第'.($k+1).'行进场数量必须是数字'; + } + } + return true; + } + +} \ No newline at end of file diff --git a/app/common/model/supervision_work/SupervisionMaterialEntry.php b/app/common/model/supervision_work/SupervisionMaterialEntry.php new file mode 100644 index 000000000..03927f01d --- /dev/null +++ b/app/common/model/supervision_work/SupervisionMaterialEntry.php @@ -0,0 +1,49 @@ +'进场', 1=>'进场后复检', 2=>'退检']; + return $arr[$data['enter_result']]; + } + + public function getParallelTestTextAttr($value,$data): string + { + $arr = [0=>'否', 1=>'是']; + return $arr[$data['parallel_test']]; + } +} \ No newline at end of file diff --git a/app/common/model/supervision_work/SupervisionMaterialEntryDetail.php b/app/common/model/supervision_work/SupervisionMaterialEntryDetail.php new file mode 100644 index 000000000..4b444b049 --- /dev/null +++ b/app/common/model/supervision_work/SupervisionMaterialEntryDetail.php @@ -0,0 +1,38 @@ +'否', 1=>'是']; + return $arr[$data['contract_brand']]; + } + +} \ No newline at end of file