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-04-22 15:49:10 +08:00
parent b5530b1177
commit cdbc08e784
10 changed files with 903 additions and 865 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

157
app/adminapi/lists/DataReceptionLists.php
View File

@ -12,92 +12,95 @@
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\lists; namespace app\adminapi\lists;
use app\adminapi\lists\BaseAdminDataLists; use app\common\lists\ListsExcelInterface;
use app\common\lists\ListsExcelInterface; use app\common\lists\ListsSearchInterface;
use app\common\model\DataReception; use app\common\model\auth\Admin;
use app\common\lists\ListsSearchInterface; use app\common\model\DataReception;
/** /**
* DataReception列表 * DataReception列表
* Class DataReceptionLists * Class DataReceptionLists
* @package app\adminapi\lists * @package app\adminapi\lists
*/ */
class DataReceptionLists extends BaseAdminDataLists implements ListsSearchInterface,ListsExcelInterface class DataReceptionLists extends BaseAdminDataLists implements ListsSearchInterface, ListsExcelInterface
{ {
/** /**
* @notes 设置搜索条件 * @notes 设置搜索条件
* @return \string[][] * @return \string[][]
* @author likeadmin * @author likeadmin
* @date 2024/02/23 09:21 * @date 2024/02/23 09:21
*/ */
public function setSearch(): array public function setSearch(): array
{ {
return [ return [
'=' => ['project_id'], '=' => ['project_id'],
'%like%' => ['num','person'] '%like%' => ['num', 'person']
]; ];
} }
/** /**
* @notes 获取列表 * @notes 获取列表
* @return array * @return array
* @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException * @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
* @author likeadmin * @author likeadmin
* @date 2024/02/23 09:21 * @date 2024/02/23 09:21
*/ */
public function lists(): array public function lists(): array
{ {
return DataReception::where($this->searchWhere) return DataReception::where($this->searchWhere)
->with(['projectInfo']) ->with(['projectInfo'])
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select() ->select()->each(function ($data) {
->toArray(); $head = Admin::field('name')->where('id', $data['person'])->findOrEmpty();
} $data['person_name'] = $head?->name;
})
->toArray();
}
/** /**
* @notes 获取数量 * @notes 获取数量
* @return int * @return int
* @author likeadmin * @author likeadmin
* @date 2024/02/23 09:21 * @date 2024/02/23 09:21
*/ */
public function count(): int public function count(): int
{ {
return DataReception::where($this->searchWhere)->count(); return DataReception::where($this->searchWhere)->count();
} }
public function setFileName(): string public function setFileName(): string
{ {
return '资料接收'; return '资料接收';
} }
/** /**
* @notes 导出字段 * @notes 导出字段
* @return string[] * @return string[]
* @author 段誉 * @author 段誉
* @date 2022/11/24 16:17 * @date 2022/11/24 16:17
*/ */
public function setExcelFields(): array public function setExcelFields(): array
{ {
return [ return [
'id' => 'id', 'id' => 'id',
'num' => '单据编号', 'num' => '单据编号',
'project_id' => '项目id', 'project_id' => '项目id',
'apptime' => '登记日期', 'apptime' => '登记日期',
'person' => '登记人', 'person' => '登记人',
'number' => '资料份数', 'number' => '资料份数',
'position' => '存放位置', 'position' => '存放位置',
'tips' => '说明', 'tips' => '说明',
]; ];
} }
} }

2
app/adminapi/lists/ProjectCommissionLists.php
View File

@ -67,6 +67,8 @@
$project = CostProject::field('project_name,project_num,contract_id,industry,principal')->where('id', $data['project_id'])->findOrEmpty(); $project = CostProject::field('project_name,project_num,contract_id,industry,principal')->where('id', $data['project_id'])->findOrEmpty();
$contract = MarketingContract::field('contract_name')->where('id', $project['contract_id'])->findOrEmpty(); $contract = MarketingContract::field('contract_name')->where('id', $project['contract_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id', $project['principal'])->findOrEmpty(); $admin = Admin::field('name')->where('id', $project['principal'])->findOrEmpty();
$djr = Admin::field('name')->where('id', $data['djr'])->findOrEmpty();
$data['djr_name'] = $djr?->name;
$data['project_name'] = $project['project_name']; $data['project_name'] = $project['project_name'];
$data['project_num'] = $project['project_num']; $data['project_num'] = $project['project_num'];
$data['contract_name'] = $contract['contract_name']; $data['contract_name'] = $contract['contract_name'];

164
app/adminapi/lists/project_process_management/ProjectChangeVisaLists.php
View File

@ -12,96 +12,100 @@
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\lists\project_process_management; namespace app\adminapi\lists\project_process_management;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsExcelInterface; use app\common\lists\ListsExcelInterface;
use app\common\model\project_process_management\ProjectChangeVisa; use app\common\lists\ListsSearchInterface;
use app\common\lists\ListsSearchInterface; use app\common\model\auth\Admin;
use app\common\model\project_process_management\ProjectChangeVisaContent; use app\common\model\project_process_management\ProjectChangeVisa;
use app\common\model\project_process_management\ProjectChangeVisaContent;
/** /**
* ProjectChangeVisa列表 * ProjectChangeVisa列表
* Class ProjectChangeVisaLists * Class ProjectChangeVisaLists
* @package app\adminapi\listsproject_process_management * @package app\adminapi\listsproject_process_management
*/ */
class ProjectChangeVisaLists extends BaseAdminDataLists implements ListsSearchInterface,ListsExcelInterface class ProjectChangeVisaLists extends BaseAdminDataLists implements ListsSearchInterface, ListsExcelInterface
{ {
/** /**
* @notes 设置搜索条件 * @notes 设置搜索条件
* @return \string[][] * @return \string[][]
* @author likeadmin * @author likeadmin
* @date 2024/02/23 09:58 * @date 2024/02/23 09:58
*/ */
public function setSearch(): array public function setSearch(): array
{ {
return [ return [
'=' => ['project_id'], '=' => ['project_id'],
'%like%' => ['num'] '%like%' => ['num']
]; ];
} }
/** /**
* @notes 获取列表 * @notes 获取列表
* @return array * @return array
* @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException * @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
* @author likeadmin * @author likeadmin
* @date 2024/02/23 09:58 * @date 2024/02/23 09:58
*/ */
public function lists(): array public function lists(): array
{ {
return ProjectChangeVisa::with(['projectInfo']) return ProjectChangeVisa::with(['projectInfo'])
->append(['children']) ->append(['children'])
->where($this->searchWhere) ->where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->withAttr('children', function ($value, $data){ ->withAttr('children', function ($value, $data) {
$details = ProjectChangeVisaContent::where('project_change_visa_id', $data['id'])->select(); $details = ProjectChangeVisaContent::where('project_change_visa_id', $data['id'])->select();
return $details; return $details;
}) })
->select() ->select()->each(function ($data) {
->toArray(); $djr = Admin::field('name')->where('id', $data['djr'])->findOrEmpty();
} $data['djr_name'] = $djr?->name;
})
->toArray();
}
/** /**
* @notes 获取数量 * @notes 获取数量
* @return int * @return int
* @author likeadmin * @author likeadmin
* @date 2024/02/23 09:58 * @date 2024/02/23 09:58
*/ */
public function count(): int public function count(): int
{ {
return ProjectChangeVisa::where($this->searchWhere)->count(); return ProjectChangeVisa::where($this->searchWhere)->count();
} }
public function setFileName(): string public function setFileName(): string
{ {
return '项目变更签证'; return '项目变更签证';
} }
/** /**
* @notes 导出字段 * @notes 导出字段
* @return string[] * @return string[]
* @author 段誉 * @author 段誉
* @date 2022/11/24 16:17 * @date 2022/11/24 16:17
*/ */
public function setExcelFields(): array public function setExcelFields(): array
{ {
return [ return [
'id' => 'id', 'id' => 'id',
'num' => '单据编号', 'num' => '单据编号',
'project_id' => '项目id', 'project_id' => '项目id',
'djr' => '登记人', 'djr' => '登记人',
'apptime' => '登记日期', 'apptime' => '登记日期',
]; ];
} }
} }

170
app/adminapi/lists/project_process_management/ProjectRectificationLists.php
View File

@ -12,97 +12,103 @@
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\lists\project_process_management; namespace app\adminapi\lists\project_process_management;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsExcelInterface; use app\common\lists\ListsExcelInterface;
use app\common\model\project_process_management\ProjectRectification; use app\common\lists\ListsSearchInterface;
use app\common\lists\ListsSearchInterface; use app\common\model\auth\Admin;
use app\common\model\project_process_management\ProjectRectification;
/** /**
* ProjectRectification列表 * ProjectRectification列表
* Class ProjectRectificationLists * Class ProjectRectificationLists
* @package app\adminapi\listsproject_process_management * @package app\adminapi\listsproject_process_management
*/ */
class ProjectRectificationLists extends BaseAdminDataLists implements ListsSearchInterface,ListsExcelInterface class ProjectRectificationLists extends BaseAdminDataLists implements ListsSearchInterface, ListsExcelInterface
{ {
/** /**
* @notes 设置搜索条件 * @notes 设置搜索条件
* @return \string[][] * @return \string[][]
* @author likeadmin * @author likeadmin
* @date 2024/02/23 11:22 * @date 2024/02/23 11:22
*/ */
public function setSearch(): array public function setSearch(): array
{ {
return [ return [
'=' => ['project_id'], '=' => ['project_id'],
'%like%' => ['num','wt_unit','xm_master','zg_master'] '%like%' => ['num', 'wt_unit', 'xm_master', 'zg_master']
]; ];
} }
/** /**
* @notes 获取列表 * @notes 获取列表
* @return array * @return array
* @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException * @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
* @author likeadmin * @author likeadmin
* @date 2024/02/23 11:22 * @date 2024/02/23 11:22
*/ */
public function lists(): array public function lists(): array
{ {
return ProjectRectification::with(['projectInfo']) return ProjectRectification::with(['projectInfo'])
->where($this->searchWhere) ->where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select() ->select()->each(function ($data) {
->toArray(); $xmfz = Admin::field('name')->where('id', $data['xm_master'])->findOrEmpty();
} $djr = Admin::field('name')->where('id', $data['dj_person'])->findOrEmpty();
$data['xm_master_name'] = $xmfz?->name;
$data['dj_person_name'] = $djr?->name;
})
->toArray();
}
/** /**
* @notes 获取数量 * @notes 获取数量
* @return int * @return int
* @author likeadmin * @author likeadmin
* @date 2024/02/23 11:22 * @date 2024/02/23 11:22
*/ */
public function count(): int public function count(): int
{ {
return ProjectRectification::where($this->searchWhere)->count(); return ProjectRectification::where($this->searchWhere)->count();
} }
public function setFileName(): string public function setFileName(): string
{ {
return '项目整改'; return '项目整改';
} }
/** /**
* @notes 导出字段 * @notes 导出字段
* @return string[] * @return string[]
* @author 段誉 * @author 段誉
* @date 2022/11/24 16:17 * @date 2022/11/24 16:17
*/ */
public function setExcelFields(): array public function setExcelFields(): array
{ {
return [ return [
'id' => 'id', 'id' => 'id',
'num' => '单据编号', 'num' => '单据编号',
'project_id' => '项目id', 'project_id' => '项目id',
'wt_unit' => '委托单位', 'wt_unit' => '委托单位',
'jsdw' => '建设单位', 'jsdw' => '建设单位',
'bmfz' => '部门负责人', 'bmfz' => '部门负责人',
'xmfz' => '项目负责人', 'xmfz' => '项目负责人',
'riqi' => '踏勘日期', 'riqi' => '踏勘日期',
'people' => '踏勘人员', 'people' => '踏勘人员',
'djr' => '登记人', 'djr' => '登记人',
'apptime' => '登记日期', 'apptime' => '登记日期',
'content' => '踏勘内容', 'content' => '踏勘内容',
'remark' => '核实结果', 'remark' => '核实结果',
]; ];
} }
} }

170
app/adminapi/lists/project_process_management/ProjectSurveySignatureLists.php
View File

@ -12,98 +12,104 @@
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\lists\project_process_management; namespace app\adminapi\lists\project_process_management;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\lists\ListsExcelInterface; use app\common\lists\ListsExcelInterface;
use app\common\model\project_process_management\ProjectSurveySignature; use app\common\lists\ListsSearchInterface;
use app\common\lists\ListsSearchInterface; use app\common\model\auth\Admin;
use app\common\model\project_process_management\ProjectSurveySignature;
/** /**
* ProjectSurveySignature列表 * ProjectSurveySignature列表
* Class ProjectSurveySignatureLists * Class ProjectSurveySignatureLists
* @package app\adminapi\listsproject_process_management * @package app\adminapi\listsproject_process_management
*/ */
class ProjectSurveySignatureLists extends BaseAdminDataLists implements ListsSearchInterface,ListsExcelInterface class ProjectSurveySignatureLists extends BaseAdminDataLists implements ListsSearchInterface, ListsExcelInterface
{ {
/** /**
* @notes 设置搜索条件 * @notes 设置搜索条件
* @return \string[][] * @return \string[][]
* @author likeadmin * @author likeadmin
* @date 2024/02/23 11:06 * @date 2024/02/23 11:06
*/ */
public function setSearch(): array public function setSearch(): array
{ {
return [ return [
'=' => ['project_id'], '=' => ['project_id'],
'%like%' => ['num','wt_unit','jsdw'] '%like%' => ['num', 'wt_unit', 'jsdw']
]; ];
} }
/** /**
* @notes 获取列表 * @notes 获取列表
* @return array * @return array
* @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException * @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
* @author likeadmin * @author likeadmin
* @date 2024/02/23 11:06 * @date 2024/02/23 11:06
*/ */
public function lists(): array public function lists(): array
{ {
return ProjectSurveySignature::with(['projectInfo']) return ProjectSurveySignature::with(['projectInfo'])
->where($this->searchWhere) ->where($this->searchWhere)
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select() ->select()->each(function ($data) {
->toArray(); $xmfz = Admin::field('name')->where('id', $data['xmfz'])->findOrEmpty();
} $djr = Admin::field('name')->where('id', $data['djr'])->findOrEmpty();
$data['xmfz_name'] = $xmfz?->name;
$data['djr_name'] = $djr?->name;
})
->toArray();
}
/** /**
* @notes 获取数量 * @notes 获取数量
* @return int * @return int
* @author likeadmin * @author likeadmin
* @date 2024/02/23 11:06 * @date 2024/02/23 11:06
*/ */
public function count(): int public function count(): int
{ {
return ProjectSurveySignature::where($this->searchWhere)->count(); return ProjectSurveySignature::where($this->searchWhere)->count();
} }
public function setFileName(): string public function setFileName(): string
{ {
return '项目踏勘会签'; return '项目踏勘会签';
} }
/** /**
* @notes 导出字段 * @notes 导出字段
* @return string[] * @return string[]
* @author 段誉 * @author 段誉
* @date 2022/11/24 16:17 * @date 2022/11/24 16:17
*/ */
public function setExcelFields(): array public function setExcelFields(): array
{ {
return [ return [
'id' => 'id', 'id' => 'id',
'num' => '单据编号', 'num' => '单据编号',
'project_id' => '项目id', 'project_id' => '项目id',
'wt_unit' => '委托单位', 'wt_unit' => '委托单位',
'jsdw' => '建设单位', 'jsdw' => '建设单位',
'bmfz' => '部门负责人', 'bmfz' => '部门负责人',
'xmfz' => '项目负责人', 'xmfz' => '项目负责人',
'riqi' => '踏勘日期', 'riqi' => '踏勘日期',
'people' => '踏勘人员', 'people' => '踏勘人员',
'djr' => '登记人', 'djr' => '登记人',
'apptime' => '登记日期', 'apptime' => '登记日期',
'content' => '踏勘内容', 'content' => '踏勘内容',
'remark' => '核实结果', 'remark' => '核实结果',
]; ];
} }
} }

227
app/adminapi/logic/DataReceptionLogic.php
View File

@ -12,129 +12,132 @@
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\logic; namespace app\adminapi\logic;
use app\common\model\DataReception; use app\common\logic\BaseLogic;
use app\common\logic\BaseLogic; use app\common\model\auth\Admin;
use think\facade\Db; use app\common\model\DataReception;
use think\facade\Db;
/** /**
* DataReception逻辑 * DataReception逻辑
* Class DataReceptionLogic * Class DataReceptionLogic
* @package app\adminapi\logic * @package app\adminapi\logic
*/ */
class DataReceptionLogic extends BaseLogic class DataReceptionLogic extends BaseLogic
{ {
/** /**
* @notes 添加 * @notes 添加
* @param array $params * @param array $params
* @return bool * @return bool
* @author likeadmin * @author likeadmin
* @date 2024/02/23 09:21 * @date 2024/02/23 09:21
*/ */
public static function add(array $params): bool public static function add(array $params): bool
{ {
Db::startTrans(); Db::startTrans();
try { try {
DataReception::create([ DataReception::create([
'dataid' => generate_sn(DataReception::class, 'dataid'), 'dataid' => generate_sn(DataReception::class, 'dataid'),
'num' => generate_sn(DataReception::class, 'num'), 'num' => generate_sn(DataReception::class, 'num'),
'project_id' => $params['project_id'], 'project_id' => $params['project_id'],
'apptime' => $params['apptime'], 'apptime' => $params['apptime'],
'person' => $params['person'], 'person' => $params['person'],
'number' => $params['number'], 'number' => $params['number'],
'position' => $params['position'], 'position' => $params['position'],
'tips' => $params['tips'], 'tips' => $params['tips'],
'bidding_file' => $params['bidding_file'] ? json_encode($params['bidding_file']) : null, 'bidding_file' => $params['bidding_file'] ? json_encode($params['bidding_file']) : null,
'zbkzj_file' => $params['zbkzj_file'] ? json_encode($params['zbkzj_file']) : null, 'zbkzj_file' => $params['zbkzj_file'] ? json_encode($params['zbkzj_file']) : null,
'gczjht_file' => $params['gczjht_file'] ? json_encode($params['gczjht_file']) : null, 'gczjht_file' => $params['gczjht_file'] ? json_encode($params['gczjht_file']) : null,
'xmbgqzzl_file' => $params['xmbgqzzl_file'] ? json_encode($params['xmbgqzzl_file']) : null, 'xmbgqzzl_file' => $params['xmbgqzzl_file'] ? json_encode($params['xmbgqzzl_file']) : null,
'ssgsysjs_file' => $params['ssgsysjs_file'] ? json_encode($params['ssgsysjs_file']) : null, 'ssgsysjs_file' => $params['ssgsysjs_file'] ? json_encode($params['ssgsysjs_file']) : null,
'wlhj_file' => $params['wlhj_file'] ? json_encode($params['wlhj_file']) : null, 'wlhj_file' => $params['wlhj_file'] ? json_encode($params['wlhj_file']) : null,
'other_file' => $params['other_file'] ? json_encode($params['other_file']) : null, 'other_file' => $params['other_file'] ? json_encode($params['other_file']) : null,
]); ]);
Db::commit(); Db::commit();
return true; return true;
} catch (\Exception $e) { } catch (\Exception $e) {
Db::rollback(); Db::rollback();
self::setError($e->getMessage()); self::setError($e->getMessage());
return false; return false;
} }
} }
/** /**
* @notes 编辑 * @notes 编辑
* @param array $params * @param array $params
* @return bool * @return bool
* @author likeadmin * @author likeadmin
* @date 2024/02/23 09:21 * @date 2024/02/23 09:21
*/ */
public static function edit(array $params): bool public static function edit(array $params): bool
{ {
Db::startTrans(); Db::startTrans();
try { try {
DataReception::where('id', $params['id'])->update([ DataReception::where('id', $params['id'])->update([
'project_id' => $params['project_id'], 'project_id' => $params['project_id'],
'apptime' => $params['apptime'], 'apptime' => $params['apptime'],
'person' => $params['person'], 'person' => $params['person'],
'number' => $params['number'], 'number' => $params['number'],
'position' => $params['position'], 'position' => $params['position'],
'tips' => $params['tips'], 'tips' => $params['tips'],
'bidding_file' => $params['bidding_file'] ? json_encode($params['bidding_file']) : null, 'bidding_file' => $params['bidding_file'] ? json_encode($params['bidding_file']) : null,
'zbkzj_file' => $params['zbkzj_file'] ? json_encode($params['zbkzj_file']) : null, 'zbkzj_file' => $params['zbkzj_file'] ? json_encode($params['zbkzj_file']) : null,
'gczjht_file' => $params['gczjht_file'] ? json_encode($params['gczjht_file']) : null, 'gczjht_file' => $params['gczjht_file'] ? json_encode($params['gczjht_file']) : null,
'xmbgqzzl_file' => $params['xmbgqzzl_file'] ? json_encode($params['xmbgqzzl_file']) : null, 'xmbgqzzl_file' => $params['xmbgqzzl_file'] ? json_encode($params['xmbgqzzl_file']) : null,
'ssgsysjs_file' => $params['ssgsysjs_file'] ? json_encode($params['ssgsysjs_file']) : null, 'ssgsysjs_file' => $params['ssgsysjs_file'] ? json_encode($params['ssgsysjs_file']) : null,
'wlhj_file' => $params['wlhj_file'] ? json_encode($params['wlhj_file']) : null, 'wlhj_file' => $params['wlhj_file'] ? json_encode($params['wlhj_file']) : null,
'other_file' => $params['other_file'] ? json_encode($params['other_file']) : null, 'other_file' => $params['other_file'] ? json_encode($params['other_file']) : null,
]); ]);
Db::commit(); Db::commit();
return true; return true;
} catch (\Exception $e) { } catch (\Exception $e) {
Db::rollback(); Db::rollback();
self::setError($e->getMessage()); self::setError($e->getMessage());
return false; return false;
} }
} }
/** /**
* @notes 删除 * @notes 删除
* @param array $params * @param array $params
* @return bool * @return bool
* @author likeadmin * @author likeadmin
* @date 2024/02/23 09:21 * @date 2024/02/23 09:21
*/ */
public static function delete(array $params): bool public static function delete(array $params): bool
{ {
return DataReception::destroy($params['id']); return DataReception::destroy($params['id']);
} }
/** /**
* @notes 获取详情 * @notes 获取详情
* @param $params * @param $params
* @return array * @return array
* @author likeadmin * @author likeadmin
* @date 2024/02/23 09:21 * @date 2024/02/23 09:21
*/ */
public static function detail($params): array public static function detail($params): array
{ {
$data = DataReception::with(['projectInfo'])->findOrEmpty($params['id'])->toArray(); $data = DataReception::with(['projectInfo'])->findOrEmpty($params['id'])->toArray();
$data['bidding_file'] = !empty($data['bidding_file']) ? json_decode($data['bidding_file'], true) : ''; $data['bidding_file'] = !empty($data['bidding_file']) ? json_decode($data['bidding_file'], true) : '';
$data['zbkzj_file'] = !empty($data['zbkzj_file']) ? json_decode($data['zbkzj_file'], true) : ''; $data['zbkzj_file'] = !empty($data['zbkzj_file']) ? json_decode($data['zbkzj_file'], true) : '';
$data['gczjht_file'] = !empty($data['gczjht_file']) ? json_decode($data['gczjht_file'], true) : ''; $data['gczjht_file'] = !empty($data['gczjht_file']) ? json_decode($data['gczjht_file'], true) : '';
$data['xmbgqzzl_file'] = !empty($data['xmbgqzzl_file']) ? json_decode($data['xmbgqzzl_file'], true) : ''; $data['xmbgqzzl_file'] = !empty($data['xmbgqzzl_file']) ? json_decode($data['xmbgqzzl_file'], true) : '';
$data['ssgsysjs_file'] = !empty($data['ssgsysjs_file']) ? json_decode($data['ssgsysjs_file'], true) : ''; $data['ssgsysjs_file'] = !empty($data['ssgsysjs_file']) ? json_decode($data['ssgsysjs_file'], true) : '';
$data['wlhj_file'] = !empty($data['wlhj_file']) ? json_decode($data['wlhj_file'], true) : ''; $data['wlhj_file'] = !empty($data['wlhj_file']) ? json_decode($data['wlhj_file'], true) : '';
$data['other_file'] = !empty($data['other_file']) ? json_decode($data['other_file'], true) : ''; $data['other_file'] = !empty($data['other_file']) ? json_decode($data['other_file'], true) : '';
return $data; $head = Admin::field('name')->where('id', $data['person'])->findOrEmpty();
} $data['person_name'] = $head?->name;
} return $data;
}
}

2
app/adminapi/logic/ProjectCommissionLogic.php
View File

@ -140,6 +140,8 @@
$project = CostProject::field('project_name,project_num,contract_id,industry,principal')->where('id', $data['project_id'])->findOrEmpty(); $project = CostProject::field('project_name,project_num,contract_id,industry,principal')->where('id', $data['project_id'])->findOrEmpty();
$contract = MarketingContract::field('contract_name')->where('id', $project['contract_id'])->findOrEmpty(); $contract = MarketingContract::field('contract_name')->where('id', $project['contract_id'])->findOrEmpty();
$admin = Admin::field('name')->where('id', $project['principal'])->findOrEmpty(); $admin = Admin::field('name')->where('id', $project['principal'])->findOrEmpty();
$djr = Admin::field('name')->where('id', $data['djr'])->findOrEmpty();
$data['djr_name'] = $djr?->name;
$data['project_name'] = $project['project_name']; $data['project_name'] = $project['project_name'];
$data['project_num'] = $project['project_num']; $data['project_num'] = $project['project_num'];
$data['contract_name'] = $contract['contract_name']; $data['contract_name'] = $contract['contract_name'];

239
app/adminapi/logic/project_process_management/ProjectChangeVisaLogic.php
View File

@ -12,135 +12,136 @@
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\logic\project_process_management; namespace app\adminapi\logic\project_process_management;
use app\common\model\project_process_management\ProjectChangeVisa; use app\common\logic\BaseLogic;
use app\common\logic\BaseLogic; use app\common\model\auth\Admin;
use app\common\model\project_process_management\ProjectChangeVisaContent; use app\common\model\project_process_management\ProjectChangeVisa;
use think\facade\Db; use app\common\model\project_process_management\ProjectChangeVisaContent;
use think\facade\Db;
/** /**
* ProjectChangeVisa逻辑 * ProjectChangeVisa逻辑
* Class ProjectChangeVisaLogic * Class ProjectChangeVisaLogic
* @package app\adminapi\logic\project_process_management * @package app\adminapi\logic\project_process_management
*/ */
class ProjectChangeVisaLogic extends BaseLogic class ProjectChangeVisaLogic extends BaseLogic
{ {
/** /**
* @notes 添加 * @notes 编辑
* @param array $params * @param array $params
* @return bool * @return bool
* @author likeadmin * @author likeadmin
* @date 2024/02/23 09:58 * @date 2024/02/23 09:58
*/ */
public static function add(array $params): bool public static function edit(array $params): bool
{ {
Db::startTrans(); Db::startTrans();
try { try {
$projectChangeVisa = ProjectChangeVisa::create([ ProjectChangeVisa::where('id', $params['id'])->update([
'dataid' => generate_sn(ProjectChangeVisa::class, 'dataid'), 'project_id' => $params['project_id'],
'num' => generate_sn(ProjectChangeVisa::class, 'num'), 'djr' => $params['djr'],
'project_id' => $params['project_id'], 'djrq' => $params['djrq'],
'djr' => $params['djr'], ]);
'djrq' => $params['djrq'], if (!empty($params['project_change_visa_content'])) {
]); foreach ($params['project_change_visa_content'] as $item) {
if(!empty($params['project_change_visa_content'])){ if (!empty($item['id'])) {
foreach ($params['project_change_visa_content'] as $item) { ProjectChangeVisaContentLogic::edit($item);
$item['project_change_visa_id'] = $projectChangeVisa->id; } else {
ProjectChangeVisaContentLogic::add($item); $item['project_change_visa_id'] = $params['id'];
ProjectChangeVisaContentLogic::add($item);
}
}
} }
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;
}
}
/**
/** * @notes 添加
* @notes 编辑 * @param array $params
* @param array $params * @return bool
* @return bool * @author likeadmin
* @author likeadmin * @date 2024/02/23 09:58
* @date 2024/02/23 09:58 */
*/ public static function add(array $params): bool
public static function edit(array $params): bool {
{ Db::startTrans();
Db::startTrans(); try {
try { $projectChangeVisa = ProjectChangeVisa::create([
ProjectChangeVisa::where('id', $params['id'])->update([ 'dataid' => generate_sn(ProjectChangeVisa::class, 'dataid'),
'project_id' => $params['project_id'], 'num' => generate_sn(ProjectChangeVisa::class, 'num'),
'djr' => $params['djr'], 'project_id' => $params['project_id'],
'djrq' => $params['djrq'], 'djr' => $params['djr'],
]); 'djrq' => $params['djrq'],
if(!empty($params['project_change_visa_content'])){ ]);
foreach ($params['project_change_visa_content'] as $item) { if (!empty($params['project_change_visa_content'])) {
if(!empty($item['id'])){ foreach ($params['project_change_visa_content'] as $item) {
ProjectChangeVisaContentLogic::edit($item); $item['project_change_visa_id'] = $projectChangeVisa->id;
}else{
$item['project_change_visa_id'] = $params['id'];
ProjectChangeVisaContentLogic::add($item); ProjectChangeVisaContentLogic::add($item);
} }
} }
} Db::commit();
Db::commit(); return true;
return true; } catch (\Exception $e) {
} catch (\Exception $e) { Db::rollback();
Db::rollback(); self::setError($e->getMessage());
self::setError($e->getMessage()); return false;
return false; }
} }
}
/**
* @notes 删除
/** * @param array $params
* @notes 删除 * @return bool
* @param array $params * @author likeadmin
* @return bool * @date 2024/02/23 09:58
* @author likeadmin */
* @date 2024/02/23 09:58 public static function delete(array $params): bool
*/ {
public static function delete(array $params): bool $data = ProjectChangeVisaContent::where('project_change_visa_id', 'in', $params['id'])->findOrEmpty();
{ if (!$data->isEmpty()) {
$data = ProjectChangeVisaContent::where('project_change_visa_id','in',$params['id'])->findOrEmpty(); self::setError('此数据关联了项目变更签证明细信息,须删除项目变更签证明细信息');
if(!$data->isEmpty()){ return false;
self::setError('此数据关联了项目变更签证明细信息,须删除项目变更签证明细信息'); }
return false; return ProjectChangeVisa::destroy($params['id']);
} }
return ProjectChangeVisa::destroy($params['id']);
}
/**
* @notes 获取详情
/** * @param $params
* @notes 获取详情 * @return array
* @param $params * @author likeadmin
* @return array * @date 2024/02/23 09:58
* @author likeadmin */
* @date 2024/02/23 09:58 public static function detail($params): array
*/ {
public static function detail($params): array $data = ProjectChangeVisa::with(['projectInfo'])->findOrEmpty($params['id']);
{ $data['project_change_visa_content'] = ProjectChangeVisaContent::where('project_change_visa_id', $data['id'])->select();
$data = ProjectChangeVisa::with(['projectInfo'])->findOrEmpty($params['id'])->toArray(); $djr = Admin::field('name')->where('id', $data['djr'])->findOrEmpty();
$data['project_change_visa_content'] = ProjectChangeVisaContent::where('project_change_visa_id', $data['id'])->select(); $data['djr_name'] = $djr?->name;
return $data; return $data->toArray();
} }
public static function datas() public static function datas()
{ {
$datas = ProjectChangeVisa::field(['id', 'num']) $datas = ProjectChangeVisa::field(['id', 'num'])
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select() ->select()
->toArray(); ->toArray();
foreach ($datas as &$item) { foreach ($datas as &$item) {
$item['projectinfo'] = 'ID：' . $item['id'] . ' / 单号：' . $item['num']; $item['projectinfo'] = 'ID：' . $item['id'] . ' / 单号：' . $item['num'];
}
return $datas;
} }
return $datas;
} }
}

206
app/adminapi/logic/project_process_management/ProjectRectificationLogic.php
View File

@ -12,117 +12,123 @@
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\logic\project_process_management; namespace app\adminapi\logic\project_process_management;
use app\common\model\project_process_management\ProjectRectification; use app\common\logic\BaseLogic;
use app\common\logic\BaseLogic; use app\common\model\auth\Admin;
use think\facade\Db; use app\common\model\project_process_management\ProjectRectification;
use think\facade\Db;
/** /**
* ProjectRectification逻辑 * ProjectRectification逻辑
* Class ProjectRectificationLogic * Class ProjectRectificationLogic
* @package app\adminapi\logic\project_process_management * @package app\adminapi\logic\project_process_management
*/ */
class ProjectRectificationLogic extends BaseLogic class ProjectRectificationLogic extends BaseLogic
{ {
/** /**
* @notes 添加 * @notes 添加
* @param array $params * @param array $params
* @return bool * @return bool
* @author likeadmin * @author likeadmin
* @date 2024/02/23 11:22 * @date 2024/02/23 11:22
*/ */
public static function add(array $params): bool public static function add(array $params): bool
{ {
Db::startTrans(); Db::startTrans();
try { try {
ProjectRectification::create([ ProjectRectification::create([
'dataid' => generate_sn(ProjectRectification::class, 'dataid'), 'dataid' => generate_sn(ProjectRectification::class, 'dataid'),
'num' => generate_sn(ProjectRectification::class, 'num'), 'num' => generate_sn(ProjectRectification::class, 'num'),
'project_id' => $params['project_id'], 'project_id' => $params['project_id'],
'wt_unit' => $params['wt_unit'], 'wt_unit' => $params['wt_unit'],
'xm_master' => $params['xm_master'], 'xm_master' => $params['xm_master'],
'zx_type' => $params['zx_type'], 'zx_type' => $params['zx_type'],
'zg_master' => $params['zg_master'], 'zg_master' => $params['zg_master'],
'dj_person' => $params['dj_person'], 'dj_person' => $params['dj_person'],
'apptime' => $params['apptime'], 'apptime' => $params['apptime'],
'problem' => $params['problem'], 'problem' => $params['problem'],
'deal_desc' => $params['deal_desc'], 'deal_desc' => $params['deal_desc'],
'remark' => $params['remark'], 'remark' => $params['remark'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null, 'annex' => $params['annex'] ? json_encode($params['annex']) : null,
]); ]);
Db::commit(); Db::commit();
return true; return true;
} catch (\Exception $e) { } catch (\Exception $e) {
Db::rollback(); Db::rollback();
self::setError($e->getMessage()); self::setError($e->getMessage());
return false; return false;
} }
} }
/** /**
* @notes 编辑 * @notes 编辑
* @param array $params * @param array $params
* @return bool * @return bool
* @author likeadmin * @author likeadmin
* @date 2024/02/23 11:22 * @date 2024/02/23 11:22
*/ */
public static function edit(array $params): bool public static function edit(array $params): bool
{ {
Db::startTrans(); Db::startTrans();
try { try {
ProjectRectification::where('id', $params['id'])->update([ ProjectRectification::where('id', $params['id'])->update([
'project_id' => $params['project_id'], 'project_id' => $params['project_id'],
'wt_unit' => $params['wt_unit'], 'wt_unit' => $params['wt_unit'],
'xm_master' => $params['xm_master'], 'xm_master' => $params['xm_master'],
'zx_type' => $params['zx_type'], 'zx_type' => $params['zx_type'],
'zg_master' => $params['zg_master'], 'zg_master' => $params['zg_master'],
'dj_person' => $params['dj_person'], 'dj_person' => $params['dj_person'],
'apptime' => $params['apptime'], 'apptime' => $params['apptime'],
'problem' => $params['problem'], 'problem' => $params['problem'],
'deal_desc' => $params['deal_desc'], 'deal_desc' => $params['deal_desc'],
'remark' => $params['remark'], 'remark' => $params['remark'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null, 'annex' => $params['annex'] ? json_encode($params['annex']) : null,
]); ]);
Db::commit(); Db::commit();
return true; return true;
} catch (\Exception $e) { } catch (\Exception $e) {
Db::rollback(); Db::rollback();
self::setError($e->getMessage()); self::setError($e->getMessage());
return false; return false;
} }
} }
/** /**
* @notes 删除 * @notes 删除
* @param array $params * @param array $params
* @return bool * @return bool
* @author likeadmin * @author likeadmin
* @date 2024/02/23 11:22 * @date 2024/02/23 11:22
*/ */
public static function delete(array $params): bool public static function delete(array $params): bool
{ {
return ProjectRectification::destroy($params['id']); return ProjectRectification::destroy($params['id']);
} }
/** /**
* @notes 获取详情 * @notes 获取详情
* @param $params * @param $params
* @return array * @return array
* @author likeadmin * @author likeadmin
* @date 2024/02/23 11:22 * @date 2024/02/23 11:22
*/ */
public static function detail($params): array public static function detail($params): array
{ {
return ProjectRectification::with(['projectInfo'])->findOrEmpty($params['id'])->toArray(); $data = ProjectRectification::with(['projectInfo'])->findOrEmpty($params['id']);
} $xmfz = Admin::field('name')->where('id', $data['xm_master'])->findOrEmpty();
} $djr = Admin::field('name')->where('id', $data['dj_person'])->findOrEmpty();
$data['xm_master_name'] = $xmfz?->name;
$data['dj_person_name'] = $djr?->name;
return $data->toArray();
}
}

215
app/adminapi/logic/project_process_management/ProjectSurveySignatureLogic.php
View File

@ -12,122 +12,127 @@
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\logic\project_process_management; namespace app\adminapi\logic\project_process_management;
use app\common\model\project_process_management\ProjectSurveySignature; use app\common\logic\BaseLogic;
use app\common\logic\BaseLogic; use app\common\model\auth\Admin;
use think\facade\Db; use app\common\model\project_process_management\ProjectSurveySignature;
use think\facade\Db;
/** /**
* ProjectSurveySignature逻辑 * ProjectSurveySignature逻辑
* Class ProjectSurveySignatureLogic * Class ProjectSurveySignatureLogic
* @package app\adminapi\logic\project_process_management * @package app\adminapi\logic\project_process_management
*/ */
class ProjectSurveySignatureLogic extends BaseLogic class ProjectSurveySignatureLogic extends BaseLogic
{ {
/** /**
* @notes 添加 * @notes 添加
* @param array $params * @param array $params
* @return bool * @return bool
* @author likeadmin * @author likeadmin
* @date 2024/02/23 11:06 * @date 2024/02/23 11:06
*/ */
public static function add(array $params): bool public static function add(array $params): bool
{ {
Db::startTrans(); Db::startTrans();
try { try {
ProjectSurveySignature::create([ ProjectSurveySignature::create([
'dataid' => generate_sn(ProjectSurveySignature::class, 'dataid'), 'dataid' => generate_sn(ProjectSurveySignature::class, 'dataid'),
'num' => generate_sn(ProjectSurveySignature::class, 'num'), 'num' => generate_sn(ProjectSurveySignature::class, 'num'),
'project_id' => $params['project_id'], 'project_id' => $params['project_id'],
'wt_unit' => $params['wt_unit'], 'wt_unit' => $params['wt_unit'],
'jsdw' => $params['jsdw'], 'jsdw' => $params['jsdw'],
'bmfz' => $params['bmfz'], 'bmfz' => $params['bmfz'],
'xmfz' => $params['xmfz'], 'xmfz' => $params['xmfz'],
'riqi' => $params['riqi'], 'riqi' => $params['riqi'],
'people' => $params['people'], 'people' => $params['people'],
'djr' => $params['djr'], 'djr' => $params['djr'],
'apptime' => $params['apptime'], 'apptime' => $params['apptime'],
'content' => $params['content'], 'content' => $params['content'],
'result' => $params['result'], 'result' => $params['result'],
'remark' => $params['remark'], 'remark' => $params['remark'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null 'annex' => $params['annex'] ? json_encode($params['annex']) : null
]); ]);
Db::commit(); Db::commit();
return true; return true;
} catch (\Exception $e) { } catch (\Exception $e) {
Db::rollback(); Db::rollback();
self::setError($e->getMessage()); self::setError($e->getMessage());
return false; return false;
} }
} }
/** /**
* @notes 编辑 * @notes 编辑
* @param array $params * @param array $params
* @return bool * @return bool
* @author likeadmin * @author likeadmin
* @date 2024/02/23 11:06 * @date 2024/02/23 11:06
*/ */
public static function edit(array $params): bool public static function edit(array $params): bool
{ {
Db::startTrans(); Db::startTrans();
try { try {
ProjectSurveySignature::where('id', $params['id'])->update([ ProjectSurveySignature::where('id', $params['id'])->update([
'project_id' => $params['project_id'], 'project_id' => $params['project_id'],
'wt_unit' => $params['wt_unit'], 'wt_unit' => $params['wt_unit'],
'jsdw' => $params['jsdw'], 'jsdw' => $params['jsdw'],
'bmfz' => $params['bmfz'], 'bmfz' => $params['bmfz'],
'xmfz' => $params['xmfz'], 'xmfz' => $params['xmfz'],
'riqi' => $params['riqi'], 'riqi' => $params['riqi'],
'people' => $params['people'], 'people' => $params['people'],
'djr' => $params['djr'], 'djr' => $params['djr'],
'apptime' => $params['apptime'], 'apptime' => $params['apptime'],
'content' => $params['content'], 'content' => $params['content'],
'result' => $params['result'], 'result' => $params['result'],
'remark' => $params['remark'], 'remark' => $params['remark'],
'annex' => $params['annex'] ? json_encode($params['annex']) : null 'annex' => $params['annex'] ? json_encode($params['annex']) : null
]); ]);
Db::commit(); Db::commit();
return true; return true;
} catch (\Exception $e) { } catch (\Exception $e) {
Db::rollback(); Db::rollback();
self::setError($e->getMessage()); self::setError($e->getMessage());
return false; return false;
} }
} }
/** /**
* @notes 删除 * @notes 删除
* @param array $params * @param array $params
* @return bool * @return bool
* @author likeadmin * @author likeadmin
* @date 2024/02/23 11:06 * @date 2024/02/23 11:06
*/ */
public static function delete(array $params): bool public static function delete(array $params): bool
{ {
return ProjectSurveySignature::destroy($params['id']); return ProjectSurveySignature::destroy($params['id']);
} }
/** /**
* @notes 获取详情 * @notes 获取详情
* @param $params * @param $params
* @return array * @return array
* @author likeadmin * @author likeadmin
* @date 2024/02/23 11:06 * @date 2024/02/23 11:06
*/ */
public static function detail($params): array public static function detail($params): array
{ {
$data = ProjectSurveySignature::with(['projectInfo'])->findOrEmpty($params['id'])->toArray(); $data = ProjectSurveySignature::with(['projectInfo'])->findOrEmpty($params['id']);
return $data; $xmfz = Admin::field('name')->where('id', $data['xmfz'])->findOrEmpty();
} $djr = Admin::field('name')->where('id', $data['djr'])->findOrEmpty();
} $data['xmfz_name'] = $xmfz?->name;
$data['djr_name'] = $djr?->name;
return $data->toArray();
}
}