Commit 0d2febf1 by zhiwj

修改bug

parent f56f2939
......@@ -77,6 +77,16 @@ public class TodoItemDTO implements Serializable {
@NotBlank(message = "url不能为空", groups = SaveValidView.class)
private String itemInfoUrl;
private String itemTypeName;
public void setItemTypeName(String itemTypeName) {
this.itemTypeName = itemTypeName;
}
public String getItemTypeName() {
return itemTypeName;
}
public Integer getTodoItemId() {
return todoItemId;
}
......
......@@ -60,7 +60,6 @@ public class TabTodoItem {
* 存事项的需要反查的内容,url
*/
private String itemInfoUrl;
private String itemTypeName;
public Integer getTodoItemId() {
return todoItemId;
......@@ -149,12 +148,4 @@ public class TabTodoItem {
public void setItemInfoUrl(String itemInfoUrl) {
this.itemInfoUrl = itemInfoUrl;
}
public void setItemTypeName(String itemTypeName) {
this.itemTypeName = itemTypeName;
}
public String getItemTypeName() {
return itemTypeName;
}
}
\ No newline at end of file
......@@ -63,14 +63,14 @@ public class TodoItemApiServiceImpl implements TodoItemApiService {
@Override
public ServiceResponse<Page<TodoItemDTO>> listTodoItem(TodoItemQO todoItemQO) {
com.github.pagehelper.Page<TabTodoItem> page = this.todoItemService.listTodoItem(todoItemQO);
Page<TodoItemDTO> result = PageHelperUtils.changePageHelperToCurrentPage(page, TodoItemDTO.class);
if (CollectionUtils.isNotEmpty(page)) {
List<DictDTO> list = dictApiService.listTodoItemType().getResult();
Map<String, String> map = list.stream().collect(Collectors.toMap(DictDTO::getValue, DictDTO::getKey));
for (TabTodoItem e : page) {
for (TodoItemDTO e : result.getResult()) {
e.setItemTypeName(map.get(e.getItemType()));
}
}
Page<TodoItemDTO> result = PageHelperUtils.changePageHelperToCurrentPage(page, TodoItemDTO.class);
return EnterpriseServiceResponse.success(result);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment