待办任务接口开发

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/CompanyExamineEnum.java

+package com.yeejoin.amos.boot.module.ugp.api.Enum;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum CompanyExamineEnum {
+    企业审核("企业审核","未审核","已审核");
+
+    String name;
+    String no;
+    String yes;
+}

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/TaskTypeEnum.java

@@ -8,6 +8,7 @@ import lombok.Getter;
 public enum TaskTypeEnum {
     填报("form","填报"),
     流程("flow","流程"),
+    企业审核("examine","企业审核"),
     待办("false","待办"),
     已办("true","已办");
 

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/TaskController.java

@@ -4,17 +4,24 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+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.Task;
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.TaskServiceImpl;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import jdk.nashorn.internal.runtime.regexp.joni.EncodingHelper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 
 
 /**
@@ -126,6 +133,25 @@ public class TaskController {
     page = iTzUgpTaskService.page(pageBean, tzUgpTaskQueryWrapper);
     return page;
   }
+
+    /**
+     * 获取当前登录人的所有任务列表
+     * @return
+     */
+    @RequestMapping(value = "/getTaskList", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "获取当前登录人的所有任务列表", notes = "获取当前登录人的所有任务列表")
+  public ResponseModel<List<TaskDto>> getTaskList(String type){
+        List<TaskDto> taskDtoList = new ArrayList<>();
+        if(TaskTypeEnum.已办.getKey().equals(type)){
+            taskDtoList.addAll(iTzUgpTaskService.unDoneTask());
+        } else {
+
+        }
+
+
+      return ResponseHelper.buildResponse(taskDtoList);
+  }
+
 }
 
 

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

@@ -3,15 +3,9 @@ package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.ProblemProcessEnum;
-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.Enum.*;
 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.QualityProblem;
-import com.yeejoin.amos.boot.module.ugp.api.entity.Task;
+import com.yeejoin.amos.boot.module.ugp.api.entity.*;
 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;
@@ -22,9 +16,7 @@ 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;
+import java.util.*;
 
 /**
  * 监检任务表 服务实现类
@@ -44,6 +36,16 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl
     @Autowired
     QualityProblemServiceImpl qualityProblemService;
 
+    @Autowired
+    SuperviseRuleServiceImpl superviseRuleService;
+
+    @Autowired
+    CompanyServiceImpl companyService;
+
+    /**
+     * 获取当前登录人的所有待办事项
+     * @return
+     */
     @BusinessIdentify
     public List<TaskDto> unDoneTask(){
         List<TaskDto> taskDtoList = new ArrayList<>();
@@ -51,6 +53,7 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl
         JSONObject jsonObject = new JSONObject();
         ReginParams ReginParams = orgService.getReginParams();
         String companyType = ReginParams.getBusinessInfo().getCompanyType();
+        Long companyId = ReginParams.getBusinessInfo().getCompanySequenceNbr();
         List<Project> projectList = projectResourceService.getProjectList();
         if(!ValidationUtil.isEmpty(projectList)) {
 
@@ -120,9 +123,23 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl
         }
 
         //企业审核任务
-
-
-        return null;
+        Set<Integer> regionCodes = new HashSet<>();
+        LambdaQueryWrapper<SuperviseRule> wrapper = new LambdaQueryWrapper<>();
+        if (OrgEnum.监察部门.getKey().equals(companyType)) {
+            wrapper.eq(SuperviseRule::getSuperviseDeptId,companyId);
+        } else if (OrgEnum.监检机构.getKey().equals(companyType)) {
+            wrapper.eq(SuperviseRule::getInspectionUnitId,companyId);
+        }
+        for(SuperviseRule superviseRule:superviseRuleService.list(wrapper)){
+            regionCodes.add(superviseRule.getAdminRegionCode());
+        }
+        LambdaQueryWrapper<Company> companyWrapper = new LambdaQueryWrapper<>();
+        companyWrapper.in(Company::getRegionCode,regionCodes).eq(Company :: getApproved,CompanyExamineEnum.企业审核.getNo());
+        List<Company> companyList = companyService.list(companyWrapper);
+        for (Company company : companyList) {
+            taskDtoList.add(setTask(null, false, TaskTypeEnum.企业审核.getKey(), company.getRecDate(), company.getSequenceNbr()));
+        }
+        return taskDtoList;
     }
 
     /**
@@ -135,14 +152,29 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl
      */
     public TaskDto setTask(String InitiationStatus,boolean status, String taskType, Date sendTime,Long sequenceNbr){
         TaskDto task = new TaskDto();
+        String title = "", taskStatus = "";
         task.setTaskType(taskType);
-        String title = ProjectInitiationEnum.getTaskNameMap.get(InitiationStatus);
-        String taskStatus = ProjectInitiationEnum.getTaskStatusMap.get(InitiationStatus);
+        if(ValidationUtil.isEmpty(InitiationStatus)){
+            title = ProjectInitiationEnum.getTaskNameMap.get(InitiationStatus);
+            taskStatus = ProjectInitiationEnum.getTaskStatusMap.get(InitiationStatus);
             if(ValidationUtil.isEmpty(title)){
                 //不是项目立项流程，是问题处置流程
                 title = ProblemProcessEnum.getTaskNameMap.get(InitiationStatus);
                 taskStatus = ProblemProcessEnum.getTaskStatusMap.get(InitiationStatus);
             }
+        }
+
+        if (ValidationUtil.isEmpty(title)) {
+            //不是问题处置流程，企业注册任务
+            title = CompanyExamineEnum.企业审核.getName();
+            if(status){
+                taskStatus = CompanyExamineEnum.企业审核.getYes();
+            }else {
+                taskStatus = CompanyExamineEnum.企业审核.getNo();
+            }
+
+
+        }
 
         task.setTitle(title);
         task.setStatus(status);