代办已办枚举修改

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/TaskDto.java

 package com.yeejoin.amos.boot.module.ugp.api.dto;
 
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -12,13 +13,13 @@ import java.util.Date;
 * @date 2022-10-19
 */
 @Data
-public class TaskDto implements Serializable {
+public class TaskDto extends BaseDto {
 
     private static final long serialVersionUID = 1L;
 
     String content;
-    String sendTime;
-    String status;
+    Date sendTime;
+    boolean status;
     String statusLabel;
     String taskType;
     String taskTypeLabel;

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/TaskServiceImpl.java

 package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
+import com.yeejoin.amos.boot.module.ugp.api.Enum.ProjectInitiationEnum;
+import com.yeejoin.amos.boot.module.ugp.api.Enum.TaskTypeEnum;
 import com.yeejoin.amos.boot.module.ugp.api.dto.TaskDto;
+import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
+import com.yeejoin.amos.boot.module.ugp.api.entity.ProjectResource;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Task;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.TaskMapper;
 import com.yeejoin.amos.boot.module.ugp.api.service.TaskService;
+import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import javax.xml.crypto.Data;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 /**
  * 监检任务表 服务实现类
  *
@@ -16,4 +31,67 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 @Service
 public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> implements TaskService {
 
+    @Autowired
+    OrgServiceImpl orgService;
+
+    @Autowired
+    ProjectResourceServiceImpl projectResourceService;
+
+    @BusinessIdentify
+    public List<TaskDto> unDoneTask(){
+        TaskDto task = new TaskDto();
+        JSONObject jsonObject = new JSONObject();
+        ReginParams ReginParams = orgService.getReginParams();
+        String companyType = ReginParams.getBusinessInfo().getCompanyType();
+        List<Project> projectList = projectResourceService.getProjectList();
+        List<TaskDto> taskDtoList = new ArrayList<>();
+        if(OrgEnum.安装单位.getKey().equals(companyType)){
+            for (Project project : projectList) {
+                if (ProjectInitiationEnum.提交资料.getName().equals(project.getStatus())) {
+                    taskDtoList.add(setTask(project.getStatus(),false,TaskTypeEnum.填报.getKey(),project.getRecDate(),project.getSequenceNbr()));
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     *
+     * @param InitiationStatus 项目/问题处置 表中的 status字段
+     * @param taskType 任务类型（填报、流程）
+     * @param sendTime
+     * @Param sequenceNbr 项目/问题处置的sequenceNbr
+     * @return
+     */
+    public TaskDto setTask(String InitiationStatus,boolean status, String taskType, Date sendTime,Long sequenceNbr){
+        TaskDto task = new TaskDto();
+        task.setTaskType(taskType);
+        String title = ProjectInitiationEnum.getTaskNameMap.get(InitiationStatus);
+        String taskStatus = ProjectInitiationEnum.getTaskStatusMap.get(InitiationStatus);
+        if(ValidationUtil.isEmpty(title)){
+            //不是项目立项流程，是问题处置流程
+
+        }
+
+        task.setTitle(title);
+        task.setStatus(status);
+        if(status){
+            task.setStatusLabel(TaskTypeEnum.已办.getName());
+        } else {
+            task.setStatusLabel(TaskTypeEnum.待办.getName());
+        }
+
+        task.setSendTime(sendTime);
+        task.setContent(title+", "+taskStatus);
+        task.setSequenceNbr(sequenceNbr);
+
+        if(TaskTypeEnum.填报.getKey().equals(taskType)){
+            task.setTaskTypeLabel(TaskTypeEnum.填报.getName());
+        } else {
+            task.setTaskTypeLabel(TaskTypeEnum.填报.getName());
+        }
+
+
+        return task;
+    }
 }