diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java b/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java index eeba424..af14d09 100644 --- a/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java +++ b/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java @@ -80,9 +80,9 @@ public class ApprovalProcessController extends BaseController { } else { process.setApprovalStatus(1); } - } else { - continue; } + }else { + continue; } } if (process.getMatterType() == 3) { @@ -99,9 +99,9 @@ public class ApprovalProcessController extends BaseController { } else { process.setApprovalStatus(1); } - }else { - continue; } + }else { + continue; } } if (process.getMatterType() == 4) { @@ -118,9 +118,9 @@ public class ApprovalProcessController extends BaseController { } else { process.setApprovalStatus(1); } - }else { - continue; } + }else { + continue; } } // 如果创建时间为当天的时间 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 6969f2b..e87f3dc 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 @@ -51,7 +51,7 @@ public class ApprovalProcess { @ApiModelProperty("事项类型 4-喝酒 3-请假 2-出差 1-出县") private Integer matterType; - @ApiModelProperty("日期类型 4-自定义日期 3-近三十日 2-近七日 1-近三日") + @TableField(exist = false) private Integer timeType; @ApiModelProperty("审批状态:0-未审核 1-通过 2-不通过") @@ -140,4 +140,7 @@ public class ApprovalProcess { @TableField(exist = false) private String leaveTypeCn; + @TableField(exist = false) + private String processTitles; + }