lijingtong
/
PublicAffairs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: lijingtong:aa82d8c9934bde6f83eeca4331ba53a9b5a04cf9
Branches Tags
lijingtong:master
...
compare: lijingtong:e410205e4157e8087d0ac54aa9e95a249379e513
Branches Tags
lijingtong:master

2 Commits
aa82d8c993 ... e410205e41

Author SHA1 Message Date
hanrenchun e410205e41 Merge remote-tracking branch 'origin/master' 2025-06-07 16:23:14 +08:00
hanrenchun 99bf931794 修改 2025-06-07 16:23:05 +08:00
7 changed files with 30 additions and 5 deletions
Show Stats Expand all files Collapse all files

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

@ -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));
}

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

@ -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) {

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

@ -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())) {

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

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

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

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

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

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

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

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