津补贴++

app/admin/controller/TalentAllowance.php

@@ -3,6 +3,7 @@
 namespace app\admin\controller;
 
 use app\admin\common\AdminController;
+use app\common\api\Response;
 use app\common\model\TalentAllowance as TaModel;
 use think\facade\Db;
 use app\common\api\DictApi;
@@ -86,6 +87,53 @@ class TalentAllowance extends AdminController {
         return view("info", ["row" => $obj, "process" => $process]);
     }
 
+    /**
+     * 审核
+     */
+    public function check() {
+        $obj = $this->request->param();
+        if (!$obj["checkState"]) {
+            return new Response(Response::ERROR, "请选择审核状态");
+        }
+        
+        $oldObj = TalentAllowanceApi::getInfoById($obj["id"]);
+        $newObj = [];
+        $newObj["id"] = $obj["id"];
+        if ($obj["process"] == 1) {
+            List<String> projectList = FengStringUtil.isEmpOrNull(oldObj.getProjects()) ? new ArrayList<>() : new ArrayList<>(Arrays.asList(oldObj.getProjects().split(",")));
+            List<String> fileList = FengStringUtil.isEmpOrNull(oldObj.getFiles()) ? new ArrayList<>() : new ArrayList<>(Arrays.asList(oldObj.getFiles().split(",")));
+            if (FengStringUtil.isNotEmpAndNull(obj.getProjects())) {
+                List<String> newList = new ArrayList<>(Arrays.asList(obj.getProjects().split(",")));
+                projectList.removeAll(newList);
+                projectList.addAll(newList);
+            }
+            if (FengStringUtil.isNotEmpAndNull(obj.getFiles())) {
+                List<String> newList = new ArrayList<>(Arrays.asList(obj.getFiles().split(",")));
+                fileList.removeAll(newList);
+                fileList.addAll(newList);
+            }
+            newObj.setProjects(projectList.stream().collect(Collectors.joining(",")));
+            newObj.setFiles(fileList.stream().collect(Collectors.joining(",")));
+            if (Const.RSJ.equals(checkCompany.getCode())) {
+                newObj.setConcats(obj.getConcats());
+                newObj.setFields(obj.getFields());
+            }
+        }
+        if ($obj["process"] == 3) {
+            $newObj["toProcess"] = $obj["toProcess"];
+            $newObj["toDep"] = $obj["toDep"];
+        }
+        this.talentAllowanceInfoService.updateById(newObj);
+        TalentChecklog log = new TalentChecklog(ProjectEnum.JBT.getCode(), obj.getId(), null,
+                StateConst.ACTIVE_NO, checkState, obj.getProcess(), null, obj.getCheckMsg(),
+                DateUtil.getTime(), ShiroKit.getUser().getAccount() + "(" + company.getName() + ")");
+        if (obj.getProcess() == AllowanceStepEnum.JBT_STEP_FIRST.getCode()) {
+            log.setCompanyId(obj.getCompanyId());
+        }
+        this.talentChecklogService.insert(log);
+        return new ResponseObj(ResponseObj.SUCCESS, "审核成功");
+    }
+
     /**
      * 校验是否在审核范围内
      */
@@ -94,9 +142,6 @@ class TalentAllowance extends AdminController {
         $type = $this->request["type"];
         $process = $this->request["process"];
 
-        $response = new \stdClass();
-        $response->code = 500;
-
         $info = null;
         switch ($type) {
             case 1:                 //编辑合同
@@ -112,8 +157,7 @@ class TalentAllowance extends AdminController {
                 break;
         }
         if (!$info) {
-            $response->msg = "校验不通过，无法操作";
-            return $response;
+            return new Response(Response::ERROR, "校验不通过，无法操作");
         }
         $where = [];
         $where[] = ["mainId", "=", $info["id"]];
@@ -124,22 +168,19 @@ class TalentAllowance extends AdminController {
         switch ($process) {
             case 1:
                 if ($info["checkState"] != AllowanceStateEnum::NEED_CHECK && $info["checkState"] != AllowanceStateEnum::REJECT_TO_FIRST) {
-                    $response->msg = "不在审核范围内";
-                    return $response;
+                    return new Response(Response::ERROR, "不在审核范围内");
                 }
                 //$where[] = ["companyId","=",$this->user["companyId"]];
                 $log = TalentChecklog::where($where)->order("createTime desc")->find();
                 break;
             case 2:
                 if ($info["checkState"] != AllowanceStateEnum::NEED_VISIT_CHECK && $info["checkState"] != AllowanceStateEnum::REVIEW_REJECT) {
-                    $response->msg = "不在审核范围内";
-                    return $response;
+                    return new Response(Response::ERROR, "不在审核范围内");
                 }
                 break;
             case 3:
                 if ($info["checkState"] != AllowanceStateEnum::NEED_REVIEW && $info["checkState"] != AllowanceStateEnum::PUBLIC_REJECT) {
-                    $response->msg = "不在审核范围内";
-                    return $response;
+                    return new Response(Response::ERROR, "不在审核范围内");
                 }
                 $log = TalentChecklog::where($where)->order("createTime desc")->find();
                 break;
@@ -181,11 +222,8 @@ class TalentAllowance extends AdminController {
             $res["files"] = $filetypes;
             $res["projects"] = $projectList;
             $res["concats"] = $detailList;
-            $response->obj = $res;
         }
-        $response->code = 200;
-        return $response;
-        return new ResponseObj(ResponseObj . SUCCESS, "", res);
+        return new Response(Response::SUCCESS, "不在审核范围内", $res);
     }
 
     /**

app/common/api/Response.php

@@ -0,0 +1,65 @@
+<?php
+
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+namespace app\common\api;
+
+/**
+ * Description of Response
+ *
+ * @author sgq
+ */
+class Response{
+
+    public $code, $msg, $obj;
+
+    const SUCCESS = 200;
+    const ERROR = 500;
+
+    public function __construct($code, $msg, $obj = null) {
+        $this->setCode($code);
+        $this->setMsg($msg);
+        $this->obj = $obj;
+    }
+
+    public function __set($name, $value) {
+        if (property_exists($this, $name)) {
+            $this->$name = $value;
+        } else {
+            throw new \Exception("Property '$name' does not exist in 'Response' class.");
+        }
+    }
+
+    public function __get($name) {
+        if (property_exists($this, $name)) {
+            return $this->$name;
+        } else {
+            throw new \Exception("Property '$name' does not exist in 'Response' class.");
+        }
+    }
+
+    public function __isset($name) {
+        return property_exists($this, $name);
+    }
+
+    public function setCode($code) {
+        if (is_int($code)) {
+            $this->code = $code;
+        } else {
+            throw new \Exception("Invalid code. Please provide an integer.");
+        }
+    }
+
+    public function setMsg($msg) {
+        if (is_string($msg)) {
+            $this->msg = $msg;
+        } else {
+            throw new \Exception("Invalid msg. Please provide an string.");
+        }
+    }
+
+}

public/static/modular/talentAllowance/talentAllowanceInfo_info.js

@@ -755,6 +755,7 @@ TalentAllowanceInfoDlg.checkSubmit = function(index){
         companyCodes = companyCodes.substring(0,companyCodes.length-1);
     }
     var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/check", function (data) {
+        console.log(data)
         if(data.code==200){
             layer.close(index);
             Feng.success(data.msg);