diff --git a/app/Http/Controllers/Api/ApproveController.php b/app/Http/Controllers/Api/ApproveController.php index 25c10ba68..5e3cdfa8d 100755 --- a/app/Http/Controllers/Api/ApproveController.php +++ b/app/Http/Controllers/Api/ApproveController.php @@ -13,7 +13,7 @@ use App\Module\Ihttp; use App\Tasks\PushTask; use App\Module\BillExport; use App\Models\WebSocketDialog; -use App\Models\WorkflowProcMsg; +use App\Models\ApproveProcMsg; use App\Exceptions\ApiException; use App\Models\UserDepartment; use App\Models\WebSocketDialogMsg; @@ -206,7 +206,7 @@ class ApproveController extends AbstractController * @apiDescription 需要token身份 * @apiVersion 1.0.0 * @apiGroup approve - * @apiName task__complete + * @apiName task__complete * * @apiQuery {Number} task_id 流程ID * @apiQuery {String} pass 标题 [true-通过,false-拒绝] @@ -237,7 +237,7 @@ class ApproveController extends AbstractController return Base::retError('审批机器人不存在'); } // 在流程信息关联的用户中查找 - $toUser = WorkflowProcMsg::where('proc_inst_id', $process['id'])->get()->toArray(); + $toUser = ApproveProcMsg::where('proc_inst_id', $process['id'])->get()->toArray(); foreach ($toUser as $val) { $dialog = WebSocketDialog::checkUserDialog($botUser, $val['userid']); if (empty($dialog)) { @@ -313,7 +313,7 @@ class ApproveController extends AbstractController return Base::retError('审批机器人不存在'); } // 在流程信息关联的用户中查找 - $toUser = WorkflowProcMsg::where('proc_inst_id', $process['id'])->get()->toArray(); + $toUser = ApproveProcMsg::where('proc_inst_id', $process['id'])->get()->toArray(); foreach ($toUser as $val) { $dialog = WebSocketDialog::checkUserDialog($botUser, $val['userid']); if (empty($dialog)) { @@ -975,7 +975,7 @@ class ApproveController extends AbstractController $msg = WebSocketDialogMsg::sendMsg($msg_action, $dialog->id, 'text', ['text' => $text], $botUser->userid, false, false, true); // 关联信息 if ($action == 'start') { - $proc_msg = new WorkflowProcMsg(); + $proc_msg = new ApproveProcMsg(); $proc_msg->proc_inst_id = $process['id']; $proc_msg->msg_id = $msg['data']->id; $proc_msg->userid = $toUser['userid']; diff --git a/app/Models/ApproveProcMsg.php b/app/Models/ApproveProcMsg.php new file mode 100644 index 000000000..ae1707dae --- /dev/null +++ b/app/Models/ApproveProcMsg.php @@ -0,0 +1,30 @@ +bigIncrements('id'); $table->bigInteger('proc_inst_id')->nullable()->default(0)->comment('流程实例ID'); $table->bigInteger('userid')->nullable()->default(0)->comment('会员ID'); @@ -31,8 +31,8 @@ class CreateWorkflowProcMsgs extends Migration */ public function down() { - Schema::table('workflow_proc_msgs', function (Blueprint $table) { - Schema::dropIfExists('workflow_proc_msgs'); + Schema::table('approve_proc_msgs', function (Blueprint $table) { + Schema::dropIfExists('approve_proc_msgs'); }); } } diff --git a/docker-compose.yml b/docker-compose.yml index c9aff6f97..de4a50f1f 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -150,7 +150,7 @@ services: approve: container_name: "dootask-approve-${APP_ID}" - image: "hitosea2020/go-workflow:latest" + image: "hitosea2020/go-approve:latest" environment: TZ: "Asia/Shanghai" MYSQL_HOST: "${DB_HOST}" @@ -158,7 +158,7 @@ services: MYSQL_DBNAME: "${DB_DATABASE}" MYSQL_USERNAME: "${DB_USERNAME}" MYSQL_PASSWORD: "${DB_PASSWORD}" - MYSQL_Prefix: "${DB_PREFIX}workflow_" + MYSQL_Prefix: "${DB_PREFIX}approve_" networks: extnetwork: ipv4_address: "${APP_IPPR}.11" diff --git a/resources/assets/sass/pages/page-setting.scss b/resources/assets/sass/pages/page-setting.scss index a3f78a900..55d208f6c 100755 --- a/resources/assets/sass/pages/page-setting.scss +++ b/resources/assets/sass/pages/page-setting.scss @@ -370,6 +370,7 @@ justify-content: center; align-items: center; color: #ededed; + min-height: 95px; } .approve-col-for{ padding:16px;