Merge remote-tracking branch 'origin/developer' into developer

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/TodoItemDTO.java

@@ -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;
     }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/TodoItemApiServiceImpl.java

@@ -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) {
@@ -55,6 +64,13 @@ public class TodoItemApiServiceImpl implements TodoItemApiService {
     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 (TodoItemDTO e : result.getResult()) {
+                e.setItemTypeName(map.get(e.getItemType()));
+            }
+        }
         return EnterpriseServiceResponse.success(result);
     }