gather-app/src/main/java/com/ruoyi/business/controller/BusinessTripApprovalController.java

@@ -96,12 +96,9 @@ 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(user.getNickName() + "的出差呈请");
+        approvalProcess.setProcessTitle("饮酒报备");
         approvalProcess.setSubmitterName(user.getNickName());
         approvalProcess.setSubmitterId(user.getUserId());
         approvalProcess.setSubmitTime(new Date().getTime());
@@ -110,7 +107,6 @@ 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));
     }

gather-app/src/main/java/com/ruoyi/business/controller/NonWorkingDayDrinkingReportController.java

@@ -26,7 +26,6 @@ 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;
 
 /**
@@ -134,12 +133,10 @@ 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(user.getNickName() + "的饮酒报备");
+            approvalProcess.setProcessTitle("饮酒报备");
             approvalProcess.setSubmitterName(user.getNickName());
             approvalProcess.setSubmitterId(user.getUserId());
             approvalProcess.setSubmitTime(new Date().getTime());
@@ -148,7 +145,6 @@ 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) {

gather-app/src/main/java/com/ruoyi/business/controller/PoliceLeaveApprovalController.java

@@ -27,7 +27,6 @@ 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;
 
 /**
@@ -119,13 +118,11 @@ 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(user.getNickName() + "的请（休）假审批表");
+            approvalProcess.setProcessTitle("民警请（休）假审批表");
             approvalProcess.setSubmitterName(user.getNickName());
             approvalProcess.setSubmitterId(user.getUserId());
             approvalProcess.setSubmitTime(new Date().getTime());
@@ -135,7 +132,6 @@ 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())) {

gather-app/src/main/java/com/ruoyi/database/domain/ApprovalProcess.java

@@ -111,7 +111,4 @@ public class ApprovalProcess {
     @ApiModelProperty("开始时间（格式化字符串）")
     private String startTimeStr;
 
-    @ApiModelProperty("关联用uuid")
-    private String uuid;
-
 }

gather-app/src/main/java/com/ruoyi/database/domain/BusinessTripApproval.java

@@ -77,8 +77,4 @@ public class BusinessTripApproval extends BaseEntityMini {
 
     @TableField(exist = false)
     private List<Long> togUserIdList;
-
-
-    @ApiModelProperty("关联用uuid")
-    private String uuid;
 }

gather-app/src/main/java/com/ruoyi/database/domain/NonWorkingDayDrinkingReport.java

@@ -101,7 +101,4 @@ public class NonWorkingDayDrinkingReport {
     private String fTime;
     @TableField(exist = false)
     private String eTime;
-
-    @ApiModelProperty("关联用uuid")
-    private String uuid;
 }

gather-app/src/main/java/com/ruoyi/database/domain/PoliceLeaveApproval.java

@@ -92,7 +92,4 @@ public class PoliceLeaveApproval {
     private String fTime;
     @TableField(exist = false)
     private String eTime;
-
-    @ApiModelProperty("关联用uuid")
-    private String uuid;
 }