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

修改

This commit is contained in:
hanrenchun 2025-06-09 23:09:30 +08:00
parent ac57acc4b2
commit ffd85c9ae2
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,11 +80,11 @@ public class ApprovalProcessController extends BaseController {
} else {
process.setApprovalStatus(1);
}
}
}else {
continue;
}
}
}
if (process.getMatterType() == 3) {
gwglLog one = gwglLogService.lambdaQuery()
.eq(gwglLog::getApplyNo, process.getApprovalNo())
@ -99,11 +99,11 @@ public class ApprovalProcessController extends BaseController {
} else {
process.setApprovalStatus(1);
}
}
}else {
continue;
}
}
}
if (process.getMatterType() == 4) {
gwglLog one = gwglLogService.lambdaQuery()
.eq(gwglLog::getApplyNo, process.getApprovalNo())
@ -118,11 +118,11 @@ public class ApprovalProcessController extends BaseController {
} else {
process.setApprovalStatus(1);
}
}
}else {
continue;
}
}
}
// 如果创建时间为当天的时间
if (process.getCreateTime() > System.currentTimeMillis() - 24 * 60 * 60 * 1000) {
// 一分钟之内，显示刚刚

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

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