[新增]工单处理人接口

core/src/main/java/com/keymobile/governworkorder/core/api/WorkOrderApi.java

@@ -5,7 +5,7 @@ import com.keymobile.governworkorder.common.bo.WorkOrderInfoVO;
 import com.keymobile.governworkorder.common.bo.WorkOrderProcessVO;
 import com.keymobile.governworkorder.core.dto.WorkOrdeQueryDto;
 import com.keymobile.governworkorder.core.dto.WorkOrderConfirmDataDto;
-import com.keymobile.governworkorder.core.persistence.model.WorkOrderData;
+import com.keymobile.governworkorder.core.remote.user.User;
 import com.keymobile.governworkorder.core.service.WorkOrderService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -103,4 +103,13 @@ public class WorkOrderApi {
         return  workOrderService.checkCreatePermission(userName);
     }
 
+    @GetMapping(value = "/users/find")
+    @Operation(summary = "人员接口", description = "")
+    List<User> findUser(@RequestParam(value = "types", required = false) String[] types,
+                    @RequestParam(value = "dataRoleIds", required = false) Long[] dataRoleIds,
+                    @RequestParam(value = "match", required = false) String match,
+                    @RequestParam(value = "userGroupIds", required = false) Long[] userGroupIds){
+        return workOrderService.findUser(types, dataRoleIds, match, userGroupIds);
+    }
+
 }

core/src/main/java/com/keymobile/governworkorder/core/remote/AuthService.java

@@ -5,6 +5,7 @@ import com.keymobile.governworkorder.core.remote.user.UserGroup;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -20,5 +21,9 @@ public interface AuthService {
     @GetMapping(value = "/userGroups/{userGroupId}/users")
     List<User> getUserListByGroupId(@PathVariable("userGroupId") Long userGroupId);
 
-
+    @GetMapping(value = "/users/find")
+    List<User> find(@RequestParam(value = "types", required = false) String[] types,
+                    @RequestParam(value = "dataRoleIds", required = false) Long[] dataRoleIds,
+                    @RequestParam(value = "match", required = false) String match,
+                    @RequestParam(value = "userGroupIds", required = false) Long[] userGroupIds);
 }

core/src/main/java/com/keymobile/governworkorder/core/service/WorkOrderService.java

@@ -5,7 +5,7 @@ import com.keymobile.governworkorder.common.bo.WorkOrderInfoVO;
 import com.keymobile.governworkorder.common.bo.WorkOrderProcessVO;
 import com.keymobile.governworkorder.core.dto.WorkOrdeQueryDto;
 import com.keymobile.governworkorder.core.dto.WorkOrderConfirmDataDto;
-import com.keymobile.governworkorder.core.persistence.model.WorkOrderProcess;
+import com.keymobile.governworkorder.core.remote.user.User;
 import org.springframework.data.domain.Page;
 
 import java.util.List;
@@ -39,4 +39,6 @@ public interface WorkOrderService {
 
     boolean checkCreatePermission(String userName);
 
+    List<User> findUser(String[] types, Long[] dataRoleIds, String match, Long[] userGroupIds);
+
 }

core/src/main/java/com/keymobile/governworkorder/core/service/impl/WorkOrderServiceImpl.java

@@ -316,10 +316,6 @@ public class WorkOrderServiceImpl implements WorkOrderService {
         return !(user == null);
     }
 
-    private boolean checkSuperAdmin(String userName) {
-        return StringUtils.equals(superAdmin, userName);
-    }
-
     @Override
     public void startProcess(String workOrderId) {
         WorkOrderInfo workOrder = mongoTemplate.findById(workOrderId, WorkOrderInfo.class);
@@ -356,6 +352,15 @@ public class WorkOrderServiceImpl implements WorkOrderService {
 
     }
 
+    @Override
+    public List<User> findUser(String[] types, Long[] dataRoleIds, String match, Long[] userGroupIds) {
+        return authService.find(types, dataRoleIds, match, userGroupIds);
+    }
+
+    private boolean checkSuperAdmin(String userName) {
+        return StringUtils.equals(superAdmin, userName);
+    }
+
     public void approvalProcess(String workOrderId, WorkOrderProcessVO processVO) {
         log.debug("workOrderId:{},process:{}", workOrderId, ObjectUtil.toJson(processVO));
         WorkOrderInfo workOrder = mongoTemplate.findById(workOrderId, WorkOrderInfo.class);
@@ -483,18 +488,18 @@ public class WorkOrderServiceImpl implements WorkOrderService {
             workOrderData.setId(IdUtil.generateId());
         }
         workOrderData.setWorkOrderId(workOrder.getId());
-        if (StringUtils.isBlank(workOrderData.getHandleStatus())) {
-            workOrderData.setHandleStatus("否");
-        }
-        if (StringUtils.isBlank(workOrderData.getConfirmStatus())) {
-            workOrderData.setConfirmStatus("未确认");
-        }
         if (StringUtils.isBlank(workOrderData.getType())) {
             workOrderData.setType(workOrder.getType());
         }
         if (StringUtils.isBlank(workOrderData.getDataType())) {
             workOrderData.setDataType(workOrder.getDataType());
         }
+        if (StringUtils.isBlank(workOrderData.getHandleStatus())) {
+            workOrderData.setHandleStatus("否");
+        }
+        if (StringUtils.isBlank(workOrderData.getConfirmStatus())) {
+            workOrderData.setConfirmStatus("未确认");
+        }
     }
 
     private WorkOrderInfoVO convertMessage(WorkOrderInfo workOrder) {