|
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.github.jfcloud.common.annotation.WebApiLog;
|
|
|
import com.github.jfcloud.common.core.util.R;
|
|
|
+import com.github.jfcloud.gene.cache.UserIdNameCache;
|
|
|
import com.github.jfcloud.gene.common.constant.WhetherEnum;
|
|
|
import com.github.jfcloud.gene.constants.GeneStatusEnum;
|
|
|
import com.github.jfcloud.gene.flow.dto.FlowAuditDto;
|
|
@@ -40,6 +41,7 @@ public class FlowController {
|
|
|
|
|
|
private final FlowInfoService flowInfoService;
|
|
|
private final FlowAuditService flowAuditService;
|
|
|
+ private final UserIdNameCache userIdNameCache;
|
|
|
|
|
|
@Operation(summary = "列表查询")
|
|
|
@GetMapping("/page")
|
|
@@ -126,6 +128,7 @@ public class FlowController {
|
|
|
auditDto = BeanUtil.toBean(audit.getAdditionalData(), FlowAuditDto.class);
|
|
|
}
|
|
|
BeanUtil.copyProperties(audit, auditDto);
|
|
|
+ auditDto.setCreateName(userIdNameCache.getNicknameByUserId(audit.getCreateBy()));
|
|
|
auditDto.setFlowStatusLabel(Objects.requireNonNull(GeneStatusEnum.getByStatus(audit.getFlowStatus())).getDescription());
|
|
|
auditDtos.add(auditDto);
|
|
|
}
|