xiangshan
/
lcoa-java
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

This commit is contained in:
lijiaqi 2024-01-10 13:37:12 +08:00
parent a4780b39b0
commit 3e46af3895
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/ydool/oa/workFlow/controller/WorkFlowController.java
View File

@ -244,7 +244,8 @@ public class WorkFlowController extends BaseController {
@ApiImplicitParam(name = "userId", value = "发起人"),
@ApiImplicitParam(name = "status", value = "状态"),
@ApiImplicitParam(name = "startTime", value = "开始时间", dataType = "Date"),
@ApiImplicitParam(name = "endTime", value = "结束时间", dataType = "Date")
@ApiImplicitParam(name = "endTime", value = "结束时间", dataType = "Date"),
@ApiImplicitParam(name = "deptId", value = "部门id")
})
@ApiOperationSupport(
responses = @DynamicResponseParameters(properties = {
@ -257,9 +258,9 @@ public class WorkFlowController extends BaseController {
"HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") LocalDateTime startTime,
@DateTimeFormat(pattern = "yyyy-MM-dd " +
"HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone =
"GMT+8") LocalDateTime endTime) {
"GMT+8") LocalDateTime endTime,String deptId) {
return workFlowService.getAllWorkFlowList(getPage(), value, column, orderBy, type, userId, status, startTime,
endTime);
endTime,deptId);
}
/**

2
src/main/java/com/ydool/oa/workFlow/data/dto/WorkFlowDto.java
View File

@ -48,4 +48,6 @@ public class WorkFlowDto extends WorkFlow {
@ApiModelProperty(value = "是否能发起维修流程")
private Boolean isRepair;
}

15
src/main/java/com/ydool/oa/workFlow/service/WorkFlowService.java
View File

@ -454,11 +454,15 @@ public class WorkFlowService extends BaseService<WorkFlowMapper, WorkFlow> {
* @return
*/
public AjaxResult getAllWorkFlowList(Page page, String value, String column, String orderBy, String type,
String userId, String status, LocalDateTime startTime, LocalDateTime endTime) {
String userId, String status, LocalDateTime startTime, LocalDateTime endTime, String deptId) {
QueryWrapper<WorkFlow> qw = new QueryWrapper<WorkFlow>();
if (StrUtil.isNotBlank(value)) {
qw.lambda().like(WorkFlow::getData, value);
}
User user = userService.getOne(new QueryWrapper<User>().lambda()
.eq(User::getId, StpUtil.getLoginIdAsString())
.last("limit 1")
);
qw.lambda()
.eq(StrUtil.isNotBlank(status), WorkFlow::getStatus, status)
@ -466,6 +470,15 @@ public class WorkFlowService extends BaseService<WorkFlowMapper, WorkFlow> {
.eq(StrUtil.isNotBlank(userId), WorkFlow::getUserId, userId)
.ge(ObjUtil.isNotNull(startTime), WorkFlow::getCreatedAt, startTime)
.le(ObjUtil.isNotNull(endTime), WorkFlow::getCreatedAt, endTime);
if ("all".equals(user.getPermissions())) {
qw.lambda().inSql(StrUtil.isNotBlank(deptId), WorkFlow::getUserId, "select id from t_sys_user where dept = '" + deptId + "'");
} else if ("dept".equals(user.getPermissions())) {
qw.lambda().inSql(WorkFlow::getUserId, "select id from t_sys_user where dept = '" + user.getDept() + "'");
} else if ("my".equals(user.getPermissions())) {
qw.lambda().eq(WorkFlow::getUserId, StpUtil.getLoginIdAsString());
} else {
return AjaxResult.fail("无权限");
}
if ("desc".equals(orderBy) && StrUtil.isNotBlank(column)) {