update
This commit is contained in:
weiz
parent
3abe30b2fc
commit
bc70ca1ed0
@ -13,85 +13,102 @@
|
|||||||
// +----------------------------------------------------------------------
|
// +----------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
namespace app\adminapi\controller\project;
|
namespace app\adminapi\controller\project;
|
||||||
|
|
||||||
|
|
||||||
use app\adminapi\controller\BaseAdminController;
|
use app\adminapi\controller\BaseAdminController;
|
||||||
use app\adminapi\lists\project\ProjectSettlementLists;
|
use app\adminapi\lists\project\ProjectSettlementLists;
|
||||||
use app\adminapi\logic\project\ProjectSettlementLogic;
|
use app\adminapi\logic\project\ProjectSettlementLogic;
|
||||||
use app\adminapi\validate\project\ProjectSettlementValidate;
|
use app\adminapi\validate\project\ProjectSettlementValidate;
|
||||||
use app\common\model\oa\Flow;
|
use app\common\model\oa\Flow;
|
||||||
use app\common\model\oa\FlowType;
|
use app\common\model\oa\FlowType;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 甲方结算控制器
|
* 甲方结算控制器
|
||||||
* Class ProjectSettlementController
|
* Class ProjectSettlementController
|
||||||
* @package app\adminapi\controller\project
|
* @package app\adminapi\controller\project
|
||||||
*/
|
*/
|
||||||
class ProjectSettlementController extends BaseAdminController
|
class ProjectSettlementController extends BaseAdminController
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @notes 获取甲方结算列表
|
|
||||||
* @return \think\response\Json
|
|
||||||
* @author likeadmin
|
|
||||||
* @date 2023/12/29 10:22
|
|
||||||
*/
|
|
||||||
public function lists()
|
|
||||||
{
|
|
||||||
return $this->dataLists(new ProjectSettlementLists());
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @notes 添加甲方结算
|
|
||||||
* @return \think\response\Json
|
|
||||||
* @author likeadmin
|
|
||||||
* @date 2023/12/29 10:22
|
|
||||||
*/
|
|
||||||
public function add()
|
|
||||||
{
|
|
||||||
$params = (new ProjectSettlementValidate())->post()->goCheck('add');
|
|
||||||
$result = ProjectSettlementLogic::add($params,$this->adminId);
|
|
||||||
if (true === $result) {
|
|
||||||
return $this->success('添加成功', [], 1, 1);
|
|
||||||
}
|
|
||||||
return $this->fail(ProjectSettlementLogic::getError());
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @notes 获取甲方结算详情
|
|
||||||
* @return \think\response\Json
|
|
||||||
* @author likeadmin
|
|
||||||
* @date 2023/12/29 10:22
|
|
||||||
*/
|
|
||||||
public function detail()
|
|
||||||
{
|
|
||||||
$params = (new ProjectSettlementValidate())->goCheck('detail');
|
|
||||||
$result = ProjectSettlementLogic::detail($params);
|
|
||||||
return $this->data($result);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function flows(): \think\response\Json
|
|
||||||
{
|
{
|
||||||
$flow_type = FlowType::where('type',4)->where('name','jfjs')->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
|
/**
|
||||||
{
|
* @notes 获取甲方结算列表
|
||||||
$params = (new ProjectSettlementValidate())->post()->goCheck('approve');
|
* @return \think\response\Json
|
||||||
$result = ProjectSettlementLogic::approve($params,$this->adminId);
|
* @author likeadmin
|
||||||
if (true === $result) {
|
* @date 2023/12/29 10:22
|
||||||
return $this->success('提交审核信息成功', [], 1, 1);
|
*/
|
||||||
|
public function lists()
|
||||||
|
{
|
||||||
|
return $this->dataLists(new ProjectSettlementLists());
|
||||||
}
|
}
|
||||||
return $this->fail(ProjectSettlementLogic::getError());
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @notes 添加甲方结算
|
||||||
|
* @return \think\response\Json
|
||||||
|
* @author likeadmin
|
||||||
|
* @date 2023/12/29 10:22
|
||||||
|
*/
|
||||||
|
public function add()
|
||||||
|
{
|
||||||
|
$params = (new ProjectSettlementValidate())->post()->goCheck('add');
|
||||||
|
$result = ProjectSettlementLogic::add($params, $this->adminId);
|
||||||
|
if (true === $result) {
|
||||||
|
return $this->success('添加成功', [], 1, 1);
|
||||||
|
}
|
||||||
|
return $this->fail(ProjectSettlementLogic::getError());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function edit()
|
||||||
|
{
|
||||||
|
$params = (new ProjectSettlementValidate())->post()->goCheck('edit');
|
||||||
|
$result = ProjectSettlementLogic::edit($params);
|
||||||
|
if (true === $result) {
|
||||||
|
return $this->success('编辑成功', [], 1, 1);
|
||||||
|
}
|
||||||
|
return $this->fail(ProjectSettlementLogic::getError());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function delete()
|
||||||
|
{
|
||||||
|
$params = (new ProjectSettlementValidate())->post()->goCheck('delete');
|
||||||
|
ProjectSettlementLogic::delete($params);
|
||||||
|
return $this->success('编辑成功', [], 1, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @notes 获取甲方结算详情
|
||||||
|
* @return \think\response\Json
|
||||||
|
* @author likeadmin
|
||||||
|
* @date 2023/12/29 10:22
|
||||||
|
*/
|
||||||
|
public function detail()
|
||||||
|
{
|
||||||
|
$params = (new ProjectSettlementValidate())->goCheck('detail');
|
||||||
|
$result = ProjectSettlementLogic::detail($params);
|
||||||
|
return $this->data($result);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function flows(): \think\response\Json
|
||||||
|
{
|
||||||
|
$flow_type = FlowType::where('type', 4)->where('name', 'jfjs')->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 ProjectSettlementValidate())->post()->goCheck('approve');
|
||||||
|
$result = ProjectSettlementLogic::approve($params, $this->adminId);
|
||||||
|
if (true === $result) {
|
||||||
|
return $this->success('提交审核信息成功', [], 1, 1);
|
||||||
|
}
|
||||||
|
return $this->fail(ProjectSettlementLogic::getError());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -12,159 +12,160 @@
|
|||||||
// | author: likeadminTeam
|
// | author: likeadminTeam
|
||||||
// +----------------------------------------------------------------------
|
// +----------------------------------------------------------------------
|
||||||
|
|
||||||
namespace app\adminapi\logic\project;
|
namespace app\adminapi\logic\project;
|
||||||
|
|
||||||
|
|
||||||
use app\common\model\contract\Contract;
|
use app\common\logic\BaseLogic;
|
||||||
use app\common\model\contract\ContractNegotiation;
|
use app\common\model\contract\Contract;
|
||||||
use app\common\model\custom\Custom;
|
use app\common\model\contract\ContractNegotiation;
|
||||||
use app\common\model\oa\FlowApprove;
|
use app\common\model\custom\Custom;
|
||||||
use app\common\model\project\Project;
|
use app\common\model\oa\FlowApprove;
|
||||||
use app\common\model\project\ProjectSettlement;
|
use app\common\model\project\Project;
|
||||||
use app\common\logic\BaseLogic;
|
use app\common\model\project\ProjectSettlement;
|
||||||
use think\facade\Db;
|
use think\facade\Db;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 甲方结算逻辑
|
* 甲方结算逻辑
|
||||||
* Class ProjectSettlementLogic
|
* Class ProjectSettlementLogic
|
||||||
* @package app\adminapi\logic\project
|
* @package app\adminapi\logic\project
|
||||||
*/
|
*/
|
||||||
class ProjectSettlementLogic extends BaseLogic
|
class ProjectSettlementLogic extends BaseLogic
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @notes 添加甲方结算
|
* @notes 添加甲方结算
|
||||||
* @param array $params
|
* @param array $params
|
||||||
* @return bool
|
* @return bool
|
||||||
* @author likeadmin
|
* @author likeadmin
|
||||||
* @date 2023/12/29 10:22
|
* @date 2023/12/29 10:22
|
||||||
*/
|
*/
|
||||||
public static function add(array $params,$admin_id): bool
|
public static function add(array $params, $admin_id): bool
|
||||||
{
|
{
|
||||||
Db::startTrans();
|
Db::startTrans();
|
||||||
try {
|
try {
|
||||||
$res = ProjectSettlement::create([
|
ProjectSettlement::create([
|
||||||
'settlement_code' => data_unique_code('甲方结算'),
|
'settlement_code' => data_unique_code('甲方结算'),
|
||||||
'project_id' => $params['project_id'],
|
'project_id' => $params['project_id'],
|
||||||
'contract_id' => $params['contract_id'],
|
'contract_id' => $params['contract_id'],
|
||||||
'settlement_amount' => $params['settlement_amount'],
|
'settlement_amount' => $params['settlement_amount'],
|
||||||
'settlement_date' => strtotime($params['settlement_date']),
|
'settlement_date' => strtotime($params['settlement_date']),
|
||||||
'remark' => $params['remark'],
|
'remark' => $params['remark'],
|
||||||
'annex' => $params['annex']? json_encode($params['annex']) : null,
|
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
|
||||||
'add_user' => $admin_id
|
'add_user' => $admin_id
|
||||||
]);
|
|
||||||
Db::commit();
|
|
||||||
return true;
|
|
||||||
} catch (\Exception $e) {
|
|
||||||
Db::rollback();
|
|
||||||
self::setError($e->getMessage());
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @notes 编辑甲方结算
|
|
||||||
* @param array $params
|
|
||||||
* @return bool
|
|
||||||
* @author likeadmin
|
|
||||||
* @date 2023/12/29 10:22
|
|
||||||
*/
|
|
||||||
public static function edit(array $params): bool
|
|
||||||
{
|
|
||||||
Db::startTrans();
|
|
||||||
try {
|
|
||||||
ProjectSettlement::where('id', $params['id'])->update([
|
|
||||||
'project_id' => $params['project_id'],
|
|
||||||
'contract_id' => $params['contract_id'],
|
|
||||||
'settlement_amount' => $params['settlement_amount'],
|
|
||||||
'settlement_date' => strtotime($params['settlement_date']),
|
|
||||||
'remark' => $params['remark'],
|
|
||||||
'annex' => $params['annex']? json_encode($params['annex']) : null,
|
|
||||||
'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 2023/12/29 10:22
|
|
||||||
*/
|
|
||||||
public static function delete(array $params): bool
|
|
||||||
{
|
|
||||||
return ProjectSettlement::destroy($params['id']);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @notes 获取甲方结算详情
|
|
||||||
* @param $params
|
|
||||||
* @return array
|
|
||||||
* @author likeadmin
|
|
||||||
* @date 2023/12/29 10:22
|
|
||||||
*/
|
|
||||||
public static function detail($params): array
|
|
||||||
{
|
|
||||||
$data = ProjectSettlement::field('id,settlement_code,project_id,contract_id,settlement_amount,settlement_date,remark,annex,approve_id')->findOrEmpty($params['id'])->toArray();
|
|
||||||
$project = Project::field('custom_id,name,project_code')->where('id',$data['project_id'])->findOrEmpty();
|
|
||||||
$contract = Contract::field('contract_name,contract_code,amount')->where('id',$data['contract_id'])->findOrEmpty();
|
|
||||||
$custom = Custom::field('name')->where('id',$project['custom_id'])->findOrEmpty();
|
|
||||||
$data['project_name'] = $project['name'];
|
|
||||||
$data['project_code'] = $project['project_code'];
|
|
||||||
$data['contract_name'] = $contract['contract_name'];
|
|
||||||
$data['contract_code'] = $contract['contract_code'];
|
|
||||||
$data['custom_name'] = $custom['name'];
|
|
||||||
//合同金额
|
|
||||||
$data['contract_amount'] = $contract['amount'];
|
|
||||||
//洽商金额
|
|
||||||
$data['negotiation_amount'] = ContractNegotiation::where('contract_id',$data['contract_id'])->sum('negotiation_amount');
|
|
||||||
//结算差异
|
|
||||||
$data['settlement_difference'] = bcsub(($data['contract_amount']+$data['negotiation_amount']),$data['settlement_amount']);
|
|
||||||
$approve_data = FlowApprove::where('id',$data['approve_id'])->findOrEmpty();
|
|
||||||
$data['approve_check_status'] = $approve_data['check_status'];
|
|
||||||
return $data;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function approve($params,$admin_id): bool{
|
|
||||||
$data = ProjectSettlement::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;
|
|
||||||
}
|
|
||||||
Db::startTrans();
|
|
||||||
try {
|
|
||||||
$res = addApprove(
|
|
||||||
'甲方结算',
|
|
||||||
$params['id'],
|
|
||||||
'app\common\model\project\ProjectSettlement',
|
|
||||||
$params['path'],
|
|
||||||
$params['flow_id'],
|
|
||||||
$admin_id
|
|
||||||
);
|
|
||||||
if($res){
|
|
||||||
ProjectSettlement::where('id',$params['id'])->update([
|
|
||||||
'approve_id' => $res,
|
|
||||||
]);
|
]);
|
||||||
|
Db::commit();
|
||||||
|
return true;
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
Db::rollback();
|
||||||
|
self::setError($e->getMessage());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @notes 编辑甲方结算
|
||||||
|
* @param array $params
|
||||||
|
* @return bool
|
||||||
|
* @author likeadmin
|
||||||
|
* @date 2023/12/29 10:22
|
||||||
|
*/
|
||||||
|
public static function edit(array $params): bool
|
||||||
|
{
|
||||||
|
Db::startTrans();
|
||||||
|
try {
|
||||||
|
ProjectSettlement::where('id', $params['id'])->update([
|
||||||
|
'project_id' => $params['project_id'],
|
||||||
|
'contract_id' => $params['contract_id'],
|
||||||
|
'settlement_amount' => $params['settlement_amount'],
|
||||||
|
'settlement_date' => strtotime($params['settlement_date']),
|
||||||
|
'remark' => $params['remark'],
|
||||||
|
'annex' => $params['annex'] ? json_encode($params['annex']) : null,
|
||||||
|
'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 2023/12/29 10:22
|
||||||
|
*/
|
||||||
|
public static function delete(array $params): bool
|
||||||
|
{
|
||||||
|
return ProjectSettlement::destroy($params['id']);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @notes 获取甲方结算详情
|
||||||
|
* @param $params
|
||||||
|
* @return array
|
||||||
|
* @author likeadmin
|
||||||
|
* @date 2023/12/29 10:22
|
||||||
|
*/
|
||||||
|
public static function detail($params): array
|
||||||
|
{
|
||||||
|
$data = ProjectSettlement::field('id,settlement_code,project_id,contract_id,settlement_amount,settlement_date,remark,annex,approve_id')->findOrEmpty($params['id'])->toArray();
|
||||||
|
$project = Project::field('custom_id,name,project_code')->where('id', $data['project_id'])->findOrEmpty();
|
||||||
|
$contract = Contract::field('contract_name,contract_code,amount')->where('id', $data['contract_id'])->findOrEmpty();
|
||||||
|
$custom = Custom::field('name')->where('id', $project['custom_id'])->findOrEmpty();
|
||||||
|
$data['project_name'] = $project['name'];
|
||||||
|
$data['project_code'] = $project['project_code'];
|
||||||
|
$data['contract_name'] = $contract['contract_name'];
|
||||||
|
$data['contract_code'] = $contract['contract_code'];
|
||||||
|
$data['custom_name'] = $custom['name'];
|
||||||
|
//合同金额
|
||||||
|
$data['contract_amount'] = $contract['amount'];
|
||||||
|
//洽商金额
|
||||||
|
$data['negotiation_amount'] = ContractNegotiation::where('contract_id', $data['contract_id'])->sum('negotiation_amount');
|
||||||
|
//结算差异
|
||||||
|
$data['settlement_difference'] = bcsub(($data['contract_amount'] + $data['negotiation_amount']), $data['settlement_amount']);
|
||||||
|
$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
|
||||||
|
$data['approve_check_status'] = $approve_data['check_status'];
|
||||||
|
return $data;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function approve($params, $admin_id): bool
|
||||||
|
{
|
||||||
|
$data = ProjectSettlement::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;
|
||||||
|
}
|
||||||
|
Db::startTrans();
|
||||||
|
try {
|
||||||
|
$res = addApprove(
|
||||||
|
'甲方结算',
|
||||||
|
$params['id'],
|
||||||
|
'app\common\model\project\ProjectSettlement',
|
||||||
|
$params['path'],
|
||||||
|
$params['flow_id'],
|
||||||
|
$admin_id
|
||||||
|
);
|
||||||
|
if ($res) {
|
||||||
|
ProjectSettlement::where('id', $params['id'])->update([
|
||||||
|
'approve_id' => $res,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
Db::commit();
|
||||||
|
return true;
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
Db::rollback();
|
||||||
|
self::setError($e->getMessage());
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
Db::commit();
|
|
||||||
return true;
|
|
||||||
} catch (\Exception $e) {
|
|
||||||
Db::rollback();
|
|
||||||
self::setError($e->getMessage());
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
Loading…
x
Reference in New Issue
Block a user