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 401fe51..b1e0726 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 @@ -103,11 +103,11 @@ public class BusinessTripApprovalController extends BaseController { 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()); - approvalProcess.setMatterType(3); + approvalProcess.setMatterType(2); approvalProcess.setApprovalStatus(0); approvalProcess.setReadStatus(0); approvalProcess.setStartTime(approvalProcess.getStartTime()); 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 a2b4a82..7138403 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 @@ -139,11 +139,11 @@ public class NonWorkingDayDrinkingReportController extends BaseController { 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()); - approvalProcess.setMatterType(0); + approvalProcess.setMatterType(4); approvalProcess.setApprovalStatus(0); approvalProcess.setReadStatus(0); approvalProcess.setStartTime(nonWorkingDayDrinkingReport.getDrinkTime()); 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 07af2f1..ee97a99 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 @@ -129,7 +129,7 @@ public class PoliceLeaveApprovalController extends BaseController { approvalProcess.setSubmitterName(user.getNickName()); approvalProcess.setSubmitterId(user.getUserId()); approvalProcess.setSubmitTime(new Date().getTime()); - approvalProcess.setMatterType(1); + approvalProcess.setMatterType(3); approvalProcess.setApprovalStatus(0); approvalProcess.setReadStatus(0); approvalProcess.setStartTime(policeLeaveApproval.getStartDate()); 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 7265659..09899af 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 @@ -23,6 +23,7 @@ public class ApprovalProcess { private String approvalNo; @ApiModelProperty("流程标题") + @TableField(condition = SqlCondition.LIKE) private String processTitle; @ApiModelProperty("提交人姓名") @@ -32,6 +33,7 @@ public class ApprovalProcess { private Long submitterId; @ApiModelProperty("抄送人姓名") + @TableField(condition = SqlCondition.LIKE) private String ccName; @@ -45,10 +47,11 @@ public class ApprovalProcess { @ApiModelProperty("提交时间") private Long submitTime; - @ApiModelProperty("事项类型 0-喝酒 1-请假 2-出差") + @ApiModelProperty("事项类型 4-喝酒 3-请假 2-出差 1-出县") private Integer matterType; @ApiModelProperty("审批状态:0-待提交 1-部门审批中 2-政治处审批中 3-局领导审批中 4-已通过 5-已拒绝") + @TableField(condition = SqlCondition.LIKE) private Integer approvalStatus; @ApiModelProperty("到达日期")