Compare commits
No commits in common. "e410205e4157e8087d0ac54aa9e95a249379e513" and "aa82d8c9934bde6f83eeca4331ba53a9b5a04cf9" have entirely different histories.
e410205e41
...
aa82d8c993
gather-app/src/main/java/com/ruoyi
|
@ -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));
|
||||
}
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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())) {
|
||||
|
|
|
@ -111,7 +111,4 @@ public class ApprovalProcess {
|
|||
@ApiModelProperty("开始时间(格式化字符串)")
|
||||
private String startTimeStr;
|
||||
|
||||
@ApiModelProperty("关联用uuid")
|
||||
private String uuid;
|
||||
|
||||
}
|
||||
|
|
|
@ -77,8 +77,4 @@ public class BusinessTripApproval extends BaseEntityMini {
|
|||
|
||||
@TableField(exist = false)
|
||||
private List<Long> togUserIdList;
|
||||
|
||||
|
||||
@ApiModelProperty("关联用uuid")
|
||||
private String uuid;
|
||||
}
|
|
@ -101,7 +101,4 @@ public class NonWorkingDayDrinkingReport {
|
|||
private String fTime;
|
||||
@TableField(exist = false)
|
||||
private String eTime;
|
||||
|
||||
@ApiModelProperty("关联用uuid")
|
||||
private String uuid;
|
||||
}
|
|
@ -92,7 +92,4 @@ public class PoliceLeaveApproval {
|
|||
private String fTime;
|
||||
@TableField(exist = false)
|
||||
private String eTime;
|
||||
|
||||
@ApiModelProperty("关联用uuid")
|
||||
private String uuid;
|
||||
}
|
Loading…
Reference in New Issue