From 57aa3ffc183768dd408e0b7a735021a72dcd6149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E4=BA=AC=E9=80=9A?= <2405957150@qq.com>
Date: Sun, 8 Jun 2025 14:05:42 +0800
Subject: [PATCH] feat:

---
 .../business/controller/BusinessTripApprovalController.java     | 1 +
 .../controller/NonWorkingDayDrinkingReportController.java       | 1 +
 .../business/controller/PoliceLeaveApprovalController.java      | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/BusinessTripApprovalController.java b/gather-app/src/main/java/com/ruoyi/business/controller/BusinessTripApprovalController.java
index b1e0726..139fa28 100644
--- a/gather-app/src/main/java/com/ruoyi/business/controller/BusinessTripApprovalController.java
+++ b/gather-app/src/main/java/com/ruoyi/business/controller/BusinessTripApprovalController.java
@@ -110,6 +110,7 @@ public class BusinessTripApprovalController extends BaseController {
         approvalProcess.setMatterType(2);
         approvalProcess.setApprovalStatus(0);
         approvalProcess.setReadStatus(0);
+        approvalProcess.setBusinessTripDestination(dto.getDestinationIdCn());
         approvalProcess.setStartTime(approvalProcess.getStartTime());
         approvalProcess.setCreateTime(new Date().getTime());
         approvalProcess.setUuid(uuids);
diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/NonWorkingDayDrinkingReportController.java b/gather-app/src/main/java/com/ruoyi/business/controller/NonWorkingDayDrinkingReportController.java
index 7138403..708760f 100644
--- a/gather-app/src/main/java/com/ruoyi/business/controller/NonWorkingDayDrinkingReportController.java
+++ b/gather-app/src/main/java/com/ruoyi/business/controller/NonWorkingDayDrinkingReportController.java
@@ -146,6 +146,7 @@ public class NonWorkingDayDrinkingReportController extends BaseController {
             approvalProcess.setMatterType(4);
             approvalProcess.setApprovalStatus(0);
             approvalProcess.setReadStatus(0);
+            approvalProcess.setDrinkingPlace(nonWorkingDayDrinkingReport.getDrinkPlace());
             approvalProcess.setStartTime(nonWorkingDayDrinkingReport.getDrinkTime());
             approvalProcess.setCreateTime(new Date().getTime());
             approvalProcess.setUuid(uuids);
diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/PoliceLeaveApprovalController.java b/gather-app/src/main/java/com/ruoyi/business/controller/PoliceLeaveApprovalController.java
index ee97a99..963c199 100644
--- a/gather-app/src/main/java/com/ruoyi/business/controller/PoliceLeaveApprovalController.java
+++ b/gather-app/src/main/java/com/ruoyi/business/controller/PoliceLeaveApprovalController.java
@@ -125,7 +125,7 @@ public class PoliceLeaveApprovalController extends BaseController {
 
             ApprovalProcess approvalProcess = new ApprovalProcess();
             approvalProcess.setApprovalNo(s);
-            approvalProcess.setProcessTitle(user.getNickName() + "的请（休）假审批表");
+            approvalProcess.setProcessTitle("请（休）假审批表");
             approvalProcess.setSubmitterName(user.getNickName());
             approvalProcess.setSubmitterId(user.getUserId());
             approvalProcess.setSubmitTime(new Date().getTime());