fix(业务管理): 修改了业务管理 查询全部以及办结业务的接口 添加了根据unitId以及areaId的条件

dev-task/src/main/java/com/tykj/dev/device/task/service/impl/TaskServiceImpl.java

@@ -19,8 +19,13 @@ import com.tykj.dev.device.task.utils.TaskUtils;
 import com.tykj.dev.device.user.cache.UserCache;
 import com.tykj.dev.device.user.read.service.MessageService;
 import com.tykj.dev.device.user.read.subject.bto.MessageBto;
+import com.tykj.dev.device.user.subject.dao.UnitsDao;
+import com.tykj.dev.device.user.subject.entity.Units;
 import com.tykj.dev.device.user.subject.entity.User;
+import com.tykj.dev.device.user.subject.service.AreaService;
+import com.tykj.dev.device.user.subject.service.UnitsService;
 import com.tykj.dev.device.user.subject.service.UserPublicService;
+import com.tykj.dev.device.user.subject.service.UserService;
 import com.tykj.dev.device.user.util.UserUtils;
 import com.tykj.dev.misc.base.BusinessEnum;
 import com.tykj.dev.misc.base.CustomOrder;
@@ -76,6 +81,15 @@ public class TaskServiceImpl implements TaskService {
     @Autowired
     private MessageService messageService;
 
+    @Autowired
+    AreaService areaService;
+
+    @Autowired
+    UserService userService;
+
+    @Autowired
+    UnitsDao unitsDao;
+
     @Override
     public Task deleteById(Task task) {
 
@@ -628,6 +642,16 @@ public class TaskServiceImpl implements TaskService {
                         .filter(taskUserVo -> !Collections.disjoint(idLists, taskUserVo.getInvolveUserIdList())||(taskUserVo.getCreateUserId()!=null&&idLists.contains(taskUserVo.getCreateUserId())))
                         .collect(Collectors.toList());
             }
+            if (taskSelectVo.getAreaId()!=null){
+                List<Integer> ids = areaService.findIdQuerySubordinateIds(taskSelectVo.getAreaId());
+                List<Integer>  unitIds = unitsDao.findAllByAreaIdIn(ids).stream().map(Units::getUnitId).collect(Collectors.toList());
+                List<Integer>  userIDs= userService.findUnitsIdInUsers(unitIds).stream().map(User::getUserId).collect(Collectors.toList());
+                taskUserVos=taskUserVos.stream().filter(taskUserVo -> userIDs.contains(taskUserVo.getCreateUserId())).collect(Collectors.toList());
+            }else {
+                List<Integer>  userIDs= userService.findAllByUnite(taskSelectVo.getUnitId()).stream().map(User::getUserId).collect(Collectors.toList());
+                taskUserVos=taskUserVos.stream().filter(taskUserVo -> userIDs.contains(taskUserVo.getCreateUserId())).collect(Collectors.toList());
+            }
+
             taskUserVos = taskUserVos.stream()
                     .filter(taskUserVo -> !businesses.contains(taskUserVo.getBusinessType()) || (taskUserVo.getParentTaskId() == null || taskUserVo.getParentTaskId() == 0))
                     .filter(taskUserVo -> !taskUserVo.getBillStatus().equals(StatusEnum.REVOKEALLOTTASK.id))
@@ -1256,7 +1280,7 @@ public class TaskServiceImpl implements TaskService {
         if (taskSelectVo.getSelectNum() == 3) {
             //所有涉及人员所在单位包含当前用户所在单位且指针对应UserId不是当前用户
 //            List<Integer> status = Arrays.asList(201,333,810,322,722,788,1250,2223,8110,888,140,130,141,111,1002,150);
-            List<Integer> status = Arrays.asList(201,333,810,322,722,788,1250,2223,8110,888,140,130,141,111,1002,150,101,142,160,161);
+            List<Integer> status = Arrays.asList(201,333,810,322,722,788,1250,2223,8110,888,140,130,141,111,1002,150,101,142,160,161,1009);
             List<TaskBto> taskBtoList = taskBtos.stream()
                     .filter(taskBto -> {
 //                        boolean unitExists = getUnitsByUsers(taskBto.getInvolveUserIdList()).contains(unitId);

dev-task/src/main/java/com/tykj/dev/device/task/subject/vo/TaskSelectVo.java

@@ -3,6 +3,7 @@ package com.tykj.dev.device.task.subject.vo;
 import com.tykj.dev.misc.base.CustomPage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
 import lombok.Data;
 
 import java.util.Date;
@@ -14,20 +15,28 @@ import java.util.List;
 @Data
 @ApiModel("待办任务查询类")
 public class TaskSelectVo extends CustomPage {
+
     @ApiModelProperty(value = "模糊查询关键字", example = "测试")
     public String content;
+
     @ApiModelProperty(value = "发起时间", example = "2020-10-10 01:10:10")
     public Date startTime;
+
     @ApiModelProperty(value = "结束时间", example = "2020-10-10 01:10:10")
     public Date endTime;
+
     @ApiModelProperty(value = "查询方式(0:全部业务,1:我的发起,2:待办业务,3:业务跟踪,4:办结任务,5:封存业务)", example = "0")
     private Integer selectNum;
+
     @ApiModelProperty(value = "业务类型id", example = "1")
     private List<Integer> businessType;
+
     @ApiModelProperty(value = "待办类型(1:省内待办，2：省外待办)", example = "1")
     private Integer type;
+
     @ApiModelProperty(value = "业务状态", example = "1")
     private Integer billStatus;
+
     @ApiModelProperty(value = "业务备注", example = "测试")
     public List<String> remark;
 
@@ -43,4 +52,10 @@ public class TaskSelectVo extends CustomPage {
     @ApiModelProperty(value = "待办人模糊查询字段")
     private String processingUserDim;
 
+    @ApiModelProperty(value = "区域id")
+    private Integer areaId;
+
+    @ApiModelProperty(value = "单位id")
+    private Integer unitId;
+
 }