mkm/engineering
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
weiz 2024-03-21 17:39:01 +08:00
parent cf798307a0
commit 913d9be8b1
2 changed files with 273 additions and 272 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/adminapi/controller/contract/SubcontractingContractNegotiationController.php
View File

@ -13,24 +13,24 @@
// +----------------------------------------------------------------------
namespace app\adminapi\controller\contract;
namespace app\adminapi\controller\contract;
use app\adminapi\controller\BaseAdminController;
use app\adminapi\lists\contract\SubcontractingContractNegotiationLists;
use app\adminapi\logic\contract\SubcontractingContractNegotiationLogic;
use app\adminapi\validate\contract\SubcontractingContractNegotiationValidate;
use app\common\model\oa\Flow;
use app\common\model\oa\FlowType;
use app\adminapi\controller\BaseAdminController;
use app\adminapi\lists\contract\SubcontractingContractNegotiationLists;
use app\adminapi\logic\contract\SubcontractingContractNegotiationLogic;
use app\adminapi\validate\contract\SubcontractingContractNegotiationValidate;
use app\common\model\oa\Flow;
use app\common\model\oa\FlowType;
/**
/**
* SubcontractingContractNegotiation控制器
* Class SubcontractingContractNegotiationController
* @package app\adminapi\controller\contract
*/
class SubcontractingContractNegotiationController extends BaseAdminController
{
class SubcontractingContractNegotiationController extends BaseAdminController
{
/**
@ -54,7 +54,7 @@ class SubcontractingContractNegotiationController extends BaseAdminController
public function add()
{
$params = (new SubcontractingContractNegotiationValidate())->post()->goCheck('add');
$result = SubcontractingContractNegotiationLogic::add($params,$this->adminId);
$result = SubcontractingContractNegotiationLogic::add($params);
if (true === $result) {
return $this->success('添加成功', [], 1, 1);
}
@ -108,16 +108,16 @@ class SubcontractingContractNegotiationController extends BaseAdminController
public function flows(): \think\response\Json
{
$flow_type = FlowType::where('type',2)->where('name','fbhtqs')->findOrEmpty();
$data = Flow::field('id,name')->where('flow_cate',$flow_type['id'])->where('status',2)->select();
return $this->success('请求成功',$data->toArray());
$flow_type = FlowType::where('type', 2)->where('name', 'fbhtqs')->findOrEmpty();
$data = Flow::field('id,name')->where('flow_cate', $flow_type['id'])->where('status', 2)->select();
return $this->success('请求成功', $data->toArray());
}
//添加审批
public function approve(): \think\response\Json
{
$params = (new SubcontractingContractNegotiationValidate())->post()->goCheck('approve');
$result = SubcontractingContractNegotiationLogic::approve($params,$this->adminId);
$result = SubcontractingContractNegotiationLogic::approve($params, $this->adminId);
if (true === $result) {
return $this->success('提交审核信息成功', [], 1, 1);
}
@ -125,4 +125,4 @@ class SubcontractingContractNegotiationController extends BaseAdminController
}
}
}

51
app/adminapi/logic/contract/SubcontractingContractNegotiationLogic.php
View File

@ -12,25 +12,25 @@
// | author: likeadminTeam
// +----------------------------------------------------------------------
namespace app\adminapi\logic\contract;
namespace app\adminapi\logic\contract;
use app\common\model\contract\SubcontractingContract;
use app\common\model\contract\SubcontractingContractNegotiation;
use app\common\logic\BaseLogic;
use app\common\model\oa\FlowApprove;
use app\common\model\project\Project;
use app\common\model\supplier\Supplier;
use think\facade\Db;
use app\common\logic\BaseLogic;
use app\common\model\contract\SubcontractingContract;
use app\common\model\contract\SubcontractingContractNegotiation;
use app\common\model\oa\FlowApprove;
use app\common\model\project\Project;
use app\common\model\supplier\Supplier;
use think\facade\Db;
/**
/**
* SubcontractingContractNegotiation逻辑
* Class SubcontractingContractNegotiationLogic
* @package app\adminapi\logic\contract
*/
class SubcontractingContractNegotiationLogic extends BaseLogic
{
class SubcontractingContractNegotiationLogic extends BaseLogic
{
/**
* @notes 添加
@ -39,9 +39,9 @@ class SubcontractingContractNegotiationLogic extends BaseLogic
* @author likeadmin
* @date 2023/12/12 17:21
*/
public static function add(array $params,$admin_id): bool
public static function add(array $params): bool
{
$subcontracting_contract = SubcontractingContract::field('project_id')->where('id',$params['subcontracting_contract_id'])->findOrEmpty();
$subcontracting_contract = SubcontractingContract::field('project_id')->where('id', $params['subcontracting_contract_id'])->findOrEmpty();
Db::startTrans();
try {
SubcontractingContractNegotiation::create([
@ -78,7 +78,7 @@ class SubcontractingContractNegotiationLogic extends BaseLogic
*/
public static function edit(array $params): bool
{
$subcontracting_contract = SubcontractingContract::field('project_id')->where('id',$params['subcontracting_contract_id'])->findOrEmpty();
$subcontracting_contract = SubcontractingContract::field('project_id')->where('id', $params['subcontracting_contract_id'])->findOrEmpty();
Db::startTrans();
try {
SubcontractingContractNegotiation::where('id', $params['id'])->update([
@ -130,9 +130,9 @@ class SubcontractingContractNegotiationLogic extends BaseLogic
{
$data = SubcontractingContractNegotiation::field('id,project_id,subcontracting_contract_id,negotiation_name,negotiation_no,negotiation_amount,negotiation_type,sign_date,warranty_amount,warranty_expire_date,negotiation_content,negotiation_detail,negotiation_quotation,negotiation_basis,approve_id')
->findOrEmpty($params['id']);
$subcontracting_contract = SubcontractingContract::field('supplier_id,contract_no,contract_name')->where('id',$data['subcontracting_contract_id'])->findOrEmpty();
$project = Project::field('name,project_code')->where('id',$data['project_id'])->findOrEmpty();
$supplier = Supplier::field('supplier_name,supplier_code')->where('id',$subcontracting_contract['supplier_id'])->findOrEmpty();
$subcontracting_contract = SubcontractingContract::field('supplier_id,contract_no,contract_name')->where('id', $data['subcontracting_contract_id'])->findOrEmpty();
$project = Project::field('name,project_code')->where('id', $data['project_id'])->findOrEmpty();
$supplier = Supplier::field('supplier_name,supplier_code')->where('id', $subcontracting_contract['supplier_id'])->findOrEmpty();
$data['contract_name'] = $subcontracting_contract['contract_name'];
$data['contract_no'] = $subcontracting_contract['contract_no'];
$data['supplier_name'] = $supplier['supplier_name'];
@ -140,15 +140,16 @@ class SubcontractingContractNegotiationLogic extends BaseLogic
$data['project_code'] = $project['project_code'];
$data['project_name'] = $project['name'];
$data['negotiation_type_text'] = $data->negotiation_type_text;
$approve_data = FlowApprove::where('id',$data['approve_id'])->findOrEmpty();
$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
$data['approve_check_status'] = $approve_data['check_status'];
return $data->toArray();
}
public static function approve($params,$admin_id): bool{
$data = SubcontractingContractNegotiation::where('id',$params['id'])->findOrEmpty();
$approve_data = FlowApprove::where('id',$data['approve_id'])->findOrEmpty();
if(!empty($data['approve_id']) && $approve_data['check_status'] != 3){
public static function approve($params, $admin_id): bool
{
$data = SubcontractingContractNegotiation::where('id', $params['id'])->findOrEmpty();
$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) {
self::setError('当前内容存在审核信息，请勿重复提交');
return false;
}
@ -162,8 +163,8 @@ class SubcontractingContractNegotiationLogic extends BaseLogic
$params['flow_id'],
$admin_id
);
if($res){
SubcontractingContractNegotiation::where('id',$params['id'])->update([
if ($res) {
SubcontractingContractNegotiation::where('id', $params['id'])->update([
'approve_id' => $res,
]);
}
@ -175,4 +176,4 @@ class SubcontractingContractNegotiationLogic extends BaseLogic
return false;
}
}
}
}