wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update - 调整查询待办和已办状态结果查询入参

Browse Source
This commit is contained in:
wangli 2023-09-05 16:38:36 +08:00
parent 7419c36f52
commit 89dbf01ebc
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/dto/request/bpmn/task/BpmnTaskPageSearchDTO.java
View File

@ -23,6 +23,7 @@ import java.util.List;
public class BpmnTaskPageSearchDTO extends BpmPageParam { public class BpmnTaskPageSearchDTO extends BpmPageParam {
@ApiModelProperty(value = "操作人标识") @ApiModelProperty(value = "操作人标识")
@NotBlank(message = "用户不能为空")
private String userId; private String userId;
@ApiModelProperty(value = "租户Id", example = "1") @ApiModelProperty(value = "租户Id", example = "1")

5
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnTaskServiceImpl.java
View File

@ -150,6 +150,7 @@ public class BpmnTaskServiceImpl implements BpmnTaskService {
baseQuerySql.append(sqlConnectors(baseQuerySql)).append(" a.END_TIME_ is null") baseQuerySql.append(sqlConnectors(baseQuerySql)).append(" a.END_TIME_ is null")
.append(sqlConnectors(baseQuerySql)).append(" a.ASSIGNEE_ = #{assignee}") .append(sqlConnectors(baseQuerySql)).append(" a.ASSIGNEE_ = #{assignee}")
.append(" ORDER BY a.END_TIME_ DESC"); .append(" ORDER BY a.END_TIME_ DESC");
nativeQuery.sql(baseQuerySql.toString());
return nativeQuery; return nativeQuery;
} }
@ -158,6 +159,7 @@ public class BpmnTaskServiceImpl implements BpmnTaskService {
baseQuerySql.append(sqlConnectors(baseQuerySql)).append(" a.END_TIME_ is not null") baseQuerySql.append(sqlConnectors(baseQuerySql)).append(" a.END_TIME_ is not null")
.append(sqlConnectors(baseQuerySql)).append(" a.ASSIGNEE_ = #{assignee}") .append(sqlConnectors(baseQuerySql)).append(" a.ASSIGNEE_ = #{assignee}")
.append(" ORDER BY a.START_TIME_ DESC"); .append(" ORDER BY a.START_TIME_ DESC");
nativeQuery.sql(baseQuerySql.toString());
return nativeQuery; return nativeQuery;
} }
@ -205,7 +207,7 @@ public class BpmnTaskServiceImpl implements BpmnTaskService {
} }
baseQuerySql.append(")"); baseQuerySql.append(")");
} }
if (CollectionUtils.isEmpty(dto.getResults())) { if (!CollectionUtils.isEmpty(dto.getResults())) {
baseQuerySql.append(sqlConnectors(baseQuerySql)) baseQuerySql.append(sqlConnectors(baseQuerySql))
.append(" b.BUSINESS_STATUS_ in ("); .append(" b.BUSINESS_STATUS_ in (");
for (int i = 0; i < dto.getResults().size(); i++) { for (int i = 0; i < dto.getResults().size(); i++) {
@ -215,6 +217,7 @@ public class BpmnTaskServiceImpl implements BpmnTaskService {
} }
nativeQuery.parameter("businessStatus" + i, dto.getResults().get(i).getStatus()); nativeQuery.parameter("businessStatus" + i, dto.getResults().get(i).getStatus());
} }
baseQuerySql.append(")");
} }
return nativeQuery; return nativeQuery;
} }