diff --git a/app/adminapi/lists/contract/ContractNegotiationLists.php b/app/adminapi/lists/contract/ContractNegotiationLists.php index 8e13dd27c..7f86888a6 100644 --- a/app/adminapi/lists/contract/ContractNegotiationLists.php +++ b/app/adminapi/lists/contract/ContractNegotiationLists.php @@ -16,8 +16,12 @@ namespace app\adminapi\lists\contract; use app\adminapi\lists\BaseAdminDataLists; +use app\common\model\auth\Admin; +use app\common\model\contract\Contract; use app\common\model\contract\ContractNegotiation; use app\common\lists\ListsSearchInterface; +use app\common\model\custom\Custom; +use app\common\model\project\Project; use think\facade\Db; /** @@ -38,7 +42,8 @@ class ContractNegotiationLists extends BaseAdminDataLists implements ListsSearch public function setSearch(): array { return [ - '=' => ['cn.contract_id', 'cn.negotiation_name', 'cn.negotiation_no'], + '=' => ['contract_id', 'project_id', 'negotiation_type'], + '%like%' => ['negotiation_name','negotiation_no'] ]; } @@ -54,31 +59,35 @@ class ContractNegotiationLists extends BaseAdminDataLists implements ListsSearch */ public function lists(): array { - return Db::name('ContractNegotiation')->alias('cn') - ->where($this->searchWhere) - ->whereNull('cn.delete_time') - ->leftJoin('orgs o','o.id = cn.org_id') - ->leftJoin('dept d','d.id = cn.dept_id') - ->leftJoin('contract c','c.id = cn.contract_id') - ->leftJoin('bid_buy_bidding_document bbbd','bbbd.id = c.buy_bidding_document_id') - ->leftJoin('project p','p.id = bbbd.project_id') - ->leftJoin('custom ct','ct.id = p.custom_id') - ->field('cn.*, bbbd.project_id, c.contract_code, c.contract_type, c.contract_pricing_method, c.contract_name, c.business_director, p.name as project_name, p.project_code, p.custom_id, ct.name as custom_name') + $params = $this->request->get(['custom_id','project_name']); + $where = []; + if(isset($params['custom_id']) && $params['custom_id'] != ''){ + $project_ids = Project::where('custom_id',$params['custom_id'])->column('id'); + $where[] = ['project_id','in',$project_ids]; + } + if(isset($params['project_name']) && $params['project_name'] != ''){ + $project_ids = Project::where('name','like','%'.$params['project_name'].'%')->column('id'); + $where[] = ['project_id','in',$project_ids]; + } + return ContractNegotiation::field('id,project_id,contract_id,negotiation_name,negotiation_no,negotiation_amount,negotiation_type,profit,profit_rate') + ->where($this->searchWhere)->where($where) ->limit($this->limitOffset, $this->limitLength) - ->order(['cn.id' => 'desc']) - ->select()->each(function($item, $key){ - //关联数据后续添加 - $item['supplier_name'] = '供应商名称'; - $item['approve_no'] = '付款单号'; - $item['approve_step'] = '流程步骤'; - $item['approve_settle_status'] = 1; - if (!empty($item['pay_plan'])) { - $planArray = json_decode($item['pay_plan'], true); - if (is_array($planArray)) { - $item['pay_plan'] = $planArray; - } - } - return $item; + ->order(['id' => 'desc']) + ->select()->each(function($data){ + $contract = Contract::field('contract_name,contract_code,contract_date,business_director')->where('id',$data['contract_id'])->findOrEmpty(); + $project = Project::field('custom_id,name,project_code')->where('id',$data['project_id'])->findOrEmpty(); + $custom = Custom::field('name')->where('id',$project['custom_id'])->findOrEmpty(); + $business_director = Admin::field('name')->where('id',$contract['business_director'])->findOrEmpty(); + $data['contract_name'] = $contract['contract_name']; + $data['contract_code'] = $contract['contract_code']; + $data['contract_date'] = $contract['contract_date']; + $data['business_director'] = $business_director['name']; + $data['project_name'] = $project['name']; + $data['project_code'] = $project['project_code']; + $data['custom_name'] = $custom['name']; + $data['negotiation_type'] = $data->negotiation_type_text; + $data['profit_rate'] = ($data['profit_rate'] * 100).'%'; + return $data; }) ->toArray(); } @@ -92,15 +101,17 @@ class ContractNegotiationLists extends BaseAdminDataLists implements ListsSearch */ public function count(): int { - return Db::name('ContractNegotiation')->alias('cn') - ->where($this->searchWhere) - ->whereNull('cn.delete_time') - ->leftJoin('orgs o','o.id = cn.org_id') - ->leftJoin('dept d','d.id = cn.dept_id') - ->leftJoin('contract c','c.id = cn.contract_id') - ->leftJoin('bid_buy_bidding_document bbbd','bbbd.id = c.buy_bidding_document_id') - ->leftJoin('project p','p.id = bbbd.project_id') - ->leftJoin('custom ct','ct.id = p.custom_id')->count(); + $params = $this->request->get(['custom_id','project_name']); + $where = []; + if(isset($params['custom_id']) && $params['custom_id'] != ''){ + $project_ids = Project::where('custom_id',$params['custom_id'])->column('id'); + $where[] = ['project_id','in',$project_ids]; + } + if(isset($params['project_name']) && $params['project_name'] != ''){ + $project_ids = Project::where('name','like','%'.$params['project_name'].'%')->column('id'); + $where[] = ['project_id','in',$project_ids]; + } + return ContractNegotiation::field('id')->where($this->searchWhere)->where($where)->count(); } } \ No newline at end of file diff --git a/app/adminapi/logic/contract/ContractNegotiationLogic.php b/app/adminapi/logic/contract/ContractNegotiationLogic.php index d2d99cf45..f2019ceee 100644 --- a/app/adminapi/logic/contract/ContractNegotiationLogic.php +++ b/app/adminapi/logic/contract/ContractNegotiationLogic.php @@ -15,8 +15,14 @@ namespace app\adminapi\logic\contract; +use app\common\model\auth\Admin; +use app\common\model\contract\Contract; use app\common\model\contract\ContractNegotiation; use app\common\logic\BaseLogic; +use app\common\model\custom\Custom; +use app\common\model\dept\Dept; +use app\common\model\dept\Orgs; +use app\common\model\project\Project; use think\facade\Db; @@ -38,29 +44,31 @@ class ContractNegotiationLogic extends BaseLogic */ public static function add(array $params): bool { + $contract = Contract::field('project_id')->where('id',$params['contract_id'])->findOrEmpty(); + $profit = $params['negotiation_amount'] - ($params['labor_costs'] + $params['material_costs']); + $profit_rate = $profit / $params['negotiation_amount']; Db::startTrans(); try { ContractNegotiation::create([ - 'org_id' => $params['org_id'] ?? 0, - 'dept_id' => $params['dept_id'] ?? 0, - 'contract_id' => $params['contract_id'] ?? 0, - 'approve_id' => $params['approve_id'] ?? 0, - 'negotiation_name' => $params['negotiation_name'] ?? '', - 'negotiation_no' => $params['negotiation_no'] ?? '', - 'negotiation_amount' => $params['negotiation_amount'] ?? 0, - 'negotiation_type' => $params['negotiation_type'] ?? 0, + 'org_id' => $params['org_id'], + 'dept_id' => $params['dept_id'], + 'project_id' => $contract['project_id'], + 'contract_id' => $params['contract_id'], + 'negotiation_name' => $params['negotiation_name'], + 'negotiation_no' => data_unique_code('QS'), + 'negotiation_amount' => $params['negotiation_amount'], + 'negotiation_type' => $params['negotiation_type'], 'labor_costs' => $params['labor_costs'] ?? 0, 'material_costs' => $params['material_costs'] ?? 0, 'warranty_amount' => $params['warranty_amount'] ?? 0, - 'Warranty_expire_date' => strtotime($params['Warranty_expire_date']), - 'profit' => $params['profit'] ?? 0, - 'profit_rate' => $params['profit_rate'] ?? '', - 'negotiation_content' => $params['negotiation_content'] ?? 0, - 'negotiation_detail' => $params['negotiation_detail'] ?? 0, - 'negotiation_quotation' => $params['negotiation_quotation'] ?? 0, - 'negotiation_basis' => $params['negotiation_basis'] ?? 0, + 'warranty_expire_date' => !empty($params['Warranty_expire_date']) ? strtotime($params['Warranty_expire_date']) : 0, + 'profit' => $profit, + 'profit_rate' => $profit_rate, + 'negotiation_content' => $params['negotiation_content'] ?? '', + 'negotiation_detail' => $params['negotiation_detail'] ?? '', + 'negotiation_quotation' => $params['negotiation_quotation'] ?? null, + 'negotiation_basis' => $params['negotiation_basis'] ?? null, ]); - Db::commit(); return true; } catch (\Exception $e) { @@ -80,29 +88,31 @@ class ContractNegotiationLogic extends BaseLogic */ public static function edit(array $params): bool { + $contract = Contract::field('project_id')->where('id',$params['contract_id'])->findOrEmpty(); + $profit = $params['negotiation_amount'] - ($params['labor_costs'] + $params['material_costs']); + $profit_rate = $profit / $params['negotiation_amount']; Db::startTrans(); try { ContractNegotiation::where('id', $params['id'])->update([ - 'org_id' => $params['org_id'] ?? 0, - 'dept_id' => $params['dept_id'] ?? 0, - 'contract_id' => $params['contract_id'] ?? 0, - 'approve_id' => $params['approve_id'] ?? 0, - 'negotiation_name' => $params['negotiation_name'] ?? '', - 'negotiation_no' => $params['negotiation_no'] ?? '', - 'negotiation_amount' => $params['negotiation_amount'] ?? 0, - 'negotiation_type' => $params['negotiation_type'] ?? 0, - 'labor_costs' => $params['labor_costs'] ?? 0, - 'material_costs' => $params['material_costs'] ?? 0, - 'warranty_amount' => $params['warranty_amount'] ?? 0, - 'Warranty_expire_date' => strtotime($params['Warranty_expire_date']), - 'profit' => $params['profit'] ?? 0, - 'profit_rate' => $params['profit_rate'] ?? '', - 'negotiation_content' => $params['negotiation_content'] ?? 0, - 'negotiation_detail' => $params['negotiation_detail'] ?? 0, - 'negotiation_quotation' => $params['negotiation_quotation'] ?? 0, - 'negotiation_basis' => $params['negotiation_basis'] ?? 0 + 'org_id' => $params['org_id'], + 'dept_id' => $params['dept_id'], + 'project_id' => $contract['project_id'], + 'contract_id' => $params['contract_id'], + 'negotiation_name' => $params['negotiation_name'], + 'negotiation_no' => data_unique_code('QS'), + 'negotiation_amount' => $params['negotiation_amount'], + 'negotiation_type' => $params['negotiation_type'], + 'labor_costs' => $params['labor_costs'] ?? 0, + 'material_costs' => $params['material_costs'] ?? 0, + 'warranty_amount' => $params['warranty_amount'] ?? 0, + 'warranty_expire_date' => !empty($params['Warranty_expire_date']) ? strtotime($params['Warranty_expire_date']) : 0, + 'profit' => $profit, + 'profit_rate' => $profit_rate, + 'negotiation_content' => $params['negotiation_content'] ?? '', + 'negotiation_detail' => $params['negotiation_detail'] ?? '', + 'negotiation_quotation' => $params['negotiation_quotation'] ?? null, + 'negotiation_basis' => $params['negotiation_basis'] ?? null, ]); - Db::commit(); return true; } catch (\Exception $e) { @@ -135,15 +145,25 @@ class ContractNegotiationLogic extends BaseLogic */ public static function detail($params): array { - $contractNegotiation = ContractNegotiation::findOrEmpty($params['id']); - $contractNegotiation->contract; - $contractNegotiation->project= null; - if (!empty($contractNegotiation->contract->document) && !empty($contractNegotiation->contract->document->project)) { - $contractNegotiation->project = $contractNegotiation->contract->document->project; - unset($contractNegotiation->contract->document); - } - $contractNegotiation->org; - $contractNegotiation->dept; - return $contractNegotiation->toArray(); + $data = ContractNegotiation::findOrEmpty($params['id']); + $org = Orgs::field('name')->where('id',$data['org_id'])->findOrEmpty(); + $dept = Dept::field('name')->where('id',$data['dept_id'])->findOrEmpty(); + $contract = Contract::field('contract_name,contract_code,contract_type,contract_pricing_method,contract_date,business_director')->where('id',$data['contract_id'])->findOrEmpty(); + $project = Project::field('custom_id,name,project_code')->where('id',$data['project_id'])->findOrEmpty(); + $custom = Custom::field('name')->where('id',$project['custom_id'])->findOrEmpty(); + $business_director = Admin::field('name')->where('id',$contract['business_director'])->findOrEmpty(); + $data['org_name'] = $org['name']; + $data['dept_name'] = $dept['name']; + $data['contract_name'] = $contract['contract_name']; + $data['contract_code'] = $contract['contract_code']; + $data['contract_type'] = $contract->contract_type_text; + $data['contract_pricing_method'] = $contract->contract_pricing_method_text; + $data['contract_date'] = $contract['contract_date']; + $data['business_director'] = $business_director['name']; + $data['project_name'] = $project['name']; + $data['project_code'] = $project['project_code']; + $data['custom_name'] = $custom['name']; + $data['negotiation_type_text'] = $data->negotiation_type_text; + return $data->toArray(); } } \ No newline at end of file diff --git a/app/adminapi/validate/contract/ContractNegotiationValidate.php b/app/adminapi/validate/contract/ContractNegotiationValidate.php index 9559d4524..e8acfbf03 100644 --- a/app/adminapi/validate/contract/ContractNegotiationValidate.php +++ b/app/adminapi/validate/contract/ContractNegotiationValidate.php @@ -15,6 +15,10 @@ namespace app\adminapi\validate\contract; +use app\common\model\contract\Contract; +use app\common\model\dept\Dept; +use app\common\model\dept\Orgs; +use app\common\model\dict\DictData; use app\common\validate\BaseValidate; @@ -32,6 +36,8 @@ class ContractNegotiationValidate extends BaseValidate */ protected $rule = [ 'id' => 'require', + 'org_id' => 'require|checkOrg', + 'dept_id' => 'require|checkDept', 'contract_id' => 'require|checkContract', 'negotiation_name' => 'require', 'negotiation_amount' => 'require|float|gt:0', @@ -40,22 +46,27 @@ class ContractNegotiationValidate extends BaseValidate 'material_costs' => 'float|egt:0', 'warranty_amount' => 'float|egt:0', 'warranty_expire_date' => 'dateFormat:Y-m-d', - 'profit' => 'float|egt:0', 'negotiation_quotation' => 'checkAnnex', 'negotiation_basis' => 'checkAnnex' ]; protected $message = [ - 'id' => 'require', - 'contract_id' => 'require|checkContract', - 'negotiation_name' => 'require', - 'negotiation_amount' => 'require|float|gt:0', - 'negotiation_type' => 'require|checkNegotiationType', - 'labor_costs' => 'float|egt:0', - 'material_costs' => 'float|egt:0', - 'warranty_amount' => 'float|egt:0', - 'warranty_expire_date' => 'dateFormat:Y-m-d', - 'profit' => 'float|egt:0', + 'id.require' => '缺少必要参数', + 'org_id.require' => '请选择组织', + 'dept_id.require' => '请选择部门', + 'contract_id.require' => '请选择项目合同', + 'negotiation_name.require' => '请填写洽商单名称', + 'negotiation_amount.require' => '请填写洽商金额', + 'negotiation_amount.float' => '洽商金额值必须是数字', + 'negotiation_amount.gt' => '洽商金额值必须大于0', + 'negotiation_type.require' => '请选择洽商类别', + 'labor_costs.float' => '成本金额（人工）值必须是数字', + 'labor_costs.egt' => '成本金额（人工）值必须大于等于0', + 'material_costs.float' => '成本金额（材料）值必须是数字', + 'material_costs.egt' => '成本金额（材料）值必须大于等于0', + 'warranty_amount.float' => '洽商质保金额值必须是数字', + 'warranty_amount.egt' => '洽商质保金额值必须大于等于0', + 'warranty_expire_date.dateFormat' => '洽商质保到期时间数据格式错误', ]; @@ -78,9 +89,7 @@ class ContractNegotiationValidate extends BaseValidate * @date 2023/12/04 21:26 */ public function sceneEdit() - { - return $this->only(['id', 'contract_id', 'approve_id', 'negotiation_name', 'negotiation_no']); - } + {} /** @@ -105,5 +114,55 @@ class ContractNegotiationValidate extends BaseValidate { return $this->only(['id']); } + + public function checkOrg($value): bool|string + { + $org = Orgs::where('id',$value)->findOrEmpty(); + if($org->isEmpty()) { + return '组织不存在'; + } + return true; + } + + public function checkDept($value,$rule,$data): bool|string + { + $dept = Dept::where('id',$value)->findOrEmpty(); + if($dept->isEmpty()){ + return '部门不存在'; + } + if($dept['org_id'] != $data['org_id']){ + return '当前部门不属于所选择的组织'; + } + return true; + } + + public function checkContract($value): bool|string + { + $contract = Contract::where('id',$value)->findOrEmpty(); + if($contract->isEmpty()){ + return '项目合同信息不存在'; + } + return true; + } + + public function checkNegotiationType($value): bool|string + { + $dict = DictData::where('type_value','negotiation_type')->column('value'); + if(!in_array($value,$dict)){ + return '洽商类别无效'; + } + return true; + } + + public function checkAnnex($value): bool|string + { + if(!empty($value) && $value != ''){ + $annex = json_decode($value,true); + if(empty($annex) || !is_array($annex)){ + return '附件数据格式错误'; + } + } + return true; + } } \ No newline at end of file diff --git a/app/common/model/contract/ContractNegotiation.php b/app/common/model/contract/ContractNegotiation.php index eee778929..32f7ccf1c 100644 --- a/app/common/model/contract/ContractNegotiation.php +++ b/app/common/model/contract/ContractNegotiation.php @@ -16,6 +16,7 @@ namespace app\common\model\contract; use app\common\model\BaseModel; +use app\common\model\dict\DictData; use think\model\concern\SoftDelete; @@ -29,25 +30,24 @@ class ContractNegotiation extends BaseModel use SoftDelete; protected $name = 'contract_negotiation'; protected $deleteTime = 'delete_time'; + - public function contract() - { - return $this->belongsTo(\app\common\model\contract\Contract::class, 'contract_id'); - } - - public function org() - { - return $this->hasOne(\app\common\model\dept\Orgs::class, 'id', 'org_id'); - } - - public function dept() - { - return $this->hasOne(\app\common\model\dept\Dept::class, 'id', 'dept_id'); - } - - public function getWarrantyExpireDateAttr($value) + public function getWarrantyExpireDateAttr($value): string { return empty($value) ? '' : date('Y-m-d H:i:s', $value); } + + public function getNegotiationQuotationAttr($value){ + return !empty($value) ? json_decode($value) : ''; + } + + public function getNegotiationBasisAttr($value){ + return !empty($value) ? json_decode($value) : ''; + } + + public function getNegotiationTypeTextAttr($value,$data){ + $dict = DictData::where('type_value','negotiation_type')->column('name','value'); + return $dict[$data['negotiation_type']]; + } } \ No newline at end of file