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

feat:

This commit is contained in:
李京通 2025-06-08 13:14:21 +08:00
parent 6c72ace72c
commit b749c34ac6
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,11 +103,11 @@ public class BusinessTripApprovalController extends BaseController {
dto.setUuid(uuids); dto.setUuid(uuids);
ApprovalProcess approvalProcess = new ApprovalProcess(); ApprovalProcess approvalProcess = new ApprovalProcess();
approvalProcess.setApprovalNo(s); approvalProcess.setApprovalNo(s);
approvalProcess.setProcessTitle(user.getNickName() + "的出差呈请"); approvalProcess.setProcessTitle("出差呈请");
approvalProcess.setSubmitterName(user.getNickName()); approvalProcess.setSubmitterName(user.getNickName());
approvalProcess.setSubmitterId(user.getUserId()); approvalProcess.setSubmitterId(user.getUserId());
approvalProcess.setSubmitTime(new Date().getTime()); approvalProcess.setSubmitTime(new Date().getTime());
approvalProcess.setMatterType(3); approvalProcess.setMatterType(2);
approvalProcess.setApprovalStatus(0); approvalProcess.setApprovalStatus(0);
approvalProcess.setReadStatus(0); approvalProcess.setReadStatus(0);
approvalProcess.setStartTime(approvalProcess.getStartTime()); approvalProcess.setStartTime(approvalProcess.getStartTime());

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

@ -139,11 +139,11 @@ public class NonWorkingDayDrinkingReportController extends BaseController {
nonWorkingDayDrinkingReport.setUuid(uuids); nonWorkingDayDrinkingReport.setUuid(uuids);
ApprovalProcess approvalProcess = new ApprovalProcess(); ApprovalProcess approvalProcess = new ApprovalProcess();
approvalProcess.setApprovalNo(s); approvalProcess.setApprovalNo(s);
approvalProcess.setProcessTitle(user.getNickName() + "的饮酒报备"); approvalProcess.setProcessTitle("饮酒报备");
approvalProcess.setSubmitterName(user.getNickName()); approvalProcess.setSubmitterName(user.getNickName());
approvalProcess.setSubmitterId(user.getUserId()); approvalProcess.setSubmitterId(user.getUserId());
approvalProcess.setSubmitTime(new Date().getTime()); approvalProcess.setSubmitTime(new Date().getTime());
approvalProcess.setMatterType(0); approvalProcess.setMatterType(4);
approvalProcess.setApprovalStatus(0); approvalProcess.setApprovalStatus(0);
approvalProcess.setReadStatus(0); approvalProcess.setReadStatus(0);
approvalProcess.setStartTime(nonWorkingDayDrinkingReport.getDrinkTime()); approvalProcess.setStartTime(nonWorkingDayDrinkingReport.getDrinkTime());

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

@ -129,7 +129,7 @@ public class PoliceLeaveApprovalController extends BaseController {
approvalProcess.setSubmitterName(user.getNickName()); approvalProcess.setSubmitterName(user.getNickName());
approvalProcess.setSubmitterId(user.getUserId()); approvalProcess.setSubmitterId(user.getUserId());
approvalProcess.setSubmitTime(new Date().getTime()); approvalProcess.setSubmitTime(new Date().getTime());
approvalProcess.setMatterType(1); approvalProcess.setMatterType(3);
approvalProcess.setApprovalStatus(0); approvalProcess.setApprovalStatus(0);
approvalProcess.setReadStatus(0); approvalProcess.setReadStatus(0);
approvalProcess.setStartTime(policeLeaveApproval.getStartDate()); approvalProcess.setStartTime(policeLeaveApproval.getStartDate());

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

@ -23,6 +23,7 @@ public class ApprovalProcess {
private String approvalNo; private String approvalNo;
@ApiModelProperty("流程标题") @ApiModelProperty("流程标题")
@TableField(condition = SqlCondition.LIKE)
private String processTitle; private String processTitle;
@ApiModelProperty("提交人姓名") @ApiModelProperty("提交人姓名")
@ -32,6 +33,7 @@ public class ApprovalProcess {
private Long submitterId; private Long submitterId;
@ApiModelProperty("抄送人姓名") @ApiModelProperty("抄送人姓名")
@TableField(condition = SqlCondition.LIKE)
private String ccName; private String ccName;
@ -45,10 +47,11 @@ public class ApprovalProcess {
@ApiModelProperty("提交时间") @ApiModelProperty("提交时间")
private Long submitTime; private Long submitTime;
@ApiModelProperty("事项类型 0-喝酒 1-请假 2-出差") @ApiModelProperty("事项类型 4-喝酒 3-请假 2-出差 1-出县")
private Integer matterType; private Integer matterType;
@ApiModelProperty("审批状态：0-待提交 1-部门审批中 2-政治处审批中 3-局领导审批中 4-已通过 5-已拒绝") @ApiModelProperty("审批状态：0-待提交 1-部门审批中 2-政治处审批中 3-局领导审批中 4-已通过 5-已拒绝")
@TableField(condition = SqlCondition.LIKE)
private Integer approvalStatus; private Integer approvalStatus;
@ApiModelProperty("到达日期") @ApiModelProperty("到达日期")