Commit f56f2939 by zhiwj

修改bug

parent df04252f
......@@ -60,6 +60,7 @@ public class TabTodoItem {
* 存事项的需要反查的内容,url
*/
private String itemInfoUrl;
private String itemTypeName;
public Integer getTodoItemId() {
return todoItemId;
......@@ -148,4 +149,12 @@ 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
......@@ -4,17 +4,24 @@ import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.PageHelperUtils;
import com.gic.enterprise.dto.DictDTO;
import com.gic.enterprise.dto.TodoItemDTO;
import com.gic.enterprise.entity.TabTodoItem;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.qo.TodoItemQO;
import com.gic.enterprise.response.EnterpriseServiceResponse;
import com.gic.enterprise.service.DictApiService;
import com.gic.enterprise.service.TodoItemApiService;
import com.gic.enterprise.service.TodoItemService;
import com.gic.enterprise.utils.valid.ValidParamsUtils;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
*
* @Description:
......@@ -26,6 +33,8 @@ public class TodoItemApiServiceImpl implements TodoItemApiService {
@Autowired
private TodoItemService todoItemService;
@Autowired
private DictApiService dictApiService;
@Override
public ServiceResponse<Void> saveTodoItem(TodoItemDTO todoItemDTO) {
......@@ -54,6 +63,13 @@ public class TodoItemApiServiceImpl implements TodoItemApiService {
@Override
public ServiceResponse<Page<TodoItemDTO>> listTodoItem(TodoItemQO todoItemQO) {
com.github.pagehelper.Page<TabTodoItem> page = this.todoItemService.listTodoItem(todoItemQO);
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) {
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