|
@@ -369,16 +369,25 @@ class Cost extends BaseController
|
|
|
//拿到自身的所属于单位和职位,查询和自身单位一样的账号,
|
|
|
$unit_name = Db::name('admin')->where('id', $this->uid)->value('unit_name');
|
|
|
|
|
|
- $proprietorDepartmentIds = Db::name("department")
|
|
|
+ $leader_id = Db::name("department")
|
|
|
->where([
|
|
|
["delete_time", "=", 0],
|
|
|
["pid", "=", 0],
|
|
|
["type", "=", 1], //1表示业主
|
|
|
["entrust_unit", "=", $unit_name]
|
|
|
- ])->column('id');
|
|
|
+ ])->value('leader_id');
|
|
|
+ $proprietor_unit_name = Db::name("department")
|
|
|
+ ->where([
|
|
|
+ ["delete_time", "=", 0],
|
|
|
+ ["pid", "=", 0],
|
|
|
+ ["type", "=", 1], //1表示业主
|
|
|
+ ["entrust_unit", "=", $unit_name]
|
|
|
+ ])->column('unit_name');
|
|
|
+ $admin_group_id=Db::name("admin")->where("id", $leader_id)->value("admin_group_id");
|
|
|
$where = [
|
|
|
['status', '>=', 0],
|
|
|
- ['unit_name', 'in', $proprietorDepartmentIds]
|
|
|
+ ["admin_group_id","=", $admin_group_id],
|
|
|
+ ["unit_name","in",$proprietor_unit_name]
|
|
|
];
|
|
|
$proprietor =Db::name("admin")->where($where)->field(["id","nickname"])->select()->toArray();
|
|
|
$person = Db::name("admin")->where("unit_name", $unit_name)->where("status",">",0)->field(["id", "nickname"])->select()->toArray();
|
|
@@ -762,32 +771,41 @@ class Cost extends BaseController
|
|
|
// halt($param);
|
|
|
$type = isset($param['type']) ? $param['type'] : 0;
|
|
|
if (request()->isAjax()) {
|
|
|
-
|
|
|
$id = isset($param['id']) ? $param['id'] : 0;
|
|
|
$detail = $this->model->getCostProjectById($id);
|
|
|
|
|
|
+
|
|
|
if ($type == 2) {
|
|
|
|
|
|
- $review_unit_name = Db::name('department')->where(['id' => $param["review_unit"]])->value('title');
|
|
|
+ $review_unit_name = Db::name('department')->where(['id' => $detail["review_unit"]])->value('title');
|
|
|
$unit_name = Db::name('admin')->where('id', $this->uid)->value('unit_name');
|
|
|
|
|
|
$person = Db::name("admin")->where([["unit_name", "=", $unit_name], ["status", "=", 1]])->field(["id", "nickname"])->select()->toArray();
|
|
|
- $proprietorDepartmentIds = Db::name("department")
|
|
|
+ $leader_id = Db::name("department")
|
|
|
->where([
|
|
|
["delete_time", "=", 0],
|
|
|
["pid", "=", 0],
|
|
|
["type", "=", 1], //1表示业主
|
|
|
["entrust_unit", "=", $unit_name]
|
|
|
- ])->column('id');
|
|
|
+ ])->value('leader_id');
|
|
|
+ $proprietor_unit_name = Db::name("department")
|
|
|
+ ->where([
|
|
|
+ ["delete_time", "=", 0],
|
|
|
+ ["pid", "=", 0],
|
|
|
+ ["type", "=", 1], //1表示业主
|
|
|
+ ["entrust_unit", "=", $unit_name]
|
|
|
+ ])->column('unit_name');
|
|
|
+ $admin_group_id=Db::name("admin")->where("id", $leader_id)->value("admin_group_id");
|
|
|
$where = [
|
|
|
['status', '>=', 0],
|
|
|
- ['unit_name', 'in', $proprietorDepartmentIds]
|
|
|
+ ["admin_group_id","=", $admin_group_id],
|
|
|
+ ["unit_name","in",$proprietor_unit_name]
|
|
|
];
|
|
|
$proprietor =Db::name("admin")->where($where)->field(["id","nickname"])->select()->toArray();
|
|
|
|
|
|
|
|
|
- $review_person = Db::name("admin")->where([["unit_name", "=", $param["review_unit"]], ["status", "=", 1]])->field(["id", "nickname"])->select();
|
|
|
- $review_name = Db::name("admin")->where("id",$param['review_head'])->field(["id", "nickname"])->find();
|
|
|
+ $review_person = Db::name("admin")->where([["unit_name", "=", $detail["review_unit"]], ["status", "=", 1]])->field(["id", "nickname"])->select();
|
|
|
+ $review_name = Db::name("admin")->where("id", $detail['review_head'])->field(["id", "nickname"])->find();
|
|
|
$audit = Db::name("project_audit")->where([["project_id", "=", $id], ["sponsor_id", "=", $this->uid]])->order('create_time', 'desc')->select();
|
|
|
$file_array = Db::name('ProjectFile')
|
|
|
->field('mf.id,mf.topic_id,mf.admin_id,f.name,f.filesize,f.filepath,f.fileext,f.create_time,f.admin_id,a.nickname as admin_name')
|
|
@@ -855,15 +873,15 @@ class Cost extends BaseController
|
|
|
}
|
|
|
|
|
|
|
|
|
- //送审
|
|
|
- if(isset($param["sent_review_head"])&&$detail["proprietor_status"]==0){
|
|
|
+ //财评送审
|
|
|
+ if(isset($detail["sent_review_head"])&&$detail.proprietor_status==0){
|
|
|
$param["sent_review_head_name"] = get_admin($param["sent_review_head"])["nickname"];
|
|
|
$param["sent_review_unit"]=get_admin($param["sent_review_head"])["unit_name"];
|
|
|
$param["sent_review_unit_name"]=Db::name("department")->where("id",$param["sent_review_unit"])->value("title");
|
|
|
$param["sent_review_phone"] = get_admin($param["sent_review_head"])["mobile"];//电话
|
|
|
}
|
|
|
-
|
|
|
- if(isset($deatil["sent_review_head"])&&$detail["proprietor_status"]==3){//业主创建推送时
|
|
|
+ //业主创建送审
|
|
|
+ if(isset($detail["sent_review_head"])&&$detail.proprietor_status==3){
|
|
|
$param["sent_review_head_name"] = get_admin($detail["sent_review_head"])["nickname"];
|
|
|
$param["sent_review_unit"]=get_admin($detail["sent_review_head"])["unit_name"];
|
|
|
$param["sent_review_unit_name"]=Db::name("department")->where("id",$detail["sent_review_unit"])->value("title");
|
|
@@ -952,16 +970,26 @@ class Cost extends BaseController
|
|
|
$detail["project_start_time"] !=null?$detail["project_start_time"]:null;
|
|
|
|
|
|
//送审业主
|
|
|
- $proprietorDepartmentIds = Db::name("department")
|
|
|
+ $leader_id = Db::name("department")
|
|
|
+ ->where([
|
|
|
+ ["delete_time", "=", 0],
|
|
|
+ ["pid", "=", 0],
|
|
|
+ ["type", "=", 1], //1表示业主
|
|
|
+ ["entrust_unit", "=", $unit_name]
|
|
|
+ ])->value('leader_id');
|
|
|
+ $proprietor_unit_name = Db::name("department")
|
|
|
->where([
|
|
|
["delete_time", "=", 0],
|
|
|
["pid", "=", 0],
|
|
|
["type", "=", 1], //1表示业主
|
|
|
["entrust_unit", "=", $unit_name]
|
|
|
- ])->column('id');
|
|
|
+ ])->column('unit_name');
|
|
|
+ dump( $proprietor_unit_name);
|
|
|
+ $admin_group_id=Db::name("admin")->where("id", $leader_id)->value("admin_group_id");
|
|
|
$where = [
|
|
|
['status', '>=', 0],
|
|
|
- ['unit_name', 'in', $proprietorDepartmentIds]
|
|
|
+ ["admin_group_id","=", $admin_group_id],
|
|
|
+ ["unit_name","in",$proprietor_unit_name]
|
|
|
];
|
|
|
$proprietor =Db::name("admin")->where($where)->field(["id","nickname"])->select()->toArray();
|
|
|
$proprietor = array_values($proprietor);
|