From 99bf931794353bc7b8811088e9a68e1511c02f62 Mon Sep 17 00:00:00 2001 From: hanrenchun Date: Sat, 7 Jun 2025 16:23:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BusinessTripApprovalController.java | 6 +++++- .../controller/NonWorkingDayDrinkingReportController.java | 8 ++++++-- .../controller/PoliceLeaveApprovalController.java | 8 ++++++-- .../java/com/ruoyi/database/domain/ApprovalProcess.java | 3 +++ .../com/ruoyi/database/domain/BusinessTripApproval.java | 4 ++++ .../database/domain/NonWorkingDayDrinkingReport.java | 3 +++ .../com/ruoyi/database/domain/PoliceLeaveApproval.java | 3 +++ 7 files changed, 30 insertions(+), 5 deletions(-) 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 85d19cf..9438eaf 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 @@ -96,9 +96,12 @@ public class BusinessTripApprovalController extends BaseController { String s = OrderNumberGenerator(); dto.setApplyNo(s); + UUID uuid = UUID.randomUUID(); + String uuids = uuid.toString(); + dto.setUuid(uuids); ApprovalProcess approvalProcess = new ApprovalProcess(); approvalProcess.setApprovalNo(s); - approvalProcess.setProcessTitle("饮酒报备"); + approvalProcess.setProcessTitle(user.getNickName() + "的出差呈请"); approvalProcess.setSubmitterName(user.getNickName()); approvalProcess.setSubmitterId(user.getUserId()); approvalProcess.setSubmitTime(new Date().getTime()); @@ -107,6 +110,7 @@ public class BusinessTripApprovalController extends BaseController { approvalProcess.setReadStatus(0); approvalProcess.setStartTime(approvalProcess.getStartTime()); approvalProcess.setCreateTime(new Date().getTime()); + approvalProcess.setUuid(uuids); approvalsProcessService.save(approvalProcess); return toAjax(businessTripApprovalService.save(dto)); } 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 388f34e..a2b4a82 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 @@ -26,6 +26,7 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.Date; import java.util.List; +import java.util.UUID; import java.util.stream.Collectors; /** @@ -133,10 +134,12 @@ public class NonWorkingDayDrinkingReportController extends BaseController { // 普通民警 nonWorkingDayDrinkingReport.setUserType(0); } - + UUID uuid = UUID.randomUUID(); + String uuids = uuid.toString(); + nonWorkingDayDrinkingReport.setUuid(uuids); ApprovalProcess approvalProcess = new ApprovalProcess(); approvalProcess.setApprovalNo(s); - approvalProcess.setProcessTitle("饮酒报备"); + approvalProcess.setProcessTitle(user.getNickName() + "的饮酒报备"); approvalProcess.setSubmitterName(user.getNickName()); approvalProcess.setSubmitterId(user.getUserId()); approvalProcess.setSubmitTime(new Date().getTime()); @@ -145,6 +148,7 @@ public class NonWorkingDayDrinkingReportController extends BaseController { approvalProcess.setReadStatus(0); approvalProcess.setStartTime(nonWorkingDayDrinkingReport.getDrinkTime()); approvalProcess.setCreateTime(new Date().getTime()); + approvalProcess.setUuid(uuids); approvalsProcessService.save(approvalProcess); boolean result = nonWorkingDayDrinkingReportService.save(nonWorkingDayDrinkingReport); if (!result) { 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 d49cf33..07af2f1 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 @@ -27,6 +27,7 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.Date; import java.util.List; +import java.util.UUID; import java.util.stream.Collectors; /** @@ -118,11 +119,13 @@ public class PoliceLeaveApprovalController extends BaseController { policeLeaveApproval.setUserId(user.getUserId()); policeLeaveApproval.setDeptId(user.getDeptId()); policeLeaveApproval.setApplyNo(s); - + UUID uuid = UUID.randomUUID(); + String uuids = uuid.toString(); + policeLeaveApproval.setUuid(uuids); ApprovalProcess approvalProcess = new ApprovalProcess(); approvalProcess.setApprovalNo(s); - approvalProcess.setProcessTitle("民警请（休）假审批表"); + approvalProcess.setProcessTitle(user.getNickName() + "的请（休）假审批表"); approvalProcess.setSubmitterName(user.getNickName()); approvalProcess.setSubmitterId(user.getUserId()); approvalProcess.setSubmitTime(new Date().getTime()); @@ -132,6 +135,7 @@ public class PoliceLeaveApprovalController extends BaseController { approvalProcess.setStartTime(policeLeaveApproval.getStartDate()); approvalProcess.setEndTime(policeLeaveApproval.getEndDate()); approvalProcess.setCreateTime(new Date().getTime()); + approvalProcess.setUuid(uuids); approvalsProcessService.save(approvalProcess); if (leader.contains(user.getNickName())) { diff --git a/gather-app/src/main/java/com/ruoyi/database/domain/ApprovalProcess.java b/gather-app/src/main/java/com/ruoyi/database/domain/ApprovalProcess.java index 05f06fd..83e8413 100644 --- a/gather-app/src/main/java/com/ruoyi/database/domain/ApprovalProcess.java +++ b/gather-app/src/main/java/com/ruoyi/database/domain/ApprovalProcess.java @@ -111,4 +111,7 @@ public class ApprovalProcess { @ApiModelProperty("开始时间（格式化字符串）") private String startTimeStr; + @ApiModelProperty("关联用uuid") + private String uuid; + } diff --git a/gather-app/src/main/java/com/ruoyi/database/domain/BusinessTripApproval.java b/gather-app/src/main/java/com/ruoyi/database/domain/BusinessTripApproval.java index 091e120..a4c2021 100644 --- a/gather-app/src/main/java/com/ruoyi/database/domain/BusinessTripApproval.java +++ b/gather-app/src/main/java/com/ruoyi/database/domain/BusinessTripApproval.java @@ -77,4 +77,8 @@ public class BusinessTripApproval extends BaseEntityMini { @TableField(exist = false) private List togUserIdList; + + + @ApiModelProperty("关联用uuid") + private String uuid; } \ No newline at end of file diff --git a/gather-app/src/main/java/com/ruoyi/database/domain/NonWorkingDayDrinkingReport.java b/gather-app/src/main/java/com/ruoyi/database/domain/NonWorkingDayDrinkingReport.java index 2bbaedf..4f5c96a 100644 --- a/gather-app/src/main/java/com/ruoyi/database/domain/NonWorkingDayDrinkingReport.java +++ b/gather-app/src/main/java/com/ruoyi/database/domain/NonWorkingDayDrinkingReport.java @@ -101,4 +101,7 @@ public class NonWorkingDayDrinkingReport { private String fTime; @TableField(exist = false) private String eTime; + + @ApiModelProperty("关联用uuid") + private String uuid; } \ No newline at end of file diff --git a/gather-app/src/main/java/com/ruoyi/database/domain/PoliceLeaveApproval.java b/gather-app/src/main/java/com/ruoyi/database/domain/PoliceLeaveApproval.java index cff898f..8104518 100644 --- a/gather-app/src/main/java/com/ruoyi/database/domain/PoliceLeaveApproval.java +++ b/gather-app/src/main/java/com/ruoyi/database/domain/PoliceLeaveApproval.java @@ -92,4 +92,7 @@ public class PoliceLeaveApproval { private String fTime; @TableField(exist = false) private String eTime; + + @ApiModelProperty("关联用uuid") + private String uuid; } \ No newline at end of file